@cloudpss/expression 0.6.0-alpha.13 → 0.6.0-alpha.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/eval.d.ts +2 -2
- package/dist/eval.d.ts.map +1 -1
- package/dist/eval.js +1 -1
- package/dist/eval.js.map +1 -1
- package/dist/migrator/function.d.ts.map +1 -1
- package/dist/migrator/function.js +4 -3
- package/dist/migrator/function.js.map +1 -1
- package/dist/parser.d.ts +1 -1
- package/dist/parser.d.ts.map +1 -1
- package/dist/parser.js +4 -2
- package/dist/parser.js.map +1 -1
- package/dist/scope.d.ts +4 -0
- package/dist/scope.d.ts.map +1 -1
- package/dist/scope.js +29 -5
- package/dist/scope.js.map +1 -1
- package/package.json +2 -2
- package/src/eval.ts +7 -3
- package/src/migrator/function.ts +4 -3
- package/src/parser.ts +10 -4
- package/src/scope.ts +27 -5
- package/tests/migrate.ts +14 -0
package/dist/eval.d.ts
CHANGED
|
@@ -5,9 +5,9 @@ import type { Evaluator } from './main.js';
|
|
|
5
5
|
/**
|
|
6
6
|
* 表达式求值
|
|
7
7
|
*/
|
|
8
|
-
export declare function evaluateEval<T extends VmValue>(evaluator: Evaluator, expression: EvalExpressionCache, scope: Scope): T | null;
|
|
8
|
+
export declare function evaluateEval<T extends VmValue>(evaluator: Evaluator | null, expression: EvalExpressionCache, scope: Scope): T | null;
|
|
9
9
|
/**
|
|
10
10
|
* 表达式求值
|
|
11
11
|
*/
|
|
12
|
-
export declare function evaluate<T extends VmValue>(evaluator: Evaluator, expression: ExpressionCache, scope: Scope): T | null;
|
|
12
|
+
export declare function evaluate<T extends VmValue>(evaluator: Evaluator | null, expression: ExpressionCache, scope: Scope): T | null;
|
|
13
13
|
//# sourceMappingURL=eval.d.ts.map
|
package/dist/eval.d.ts.map
CHANGED
|
@@ -1 +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,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,
|
|
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,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
CHANGED
|
@@ -12,7 +12,7 @@ export function evaluateEval(evaluator, expression, scope) {
|
|
|
12
12
|
catch (error) {
|
|
13
13
|
if (scope.throws)
|
|
14
14
|
throw error;
|
|
15
|
-
evaluator
|
|
15
|
+
(evaluator?.logger ?? console).warn(`Failed to execute expression "${expression.source}": ${error.message || String(error)}.`, {
|
|
16
16
|
error,
|
|
17
17
|
scope,
|
|
18
18
|
});
|
package/dist/eval.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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,
|
|
1
|
+
{"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"function.d.ts","sourceRoot":"","sources":["../../src/migrator/function.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,QAAQ,CAAC;AACrD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAE,KAAK,KAAK,EAAiB,MAAM,YAAY,CAAC;AAGvD,eAAe;AACf,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,sBAAsB,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"function.d.ts","sourceRoot":"","sources":["../../src/migrator/function.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,QAAQ,CAAC;AACrD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAE,KAAK,KAAK,EAAiB,MAAM,YAAY,CAAC;AAGvD,eAAe;AACf,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,sBAAsB,GAAG,MAAM,CAmB5F"}
|
|
@@ -5,19 +5,20 @@ import { migrateSymbolName } from './utils.js';
|
|
|
5
5
|
export function migrateFunctionAssignment(state, node) {
|
|
6
6
|
state.loose();
|
|
7
7
|
const { name, params, expr } = node;
|
|
8
|
-
if (state.locals.has(name)) {
|
|
9
|
-
state.err(`重复定义函数: ${name}`);
|
|
10
|
-
}
|
|
11
8
|
const fState = new FunctionState(state, params);
|
|
12
9
|
let body = migrateAtomic(fState, expr);
|
|
13
10
|
if (!(body.code.startsWith('{') && body.code.endsWith('}'))) {
|
|
14
11
|
body = { ...body, code: `{ ${body.code} }` };
|
|
15
12
|
}
|
|
13
|
+
if (state.locals.has(name)) {
|
|
14
|
+
state.err(`重复定义函数: '${name}'`);
|
|
15
|
+
}
|
|
16
16
|
state.locals.set(name, {
|
|
17
17
|
type: 'function',
|
|
18
18
|
code: body.code,
|
|
19
19
|
});
|
|
20
20
|
return {
|
|
21
|
+
type: 'function',
|
|
21
22
|
code: `fn ${migrateSymbolName(name, true)}(${params.join(', ')}) ${body.code}`,
|
|
22
23
|
};
|
|
23
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"function.js","sourceRoot":"","sources":["../../src/migrator/function.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAc,aAAa,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE/C,eAAe;AACf,MAAM,UAAU,yBAAyB,CAAC,KAAY,EAAE,IAA4B;IAChF,KAAK,CAAC,KAAK,EAAE,CAAC;IACd,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IACpC,
|
|
1
|
+
{"version":3,"file":"function.js","sourceRoot":"","sources":["../../src/migrator/function.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAc,aAAa,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE/C,eAAe;AACf,MAAM,UAAU,yBAAyB,CAAC,KAAY,EAAE,IAA4B;IAChF,KAAK,CAAC,KAAK,EAAE,CAAC;IACd,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IACpC,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAChD,IAAI,IAAI,GAAG,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACvC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QAC1D,IAAI,GAAG,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,KAAK,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;IACjD,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QACzB,KAAK,CAAC,GAAG,CAAC,YAAY,IAAI,GAAG,CAAC,CAAC;IACnC,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE;QACnB,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,IAAI,CAAC,IAAI;KAClB,CAAC,CAAC;IACH,OAAO;QACH,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,MAAM,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,EAAE;KACjF,CAAC;AACN,CAAC"}
|
package/dist/parser.d.ts
CHANGED
|
@@ -37,5 +37,5 @@ export type ExpressionCache = ErrorExpressionCache | EvalExpressionCache;
|
|
|
37
37
|
/**
|
|
38
38
|
* 解析表达式
|
|
39
39
|
*/
|
|
40
|
-
export declare function parse(evaluator: Evaluator, expression: string, throws: boolean, template: boolean): ExpressionCache;
|
|
40
|
+
export declare function parse(evaluator: Evaluator | null, expression: string, throws: boolean, template: boolean): ExpressionCache;
|
|
41
41
|
//# sourceMappingURL=parser.d.ts.map
|
package/dist/parser.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAEpE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE3C,YAAY;AACZ,MAAM,WAAW,mBAAmB;IAChC;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,IAAI,EAAE,QAAQ,CAAC;IACf;;OAEG;IACH,KAAK,EAAE,SAAS,CAAC;CACpB;AACD,cAAc;AACd,MAAM,WAAW,oBAAoB;IACjC;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,IAAI,EAAE,SAAS,CAAC;IAChB;;OAEG;IACH,KAAK,EAAE,KAAK,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,oBAAoB,GAAG,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAEpE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE3C,YAAY;AACZ,MAAM,WAAW,mBAAmB;IAChC;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,IAAI,EAAE,QAAQ,CAAC;IACf;;OAEG;IACH,KAAK,EAAE,SAAS,CAAC;CACpB;AACD,cAAc;AACd,MAAM,WAAW,oBAAoB;IACjC;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,IAAI,EAAE,SAAS,CAAC;IAChB;;OAEG;IACH,KAAK,EAAE,KAAK,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,oBAAoB,GAAG,mBAAmB,CAAC;AAiCzE;;GAEG;AACH,wBAAgB,KAAK,CACjB,SAAS,EAAE,SAAS,GAAG,IAAI,EAC3B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,OAAO,EACf,QAAQ,EAAE,OAAO,GAClB,eAAe,CAcjB"}
|
package/dist/parser.js
CHANGED
|
@@ -20,6 +20,8 @@ const kTemplateCache = Symbol('cloudpss.expression.templateCache');
|
|
|
20
20
|
const kExpressionCache = Symbol('cloudpss.expression.expressionCache');
|
|
21
21
|
/** 获取编译缓存 */
|
|
22
22
|
function getCache(evaluator, template) {
|
|
23
|
+
if (evaluator == null)
|
|
24
|
+
return null;
|
|
23
25
|
const key = template ? kTemplateCache : kExpressionCache;
|
|
24
26
|
if (!(key in evaluator)) {
|
|
25
27
|
const size = template ? evaluator.options.templateCacheSize : evaluator.options.expressionCacheSize;
|
|
@@ -37,7 +39,7 @@ export function parse(evaluator, expression, throws, template) {
|
|
|
37
39
|
throw new TypeError(`${String(expression)} is not a valid expression`);
|
|
38
40
|
}
|
|
39
41
|
const cache = getCache(evaluator, template);
|
|
40
|
-
const cached = cache
|
|
42
|
+
const cached = cache?.get(expression);
|
|
41
43
|
if (cached != null)
|
|
42
44
|
return cached;
|
|
43
45
|
const complied = compile(expression, template);
|
|
@@ -46,7 +48,7 @@ export function parse(evaluator, expression, throws, template) {
|
|
|
46
48
|
throw complied.error;
|
|
47
49
|
}
|
|
48
50
|
else {
|
|
49
|
-
cache
|
|
51
|
+
cache?.set(expression, complied);
|
|
50
52
|
}
|
|
51
53
|
return complied;
|
|
52
54
|
}
|
package/dist/parser.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAiB,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAsCrC;;GAEG;AACH,SAAS,OAAO,CAAC,UAAkB,EAAE,QAAiB;IAClD,MAAM,QAAQ,GAAG;QACb,MAAM,EAAE,UAAU;KACF,CAAC;IACrB,IAAI,CAAC;QACD,MAAM,MAAM,GAAG,WAAW,CAAC,UAAU,EAAE,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QACzF,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC;IAC3B,CAAC;IAAC,OAAO,EAAE,EAAE,CAAC;QACV,QAAQ,CAAC,KAAK,GAAG,EAAW,CAAC;IACjC,CAAC;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC;AAED,MAAM,cAAc,GAAG,MAAM,CAAC,mCAAmC,CAAC,CAAC;AACnE,MAAM,gBAAgB,GAAG,MAAM,CAAC,qCAAqC,CAAC,CAAC;AAEvE,aAAa;AACb,SAAS,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAiB,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAsCrC;;GAEG;AACH,SAAS,OAAO,CAAC,UAAkB,EAAE,QAAiB;IAClD,MAAM,QAAQ,GAAG;QACb,MAAM,EAAE,UAAU;KACF,CAAC;IACrB,IAAI,CAAC;QACD,MAAM,MAAM,GAAG,WAAW,CAAC,UAAU,EAAE,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QACzF,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC;IAC3B,CAAC;IAAC,OAAO,EAAE,EAAE,CAAC;QACV,QAAQ,CAAC,KAAK,GAAG,EAAW,CAAC;IACjC,CAAC;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC;AAED,MAAM,cAAc,GAAG,MAAM,CAAC,mCAAmC,CAAC,CAAC;AACnE,MAAM,gBAAgB,GAAG,MAAM,CAAC,qCAAqC,CAAC,CAAC;AAEvE,aAAa;AACb,SAAS,QAAQ,CAAC,SAA2B,EAAE,QAAiB;IAC5D,IAAI,SAAS,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC;IACnC,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,gBAAgB,CAAC;IACzD,IAAI,CAAC,CAAC,GAAG,IAAI,SAAS,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,mBAAmB,CAAC;QACpG,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,GAAG,EAAE;YAClC,KAAK,EAAE,IAAI,QAAQ,CAA8B,EAAE,GAAG,EAAE,IAAK,IAAI,EAAE,EAAE,CAAC;SACzE,CAAC,CAAC;IACP,CAAC;IACD,OAAQ,SAAmF,CAAC,GAAG,CAAC,CAAC;AACrG,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,KAAK,CACjB,SAA2B,EAC3B,UAAkB,EAClB,MAAe,EACf,QAAiB;IAEjB,IAAI,OAAO,UAAU,IAAI,QAAQ,EAAE,CAAC;QAChC,MAAM,IAAI,SAAS,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,4BAA4B,CAAC,CAAC;IAC3E,CAAC;IACD,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC5C,MAAM,MAAM,GAAG,KAAK,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC;IACtC,IAAI,MAAM,IAAI,IAAI;QAAE,OAAO,MAAM,CAAC;IAClC,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAC/C,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;QACjB,IAAI,MAAM;YAAE,MAAM,QAAQ,CAAC,KAAK,CAAC;IACrC,CAAC;SAAM,CAAC;QACJ,KAAK,EAAE,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IACrC,CAAC;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC"}
|
package/dist/scope.d.ts
CHANGED
|
@@ -18,6 +18,10 @@ export declare class Scope {
|
|
|
18
18
|
throws?: boolean,
|
|
19
19
|
/** 执行环境名称 */
|
|
20
20
|
name?: string);
|
|
21
|
+
/** 枚举环境中的值 */
|
|
22
|
+
enumerator: (() => Iterable<string>) | null | undefined;
|
|
23
|
+
/** 描述环境中的值 */
|
|
24
|
+
describer: ((key: string) => string | undefined) | null | undefined;
|
|
21
25
|
/** 执行器上下文 */
|
|
22
26
|
protected evaluator: Evaluator | null;
|
|
23
27
|
/** 求值计数 */
|
package/dist/scope.d.ts.map
CHANGED
|
@@ -1 +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;
|
|
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;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
CHANGED
|
@@ -72,6 +72,10 @@ export class Scope {
|
|
|
72
72
|
this.scope = scope;
|
|
73
73
|
this.throws = throws;
|
|
74
74
|
this.name = name;
|
|
75
|
+
/** 枚举环境中的值 */
|
|
76
|
+
this.enumerator = null;
|
|
77
|
+
/** 描述环境中的值 */
|
|
78
|
+
this.describer = null;
|
|
75
79
|
/** 执行器上下文 */
|
|
76
80
|
this.evaluator = null;
|
|
77
81
|
/** 求值计数 */
|
|
@@ -95,9 +99,13 @@ export class Scope {
|
|
|
95
99
|
if (this._proxy != null)
|
|
96
100
|
return this._proxy;
|
|
97
101
|
let getter;
|
|
98
|
-
|
|
102
|
+
let enumerate;
|
|
103
|
+
let describe;
|
|
104
|
+
const { scope, enumerator, describer } = this;
|
|
99
105
|
if (scope == null) {
|
|
100
106
|
getter = (key) => this.evaluator?.imported.get(key);
|
|
107
|
+
enumerate = () => this.evaluator?.imported.keys() ?? [];
|
|
108
|
+
describe = () => undefined;
|
|
101
109
|
}
|
|
102
110
|
else if (typeof scope == 'function') {
|
|
103
111
|
getter = (key) => {
|
|
@@ -119,7 +127,25 @@ export class Scope {
|
|
|
119
127
|
return createProxy(v, this, [key]);
|
|
120
128
|
};
|
|
121
129
|
}
|
|
122
|
-
|
|
130
|
+
if (typeof enumerator == 'function') {
|
|
131
|
+
enumerate = () => {
|
|
132
|
+
const keys = enumerator();
|
|
133
|
+
const imported = this.evaluator?.imported.keys() ?? [];
|
|
134
|
+
return [...keys, ...imported];
|
|
135
|
+
};
|
|
136
|
+
}
|
|
137
|
+
else {
|
|
138
|
+
enumerate = () => this.evaluator?.imported.keys() ?? [];
|
|
139
|
+
}
|
|
140
|
+
if (typeof describer == 'function') {
|
|
141
|
+
describe = (key) => {
|
|
142
|
+
const d = describer(key);
|
|
143
|
+
if (d)
|
|
144
|
+
return d;
|
|
145
|
+
return undefined;
|
|
146
|
+
};
|
|
147
|
+
}
|
|
148
|
+
const proxy = createVmContext(getter, enumerate, describe);
|
|
123
149
|
this._proxy = proxy;
|
|
124
150
|
return proxy;
|
|
125
151
|
}
|
|
@@ -156,6 +182,7 @@ export class Scope {
|
|
|
156
182
|
/** 表达式递归求值 */
|
|
157
183
|
eval(expression, path) {
|
|
158
184
|
if (this.evalCounter >= Scope.MAX_RECURSION) {
|
|
185
|
+
this.evalCounter = 0;
|
|
159
186
|
throw new Error(`Execution recursion exceeds limit`);
|
|
160
187
|
}
|
|
161
188
|
this.evalCounter++;
|
|
@@ -166,9 +193,6 @@ export class Scope {
|
|
|
166
193
|
}
|
|
167
194
|
else {
|
|
168
195
|
const { evaluator } = this;
|
|
169
|
-
if (!evaluator) {
|
|
170
|
-
throw new Error(`Undefined evaluator`);
|
|
171
|
-
}
|
|
172
196
|
const exp = parse(evaluator, expression.source, this.throws, false);
|
|
173
197
|
if (exp.func != null) {
|
|
174
198
|
result = evaluateEval(evaluator, exp, this);
|
package/dist/scope.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scope.js","sourceRoot":"","sources":["../src/scope.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"scope.js","sourceRoot":"","sources":["../src/scope.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloudpss/expression",
|
|
3
|
-
"version": "0.6.0-alpha.
|
|
3
|
+
"version": "0.6.0-alpha.14",
|
|
4
4
|
"author": "CloudPSS",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
"./*": "./dist/*.js"
|
|
13
13
|
},
|
|
14
14
|
"dependencies": {
|
|
15
|
-
"@mirascript/mirascript": "^0.1.
|
|
15
|
+
"@mirascript/mirascript": "^0.1.13",
|
|
16
16
|
"klona": "^2.0.6",
|
|
17
17
|
"lru-cache": "^11.2.2",
|
|
18
18
|
"mathjs": "^15.1.0",
|
package/src/eval.ts
CHANGED
|
@@ -7,7 +7,7 @@ import type { Evaluator } from './main.js';
|
|
|
7
7
|
* 表达式求值
|
|
8
8
|
*/
|
|
9
9
|
export function evaluateEval<T extends VmValue>(
|
|
10
|
-
evaluator: Evaluator,
|
|
10
|
+
evaluator: Evaluator | null,
|
|
11
11
|
expression: EvalExpressionCache,
|
|
12
12
|
scope: Scope,
|
|
13
13
|
): T | null {
|
|
@@ -17,7 +17,7 @@ export function evaluateEval<T extends VmValue>(
|
|
|
17
17
|
return unwrap(result as T);
|
|
18
18
|
} catch (error: unknown) {
|
|
19
19
|
if (scope.throws) throw error;
|
|
20
|
-
evaluator
|
|
20
|
+
(evaluator?.logger ?? console).warn(
|
|
21
21
|
`Failed to execute expression "${expression.source}": ${(error as Error).message || String(error)}.`,
|
|
22
22
|
{
|
|
23
23
|
error,
|
|
@@ -31,7 +31,11 @@ export function evaluateEval<T extends VmValue>(
|
|
|
31
31
|
/**
|
|
32
32
|
* 表达式求值
|
|
33
33
|
*/
|
|
34
|
-
export function evaluate<T extends VmValue>(
|
|
34
|
+
export function evaluate<T extends VmValue>(
|
|
35
|
+
evaluator: Evaluator | null,
|
|
36
|
+
expression: ExpressionCache,
|
|
37
|
+
scope: Scope,
|
|
38
|
+
): T | null {
|
|
35
39
|
let ret: T | null = null;
|
|
36
40
|
if (expression.func != null) {
|
|
37
41
|
scope ??= new Scope();
|
package/src/migrator/function.ts
CHANGED
|
@@ -8,19 +8,20 @@ import { migrateSymbolName } from './utils.js';
|
|
|
8
8
|
export function migrateFunctionAssignment(state: State, node: FunctionAssignmentNode): Result {
|
|
9
9
|
state.loose();
|
|
10
10
|
const { name, params, expr } = node;
|
|
11
|
-
if (state.locals.has(name)) {
|
|
12
|
-
state.err(`重复定义函数: ${name}`);
|
|
13
|
-
}
|
|
14
11
|
const fState = new FunctionState(state, params);
|
|
15
12
|
let body = migrateAtomic(fState, expr);
|
|
16
13
|
if (!(body.code.startsWith('{') && body.code.endsWith('}'))) {
|
|
17
14
|
body = { ...body, code: `{ ${body.code} }` };
|
|
18
15
|
}
|
|
16
|
+
if (state.locals.has(name)) {
|
|
17
|
+
state.err(`重复定义函数: '${name}'`);
|
|
18
|
+
}
|
|
19
19
|
state.locals.set(name, {
|
|
20
20
|
type: 'function',
|
|
21
21
|
code: body.code,
|
|
22
22
|
});
|
|
23
23
|
return {
|
|
24
|
+
type: 'function',
|
|
24
25
|
code: `fn ${migrateSymbolName(name, true)}(${params.join(', ')}) ${body.code}`,
|
|
25
26
|
};
|
|
26
27
|
}
|
package/src/parser.ts
CHANGED
|
@@ -57,7 +57,8 @@ const kTemplateCache = Symbol('cloudpss.expression.templateCache');
|
|
|
57
57
|
const kExpressionCache = Symbol('cloudpss.expression.expressionCache');
|
|
58
58
|
|
|
59
59
|
/** 获取编译缓存 */
|
|
60
|
-
function getCache(evaluator: Evaluator, template: boolean): LRUCache<string, EvalExpressionCache> {
|
|
60
|
+
function getCache(evaluator: Evaluator | null, template: boolean): LRUCache<string, EvalExpressionCache> | null {
|
|
61
|
+
if (evaluator == null) return null;
|
|
61
62
|
const key = template ? kTemplateCache : kExpressionCache;
|
|
62
63
|
if (!(key in evaluator)) {
|
|
63
64
|
const size = template ? evaluator.options.templateCacheSize : evaluator.options.expressionCacheSize;
|
|
@@ -71,18 +72,23 @@ function getCache(evaluator: Evaluator, template: boolean): LRUCache<string, Eva
|
|
|
71
72
|
/**
|
|
72
73
|
* 解析表达式
|
|
73
74
|
*/
|
|
74
|
-
export function parse(
|
|
75
|
+
export function parse(
|
|
76
|
+
evaluator: Evaluator | null,
|
|
77
|
+
expression: string,
|
|
78
|
+
throws: boolean,
|
|
79
|
+
template: boolean,
|
|
80
|
+
): ExpressionCache {
|
|
75
81
|
if (typeof expression != 'string') {
|
|
76
82
|
throw new TypeError(`${String(expression)} is not a valid expression`);
|
|
77
83
|
}
|
|
78
84
|
const cache = getCache(evaluator, template);
|
|
79
|
-
const cached = cache
|
|
85
|
+
const cached = cache?.get(expression);
|
|
80
86
|
if (cached != null) return cached;
|
|
81
87
|
const complied = compile(expression, template);
|
|
82
88
|
if (complied.error) {
|
|
83
89
|
if (throws) throw complied.error;
|
|
84
90
|
} else {
|
|
85
|
-
cache
|
|
91
|
+
cache?.set(expression, complied);
|
|
86
92
|
}
|
|
87
93
|
return complied;
|
|
88
94
|
}
|
package/src/scope.ts
CHANGED
|
@@ -95,6 +95,10 @@ export class Scope {
|
|
|
95
95
|
/** 执行环境名称 */
|
|
96
96
|
readonly name = '<anonymous>',
|
|
97
97
|
) {}
|
|
98
|
+
/** 枚举环境中的值 */
|
|
99
|
+
enumerator: (() => Iterable<string>) | null | undefined = null;
|
|
100
|
+
/** 描述环境中的值 */
|
|
101
|
+
describer: ((key: string) => string | undefined) | null | undefined = null;
|
|
98
102
|
|
|
99
103
|
/** 执行器上下文 */
|
|
100
104
|
protected evaluator: Evaluator | null = null;
|
|
@@ -117,9 +121,13 @@ export class Scope {
|
|
|
117
121
|
get proxy(): VmContext {
|
|
118
122
|
if (this._proxy != null) return this._proxy;
|
|
119
123
|
let getter: (key: string) => VmAny;
|
|
120
|
-
|
|
124
|
+
let enumerate: () => Iterable<string>;
|
|
125
|
+
let describe: ((key: string) => string | undefined) | undefined;
|
|
126
|
+
const { scope, enumerator, describer } = this;
|
|
121
127
|
if (scope == null) {
|
|
122
128
|
getter = (key) => this.evaluator?.imported.get(key);
|
|
129
|
+
enumerate = () => this.evaluator?.imported.keys() ?? [];
|
|
130
|
+
describe = () => undefined;
|
|
123
131
|
} else if (typeof scope == 'function') {
|
|
124
132
|
getter = (key) => {
|
|
125
133
|
const v = scope(key);
|
|
@@ -135,7 +143,23 @@ export class Scope {
|
|
|
135
143
|
return createProxy(v, this, [key]) as VmValue;
|
|
136
144
|
};
|
|
137
145
|
}
|
|
138
|
-
|
|
146
|
+
if (typeof enumerator == 'function') {
|
|
147
|
+
enumerate = () => {
|
|
148
|
+
const keys = enumerator();
|
|
149
|
+
const imported = this.evaluator?.imported.keys() ?? [];
|
|
150
|
+
return [...keys, ...imported];
|
|
151
|
+
};
|
|
152
|
+
} else {
|
|
153
|
+
enumerate = () => this.evaluator?.imported.keys() ?? [];
|
|
154
|
+
}
|
|
155
|
+
if (typeof describer == 'function') {
|
|
156
|
+
describe = (key) => {
|
|
157
|
+
const d = describer(key);
|
|
158
|
+
if (d) return d;
|
|
159
|
+
return undefined;
|
|
160
|
+
};
|
|
161
|
+
}
|
|
162
|
+
const proxy = createVmContext(getter, enumerate, describe);
|
|
139
163
|
this._proxy = proxy;
|
|
140
164
|
return proxy;
|
|
141
165
|
}
|
|
@@ -170,6 +194,7 @@ export class Scope {
|
|
|
170
194
|
/** 表达式递归求值 */
|
|
171
195
|
eval(expression: Expression | CompiledExpression, path: readonly PropertyKey[]): VmValue {
|
|
172
196
|
if (this.evalCounter >= Scope.MAX_RECURSION) {
|
|
197
|
+
this.evalCounter = 0;
|
|
173
198
|
throw new Error(`Execution recursion exceeds limit`);
|
|
174
199
|
}
|
|
175
200
|
|
|
@@ -180,9 +205,6 @@ export class Scope {
|
|
|
180
205
|
result = expression(this, this.evaluator!);
|
|
181
206
|
} else {
|
|
182
207
|
const { evaluator } = this;
|
|
183
|
-
if (!evaluator) {
|
|
184
|
-
throw new Error(`Undefined evaluator`);
|
|
185
|
-
}
|
|
186
208
|
const exp = parse(evaluator, expression.source, this.throws, false);
|
|
187
209
|
if (exp.func != null) {
|
|
188
210
|
result = evaluateEval(evaluator, exp, this);
|
package/tests/migrate.ts
CHANGED
|
@@ -210,6 +210,20 @@ describe('migrate', () => {
|
|
|
210
210
|
`,
|
|
211
211
|
1,
|
|
212
212
|
],
|
|
213
|
+
[
|
|
214
|
+
'[1,2,3].map(f(x,y,z) = x^2)',
|
|
215
|
+
dedent`
|
|
216
|
+
return [1, 2, 3]::map(f);
|
|
217
|
+
// # 帮助函数
|
|
218
|
+
fn f(x, y, z) { x^2 }
|
|
219
|
+
// # 转换日志
|
|
220
|
+
// - W: 使用了非精确转换的语法或函数，结果可能不准确
|
|
221
|
+
// - W: '^' 不支持矩阵，计算结果可能不一致
|
|
222
|
+
// # 原始 math.js 表达式
|
|
223
|
+
// [1,2,3].map(f(x,y,z) = x^2)
|
|
224
|
+
`,
|
|
225
|
+
[1, 4, 9],
|
|
226
|
+
],
|
|
213
227
|
])('should migrate expression: %s', (f, t, r) => {
|
|
214
228
|
const migrated = migrateMathJs(f as ExpressionSource, false, s);
|
|
215
229
|
expect(migrated).toBe(t);
|