@cloudpss/expression 0.6.0 → 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/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/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"}
|
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/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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"}
|