@cloudpss/expression 0.6.0-alpha.12 → 0.6.0-alpha.14

package/dist/scope.d.ts

@@ -18,6 +18,10 @@ export declare class Scope {
     throws?: boolean, 
     /** 执行环境名称 */
     name?: string);
+    /** 枚举环境中的值 */
+    enumerator: (() => Iterable<string>) | null | undefined;
+    /** 描述环境中的值 */
+    describer: ((key: string) => string | undefined) | null | undefined;
     /** 执行器上下文 */
     protected evaluator: Evaluator | null;
     /** 求值计数 */

package/dist/scope.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scope.d.ts","sourceRoot":"","sources":["../src/scope.ts"],"names":[],"mappings":"AAAA,OAAO,EAKH,KAAK,SAAS,EAEd,KAAK,OAAO,EAEf,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACH,KAAK,kBAAkB,EACvB,KAAK,UAAU,EACf,KAAK,iBAAiB,EAGzB,MAAM,iBAAiB,CAAC;AAIzB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AA8D3C,cAAc;AACd,qBAAa,KAAK;IAIV,gBAAgB;IAChB,QAAQ,CAAC,KAAK,EACR,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,iBAAiB,GAAG,SAAS,CAAC,GAChD,MAAM,CAAC,MAAM,EAAE,iBAAiB,GAAG,SAAS,CAAC,GAC7C,IAAI;IACV,gBAAgB;IAChB,QAAQ,CAAC,MAAM;IACf,aAAa;IACb,QAAQ,CAAC,IAAI;IAXjB,aAAa;IACb,MAAM,CAAC,QAAQ,CAAC,aAAa,OAAO;;IAEhC,gBAAgB;IACP,KAAK,GACR,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,iBAAiB,GAAG,SAAS,CAAC,GAChD,MAAM,CAAC,MAAM,EAAE,iBAAiB,GAAG,SAAS,CAAC,GAC7C,IAAW;IACjB,gBAAgB;IACP,MAAM,UAAO;IACtB,aAAa;IACJ,IAAI,SAAgB;IAGjC,aAAa;IACb,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAAQ;IAC7C,WAAW;IACX,SAAS,CAAC,WAAW,SAAK;IAC1B,YAAY;IACZ,KAAK,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,GAAG,MAAM,IAAI;IAU9C,mBAAmB;IACnB,SAAS,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAAQ;IAC1C,mBAAmB;IACnB,IAAI,KAAK,IAAI,SAAS,CAwBrB;IAED,oDAAoD;IACpD,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAYzB,kDAAkD;IAClD,GAAG,CAAC,CAAC,SAAS,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS;IAalD,cAAc;IACd,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,kBAAkB,EAAE,IAAI,EAAE,SAAS,WAAW,EAAE,GAAG,OAAO;CA6B3F;AAmBD,eAAe;AACf,wBAAgB,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAErC"}
+{"version":3,"file":"scope.d.ts","sourceRoot":"","sources":["../src/scope.ts"],"names":[],"mappings":"AAAA,OAAO,EAKH,KAAK,SAAS,EAEd,KAAK,OAAO,EAEf,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACH,KAAK,kBAAkB,EACvB,KAAK,UAAU,EACf,KAAK,iBAAiB,EAGzB,MAAM,iBAAiB,CAAC;AAIzB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AA8D3C,cAAc;AACd,qBAAa,KAAK;IAIV,gBAAgB;IAChB,QAAQ,CAAC,KAAK,EACR,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,iBAAiB,GAAG,SAAS,CAAC,GAChD,MAAM,CAAC,MAAM,EAAE,iBAAiB,GAAG,SAAS,CAAC,GAC7C,IAAI;IACV,gBAAgB;IAChB,QAAQ,CAAC,MAAM;IACf,aAAa;IACb,QAAQ,CAAC,IAAI;IAXjB,aAAa;IACb,MAAM,CAAC,QAAQ,CAAC,aAAa,OAAO;;IAEhC,gBAAgB;IACP,KAAK,GACR,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,iBAAiB,GAAG,SAAS,CAAC,GAChD,MAAM,CAAC,MAAM,EAAE,iBAAiB,GAAG,SAAS,CAAC,GAC7C,IAAW;IACjB,gBAAgB;IACP,MAAM,UAAO;IACtB,aAAa;IACJ,IAAI,SAAgB;IAEjC,cAAc;IACd,UAAU,EAAE,CAAC,MAAM,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,CAAQ;IAC/D,cAAc;IACd,SAAS,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC,GAAG,IAAI,GAAG,SAAS,CAAQ;IAE3E,aAAa;IACb,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAAQ;IAC7C,WAAW;IACX,SAAS,CAAC,WAAW,SAAK;IAC1B,YAAY;IACZ,KAAK,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,GAAG,MAAM,IAAI;IAU9C,mBAAmB;IACnB,SAAS,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAAQ;IAC1C,mBAAmB;IACnB,IAAI,KAAK,IAAI,SAAS,CA4CrB;IAED,oDAAoD;IACpD,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAYzB,kDAAkD;IAClD,GAAG,CAAC,CAAC,SAAS,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS;IAalD,cAAc;IACd,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,kBAAkB,EAAE,IAAI,EAAE,SAAS,WAAW,EAAE,GAAG,OAAO;CA2B3F;AAmBD,eAAe;AACf,wBAAgB,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAErC"}

package/dist/scope.js

@@ -72,6 +72,10 @@ export class Scope {
         this.scope = scope;
         this.throws = throws;
         this.name = name;
+        /** 枚举环境中的值 */
+        this.enumerator = null;
+        /** 描述环境中的值 */
+        this.describer = null;
         /** 执行器上下文 */
         this.evaluator = null;
         /** 求值计数 */
@@ -95,9 +99,13 @@ export class Scope {
         if (this._proxy != null)
             return this._proxy;
         let getter;
-        const { scope } = this;
+        let enumerate;
+        let describe;
+        const { scope, enumerator, describer } = this;
         if (scope == null) {
             getter = (key) => this.evaluator?.imported.get(key);
+            enumerate = () => this.evaluator?.imported.keys() ?? [];
+            describe = () => undefined;
         }
         else if (typeof scope == 'function') {
             getter = (key) => {
@@ -119,7 +127,25 @@ export class Scope {
                 return createProxy(v, this, [key]);
             };
         }
-        const proxy = createVmContext(getter);
+        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;
     }
@@ -156,6 +182,7 @@ export class Scope {
     /** 表达式递归求值 */
     eval(expression, path) {
         if (this.evalCounter >= Scope.MAX_RECURSION) {
+            this.evalCounter = 0;
             throw new Error(`Execution recursion exceeds limit`);
         }
         this.evalCounter++;
@@ -166,9 +193,6 @@ export class Scope {
             }
             else {
                 const { evaluator } = this;
-                if (!evaluator) {
-                    throw new Error(`Undefined evaluator`);
-                }
                 const exp = parse(evaluator, expression.source, this.throws, false);
                 if (exp.func != null) {
                     result = evaluateEval(evaluator, exp, this);

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudpss/expression",
-  "version": "0.6.0-alpha.12",
+  "version": "0.6.0-alpha.14",
   "author": "CloudPSS",
   "license": "MIT",
   "type": "module",
@@ -12,7 +12,7 @@
     "./*": "./dist/*.js"
   },
   "dependencies": {
-    "@mirascript/mirascript": "^0.1.9",
+    "@mirascript/mirascript": "^0.1.13",
     "klona": "^2.0.6",
     "lru-cache": "^11.2.2",
     "mathjs": "^15.1.0",

package/src/eval.ts

@@ -7,7 +7,7 @@ import type { Evaluator } from './main.js';
  * 表达式求值
  */
 export function evaluateEval<T extends VmValue>(
-    evaluator: Evaluator,
+    evaluator: Evaluator | null,
     expression: EvalExpressionCache,
     scope: Scope,
 ): T | null {
@@ -17,7 +17,7 @@ export function evaluateEval<T extends VmValue>(
         return unwrap(result as T);
     } catch (error: unknown) {
         if (scope.throws) throw error;
-        evaluator.logger.warn(
+        (evaluator?.logger ?? console).warn(
             `Failed to execute expression "${expression.source}": ${(error as Error).message || String(error)}.`,
             {
                 error,
@@ -31,7 +31,11 @@ export function evaluateEval<T extends VmValue>(
 /**
  * 表达式求值
  */
-export function evaluate<T extends VmValue>(evaluator: Evaluator, expression: ExpressionCache, scope: Scope): T | null {
+export function evaluate<T extends VmValue>(
+    evaluator: Evaluator | null,
+    expression: ExpressionCache,
+    scope: Scope,
+): T | null {
     let ret: T | null = null;
     if (expression.func != null) {
         scope ??= new Scope();

package/src/migrator/function.ts

@@ -0,0 +1,27 @@
+import type { FunctionAssignmentNode } from 'mathjs';
+import type { Result } from './interface.js';
+import { migrateAtomic } from './node.js';
+import { type State, FunctionState } from './state.js';
+import { migrateSymbolName } from './utils.js';
+
+/** 转换函数定义语句 */
+export function migrateFunctionAssignment(state: State, node: FunctionAssignmentNode): Result {
+    state.loose();
+    const { name, params, expr } = node;
+    const fState = new FunctionState(state, params);
+    let body = migrateAtomic(fState, expr);
+    if (!(body.code.startsWith('{') && body.code.endsWith('}'))) {
+        body = { ...body, code: `{ ${body.code} }` };
+    }
+    if (state.locals.has(name)) {
+        state.err(`重复定义函数: '${name}'`);
+    }
+    state.locals.set(name, {
+        type: 'function',
+        code: body.code,
+    });
+    return {
+        type: 'function',
+        code: `fn ${migrateSymbolName(name, true)}(${params.join(', ')}) ${body.code}`,
+    };
+}

package/src/migrator/node.ts

@@ -1,4 +1,4 @@
-import { serialize, serializePropName } from '@mirascript/mirascript/subtle';
+import { serializePropName } from '@mirascript/mirascript/subtle';
 import {
     type MathNode,
     isAccessorNode,
@@ -12,6 +12,7 @@ import {
     isRelationalNode,
     type OperatorNodeFn,
     isSymbolNode,
+    isFunctionAssignmentNode,
 } from 'mathjs';
 import type { State } from './state.js';
 import type { Options, Result } from './interface.js';
@@ -22,6 +23,8 @@ import { migrateCall } from './call.js';
 import { migrateOperator } from './operator.js';
 import { migrateSymbol } from './symbol.js';
 import { migrateCondition } from './condition.js';
+import { migrateFunctionAssignment } from './function.js';
+import { serialize } from './serialize.js';
 
 /** 转换 AST */
 export function migrateAtomic(state: State, node: MathNode): Result {
@@ -41,23 +44,6 @@ export function migrateNode(state: State, node: MathNode, options: Options): Res
     if (isConstantNode(node)) {
         const { value } = node;
         if (value == null) return { code: 'nil', literal: null, type: 'nil' };
-        if (typeof value === 'number' && Number.isFinite(value) && value !== 0) {
-            const p1 = value.toString();
-            const p2 = value.toExponential();
-            if (p2.length < p1.length) {
-                return {
-                    code: p2,
-                    literal: value,
-                    type: 'number',
-                };
-            } else {
-                return {
-                    code: p1,
-                    literal: value,
-                    type: 'number',
-                };
-            }
-        }
         return {
             code: serialize(value),
             literal: value,
@@ -141,8 +127,15 @@ export function migrateNode(state: State, node: MathNode, options: Options): Res
             code,
         };
     }
+    if (isFunctionAssignmentNode(node)) {
+        const result = migrateFunctionAssignment(state, node);
+        state.helper(result.code);
+        return {
+            type: 'function',
+            code: node.name,
+        };
+    }
     // if (isRangeNode(node)) {
     // if (isIndexNode(node)) {
-    // if (isFunctionAssignmentNode(node)) {
     return unsupportedNode(state, node);
 }

package/src/migrator/operator.ts

@@ -8,13 +8,14 @@ import {
     isOperatorNode,
     isNode,
 } from 'mathjs';
+import { operations } from '@mirascript/mirascript/subtle';
 import { symbolName, constantValue, equalText, scalar, globalFnName } from './utils.js';
 import type { State } from './state.js';
 import type { Options, Result } from './interface.js';
 import { migrateAtomic, migrateExpr } from './node.js';
 import { toBoolean, toNumber } from './to-type.js';
 import { migrateSymbol } from './symbol.js';
-import { operations, serialize } from '@mirascript/mirascript/subtle';
+import { serialize } from './serialize.js';
 
 const BINARY_MATH_OPERATORS = {
     add: [

package/src/migrator/serialize.ts

@@ -0,0 +1,21 @@
+import type { VmValue } from '@mirascript/mirascript';
+import { serialize as s, serializeNumber } from '@mirascript/mirascript/subtle';
+
+/** 序列化 */
+export function serialize(value: VmValue): string {
+    return s(value, {
+        serializeNumber: (value: number): string => {
+            if (!Number.isFinite(value) || value === 0) {
+                return serializeNumber(value);
+            }
+            const p1 = value.toString();
+            const p2 = value.toExponential();
+            // 还是优先选择默认的形式，除非指数形式更短很多
+            if (p2.length + 2 < p1.length) {
+                return p2;
+            } else {
+                return p1;
+            }
+        },
+    });
+}

package/src/migrator/state.ts

@@ -2,7 +2,6 @@ import type { VmContext } from '@mirascript/mirascript';
 import { parse } from './parser.js';
 import {
     type AssignmentNode,
-    type FunctionAssignmentNode,
     isAssignmentNode,
     isBlockNode,
     isFunctionAssignmentNode,
@@ -12,9 +11,10 @@ import {
 import type { Result } from './interface.js';
 import { migrateAtomic } from './node.js';
 import { toBoolean } from './to-type.js';
-import { constantValue, symbolName, unsupportedNode } from './utils.js';
+import { constantValue, migrateSymbolName, symbolName, unsupportedNode } from './utils.js';
 import { migrateAccess } from './access.js';
 import { specialMigrate } from './special.js';
+import { migrateFunctionAssignment } from './function.js';
 
 /** 转换 AST */
 function migrateLast(state: State, node: MathNode): Result {
@@ -38,17 +38,20 @@ function migrateAssignment(state: State, node: AssignmentNode): Result {
     const { object, index, value } = node;
     const name = symbolName(object);
     if (name && index == null) {
-        // name = xxx;
+        const localName = migrateSymbolName(name, true);
         if (state.locals.has(name)) {
-            state.err(`不支持局部变量重新赋值: ${name}'`);
+            state.err(`不支持局部变量重新赋值: '${name}'`);
             return {
-                code: `${name} = ${migrateAtomic(state, value).code}`,
+                code: `${localName} = ${migrateAtomic(state, value).code}`,
             };
         }
         const expr = migrateAtomic(state, value);
         state.locals.set(name, expr);
+        if (name !== localName) {
+            state.warn(`变量名 '${name}' 是 MiraScript 关键字，已转换为 '${localName}'`);
+        }
         return {
-            code: `let ${name} = ${expr.code};`,
+            code: `let ${localName} = ${expr.code};`,
         };
     }
     if (index != null) {
@@ -60,26 +63,6 @@ function migrateAssignment(state: State, node: AssignmentNode): Result {
     }
     return unsupportedNode(state, node);
 }
-/** 转换函数定义语句 */
-function migrateFunctionAssignment(state: State, node: FunctionAssignmentNode): Result {
-    state.loose();
-    const { name, params, expr } = node;
-    if (state.locals.has(name)) {
-        state.err(`重复定义函数: ${name}`);
-    }
-    const fState = new FunctionState(state, params);
-    let body = migrateAtomic(fState, expr);
-    if (!(body.code.startsWith('{') && body.code.endsWith('}'))) {
-        body = { ...body, code: `{ ${body.code} }` };
-    }
-    state.locals.set(name, {
-        type: 'function',
-        code: body.code,
-    });
-    return {
-        code: `fn ${name}(${params.join(', ')}) ${body.code}`,
-    };
-}
 
 /** 转换状态 */
 export class BaseState {

package/src/migrator/symbol.ts

@@ -2,6 +2,7 @@ import type { SymbolNode } from 'mathjs';
 import type { Result } from './interface.js';
 import type { State } from './state.js';
 import { operations } from '@mirascript/mirascript/subtle';
+import { migrateSymbolName } from './utils.js';
 
 /** 处理符号名称 */
 export function migrateSymbol(state: State, node: SymbolNode, migrateConst: boolean): Result {
@@ -10,14 +11,14 @@ export function migrateSymbol(state: State, node: SymbolNode, migrateConst: bool
     if (local) {
         return {
             ...local,
-            code: name,
+            code: migrateSymbolName(name, true),
         };
     }
     const global = state.globals.get(name);
     if (global != null) {
         return {
             type: operations.$Type(global),
-            code: name,
+            code: migrateSymbolName(name, false),
             global,
         };
     }
@@ -61,6 +62,6 @@ export function migrateSymbol(state: State, node: SymbolNode, migrateConst: bool
     }
     state.warn(`符号 '${name}' 未定义`);
     return {
-        code: name,
+        code: migrateSymbolName(name, false),
     };
 }

package/src/migrator/to-type.ts

@@ -1,6 +1,6 @@
 import { isConstantNode, isNode, type MathNode } from 'mathjs';
 import type { Result } from './interface.js';
-import { serialize } from '@mirascript/mirascript/subtle';
+import { serialize } from './serialize.js';
 import type { State } from './state.js';
 import { migrateNode } from './node.js';
 import { globalFnName } from './utils.js';

package/src/migrator/utils.ts

@@ -1,4 +1,5 @@
 import { type MathNode, isSymbolNode, isConstantNode } from 'mathjs';
+import { keywords } from '@mirascript/mirascript/subtle';
 import type { Result } from './interface.js';
 import type { State } from './state.js';
 import { toString } from './to-type.js';
@@ -18,6 +19,14 @@ export function symbolName(node: MathNode): string | undefined {
     return node.name;
 }
 
+const kw = new Set(keywords());
+/** 转换为 mirascript 符号 */
+export function migrateSymbolName(name: string, local: boolean): string {
+    if (!kw.has(name)) return name;
+    if (local) return `__${name}__`;
+    return `global.${name}`;
+}
+
 /** 获取 constant value */
 export function constantValue(node: MathNode): number | string | boolean | null | undefined {
     if (!isConstantNode(node)) return undefined;

package/src/parser.ts

@@ -57,7 +57,8 @@ const kTemplateCache = Symbol('cloudpss.expression.templateCache');
 const kExpressionCache = Symbol('cloudpss.expression.expressionCache');
 
 /** 获取编译缓存 */
-function getCache(evaluator: Evaluator, template: boolean): LRUCache<string, EvalExpressionCache> {
+function getCache(evaluator: Evaluator | null, template: boolean): LRUCache<string, EvalExpressionCache> | null {
+    if (evaluator == null) return null;
     const key = template ? kTemplateCache : kExpressionCache;
     if (!(key in evaluator)) {
         const size = template ? evaluator.options.templateCacheSize : evaluator.options.expressionCacheSize;
@@ -71,18 +72,23 @@ function getCache(evaluator: Evaluator, template: boolean): LRUCache<string, Eva
 /**
  * 解析表达式
  */
-export function parse(evaluator: Evaluator, expression: string, throws: boolean, template: boolean): ExpressionCache {
+export function parse(
+    evaluator: Evaluator | null,
+    expression: string,
+    throws: boolean,
+    template: boolean,
+): ExpressionCache {
     if (typeof expression != 'string') {
         throw new TypeError(`${String(expression)} is not a valid expression`);
     }
     const cache = getCache(evaluator, template);
-    const cached = cache.get(expression);
+    const cached = cache?.get(expression);
     if (cached != null) return cached;
     const complied = compile(expression, template);
     if (complied.error) {
         if (throws) throw complied.error;
     } else {
-        cache.set(expression, complied);
+        cache?.set(expression, complied);
     }
     return complied;
 }

package/src/scope.ts

@@ -95,6 +95,10 @@ export class Scope {
         /** 执行环境名称 */
         readonly name = '<anonymous>',
     ) {}
+    /** 枚举环境中的值 */
+    enumerator: (() => Iterable<string>) | null | undefined = null;
+    /** 描述环境中的值 */
+    describer: ((key: string) => string | undefined) | null | undefined = null;
 
     /** 执行器上下文 */
     protected evaluator: Evaluator | null = null;
@@ -117,9 +121,13 @@ export class Scope {
     get proxy(): VmContext {
         if (this._proxy != null) return this._proxy;
         let getter: (key: string) => VmAny;
-        const { scope } = this;
+        let enumerate: () => Iterable<string>;
+        let describe: ((key: string) => string | undefined) | undefined;
+        const { scope, enumerator, describer } = this;
         if (scope == null) {
             getter = (key) => this.evaluator?.imported.get(key);
+            enumerate = () => this.evaluator?.imported.keys() ?? [];
+            describe = () => undefined;
         } else if (typeof scope == 'function') {
             getter = (key) => {
                 const v = scope(key);
@@ -135,7 +143,23 @@ export class Scope {
                 return createProxy(v, this, [key]) as VmValue;
             };
         }
-        const proxy = createVmContext(getter);
+        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;
     }
@@ -170,6 +194,7 @@ export class Scope {
     /** 表达式递归求值 */
     eval(expression: Expression | CompiledExpression, path: readonly PropertyKey[]): VmValue {
         if (this.evalCounter >= Scope.MAX_RECURSION) {
+            this.evalCounter = 0;
             throw new Error(`Execution recursion exceeds limit`);
         }
 
@@ -180,9 +205,6 @@ export class Scope {
                 result = expression(this, this.evaluator!);
             } else {
                 const { evaluator } = this;
-                if (!evaluator) {
-                    throw new Error(`Undefined evaluator`);
-                }
                 const exp = parse(evaluator, expression.source, this.throws, false);
                 if (exp.func != null) {
                     result = evaluateEval(evaluator, exp, this);

package/tests/migrate.ts

@@ -17,6 +17,7 @@ const s = new Scope({
         x: 1,
         y: 2,
     },
+    type: 'keyword',
 });
 const e = new Evaluator();
 
@@ -194,6 +195,35 @@ describe('migrate', () => {
                 `,
             [1, 1, 2, 3],
         ],
+        [`equalText(type, "keyword")`, `global.type == 'keyword'`, true],
+        [
+            `type = { "a": [1,2,3] }; type.a[1]`,
+            dedent`
+                let __type__ = (a: [1, 2, 3]);
+                return @@maybe_chars(__type__.a)[0];
+                // # 帮助函数
+                fn @@maybe_chars(x) { if type(x) == 'string' { chars(x) } else { x } }
+                // # 转换日志
+                // - W: 变量名 'type' 是 MiraScript 关键字，已转换为 '__type__'
+                // # 原始 math.js 表达式
+                // type = { "a": [1,2,3] }; type.a[1]
+                `,
+            1,
+        ],
+        [
+            '[1,2,3].map(f(x,y,z) = x^2)',
+            dedent`
+                return [1, 2, 3]::map(f);
+                // # 帮助函数
+                fn f(x, y, z) { x^2 }
+                // # 转换日志
+                // - W: 使用了非精确转换的语法或函数，结果可能不准确
+                // - W: '^' 不支持矩阵，计算结果可能不一致
+                // # 原始 math.js 表达式
+                // [1,2,3].map(f(x,y,z) = x^2)
+                `,
+            [1, 4, 9],
+        ],
     ])('should migrate expression: %s', (f, t, r) => {
         const migrated = migrateMathJs(f as ExpressionSource, false, s);
         expect(migrated).toBe(t);