@cloudpss/expression 0.6.0-alpha.2 → 0.6.0-alpha.20

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,15 @@ 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) {
+    if (state.globals.has(name)) {
+        const global = state.globals.get(name);
         return {
             type: operations.$Type(global),
-            code: name,
+            code: migrateSymbolName(name, false),
+            global,
         };
     }
     if (name.startsWith('$') || name.startsWith('@')) {
@@ -33,21 +35,33 @@ export function migrateSymbol(state: State, node: SymbolNode, migrateConst: bool
                 code: `i`,
             };
         }
-        if (name === 'pi' || name === 'PI') {
+        if (name === 'pi') {
             return {
                 type: 'number',
-                code: `@pi`,
+                code: `PI`,
             };
         }
-        if (name === 'e' || name === 'E') {
+        if (name === 'e') {
             return {
                 type: 'number',
-                code: `@e`,
+                code: `E`,
+            };
+        }
+        if (name === '__PREVIEW') {
+            return {
+                type: 'boolean',
+                code: '@PREVIEW',
+            };
+        }
+        if (name === '__ICON') {
+            return {
+                type: 'boolean',
+                code: '@ICON',
             };
         }
     }
     state.warn(`符号 '${name}' 未定义`);
     return {
-        code: name,
+        code: migrateSymbolName(name, false),
     };
 }

package/src/migrator/to-type.ts

@@ -1,13 +1,16 @@
 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';
 
 /** 转换 AST */
 export function toBoolean(state: State, node: MathNode | Result): Result {
     const helper = (): void => {
-        state.helper("fn @@to_boolean { it != '' && it != 0 && it is not nan && !!it }");
+        state.helper(
+            "fn @@to_boolean { if it is nil { nil } else { it != '' && it != '0' && it != 0 && it is not nan && it != false } }",
+        );
     };
     if (!isNode(node)) {
         if (node.type === 'boolean') return node;
@@ -46,9 +49,17 @@ export function toString(state: State, node: MathNode | Result): Result {
                 code: node.as_string,
             };
         }
+        if (node.type === 'number' && node.literal !== undefined) {
+            const lit = String(node.literal);
+            return {
+                type: 'string',
+                literal: lit,
+                code: serialize(lit),
+            };
+        }
         return {
             type: 'string',
-            code: `to_string(${node.code})`,
+            code: `${globalFnName(state, 'to_string')}(${node.code})`,
         };
     }
     if (isConstantNode(node)) {
@@ -74,9 +85,17 @@ export function toNumber(state: State, node: MathNode | Result): Result {
                 code: node.as_number,
             };
         }
+        if ((node.type === 'string' || node.type === 'boolean') && node.literal !== undefined) {
+            const lit = Number(node.literal);
+            return {
+                type: 'number',
+                literal: lit,
+                code: serialize(lit),
+            };
+        }
         return {
             type: 'number',
-            code: `to_number(${node.code})`,
+            code: `${globalFnName(state, 'to_number')}(${node.code})`,
         };
     }
     if (isConstantNode(node)) {

package/src/migrator/utils.ts

@@ -1,15 +1,32 @@
 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';
 import { migrateExpr } from './node.js';
 
+/** 获取全局函数的名字 */
+export function globalFnName(state: State, fnName: string): string {
+    if (state.locals.has(fnName)) {
+        return `global.${fnName}`;
+    }
+    return fnName;
+}
+
 /** 获取 symbol name */
 export function symbolName(node: MathNode): string | undefined {
     if (!isSymbolNode(node)) return 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;
@@ -65,3 +82,24 @@ export function equalText(state: State, op: '==' | '!=', l: MathNode, r: MathNod
         code: `${toString(state, lr).code} ${op} ${toString(state, rr).code}`,
     };
 }
+
+/** 计算长度 */
+export function len(state: State, obj: Result): Result {
+    if (obj.type === 'string')
+        return {
+            type: 'number',
+            code: `len(chars(${obj.code}))`,
+        };
+    if (obj.type === 'array')
+        return {
+            type: 'number',
+            code: `len(${obj.code})`,
+        };
+    state.helper(
+        `fn @@length(x) { if type(x) == 'string' { len(chars(x)) } else if type(x) == 'array' { len(x) } else { x.length } }`,
+    );
+    return {
+        type: 'number',
+        code: `@@length(${obj.code})`,
+    };
+}

package/src/parser.ts

@@ -1,5 +1,7 @@
 import { compileSync, type VmScript } from '@mirascript/mirascript';
-import type { Context } from './context.js';
+import { LRUCache } from 'lru-cache';
+import type { Evaluator } from './main.js';
+
 /** 一般表达式 */
 export interface EvalExpressionCache {
     /**
@@ -38,12 +40,12 @@ export type ExpressionCache = ErrorExpressionCache | EvalExpressionCache;
 /**
  * 编译表达式
  */
-function compile(expression: string): ExpressionCache {
+function compile(expression: string, template: boolean): ExpressionCache {
     const compiled = {
         source: expression,
     } as ExpressionCache;
     try {
-        const script = compileSync(expression);
+        const script = compileSync(expression, { input_mode: template ? 'Template' : 'Script' });
         compiled.func = script;
     } catch (ex) {
         compiled.error = ex as Error;
@@ -51,19 +53,42 @@ function compile(expression: string): ExpressionCache {
     return compiled;
 }
 
+const kTemplateCache = Symbol('cloudpss.expression.templateCache');
+const kExpressionCache = Symbol('cloudpss.expression.expressionCache');
+
+/** 获取编译缓存 */
+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;
+        Object.defineProperty(evaluator, key, {
+            value: new LRUCache<string, EvalExpressionCache>({ max: size! || 50 }),
+        });
+    }
+    return (evaluator as Evaluator & Record<typeof key, LRUCache<string, EvalExpressionCache>>)[key];
+}
+
 /**
  * 解析表达式
  */
-export function parse(context: Context, expression: string, throws: 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 v = context.expressionCache.get(expression);
-    if (v) return v;
-    const complied = compile(expression);
+    const cache = getCache(evaluator, template);
+    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);
     }
-    context.expressionCache.set(expression, complied);
     return complied;
 }

package/src/re-exports.ts

@@ -0,0 +1,47 @@
+export {
+    isVmAny,
+    isVmArray,
+    isVmConst,
+    isVmContext,
+    isVmExtern,
+    isVmFunction,
+    isVmImmutable,
+    isVmModule,
+    isVmPrimitive,
+    isVmRecord,
+    isVmArrayLikeRecord,
+    isVmArrayLikeRecordByEntires,
+    isVmArrayLikeRecordByKeys,
+    isVmCallable,
+    isVmScript,
+    isVmWrapper,
+    isVmValue,
+    VmExtern,
+    VmFunction,
+    VmModule,
+    VmError,
+    defineVmContextValue,
+} from '@mirascript/mirascript';
+export type {
+    VmScript,
+    VmValueMap,
+    VmAny,
+    VmArray,
+    VmConst,
+    VmContext,
+    VmImmutable,
+    VmPrimitive,
+    VmRecord,
+    VmUninitialized,
+    VmValue,
+} from '@mirascript/mirascript';
+export {
+    serialize,
+    serializeRecordKey,
+    serializeString,
+    type SerializeOptions,
+    constants,
+    DefaultVmContext,
+    lib,
+    operations,
+} from '@mirascript/mirascript/subtle';

package/src/scope.ts

@@ -1,5 +1,13 @@
-import { createVmContext, isVmExtern, type VmAny, type VmContext, type VmValue } from '@mirascript/mirascript';
-import type { Context } from './context.js';
+import {
+    createVmContext,
+    isVmExtern,
+    type VmAny,
+    type VmArray,
+    type VmContext,
+    type VmRecord,
+    type VmValue,
+    isVmModule,
+} from '@mirascript/mirascript';
 import {
     type CompiledExpression,
     type Expression,
@@ -7,16 +15,27 @@ 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';
+import type { Evaluator } from './main.js';
 const { hasOwn } = Object;
 
 const RAW = Symbol.for('@private/expression:raw');
 
 /** 是否需要创建代理对象 */
-function needsProxy(value: unknown): value is Expression | object {
-    return isExpression(value) || (value != null && typeof value == 'object');
+function needsProxy(value: ExpressionOrValue | undefined): value is Expression | VmArray | VmRecord {
+    // 先检查 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;
 }
 
 /** 创建代理对象 */
@@ -53,75 +72,99 @@ class ScopeProxyHandler implements ProxyHandler<object> {
         if (p === RAW) {
             return target;
         }
-        const value = Reflect.get(target, p) as unknown;
-        if (!needsProxy(value)) {
+        const value = Reflect.get(target, p) as ExpressionOrValue;
+        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]);
     }
 }
 
+/** 最大求值计数 */
+const MAX_RECURSION = 500;
 /** 函数的执行环境 */
 export class Scope {
-    /** 最大求值计数 */
-    static readonly MAX_RECURSION = 500;
     constructor(
         /** 生成环境的工厂函数 */
-        readonly scope?:
+        readonly scope:
             | ((key: string) => ExpressionOrValue | undefined)
-            | Record<string, ExpressionOrValue | undefined>,
+            | Record<string, ExpressionOrValue | undefined>
+            | null = null,
         /** 求值失败是否抛异常 */
         readonly throws = true,
         /** 执行环境名称 */
         readonly name = '<anonymous>',
-    ) {
-        if (scope == null) {
-            this.getter = (key) => this.context?.imported.get(key);
-        } else if (typeof scope == 'function') {
-            this.getter = (key) => {
-                const v = scope(key);
-                if (v === undefined) return this.context?.imported.get(key);
-                if (!needsProxy(v)) return v;
-                return createProxy(v, this, [key]) as VmValue;
-            };
-        } else {
-            this.getter = (key) => {
-                if (!hasOwn(scope, key)) return this.context?.imported.get(key);
-                const v = scope[key];
-                if (!needsProxy(v)) return v;
-                return createProxy(v, this, [key]) as VmValue;
-            };
-        }
-    }
+    ) {}
+    /** 枚举环境中的值 */
+    enumerator: (() => Iterable<string>) | null | undefined = null;
+    /** 描述环境中的值 */
+    describer: ((key: string) => string | undefined) | null | undefined = null;
 
-    protected readonly getter: (key: string) => VmAny;
-    /** 上下文 */
-    protected context: Context | null = null;
+    /** 执行器上下文 */
+    protected evaluator: Evaluator | null = null;
     /** 求值计数 */
     protected evalCounter = 0;
-    /** 重置执行环境 */
-    reset(context: Context | null): () => void {
-        const oldContext = this.context;
+    /** 重置执行器 */
+    reset(evaluator: Evaluator | null): () => void {
+        const oldEvaluator = this.evaluator;
         const oldCounter = this.evalCounter;
-        this.context = context;
+        this.evaluator = evaluator;
         this.evalCounter = 0;
         return () => {
-            this.context = oldContext;
+            this.evaluator = oldEvaluator;
             this.evalCounter = oldCounter;
         };
     }
     /** 函数的执行环境，惰性求值 */
-    protected _proxy?: VmContext;
+    protected _proxy: VmContext | null = null;
     /** 函数的执行环境，惰性求值 */
     get proxy(): VmContext {
-        this._proxy ??= createVmContext(this.getter);
-        return this._proxy;
+        if (this._proxy != null) return this._proxy;
+        let getter: (key: string) => VmAny;
+        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);
+                if (v === undefined) return this.evaluator?.imported.get(key);
+                if (!needsProxy(v)) return v;
+                return createProxy(v, this, [key]) as VmValue;
+            };
+        } else {
+            getter = (key) => {
+                if (!hasOwn(scope, key)) return this.evaluator?.imported.get(key);
+                const v = scope[key];
+                if (!needsProxy(v)) return v;
+                return createProxy(v, this, [key]) as VmValue;
+            };
+        }
+        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;
     }
 
-    /** 检查环境中是否有值 */
+    /** 检查环境中是否有值，不包含 evaluator 和 default context 中的值 */
     has(key: string): boolean {
         const { scope } = this;
         if (scope == null) return false;
@@ -134,8 +177,8 @@ export class Scope {
         return v !== undefined;
     }
 
-    /** 获取环境中的值 */
-    get(key: string): VmAny {
+    /** 获取环境中的值，不包含 evaluator 和 default context 中的值 */
+    get<V extends VmValue>(key: string): V | undefined {
         const { scope } = this;
         if (scope == null) return undefined;
         let v;
@@ -144,41 +187,34 @@ export class Scope {
         } else if (hasOwn(scope, key)) {
             v = scope[key];
         }
-        if (!isExpression(v)) return v;
-        return this.eval(v, [key]);
+        if (!isExpression(v)) return v satisfies VmValue | undefined as V | undefined;
+        return this.eval(v, [key]) satisfies VmValue as V;
     }
 
-    /**
-     * 表达式递归求值
-     */
+    /** 表达式递归求值 */
     eval(expression: Expression | CompiledExpression, path: readonly PropertyKey[]): VmValue {
-        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: VmValue | null = null;
             if (typeof expression == 'function') {
-                result = expression(this) as VmValue;
+                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 as Error).message || String(ex)}\nIn ${this.name}: @ ${path.join('/')}`);
         }

package/src/type.ts

@@ -1,5 +1,5 @@
 import type { TypeName, VmValue, VmValueMap } from '@mirascript/mirascript';
-import { lib } from '@mirascript/mirascript/subtle';
+import { convert } from '@mirascript/mirascript/subtle';
 
 /** 类型信息 */
 export type TypeInfo = 'string' | 'number' | 'boolean';
@@ -12,23 +12,26 @@ 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 const TypeInfo = {
-    parse: (type: TypeInfo | LegacyType): TypeInfo => {
+export namespace TypeInfo {
+    /** 解析类型 */
+    export function parse(type: TypeInfo | LegacyType): TypeInfo {
         if (type === 's' || type === 'string') return 'string';
         if (type === 'f' || type === 'number') return 'number';
         if (type === 'b' || type === 'boolean') return 'boolean';
         throw new TypeError(`Invalid type '${String(type)}'`);
-    },
-    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> {
         switch (type) {
             case 'b':
             case 'boolean':
@@ -43,24 +46,55 @@ export const TypeInfo = {
                 (type) satisfies never;
                 return false;
         }
-    },
-    to: <T extends TypeInfo | LegacyType>(value: VmValue | undefined, type: T): TsTypeOf<T> => {
-        /** 返回类型 */
-        type R = TsTypeOf<T>;
-        if (!type) return value as R;
+    }
+
+    /** 转换类型 */
+    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> {
+        const c = converter(type);
+        return (c as typeof convert.toNumber)(value, fallback) as TsTypeOf<T>;
+    }
+
+    /** 不转换 */
+    function identity<T extends VmValue, F = undefined>(
+        value: T | undefined,
+        _fallback?: F,
+    ): T /* | Exclude<F, undefined>  */ {
+        if (value == null) return null as T;
+        return value;
+    }
+
+    /** 获取转换器 */
+    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] {
+        // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
         switch (type) {
             case 'b':
             case 'boolean':
-                return lib.to_boolean(value) as R;
+                return toBoolean as Converters[T];
             case 'f':
             case 'number':
-                return lib.to_number(value) as R;
+                return toNumber as Converters[T];
             case 's':
             case 'string':
-                return lib.to_string(value) as R;
+                return toString as Converters[T];
             default:
-                (type) satisfies never;
-                return value as R;
+                (type) satisfies '';
+                return identity as Converters[T];
         }
-    },
-};
+    }
+
+    export const { toBoolean, toFormat, toNumber, toString } = convert;
+}