@cloudpss/expression 0.6.0-beta.1 → 0.6.1
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/migrator/{condition.d.ts → conditional.d.ts} +2 -2
- package/dist/migrator/conditional.d.ts.map +1 -0
- package/dist/migrator/{condition.js → conditional.js} +3 -3
- package/dist/migrator/conditional.js.map +1 -0
- package/dist/migrator/node.js +2 -2
- package/dist/migrator/node.js.map +1 -1
- package/dist/migrator/special.d.ts.map +1 -1
- package/dist/migrator/special.js +2 -0
- package/dist/migrator/special.js.map +1 -1
- package/dist/migrator/utils.d.ts.map +1 -1
- package/dist/migrator/utils.js +2 -3
- package/dist/migrator/utils.js.map +1 -1
- package/dist/scope.d.ts.map +1 -1
- package/dist/scope.js +51 -21
- package/dist/scope.js.map +1 -1
- package/package.json +2 -2
- package/src/migrator/{condition.ts → conditional.ts} +2 -2
- package/src/migrator/node.ts +2 -2
- package/src/migrator/special.ts +2 -0
- package/src/migrator/utils.ts +2 -3
- package/src/scope.ts +57 -24
- package/tests/eval-complex.ts +60 -2
- package/tests/migrate.ts +23 -0
- package/dist/migrator/condition.d.ts.map +0 -1
- package/dist/migrator/condition.js.map +0 -1
|
@@ -2,5 +2,5 @@ import { type ConditionalNode } from 'mathjs';
|
|
|
2
2
|
import type { State } from './state.js';
|
|
3
3
|
import type { Options, Result } from './interface.js';
|
|
4
4
|
/** 三目运算 */
|
|
5
|
-
export declare function
|
|
6
|
-
//# sourceMappingURL=
|
|
5
|
+
export declare function migrateConditional(state: State, node: ConditionalNode, options: Options): Result;
|
|
6
|
+
//# sourceMappingURL=conditional.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"conditional.d.ts","sourceRoot":"","sources":["../../src/migrator/conditional.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgD,KAAK,eAAe,EAAE,MAAM,QAAQ,CAAC;AAC5F,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAKtD,WAAW;AACX,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,OAAO,GAAG,MAAM,CA+GhG"}
|
|
@@ -3,7 +3,7 @@ import { toBoolean } from './to-type.js';
|
|
|
3
3
|
import { migrateAtomic } from './node.js';
|
|
4
4
|
import { constantValue } from './utils.js';
|
|
5
5
|
/** 三目运算 */
|
|
6
|
-
export function
|
|
6
|
+
export function migrateConditional(state, node, options) {
|
|
7
7
|
const { condition, trueExpr, falseExpr } = node;
|
|
8
8
|
if (constantValue(trueExpr) === true && constantValue(falseExpr) === false) {
|
|
9
9
|
// x ? true : false
|
|
@@ -98,7 +98,7 @@ export function migrateCondition(state, node, options) {
|
|
|
98
98
|
if (!((falseRet.code.startsWith('{') || falseRet.code.startsWith('if ')) && falseRet.code.endsWith('}'))) {
|
|
99
99
|
falseRet = { ...falseRet, code: `{ ${falseRet.code} }` };
|
|
100
100
|
}
|
|
101
|
-
let code = `if ${condRet.code} ${trueRet.code} else ${falseRet.code}`;
|
|
101
|
+
let code = `if ${condRet.code}${condRet.code.startsWith('@@to_boolean(') ? ' ?? false' : ''} ${trueRet.code} else ${falseRet.code}`;
|
|
102
102
|
if (options.format === 'paren') {
|
|
103
103
|
code = `(${code})`;
|
|
104
104
|
}
|
|
@@ -107,4 +107,4 @@ export function migrateCondition(state, node, options) {
|
|
|
107
107
|
code,
|
|
108
108
|
};
|
|
109
109
|
}
|
|
110
|
-
//# sourceMappingURL=
|
|
110
|
+
//# sourceMappingURL=conditional.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"conditional.js","sourceRoot":"","sources":["../../src/migrator/conditional.ts"],"names":[],"mappings":"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"}
|
package/dist/migrator/node.js
CHANGED
|
@@ -5,7 +5,7 @@ import { migrateAccess } from './access.js';
|
|
|
5
5
|
import { migrateCall } from './call.js';
|
|
6
6
|
import { migrateOperator } from './operator.js';
|
|
7
7
|
import { migrateSymbol } from './symbol.js';
|
|
8
|
-
import {
|
|
8
|
+
import { migrateConditional } from './conditional.js';
|
|
9
9
|
import { migrateFunctionAssignment } from './function.js';
|
|
10
10
|
import { serialize } from './serialize.js';
|
|
11
11
|
import { toNumber } from './to-type.js';
|
|
@@ -82,7 +82,7 @@ export function migrateNode(state, node, options) {
|
|
|
82
82
|
return migrateAccess(state, node);
|
|
83
83
|
}
|
|
84
84
|
if (isConditionalNode(node)) {
|
|
85
|
-
return
|
|
85
|
+
return migrateConditional(state, node, options);
|
|
86
86
|
}
|
|
87
87
|
if (isFunctionNode(node)) {
|
|
88
88
|
return migrateCall(state, node, options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/migrator/node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAEH,cAAc,EACd,cAAc,EACd,WAAW,EACX,YAAY,EACZ,iBAAiB,EACjB,cAAc,EACd,cAAc,EACd,iBAAiB,EACjB,gBAAgB,EAEhB,YAAY,EACZ,wBAAwB,EACxB,WAAW,GACd,MAAM,QAAQ,CAAC;AAIhB,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/migrator/node.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"special.d.ts","sourceRoot":"","sources":["../../src/migrator/special.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"special.d.ts","sourceRoot":"","sources":["../../src/migrator/special.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAsDvC,aAAa;AACb,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,MAAM,GAAG,SAAS,CAOrF"}
|
package/dist/migrator/special.js
CHANGED
|
@@ -9,6 +9,8 @@ const pairs = [
|
|
|
9
9
|
let d2 = matrix.diagonal([$yc, $yc, $yc], +3);
|
|
10
10
|
d0::matrix.add(d1)::matrix.add(d2)`,
|
|
11
11
|
],
|
|
12
|
+
['$.context.p12', '$.context.p12 ? $.context.p12 > 0 : false', '$.context.p12 is > 0'],
|
|
13
|
+
['$.context.p12', '$.context.p12 ? $.context.p12 < 0 : false', '$.context.p12 is < 0'],
|
|
12
14
|
// 长导线校正移到后台处理
|
|
13
15
|
[
|
|
14
16
|
'sinh(gamma',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"special.js","sourceRoot":"","sources":["../../src/migrator/special.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,MAAM,KAAK,GACP;IACI;QACI,QAAQ;QACR,qPAAqP;QACrP;;;;+CAImC;KACtC;IACD,cAAc;IACd;QACI,YAAY;QACZ,wQAAwQ;QACxQ,4CAA4C;KAC/C;IACD;QACI,YAAY;QACZ,wQAAwQ;QACxQ,4CAA4C;KAC/C;IACD;QACI,YAAY;QACZ,kRAAkR;QAClR,4CAA4C;KAC/C;IACD;QACI,YAAY;QACZ,2LAA2L;QAC3L,eAAe;KAClB;IACD;QACI,YAAY;QACZ,2LAA2L;QAC3L,gBAAgB;KACnB;IACD;QACI,YAAY;QACZ,qMAAqM;QACrM,uBAAuB;KAC1B;CAER,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;IAC7B,IAAI;IACJ,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;IACrB,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,CAAC;CAClD,CAAC,CAAC,CAAC;AAEJ,aAAa;AACb,MAAM,UAAU,cAAc,CAAC,UAAkB,EAAE,IAAc;IAC7D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7D,OAAO,IAAI,CAAC,IAAI,CAAC;QACrB,CAAC;IACL,CAAC;IACD,OAAO,SAAS,CAAC;AACrB,CAAC"}
|
|
1
|
+
{"version":3,"file":"special.js","sourceRoot":"","sources":["../../src/migrator/special.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,MAAM,KAAK,GACP;IACI;QACI,QAAQ;QACR,qPAAqP;QACrP;;;;+CAImC;KACtC;IACD,CAAC,eAAe,EAAE,2CAA2C,EAAE,sBAAsB,CAAC;IACtF,CAAC,eAAe,EAAE,2CAA2C,EAAE,sBAAsB,CAAC;IACtF,cAAc;IACd;QACI,YAAY;QACZ,wQAAwQ;QACxQ,4CAA4C;KAC/C;IACD;QACI,YAAY;QACZ,wQAAwQ;QACxQ,4CAA4C;KAC/C;IACD;QACI,YAAY;QACZ,kRAAkR;QAClR,4CAA4C;KAC/C;IACD;QACI,YAAY;QACZ,2LAA2L;QAC3L,eAAe;KAClB;IACD;QACI,YAAY;QACZ,2LAA2L;QAC3L,gBAAgB;KACnB;IACD;QACI,YAAY;QACZ,qMAAqM;QACrM,uBAAuB;KAC1B;CAER,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;IAC7B,IAAI;IACJ,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;IACrB,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,CAAC;CAClD,CAAC,CAAC,CAAC;AAEJ,aAAa;AACb,MAAM,UAAU,cAAc,CAAC,UAAkB,EAAE,IAAc;IAC7D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7D,OAAO,IAAI,CAAC,IAAI,CAAC;QACrB,CAAC;IACL,CAAC;IACD,OAAO,SAAS,CAAC;AACrB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/migrator/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAgD,MAAM,QAAQ,CAAC;AAErF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAIxC,gBAAgB;AAChB,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAKjE;AAED,qBAAqB;AACrB,wBAAgB,UAAU,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,GAAG,SAAS,CAG7D;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/migrator/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAgD,MAAM,QAAQ,CAAC;AAErF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAIxC,gBAAgB;AAChB,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAKjE;AAED,qBAAqB;AACrB,wBAAgB,UAAU,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,GAAG,SAAS,CAG7D;AAED,wBAAwB;AACxB,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,CAItE;AAED,wBAAwB;AACxB,wBAAgB,aAAa,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAa1F;AAED,aAAa;AACb,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,GAAG,MAAM,CAMpE;AAED,eAAe;AACf,wBAAgB,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAOnE;AAaD,YAAY;AACZ,wBAAgB,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,GAAG,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,GAAG,MAAM,CAiBzF;AAED,WAAW;AACX,wBAAgB,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAkBrD"}
|
package/dist/migrator/utils.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { isSymbolNode, isConstantNode, isOperatorNode } from 'mathjs';
|
|
2
|
-
import {
|
|
2
|
+
import { isKeyword } from '@mirascript/mirascript/subtle';
|
|
3
3
|
import { toString } from './to-type.js';
|
|
4
4
|
import { migrateExpr } from './node.js';
|
|
5
5
|
/** 获取全局函数的名字 */
|
|
@@ -15,10 +15,9 @@ export function symbolName(node) {
|
|
|
15
15
|
return undefined;
|
|
16
16
|
return node.name;
|
|
17
17
|
}
|
|
18
|
-
const kw = new Set(keywords());
|
|
19
18
|
/** 转换为 mirascript 符号 */
|
|
20
19
|
export function migrateSymbolName(name, local) {
|
|
21
|
-
if (!
|
|
20
|
+
if (!isKeyword(name))
|
|
22
21
|
return name;
|
|
23
22
|
if (local)
|
|
24
23
|
return `__${name}__`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/migrator/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,YAAY,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AACrF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/migrator/utils.ts"],"names":[],"mappings":"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"}
|
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,
|
|
1
|
+
{"version":3,"file":"scope.d.ts","sourceRoot":"","sources":["../src/scope.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,KAAK,SAAS,EAEd,KAAK,OAAO,EAGf,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;AAyF3C,cAAc;AACd,qBAAa,KAAK;IAEV,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;;IARb,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;AA2BD,eAAe;AACf,wBAAgB,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAErC"}
|
package/dist/scope.js
CHANGED
|
@@ -1,45 +1,50 @@
|
|
|
1
|
-
import { createVmContext,
|
|
1
|
+
import { createVmContext, isVmWrapper, isVmFunction, } from '@mirascript/mirascript';
|
|
2
2
|
import { ExpressionTag, isExpression, } from './expression.js';
|
|
3
3
|
import { evaluateEval } from './eval.js';
|
|
4
4
|
import { parse } from './parser.js';
|
|
5
5
|
import { TypeInfo } from './type.js';
|
|
6
|
-
const { hasOwn } = Object;
|
|
6
|
+
const { hasOwn, keys } = Object;
|
|
7
|
+
const { isArray } = Array;
|
|
7
8
|
const RAW = Symbol.for('@private/expression:raw');
|
|
8
9
|
/** 是否需要创建代理对象 */
|
|
10
|
+
function isSpecialHostObject(value) {
|
|
11
|
+
return (value instanceof Date ||
|
|
12
|
+
value instanceof Promise ||
|
|
13
|
+
value instanceof RegExp ||
|
|
14
|
+
ArrayBuffer.isView(value) ||
|
|
15
|
+
value instanceof ArrayBuffer ||
|
|
16
|
+
(typeof SharedArrayBuffer != 'undefined' && value instanceof SharedArrayBuffer));
|
|
17
|
+
}
|
|
18
|
+
/** 是否需要创建代理对象 */
|
|
9
19
|
function needsProxy(value) {
|
|
10
|
-
|
|
20
|
+
if (value == null || (typeof value != 'object' && typeof value != 'function')) {
|
|
21
|
+
return false;
|
|
22
|
+
}
|
|
11
23
|
if (isExpression(value)) {
|
|
12
24
|
return true;
|
|
13
25
|
}
|
|
14
|
-
if (value
|
|
15
|
-
return false;
|
|
16
|
-
}
|
|
17
|
-
if (isVmExtern(value) || isVmModule(value)) {
|
|
26
|
+
if (isVmWrapper(value) || isVmFunction(value) || isSpecialHostObject(value)) {
|
|
18
27
|
return false;
|
|
19
28
|
}
|
|
20
29
|
return true;
|
|
21
30
|
}
|
|
22
31
|
/** 创建代理对象 */
|
|
23
32
|
function createProxy(value, scope, path) {
|
|
24
|
-
// 先检查 isExpression，因为 'function' 也有可能是 Expression
|
|
25
33
|
if (isExpression(value)) {
|
|
26
34
|
return scope.eval(value, path);
|
|
27
35
|
}
|
|
28
36
|
if (typeof value != 'object' || value == null) {
|
|
29
37
|
return value;
|
|
30
38
|
}
|
|
31
|
-
if (value
|
|
32
|
-
value
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
value
|
|
36
|
-
(typeof SharedArrayBuffer != 'undefined' && value instanceof SharedArrayBuffer)) {
|
|
37
|
-
return value;
|
|
39
|
+
if (isArray(value)) {
|
|
40
|
+
return new Proxy(value, new ArrayScopeProxyHandler(scope, path));
|
|
41
|
+
}
|
|
42
|
+
else {
|
|
43
|
+
return new Proxy(value, new RecordScopeProxyHandler(scope, path));
|
|
38
44
|
}
|
|
39
|
-
return new Proxy(value, new ScopeProxyHandler(scope, path));
|
|
40
45
|
}
|
|
41
46
|
/** 函数的执行环境 */
|
|
42
|
-
class
|
|
47
|
+
class ArrayScopeProxyHandler {
|
|
43
48
|
constructor(scope, path) {
|
|
44
49
|
this.scope = scope;
|
|
45
50
|
this.path = path;
|
|
@@ -52,7 +57,27 @@ class ScopeProxyHandler {
|
|
|
52
57
|
return target;
|
|
53
58
|
}
|
|
54
59
|
const value = Reflect.get(target, p);
|
|
55
|
-
if (
|
|
60
|
+
if (typeof p == 'symbol' || String(Number(p)) !== p || !needsProxy(value)) {
|
|
61
|
+
return value;
|
|
62
|
+
}
|
|
63
|
+
return createProxy(value, this.scope, [...this.path, p]);
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
/** 函数的执行环境 */
|
|
67
|
+
class RecordScopeProxyHandler {
|
|
68
|
+
constructor(scope, path) {
|
|
69
|
+
this.scope = scope;
|
|
70
|
+
this.path = path;
|
|
71
|
+
}
|
|
72
|
+
/**
|
|
73
|
+
* @inheritdoc
|
|
74
|
+
*/
|
|
75
|
+
get(target, p) {
|
|
76
|
+
if (p === RAW) {
|
|
77
|
+
return target;
|
|
78
|
+
}
|
|
79
|
+
const value = Reflect.get(target, p);
|
|
80
|
+
if (typeof p == 'symbol' || !hasOwn(target, p) || !needsProxy(value)) {
|
|
56
81
|
return value;
|
|
57
82
|
}
|
|
58
83
|
return createProxy(value, this.scope, [...this.path, p]);
|
|
@@ -216,16 +241,21 @@ function unwrapCore(value) {
|
|
|
216
241
|
if (value == null || (typeof value != 'object' && typeof value != 'function')) {
|
|
217
242
|
return undefined;
|
|
218
243
|
}
|
|
244
|
+
if (isVmWrapper(value) || isVmFunction(value) || isSpecialHostObject(value)) {
|
|
245
|
+
return undefined;
|
|
246
|
+
}
|
|
247
|
+
// 是否有 proxy
|
|
219
248
|
const raw = value[RAW];
|
|
249
|
+
// 不论是否被代理，均须递归处理子项
|
|
220
250
|
const obj = raw ?? value;
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
continue;
|
|
251
|
+
// 只处理 own enumerable 属性
|
|
252
|
+
for (const key of keys(obj)) {
|
|
224
253
|
const unwrapped = unwrapCore(obj[key]);
|
|
225
254
|
if (unwrapped !== undefined) {
|
|
226
255
|
obj[key] = unwrapped;
|
|
227
256
|
}
|
|
228
257
|
}
|
|
258
|
+
// 返回被代理的对象，如没有 proxy 则返回 undefined
|
|
229
259
|
return raw;
|
|
230
260
|
}
|
|
231
261
|
/** 移除 PROXY */
|
package/dist/scope.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scope.js","sourceRoot":"","sources":["../src/scope.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,eAAe,
|
|
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.
|
|
3
|
+
"version": "0.6.1",
|
|
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.27",
|
|
16
16
|
"klona": "^2.0.6",
|
|
17
17
|
"lru-cache": "^11.2.4",
|
|
18
18
|
"mathjs": "^15.1.0",
|
|
@@ -6,7 +6,7 @@ import { migrateAtomic } from './node.js';
|
|
|
6
6
|
import { constantValue } from './utils.js';
|
|
7
7
|
|
|
8
8
|
/** 三目运算 */
|
|
9
|
-
export function
|
|
9
|
+
export function migrateConditional(state: State, node: ConditionalNode, options: Options): Result {
|
|
10
10
|
const { condition, trueExpr, falseExpr } = node;
|
|
11
11
|
|
|
12
12
|
if (constantValue(trueExpr) === true && constantValue(falseExpr) === false) {
|
|
@@ -109,7 +109,7 @@ export function migrateCondition(state: State, node: ConditionalNode, options: O
|
|
|
109
109
|
falseRet = { ...falseRet, code: `{ ${falseRet.code} }` };
|
|
110
110
|
}
|
|
111
111
|
|
|
112
|
-
let code = `if ${condRet.code} ${trueRet.code} else ${falseRet.code}`;
|
|
112
|
+
let code = `if ${condRet.code}${condRet.code.startsWith('@@to_boolean(') ? ' ?? false' : ''} ${trueRet.code} else ${falseRet.code}`;
|
|
113
113
|
if (options.format === 'paren') {
|
|
114
114
|
code = `(${code})`;
|
|
115
115
|
}
|
package/src/migrator/node.ts
CHANGED
|
@@ -23,7 +23,7 @@ import { migrateAccess } from './access.js';
|
|
|
23
23
|
import { migrateCall } from './call.js';
|
|
24
24
|
import { migrateOperator } from './operator.js';
|
|
25
25
|
import { migrateSymbol } from './symbol.js';
|
|
26
|
-
import {
|
|
26
|
+
import { migrateConditional } from './conditional.js';
|
|
27
27
|
import { migrateFunctionAssignment } from './function.js';
|
|
28
28
|
import { serialize } from './serialize.js';
|
|
29
29
|
import { toNumber } from './to-type.js';
|
|
@@ -99,7 +99,7 @@ export function migrateNode(state: State, node: MathNode, options: Options): Res
|
|
|
99
99
|
return migrateAccess(state, node);
|
|
100
100
|
}
|
|
101
101
|
if (isConditionalNode(node)) {
|
|
102
|
-
return
|
|
102
|
+
return migrateConditional(state, node, options);
|
|
103
103
|
}
|
|
104
104
|
if (isFunctionNode(node)) {
|
|
105
105
|
return migrateCall(state, node, options);
|
package/src/migrator/special.ts
CHANGED
|
@@ -12,6 +12,8 @@ const pairs: ReadonlyArray<{ find: string; mathjs: MathNode; mira: string }> = (
|
|
|
12
12
|
let d2 = matrix.diagonal([$yc, $yc, $yc], +3);
|
|
13
13
|
d0::matrix.add(d1)::matrix.add(d2)`,
|
|
14
14
|
],
|
|
15
|
+
['$.context.p12', '$.context.p12 ? $.context.p12 > 0 : false', '$.context.p12 is > 0'],
|
|
16
|
+
['$.context.p12', '$.context.p12 ? $.context.p12 < 0 : false', '$.context.p12 is < 0'],
|
|
15
17
|
// 长导线校正移到后台处理
|
|
16
18
|
[
|
|
17
19
|
'sinh(gamma',
|
package/src/migrator/utils.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type MathNode, isSymbolNode, isConstantNode, isOperatorNode } from 'mathjs';
|
|
2
|
-
import {
|
|
2
|
+
import { isKeyword } from '@mirascript/mirascript/subtle';
|
|
3
3
|
import type { Result } from './interface.js';
|
|
4
4
|
import type { State } from './state.js';
|
|
5
5
|
import { toString } from './to-type.js';
|
|
@@ -19,10 +19,9 @@ export function symbolName(node: MathNode): string | undefined {
|
|
|
19
19
|
return node.name;
|
|
20
20
|
}
|
|
21
21
|
|
|
22
|
-
const kw = new Set(keywords());
|
|
23
22
|
/** 转换为 mirascript 符号 */
|
|
24
23
|
export function migrateSymbolName(name: string, local: boolean): string {
|
|
25
|
-
if (!
|
|
24
|
+
if (!isKeyword(name)) return name;
|
|
26
25
|
if (local) return `__${name}__`;
|
|
27
26
|
return `global.${name}`;
|
|
28
27
|
}
|
package/src/scope.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import {
|
|
2
2
|
createVmContext,
|
|
3
|
-
isVmExtern,
|
|
4
3
|
type VmAny,
|
|
5
4
|
type VmArray,
|
|
6
5
|
type VmContext,
|
|
7
6
|
type VmRecord,
|
|
8
7
|
type VmValue,
|
|
9
|
-
|
|
8
|
+
isVmWrapper,
|
|
9
|
+
isVmFunction,
|
|
10
10
|
} from '@mirascript/mirascript';
|
|
11
11
|
import {
|
|
12
12
|
type CompiledExpression,
|
|
@@ -19,48 +19,53 @@ import { evaluateEval } from './eval.js';
|
|
|
19
19
|
import { parse } from './parser.js';
|
|
20
20
|
import { TypeInfo } from './type.js';
|
|
21
21
|
import type { Evaluator } from './main.js';
|
|
22
|
-
const { hasOwn } = Object;
|
|
22
|
+
const { hasOwn, keys } = Object;
|
|
23
|
+
const { isArray } = Array;
|
|
23
24
|
|
|
24
25
|
const RAW = Symbol.for('@private/expression:raw');
|
|
25
26
|
|
|
27
|
+
/** 是否需要创建代理对象 */
|
|
28
|
+
function isSpecialHostObject(value: object): boolean {
|
|
29
|
+
return (
|
|
30
|
+
value instanceof Date ||
|
|
31
|
+
value instanceof Promise ||
|
|
32
|
+
value instanceof RegExp ||
|
|
33
|
+
ArrayBuffer.isView(value) ||
|
|
34
|
+
value instanceof ArrayBuffer ||
|
|
35
|
+
(typeof SharedArrayBuffer != 'undefined' && value instanceof SharedArrayBuffer)
|
|
36
|
+
);
|
|
37
|
+
}
|
|
38
|
+
|
|
26
39
|
/** 是否需要创建代理对象 */
|
|
27
40
|
function needsProxy(value: ExpressionOrValue | undefined): value is Expression | VmArray | VmRecord {
|
|
28
|
-
|
|
41
|
+
if (value == null || (typeof value != 'object' && typeof value != 'function')) {
|
|
42
|
+
return false;
|
|
43
|
+
}
|
|
29
44
|
if (isExpression(value)) {
|
|
30
45
|
return true;
|
|
31
46
|
}
|
|
32
|
-
if (value
|
|
33
|
-
return false;
|
|
34
|
-
}
|
|
35
|
-
if (isVmExtern(value) || isVmModule(value)) {
|
|
47
|
+
if (isVmWrapper(value) || isVmFunction(value) || isSpecialHostObject(value)) {
|
|
36
48
|
return false;
|
|
37
49
|
}
|
|
38
50
|
return true;
|
|
39
51
|
}
|
|
40
52
|
|
|
41
53
|
/** 创建代理对象 */
|
|
42
|
-
function createProxy(value: Expression |
|
|
43
|
-
// 先检查 isExpression，因为 'function' 也有可能是 Expression
|
|
54
|
+
function createProxy(value: Expression | VmArray | VmRecord, scope: Scope, path: readonly PropertyKey[]): unknown {
|
|
44
55
|
if (isExpression(value)) {
|
|
45
56
|
return scope.eval(value, path);
|
|
46
57
|
}
|
|
47
58
|
if (typeof value != 'object' || value == null) {
|
|
48
59
|
return value;
|
|
49
60
|
}
|
|
50
|
-
if (
|
|
51
|
-
value
|
|
52
|
-
|
|
53
|
-
value
|
|
54
|
-
ArrayBuffer.isView(value) ||
|
|
55
|
-
value instanceof ArrayBuffer ||
|
|
56
|
-
(typeof SharedArrayBuffer != 'undefined' && value instanceof SharedArrayBuffer)
|
|
57
|
-
) {
|
|
58
|
-
return value;
|
|
61
|
+
if (isArray(value)) {
|
|
62
|
+
return new Proxy(value, new ArrayScopeProxyHandler(scope, path));
|
|
63
|
+
} else {
|
|
64
|
+
return new Proxy(value, new RecordScopeProxyHandler(scope, path));
|
|
59
65
|
}
|
|
60
|
-
return new Proxy(value, new ScopeProxyHandler(scope, path));
|
|
61
66
|
}
|
|
62
67
|
/** 函数的执行环境 */
|
|
63
|
-
class
|
|
68
|
+
class ArrayScopeProxyHandler implements ProxyHandler<object> {
|
|
64
69
|
constructor(
|
|
65
70
|
readonly scope: Scope,
|
|
66
71
|
readonly path: readonly PropertyKey[],
|
|
@@ -73,7 +78,27 @@ class ScopeProxyHandler implements ProxyHandler<object> {
|
|
|
73
78
|
return target;
|
|
74
79
|
}
|
|
75
80
|
const value = Reflect.get(target, p) as ExpressionOrValue;
|
|
76
|
-
if (
|
|
81
|
+
if (typeof p == 'symbol' || String(Number(p)) !== p || !needsProxy(value)) {
|
|
82
|
+
return value;
|
|
83
|
+
}
|
|
84
|
+
return createProxy(value, this.scope, [...this.path, p]);
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
/** 函数的执行环境 */
|
|
88
|
+
class RecordScopeProxyHandler implements ProxyHandler<object> {
|
|
89
|
+
constructor(
|
|
90
|
+
readonly scope: Scope,
|
|
91
|
+
readonly path: readonly PropertyKey[],
|
|
92
|
+
) {}
|
|
93
|
+
/**
|
|
94
|
+
* @inheritdoc
|
|
95
|
+
*/
|
|
96
|
+
get(target: object, p: string | symbol): unknown {
|
|
97
|
+
if (p === RAW) {
|
|
98
|
+
return target;
|
|
99
|
+
}
|
|
100
|
+
const value = Reflect.get(target, p) as ExpressionOrValue;
|
|
101
|
+
if (typeof p == 'symbol' || !hasOwn(target, p) || !needsProxy(value)) {
|
|
77
102
|
return value;
|
|
78
103
|
}
|
|
79
104
|
return createProxy(value, this.scope, [...this.path, p]);
|
|
@@ -226,15 +251,23 @@ function unwrapCore<T>(value: T): T | undefined {
|
|
|
226
251
|
if (value == null || (typeof value != 'object' && typeof value != 'function')) {
|
|
227
252
|
return undefined;
|
|
228
253
|
}
|
|
254
|
+
if (isVmWrapper(value) || isVmFunction(value) || isSpecialHostObject(value)) {
|
|
255
|
+
return undefined;
|
|
256
|
+
}
|
|
257
|
+
// 是否有 proxy
|
|
229
258
|
const raw = (value as T & { [RAW]?: T })[RAW];
|
|
259
|
+
|
|
260
|
+
// 不论是否被代理，均须递归处理子项
|
|
230
261
|
const obj = raw ?? value;
|
|
231
|
-
|
|
232
|
-
|
|
262
|
+
// 只处理 own enumerable 属性
|
|
263
|
+
for (const key of keys(obj) as Array<Extract<keyof T, string>>) {
|
|
233
264
|
const unwrapped = unwrapCore(obj[key]);
|
|
234
265
|
if (unwrapped !== undefined) {
|
|
235
266
|
obj[key] = unwrapped;
|
|
236
267
|
}
|
|
237
268
|
}
|
|
269
|
+
|
|
270
|
+
// 返回被代理的对象，如没有 proxy 则返回 undefined
|
|
238
271
|
return raw;
|
|
239
272
|
}
|
|
240
273
|
|
package/tests/eval-complex.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { VmExtern } from '@mirascript/mirascript';
|
|
2
|
-
import { Evaluator, Expression, Scope } from '../dist/index.js';
|
|
2
|
+
import { Evaluator, Expression, isExpression, Scope } from '../dist/index.js';
|
|
3
3
|
|
|
4
4
|
const e = new Evaluator();
|
|
5
5
|
|
|
@@ -55,10 +55,12 @@ describe('Evaluator should work correctly', () => {
|
|
|
55
55
|
expect(result?.value).toStrictEqual(Expression('1'));
|
|
56
56
|
});
|
|
57
57
|
it('should eval deep with compiled expression', () => {
|
|
58
|
+
const b = e.compile(Expression('c+d'));
|
|
59
|
+
expect(isExpression(b)).toBe(true);
|
|
58
60
|
const s = new Scope(
|
|
59
61
|
{
|
|
60
62
|
a: Expression('b+d'),
|
|
61
|
-
b:
|
|
63
|
+
b: b,
|
|
62
64
|
c: 12,
|
|
63
65
|
d: Expression('c'),
|
|
64
66
|
},
|
|
@@ -67,6 +69,62 @@ describe('Evaluator should work correctly', () => {
|
|
|
67
69
|
const result = e.evaluate(Expression('a'), s);
|
|
68
70
|
expect(result).toBe(36);
|
|
69
71
|
});
|
|
72
|
+
it('should eval deep with object and array', () => {
|
|
73
|
+
const s = new Scope(
|
|
74
|
+
{
|
|
75
|
+
arr: [1, 2, Expression('arr.0 + obj.x'), Expression('arr.2 + obj.y')],
|
|
76
|
+
obj: { x: 3, y: Expression('arr.1 + obj.x') },
|
|
77
|
+
arr_copy: Expression('[..arr]'),
|
|
78
|
+
},
|
|
79
|
+
false,
|
|
80
|
+
);
|
|
81
|
+
const result = e.evaluate<{
|
|
82
|
+
arr: number[];
|
|
83
|
+
obj: Record<string, number>;
|
|
84
|
+
}>(Expression('(arr: [..arr], obj: (..obj))'), s)!;
|
|
85
|
+
expect(result).toStrictEqual({ arr: [1, 2, 4, 9], obj: { x: 3, y: 5 } });
|
|
86
|
+
expect(result).not.toBeProxy();
|
|
87
|
+
expect(result.arr).not.toBeProxy();
|
|
88
|
+
expect(result.obj).not.toBeProxy();
|
|
89
|
+
const copy = e.evaluate<number[]>(Expression('[..arr_copy]'), s);
|
|
90
|
+
expect(copy).toStrictEqual([1, 2, 4, 9]);
|
|
91
|
+
expect(copy).not.toBeProxy();
|
|
92
|
+
});
|
|
93
|
+
it('should eval with arr expr', () => {
|
|
94
|
+
const s = new Scope(
|
|
95
|
+
{
|
|
96
|
+
arr: Expression('[a0, 2, 3..5]'),
|
|
97
|
+
a0: Expression('0.4 + 0.6'),
|
|
98
|
+
start: Expression('0'),
|
|
99
|
+
end: Expression('start + 2'),
|
|
100
|
+
},
|
|
101
|
+
false,
|
|
102
|
+
);
|
|
103
|
+
const result = e.evaluate<number[]>(Expression('arr'), s);
|
|
104
|
+
expect(result).toStrictEqual([1, 2, 3, 4, 5]);
|
|
105
|
+
expect(result).not.toBeProxy();
|
|
106
|
+
const slice = e.evaluate<number[]>(Expression('arr[start..end]'), s);
|
|
107
|
+
expect(slice).toStrictEqual([1, 2, 3]);
|
|
108
|
+
expect(slice).not.toBeProxy();
|
|
109
|
+
const field = e.evaluate<number>(Expression('arr.0'), s);
|
|
110
|
+
expect(field).toBe(1);
|
|
111
|
+
});
|
|
112
|
+
it('should eval with obj expr', () => {
|
|
113
|
+
const s = new Scope(
|
|
114
|
+
{
|
|
115
|
+
o0: Expression('"s$(arr)"'),
|
|
116
|
+
arr: Expression('[1, 2, 3..5]'),
|
|
117
|
+
obj: Expression('(x: o0, y: 2 + arr.0, z: arr[1..arr.1 + 2])'),
|
|
118
|
+
},
|
|
119
|
+
false,
|
|
120
|
+
);
|
|
121
|
+
const result = e.evaluate<{ x: string; y: number; z: number[] }>(Expression('obj'), s)!;
|
|
122
|
+
expect(result).toStrictEqual({ x: 's1, 2, 3, 4, 5', y: 3, z: [2, 3, 4, 5] });
|
|
123
|
+
expect(result).not.toBeProxy();
|
|
124
|
+
expect(result.z).not.toBeProxy();
|
|
125
|
+
const field = e.evaluate<string>(Expression('obj.x'), s);
|
|
126
|
+
expect(field).toStrictEqual('s1, 2, 3, 4, 5');
|
|
127
|
+
});
|
|
70
128
|
it('should eval complex', () => {
|
|
71
129
|
const s = new Scope(
|
|
72
130
|
{
|
package/tests/migrate.ts
CHANGED
|
@@ -10,6 +10,7 @@ const s = new Scope({
|
|
|
10
10
|
[1, 2],
|
|
11
11
|
[3, 4],
|
|
12
12
|
],
|
|
13
|
+
n: null,
|
|
13
14
|
f: 1,
|
|
14
15
|
s: 'abc',
|
|
15
16
|
b: false,
|
|
@@ -303,6 +304,28 @@ describe('migrate', () => {
|
|
|
303
304
|
[`a[1:2]`, 'a[0..1]', [1, 2]],
|
|
304
305
|
[`a[2:-1:1]`, 'a[0..1]::reverse()', [2, 1]],
|
|
305
306
|
[`not b and f > 0`, `!b && f > 0`, true],
|
|
307
|
+
[
|
|
308
|
+
`n ? f : 0`,
|
|
309
|
+
dedent`
|
|
310
|
+
return if @@to_boolean(n) ?? false { f } else { 0 };
|
|
311
|
+
// # 帮助函数
|
|
312
|
+
fn @@to_boolean { if it is nil { nil } else { it != '' && it != '0' && it != 0 && it is not nan && it != false } }
|
|
313
|
+
// # 原始 math.js 表达式
|
|
314
|
+
// n ? f : 0
|
|
315
|
+
`,
|
|
316
|
+
0,
|
|
317
|
+
],
|
|
318
|
+
[
|
|
319
|
+
`f ? f : 0`,
|
|
320
|
+
dedent`
|
|
321
|
+
return if @@to_boolean(f) ?? false { f } else { 0 };
|
|
322
|
+
// # 帮助函数
|
|
323
|
+
fn @@to_boolean { if it is nil { nil } else { it != '' && it != '0' && it != 0 && it is not nan && it != false } }
|
|
324
|
+
// # 原始 math.js 表达式
|
|
325
|
+
// f ? f : 0
|
|
326
|
+
`,
|
|
327
|
+
1,
|
|
328
|
+
],
|
|
306
329
|
])('should migrate expression: %s', (f, t, r) => {
|
|
307
330
|
const migrated = migrateMathJs(f as ExpressionSource, false, s);
|
|
308
331
|
expect(migrated).toBe(t);
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"condition.d.ts","sourceRoot":"","sources":["../../src/migrator/condition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgD,KAAK,eAAe,EAAE,MAAM,QAAQ,CAAC;AAC5F,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAKtD,WAAW;AACX,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,OAAO,GAAG,MAAM,CA+G9F"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"condition.js","sourceRoot":"","sources":["../../src/migrator/condition.ts"],"names":[],"mappings":"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"}
|