@zhin.js/command 1.1.3 → 1.1.5

package/lib/command-index.d.ts

@@ -32,8 +32,8 @@ export declare class CommandIndex {
     constructor(slots: readonly Readonly<CapabilitySlot<CommandDefinition>>[], snapshot: RuntimeSnapshot, menu?: CommandMenuConfig);
     list(): readonly CommandDescriptor[];
     has(name: string): boolean;
-    execute(name: string, args?: readonly string[]): Promise<unknown>;
-    dispatch(input: CommandMatchInput, source?: unknown, interactionFactory?: UserInteractionFactory, commandPrefix?: string): Promise<CommandDispatchResult>;
+    execute(name: string, args?: readonly string[], operationSnapshot?: RuntimeSnapshot): Promise<unknown>;
+    dispatch(input: CommandMatchInput, source?: unknown, interactionFactory?: UserInteractionFactory, commandPrefix?: string, operationSnapshot?: RuntimeSnapshot): Promise<CommandDispatchResult>;
 }
 export declare function isCommandIndex(value: unknown): value is CommandIndex;
 export declare class CommandParameterValueError extends TypeError {

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 = {
@@ -112,37 +112,37 @@ export class CommandIndex {
             throw error;
         }
     }
-    async execute(name, args = []) {
+    async execute(name, args = [], operationSnapshot = this.snapshot) {
         const match = this.#match(name, true);
         if (!match) {
             this.#diagnoseParameter(name);
             throw new Error(`Unknown Command: ${name}`);
         }
         // Host / 无 session：跳过 permit；无 source 时函数默认值得到空 session。
-        return match.command.slot.definition.execute(createCommandContext(this.snapshot, match.command.slot.owner, args, resolveDynamicParams(match.params, undefined), undefined, Object.freeze([]), undefined, match.command.slot.definition.adapter));
+        return match.command.slot.definition.execute(createCommandContext(operationSnapshot, match.command.slot.owner, args, resolveDynamicParams(match.params, undefined), undefined, Object.freeze([]), undefined, match.command.slot.definition.adapter));
     }
-    async dispatch(input, source = undefined, interactionFactory, commandPrefix = '') {
+    async dispatch(input, source = undefined, interactionFactory, commandPrefix = '', operationSnapshot = this.snapshot) {
         if (this.#menu) {
             const menuValue = this.#dispatchMenu(input, commandPrefix);
             if (menuValue !== undefined) {
                 return Object.freeze({
                     matched: true,
                     command: this.#menu.keyword,
-                    owner: this.snapshot.root,
+                    owner: operationSnapshot.root,
                     value: menuValue,
                 });
             }
         }
-        const interaction = interactionFactory?.(source);
         const shortcut = this.#matchShortcut(input);
         if (shortcut) {
             if (!commandAdapterMatches(shortcut.record, source)) {
                 return Object.freeze({ matched: false });
             }
-            if (!(await this.#permitAllows(shortcut.record, source))) {
+            if (!(await this.#permitAllows(shortcut.record, source, operationSnapshot))) {
                 return Object.freeze({ matched: false });
             }
-            const value = await shortcut.record.slot.definition.execute(createCommandContext(this.snapshot, 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,
@@ -156,11 +156,12 @@ export class CommandIndex {
         if (!commandAdapterMatches(match.command, source)) {
             return Object.freeze({ matched: false });
         }
-        if (!(await this.#permitAllows(match.command, source))) {
+        if (!(await this.#permitAllows(match.command, source, operationSnapshot))) {
             return Object.freeze({ matched: false });
         }
         const args = textArgs(match.remaining);
-        const value = await match.command.slot.definition.execute(createCommandContext(this.snapshot, 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,
@@ -168,21 +169,21 @@ export class CommandIndex {
             value,
         });
     }
-    async #permitAllows(record, source) {
+    async #permitAllows(record, source, operationSnapshot) {
         const permits = record.permit;
         if (!permits || permits.length === 0)
             return true;
         if (!hasImSession(source))
             return true;
-        const host = this.#resolveHost();
+        const host = this.#resolveHost(operationSnapshot);
         if (!host)
             return false;
         const subject = toPermissionSubject(resolveCommandSession(source));
         return host.checkAll(permits, subject);
     }
-    #resolveHost() {
+    #resolveHost(operationSnapshot) {
         try {
-            const resources = this.snapshot.resources.get(this.snapshot.root);
+            const resources = operationSnapshot.resources.get(operationSnapshot.root);
             if (!resources)
                 return undefined;
             const host = resources.get(permissionHostToken.id);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/command",
-  "version": "1.1.3",
+  "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,
@@ -210,7 +210,7 @@ export class CommandIndex {
     }
   }
 
-  async execute(name: string, args: readonly string[] = []): Promise<unknown> {
+  async execute(name: string, args: readonly string[] = [], operationSnapshot: RuntimeSnapshot = this.snapshot): Promise<unknown> {
     const match = this.#match(name, true);
     if (!match) {
       this.#diagnoseParameter(name);
@@ -219,7 +219,7 @@ export class CommandIndex {
     // Host / 无 session：跳过 permit；无 source 时函数默认值得到空 session。
     return match.command.slot.definition.execute(
       createCommandContext(
-        this.snapshot,
+        operationSnapshot,
         match.command.slot.owner,
         args,
         resolveDynamicParams(match.params, undefined),
@@ -236,6 +236,7 @@ export class CommandIndex {
     source: unknown = undefined,
     interactionFactory?: UserInteractionFactory,
     commandPrefix = '',
+    operationSnapshot: RuntimeSnapshot = this.snapshot,
   ): Promise<CommandDispatchResult> {
     if (this.#menu) {
       const menuValue = this.#dispatchMenu(input, commandPrefix);
@@ -243,29 +244,29 @@ export class CommandIndex {
         return Object.freeze({
           matched: true,
           command: this.#menu.keyword,
-          owner: this.snapshot.root,
+          owner: operationSnapshot.root,
           value: menuValue,
         });
       }
     }
-    const interaction = interactionFactory?.(source);
     const shortcut = this.#matchShortcut(input);
     if (shortcut) {
       if (!commandAdapterMatches(shortcut.record, source)) {
         return Object.freeze({ matched: false });
       }
-      if (!(await this.#permitAllows(shortcut.record, source))) {
+      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(
-          this.snapshot,
+          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,
         ),
       );
@@ -282,19 +283,20 @@ export class CommandIndex {
     if (!commandAdapterMatches(match.command, source)) {
       return Object.freeze({ matched: false });
     }
-    if (!(await this.#permitAllows(match.command, source))) {
+    if (!(await this.#permitAllows(match.command, source, operationSnapshot))) {
       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(
-        this.snapshot,
+        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,
       ),
     );
@@ -306,19 +308,19 @@ export class CommandIndex {
     });
   }
 
-  async #permitAllows(record: CommandRecord, source: unknown): Promise<boolean> {
+  async #permitAllows(record: CommandRecord, source: unknown, operationSnapshot: RuntimeSnapshot): Promise<boolean> {
     const permits = record.permit;
     if (!permits || permits.length === 0) return true;
     if (!hasImSession(source)) return true;
-    const host = this.#resolveHost();
+    const host = this.#resolveHost(operationSnapshot);
     if (!host) return false;
     const subject = toPermissionSubject(resolveCommandSession(source));
     return host.checkAll(permits, subject);
   }
 
-  #resolveHost(): PermissionHost | undefined {
+  #resolveHost(operationSnapshot: RuntimeSnapshot): PermissionHost | undefined {
     try {
-      const resources = this.snapshot.resources.get(this.snapshot.root);
+      const resources = operationSnapshot.resources.get(operationSnapshot.root);
       if (!resources) return undefined;
       const host = resources.get(permissionHostToken.id);
       return host && typeof (host as PermissionHost).check === 'function'