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

package/dist/definitions/utils.js

@@ -0,0 +1,272 @@
+import { klona } from 'klona';
+import { isVmArray, isVmConst, isVmRecord } from '@mirascript/mirascript';
+import { Expression, isExpression } from '../expression.js';
+import { TypeInfo } from '../type.js';
+const { isArray } = Array;
+/** 回退值 */
+function toFallback(fallback) {
+    if (fallback === undefined) {
+        throw new TypeError('Conversion failed and no fallback value provided');
+    }
+    return fallback;
+}
+/**
+ * 通过枚举参数定义推测枚举类型
+ */
+export function choiceParameterType(definition) {
+    // 首先根据参数类型确定默认类型
+    let defaultType = definition.type === 'logical' ? 'boolean' : 'number';
+    // 然后根据默认值调整默认类型
+    const { value, choices } = definition;
+    if (definition.type === 'multiSelect' && Array.isArray(value)) {
+        const v = value[0];
+        if (isChoiceValue(v)) {
+            defaultType = typeof v;
+        }
+    }
+    else {
+        if (isChoiceValue(value)) {
+            defaultType = typeof value;
+        }
+    }
+    if (choices == null || typeof choices == 'function' || isExpression(choices) || !choices.length) {
+        return defaultType;
+    }
+    // 认为枚举选项值类型一致，推测枚举类型
+    for (const choice of choices) {
+        const v = choice?.key;
+        if (!isChoiceValue(v))
+            continue;
+        return typeof v;
+    }
+    return defaultType;
+}
+/** 是否为枚举值类型 */
+export function isChoiceValue(value) {
+    return typeof value == 'string' || typeof value == 'number' || typeof value == 'boolean';
+}
+const defaultConverter = (value, defaults) => {
+    if (value != null)
+        return value;
+    return toFallback(defaults);
+};
+/** 转换数组参数类型 */
+function createArrayConverter(itemConverter = null) {
+    if (itemConverter == null) {
+        return (value, defaults) => {
+            if (value == null)
+                return [];
+            if (isVmArray(value))
+                return value;
+            if (isVmConst(value))
+                return [value];
+            return toFallback(defaults);
+        };
+    }
+    return (value, defaults) => {
+        if (value == null)
+            return [];
+        let arr;
+        if (isVmArray(value))
+            arr = value;
+        else if (isVmConst(value))
+            arr = [value];
+        else
+            return toFallback(defaults);
+        if (arr.length === 0)
+            return arr;
+        let ret = null;
+        for (let i = 0; i < arr.length; i++) {
+            const el = arr[i];
+            const r = itemConverter(el, FALLBACK);
+            if (r === FALLBACK)
+                return toFallback(defaults);
+            if (!Object.is(r, el)) {
+                ret ??= [...arr];
+                ret[i] = r;
+            }
+        }
+        return ret ?? arr;
+    };
+}
+/** 转换记录参数类型 */
+function createRecordConverter(fieldConverters = null) {
+    if (fieldConverters == null) {
+        return (value, defaults) => {
+            if (isVmRecord(value))
+                return value;
+            if (isVmArray(value)) {
+                const obj = {};
+                for (let i = 0; i < value.length; i++) {
+                    obj[i] = value[i] ?? null;
+                }
+                return obj;
+            }
+            return toFallback(defaults);
+        };
+    }
+    return (value, defaults) => {
+        let record;
+        if (isVmRecord(value))
+            record = value;
+        else if (isVmArray(value)) {
+            const obj = {};
+            for (let i = 0; i < value.length; i++) {
+                obj[i] = value[i] ?? null;
+            }
+            record = obj;
+        }
+        else
+            return toFallback(defaults);
+        let ret = null;
+        for (const [key, converter] of fieldConverters) {
+            if (typeof converter != 'function')
+                continue;
+            const fieldValue = record[key];
+            const r = converter(fieldValue, FALLBACK);
+            if (r === FALLBACK)
+                return toFallback(defaults);
+            if (!Object.is(r, fieldValue)) {
+                ret ??= { ...record };
+                ret[key] = r;
+            }
+        }
+        return ret ?? record;
+    };
+}
+const FALLBACK = Symbol('FALLBACK');
+/** 转换推测参数类型，不回退到 {@link Parameter.value} 提供的默认值 */
+export function argumentConverter(definition) {
+    switch (definition.type) {
+        case 'real':
+        case 'integer':
+            return TypeInfo.converter('number');
+        case 'text':
+        case 'file':
+        case 'code':
+        case 'pinLike':
+        case 'cssColor':
+        case 'cssBackground':
+        case 'resourceId':
+            return TypeInfo.converter('string');
+        case 'choice':
+        case 'logical': {
+            const type = choiceParameterType(definition);
+            return TypeInfo.converter(type);
+        }
+        case 'multiSelect': {
+            const type = choiceParameterType(definition);
+            const to = TypeInfo.converter(type);
+            return createArrayConverter(to);
+        }
+        case 'table': {
+            const { columns } = definition;
+            if (!isArray(columns) || !columns.length) {
+                return createArrayConverter();
+            }
+            if (columns.length === 1) {
+                const item = argumentConverter(columns[0]);
+                return createArrayConverter(item);
+            }
+            else {
+                return createArrayConverter(createRecordConverter(columns.map((col, index) => [col.key || String(index), argumentConverter(col)])));
+            }
+        }
+        case 'grouped':
+        case 'record': {
+            return createRecordConverter();
+        }
+        default:
+            return defaultConverter;
+    }
+}
+/**
+ * 转换参数值的类型，不回退到 {@link Parameter.value} 提供的默认值
+ * 转换失败时返回 null
+ */
+export function toArgumentValue(value, definition) {
+    const converter = argumentConverter(definition);
+    return converter(value, null);
+}
+/** 是否为包含参数组的参数定义数组 */
+function checkParameterDefinitions(value) {
+    return value != null && isArray(value) && value.length > 0;
+}
+/** 查找指定参数 */
+function findParameterImpl(items, key) {
+    if (items.length === 0)
+        return undefined;
+    for (const item of items) {
+        if (item == null)
+            continue;
+        if (item.key === key)
+            return item;
+    }
+    return undefined;
+}
+/** 查找指定参数 */
+export function findParameter(definition, key) {
+    if (!checkParameterDefinitions(definition))
+        return undefined;
+    for (const group of definition) {
+        if (group == null || !isArray(group.items))
+            continue;
+        const found = findParameterImpl(group.items, key);
+        if (found)
+            return found;
+    }
+    return undefined;
+}
+/** 获取参数默认值，修复现有的参数，填充缺失的参数，删除未定义的参数 */
+export function fillArgumentMap(definition, args) {
+    args ??= {};
+    if (!checkParameterDefinitions(definition))
+        return args;
+    const keys = new Set(Object.keys(args));
+    // 根据定义填充或修复参数
+    for (const group of definition) {
+        for (const param of group.items) {
+            const key = param.key;
+            if (!key)
+                continue;
+            const currentValue = keys.has(key) ? args[key] : undefined;
+            if (currentValue == null) {
+                // 使用默认值填充
+                const defaultValue = param.value;
+                if (isExpression(defaultValue)) {
+                    args[key] = Expression(defaultValue.source);
+                }
+                else {
+                    const value = defaultValue != null && typeof defaultValue == 'object' ? klona(defaultValue) : defaultValue;
+                    args[key] = toArgumentValue(value, param) ?? value;
+                }
+            }
+            else {
+                // 已存在的参数值
+                if (isExpression(currentValue)) {
+                    // 保留表达式
+                }
+                else {
+                    // 修复现有的参数值
+                    const castedValue = toArgumentValue(currentValue, param);
+                    if (castedValue != null && castedValue !== currentValue) {
+                        args[key] = castedValue;
+                    }
+                }
+            }
+            keys.delete(key);
+        }
+    }
+    // 删除多余的参数
+    for (const key of keys) {
+        // 保留特殊参数和私有字段
+        if (typeof key != 'string')
+            continue;
+        const k0 = key[0];
+        if (k0 === '_' || k0 === '$' || k0 === '@' || k0 === 'ɵ')
+            continue;
+        delete args[key];
+    }
+    return args;
+}
+//# sourceMappingURL=utils.js.map

package/dist/definitions/utils.js.map

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

package/dist/definitions/variable.js

@@ -2,7 +2,7 @@
 export function isVariable(obj) {
     if (obj == null || typeof obj != 'object')
         return false;
-    if ('condition' in obj || 'description' in obj)
+    if ('condition' in obj || 'description' in obj || 'type' in obj)
         return false;
     const v = obj;
     return typeof v.key == 'string' && 'value' in v;

package/dist/definitions/variable.js.map

@@ -1 +1 @@
-{"version":3,"file":"variable.js","sourceRoot":"","sources":["../../src/definitions/variable.ts"],"names":[],"mappings":"AAWA,uBAAuB;AACvB,MAAM,UAAU,UAAU,CAAC,GAAY;IACnC,IAAI,GAAG,IAAI,IAAI,IAAI,OAAO,GAAG,IAAI,QAAQ;QAAE,OAAO,KAAK,CAAC;IACxD,IAAI,WAAW,IAAI,GAAG,IAAI,aAAa,IAAI,GAAG;QAAE,OAAO,KAAK,CAAC;IAC7D,MAAM,CAAC,GAAG,GAAe,CAAC;IAC1B,OAAO,OAAO,CAAC,CAAC,GAAG,IAAI,QAAQ,IAAI,OAAO,IAAI,CAAC,CAAC;AACpD,CAAC"}
+{"version":3,"file":"variable.js","sourceRoot":"","sources":["../../src/definitions/variable.ts"],"names":[],"mappings":"AAWA,uBAAuB;AACvB,MAAM,UAAU,UAAU,CAAC,GAAY;IACnC,IAAI,GAAG,IAAI,IAAI,IAAI,OAAO,GAAG,IAAI,QAAQ;QAAE,OAAO,KAAK,CAAC;IACxD,IAAI,WAAW,IAAI,GAAG,IAAI,aAAa,IAAI,GAAG,IAAI,MAAM,IAAI,GAAG;QAAE,OAAO,KAAK,CAAC;IAC9E,MAAM,CAAC,GAAG,GAAe,CAAC;IAC1B,OAAO,OAAO,CAAC,CAAC,GAAG,IAAI,QAAQ,IAAI,OAAO,IAAI,CAAC,CAAC;AACpD,CAAC"}

package/dist/definitions.d.ts

@@ -4,6 +4,5 @@ export * from './definitions/parameter.js';
 export * from './definitions/parameter-group.js';
 export * from './definitions/parameter-decoration.js';
 export * from './definitions/variable.js';
-export { isVmAny, isVmArray, isVmConst, isVmContext, isVmExtern, isVmFunction, isVmImmutable, isVmModule, isVmPrimitive, isVmRecord, isVmValue, } from '@mirascript/mirascript';
-export type { VmExtern, VmFunction, VmModule, VmAny, VmArray, VmConst, VmContext, VmImmutable, VmPrimitive, VmRecord, VmUninitialized, VmValue, } from '@mirascript/mirascript';
+export * from './definitions/utils.js';
 //# sourceMappingURL=definitions.d.ts.map

package/dist/definitions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"definitions.d.ts","sourceRoot":"","sources":["../src/definitions.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kCAAkC,CAAC;AACjD,cAAc,uCAAuC,CAAC;AACtD,cAAc,2BAA2B,CAAC;AAE1C,OAAO,EACH,OAAO,EACP,SAAS,EACT,SAAS,EACT,WAAW,EACX,UAAU,EACV,YAAY,EACZ,aAAa,EACb,UAAU,EACV,aAAa,EACb,UAAU,EACV,SAAS,GACZ,MAAM,wBAAwB,CAAC;AAChC,YAAY,EACR,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,KAAK,EACL,OAAO,EACP,OAAO,EACP,SAAS,EACT,WAAW,EACX,WAAW,EACX,QAAQ,EACR,eAAe,EACf,OAAO,GACV,MAAM,wBAAwB,CAAC"}
+{"version":3,"file":"definitions.d.ts","sourceRoot":"","sources":["../src/definitions.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kCAAkC,CAAC;AACjD,cAAc,uCAAuC,CAAC;AACtD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC"}

package/dist/definitions.js

@@ -4,5 +4,5 @@ export * from './definitions/parameter.js';
 export * from './definitions/parameter-group.js';
 export * from './definitions/parameter-decoration.js';
 export * from './definitions/variable.js';
-export { isVmAny, isVmArray, isVmConst, isVmContext, isVmExtern, isVmFunction, isVmImmutable, isVmModule, isVmPrimitive, isVmRecord, isVmValue, } from '@mirascript/mirascript';
+export * from './definitions/utils.js';
 //# sourceMappingURL=definitions.js.map

package/dist/definitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../src/definitions.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kCAAkC,CAAC;AACjD,cAAc,uCAAuC,CAAC;AACtD,cAAc,2BAA2B,CAAC;AAE1C,OAAO,EACH,OAAO,EACP,SAAS,EACT,SAAS,EACT,WAAW,EACX,UAAU,EACV,YAAY,EACZ,aAAa,EACb,UAAU,EACV,aAAa,EACb,UAAU,EACV,SAAS,GACZ,MAAM,wBAAwB,CAAC"}
+{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../src/definitions.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kCAAkC,CAAC;AACjD,cAAc,uCAAuC,CAAC;AACtD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC"}

package/dist/eval.d.ts

@@ -1,15 +1,13 @@
 import type { VmValue } from '@mirascript/mirascript';
-import type { Context } from './context.js';
 import type { EvalExpressionCache, ExpressionCache } from './parser.js';
 import { Scope } from './scope.js';
-import { TypeInfo } from './type.js';
-export declare const DEFAULTS: unique symbol;
+import type { Evaluator } from './main.js';
 /**
  * 表达式求值
  */
-export declare function evaluateEval<T extends VmValue>(context: Context, expression: EvalExpressionCache, scope: Scope): T | typeof DEFAULTS;
+export declare function evaluateEval<T extends VmValue>(evaluator: Evaluator | null, expression: EvalExpressionCache, scope: Scope): T | null;
 /**
  * 表达式求值
  */
-export declare function evaluate<T extends VmValue, D = T>(context: Context, expression: ExpressionCache, returnType: TypeInfo | null, scope: Scope | undefined, defaults: D): D | T;
+export declare function evaluate<T extends VmValue>(evaluator: Evaluator | null, expression: ExpressionCache, scope: Scope): T | null;
 //# sourceMappingURL=eval.d.ts.map

package/dist/eval.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"eval.d.ts","sourceRoot":"","sources":["../src/eval.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACxE,OAAO,EAAE,KAAK,EAAU,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAErC,eAAO,MAAM,QAAQ,eAAqB,CAAC;AAE3C;;GAEG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,OAAO,EAC1C,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,mBAAmB,EAC/B,KAAK,EAAE,KAAK,GACb,CAAC,GAAG,OAAO,QAAQ,CAgBrB;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAC,CAAC,SAAS,OAAO,EAAE,CAAC,GAAG,CAAC,EAC7C,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,eAAe,EAC3B,UAAU,EAAE,QAAQ,GAAG,IAAI,EAC3B,KAAK,EAAE,KAAK,GAAG,SAAS,EACxB,QAAQ,EAAE,CAAC,GACZ,CAAC,GAAG,CAAC,CAqBP"}
+{"version":3,"file":"eval.d.ts","sourceRoot":"","sources":["../src/eval.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACxE,OAAO,EAAE,KAAK,EAAU,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE3C;;GAEG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,OAAO,EAC1C,SAAS,EAAE,SAAS,GAAG,IAAI,EAC3B,UAAU,EAAE,mBAAmB,EAC/B,KAAK,EAAE,KAAK,GACb,CAAC,GAAG,IAAI,CAgBV;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAC,CAAC,SAAS,OAAO,EACtC,SAAS,EAAE,SAAS,GAAG,IAAI,EAC3B,UAAU,EAAE,eAAe,EAC3B,KAAK,EAAE,KAAK,GACb,CAAC,GAAG,IAAI,CAiBV"}

package/dist/eval.js

@@ -1,54 +1,46 @@
 import { Scope, unwrap } from './scope.js';
-import { TypeInfo } from './type.js';
-export const DEFAULTS = Symbol('defaults');
 /**
  * 表达式求值
  */
-export function evaluateEval(context, expression, scope) {
+export function evaluateEval(evaluator, expression, scope) {
     try {
         const result = expression.func(scope.proxy);
         if (result == null)
-            return DEFAULTS;
+            return null;
         return unwrap(result);
     }
     catch (error) {
         if (scope.throws)
             throw error;
-        context.logger.warn(`Failed to execute expression "${expression.source}": ${error.message || String(error)}.`, {
+        (evaluator?.logger ?? console).warn(`Failed to execute expression "${expression.source}": ${error.message || String(error)}.`, {
             error,
             scope,
         });
-        return DEFAULTS;
+        return null;
     }
 }
 /**
  * 表达式求值
  */
-export function evaluate(context, expression, returnType, scope, defaults) {
-    let ret;
+export function evaluate(evaluator, expression, scope) {
+    let ret = null;
     if (expression.func != null) {
         scope ??= new Scope();
-        const reset = scope.reset(context);
+        const reset = scope.reset(evaluator);
         try {
-            ret = evaluateEval(context, expression, scope);
+            ret = evaluateEval(evaluator, expression, scope);
         }
         finally {
             reset();
         }
     }
     else if (expression.error != null) {
-        if (scope?.throws ?? true) {
+        if (scope.throws) {
             throw expression.error;
         }
-        ret = DEFAULTS;
     }
-    else {
-        ret = DEFAULTS;
-    }
-    if (ret === DEFAULTS)
-        return defaults;
-    if (!returnType)
-        return ret;
-    return TypeInfo.to(ret, returnType);
+    if (ret == null)
+        return null;
+    return ret;
 }
 //# sourceMappingURL=eval.js.map

package/dist/eval.js.map

@@ -1 +1 @@
-{"version":3,"file":"eval.js","sourceRoot":"","sources":["../src/eval.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAErC,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AAE3C;;GAEG;AACH,MAAM,UAAU,YAAY,CACxB,OAAgB,EAChB,UAA+B,EAC/B,KAAY;IAEZ,IAAI,CAAC;QACD,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC5C,IAAI,MAAM,IAAI,IAAI;YAAE,OAAO,QAAQ,CAAC;QACpC,OAAO,MAAM,CAAC,MAAW,CAAC,CAAC;IAC/B,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACtB,IAAI,KAAK,CAAC,MAAM;YAAE,MAAM,KAAK,CAAC;QAC9B,OAAO,CAAC,MAAM,CAAC,IAAI,CACf,iCAAiC,UAAU,CAAC,MAAM,MAAO,KAAe,CAAC,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,EACpG;YACI,KAAK;YACL,KAAK;SACR,CACJ,CAAC;QACF,OAAO,QAAQ,CAAC;IACpB,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,QAAQ,CACpB,OAAgB,EAChB,UAA2B,EAC3B,UAA2B,EAC3B,KAAwB,EACxB,QAAW;IAEX,IAAI,GAAwB,CAAC;IAC7B,IAAI,UAAU,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;QAC1B,KAAK,KAAK,IAAI,KAAK,EAAE,CAAC;QACtB,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACnC,IAAI,CAAC;YACD,GAAG,GAAG,YAAY,CAAI,OAAO,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;QACtD,CAAC;gBAAS,CAAC;YACP,KAAK,EAAE,CAAC;QACZ,CAAC;IACL,CAAC;SAAM,IAAI,UAAU,CAAC,KAAK,IAAI,IAAI,EAAE,CAAC;QAClC,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,EAAE,CAAC;YACxB,MAAM,UAAU,CAAC,KAAK,CAAC;QAC3B,CAAC;QACD,GAAG,GAAG,QAAQ,CAAC;IACnB,CAAC;SAAM,CAAC;QACJ,GAAG,GAAG,QAAQ,CAAC;IACnB,CAAC;IACD,IAAI,GAAG,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAC;IACtC,IAAI,CAAC,UAAU;QAAE,OAAO,GAAG,CAAC;IAC5B,OAAO,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,CAAM,CAAC;AAC7C,CAAC"}
+{"version":3,"file":"eval.js","sourceRoot":"","sources":["../src/eval.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAG3C;;GAEG;AACH,MAAM,UAAU,YAAY,CACxB,SAA2B,EAC3B,UAA+B,EAC/B,KAAY;IAEZ,IAAI,CAAC;QACD,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC5C,IAAI,MAAM,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC;QAChC,OAAO,MAAM,CAAC,MAAW,CAAC,CAAC;IAC/B,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACtB,IAAI,KAAK,CAAC,MAAM;YAAE,MAAM,KAAK,CAAC;QAC9B,CAAC,SAAS,EAAE,MAAM,IAAI,OAAO,CAAC,CAAC,IAAI,CAC/B,iCAAiC,UAAU,CAAC,MAAM,MAAO,KAAe,CAAC,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,EACpG;YACI,KAAK;YACL,KAAK;SACR,CACJ,CAAC;QACF,OAAO,IAAI,CAAC;IAChB,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,QAAQ,CACpB,SAA2B,EAC3B,UAA2B,EAC3B,KAAY;IAEZ,IAAI,GAAG,GAAa,IAAI,CAAC;IACzB,IAAI,UAAU,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;QAC1B,KAAK,KAAK,IAAI,KAAK,EAAE,CAAC;QACtB,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACrC,IAAI,CAAC;YACD,GAAG,GAAG,YAAY,CAAI,SAAS,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;QACxD,CAAC;gBAAS,CAAC;YACP,KAAK,EAAE,CAAC;QACZ,CAAC;IACL,CAAC;SAAM,IAAI,UAAU,CAAC,KAAK,IAAI,IAAI,EAAE,CAAC;QAClC,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACf,MAAM,UAAU,CAAC,KAAK,CAAC;QAC3B,CAAC;IACL,CAAC;IACD,IAAI,GAAG,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC;IAC7B,OAAO,GAAG,CAAC;AACf,CAAC"}

package/dist/expression.d.ts

@@ -2,6 +2,7 @@ import type { VmValue } from '@mirascript/mirascript';
 import type { Tagged } from 'type-fest';
 import type { LegacyType, TsTypeOf, TypeInfo } from './type.js';
 import type { Scope } from './scope.js';
+import type { Evaluator } from './main.js';
 /** 表达式的标记属性 */
 export declare const ExpressionTag: "\u0275exp";
 /** 表示一个表达式 */
@@ -14,10 +15,7 @@ export type Expression<T extends VmValue = VmValue> = {
 /**
  * 编译后的表达式
  */
-export interface CompiledExpression<T extends VmValue = VmValue> extends Expression<T> {
-    (scope: Scope, defaults: T): T;
-    (scope?: Scope): T | undefined;
-}
+export type CompiledExpression<T extends VmValue = VmValue> = Expression<T> & ExpressionFunction<T>;
 /** 表示一个表达式内容 */
 export type ExpressionSource<T extends VmValue = VmValue> = Tagged<string, 'ExpressionResult', T>;
 /** 表示表达式或值 */
@@ -34,4 +32,12 @@ export type ExpressionResult<T> = T extends Expression<infer R> ? R : T;
 export type ExpressionResultObject<T> = {
     [K in keyof T]: ExpressionResult<T[K]>;
 };
+/**
+ * 表示一个具有类似表达式功能的 JS 函数
+ */
+export type ExpressionFunction<out T> = (
+/** 当前作用域 */
+scope: Scope, 
+/** 当前求值器 */
+evaluator: Evaluator) => T | null;
 //# sourceMappingURL=expression.d.ts.map

package/dist/expression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expression.d.ts","sourceRoot":"","sources":["../src/expression.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAExC,eAAe;AACf,eAAO,MAAM,aAAa,EAAG,WAAe,CAAC;AAG7C,cAAc;AACd,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,IAAI;IAClD,+BAA+B;IAC/B,QAAQ,CAAC,CAAC,aAAa,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,EAAE,CAAC;IACrD,YAAY;IACZ,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC;CACxC,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,kBAAkB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CAAE,SAAQ,UAAU,CAAC,CAAC,CAAC;IAClF,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,CAAC,GAAG,SAAS,CAAC;CAClC;AAED,gBAAgB;AAChB,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC;AAElG,cAAc;AACd,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,IAAI,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAC/E,mBAAmB;AACnB,wBAAgB,UAAU,CAAC,CAAC,SAAS,QAAQ,GAAG,UAAU,EACtD,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EACxC,UAAU,EAAE,CAAC,GACd,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3B,sBAAsB;AACtB,wBAAgB,UAAU,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;AAavG,eAAe;AACf,wBAAgB,YAAY,CAAC,CAAC,SAAS,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,UAAU,CAAC,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAG9G;AAED,mBAAmB;AACnB,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI,CAAC,SAAS,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAExE,sBAAsB;AACtB,MAAM,MAAM,sBAAsB,CAAC,CAAC,IAAI;KACnC,CAAC,IAAI,MAAM,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACzC,CAAC"}
+{"version":3,"file":"expression.d.ts","sourceRoot":"","sources":["../src/expression.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE3C,eAAe;AACf,eAAO,MAAM,aAAa,EAAG,WAAe,CAAC;AAG7C,cAAc;AACd,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,IAAI;IAClD,+BAA+B;IAC/B,QAAQ,CAAC,CAAC,aAAa,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,EAAE,CAAC;IACrD,YAAY;IACZ,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC;CACxC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,IAAI,UAAU,CAAC,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;AAEpG,gBAAgB;AAChB,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC;AAElG,cAAc;AACd,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,IAAI,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAC/E,mBAAmB;AACnB,wBAAgB,UAAU,CAAC,CAAC,SAAS,QAAQ,GAAG,UAAU,EACtD,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EACxC,UAAU,EAAE,CAAC,GACd,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3B,sBAAsB;AACtB,wBAAgB,UAAU,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;AAavG,eAAe;AACf,wBAAgB,YAAY,CAAC,CAAC,SAAS,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,UAAU,CAAC,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAG9G;AAED,mBAAmB;AACnB,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI,CAAC,SAAS,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAExE,sBAAsB;AACtB,MAAM,MAAM,sBAAsB,CAAC,CAAC,IAAI;KACnC,CAAC,IAAI,MAAM,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACzC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAAC,GAAG,CAAC,CAAC,IAAI;AACpC,YAAY;AACZ,KAAK,EAAE,KAAK;AACZ,YAAY;AACZ,SAAS,EAAE,SAAS,KACnB,CAAC,GAAG,IAAI,CAAC"}

package/dist/expression.js

@@ -2,17 +2,17 @@
 export const ExpressionTag = 'ɵexp';
 /** 创建一个表达式 */
 export function Expression(source, returnType = '') {
-    if (!source)
-        throw new Error(`Invalid expression ${String(source)}`);
+    if (source == null)
+        throw new TypeError(`Invalid expression ${String(source)}`);
     const s = isExpression(source) ? source.source : source;
-    if (!s || typeof s != 'string')
-        throw new Error(`Invalid expression ${String(s)}`);
-    return { [ExpressionTag]: returnType, source: s };
+    if (typeof s != 'string')
+        throw new TypeError(`Invalid expression ${String(s)}`);
+    return { [ExpressionTag]: returnType || '', source: s };
 }
 /** 检查是否为表达式 */
 export function isExpression(value) {
     if (value == null || (typeof value != 'object' && typeof value != 'function'))
         return false;
-    return ExpressionTag in value;
+    return typeof value[ExpressionTag] == 'string';
 }
 //# sourceMappingURL=expression.js.map

package/dist/expression.js.map

@@ -1 +1 @@
-{"version":3,"file":"expression.js","sourceRoot":"","sources":["../src/expression.ts"],"names":[],"mappings":"AAKA,eAAe;AACf,MAAM,CAAC,MAAM,aAAa,GAAG,MAAe,CAAC;AAgC7C,cAAc;AACd,MAAM,UAAU,UAAU,CACtB,MAA8B,EAC9B,aAAyC,EAAE;IAE3C,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACrE,MAAM,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;IACxD,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,IAAI,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACnF,OAAO,EAAE,CAAC,aAAa,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,CAAwB,EAAE,CAAC;AAC7E,CAAC;AAED,eAAe;AACf,MAAM,UAAU,YAAY,CAAoB,KAAc;IAC1D,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,QAAQ,IAAI,OAAO,KAAK,IAAI,UAAU,CAAC;QAAE,OAAO,KAAK,CAAC;IAC5F,OAAO,aAAa,IAAI,KAAK,CAAC;AAClC,CAAC"}
+{"version":3,"file":"expression.js","sourceRoot":"","sources":["../src/expression.ts"],"names":[],"mappings":"AAMA,eAAe;AACf,MAAM,CAAC,MAAM,aAAa,GAAG,MAAe,CAAC;AA6B7C,cAAc;AACd,MAAM,UAAU,UAAU,CACtB,MAA8B,EAC9B,aAAyC,EAAE;IAE3C,IAAI,MAAM,IAAI,IAAI;QAAE,MAAM,IAAI,SAAS,CAAC,sBAAsB,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAChF,MAAM,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;IACxD,IAAI,OAAO,CAAC,IAAI,QAAQ;QAAE,MAAM,IAAI,SAAS,CAAC,sBAAsB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACjF,OAAO,EAAE,CAAC,aAAa,CAAC,EAAE,UAAU,IAAI,EAAE,EAAE,MAAM,EAAE,CAAwB,EAAE,CAAC;AACnF,CAAC;AAED,eAAe;AACf,MAAM,UAAU,YAAY,CAAoB,KAAc;IAC1D,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,QAAQ,IAAI,OAAO,KAAK,IAAI,UAAU,CAAC;QAAE,OAAO,KAAK,CAAC;IAC5F,OAAO,OAAQ,KAAuB,CAAC,aAAa,CAAC,IAAI,QAAQ,CAAC;AACtE,CAAC"}

package/dist/index.d.ts

@@ -1,6 +1,8 @@
-export type { Options, Context } from './context.js';
+export type { Options, Logger } from './interface.js';
 export { Scope } from './scope.js';
 export { Evaluator } from './main.js';
+export type { GlobalReferenceChain } from './analyze.js';
 export * from './expression.js';
 export * from './type.js';
+export * from './re-exports.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,YAAY,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACzD,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC;AAC1B,cAAc,iBAAiB,CAAC"}

package/dist/index.js

@@ -2,4 +2,5 @@ export { Scope } from './scope.js';
 export { Evaluator } from './main.js';
 export * from './expression.js';
 export * from './type.js';
+export * from './re-exports.js';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC;AAC1B,cAAc,iBAAiB,CAAC"}

package/dist/interface.d.ts

@@ -0,0 +1,30 @@
+/** 日志 */
+export interface Logger {
+    /**
+     * error
+     */
+    error(...args: unknown[]): void;
+    /**
+     * warning
+     */
+    warn(...args: unknown[]): void;
+    /**
+     * info
+     */
+    info(...args: unknown[]): void;
+    /**
+     * debug
+     */
+    debug(...args: unknown[]): void;
+}
+/** 选项 */
+export interface Options {
+    /** 日志 */
+    logger: Logger;
+    /** 表达式缓存 */
+    expressionCacheSize: number;
+    /** 模板缓存 */
+    templateCacheSize: number;
+}
+export declare const defaultOptions: Options;
+//# sourceMappingURL=interface.d.ts.map

package/dist/interface.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../src/interface.ts"],"names":[],"mappings":"AAAA,SAAS;AACT,MAAM,WAAW,MAAM;IACnB;;OAEG;IACH,KAAK,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAChC;;OAEG;IACH,IAAI,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAC/B;;OAEG;IACH,IAAI,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAC/B;;OAEG;IACH,KAAK,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;CACnC;AAED,SAAS;AACT,MAAM,WAAW,OAAO;IACpB,SAAS;IACT,MAAM,EAAE,MAAM,CAAC;IACf,YAAY;IACZ,mBAAmB,EAAE,MAAM,CAAC;IAC5B,WAAW;IACX,iBAAiB,EAAE,MAAM,CAAC;CAC7B;AAED,eAAO,MAAM,cAAc,EAAE,OAI5B,CAAC"}

package/dist/interface.js

@@ -0,0 +1,6 @@
+export const defaultOptions = {
+    logger: console,
+    expressionCacheSize: 50,
+    templateCacheSize: 50,
+};
+//# sourceMappingURL=interface.js.map

package/dist/interface.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"interface.js","sourceRoot":"","sources":["../src/interface.ts"],"names":[],"mappings":"AA8BA,MAAM,CAAC,MAAM,cAAc,GAAY;IACnC,MAAM,EAAE,OAAO;IACf,mBAAmB,EAAE,EAAE;IACvB,iBAAiB,EAAE,EAAE;CACxB,CAAC"}