@cloudpss/expression 0.6.0-alpha.9 → 0.6.0

package/dist/scope.js

@@ -1,35 +1,50 @@
-import { createVmContext, isVmExtern } from '@mirascript/mirascript';
+import { createVmContext, isVmWrapper, isVmFunction, } 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 { hasOwn, keys } = Object;
+const { isArray } = Array;
 const RAW = Symbol.for('@private/expression:raw');
 /** 是否需要创建代理对象 */
+function isSpecialHostObject(value) {
+    return (value instanceof Date ||
+        value instanceof Promise ||
+        value instanceof RegExp ||
+        ArrayBuffer.isView(value) ||
+        value instanceof ArrayBuffer ||
+        (typeof SharedArrayBuffer != 'undefined' && value instanceof SharedArrayBuffer));
+}
+/** 是否需要创建代理对象 */
 function needsProxy(value) {
-    return isExpression(value) || (value != null && typeof value == 'object');
+    if (value == null || (typeof value != 'object' && typeof value != 'function')) {
+        return false;
+    }
+    if (isExpression(value)) {
+        return true;
+    }
+    if (isVmWrapper(value) || isVmFunction(value) || isSpecialHostObject(value)) {
+        return false;
+    }
+    return true;
 }
 /** 创建代理对象 */
 function createProxy(value, scope, path) {
-    // 先检查 isExpression，因为 'function' 也有可能是 Expression
     if (isExpression(value)) {
         return scope.eval(value, path);
     }
     if (typeof value != 'object' || value == null) {
         return value;
     }
-    if (value instanceof Date ||
-        value instanceof Promise ||
-        value instanceof RegExp ||
-        ArrayBuffer.isView(value) ||
-        value instanceof ArrayBuffer ||
-        (typeof SharedArrayBuffer != 'undefined' && value instanceof SharedArrayBuffer)) {
-        return value;
+    if (isArray(value)) {
+        return new Proxy(value, new ArrayScopeProxyHandler(scope, path));
+    }
+    else {
+        return new Proxy(value, new RecordScopeProxyHandler(scope, path));
     }
-    return new Proxy(value, new ScopeProxyHandler(scope, path));
 }
 /** 函数的执行环境 */
-class ScopeProxyHandler {
+class ArrayScopeProxyHandler {
     constructor(scope, path) {
         this.scope = scope;
         this.path = path;
@@ -42,22 +57,39 @@ class ScopeProxyHandler {
             return target;
         }
         const value = Reflect.get(target, p);
-        if (!needsProxy(value)) {
+        if (typeof p == 'symbol' || String(Number(p)) !== p || !needsProxy(value)) {
             return value;
         }
-        if (isVmExtern(target)) {
-            return createProxy(value, this.scope, this.path);
+        return createProxy(value, this.scope, [...this.path, p]);
+    }
+}
+/** 函数的执行环境 */
+class RecordScopeProxyHandler {
+    constructor(scope, path) {
+        this.scope = scope;
+        this.path = path;
+    }
+    /**
+     * @inheritdoc
+     */
+    get(target, p) {
+        if (p === RAW) {
+            return target;
+        }
+        const value = Reflect.get(target, p);
+        if (typeof p == 'symbol' || !hasOwn(target, p) || !needsProxy(value)) {
+            return value;
         }
         return createProxy(value, this.scope, [...this.path, p]);
     }
 }
+/** 最大求值计数 */
+const MAX_RECURSION = 500;
 /** 函数的执行环境 */
 export class Scope {
-    /** 最大求值计数 */
-    static { this.MAX_RECURSION = 500; }
     constructor(
     /** 生成环境的工厂函数 */
-    scope, 
+    scope = null, 
     /** 求值失败是否抛异常 */
     throws = true, 
     /** 执行环境名称 */
@@ -65,51 +97,84 @@ export class Scope {
         this.scope = scope;
         this.throws = throws;
         this.name = name;
-        /** 上下文 */
-        this.context = null;
+        /** 枚举环境中的值 */
+        this.enumerator = null;
+        /** 描述环境中的值 */
+        this.describer = 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;
+        let enumerate;
+        let describe;
+        const { scope, enumerator, describer } = this;
         if (scope == null) {
-            this.getter = (key) => this.context?.imported.get(key);
+            getter = (key) => this.evaluator?.imported.get(key);
+            enumerate = () => this.evaluator?.imported.keys() ?? [];
+            describe = () => undefined;
         }
         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]);
             };
         }
+        if (typeof enumerator == 'function') {
+            enumerate = () => {
+                const keys = enumerator();
+                const imported = this.evaluator?.imported.keys() ?? [];
+                return [...keys, ...imported];
+            };
+        }
+        else {
+            enumerate = () => this.evaluator?.imported.keys() ?? [];
+        }
+        if (typeof describer == 'function') {
+            describe = (key) => {
+                const d = describer(key);
+                if (d)
+                    return d;
+                return undefined;
+            };
+        }
+        const proxy = createVmContext(getter, enumerate, describe);
+        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 +188,7 @@ export class Scope {
         }
         return v !== undefined;
     }
-    /** 获取环境中的值 */
+    /** 获取环境中的值，不包含 evaluator 和 default context 中的值 */
     get(key) {
         const { scope } = this;
         if (scope == null)
@@ -139,41 +204,32 @@ export class Scope {
             return v;
         return this.eval(v, [key]);
     }
-    /**
-     * 表达式递归求值
-     */
+    /** 表达式递归求值 */
     eval(expression, path) {
-        if (this.evalCounter >= Scope.MAX_RECURSION) {
+        if (this.evalCounter >= MAX_RECURSION) {
+            this.evalCounter = 0;
             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 exp = parse(context, expression.source, this.throws);
+                const { evaluator } = this;
+                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('/')}`);
@@ -185,16 +241,21 @@ function unwrapCore(value) {
     if (value == null || (typeof value != 'object' && typeof value != 'function')) {
         return undefined;
     }
+    if (isVmWrapper(value) || isVmFunction(value) || isSpecialHostObject(value)) {
+        return undefined;
+    }
+    // 是否有 proxy
     const raw = value[RAW];
+    // 不论是否被代理，均须递归处理子项
     const obj = raw ?? value;
-    for (const key in obj) {
-        if (!hasOwn(obj, key))
-            continue;
+    // 只处理 own enumerable 属性
+    for (const key of keys(obj)) {
         const unwrapped = unwrapCore(obj[key]);
         if (unwrapped !== undefined) {
             obj[key] = unwrapped;
         }
     }
+    // 返回被代理的对象，如没有 proxy 则返回 undefined
     return raw;
 }
 /** 移除 PROXY */

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

@@ -1,4 +1,5 @@
 import type { VmValue, VmValueMap } from '@mirascript/mirascript';
+import { convert } from '@mirascript/mirascript/subtle';
 /** 类型信息 */
 export type TypeInfo = 'string' | 'number' | 'boolean';
 /** 类型映射 */
@@ -6,25 +7,36 @@ type TypeMap = VmValueMap & {
     s: string;
     f: number;
     b: boolean;
+    '': VmValue;
 };
 /** Ts 类型 */
-export type TsTypeOf<T extends TypeInfo | LegacyType> = TypeMap[T];
+export type TsTypeOf<T extends TypeInfo | LegacyType | '', I extends VmValue = VmValue> = T extends '' ? I : TypeMap[T];
 /** 兼容的旧类型 */
 export type LegacyType = 's' | 'f' | 'b';
 /** 类型信息 */
 export declare namespace TypeInfo {
     /** 解析类型 */
-    function parse(type: TypeInfo | LegacyType): TypeInfo;
+    export function parse(type: TypeInfo | LegacyType): TypeInfo;
     /** 判断类型 */
-    function is<T extends TypeInfo | LegacyType>(value: VmValue | undefined, type: T): value is TsTypeOf<T>;
+    export 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 function to<T extends TypeInfo | LegacyType | '', I extends VmValue = VmValue, F = undefined>(value: I | undefined, type: T, fallback?: F): TsTypeOf<T> | Exclude<F, undefined>;
+    /** 不转换 */
+    function identity<T extends VmValue, F = undefined>(value: T | undefined, _fallback?: F): T;
+    /** 获取转换器 */
+    type Converters = {
+        string: typeof convert.toString;
+        s: typeof convert.toString;
+        number: typeof convert.toNumber;
+        f: typeof convert.toNumber;
+        boolean: typeof convert.toBoolean;
+        b: typeof convert.toBoolean;
+        '': typeof identity;
+    };
+    /** 获取转换器 */
+    export function converter<T extends TypeInfo | LegacyType | ''>(type: T): Converters[T];
+    export const toBoolean: typeof convert.toBoolean, toFormat: typeof convert.toFormat, toNumber: typeof convert.toNumber, toString: typeof convert.toString;
+    export {};
 }
 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,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,CAkBpG;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"}
+{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../src/type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAY,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAC5E,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAExD,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;IACX,EAAE,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,YAAY;AACZ,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,QAAQ,GAAG,UAAU,GAAG,EAAE,EAAE,CAAC,SAAS,OAAO,GAAG,OAAO,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAExH,aAAa;AACb,MAAM,MAAM,UAAU,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;AAEzC,WAAW;AACX,yBAAiB,QAAQ,CAAC;IACtB,WAAW;IACX,MAAM,UAAU,KAAK,CAAC,IAAI,EAAE,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAK3D;IACD,WAAW;IACX,MAAM,UAAU,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,MAAM,UAAU,EAAE,CAAC,CAAC,SAAS,QAAQ,GAAG,UAAU,GAAG,EAAE,EAAE,CAAC,SAAS,OAAO,GAAG,OAAO,EAAE,CAAC,GAAG,SAAS,EAC/F,KAAK,EAAE,CAAC,GAAG,SAAS,EACpB,IAAI,EAAE,CAAC,EACP,QAAQ,CAAC,EAAE,CAAC,GACb,QAAQ,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,EAAE,SAAS,CAAC,CAGrC;IAED,UAAU;IACV,SAAS,QAAQ,CAAC,CAAC,SAAS,OAAO,EAAE,CAAC,GAAG,SAAS,EAC9C,KAAK,EAAE,CAAC,GAAG,SAAS,EACpB,SAAS,CAAC,EAAE,CAAC,GACd,CAAC,CAGH;IAED,YAAY;IACZ,KAAK,UAAU,GAAG;QACd,MAAM,EAAE,OAAO,OAAO,CAAC,QAAQ,CAAC;QAChC,CAAC,EAAE,OAAO,OAAO,CAAC,QAAQ,CAAC;QAC3B,MAAM,EAAE,OAAO,OAAO,CAAC,QAAQ,CAAC;QAChC,CAAC,EAAE,OAAO,OAAO,CAAC,QAAQ,CAAC;QAC3B,OAAO,EAAE,OAAO,OAAO,CAAC,SAAS,CAAC;QAClC,CAAC,EAAE,OAAO,OAAO,CAAC,SAAS,CAAC;QAC5B,EAAE,EAAE,OAAO,QAAQ,CAAC;KACvB,CAAC;IACF,YAAY;IACZ,MAAM,UAAU,SAAS,CAAC,CAAC,SAAS,QAAQ,GAAG,UAAU,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAgBtF;IAED,MAAM,CAAC,MAAQ,SAAS,4BAAE,QAAQ,2BAAE,QAAQ,2BAAE,QAAQ,yBAAY,CAAC;;CACtE"}

package/dist/type.js

@@ -1,4 +1,4 @@
-import { lib } from '@mirascript/mirascript/subtle';
+import { convert } from '@mirascript/mirascript/subtle';
 const x = 'boolean';
 x;
 /** 类型信息 */
@@ -34,39 +34,36 @@ export var TypeInfo;
     }
     TypeInfo.is = is;
     /** 转换类型 */
-    function to(value, type) {
-        if (!type)
-            return value;
+    function to(value, type, fallback) {
+        const c = converter(type);
+        return c(value, fallback);
+    }
+    TypeInfo.to = to;
+    /** 不转换 */
+    function identity(value, _fallback) {
+        if (value == null)
+            return null;
+        return value;
+    }
+    /** 获取转换器 */
+    function converter(type) {
+        // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
         switch (type) {
             case 'b':
             case 'boolean':
-                return lib.to_boolean(value);
+                return TypeInfo.toBoolean;
             case 'f':
             case 'number':
-                return lib.to_number(value);
+                return TypeInfo.toNumber;
             case 's':
             case 'string':
-                return lib.to_string(value);
+                return TypeInfo.toString;
             default:
                 (type);
-                return value;
+                return identity;
         }
     }
-    TypeInfo.to = to;
-    /** 转换为字符串 */
-    function toString(value) {
-        return lib.to_string(value);
-    }
-    TypeInfo.toString = toString;
-    /** 转换为数字 */
-    function toNumber(value) {
-        return lib.to_number(value);
-    }
-    TypeInfo.toNumber = toNumber;
-    /** 转换为布尔值 */
-    function toBoolean(value) {
-        return lib.to_boolean(value);
-    }
-    TypeInfo.toBoolean = toBoolean;
+    TypeInfo.converter = converter;
+    TypeInfo.toBoolean = convert.toBoolean, TypeInfo.toFormat = convert.toFormat, TypeInfo.toNumber = convert.toNumber, TypeInfo.toString = convert.toString;
 })(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,KAAW,QAAQ,CA6DxB;AA7DD,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,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;IAlBe,WAAE,KAkBjB,CAAA;IAED,aAAa;IACb,SAAgB,QAAQ,CAAC,KAA0B;QAC/C,OAAO,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAFe,iBAAQ,WAEvB,CAAA;IAED,YAAY;IACZ,SAAgB,QAAQ,CAAC,KAA0B;QAC/C,OAAO,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAFe,iBAAQ,WAEvB,CAAA;IAED,aAAa;IACb,SAAgB,SAAS,CAAC,KAA0B;QAChD,OAAO,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAFe,kBAAS,YAExB,CAAA;AACL,CAAC,EA7DgB,QAAQ,KAAR,QAAQ,QA6DxB"}
+{"version":3,"file":"type.js","sourceRoot":"","sources":["../src/type.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAKxD,MAAM,CAAC,GAAa,SAAS,CAAC;AAC9B,CAAoB,CAAC;AAgBrB,WAAW;AACX,MAAM,KAAW,QAAQ,CA2ExB;AA3ED,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,CACd,KAAoB,EACpB,IAAO,EACP,QAAY;QAEZ,MAAM,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;QAC1B,OAAQ,CAA6B,CAAC,KAAK,EAAE,QAAQ,CAAgB,CAAC;IAC1E,CAAC;IAPe,WAAE,KAOjB,CAAA;IAED,UAAU;IACV,SAAS,QAAQ,CACb,KAAoB,EACpB,SAAa;QAEb,IAAI,KAAK,IAAI,IAAI;YAAE,OAAO,IAAS,CAAC;QACpC,OAAO,KAAK,CAAC;IACjB,CAAC;IAYD,YAAY;IACZ,SAAgB,SAAS,CAAuC,IAAO;QACnE,0EAA0E;QAC1E,QAAQ,IAAI,EAAE,CAAC;YACX,KAAK,GAAG,CAAC;YACT,KAAK,SAAS;gBACV,OAAO,SAAA,SAA0B,CAAC;YACtC,KAAK,GAAG,CAAC;YACT,KAAK,QAAQ;gBACT,OAAO,SAAA,QAAyB,CAAC;YACrC,KAAK,GAAG,CAAC;YACT,KAAK,QAAQ;gBACT,OAAO,SAAA,QAAyB,CAAC;YACrC;gBACI,CAAC,IAAI,CAAc,CAAC;gBACpB,OAAO,QAAyB,CAAC;QACzC,CAAC;IACL,CAAC;IAhBe,kBAAS,YAgBxB,CAAA;IAEc,kBAAS,GAAmC,OAAO,UAA1C,EAAE,iBAAQ,GAAyB,OAAO,SAAhC,EAAE,iBAAQ,GAAe,OAAO,SAAtB,EAAE,iBAAQ,GAAK,OAAO,SAAZ,CAAa;AACvE,CAAC,EA3EgB,QAAQ,KAAR,QAAQ,QA2ExB"}

package/package.json

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

package/src/analyze.ts

@@ -1,44 +1,25 @@
-import type { Context } from './context.js';
-import type { ExpressionCache } from './parser.js';
+import { DefaultVmContext, type GlobalReferenceChain, analyzeGlobalReferences } from '@mirascript/mirascript/subtle';
+import type { EvalExpressionCache } from './parser.js';
+import type { Scope } from './scope.js';
+import type { Evaluator } from './main.js';
 
+const kAnalyze = Symbol('cloudpss.expression.analyzeCache');
+export type { GlobalReferenceChain };
 /**
  * 分析依赖
  */
-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;
-
-    //         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: EvalExpressionCache,
+    evaluator: Evaluator,
+    scope: Scope,
+): readonly GlobalReferenceChain[] {
+    let result = (expression as EvalExpressionCache & { [kAnalyze]?: readonly GlobalReferenceChain[] })[kAnalyze];
+    if (result == null) {
+        result = analyzeGlobalReferences(expression.source);
+        (expression as EvalExpressionCache & { [kAnalyze]?: readonly GlobalReferenceChain[] })[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<out R, in V extends VmValue = ArgumentValue> = (
+export type ArgumentFunction<out R, in V extends VmValue = ArgumentValue> = (
     /** 相关联的参数值 */
     value: V,
     /** 当前作用域 */
@@ -15,26 +15,16 @@ export type ExpressionFunction<out R, in V extends VmValue = ArgumentValue> = (
     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]>>;
 };

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 || 'items' 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;