fix: copy full context when calling transfer scripts, test stack map …

…more
ssube · Jun 1, 2021 · d0bbeab · d0bbeab
1 parent 700c147
commit d0bbeab
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/src/service/script/index.ts b/src/service/script/index.ts
@@ -18,6 +18,8 @@ export type ScriptFunction = (this: ScriptTarget, context: ScriptContext) => Pro
 
 export interface StateHelper {
   enter: (target: ShowSource) => Promise<void>;
+  // find: () => Promise<Array<WorldEntity>>; // replaces searchState
+  // move: () => Promise<void>; // replaces transfer
   show: (msg: string, context?: LocaleContext, volume?: ShowVolume, source?: ShowSource) => Promise<void>;
   quit: () => Promise<void>;
 }

diff --git a/src/util/state/EntityTransfer.ts b/src/util/state/EntityTransfer.ts
@@ -92,14 +92,11 @@ export class StateEntityTransfer {
     target.actors.push(transfer.moving);
 
     await context.script.invoke(target, SLOT_ENTER, {
+      ...context,
       actor: transfer.moving,
       data: new Map([
         ['source', transfer.source],
       ]),
-      random: context.random,
-      state: context.state,
-      stateHelper: context.stateHelper,
-      transfer: context.transfer,
     });
   }
 
@@ -155,14 +152,11 @@ export class StateEntityTransfer {
     target.items.push(transfer.moving);
 
     await context.script.invoke(target, SLOT_GET, {
+      ...context,
       item: transfer.moving,
       data: new Map([
         ['source', transfer.source],
       ]),
-      random: context.random,
-      state: context.state,
-      stateHelper: context.stateHelper,
-      transfer: context.transfer,
     });
   }
 }
diff --git a/test/util/collection/TestStackMap.ts b/test/util/collection/TestStackMap.ts
@@ -41,7 +41,7 @@ describe('stack map', () => {
     expect(map.get('bar')).to.deep.equal([]);
   });
 
-  it('should clear items normally', async () => {
+  it('should clear data normally', async () => {
     const map = new StackMap();
     map.push('foo', 1);
     map.push('bar', 1);
@@ -50,4 +50,12 @@ describe('stack map', () => {
     map.clear();
     expect(map.size).to.equal(0);
   });
+
+  it('should test key presence normally', async () => {
+    const map = new StackMap();
+    map.push('foo', 1);
+
+    expect(map.has('foo')).to.equal(true);
+    expect(map.has('bar')).to.equal(false);
+  });
 });