@cloudpss/expression 0.6.0-alpha.9 → 0.6.0-beta.1

package/dist/analyze.d.ts

@@ -1,7 +1,10 @@
-import type { Context } from './context.js';
-import type { ExpressionCache } from './parser.js';
+import { type GlobalReferenceChain } from '@mirascript/mirascript/subtle';
+import type { EvalExpressionCache } from './parser.js';
+import type { Scope } from './scope.js';
+import type { Evaluator } from './main.js';
+export type { GlobalReferenceChain };
 /**
  * 分析依赖
  */
-export declare function analyze(context: Context, expression: ExpressionCache): string[][];
+export declare function analyze(expression: EvalExpressionCache, evaluator: Evaluator, scope: Scope): readonly GlobalReferenceChain[];
 //# sourceMappingURL=analyze.d.ts.map

package/dist/analyze.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"analyze.d.ts","sourceRoot":"","sources":["../src/analyze.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD;;GAEG;AACH,wBAAgB,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,eAAe,GAAG,MAAM,EAAE,EAAE,CAqCjF"}
+{"version":3,"file":"analyze.d.ts","sourceRoot":"","sources":["../src/analyze.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,KAAK,oBAAoB,EAA2B,MAAM,+BAA+B,CAAC;AACrH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAG3C,YAAY,EAAE,oBAAoB,EAAE,CAAC;AACrC;;GAEG;AACH,wBAAgB,OAAO,CACnB,UAAU,EAAE,mBAAmB,EAC/B,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,KAAK,GACb,SAAS,oBAAoB,EAAE,CAUjC"}

package/dist/analyze.js

@@ -1,38 +1,18 @@
+import { DefaultVmContext, analyzeGlobalReferences } from '@mirascript/mirascript/subtle';
+const kAnalyze = Symbol('cloudpss.expression.analyzeCache');
 /**
  * 分析依赖
  */
-export function analyze(context, expression) {
-    // TODO:
-    return [];
-    // if (expression.ast == null) return [];
-    // const deps: string[][] = [];
-    // const analyzeNode = (node: MathNode): string[] | undefined => {
-    //     if (isSymbolNode(node) && node.name) {
-    //         return [node.name];
-    //     }
-    //     if (isAccessorNode(node)) {
-    //         const { index } = node;
-    //         if (index.dimensions.length !== 1 || !isConstantNode(index.dimensions[0])) {
-    //             return undefined;
-    //         }
-    //         const indexValue = index.dimensions[0].value;
-    //         // 暂时不考虑，两边索引 base 不一致
-    //         if (typeof indexValue != 'string' /*&& typeof indexValue != 'number'*/) {
-    //             return undefined;
-    //         }
-    //         const deps = analyzeNode(node.object);
-    //         if (!deps) return undefined;
-    //         return [...deps, indexValue];
-    //     }
-    //     return undefined;
-    // };
-    // const analyzeAndPush = (node: MathNode): void => {
-    //     const dep = analyzeNode(node);
-    //     if (dep) deps.push(dep);
-    //     // eslint-disable-next-line unicorn/no-array-for-each
-    //     else node.forEach(analyzeAndPush);
-    // };
-    // analyzeAndPush(expression.ast);
-    // return deps;
+export function analyze(expression, evaluator, scope) {
+    let result = expression[kAnalyze];
+    if (result == null) {
+        result = analyzeGlobalReferences(expression.source);
+        expression[kAnalyze] = result;
+    }
+    return result.filter(([global]) => {
+        if (scope.has(global))
+            return true;
+        return !(evaluator.imported.has(global) || DefaultVmContext.has(global));
+    });
 }
 //# sourceMappingURL=analyze.js.map

package/dist/analyze.js.map

@@ -1 +1 @@
-{"version":3,"file":"analyze.js","sourceRoot":"","sources":["../src/analyze.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,UAAU,OAAO,CAAC,OAAgB,EAAE,UAA2B;IACjE,QAAQ;IACR,OAAO,EAAE,CAAC;IACV,yCAAyC;IAEzC,+BAA+B;IAE/B,kEAAkE;IAClE,6CAA6C;IAC7C,8BAA8B;IAC9B,QAAQ;IACR,kCAAkC;IAClC,kCAAkC;IAClC,uFAAuF;IACvF,gCAAgC;IAChC,YAAY;IACZ,wDAAwD;IACxD,iCAAiC;IACjC,oFAAoF;IACpF,gCAAgC;IAChC,YAAY;IACZ,iDAAiD;IACjD,uCAAuC;IAEvC,wCAAwC;IACxC,QAAQ;IACR,wBAAwB;IACxB,KAAK;IAEL,qDAAqD;IACrD,qCAAqC;IACrC,+BAA+B;IAC/B,4DAA4D;IAC5D,yCAAyC;IACzC,KAAK;IACL,kCAAkC;IAClC,eAAe;AACnB,CAAC"}
+{"version":3,"file":"analyze.js","sourceRoot":"","sources":["../src/analyze.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAA6B,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAKrH,MAAM,QAAQ,GAAG,MAAM,CAAC,kCAAkC,CAAC,CAAC;AAE5D;;GAEG;AACH,MAAM,UAAU,OAAO,CACnB,UAA+B,EAC/B,SAAoB,EACpB,KAAY;IAEZ,IAAI,MAAM,GAAI,UAAqF,CAAC,QAAQ,CAAC,CAAC;IAC9G,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;QACjB,MAAM,GAAG,uBAAuB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACnD,UAAqF,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;IAC9G,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE;QAC9B,IAAI,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC;YAAE,OAAO,IAAI,CAAC;QACnC,OAAO,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;AACP,CAAC"}

package/dist/definitions/argument.d.ts

@@ -5,29 +5,21 @@ import type { Evaluator } from '../main.js';
 /**
  * 表示一个具有类似表达式功能的 JS 函数，与某个 {@link ArgumentValue} 相关联，在其之后求值
  */
-export type ExpressionFunction<out R, in V extends VmValue = ArgumentValue> = (
+export type ArgumentFunction<out R, in V extends VmValue = ArgumentValue> = (
 /** 相关联的参数值 */
 value: V, 
 /** 当前作用域 */
 scope: Scope, 
 /** 当前求值器 */
 evaluator: Evaluator) => R;
-/**
- * 表示一个具有类似表达式功能的 JS 函数，与某个 {@link ArgumentValue} 相关联，在其之前求值
- */
-export type ParameterFunction<out R> = (
-/** 当前作用域 */
-scope: Scope, 
-/** 当前求值器 */
-evaluator: Evaluator) => R;
 /** 条件表达式 */
 export type ConditionExpression = boolean | ExpressionSource<boolean>;
 /** 条件函数 */
-export type ConditionFunction<in V extends VmValue = ArgumentValue> = ExpressionFunction<boolean, V>;
+export type ConditionFunction<in V extends VmValue = ArgumentValue> = ArgumentFunction<boolean, V>;
 /** 参数值 */
 export type ArgumentValue = NonNullable<VmConst>;
 /** 未求值的参数表 */
 export type ArgumentMap<T extends Record<string, ArgumentValue> = Record<string, ArgumentValue>> = {
-    [K in keyof T & string]?: ExpressionOrValue<NonNullable<T[K]>>;
+    [K in keyof T]?: ExpressionOrValue<NonNullable<T[K]>>;
 };
 //# sourceMappingURL=argument.d.ts.map

package/dist/definitions/argument.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"argument.d.ts","sourceRoot":"","sources":["../../src/definitions/argument.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAC5E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,OAAO,GAAG,aAAa,IAAI;AAC1E,cAAc;AACd,KAAK,EAAE,CAAC;AACR,YAAY;AACZ,KAAK,EAAE,KAAK;AACZ,YAAY;AACZ,SAAS,EAAE,SAAS,KACnB,CAAC,CAAC;AAEP;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,GAAG,CAAC,CAAC,IAAI;AACnC,YAAY;AACZ,KAAK,EAAE,KAAK;AACZ,YAAY;AACZ,SAAS,EAAE,SAAS,KACnB,CAAC,CAAC;AAEP,YAAY;AACZ,MAAM,MAAM,mBAAmB,GAAG,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;AAEtE,WAAW;AACX,MAAM,MAAM,iBAAiB,CAAC,EAAE,CAAC,CAAC,SAAS,OAAO,GAAG,aAAa,IAAI,kBAAkB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;AAErG,UAAU;AACV,MAAM,MAAM,aAAa,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;AAEjD,cAAc;AACd,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,IAAI;KAC9F,CAAC,IAAI,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,EAAE,iBAAiB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACjE,CAAC"}
+{"version":3,"file":"argument.d.ts","sourceRoot":"","sources":["../../src/definitions/argument.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAC5E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,OAAO,GAAG,aAAa,IAAI;AACxE,cAAc;AACd,KAAK,EAAE,CAAC;AACR,YAAY;AACZ,KAAK,EAAE,KAAK;AACZ,YAAY;AACZ,SAAS,EAAE,SAAS,KACnB,CAAC,CAAC;AAEP,YAAY;AACZ,MAAM,MAAM,mBAAmB,GAAG,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;AAEtE,WAAW;AACX,MAAM,MAAM,iBAAiB,CAAC,EAAE,CAAC,CAAC,SAAS,OAAO,GAAG,aAAa,IAAI,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;AAEnG,UAAU;AACV,MAAM,MAAM,aAAa,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;AAEjD,cAAc;AACd,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,IAAI;KAC9F,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,iBAAiB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACxD,CAAC"}

package/dist/definitions/constraint.d.ts

@@ -1,5 +1,5 @@
 import type { VmRecord, VmValue } from '@mirascript/mirascript';
-import type { ArgumentValue, ConditionExpression, ConditionFunction, ExpressionFunction } from './argument.js';
+import type { ArgumentValue, ConditionExpression, ConditionFunction, ArgumentFunction } from './argument.js';
 import type { ExpressionSource } from '../expression.js';
 export declare const ConstraintLevel: readonly ["info", "warning", "error"];
 /** 约束条件的级别 */
@@ -21,7 +21,7 @@ export interface Constraint<V extends VmValue = ArgumentValue> {
     /**
      * 不满足条件的提示附加参数
      */
-    messageData?: ExpressionSource<VmRecord> | VmRecord | ExpressionFunction<VmRecord, V>;
+    messageData?: ExpressionSource<VmRecord> | VmRecord | ArgumentFunction<VmRecord, V>;
     /**
      * 约束条件
      */

package/dist/definitions/constraint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constraint.d.ts","sourceRoot":"","sources":["../../src/definitions/constraint.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAC/G,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,eAAO,MAAM,eAAe,uCAAuD,CAAC;AACpF,cAAc;AACd,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AAE/D,qBAAqB;AACrB,MAAM,WAAW,UAAU,CAAC,CAAC,SAAS,OAAO,GAAG,aAAa;IACzD;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IACvB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB;;OAEG;IACH,WAAW,CAAC,EAAE,gBAAgB,CAAC,QAAQ,CAAC,GAAG,QAAQ,GAAG,kBAAkB,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IACtF;;OAEG;IACH,SAAS,EAAE,mBAAmB,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;CACzD;AAED,uBAAuB;AACvB,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,UAAU,CAehE"}
+{"version":3,"file":"constraint.d.ts","sourceRoot":"","sources":["../../src/definitions/constraint.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC7G,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,eAAO,MAAM,eAAe,uCAAuD,CAAC;AACpF,cAAc;AACd,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AAE/D,qBAAqB;AACrB,MAAM,WAAW,UAAU,CAAC,CAAC,SAAS,OAAO,GAAG,aAAa;IACzD;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IACvB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB;;OAEG;IACH,WAAW,CAAC,EAAE,gBAAgB,CAAC,QAAQ,CAAC,GAAG,QAAQ,GAAG,gBAAgB,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IACpF;;OAEG;IACH,SAAS,EAAE,mBAAmB,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;CACzD;AAED,uBAAuB;AACvB,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,UAAU,CAehE"}

package/dist/definitions/constraint.js

@@ -3,7 +3,7 @@ export const ConstraintLevel = Object.freeze(['info', 'warning', 'error']);
 export function isConstraint(value) {
     if (value == null || typeof value !== 'object')
         return false;
-    if ('key' in value || 'description' in value || 'items' in value)
+    if ('key' in value || 'name' in value || 'description' in value || 'items' in value)
         return false;
     const v = value;
     if (typeof v.message != 'string')

package/dist/definitions/constraint.js.map

@@ -1 +1 @@
-{"version":3,"file":"constraint.js","sourceRoot":"","sources":["../../src/definitions/constraint.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAU,CAAC,CAAC;AA4BpF,uBAAuB;AACvB,MAAM,UAAU,YAAY,CAAC,KAAc;IACvC,IAAI,KAAK,IAAI,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC7D,IAAI,KAAK,IAAI,KAAK,IAAI,aAAa,IAAI,KAAK,IAAI,OAAO,IAAI,KAAK;QAAE,OAAO,KAAK,CAAC;IAE/E,MAAM,CAAC,GAAG,KAAmB,CAAC;IAC9B,IAAI,OAAO,CAAC,CAAC,OAAO,IAAI,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC/C,IAAI,OAAO,CAAC,CAAC,SAAS,IAAI,UAAU,IAAI,OAAO,CAAC,CAAC,SAAS,IAAI,QAAQ;QAAE,OAAO,KAAK,CAAC;IACrF,IACI,CAAC,CAAC,WAAW,IAAI,IAAI;QACrB,OAAO,CAAC,CAAC,WAAW,IAAI,QAAQ;QAChC,OAAO,CAAC,CAAC,WAAW,IAAI,QAAQ;QAChC,OAAO,CAAC,CAAC,WAAW,IAAI,UAAU;QAElC,OAAO,KAAK,CAAC;IACjB,OAAO,IAAI,CAAC;AAChB,CAAC"}
+{"version":3,"file":"constraint.js","sourceRoot":"","sources":["../../src/definitions/constraint.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAU,CAAC,CAAC;AA4BpF,uBAAuB;AACvB,MAAM,UAAU,YAAY,CAAC,KAAc;IACvC,IAAI,KAAK,IAAI,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC7D,IAAI,KAAK,IAAI,KAAK,IAAI,MAAM,IAAI,KAAK,IAAI,aAAa,IAAI,KAAK,IAAI,OAAO,IAAI,KAAK;QAAE,OAAO,KAAK,CAAC;IAElG,MAAM,CAAC,GAAG,KAAmB,CAAC;IAC9B,IAAI,OAAO,CAAC,CAAC,OAAO,IAAI,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC/C,IAAI,OAAO,CAAC,CAAC,SAAS,IAAI,UAAU,IAAI,OAAO,CAAC,CAAC,SAAS,IAAI,QAAQ;QAAE,OAAO,KAAK,CAAC;IACrF,IACI,CAAC,CAAC,WAAW,IAAI,IAAI;QACrB,OAAO,CAAC,CAAC,WAAW,IAAI,QAAQ;QAChC,OAAO,CAAC,CAAC,WAAW,IAAI,QAAQ;QAChC,OAAO,CAAC,CAAC,WAAW,IAAI,UAAU;QAElC,OAAO,KAAK,CAAC;IACjB,OAAO,IAAI,CAAC;AAChB,CAAC"}

package/dist/definitions/parameter-group.js

@@ -3,7 +3,7 @@ export function isParameterDecorationGroup(value) {
     if (value == null || typeof value !== 'object')
         return false;
     const v = value;
-    if ('key' in v || 'name' in v || 'description' in v)
+    if ('key' in v || 'name' in v || 'description' in v || 'value' in v)
         return false;
     return Array.isArray(v.items);
 }
@@ -11,9 +11,9 @@ export function isParameterDecorationGroup(value) {
 export function isParameterGroup(item) {
     if (item == null || typeof item !== 'object')
         return false;
-    const group = item;
-    if ('key' in group)
+    const v = item;
+    if ('key' in v || 'value' in v)
         return false;
-    return typeof group.name === 'string' && typeof group.description === 'string' && Array.isArray(group.items);
+    return typeof v.name === 'string' && typeof v.description === 'string' && Array.isArray(v.items);
 }
 //# sourceMappingURL=parameter-group.js.map

package/dist/definitions/parameter-group.js.map

@@ -1 +1 @@
-{"version":3,"file":"parameter-group.js","sourceRoot":"","sources":["../../src/definitions/parameter-group.ts"],"names":[],"mappings":"AAkBA,gBAAgB;AAChB,MAAM,UAAU,0BAA0B,CAAC,KAAc;IACrD,IAAI,KAAK,IAAI,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC7D,MAAM,CAAC,GAAG,KAAiC,CAAC;IAC5C,IAAI,KAAK,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,IAAI,aAAa,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IAClE,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;AAClC,CAAC;AAgBD,gBAAgB;AAChB,MAAM,UAAU,gBAAgB,CAAC,IAAa;IAC1C,IAAI,IAAI,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC3D,MAAM,KAAK,GAAG,IAAsB,CAAC;IACrC,IAAI,KAAK,IAAI,KAAK;QAAE,OAAO,KAAK,CAAC;IACjC,OAAO,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,KAAK,CAAC,WAAW,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AACjH,CAAC"}
+{"version":3,"file":"parameter-group.js","sourceRoot":"","sources":["../../src/definitions/parameter-group.ts"],"names":[],"mappings":"AAkBA,gBAAgB;AAChB,MAAM,UAAU,0BAA0B,CAAC,KAAc;IACrD,IAAI,KAAK,IAAI,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC7D,MAAM,CAAC,GAAG,KAAiC,CAAC;IAC5C,IAAI,KAAK,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,IAAI,aAAa,IAAI,CAAC,IAAI,OAAO,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IAClF,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;AAClC,CAAC;AAgBD,gBAAgB;AAChB,MAAM,UAAU,gBAAgB,CAAC,IAAa;IAC1C,IAAI,IAAI,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC3D,MAAM,CAAC,GAAG,IAAsB,CAAC;IACjC,IAAI,KAAK,IAAI,CAAC,IAAI,OAAO,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IAC7C,OAAO,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,CAAC,CAAC,WAAW,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;AACrG,CAAC"}

package/dist/definitions/parameter.d.ts

@@ -1,6 +1,6 @@
 import type { VmPrimitive, VmRecord } from '@mirascript/mirascript';
-import type { ExpressionOrValue } from '../expression.js';
-import type { ArgumentMap, ArgumentValue, ConditionExpression, ParameterFunction } from './argument.js';
+import type { ExpressionFunction, ExpressionOrValue } from '../expression.js';
+import type { ArgumentMap, ArgumentValue, ConditionExpression } from './argument.js';
 import type { Constraint } from './constraint.js';
 import type { ParameterDecoration } from './parameter-decoration.js';
 import type { ParameterGroup } from './parameter-group.js';
@@ -58,12 +58,10 @@ export interface IntegerParameter extends NumericParameter<'integer'> {
 }
 /** 可用于选项的值 */
 export type ChoiceArgumentValue = NonNullable<VmPrimitive>;
-/** 表示一个选项 Key，当其值为数字时，默认值为其在数组中的索引 */
-export type ChoiceKey<V extends ChoiceArgumentValue = ChoiceArgumentValue> = V extends number ? number | null : V;
 /** 表示一个选项 */
 export type Choice<V extends ChoiceArgumentValue = ChoiceArgumentValue> = {
-    /** 选中该选项将存储的参数值 */
-    key: ChoiceKey<V>;
+    /** 选中该选项将存储的参数值，默认值为其在数组中的索引 */
+    key: V;
     /** 选项名称 */
     name: string;
     /** 选项详细描述 */
@@ -80,7 +78,7 @@ export interface ChoiceParameter<V extends ChoiceArgumentValue = ChoiceArgumentV
     /**
      * 可选取值及其对应的说明文本
      */
-    choices: ExpressionOrValue<Array<Choice<V>>> | ParameterFunction<ReadonlyArray<Choice<V>>>;
+    choices: ExpressionOrValue<Array<Choice<V>>> | ExpressionFunction<ReadonlyArray<Choice<V>>>;
 }
 /**
  * 表示值为多选选择项的参数定义
@@ -89,7 +87,7 @@ export interface MultiSelectParameter<V extends readonly ChoiceArgumentValue[] =
     /**
      * 可选取值及其对应的说明文本
      */
-    choices: ExpressionOrValue<Array<Choice<V[number]>>> | ParameterFunction<ReadonlyArray<Choice<V[number]>>>;
+    choices: ExpressionOrValue<Array<Choice<V[number]>>> | ExpressionFunction<ReadonlyArray<Choice<V[number]>>>;
 }
 /**
  * 表示值为布尔量的参数定义
@@ -98,7 +96,7 @@ export interface LogicalParameter<V extends ChoiceArgumentValue = ChoiceArgument
     /**
      * 可选取值及其对应的说明文本
      */
-    choices?: ExpressionOrValue<[false: Choice<V>, true: Choice<V>]> | ParameterFunction<readonly [false: Choice<V>, true: Choice<V>]>;
+    choices?: ExpressionOrValue<[false: Choice<V>, true: Choice<V>]> | ExpressionFunction<readonly [false: Choice<V>, true: Choice<V>]>;
 }
 /**
  * 表示值为表格的参数定义
@@ -117,8 +115,12 @@ export interface TableParameter<V extends readonly ArgumentValue[] = readonly Ar
      *
      * 否则，表格参数的值为记录类型数组，每个记录包含各列定义的键值
      */
-    columns: Parameter[] | ParameterFunction<readonly Parameter[]>;
+    columns: Parameter[] | ExpressionFunction<readonly Parameter[]>;
+    /** 添加额外属性以跟踪表格行 */
+    trackTag?: string;
 }
+/** 生成用于跟踪的额外属性值 */
+export declare function generateTrackId(): number;
 /**
  * 表示值为简单记录类型的定义
  *
@@ -184,13 +186,13 @@ export interface ParameterMap {
     /** 整数参数 */
     integer: IntegerParameter;
     /** 选择参数 */
-    choice: ChoiceParameter<ChoiceArgumentValue>;
+    choice: ChoiceParameter;
     /** 多选参数 */
-    multiSelect: MultiSelectParameter<ChoiceArgumentValue[]>;
+    multiSelect: MultiSelectParameter;
     /** 布尔参数 */
-    logical: LogicalParameter<ChoiceArgumentValue>;
+    logical: LogicalParameter;
     /** 表格参数 */
-    table: TableParameter<ArgumentValue[]>;
+    table: TableParameter;
     /** 文本参数 */
     text: TextParameter;
     /** 代码参数 */
@@ -206,6 +208,12 @@ export interface ParameterMap {
 export type ParameterType = keyof ParameterMap;
 /** 已定义的参数类型 */
 export type Parameter = ParameterMap[ParameterType];
+/** 已定义的选择参数类型 */
+export type ChoiceParameterType = {
+    [K in keyof ParameterMap]: ParameterMap[K] extends {
+        choices?: infer _;
+    } ? ParameterMap[K]['type'] : never;
+}[keyof ParameterMap];
 /**
  * 是否为参数定义
  */

package/dist/definitions/parameter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parameter.d.ts","sourceRoot":"","sources":["../../src/definitions/parameter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parameter.d.ts","sourceRoot":"","sources":["../../src/definitions/parameter.ts"],"names":[],"mappings":"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"}

package/dist/definitions/parameter.js

@@ -4,7 +4,16 @@ export function isChoice(value) {
     if (value == null || typeof value != 'object')
         return false;
     const c = value;
-    return typeof c.name === 'string' && typeof c.description == 'string' && !('items' in c) && !('value' in c);
+    return (typeof c.name === 'string' &&
+        typeof c.description == 'string' &&
+        !('items' in c) &&
+        !('value' in c) &&
+        !('span' in c));
+}
+/** 生成用于跟踪的额外属性值 */
+export function generateTrackId() {
+    // 生成 1 ~ 2^31-1 之间的随机整数
+    return Math.trunc(1 + Math.random() * 0x7fff_ffff);
 }
 /**
  * 是否为参数定义

package/dist/definitions/parameter.js.map

@@ -1 +1 @@
-{"version":3,"file":"parameter.js","sourceRoot":"","sources":["../../src/definitions/parameter.ts"],"names":[],"mappings":"AAgCA,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,CAAU,CAAC,CAAC;AAkD9G,YAAY;AACZ,MAAM,UAAU,QAAQ,CAAsD,KAAc;IACxF,IAAI,KAAK,IAAI,IAAI,IAAI,OAAO,KAAK,IAAI,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC5D,MAAM,CAAC,GAAG,KAAkB,CAAC;IAC7B,OAAO,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,CAAC,CAAC,WAAW,IAAI,QAAQ,IAAI,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC;AAChH,CAAC;AA+JD;;GAEG;AACH,MAAM,UAAU,WAAW,CAAC,KAAc;IACtC,IAAI,KAAK,IAAI,IAAI,IAAI,OAAO,KAAK,IAAI,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC5D,MAAM,CAAC,GAAG,KAAkB,CAAC;IAC7B,OAAO,CACH,OAAO,CAAC,CAAC,GAAG,KAAK,QAAQ;QACzB,OAAO,CAAC,CAAC,IAAI,IAAI,QAAQ;QACzB,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC;QACjB,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ;QAC1B,OAAO,CAAC,CAAC,WAAW,IAAI,QAAQ;QAChC,OAAO,IAAI,CAAC,CACf,CAAC;AACN,CAAC"}
+{"version":3,"file":"parameter.js","sourceRoot":"","sources":["../../src/definitions/parameter.ts"],"names":[],"mappings":"AAgCA,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,CAAU,CAAC,CAAC;AA+C9G,YAAY;AACZ,MAAM,UAAU,QAAQ,CAAsD,KAAc;IACxF,IAAI,KAAK,IAAI,IAAI,IAAI,OAAO,KAAK,IAAI,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC5D,MAAM,CAAC,GAAG,KAAkB,CAAC;IAC7B,OAAO,CACH,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ;QAC1B,OAAO,CAAC,CAAC,WAAW,IAAI,QAAQ;QAChC,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC;QACf,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC;QACf,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CACjB,CAAC;AACN,CAAC;AAiED,mBAAmB;AACnB,MAAM,UAAU,eAAe;IAC3B,wBAAwB;IACxB,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,WAAW,CAAC,CAAC;AACvD,CAAC;AA8GD;;GAEG;AACH,MAAM,UAAU,WAAW,CAAC,KAAc;IACtC,IAAI,KAAK,IAAI,IAAI,IAAI,OAAO,KAAK,IAAI,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC5D,MAAM,CAAC,GAAG,KAAkB,CAAC;IAC7B,OAAO,CACH,OAAO,CAAC,CAAC,GAAG,KAAK,QAAQ;QACzB,OAAO,CAAC,CAAC,IAAI,IAAI,QAAQ;QACzB,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC;QACjB,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ;QAC1B,OAAO,CAAC,CAAC,WAAW,IAAI,QAAQ;QAChC,OAAO,IAAI,CAAC,CACf,CAAC;AACN,CAAC"}

package/dist/definitions/utils.d.ts

@@ -0,0 +1,28 @@
+import { type VmValue } from '@mirascript/mirascript';
+import type { ChoiceParameterType, Parameter, ParameterMap } from './parameter.js';
+import { TypeInfo } from '../type.js';
+import type { ArgumentMap, ArgumentValue } from './argument.js';
+import type { ParameterGroup } from './parameter-group.js';
+/** 转换参数类型 */
+export type ArgumentConverter<out R extends ArgumentValue = ArgumentValue> = <const D = undefined>(value: VmValue | null | undefined, defaults?: D) => R | Exclude<D, undefined>;
+/**
+ * 通过枚举参数定义推测枚举类型
+ */
+export declare function choiceParameterType(definition: Pick<ParameterMap[ChoiceParameterType], 'type' | 'value' | 'choices'>): TypeInfo;
+/** 是否为枚举值类型 */
+export declare function isChoiceValue(value: unknown): value is ChoiceParameterType;
+/** 转换推测参数类型，不回退到 {@link Parameter.value} 提供的默认值 */
+export declare function argumentConverter(definition: Parameter): ArgumentConverter;
+/**
+ * 转换参数值的类型，不回退到 {@link Parameter.value} 提供的默认值
+ * 转换失败时返回 null
+ */
+export declare function toArgumentValue(value: VmValue | null | undefined, definition: Parameter): ArgumentValue | null;
+/** 参数定义数组 */
+type ParameterDefinitions = ReadonlyArray<Pick<ParameterGroup, 'items'>>;
+/** 查找指定参数 */
+export declare function findParameter(definition: ParameterDefinitions | undefined, key: string): Parameter | undefined;
+/** 获取参数默认值，修复现有的参数，填充缺失的参数，删除未定义的参数 */
+export declare function fillArgumentMap<T extends Record<string, ArgumentValue>>(definition: ParameterDefinitions | undefined, args?: ArgumentMap<T> | null): ArgumentMap<T>;
+export {};
+//# sourceMappingURL=utils.d.ts.map

package/dist/definitions/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/definitions/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAiE,KAAK,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAErH,OAAO,KAAK,EAAE,mBAAmB,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnF,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAG3D,aAAa;AACb,MAAM,MAAM,iBAAiB,CAAC,GAAG,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,SAAS,EAC7F,KAAK,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,EACjC,QAAQ,CAAC,EAAE,CAAC,KACX,CAAC,GAAG,OAAO,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;AAS/B;;GAEG;AACH,wBAAgB,mBAAmB,CAC/B,UAAU,EAAE,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC,GAClF,QAAQ,CA2BV;AAED,eAAe;AACf,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,mBAAmB,CAE1E;AAmFD,mDAAmD;AACnD,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,SAAS,GAAG,iBAAiB,CAkD1E;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,EAAE,UAAU,EAAE,SAAS,GAAG,aAAa,GAAG,IAAI,CAG9G;AAED,aAAa;AACb,KAAK,oBAAoB,GAAG,aAAa,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC;AAgBzE,aAAa;AACb,wBAAgB,aAAa,CAAC,UAAU,EAAE,oBAAoB,GAAG,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAQ9G;AAED,uCAAuC;AACvC,wBAAgB,eAAe,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,EACnE,UAAU,EAAE,oBAAoB,GAAG,SAAS,EAC5C,IAAI,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI,GAC7B,WAAW,CAAC,CAAC,CAAC,CAmDhB"}