@cloudpss/expression 0.6.0-alpha.1 → 0.6.0-alpha.10
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/analyze.d.ts +6 -3
- package/dist/analyze.d.ts.map +1 -1
- package/dist/analyze.js +67 -33
- package/dist/analyze.js.map +1 -1
- package/dist/definitions/argument.d.ts +2 -10
- package/dist/definitions/argument.d.ts.map +1 -1
- package/dist/definitions/constraint.d.ts +2 -2
- package/dist/definitions/constraint.d.ts.map +1 -1
- package/dist/definitions/constraint.js +1 -1
- package/dist/definitions/constraint.js.map +1 -1
- package/dist/definitions/parameter-decoration.d.ts +3 -3
- package/dist/definitions/parameter-decoration.d.ts.map +1 -1
- package/dist/definitions/parameter-decoration.js +0 -7
- package/dist/definitions/parameter-decoration.js.map +1 -1
- package/dist/definitions/parameter-group.d.ts +0 -4
- package/dist/definitions/parameter-group.d.ts.map +1 -1
- package/dist/definitions/parameter-group.js +5 -17
- package/dist/definitions/parameter-group.js.map +1 -1
- package/dist/definitions/parameter.d.ts +47 -40
- package/dist/definitions/parameter.d.ts.map +1 -1
- package/dist/definitions/parameter.js +9 -21
- package/dist/definitions/parameter.js.map +1 -1
- package/dist/definitions/utils.d.ts +19 -0
- package/dist/definitions/utils.d.ts.map +1 -0
- package/dist/definitions/utils.js +177 -0
- package/dist/definitions/utils.js.map +1 -0
- package/dist/definitions/variable.d.ts +0 -2
- package/dist/definitions/variable.d.ts.map +1 -1
- package/dist/definitions/variable.js +1 -5
- package/dist/definitions/variable.js.map +1 -1
- package/dist/definitions.d.ts +1 -0
- package/dist/definitions.d.ts.map +1 -1
- package/dist/definitions.js +1 -0
- package/dist/definitions.js.map +1 -1
- package/dist/eval.d.ts +3 -5
- package/dist/eval.d.ts.map +1 -1
- package/dist/eval.js +12 -20
- package/dist/eval.js.map +1 -1
- package/dist/expression.d.ts +10 -4
- package/dist/expression.d.ts.map +1 -1
- package/dist/expression.js +4 -4
- package/dist/expression.js.map +1 -1
- package/dist/index.d.ts +3 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/interface.d.ts +30 -0
- package/dist/interface.d.ts.map +1 -0
- package/dist/interface.js +6 -0
- package/dist/interface.js.map +1 -0
- package/dist/main.d.ts +41 -28
- package/dist/main.d.ts.map +1 -1
- package/dist/main.js +145 -141
- package/dist/main.js.map +1 -1
- package/dist/migrate.d.ts +3 -2
- package/dist/migrate.d.ts.map +1 -1
- package/dist/migrate.js +12 -3
- package/dist/migrate.js.map +1 -1
- package/dist/migrator/access.d.ts.map +1 -1
- package/dist/migrator/access.js +22 -24
- package/dist/migrator/access.js.map +1 -1
- package/dist/migrator/call.d.ts.map +1 -1
- package/dist/migrator/call.js +235 -209
- package/dist/migrator/call.js.map +1 -1
- package/dist/migrator/interface.d.ts +3 -1
- package/dist/migrator/interface.d.ts.map +1 -1
- package/dist/migrator/interface.js.map +1 -1
- package/dist/migrator/node.js +1 -1
- package/dist/migrator/node.js.map +1 -1
- package/dist/migrator/operator.d.ts.map +1 -1
- package/dist/migrator/operator.js +19 -5
- package/dist/migrator/operator.js.map +1 -1
- package/dist/migrator/state.d.ts +2 -2
- package/dist/migrator/state.d.ts.map +1 -1
- package/dist/migrator/state.js +1 -2
- package/dist/migrator/state.js.map +1 -1
- package/dist/migrator/symbol.d.ts.map +1 -1
- package/dist/migrator/symbol.js +13 -0
- package/dist/migrator/symbol.js.map +1 -1
- package/dist/migrator/to-type.d.ts.map +1 -1
- package/dist/migrator/to-type.js +16 -0
- package/dist/migrator/to-type.js.map +1 -1
- package/dist/migrator/utils.d.ts +2 -0
- package/dist/migrator/utils.d.ts.map +1 -1
- package/dist/migrator/utils.js +18 -0
- package/dist/migrator/utils.js.map +1 -1
- package/dist/parser.d.ts +2 -2
- package/dist/parser.d.ts.map +1 -1
- package/dist/parser.js +25 -8
- package/dist/parser.js.map +1 -1
- package/dist/re-exports.d.ts +4 -0
- package/dist/re-exports.d.ts.map +1 -0
- package/dist/re-exports.js +3 -0
- package/dist/re-exports.js.map +1 -0
- package/dist/scope.d.ts +13 -16
- package/dist/scope.d.ts.map +1 -1
- package/dist/scope.js +56 -49
- package/dist/scope.js.map +1 -1
- package/dist/type.d.ts +14 -5
- package/dist/type.d.ts.map +1 -1
- package/dist/type.js +35 -11
- package/dist/type.js.map +1 -1
- package/package.json +4 -4
- package/src/analyze.ts +77 -37
- package/src/definitions/argument.ts +2 -12
- package/src/definitions/constraint.ts +3 -3
- package/src/definitions/parameter-decoration.ts +3 -9
- package/src/definitions/parameter-group.ts +4 -19
- package/src/definitions/parameter.ts +62 -61
- package/src/definitions/utils.ts +175 -0
- package/src/definitions/variable.ts +1 -6
- package/src/definitions.ts +1 -0
- package/src/eval.ts +13 -26
- package/src/expression.ts +14 -6
- package/src/index.ts +3 -1
- package/src/interface.ts +35 -0
- package/src/main.ts +213 -194
- package/src/migrate.ts +15 -6
- package/src/migrator/access.ts +21 -26
- package/src/migrator/call.ts +225 -194
- package/src/migrator/interface.ts +3 -1
- package/src/migrator/node.ts +1 -1
- package/src/migrator/operator.ts +19 -5
- package/src/migrator/state.ts +2 -2
- package/src/migrator/symbol.ts +13 -0
- package/src/migrator/to-type.ts +16 -0
- package/src/migrator/utils.ts +21 -0
- package/src/parser.ts +27 -8
- package/src/re-exports.ts +28 -0
- package/src/scope.ts +75 -61
- package/src/type.ts +32 -11
- package/tests/analyze.ts +40 -6
- package/tests/compile.ts +65 -0
- package/tests/condition.ts +13 -5
- package/tests/definition.ts +205 -18
- package/tests/eval-complex.ts +7 -10
- package/tests/eval.ts +59 -12
- package/tests/import.ts +18 -4
- package/tests/main.ts +9 -0
- package/tests/migrate.ts +77 -0
- package/tests/scope.ts +3 -3
- package/tests/template.ts +36 -0
- package/dist/context.d.ts +0 -41
- package/dist/context.d.ts.map +0 -1
- package/dist/context.js +0 -18
- package/dist/context.js.map +0 -1
- package/jest.config.js +0 -3
- package/src/context.ts +0 -54
- package/tests/tsconfig.json +0 -3
- package/tsconfig.json +0 -3
package/dist/main.js
CHANGED
|
@@ -1,67 +1,118 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { isVmFunction, isVmPrimitive, wrapToVmValue } from '@mirascript/mirascript';
|
|
2
2
|
import { lib } from '@mirascript/mirascript/subtle';
|
|
3
|
-
import {
|
|
4
|
-
import { Context } from './context.js';
|
|
3
|
+
import { defaultOptions } from './interface.js';
|
|
5
4
|
import { parse } from './parser.js';
|
|
6
5
|
import { analyze } from './analyze.js';
|
|
7
6
|
import { Expression, ExpressionTag, isExpression, } from './expression.js';
|
|
8
7
|
import { evaluate } from './eval.js';
|
|
9
8
|
import { TypeInfo } from './type.js';
|
|
10
9
|
import { Scope } from './scope.js';
|
|
10
|
+
import { enumType, fillArgumentMap, toArgumentValue, } from './definitions.js';
|
|
11
11
|
const { isArray } = Array;
|
|
12
|
-
const {
|
|
12
|
+
const { defineProperty } = Object;
|
|
13
|
+
const { to_string } = lib;
|
|
13
14
|
/**
|
|
14
15
|
* 表达式求值
|
|
15
16
|
*/
|
|
16
17
|
export class Evaluator {
|
|
17
18
|
constructor(options) {
|
|
18
19
|
/** 默认执行环境 */
|
|
19
|
-
this.scope = new Scope(
|
|
20
|
-
this.
|
|
20
|
+
this.scope = new Scope(null, true, '<evaluator>');
|
|
21
|
+
this.__imported = new Map();
|
|
22
|
+
this.options = options ?? defaultOptions;
|
|
21
23
|
}
|
|
22
|
-
/**
|
|
23
|
-
get
|
|
24
|
-
return this.
|
|
24
|
+
/** Logger */
|
|
25
|
+
get logger() {
|
|
26
|
+
return this.options.logger ?? console;
|
|
25
27
|
}
|
|
26
|
-
/**
|
|
28
|
+
/** 执行环境 */
|
|
29
|
+
get imported() {
|
|
30
|
+
return this.__imported;
|
|
31
|
+
}
|
|
32
|
+
/**
|
|
33
|
+
* 导入到执行环境
|
|
34
|
+
*
|
|
35
|
+
* 使用 `undefined` 删除已导入的变量
|
|
36
|
+
*/
|
|
27
37
|
import(values) {
|
|
28
38
|
for (const [key, value] of Object.entries(values)) {
|
|
29
39
|
if (value === undefined) {
|
|
30
|
-
this.
|
|
40
|
+
this.__imported.delete(key);
|
|
31
41
|
}
|
|
32
42
|
else {
|
|
33
|
-
this.
|
|
43
|
+
this.__imported.set(key, wrapToVmValue(value, null));
|
|
34
44
|
}
|
|
35
45
|
}
|
|
36
46
|
}
|
|
37
|
-
/**
|
|
38
|
-
* 编译表达式
|
|
39
|
-
*/
|
|
47
|
+
/** 编译表达式 */
|
|
40
48
|
compile(expression, throws = true) {
|
|
41
|
-
const value = parse(this
|
|
49
|
+
const value = parse(this, expression.source, throws, false);
|
|
42
50
|
const tag = expression[ExpressionTag];
|
|
43
|
-
const type = tag ? TypeInfo.parse(tag) :
|
|
44
|
-
const compiled = (
|
|
45
|
-
const ret = evaluate(
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
51
|
+
const type = tag ? TypeInfo.parse(tag) : '';
|
|
52
|
+
const compiled = (scope, evaluator) => {
|
|
53
|
+
const ret = evaluate(evaluator, value, scope);
|
|
54
|
+
if (ret == null)
|
|
55
|
+
return null;
|
|
56
|
+
if (!type)
|
|
57
|
+
return ret;
|
|
58
|
+
return TypeInfo.to(ret, type);
|
|
59
|
+
};
|
|
60
|
+
defineProperty(compiled, ExpressionTag, { value: type, enumerable: true });
|
|
61
|
+
defineProperty(compiled, 'source', { value: value.source, enumerable: true });
|
|
50
62
|
return compiled;
|
|
51
63
|
}
|
|
52
|
-
/**
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
64
|
+
/** 执行 MiraScript 模板 */
|
|
65
|
+
template(template, scope) {
|
|
66
|
+
if (template == null)
|
|
67
|
+
return '';
|
|
68
|
+
const throws = scope?.throws ?? true;
|
|
69
|
+
const value = parse(this, template, throws, true);
|
|
70
|
+
const result = evaluate(this, value, scope ?? this.scope) ?? template;
|
|
71
|
+
if (typeof result == 'string')
|
|
72
|
+
return result;
|
|
73
|
+
return to_string(result);
|
|
74
|
+
}
|
|
75
|
+
/** 求值 */
|
|
76
|
+
evaluate(expression, scope, defaults = null) {
|
|
56
77
|
if (expression == null)
|
|
57
78
|
return defaults;
|
|
58
|
-
if (!
|
|
79
|
+
if (typeof expression == 'function' && !isVmFunction(expression)) {
|
|
80
|
+
try {
|
|
81
|
+
const ret = expression(scope ?? this.scope, this);
|
|
82
|
+
if (ret == null)
|
|
83
|
+
return defaults;
|
|
84
|
+
return ret;
|
|
85
|
+
}
|
|
86
|
+
catch (ex) {
|
|
87
|
+
if (scope?.throws ?? true) {
|
|
88
|
+
throw ex;
|
|
89
|
+
}
|
|
90
|
+
return defaults;
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
if (!isExpression(expression)) {
|
|
59
94
|
return expression;
|
|
60
|
-
|
|
95
|
+
}
|
|
96
|
+
const result = this.evaluateSource(expression.source, scope);
|
|
97
|
+
if (result == null)
|
|
98
|
+
return defaults;
|
|
61
99
|
const tag = expression[ExpressionTag];
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
100
|
+
if (!tag)
|
|
101
|
+
return result;
|
|
102
|
+
return TypeInfo.to(result, tag);
|
|
103
|
+
}
|
|
104
|
+
/** 求值 */
|
|
105
|
+
evaluateSource(expression, scope, defaults = null) {
|
|
106
|
+
if (expression == null)
|
|
107
|
+
return defaults;
|
|
108
|
+
if (typeof expression != 'string')
|
|
109
|
+
return expression;
|
|
110
|
+
scope ??= this.scope;
|
|
111
|
+
const { throws } = scope;
|
|
112
|
+
const value = parse(this, expression, throws, false);
|
|
113
|
+
const result = evaluate(this, value, scope);
|
|
114
|
+
if (result == null)
|
|
115
|
+
return defaults;
|
|
65
116
|
return result;
|
|
66
117
|
}
|
|
67
118
|
/** 求条件 */
|
|
@@ -70,7 +121,7 @@ export class Evaluator {
|
|
|
70
121
|
return condition;
|
|
71
122
|
if (condition == null)
|
|
72
123
|
return defaults;
|
|
73
|
-
condition =
|
|
124
|
+
condition = to_string(condition).trim();
|
|
74
125
|
if (condition === '')
|
|
75
126
|
return defaults;
|
|
76
127
|
if (condition === 'true')
|
|
@@ -84,75 +135,75 @@ export class Evaluator {
|
|
|
84
135
|
if (scope?.throws) {
|
|
85
136
|
throw ex;
|
|
86
137
|
}
|
|
87
|
-
this.
|
|
138
|
+
this.logger.warn(`Invalid condition`, ex);
|
|
88
139
|
return defaults;
|
|
89
140
|
}
|
|
90
141
|
}
|
|
91
142
|
/** 求选项列表 */
|
|
92
|
-
evaluateChoices(
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
if (
|
|
98
|
-
|
|
143
|
+
evaluateChoices(definition, scope) {
|
|
144
|
+
const ret = [];
|
|
145
|
+
const { type, choices } = definition;
|
|
146
|
+
if (choices != null) {
|
|
147
|
+
const result = this.evaluate(choices, scope);
|
|
148
|
+
if (result == null) {
|
|
149
|
+
// do nothing
|
|
99
150
|
}
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
return { key: index, name: String(index), description: '' };
|
|
151
|
+
else if (!isArray(result)) {
|
|
152
|
+
if (scope?.throws ?? true) {
|
|
153
|
+
throw new Error(`Choices is not an array`);
|
|
154
|
+
}
|
|
105
155
|
}
|
|
106
|
-
|
|
107
|
-
|
|
156
|
+
else {
|
|
157
|
+
const len = result.length;
|
|
158
|
+
for (let i = 0; i < len; i++) {
|
|
159
|
+
const item = result[i];
|
|
160
|
+
if (item == null) {
|
|
161
|
+
ret[i] = { key: i, name: String(i), description: '', condition: undefined };
|
|
162
|
+
}
|
|
163
|
+
else if (isVmPrimitive(item)) {
|
|
164
|
+
ret[i] = { key: item, name: String(item), description: '', condition: undefined };
|
|
165
|
+
}
|
|
166
|
+
else {
|
|
167
|
+
const key = item.key ?? i;
|
|
168
|
+
ret[i] = {
|
|
169
|
+
key,
|
|
170
|
+
name: item.name ?? String(key),
|
|
171
|
+
description: item.description ?? '',
|
|
172
|
+
condition: item.condition || undefined,
|
|
173
|
+
};
|
|
174
|
+
}
|
|
175
|
+
}
|
|
108
176
|
}
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
case 'text':
|
|
125
|
-
case 'code':
|
|
126
|
-
case 'pinLike':
|
|
127
|
-
case 'cssColor':
|
|
128
|
-
case 'cssBackground':
|
|
129
|
-
case 'resourceId':
|
|
130
|
-
return to_string(value);
|
|
131
|
-
case 'choice':
|
|
132
|
-
case 'logical':
|
|
133
|
-
return value;
|
|
134
|
-
case 'multiSelect':
|
|
135
|
-
case 'table': {
|
|
136
|
-
if (isVmArray(value)) {
|
|
137
|
-
return value;
|
|
177
|
+
}
|
|
178
|
+
if (type === 'logical') {
|
|
179
|
+
if (ret.length >= 2) {
|
|
180
|
+
ret.length = 2;
|
|
181
|
+
}
|
|
182
|
+
else {
|
|
183
|
+
const type = enumType(definition) ?? 'boolean';
|
|
184
|
+
const keys = type === 'boolean' ? [false, true] : type === 'number' ? [0, 1] : ['0', '1'];
|
|
185
|
+
while (ret.length < 2) {
|
|
186
|
+
ret.push({
|
|
187
|
+
key: keys[ret.length],
|
|
188
|
+
name: '',
|
|
189
|
+
description: '',
|
|
190
|
+
condition: undefined,
|
|
191
|
+
});
|
|
138
192
|
}
|
|
139
|
-
return (value != null ? [value] : []);
|
|
140
193
|
}
|
|
141
|
-
case 'grouped':
|
|
142
|
-
case 'record':
|
|
143
|
-
default:
|
|
144
|
-
return value;
|
|
145
194
|
}
|
|
195
|
+
return ret;
|
|
146
196
|
}
|
|
147
197
|
/** 求参数值 */
|
|
148
198
|
evaluateArg(expression, scope, definition) {
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
199
|
+
// 默认值有可能为表达式,因此需要先填充再求值
|
|
200
|
+
expression ??= definition.value;
|
|
201
|
+
const result = this.evaluate(expression, scope, definition.value);
|
|
202
|
+
return toArgumentValue(result, definition);
|
|
152
203
|
}
|
|
153
204
|
/** 求参数表的所有参数值 */
|
|
154
205
|
evaluateArgs(args, scope, definition) {
|
|
155
|
-
const a =
|
|
206
|
+
const a = fillArgumentMap(definition, args);
|
|
156
207
|
const ret = {};
|
|
157
208
|
for (const group of definition) {
|
|
158
209
|
for (const param of group.items) {
|
|
@@ -165,57 +216,6 @@ export class Evaluator {
|
|
|
165
216
|
}
|
|
166
217
|
return ret;
|
|
167
218
|
}
|
|
168
|
-
/** 获取参数默认值,修复现有的参数,并填充缺失的参数 */
|
|
169
|
-
defaultArgs(definition, args = {}) {
|
|
170
|
-
if (definition == null || !isArray(definition)) {
|
|
171
|
-
return args;
|
|
172
|
-
}
|
|
173
|
-
const keys = new Set(Object.keys(args));
|
|
174
|
-
// 根据定义填充或修复参数
|
|
175
|
-
for (const group of definition) {
|
|
176
|
-
for (const param of group.items) {
|
|
177
|
-
const key = param.key;
|
|
178
|
-
if (!key)
|
|
179
|
-
continue;
|
|
180
|
-
const currentValue = keys.has(key) ? args[key] : undefined;
|
|
181
|
-
if (currentValue == null) {
|
|
182
|
-
// 使用默认值填充
|
|
183
|
-
const defaultValue = param.value;
|
|
184
|
-
if (isExpression(defaultValue)) {
|
|
185
|
-
args[key] = { [ExpressionTag]: '', source: defaultValue.source };
|
|
186
|
-
}
|
|
187
|
-
else {
|
|
188
|
-
const value = defaultValue != null && typeof defaultValue == 'object'
|
|
189
|
-
? klona(defaultValue)
|
|
190
|
-
: defaultValue;
|
|
191
|
-
args[key] = this.toArg(value, param);
|
|
192
|
-
}
|
|
193
|
-
}
|
|
194
|
-
else {
|
|
195
|
-
// 已存在的参数值
|
|
196
|
-
if (isExpression(currentValue)) {
|
|
197
|
-
// 保留表达式
|
|
198
|
-
}
|
|
199
|
-
else {
|
|
200
|
-
// 修复现有的参数值
|
|
201
|
-
const castedValue = this.toArg(currentValue, param);
|
|
202
|
-
if (castedValue != null && castedValue !== currentValue) {
|
|
203
|
-
args[key] = castedValue;
|
|
204
|
-
}
|
|
205
|
-
}
|
|
206
|
-
}
|
|
207
|
-
keys.delete(key);
|
|
208
|
-
}
|
|
209
|
-
}
|
|
210
|
-
// 删除多余的参数
|
|
211
|
-
for (const key of keys) {
|
|
212
|
-
// 保留特殊参数和私有字段
|
|
213
|
-
if (key.startsWith('_') || key.startsWith('$') || key.startsWith('@'))
|
|
214
|
-
continue;
|
|
215
|
-
delete args[key];
|
|
216
|
-
}
|
|
217
|
-
return args;
|
|
218
|
-
}
|
|
219
219
|
/** 解析表达式 */
|
|
220
220
|
validate(expression) {
|
|
221
221
|
if (!isExpression(expression) || !expression.source) {
|
|
@@ -224,15 +224,19 @@ export class Evaluator {
|
|
|
224
224
|
const tag = expression[ExpressionTag];
|
|
225
225
|
if (tag)
|
|
226
226
|
TypeInfo.parse(tag);
|
|
227
|
-
parse(this
|
|
227
|
+
parse(this, expression.source, true, false);
|
|
228
228
|
}
|
|
229
229
|
/** 分析表达式 */
|
|
230
|
-
analyze(expression) {
|
|
230
|
+
analyze(expression, scope) {
|
|
231
231
|
if (!isExpression(expression) || !expression.source) {
|
|
232
232
|
throw new Error(`${expression.source || String(expression)} is not a valid expression`);
|
|
233
233
|
}
|
|
234
|
-
|
|
235
|
-
|
|
234
|
+
scope ??= this.scope;
|
|
235
|
+
const exp = parse(this, expression.source, scope.throws, false);
|
|
236
|
+
// 如果 throws=true,则 parse 会抛出错误,此处有 error 一定是 throws=false 的情况
|
|
237
|
+
if (exp.error)
|
|
238
|
+
return [];
|
|
239
|
+
return analyze(exp, this, scope);
|
|
236
240
|
}
|
|
237
241
|
}
|
|
238
242
|
//# sourceMappingURL=main.js.map
|
package/dist/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
|
package/dist/migrate.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { VmValue } from '@mirascript/mirascript';
|
|
2
|
+
import type { Scope } from './scope.js';
|
|
2
3
|
import type { ExpressionSource } from './expression.js';
|
|
3
4
|
/** MathJs 表达式转为 MiraScript 表达式 */
|
|
4
|
-
export declare function migrateMathJs<const T extends VmValue>(expr: ExpressionSource<T>, condition: boolean, context
|
|
5
|
+
export declare function migrateMathJs<const T extends VmValue>(expr: ExpressionSource<T>, condition: boolean, context: Scope | undefined): ExpressionSource<T>;
|
|
5
6
|
//# sourceMappingURL=migrate.d.ts.map
|
package/dist/migrate.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../src/migrate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../src/migrate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAMxD,kCAAkC;AAClC,wBAAgB,aAAa,CAAC,KAAK,CAAC,CAAC,SAAS,OAAO,EACjD,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC,EACzB,SAAS,EAAE,OAAO,EAClB,OAAO,EAAE,KAAK,GAAG,SAAS,GAC3B,gBAAgB,CAAC,CAAC,CAAC,CAoBrB"}
|
package/dist/migrate.js
CHANGED
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
import { BaseState } from './migrator/state.js';
|
|
2
|
+
import { Evaluator } from './main.js';
|
|
3
|
+
import { DefaultVmContext } from '@mirascript/mirascript/subtle';
|
|
4
|
+
const evaluator = new Evaluator();
|
|
2
5
|
/** MathJs 表达式转为 MiraScript 表达式 */
|
|
3
6
|
export function migrateMathJs(expr, condition, context) {
|
|
4
7
|
// 检查输入
|
|
@@ -16,8 +19,14 @@ export function migrateMathJs(expr, condition, context) {
|
|
|
16
19
|
if (/^[-+]?(\d+(?:\.\d+)?(?:[eE][+-]?\d+)?)$/.test(expr)) {
|
|
17
20
|
return expr;
|
|
18
21
|
}
|
|
19
|
-
const
|
|
20
|
-
|
|
21
|
-
|
|
22
|
+
const dispose = context?.reset(evaluator);
|
|
23
|
+
try {
|
|
24
|
+
const state = new BaseState(expr, condition, context ? context.proxy : DefaultVmContext);
|
|
25
|
+
state.migrate();
|
|
26
|
+
return state.result();
|
|
27
|
+
}
|
|
28
|
+
finally {
|
|
29
|
+
dispose?.();
|
|
30
|
+
}
|
|
22
31
|
}
|
|
23
32
|
//# sourceMappingURL=migrate.js.map
|
package/dist/migrate.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../src/migrate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../src/migrate.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEjE,MAAM,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC;AAClC,kCAAkC;AAClC,MAAM,UAAU,aAAa,CACzB,IAAyB,EACzB,SAAkB,EAClB,OAA0B;IAE1B,OAAO;IACP,IAAI,CAAC,IAAI;QAAE,OAAO,EAAyB,CAAC;IAC5C,IAAI,GAAG,IAAI,CAAC,IAAI,EAAyB,CAAC;IAC1C,IAAI,CAAC,IAAI,IAAI,IAAI,KAAK,WAAW;QAAE,OAAO,EAAyB,CAAC;IACpE,IAAI,IAAI,KAAK,MAAM;QAAE,OAAO,KAA4B,CAAC;IACzD,IAAI,IAAI,KAAK,MAAM;QAAE,OAAO,MAA6B,CAAC;IAC1D,IAAI,IAAI,KAAK,OAAO;QAAE,OAAO,OAA8B,CAAC;IAC5D,IAAI,yCAAyC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACvD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,OAAO,GAAG,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IAC1C,IAAI,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,SAAS,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;QACzF,KAAK,CAAC,OAAO,EAAE,CAAC;QAChB,OAAO,KAAK,CAAC,MAAM,EAAyB,CAAC;IACjD,CAAC;YAAS,CAAC;QACP,OAAO,EAAE,EAAE,CAAC;IAChB,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access.d.ts","sourceRoot":"","sources":["../../src/migrator/access.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,KAAK,YAAY,EAMjB,KAAK,cAAc,EACtB,MAAM,QAAQ,CAAC;AAChB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"access.d.ts","sourceRoot":"","sources":["../../src/migrator/access.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,KAAK,YAAY,EAMjB,KAAK,cAAc,EACtB,MAAM,QAAQ,CAAC;AAChB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AA6KxC,WAAW;AACX,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,GAAG,cAAc,GAAG,MAAM,CAOvF"}
|
package/dist/migrator/access.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { isConstantNode, isRangeNode, isFunctionNode, isSymbolNode, isAccessorNode, isAssignmentNode, } from 'mathjs';
|
|
2
2
|
import { migrateAtomic, migrateExpr } from './node.js';
|
|
3
|
-
import { unsupportedNode } from './utils.js';
|
|
4
|
-
import {
|
|
3
|
+
import { len, unsupportedNode } from './utils.js';
|
|
4
|
+
import { isVmPrimitive } from '@mirascript/mirascript';
|
|
5
|
+
import { operations, serialize, serializePropName } from '@mirascript/mirascript/subtle';
|
|
5
6
|
/** 常量访问 */
|
|
6
7
|
function constIndexing(node) {
|
|
7
8
|
const { value } = node;
|
|
@@ -43,16 +44,30 @@ function accessChain(state, object, index, assignment) {
|
|
|
43
44
|
return `[${s}]`;
|
|
44
45
|
return `.${s}`;
|
|
45
46
|
});
|
|
47
|
+
let type;
|
|
48
|
+
if (!assignment && obj.global != null) {
|
|
49
|
+
let v = obj.global;
|
|
50
|
+
for (const i of index) {
|
|
51
|
+
if (v == null)
|
|
52
|
+
break;
|
|
53
|
+
v = operations.$Get(v, i);
|
|
54
|
+
}
|
|
55
|
+
if (v != null && isVmPrimitive(v)) {
|
|
56
|
+
type = operations.$Type(v);
|
|
57
|
+
}
|
|
58
|
+
}
|
|
46
59
|
if (!assignment && typeof index.at(-1) == 'number') {
|
|
47
60
|
const prev = chain.slice(0, -1).join('');
|
|
48
61
|
return {
|
|
62
|
+
type,
|
|
49
63
|
code: `${stringToArray(state, {
|
|
50
64
|
code: `${obj.code}${prev}`,
|
|
51
65
|
}).code}${chain.at(-1)}`,
|
|
52
66
|
};
|
|
53
67
|
}
|
|
54
68
|
return {
|
|
55
|
-
|
|
69
|
+
type,
|
|
70
|
+
code: `${obj.code}${chain.join('')}`,
|
|
56
71
|
};
|
|
57
72
|
}
|
|
58
73
|
/** 访问节点 */
|
|
@@ -61,7 +76,7 @@ function access(state, node, assignment) {
|
|
|
61
76
|
return [node, []];
|
|
62
77
|
}
|
|
63
78
|
const { object, index } = node;
|
|
64
|
-
if (
|
|
79
|
+
if (index?.dimensions.length !== 1 || !index.dimensions[0]) {
|
|
65
80
|
return unsupportedNode(state, node);
|
|
66
81
|
}
|
|
67
82
|
const dim0 = index.dimensions[0];
|
|
@@ -90,20 +105,7 @@ function access(state, node, assignment) {
|
|
|
90
105
|
return unsupportedNode(state, node);
|
|
91
106
|
if (!assignment && value === 'length') {
|
|
92
107
|
const obj = migrateExpr(state, object);
|
|
93
|
-
|
|
94
|
-
return {
|
|
95
|
-
type: 'number',
|
|
96
|
-
code: `len(chars(${obj.code}))`,
|
|
97
|
-
};
|
|
98
|
-
if (obj.type === 'array')
|
|
99
|
-
return {
|
|
100
|
-
type: 'number',
|
|
101
|
-
code: `len(${obj.code})`,
|
|
102
|
-
};
|
|
103
|
-
state.helper(`fn @@length(x) { if type(x) == 'string' { len(chars(x)) } else if type(x) == 'array' { len(x) } } else { x.length } }`);
|
|
104
|
-
return {
|
|
105
|
-
code: `@@length(${obj.code})`,
|
|
106
|
-
};
|
|
108
|
+
return len(state, obj);
|
|
107
109
|
}
|
|
108
110
|
const obj = access(state, object, assignment);
|
|
109
111
|
if (Array.isArray(obj)) {
|
|
@@ -128,14 +130,10 @@ function access(state, node, assignment) {
|
|
|
128
130
|
isFunctionNode(object) &&
|
|
129
131
|
isSymbolNode(object.fn) &&
|
|
130
132
|
!state.locals.has('size') &&
|
|
131
|
-
!('size'
|
|
133
|
+
!state.globals.has('size') &&
|
|
132
134
|
object.fn.name === 'size' &&
|
|
133
135
|
object.args.length === 1) {
|
|
134
|
-
|
|
135
|
-
return {
|
|
136
|
-
type: 'number',
|
|
137
|
-
code: `len(${el.code})`,
|
|
138
|
-
};
|
|
136
|
+
return len(state, migrateAtomic(state, object.args[0]));
|
|
139
137
|
}
|
|
140
138
|
const obj = access(state, object, assignment);
|
|
141
139
|
if (Array.isArray(obj)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access.js","sourceRoot":"","sources":["../../src/migrator/access.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,cAAc,EACd,WAAW,EAGX,cAAc,EACd,YAAY,EACZ,cAAc,EACd,gBAAgB,GAEnB,MAAM,QAAQ,CAAC;AAEhB,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"access.js","sourceRoot":"","sources":["../../src/migrator/access.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"call.d.ts","sourceRoot":"","sources":["../../src/migrator/call.ts"],"names":[],"mappings":"AAAA,OAAO,EAMH,KAAK,YAAY,EACjB,KAAK,QAAQ,EAEhB,MAAM,QAAQ,CAAC;AAChB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"call.d.ts","sourceRoot":"","sources":["../../src/migrator/call.ts"],"names":[],"mappings":"AAAA,OAAO,EAMH,KAAK,YAAY,EACjB,KAAK,QAAQ,EAEhB,MAAM,QAAQ,CAAC;AAChB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAqRxC,aAAa;AACb,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,OAAO,GAAG,MAAM,CA0IhG"}
|