@cloudpss/expression 0.6.0-alpha.1 → 0.6.0-alpha.11

package/dist/type.js

@@ -1,9 +1,12 @@
 import { lib } from '@mirascript/mirascript/subtle';
+const { to_string, to_number, to_boolean } = lib;
 const x = 'boolean';
 x;
 /** 类型信息 */
-export const TypeInfo = {
-    parse: (type) => {
+export var TypeInfo;
+(function (TypeInfo) {
+    /** 解析类型 */
+    function parse(type) {
         if (type === 's' || type === 'string')
             return 'string';
         if (type === 'f' || type === 'number')
@@ -11,8 +14,10 @@ export const TypeInfo = {
         if (type === 'b' || type === 'boolean')
             return 'boolean';
         throw new TypeError(`Invalid type '${String(type)}'`);
-    },
-    is: (value, type) => {
+    }
+    TypeInfo.parse = parse;
+    /** 判断类型 */
+    function is(value, type) {
         switch (type) {
             case 'b':
             case 'boolean':
@@ -27,24 +32,43 @@ export const TypeInfo = {
                 (type);
                 return false;
         }
-    },
-    to: (value, type) => {
+    }
+    TypeInfo.is = is;
+    /** 转换类型 */
+    function to(value, type) {
+        value ??= null;
         if (!type)
             return value;
         switch (type) {
             case 'b':
             case 'boolean':
-                return lib.to_boolean(value);
+                return toBoolean(value);
             case 'f':
             case 'number':
-                return lib.to_number(value);
+                return toNumber(value);
             case 's':
             case 'string':
-                return lib.to_string(value);
+                return toString(value);
             default:
                 (type);
                 return value;
         }
-    },
-};
+    }
+    TypeInfo.to = to;
+    /** 转换为字符串 */
+    function toString(value) {
+        return to_string(value ?? null);
+    }
+    TypeInfo.toString = toString;
+    /** 转换为数字 */
+    function toNumber(value) {
+        return to_number(value ?? null);
+    }
+    TypeInfo.toNumber = toNumber;
+    /** 转换为布尔值 */
+    function toBoolean(value) {
+        return to_boolean(value ?? null);
+    }
+    TypeInfo.toBoolean = toBoolean;
+})(TypeInfo || (TypeInfo = {}));
 //# sourceMappingURL=type.js.map

package/dist/type.js.map

@@ -1 +1 @@
-{"version":3,"file":"type.js","sourceRoot":"","sources":["../src/type.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAC;AAKpD,MAAM,CAAC,GAAa,SAAS,CAAC;AAC9B,CAAoB,CAAC;AAerB,WAAW;AACX,MAAM,CAAC,MAAM,QAAQ,GAAG;IACpB,KAAK,EAAE,CAAC,IAA2B,EAAY,EAAE;QAC7C,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,QAAQ;YAAE,OAAO,QAAQ,CAAC;QACvD,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,QAAQ;YAAE,OAAO,QAAQ,CAAC;QACvD,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QACzD,MAAM,IAAI,SAAS,CAAC,iBAAiB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1D,CAAC;IACD,EAAE,EAAE,CAAkC,KAA0B,EAAE,IAAO,EAAwB,EAAE;QAC/F,QAAQ,IAAI,EAAE,CAAC;YACX,KAAK,GAAG,CAAC;YACT,KAAK,SAAS;gBACV,OAAO,OAAO,KAAK,KAAK,SAAS,CAAC;YACtC,KAAK,GAAG,CAAC;YACT,KAAK,QAAQ;gBACT,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC;YACrC,KAAK,GAAG,CAAC;YACT,KAAK,QAAQ;gBACT,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC;YACrC;gBACI,CAAC,IAAI,CAAiB,CAAC;gBACvB,OAAO,KAAK,CAAC;QACrB,CAAC;IACL,CAAC;IACD,EAAE,EAAE,CAAkC,KAA0B,EAAE,IAAO,EAAe,EAAE;QAGtF,IAAI,CAAC,IAAI;YAAE,OAAO,KAAU,CAAC;QAC7B,QAAQ,IAAI,EAAE,CAAC;YACX,KAAK,GAAG,CAAC;YACT,KAAK,SAAS;gBACV,OAAO,GAAG,CAAC,UAAU,CAAC,KAAK,CAAM,CAAC;YACtC,KAAK,GAAG,CAAC;YACT,KAAK,QAAQ;gBACT,OAAO,GAAG,CAAC,SAAS,CAAC,KAAK,CAAM,CAAC;YACrC,KAAK,GAAG,CAAC;YACT,KAAK,QAAQ;gBACT,OAAO,GAAG,CAAC,SAAS,CAAC,KAAK,CAAM,CAAC;YACrC;gBACI,CAAC,IAAI,CAAiB,CAAC;gBACvB,OAAO,KAAU,CAAC;QAC1B,CAAC;IACL,CAAC;CACJ,CAAC"}
+{"version":3,"file":"type.js","sourceRoot":"","sources":["../src/type.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAC;AACpD,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC;AAKjD,MAAM,CAAC,GAAa,SAAS,CAAC;AAC9B,CAAoB,CAAC;AAerB,WAAW;AACX,MAAM,KAAW,QAAQ,CA8DxB;AA9DD,WAAiB,QAAQ;IACrB,WAAW;IACX,SAAgB,KAAK,CAAC,IAA2B;QAC7C,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,QAAQ;YAAE,OAAO,QAAQ,CAAC;QACvD,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,QAAQ;YAAE,OAAO,QAAQ,CAAC;QACvD,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QACzD,MAAM,IAAI,SAAS,CAAC,iBAAiB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1D,CAAC;IALe,cAAK,QAKpB,CAAA;IACD,WAAW;IACX,SAAgB,EAAE,CAAkC,KAA0B,EAAE,IAAO;QACnF,QAAQ,IAAI,EAAE,CAAC;YACX,KAAK,GAAG,CAAC;YACT,KAAK,SAAS;gBACV,OAAO,OAAO,KAAK,KAAK,SAAS,CAAC;YACtC,KAAK,GAAG,CAAC;YACT,KAAK,QAAQ;gBACT,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC;YACrC,KAAK,GAAG,CAAC;YACT,KAAK,QAAQ;gBACT,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC;YACrC;gBACI,CAAC,IAAI,CAAiB,CAAC;gBACvB,OAAO,KAAK,CAAC;QACrB,CAAC;IACL,CAAC;IAfe,WAAE,KAejB,CAAA;IAED,WAAW;IACX,SAAgB,EAAE,CAAkC,KAA0B,EAAE,IAAO;QAGnF,KAAK,KAAK,IAAI,CAAC;QACf,IAAI,CAAC,IAAI;YAAE,OAAO,KAAU,CAAC;QAC7B,QAAQ,IAAI,EAAE,CAAC;YACX,KAAK,GAAG,CAAC;YACT,KAAK,SAAS;gBACV,OAAO,SAAS,CAAC,KAAK,CAAM,CAAC;YACjC,KAAK,GAAG,CAAC;YACT,KAAK,QAAQ;gBACT,OAAO,QAAQ,CAAC,KAAK,CAAM,CAAC;YAChC,KAAK,GAAG,CAAC;YACT,KAAK,QAAQ;gBACT,OAAO,QAAQ,CAAC,KAAK,CAAM,CAAC;YAChC;gBACI,CAAC,IAAI,CAAiB,CAAC;gBACvB,OAAO,KAAU,CAAC;QAC1B,CAAC;IACL,CAAC;IAnBe,WAAE,KAmBjB,CAAA;IAED,aAAa;IACb,SAAgB,QAAQ,CAAC,KAA0B;QAC/C,OAAO,SAAS,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC;IACpC,CAAC;IAFe,iBAAQ,WAEvB,CAAA;IAED,YAAY;IACZ,SAAgB,QAAQ,CAAC,KAA0B;QAC/C,OAAO,SAAS,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC;IACpC,CAAC;IAFe,iBAAQ,WAEvB,CAAA;IAED,aAAa;IACb,SAAgB,SAAS,CAAC,KAA0B;QAChD,OAAO,UAAU,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC;IACrC,CAAC;IAFe,kBAAS,YAExB,CAAA;AACL,CAAC,EA9DgB,QAAQ,KAAR,QAAQ,QA8DxB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudpss/expression",
-  "version": "0.6.0-alpha.1",
+  "version": "0.6.0-alpha.11",
   "author": "CloudPSS",
   "license": "MIT",
   "type": "module",
@@ -12,11 +12,14 @@
     "./*": "./dist/*.js"
   },
   "dependencies": {
-    "@mirascript/mirascript": "^0.0.17",
+    "@mirascript/mirascript": "^0.1.9",
     "klona": "^2.0.6",
     "lru-cache": "^11.2.2",
-    "mathjs": "^14.7.0",
-    "type-fest": "^5.0.1"
+    "mathjs": "^15.1.0",
+    "type-fest": "^5.2.0"
+  },
+  "devDependencies": {
+    "dedent": "^1.7.0"
   },
   "scripts": {
     "build": "pnpm clean && tsc --build --force",

package/src/analyze.ts

@@ -1,44 +1,84 @@
-import type { Context } from './context.js';
-import type { ExpressionCache } from './parser.js';
+import {
+    parseDiagnostics,
+    generateBytecodeSync,
+    DiagnosticCode,
+    DefaultVmContext,
+} from '@mirascript/mirascript/subtle';
+import type { TranspileOptions } from '@mirascript/mirascript';
+import type { EvalExpressionCache } from './parser.js';
+import type { Scope } from './scope.js';
+import type { Evaluator } from './main.js';
+
+/** 一个访问链，第一个元素为变量名称 */
+export type AccessChain = readonly [string, ...ReadonlyArray<string | number>];
+
+const config: TranspileOptions = Object.freeze({
+    input_mode: 'Script',
+    diagnostic_position_encoding: 'Utf16',
+    diagnostic_error: false,
+    diagnostic_warning: false,
+    diagnostic_info: false,
+    diagnostic_hint: false,
+    diagnostic_reference: false,
+    diagnostic_tag: true,
+    trivia: false,
+} satisfies TranspileOptions);
 
 /**
  * 分析依赖
  */
-export function analyze(context: Context, expression: ExpressionCache): string[][] {
-    // 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;
+function analyzeImpl(expression: string): readonly AccessChain[] {
+    if (expression.trim() === '') {
+        return [];
+    }
+    const [code, diagnostics] = generateBytecodeSync(expression, config);
+    if (code == null || diagnostics.length === 0) {
+        return [];
+    }
+    const parsedDiagnostics = parseDiagnostics(expression, diagnostics);
+    const globals = parsedDiagnostics.tags.filter((t) => t.code === DiagnosticCode.GlobalVariable);
+    if (globals.length === 0) {
+        return [];
+    }
+    const lines = expression.split(/\r?\n/);
+    const result = new Set<string>();
+    for (const global of globals) {
+        // 分析每个全局变量访问
+        const line = lines[global.range.startLineNumber - 1];
+        if (!line) continue;
+        const access = line.slice(global.range.startColumn - 1);
+        const chain =
+            /^((?:@+|\$+|[a-zA-Z_])[a-zA-Z0-9_]*)(?:\s*!?\.\s*(?:\d+|(?:@+|\$+|[a-zA-Z_])[a-zA-Z0-9_]*))*/.exec(access);
+        if (chain == null) continue;
+        const globalName = chain[1];
+        if (globalName?.length !== global.range.endColumn - global.range.startColumn) continue;
+        const chainStr = chain[0].split(/\s*!?\.\s*/).join('.');
+        result.add(chainStr);
+    }
+    const accessChains: AccessChain[] = [];
+    for (const chainStr of result) {
+        const parts = chainStr.split('.').map((part) => {
+            const num = Number.parseInt(part, 10);
+            return Number.isNaN(num) ? part : num;
+        });
+        accessChains.push(parts as unknown as AccessChain);
+    }
+    return accessChains;
+}
 
-    //         return [...deps, indexValue];
-    //     }
-    //     return undefined;
-    // };
+const kAnalyze = Symbol('cloudpss.expression.analyzeCache');
 
-    // 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: EvalExpressionCache, evaluator: Evaluator, scope: Scope): readonly AccessChain[] {
+    let result = (expression as EvalExpressionCache & { [kAnalyze]?: readonly AccessChain[] })[kAnalyze];
+    if (result == null) {
+        result = analyzeImpl(expression.source);
+        (expression as EvalExpressionCache & { [kAnalyze]?: readonly AccessChain[] })[kAnalyze] = result;
+    }
+    return result.filter(([global]) => {
+        if (scope.has(global)) return true;
+        return !(evaluator.imported.has(global) || DefaultVmContext.has(global));
+    });
 }

package/src/definitions/argument.ts

@@ -6,7 +6,7 @@ import type { Evaluator } from '../main.js';
 /**
  * 表示一个具有类似表达式功能的 JS 函数，与某个 {@link ArgumentValue} 相关联，在其之后求值
  */
-export type ExpressionFunction<R, V extends VmValue = ArgumentValue> = (
+export type ArgumentFunction<out R, in V extends VmValue = ArgumentValue> = (
     /** 相关联的参数值 */
     value: V,
     /** 当前作用域 */
@@ -15,21 +15,11 @@ export type ExpressionFunction<R, V extends VmValue = ArgumentValue> = (
     evaluator: Evaluator,
 ) => R;
 
-/**
- * 表示一个具有类似表达式功能的 JS 函数，与某个 {@link ArgumentValue} 相关联，在其之前求值
- */
-export type ParameterFunction<R> = (
-    /** 当前作用域 */
-    scope: Scope,
-    /** 当前求值器 */
-    evaluator: Evaluator,
-) => R;
-
 /** 条件表达式 */
 export type ConditionExpression = boolean | ExpressionSource<boolean>;
 
 /** 条件函数 */
-export type ConditionFunction<V extends VmValue = ArgumentValue> = ExpressionFunction<boolean, V>;
+export type ConditionFunction<in V extends VmValue = ArgumentValue> = ArgumentFunction<boolean, V>;
 
 /** 参数值 */
 export type ArgumentValue = NonNullable<VmConst>;

package/src/definitions/constraint.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 const ConstraintLevel = Object.freeze(['info', 'warning', 'error'] as const);
@@ -23,7 +23,7 @@ export interface Constraint<V extends VmValue = ArgumentValue> {
     /**
      * 不满足条件的提示附加参数
      */
-    messageData?: ExpressionSource<VmRecord> | VmRecord | ExpressionFunction<VmRecord, V>;
+    messageData?: ExpressionSource<VmRecord> | VmRecord | ArgumentFunction<VmRecord, V>;
     /**
      * 约束条件
      */
@@ -33,7 +33,7 @@ export interface Constraint<V extends VmValue = ArgumentValue> {
 /** 检查是否为 Constraint */
 export function isConstraint(value: unknown): value is Constraint {
     if (value == null || typeof value !== 'object') return false;
-    if ('key' in value || 'description' in value) return false;
+    if ('key' in value || 'name' in value || 'description' in value || 'items' in value) return false;
 
     const v = value as Constraint;
     if (typeof v.message != 'string') return false;

package/src/definitions/parameter-decoration.ts

@@ -22,8 +22,10 @@ export interface ParameterDecorationMap {
     label: ParameterLabelDecoration;
 }
 
+/** 参数界面装饰 type */
+export type ParameterDecorationType = keyof ParameterDecorationMap;
 /** 参数界面装饰 */
-export type ParameterDecoration = ParameterDecorationMap[keyof ParameterDecorationMap];
+export type ParameterDecoration = ParameterDecorationMap[ParameterDecorationType];
 
 /** 是否为参数界面装饰 */
 export function isParameterDecoration(value: unknown): value is ParameterDecoration {
@@ -32,11 +34,3 @@ export function isParameterDecoration(value: unknown): value is ParameterDecorat
     if ('key' in v || 'name' in v || 'description' in v) return false;
     return typeof v.type == 'string' && v.type.length > 0;
 }
-
-/** 创建参数界面装饰 */
-export function ParameterDecoration(): ParameterLabelDecoration {
-    return {
-        type: 'label',
-        label: '',
-    };
-}

package/src/definitions/parameter-group.ts

@@ -16,18 +16,11 @@ export interface ParameterDecorationGroup extends ParameterGroupBase {
     items: ParameterDecoration[];
 }
 
-/** 创建装饰分组 */
-export function ParameterDecorationGroup(): ParameterDecorationGroup {
-    return {
-        items: [],
-    };
-}
-
 /** 判断是否为装饰分组 */
 export function isParameterDecorationGroup(value: unknown): value is ParameterDecorationGroup {
     if (value == null || typeof value !== 'object') return false;
     const v = value as ParameterDecorationGroup;
-    if ('key' in v || 'name' in v || 'description' in v) return false;
+    if ('key' in v || 'name' in v || 'description' in v || 'value' in v) return false;
     return Array.isArray(v.items);
 }
 
@@ -45,18 +38,10 @@ export interface ParameterGroup extends ParameterGroupBase {
     after?: ParameterDecorationGroup;
 }
 
-/** 创建参数分组 */
-export function ParameterGroup(): ParameterGroup {
-    return {
-        name: '',
-        description: '',
-        items: [],
-    };
-}
-
 /** 判断是否为参数分组 */
 export function isParameterGroup(item: unknown): item is ParameterGroup {
     if (item == null || typeof item !== 'object') return false;
-    const group = item as ParameterGroup;
-    return typeof group.name === 'string' && typeof group.description === 'string' && Array.isArray(group.items);
+    const v = item as ParameterGroup;
+    if ('key' in v || 'value' in v) return false;
+    return typeof v.name === 'string' && typeof v.description === 'string' && Array.isArray(v.items);
 }

package/src/definitions/parameter.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';
@@ -65,13 +65,10 @@ export interface IntegerParameter extends NumericParameter<'integer'> {}
 /** 可用于选项的值 */
 export type ChoiceArgumentValue = NonNullable<VmPrimitive>;
 
-/** 表示一个选项 Key，当其值为数字时，默认值为其在数组中的索引 */
-type ChoiceKey<V extends ChoiceArgumentValue> = V extends number ? number | null : V;
-
 /** 表示一个选项 */
-export type Choice<V extends ChoiceArgumentValue> = {
-    /** 选中该选项将存储的参数值 */
-    key: ChoiceKey<V>;
+export type Choice<V extends ChoiceArgumentValue = ChoiceArgumentValue> = {
+    /** 选中该选项将存储的参数值，默认值为其在数组中的索引 */
+    key: V;
     /** 选项名称 */
     name: string;
     /** 选项详细描述 */
@@ -81,64 +78,56 @@ export type Choice<V extends ChoiceArgumentValue> = {
 };
 
 /** 是否为选项 */
-export function isChoice<V extends NonNullable<VmPrimitive>>(value: unknown): value is Choice<V> {
+export function isChoice<V extends ChoiceArgumentValue = ChoiceArgumentValue>(value: unknown): value is Choice<V> {
     if (value == null || typeof value != 'object') return false;
     const c = value as Choice<V>;
-    return typeof c.name === 'string' && typeof c.description == 'string' && !('items' in c) && !('value' in c);
-}
-/** 创建数值选项 */
-export function Choice(key?: ChoiceKey<number>): Choice<number>;
-/** 创建布尔选项 */
-export function Choice(key: ChoiceKey<boolean>): Choice<boolean>;
-/** 创建字符串选项 */
-export function Choice(key: ChoiceKey<string>): Choice<string>;
-/** 创建选项 */
-export function Choice<V extends NonNullable<VmPrimitive> = number>(key: ChoiceKey<V>): Choice<V>;
-/** 创建选项 */
-export function Choice<V extends NonNullable<VmPrimitive> = number>(key: ChoiceKey<V>): Choice<V> {
-    return {
-        key: key ?? (null as never),
-        name: '',
-        description: '',
-    };
+    return (
+        typeof c.name === 'string' &&
+        typeof c.description == 'string' &&
+        !('items' in c) &&
+        !('value' in c) &&
+        !('span' in c)
+    );
 }
-
 /**
  * 表示值为选择项的参数定义
  */
-export interface ChoiceParameter<V extends ChoiceArgumentValue> extends ParameterBase<'choice', V> {
+export interface ChoiceParameter<V extends ChoiceArgumentValue = ChoiceArgumentValue>
+    extends ParameterBase<'choice', V> {
     /**
      * 可选取值及其对应的说明文本
      */
-    choices: ExpressionOrValue<Array<Choice<V>>> | ParameterFunction<Array<Choice<V>>>;
+    choices: ExpressionOrValue<Array<Choice<V>>> | ExpressionFunction<ReadonlyArray<Choice<V>>>;
 }
 /**
  * 表示值为多选选择项的参数定义
  */
-export interface MultiSelectParameter<V extends readonly ChoiceArgumentValue[]>
+export interface MultiSelectParameter<V extends readonly ChoiceArgumentValue[] = readonly ChoiceArgumentValue[]>
     extends ParameterBase<'multiSelect', V> {
     /**
      * 可选取值及其对应的说明文本
      */
-    choices: ExpressionOrValue<Array<Choice<V[number]>>> | ParameterFunction<Array<Choice<V[number]>>>;
+    choices: ExpressionOrValue<Array<Choice<V[number]>>> | ExpressionFunction<ReadonlyArray<Choice<V[number]>>>;
 }
 
 /**
  * 表示值为布尔量的参数定义
  */
-export interface LogicalParameter<V extends ChoiceArgumentValue> extends ParameterBase<'logical', V> {
+export interface LogicalParameter<V extends ChoiceArgumentValue = ChoiceArgumentValue>
+    extends ParameterBase<'logical', V> {
     /**
      * 可选取值及其对应的说明文本
      */
     choices?:
         | ExpressionOrValue<[false: Choice<V>, true: Choice<V>]>
-        | ParameterFunction<[false: Choice<V>, true: Choice<V>]>;
+        | ExpressionFunction<readonly [false: Choice<V>, true: Choice<V>]>;
 }
 
 /**
  * 表示值为表格的参数定义
  */
-export interface TableParameter<V extends readonly ArgumentValue[]> extends ParameterBase<'table', V> {
+export interface TableParameter<V extends readonly ArgumentValue[] = readonly ArgumentValue[]>
+    extends ParameterBase<'table', V> {
     /** 最小行数 */
     minRowCount?: number;
     /** 最大行数 */
@@ -152,7 +141,15 @@ export interface TableParameter<V extends readonly ArgumentValue[]> extends Para
      *
      * 否则，表格参数的值为记录类型数组，每个记录包含各列定义的键值
      */
-    columns: Parameter[] | ParameterFunction<Parameter[]>;
+    columns: Parameter[] | ExpressionFunction<readonly Parameter[]>;
+    /** 添加额外属性以跟踪表格行 */
+    trackTag?: string;
+}
+
+/** 生成用于跟踪的额外属性值 */
+export function generateTrackId(): number {
+    // 生成 1 ~ 2^31-1 之间的随机整数
+    return Math.trunc(1 + Math.random() * 0x7fff_ffff);
 }
 
 /**
@@ -162,7 +159,7 @@ export interface TableParameter<V extends readonly ArgumentValue[]> extends Para
  *
  * 字段中可包含占位符，占位符在主轴上尺寸可自定义。
  */
-export interface RecordParameter<V extends VmRecord> extends ParameterBase<'record', V> {
+export interface RecordParameter<V extends VmRecord = VmRecord> extends ParameterBase<'record', V> {
     /** 主轴的优先方向 */
     direction?: 'row' | 'column';
     /** 包含的元素 */
@@ -176,7 +173,7 @@ export interface RecordParameter<V extends VmRecord> extends ParameterBase<'reco
  *
  * 各分组沿主轴排列时占据位置由 span 定义。
  */
-export interface GroupedParameter<V extends VmRecord> extends ParameterBase<'grouped', V> {
+export interface GroupedParameter<V extends VmRecord = VmRecord> extends ParameterBase<'grouped', V> {
     /** 主轴的优先方向 */
     direction?: 'row' | 'column';
     /** 包含的元素 */
@@ -227,23 +224,41 @@ export interface FileParameter extends ParameterBase<'file', string> {
 /**
  * 已定义的参数类型
  */
-export type ParameterMap = {
+export interface ParameterMap {
+    /** 实数参数 */
     real: RealParameter;
+    /** 整数参数 */
     integer: IntegerParameter;
-    choice: ChoiceParameter<string> | ChoiceParameter<number> | ChoiceParameter<boolean>;
-    multiSelect: MultiSelectParameter<string[]> | MultiSelectParameter<number[]> | MultiSelectParameter<boolean[]>;
-    logical: LogicalParameter<string> | LogicalParameter<number> | LogicalParameter<boolean>;
-    table: TableParameter<ArgumentValue[]>;
+    /** 选择参数 */
+    choice: ChoiceParameter;
+    /** 多选参数 */
+    multiSelect: MultiSelectParameter;
+    /** 布尔参数 */
+    logical: LogicalParameter;
+    /** 表格参数 */
+    table: TableParameter;
+    /** 文本参数 */
     text: TextParameter;
+    /** 代码参数 */
     code: CodeParameter;
+    /** 文件参数 */
     file: FileParameter;
+    /** 记录参数 */
     record: RecordParameter<VmRecord>;
+    /** 分组记录参数 */
     grouped: GroupedParameter<VmRecord>;
-};
-/**
- * 已定义的参数类型
- */
-export type Parameter = ParameterMap[keyof ParameterMap];
+}
+
+/** 已定义的参数类型 type */
+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];
 
 /**
  * 是否为参数定义
@@ -260,17 +275,3 @@ export function isParameter(value: unknown): value is Parameter {
         'value' in v
     );
 }
-
-/**
- * 创建参数定义
- */
-export function Parameter(): RealParameter {
-    return {
-        key: '',
-        name: '',
-        description: '',
-        condition: '' as ConditionExpression,
-        type: 'real',
-        value: 0,
-    };
-}