@zhin.js/command 1.1.4 → 1.1.5

package/lib/command-index.js

@@ -1,5 +1,5 @@
 import { SegmentMatcher, TypeMatcherRegistry, } from 'segment-matcher';
-import { operationClientAdapter } from '@zhin.js/feature-kit';
+import { bindOperationInput, operationClientAdapter } from '@zhin.js/feature-kit';
 import { permissionHostToken, toPermissionSubject, } from '@zhin.js/permission';
 import { createCommandContext, resolveCommandSession, resolveDynamicParams, } from './definition.js';
 const segmentFields = {
@@ -133,7 +133,6 @@ export class CommandIndex {
                 });
             }
         }
-        const interaction = interactionFactory?.(source);
         const shortcut = this.#matchShortcut(input);
         if (shortcut) {
             if (!commandAdapterMatches(shortcut.record, source)) {
@@ -142,7 +141,8 @@ export class CommandIndex {
             if (!(await this.#permitAllows(shortcut.record, source, operationSnapshot))) {
                 return Object.freeze({ matched: false });
             }
-            const value = await shortcut.record.slot.definition.execute(createCommandContext(operationSnapshot, shortcut.record.slot.owner, Object.freeze([]), resolveDynamicParams(shortcut.params, source), source, Object.freeze([]), interaction, shortcut.record.slot.definition.adapter));
+            const authorSource = bindOperationInput(source, shortcut.record.slot.owner, operationSnapshot);
+            const value = await shortcut.record.slot.definition.execute(createCommandContext(operationSnapshot, shortcut.record.slot.owner, Object.freeze([]), resolveDynamicParams(shortcut.params, authorSource), authorSource, Object.freeze([]), interactionFactory?.(authorSource), shortcut.record.slot.definition.adapter));
             return Object.freeze({
                 matched: true,
                 command: shortcut.record.name,
@@ -160,7 +160,8 @@ export class CommandIndex {
             return Object.freeze({ matched: false });
         }
         const args = textArgs(match.remaining);
-        const value = await match.command.slot.definition.execute(createCommandContext(operationSnapshot, match.command.slot.owner, args, resolveDynamicParams(match.params, source), source, match.remaining, interaction, match.command.slot.definition.adapter));
+        const authorSource = bindOperationInput(source, match.command.slot.owner, operationSnapshot);
+        const value = await match.command.slot.definition.execute(createCommandContext(operationSnapshot, match.command.slot.owner, args, resolveDynamicParams(match.params, authorSource), authorSource, match.remaining, interactionFactory?.(authorSource), match.command.slot.definition.adapter));
         return Object.freeze({
             matched: true,
             command: match.command.name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/command",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "Convention-based Command Feature for Zhin Plugin Runtime",
   "type": "module",
   "main": "./lib/index.js",
@@ -18,10 +18,10 @@
   ],
   "dependencies": {
     "segment-matcher": "^1.0.5",
-    "@zhin.js/feature-kit": "1.1.2",
+    "@zhin.js/feature-kit": "1.1.3",
     "@zhin.js/interaction": "1.1.0",
-    "@zhin.js/permission": "1.1.3",
-    "@zhin.js/plugin-runtime": "1.1.11"
+    "@zhin.js/permission": "1.1.4",
+    "@zhin.js/plugin-runtime": "1.1.12"
   },
   "devDependencies": {
     "@types/node": "^26.1.2",

package/src/command-index.ts

@@ -9,7 +9,7 @@ import type {
   RuntimeSnapshot,
 } from '@zhin.js/plugin-runtime';
 import type { UserInteractionFactory } from '@zhin.js/interaction';
-import { operationClientAdapter } from '@zhin.js/feature-kit';
+import { bindOperationInput, operationClientAdapter } from '@zhin.js/feature-kit';
 import {
   permissionHostToken,
   toPermissionSubject,
@@ -249,7 +249,6 @@ export class CommandIndex {
         });
       }
     }
-    const interaction = interactionFactory?.(source);
     const shortcut = this.#matchShortcut(input);
     if (shortcut) {
       if (!commandAdapterMatches(shortcut.record, source)) {
@@ -258,15 +257,16 @@ export class CommandIndex {
       if (!(await this.#permitAllows(shortcut.record, source, operationSnapshot))) {
         return Object.freeze({ matched: false });
       }
+      const authorSource = bindOperationInput(source, shortcut.record.slot.owner, operationSnapshot);
       const value = await shortcut.record.slot.definition.execute(
         createCommandContext(
           operationSnapshot,
           shortcut.record.slot.owner,
           Object.freeze([]),
-          resolveDynamicParams(shortcut.params, source),
-          source,
+          resolveDynamicParams(shortcut.params, authorSource),
+          authorSource,
           Object.freeze([]),
-          interaction,
+          interactionFactory?.(authorSource),
           shortcut.record.slot.definition.adapter,
         ),
       );
@@ -287,15 +287,16 @@ export class CommandIndex {
       return Object.freeze({ matched: false });
     }
     const args = textArgs(match.remaining);
+    const authorSource = bindOperationInput(source, match.command.slot.owner, operationSnapshot);
     const value = await match.command.slot.definition.execute(
       createCommandContext(
         operationSnapshot,
         match.command.slot.owner,
         args,
-        resolveDynamicParams(match.params, source),
-        source,
+        resolveDynamicParams(match.params, authorSource),
+        authorSource,
         match.remaining,
-        interaction,
+        interactionFactory?.(authorSource),
         match.command.slot.definition.adapter,
       ),
     );