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

package/dist/scope.js

@@ -1,13 +1,23 @@
-import { createVmContext, isVmExtern } from '@mirascript/mirascript';
+import { createVmContext, isVmExtern, isVmModule, } from '@mirascript/mirascript';
 import { ExpressionTag, isExpression, } from './expression.js';
-import { DEFAULTS, evaluateEval } from './eval.js';
+import { evaluateEval } from './eval.js';
 import { parse } from './parser.js';
 import { TypeInfo } from './type.js';
 const { hasOwn } = Object;
 const RAW = Symbol.for('@private/expression:raw');
 /** 是否需要创建代理对象 */
 function needsProxy(value) {
-    return isExpression(value) || (value != null && typeof value == 'object');
+    // 先检查 isExpression，因为 'function' 也有可能是 Expression
+    if (isExpression(value)) {
+        return true;
+    }
+    if (value == null || typeof value != 'object') {
+        return false;
+    }
+    if (isVmExtern(value) || isVmModule(value)) {
+        return false;
+    }
+    return true;
 }
 /** 创建代理对象 */
 function createProxy(value, scope, path) {
@@ -42,12 +52,9 @@ class ScopeProxyHandler {
             return target;
         }
         const value = Reflect.get(target, p);
-        if (!needsProxy(value)) {
+        if (isVmExtern(target) || !needsProxy(value)) {
             return value;
         }
-        if (isVmExtern(target)) {
-            return createProxy(value, this.scope, this.path);
-        }
         return createProxy(value, this.scope, [...this.path, p]);
     }
 }
@@ -57,7 +64,7 @@ export class Scope {
     static { this.MAX_RECURSION = 500; }
     constructor(
     /** 生成环境的工厂函数 */
-    scope, 
+    scope = null, 
     /** 求值失败是否抛异常 */
     throws = true, 
     /** 执行环境名称 */
@@ -65,51 +72,58 @@ export class Scope {
         this.scope = scope;
         this.throws = throws;
         this.name = name;
-        /** 上下文 */
-        this.context = null;
+        /** 执行器上下文 */
+        this.evaluator = null;
         /** 求值计数 */
         this.evalCounter = 0;
+        /** 函数的执行环境，惰性求值 */
+        this._proxy = null;
+    }
+    /** 重置执行器 */
+    reset(evaluator) {
+        const oldEvaluator = this.evaluator;
+        const oldCounter = this.evalCounter;
+        this.evaluator = evaluator;
+        this.evalCounter = 0;
+        return () => {
+            this.evaluator = oldEvaluator;
+            this.evalCounter = oldCounter;
+        };
+    }
+    /** 函数的执行环境，惰性求值 */
+    get proxy() {
+        if (this._proxy != null)
+            return this._proxy;
+        let getter;
+        const { scope } = this;
         if (scope == null) {
-            this.getter = (key) => this.context?.imported.get(key);
+            getter = (key) => this.evaluator?.imported.get(key);
         }
         else if (typeof scope == 'function') {
-            this.getter = (key) => {
+            getter = (key) => {
                 const v = scope(key);
                 if (v === undefined)
-                    return this.context?.imported.get(key);
+                    return this.evaluator?.imported.get(key);
                 if (!needsProxy(v))
                     return v;
                 return createProxy(v, this, [key]);
             };
         }
         else {
-            this.getter = (key) => {
+            getter = (key) => {
                 if (!hasOwn(scope, key))
-                    return this.context?.imported.get(key);
+                    return this.evaluator?.imported.get(key);
                 const v = scope[key];
                 if (!needsProxy(v))
                     return v;
                 return createProxy(v, this, [key]);
             };
         }
+        const proxy = createVmContext(getter);
+        this._proxy = proxy;
+        return proxy;
     }
-    /** 重置执行环境 */
-    reset(context) {
-        const oldContext = this.context;
-        const oldCounter = this.evalCounter;
-        this.context = context;
-        this.evalCounter = 0;
-        return () => {
-            this.context = oldContext;
-            this.evalCounter = oldCounter;
-        };
-    }
-    /** 函数的执行环境，惰性求值 */
-    get proxy() {
-        this._proxy ??= createVmContext(this.getter);
-        return this._proxy;
-    }
-    /** 检查环境中是否有值 */
+    /** 检查环境中是否有值，不包含 evaluator 和 default context 中的值 */
     has(key) {
         const { scope } = this;
         if (scope == null)
@@ -123,7 +137,7 @@ export class Scope {
         }
         return v !== undefined;
     }
-    /** 获取环境中的值 */
+    /** 获取环境中的值，不包含 evaluator 和 default context 中的值 */
     get(key) {
         const { scope } = this;
         if (scope == null)
@@ -139,41 +153,34 @@ export class Scope {
             return v;
         return this.eval(v, [key]);
     }
-    /**
-     * 表达式递归求值
-     */
+    /** 表达式递归求值 */
     eval(expression, path) {
         if (this.evalCounter >= Scope.MAX_RECURSION) {
             throw new Error(`Execution recursion exceeds limit`);
         }
         this.evalCounter++;
         try {
-            let result;
+            let result = null;
             if (typeof expression == 'function') {
-                result = expression(this);
+                result = expression(this, this.evaluator);
             }
             else {
-                const { context } = this;
-                if (!context) {
-                    throw new Error(`Undefined context`);
+                const { evaluator } = this;
+                if (!evaluator) {
+                    throw new Error(`Undefined evaluator`);
                 }
-                const exp = parse(context, expression.source, this.throws);
+                const exp = parse(evaluator, expression.source, this.throws, false);
                 if (exp.func != null) {
-                    result = evaluateEval(context, exp, this);
+                    result = evaluateEval(evaluator, exp, this);
                 }
                 else if (exp.error != null) {
                     throw exp.error;
                 }
-                else {
-                    result = DEFAULTS;
-                }
             }
-            if (result === DEFAULTS)
-                return null;
             const tag = expression[ExpressionTag];
             if (!tag)
                 return result;
-            return TypeInfo.to(result, TypeInfo.parse(tag));
+            return TypeInfo.to(result, tag);
         }
         catch (ex) {
             throw new Error(`${ex.message || String(ex)}\nIn ${this.name}: @ ${path.join('/')}`);

package/dist/scope.js.map

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

package/dist/type.d.ts

@@ -12,10 +12,19 @@ export type TsTypeOf<T extends TypeInfo | LegacyType> = TypeMap[T];
 /** 兼容的旧类型 */
 export type LegacyType = 's' | 'f' | 'b';
 /** 类型信息 */
-export declare const TypeInfo: {
-    parse: (type: TypeInfo | LegacyType) => TypeInfo;
-    is: <T extends TypeInfo | LegacyType>(value: VmValue | undefined, type: T) => value is TsTypeOf<T>;
-    to: <T extends TypeInfo | LegacyType>(value: VmValue | undefined, type: T) => TsTypeOf<T>;
-};
+export declare namespace TypeInfo {
+    /** 解析类型 */
+    function parse(type: TypeInfo | LegacyType): TypeInfo;
+    /** 判断类型 */
+    function is<T extends TypeInfo | LegacyType>(value: VmValue | undefined, type: T): value is TsTypeOf<T>;
+    /** 转换类型 */
+    function to<T extends TypeInfo | LegacyType>(value: VmValue | undefined, type: T): TsTypeOf<T>;
+    /** 转换为字符串 */
+    function toString(value: VmValue | undefined): string;
+    /** 转换为数字 */
+    function toNumber(value: VmValue | undefined): number;
+    /** 转换为布尔值 */
+    function toBoolean(value: VmValue | undefined): boolean;
+}
 export {};
 //# sourceMappingURL=type.d.ts.map

package/dist/type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../src/type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAY,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAG5E,WAAW;AACX,MAAM,MAAM,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC;AAKvD,WAAW;AACX,KAAK,OAAO,GAAG,UAAU,GAAG;IACxB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,OAAO,CAAC;CACd,CAAC;AAEF,YAAY;AACZ,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,QAAQ,GAAG,UAAU,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;AAEnE,aAAa;AACb,MAAM,MAAM,UAAU,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;AAEzC,WAAW;AACX,eAAO,MAAM,QAAQ;kBACH,QAAQ,GAAG,UAAU,KAAG,QAAQ;SAMzC,CAAC,SAAS,QAAQ,GAAG,UAAU,SAAS,OAAO,GAAG,SAAS,QAAQ,CAAC,KAAG,KAAK,IAAI,QAAQ,CAAC,CAAC,CAAC;SAgB3F,CAAC,SAAS,QAAQ,GAAG,UAAU,SAAS,OAAO,GAAG,SAAS,QAAQ,CAAC,KAAG,QAAQ,CAAC,CAAC,CAAC;CAmB1F,CAAC"}
+{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../src/type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAY,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAI5E,WAAW;AACX,MAAM,MAAM,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC;AAKvD,WAAW;AACX,KAAK,OAAO,GAAG,UAAU,GAAG;IACxB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,OAAO,CAAC;CACd,CAAC;AAEF,YAAY;AACZ,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,QAAQ,GAAG,UAAU,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;AAEnE,aAAa;AACb,MAAM,MAAM,UAAU,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;AAEzC,WAAW;AACX,yBAAiB,QAAQ,CAAC;IACtB,WAAW;IACX,SAAgB,KAAK,CAAC,IAAI,EAAE,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAK3D;IACD,WAAW;IACX,SAAgB,EAAE,CAAC,CAAC,SAAS,QAAQ,GAAG,UAAU,EAAE,KAAK,EAAE,OAAO,GAAG,SAAS,EAAE,IAAI,EAAE,CAAC,GAAG,KAAK,IAAI,QAAQ,CAAC,CAAC,CAAC,CAe7G;IAED,WAAW;IACX,SAAgB,EAAE,CAAC,CAAC,SAAS,QAAQ,GAAG,UAAU,EAAE,KAAK,EAAE,OAAO,GAAG,SAAS,EAAE,IAAI,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAmBpG;IAED,aAAa;IACb,SAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAE3D;IAED,YAAY;IACZ,SAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAE3D;IAED,aAAa;IACb,SAAgB,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,GAAG,OAAO,CAE7D;CACJ"}

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.10",
   "author": "CloudPSS",
   "license": "MIT",
   "type": "module",
@@ -12,11 +12,11 @@
     "./*": "./dist/*.js"
   },
   "dependencies": {
-    "@mirascript/mirascript": "^0.0.17",
+    "@mirascript/mirascript": "^0.1.7",
     "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"
   },
   "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',
+    track_references: false,
+    diagnostic_position_encoding: 'Utf16',
+    diagnostic_error: false,
+    diagnostic_warning: false,
+    diagnostic_info: false,
+    diagnostic_hint: false,
+    diagnostic_other: true,
+    trivia: false,
+});
 
 /**
  * 分析依赖
  */
-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);
 }