@cloudpss/expression 0.6.0-alpha.9 → 0.6.0-beta.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/analyze.d.ts +6 -3
- package/dist/analyze.d.ts.map +1 -1
- package/dist/analyze.js +13 -33
- package/dist/analyze.js.map +1 -1
- package/dist/definitions/argument.d.ts +3 -11
- 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-group.js +4 -4
- package/dist/definitions/parameter-group.js.map +1 -1
- package/dist/definitions/parameter.d.ts +22 -14
- package/dist/definitions/parameter.d.ts.map +1 -1
- package/dist/definitions/parameter.js +10 -1
- package/dist/definitions/parameter.js.map +1 -1
- package/dist/definitions/utils.d.ts +28 -0
- package/dist/definitions/utils.d.ts.map +1 -0
- package/dist/definitions/utils.js +272 -0
- package/dist/definitions/utils.js.map +1 -0
- package/dist/definitions/variable.js +1 -1
- package/dist/definitions/variable.js.map +1 -1
- package/dist/definitions.d.ts +1 -2
- package/dist/definitions.d.ts.map +1 -1
- package/dist/definitions.js +1 -1
- 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 +6 -6
- 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 +165 -149
- package/dist/main.js.map +1 -1
- package/dist/migrate.d.ts +1 -1
- package/dist/migrate.d.ts.map +1 -1
- package/dist/migrate.js +25 -4
- package/dist/migrate.js.map +1 -1
- package/dist/migrator/access.d.ts.map +1 -1
- package/dist/migrator/access.js +64 -29
- package/dist/migrator/access.js.map +1 -1
- package/dist/migrator/call.d.ts.map +1 -1
- package/dist/migrator/call.js +298 -201
- package/dist/migrator/call.js.map +1 -1
- package/dist/migrator/concat.d.ts.map +1 -1
- package/dist/migrator/concat.js +15 -2
- package/dist/migrator/concat.js.map +1 -1
- package/dist/migrator/function.d.ts +6 -0
- package/dist/migrator/function.d.ts.map +1 -0
- package/dist/migrator/function.js +25 -0
- package/dist/migrator/function.js.map +1 -0
- 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.d.ts.map +1 -1
- package/dist/migrator/node.js +55 -7
- package/dist/migrator/node.js.map +1 -1
- package/dist/migrator/operator.d.ts.map +1 -1
- package/dist/migrator/operator.js +107 -60
- package/dist/migrator/operator.js.map +1 -1
- package/dist/migrator/serialize.d.ts +4 -0
- package/dist/migrator/serialize.d.ts.map +1 -0
- package/dist/migrator/serialize.js +21 -0
- package/dist/migrator/serialize.js.map +1 -0
- package/dist/migrator/special.d.ts.map +1 -1
- package/dist/migrator/special.js +31 -0
- package/dist/migrator/special.js.map +1 -1
- package/dist/migrator/state.d.ts +4 -4
- package/dist/migrator/state.d.ts.map +1 -1
- package/dist/migrator/state.js +29 -31
- package/dist/migrator/state.js.map +1 -1
- package/dist/migrator/symbol.d.ts.map +1 -1
- package/dist/migrator/symbol.js +34 -12
- package/dist/migrator/symbol.js.map +1 -1
- package/dist/migrator/to-type.d.ts.map +1 -1
- package/dist/migrator/to-type.js +21 -4
- package/dist/migrator/to-type.js.map +1 -1
- package/dist/migrator/utils.d.ts +6 -0
- package/dist/migrator/utils.d.ts.map +1 -1
- package/dist/migrator/utils.js +49 -1
- 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 +27 -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 +16 -17
- package/dist/scope.d.ts.map +1 -1
- package/dist/scope.js +84 -53
- package/dist/scope.js.map +1 -1
- package/dist/type.d.ts +22 -10
- package/dist/type.d.ts.map +1 -1
- package/dist/type.js +21 -24
- package/dist/type.js.map +1 -1
- package/package.json +8 -5
- package/src/analyze.ts +20 -39
- package/src/definitions/argument.ts +3 -13
- package/src/definitions/constraint.ts +3 -3
- package/src/definitions/parameter-group.ts +4 -4
- package/src/definitions/parameter.ts +47 -24
- package/src/definitions/utils.ts +288 -0
- package/src/definitions/variable.ts +1 -1
- package/src/definitions.ts +1 -28
- package/src/eval.ts +16 -25
- package/src/expression.ts +16 -8
- package/src/index.ts +3 -1
- package/src/interface.ts +35 -0
- package/src/main.ts +232 -200
- package/src/migrate.ts +27 -4
- package/src/migrator/access.ts +67 -37
- package/src/migrator/call.ts +287 -190
- package/src/migrator/concat.ts +15 -2
- package/src/migrator/function.ts +27 -0
- package/src/migrator/interface.ts +3 -1
- package/src/migrator/node.ts +56 -6
- package/src/migrator/operator.ts +110 -64
- package/src/migrator/serialize.ts +21 -0
- package/src/migrator/special.ts +31 -0
- package/src/migrator/state.ts +31 -34
- package/src/migrator/symbol.ts +33 -12
- package/src/migrator/to-type.ts +23 -4
- package/src/migrator/utils.ts +49 -1
- package/src/parser.ts +33 -8
- package/src/re-exports.ts +47 -0
- package/src/scope.ts +98 -62
- package/src/type.ts +40 -25
- package/tests/analyze.ts +45 -6
- package/tests/compile.ts +65 -0
- package/tests/condition.ts +33 -17
- package/tests/definition.ts +237 -18
- package/tests/eval-complex.ts +19 -11
- package/tests/eval.ts +59 -12
- package/tests/import.ts +21 -7
- package/tests/main.ts +58 -0
- package/tests/migrate.ts +317 -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/src/context.ts +0 -54
package/dist/main.d.ts
CHANGED
|
@@ -1,49 +1,62 @@
|
|
|
1
|
-
import type { SetFieldType } from 'type-fest';
|
|
2
1
|
import { type VmValue } from '@mirascript/mirascript';
|
|
3
|
-
import { type Options } from './
|
|
4
|
-
import { type
|
|
2
|
+
import { type Logger, type Options } from './interface.js';
|
|
3
|
+
import { type GlobalReferenceChain } from './analyze.js';
|
|
4
|
+
import { type CompiledExpression, type Expression, type ExpressionFunction, type ExpressionOrValue, type ExpressionSource } from './expression.js';
|
|
5
5
|
import { Scope } from './scope.js';
|
|
6
|
-
import type
|
|
6
|
+
import { type ArgumentMap, type ArgumentValue, type ChoiceParameterType, type ConditionExpression, type Parameter, type ParameterGroup, type ParameterMap } from './definitions.js';
|
|
7
|
+
/** 选项类型 */
|
|
8
|
+
export type EvaluatedChoices<T extends ChoiceParameterType> = {
|
|
9
|
+
[K in T]: ParameterMap[K] extends {
|
|
10
|
+
choices?: infer C;
|
|
11
|
+
} ? (C extends readonly unknown[] ? C : never) : never;
|
|
12
|
+
}[T];
|
|
7
13
|
/**
|
|
8
14
|
* 表达式求值
|
|
9
15
|
*/
|
|
10
16
|
export declare class Evaluator {
|
|
11
|
-
constructor(options?: Partial<Options>);
|
|
17
|
+
constructor(options?: Partial<Options> | null);
|
|
18
|
+
/** Logger */
|
|
19
|
+
get logger(): Logger;
|
|
12
20
|
/** 选项 */
|
|
13
|
-
|
|
14
|
-
/** 上下文 */
|
|
15
|
-
private readonly context;
|
|
21
|
+
readonly options: Readonly<Partial<Options>>;
|
|
16
22
|
/** 默认执行环境 */
|
|
17
23
|
private readonly scope;
|
|
18
|
-
|
|
19
|
-
|
|
24
|
+
private readonly __imported;
|
|
25
|
+
/** 执行环境 */
|
|
26
|
+
get imported(): ReadonlyMap<string, VmValue>;
|
|
20
27
|
/**
|
|
21
|
-
*
|
|
28
|
+
* 导入到执行环境
|
|
29
|
+
*
|
|
30
|
+
* 使用 `undefined` 删除已导入的变量
|
|
22
31
|
*/
|
|
32
|
+
import(values: Record<string, unknown>): void;
|
|
33
|
+
/** 编译表达式 */
|
|
23
34
|
compile<T extends VmValue>(expression: Expression<T>, throws?: boolean): CompiledExpression<T>;
|
|
24
|
-
/**
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
evaluate<T extends VmValue>(expression: ExpressionOrValue<T> | undefined, scope?: Scope): T |
|
|
28
|
-
/**
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
evaluate<T
|
|
35
|
+
/** 执行 MiraScript 模板 */
|
|
36
|
+
template(template: string | null | undefined, scope: Scope | undefined): string;
|
|
37
|
+
/** 求值 */
|
|
38
|
+
evaluate<T extends VmValue>(expression: ExpressionOrValue<T> | ExpressionFunction<T> | null | undefined, scope?: Scope | null): T | null;
|
|
39
|
+
/** 求值 */
|
|
40
|
+
evaluate<T extends VmValue, const D = NonNullable<T>>(expression: ExpressionOrValue<T> | ExpressionFunction<T> | null | undefined, scope: Scope | null | undefined, defaults: D): NonNullable<T> | D;
|
|
41
|
+
/** 求值 */
|
|
42
|
+
evaluate<T>(expression: ExpressionFunction<T> | T | null | undefined, scope?: Scope | null): T | null;
|
|
43
|
+
/** 求值 */
|
|
44
|
+
evaluate<T, const D = NonNullable<T>>(expression: ExpressionFunction<T> | T | null | undefined, scope: Scope | null | undefined, defaults: D): NonNullable<T> | D;
|
|
45
|
+
/** 求值 */
|
|
46
|
+
evaluateSource<T extends VmValue>(expression: ExpressionSource<T> | T | null | undefined, scope: Scope | null | undefined): T | null;
|
|
47
|
+
/** 求值 */
|
|
48
|
+
evaluateSource<T extends VmValue, const D = NonNullable<T>>(expression: ExpressionSource<T> | T | null | undefined, scope: Scope | null | undefined, defaults: D): NonNullable<T> | D;
|
|
32
49
|
/** 求条件 */
|
|
33
|
-
evaluateCondition(condition: ConditionExpression | undefined, scope: Scope | undefined, defaults?: boolean): boolean;
|
|
50
|
+
evaluateCondition(condition: ConditionExpression | null | undefined, scope: Scope | null | undefined, defaults?: boolean): boolean;
|
|
34
51
|
/** 求选项列表 */
|
|
35
|
-
evaluateChoices<
|
|
36
|
-
/** 转换参数值的类型 */
|
|
37
|
-
toArg<V extends ArgumentValue>(value: VmValue, definition: Parameter): V;
|
|
52
|
+
evaluateChoices<T extends ChoiceParameterType>(definition: Pick<ParameterMap[T], 'type' | 'choices' | 'value'>, scope: Scope | null | undefined): EvaluatedChoices<T>;
|
|
38
53
|
/** 求参数值 */
|
|
39
|
-
evaluateArg<V extends ArgumentValue>(expression: ExpressionOrValue<V> | undefined, scope: Scope | undefined, definition: Parameter): V;
|
|
54
|
+
evaluateArg<V extends ArgumentValue>(expression: ExpressionOrValue<V> | null | undefined, scope: Scope | null | undefined, definition: Parameter): V;
|
|
40
55
|
/** 求参数表的所有参数值 */
|
|
41
|
-
evaluateArgs<T extends Record<string, ArgumentValue>>(args: ArgumentMap<T> | undefined, scope: Scope | undefined, definition: ReadonlyArray<Pick<ParameterGroup, 'items'>>): T;
|
|
42
|
-
/** 获取参数默认值,修复现有的参数,并填充缺失的参数 */
|
|
43
|
-
defaultArgs<T extends Record<string, ArgumentValue>>(definition: ReadonlyArray<Pick<ParameterGroup, 'items'>> | undefined, args?: ArgumentMap<T>): ArgumentMap<T>;
|
|
56
|
+
evaluateArgs<T extends Record<string, ArgumentValue>>(args: ArgumentMap<T> | null | undefined, scope: Scope | null | undefined, definition: ReadonlyArray<Pick<ParameterGroup, 'items'>>): T;
|
|
44
57
|
/** 解析表达式 */
|
|
45
58
|
validate<T extends VmValue>(expression: Expression<T>): void;
|
|
46
59
|
/** 分析表达式 */
|
|
47
|
-
analyze<T extends VmValue>(expression: Expression<T
|
|
60
|
+
analyze<T extends VmValue>(expression: Expression<T>, scope?: Scope | null): readonly GlobalReferenceChain[];
|
|
48
61
|
}
|
|
49
62
|
//# sourceMappingURL=main.d.ts.map
|
package/dist/main.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
|
package/dist/main.js
CHANGED
|
@@ -1,158 +1,221 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import { Context } from './context.js';
|
|
1
|
+
import { isVmFunction, wrapToVmValue } from '@mirascript/mirascript';
|
|
2
|
+
import { serialize } from '@mirascript/mirascript/subtle';
|
|
3
|
+
import { defaultOptions } from './interface.js';
|
|
5
4
|
import { parse } from './parser.js';
|
|
6
5
|
import { analyze } from './analyze.js';
|
|
7
|
-
import {
|
|
6
|
+
import { 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 { argumentConverter, choiceParameterType, fillArgumentMap, } from './definitions.js';
|
|
11
11
|
const { isArray } = Array;
|
|
12
|
-
const {
|
|
12
|
+
const { defineProperty } = Object;
|
|
13
13
|
/**
|
|
14
14
|
* 表达式求值
|
|
15
15
|
*/
|
|
16
16
|
export class Evaluator {
|
|
17
17
|
constructor(options) {
|
|
18
18
|
/** 默认执行环境 */
|
|
19
|
-
this.scope = new Scope(
|
|
20
|
-
this.
|
|
19
|
+
this.scope = new Scope(null, true, '<evaluator>');
|
|
20
|
+
this.__imported = new Map();
|
|
21
|
+
this.options = options ?? defaultOptions;
|
|
21
22
|
}
|
|
22
|
-
/**
|
|
23
|
-
get
|
|
24
|
-
return this.
|
|
23
|
+
/** Logger */
|
|
24
|
+
get logger() {
|
|
25
|
+
return this.options.logger ?? console;
|
|
25
26
|
}
|
|
26
|
-
/**
|
|
27
|
+
/** 执行环境 */
|
|
28
|
+
get imported() {
|
|
29
|
+
return this.__imported;
|
|
30
|
+
}
|
|
31
|
+
/**
|
|
32
|
+
* 导入到执行环境
|
|
33
|
+
*
|
|
34
|
+
* 使用 `undefined` 删除已导入的变量
|
|
35
|
+
*/
|
|
27
36
|
import(values) {
|
|
28
37
|
for (const [key, value] of Object.entries(values)) {
|
|
29
38
|
if (value === undefined) {
|
|
30
|
-
this.
|
|
39
|
+
this.__imported.delete(key);
|
|
31
40
|
}
|
|
32
41
|
else {
|
|
33
|
-
this.
|
|
42
|
+
this.__imported.set(key, wrapToVmValue(value, null));
|
|
34
43
|
}
|
|
35
44
|
}
|
|
36
45
|
}
|
|
37
|
-
/**
|
|
38
|
-
* 编译表达式
|
|
39
|
-
*/
|
|
46
|
+
/** 编译表达式 */
|
|
40
47
|
compile(expression, throws = true) {
|
|
41
|
-
const value = parse(this
|
|
48
|
+
const value = parse(this, expression.source, throws, false);
|
|
42
49
|
const tag = expression[ExpressionTag];
|
|
43
|
-
const type = tag ? TypeInfo.parse(tag) :
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
|
|
50
|
+
const type = tag ? TypeInfo.parse(tag) : '';
|
|
51
|
+
let compiled;
|
|
52
|
+
if (!type) {
|
|
53
|
+
compiled = (scope, evaluator) => evaluate(evaluator, value, scope);
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
const to = TypeInfo.converter(type);
|
|
57
|
+
compiled = (scope, evaluator) => {
|
|
58
|
+
const ret = evaluate(evaluator, value, scope);
|
|
59
|
+
if (ret == null)
|
|
60
|
+
return null;
|
|
61
|
+
return to(ret);
|
|
62
|
+
};
|
|
63
|
+
}
|
|
64
|
+
defineProperty(compiled, ExpressionTag, { value: type, enumerable: true });
|
|
65
|
+
defineProperty(compiled, 'source', { value: value.source, enumerable: true });
|
|
50
66
|
return compiled;
|
|
51
67
|
}
|
|
52
|
-
/**
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
68
|
+
/** 执行 MiraScript 模板 */
|
|
69
|
+
template(template, scope) {
|
|
70
|
+
if (template == null)
|
|
71
|
+
return '';
|
|
72
|
+
const throws = scope?.throws ?? true;
|
|
73
|
+
const value = parse(this, template, throws, true);
|
|
74
|
+
const result = evaluate(this, value, scope ?? this.scope) ?? template;
|
|
75
|
+
if (typeof result == 'string')
|
|
76
|
+
return result;
|
|
77
|
+
return TypeInfo.toString(result);
|
|
78
|
+
}
|
|
79
|
+
/** 求值 */
|
|
80
|
+
evaluate(expression, scope, defaults = null) {
|
|
56
81
|
if (expression == null)
|
|
57
82
|
return defaults;
|
|
58
|
-
if (!
|
|
83
|
+
if (typeof expression == 'function' && !isVmFunction(expression)) {
|
|
84
|
+
try {
|
|
85
|
+
const ret = expression(scope ?? this.scope, this);
|
|
86
|
+
if (ret == null)
|
|
87
|
+
return defaults;
|
|
88
|
+
return ret;
|
|
89
|
+
}
|
|
90
|
+
catch (ex) {
|
|
91
|
+
if (scope?.throws ?? true) {
|
|
92
|
+
throw ex;
|
|
93
|
+
}
|
|
94
|
+
return defaults;
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
if (!isExpression(expression)) {
|
|
59
98
|
return expression;
|
|
60
|
-
|
|
99
|
+
}
|
|
100
|
+
const result = this.evaluateSource(expression.source, scope);
|
|
101
|
+
if (result == null)
|
|
102
|
+
return defaults;
|
|
61
103
|
const tag = expression[ExpressionTag];
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
104
|
+
if (!tag)
|
|
105
|
+
return result;
|
|
106
|
+
return TypeInfo.to(result, tag);
|
|
107
|
+
}
|
|
108
|
+
/** 求值 */
|
|
109
|
+
evaluateSource(expression, scope, defaults = null) {
|
|
110
|
+
if (expression == null)
|
|
111
|
+
return defaults;
|
|
112
|
+
if (typeof expression != 'string')
|
|
113
|
+
return expression;
|
|
114
|
+
scope ??= this.scope;
|
|
115
|
+
const { throws } = scope;
|
|
116
|
+
const value = parse(this, expression, throws, false);
|
|
117
|
+
const result = evaluate(this, value, scope);
|
|
118
|
+
if (result == null)
|
|
119
|
+
return defaults;
|
|
65
120
|
return result;
|
|
66
121
|
}
|
|
67
122
|
/** 求条件 */
|
|
68
123
|
evaluateCondition(condition, scope, defaults = true) {
|
|
124
|
+
if (condition == null || condition === '')
|
|
125
|
+
return defaults;
|
|
69
126
|
if (typeof condition == 'boolean')
|
|
70
127
|
return condition;
|
|
71
|
-
if (condition == null)
|
|
72
|
-
return defaults;
|
|
73
|
-
condition = (typeof condition == 'string' ? condition : lib.to_string(condition)).trim();
|
|
74
|
-
if (condition === '')
|
|
75
|
-
return defaults;
|
|
76
128
|
if (condition === 'true')
|
|
77
129
|
return true;
|
|
78
130
|
if (condition === 'false')
|
|
79
131
|
return false;
|
|
80
132
|
try {
|
|
81
|
-
|
|
133
|
+
const result = this.evaluateSource(condition, scope, defaults);
|
|
134
|
+
if (typeof result == 'boolean')
|
|
135
|
+
return result;
|
|
136
|
+
throw new Error(`Condition evaluates to \`${serialize(result)}\``);
|
|
82
137
|
}
|
|
83
138
|
catch (ex) {
|
|
84
139
|
if (scope?.throws) {
|
|
85
140
|
throw ex;
|
|
86
141
|
}
|
|
87
|
-
this.
|
|
142
|
+
this.logger.warn(`Invalid condition`, ex);
|
|
88
143
|
return defaults;
|
|
89
144
|
}
|
|
90
145
|
}
|
|
91
146
|
/** 求选项列表 */
|
|
92
|
-
evaluateChoices(
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
const
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
147
|
+
evaluateChoices(definition, scope) {
|
|
148
|
+
const ret = [];
|
|
149
|
+
const { type, choices } = definition;
|
|
150
|
+
const isLogical = type === 'logical';
|
|
151
|
+
const choiceType = choiceParameterType(definition);
|
|
152
|
+
const fallbackKeys = !isLogical
|
|
153
|
+
? []
|
|
154
|
+
: choiceType === 'boolean'
|
|
155
|
+
? [false, true]
|
|
156
|
+
: choiceType === 'number'
|
|
157
|
+
? [0, 1]
|
|
158
|
+
: ['0', '1'];
|
|
159
|
+
if (choices != null) {
|
|
160
|
+
const evaluatedChoices = this.evaluate(choices, scope);
|
|
161
|
+
if (evaluatedChoices == null) {
|
|
162
|
+
// do nothing
|
|
99
163
|
}
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
return { key: index, name: String(index), description: '' };
|
|
105
|
-
}
|
|
106
|
-
if (typeof item == 'string' || typeof item == 'number' || typeof item == 'boolean') {
|
|
107
|
-
return { key: item, name: String(item), description: '' };
|
|
164
|
+
else if (!isArray(evaluatedChoices)) {
|
|
165
|
+
if (scope?.throws ?? true) {
|
|
166
|
+
throw new Error(`Choices is not an array`);
|
|
167
|
+
}
|
|
108
168
|
}
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
case 'choice':
|
|
132
|
-
case 'logical':
|
|
133
|
-
return value;
|
|
134
|
-
case 'multiSelect':
|
|
135
|
-
case 'table': {
|
|
136
|
-
if (isVmArray(value)) {
|
|
137
|
-
return value;
|
|
169
|
+
else if (evaluatedChoices.length > 0) {
|
|
170
|
+
const to = TypeInfo.converter(choiceType);
|
|
171
|
+
let len = evaluatedChoices.length;
|
|
172
|
+
if (isLogical && len > 2)
|
|
173
|
+
len = 2;
|
|
174
|
+
for (let i = 0; i < len; i++) {
|
|
175
|
+
try {
|
|
176
|
+
const item = evaluatedChoices[i];
|
|
177
|
+
const key = to(item?.key ?? fallbackKeys[i] ?? i);
|
|
178
|
+
const name = item?.name ?? (isLogical ? '' : String(key));
|
|
179
|
+
const description = item?.description ?? '';
|
|
180
|
+
const condition = item?.condition || undefined;
|
|
181
|
+
ret[i] = { key, name, description, condition };
|
|
182
|
+
}
|
|
183
|
+
catch (ex) {
|
|
184
|
+
if (scope?.throws ?? true) {
|
|
185
|
+
throw new Error(`Invalid choice value: ${serialize(evaluatedChoices[i])}`, {
|
|
186
|
+
cause: ex,
|
|
187
|
+
});
|
|
188
|
+
}
|
|
189
|
+
ret[i] = { key: to(i, i), name: '', description: '', condition: undefined };
|
|
190
|
+
}
|
|
138
191
|
}
|
|
139
|
-
return (value != null ? [value] : []);
|
|
140
192
|
}
|
|
141
|
-
case 'grouped':
|
|
142
|
-
case 'record':
|
|
143
|
-
default:
|
|
144
|
-
return value;
|
|
145
193
|
}
|
|
194
|
+
if (isLogical) {
|
|
195
|
+
while (ret.length < 2) {
|
|
196
|
+
ret.push({
|
|
197
|
+
key: fallbackKeys[ret.length],
|
|
198
|
+
name: '',
|
|
199
|
+
description: '',
|
|
200
|
+
condition: undefined,
|
|
201
|
+
});
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
return ret;
|
|
146
205
|
}
|
|
147
206
|
/** 求参数值 */
|
|
148
207
|
evaluateArg(expression, scope, definition) {
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
208
|
+
// 默认值有可能为表达式,因此需要先填充再求值
|
|
209
|
+
expression ??= definition.value;
|
|
210
|
+
// 求值失败时返回默认值
|
|
211
|
+
const result = this.evaluate(expression, scope, definition.value);
|
|
212
|
+
const converter = argumentConverter(definition);
|
|
213
|
+
// 转换失败时返回转换前的值
|
|
214
|
+
return converter(result, result);
|
|
152
215
|
}
|
|
153
216
|
/** 求参数表的所有参数值 */
|
|
154
217
|
evaluateArgs(args, scope, definition) {
|
|
155
|
-
const a =
|
|
218
|
+
const a = fillArgumentMap(definition, args);
|
|
156
219
|
const ret = {};
|
|
157
220
|
for (const group of definition) {
|
|
158
221
|
for (const param of group.items) {
|
|
@@ -165,57 +228,6 @@ export class Evaluator {
|
|
|
165
228
|
}
|
|
166
229
|
return ret;
|
|
167
230
|
}
|
|
168
|
-
/** 获取参数默认值,修复现有的参数,并填充缺失的参数 */
|
|
169
|
-
defaultArgs(definition, args = {}) {
|
|
170
|
-
if (definition == null || !isArray(definition) || definition.length === 0) {
|
|
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
231
|
/** 解析表达式 */
|
|
220
232
|
validate(expression) {
|
|
221
233
|
if (!isExpression(expression) || !expression.source) {
|
|
@@ -224,15 +236,19 @@ export class Evaluator {
|
|
|
224
236
|
const tag = expression[ExpressionTag];
|
|
225
237
|
if (tag)
|
|
226
238
|
TypeInfo.parse(tag);
|
|
227
|
-
parse(this
|
|
239
|
+
parse(this, expression.source, true, false);
|
|
228
240
|
}
|
|
229
241
|
/** 分析表达式 */
|
|
230
|
-
analyze(expression) {
|
|
242
|
+
analyze(expression, scope) {
|
|
231
243
|
if (!isExpression(expression) || !expression.source) {
|
|
232
244
|
throw new Error(`${expression.source || String(expression)} is not a valid expression`);
|
|
233
245
|
}
|
|
234
|
-
|
|
235
|
-
|
|
246
|
+
scope ??= this.scope;
|
|
247
|
+
const exp = parse(this, expression.source, scope.throws, false);
|
|
248
|
+
// 如果 throws=true,则 parse 会抛出错误,此处有 error 一定是 throws=false 的情况
|
|
249
|
+
if (exp.error)
|
|
250
|
+
return [];
|
|
251
|
+
return analyze(exp, this, scope);
|
|
236
252
|
}
|
|
237
253
|
}
|
|
238
254
|
//# 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":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAgB,MAAM,wBAAwB,CAAC;AACnF,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAA6B,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,OAAO,EAA6B,MAAM,cAAc,CAAC;AAClE,OAAO,EAMH,aAAa,EACb,YAAY,GACf,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EACH,iBAAiB,EACjB,mBAAmB,EACnB,eAAe,GASlB,MAAM,kBAAkB,CAAC;AAC1B,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;AAC1B,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,CAAC;AAOlC;;GAEG;AACH,MAAM,OAAO,SAAS;IAClB,YAAY,OAAiC;QAW7C,aAAa;QACI,UAAK,GAAG,IAAI,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC;QAE7C,eAAU,GAAG,IAAI,GAAG,EAAmB,CAAC;QAbrD,IAAI,CAAC,OAAO,GAAG,OAAO,IAAI,cAAc,CAAC;IAC7C,CAAC;IAED,aAAa;IACb,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC;IAC1C,CAAC;IAQD,WAAW;IACX,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IACD;;;;OAIG;IACH,MAAM,CAAC,MAA+B;QAClC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAChD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACtB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAChC,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;YACzD,CAAC;QACL,CAAC;IACL,CAAC;IAED,YAAY;IACZ,OAAO,CAAoB,UAAyB,EAAE,MAAM,GAAG,IAAI;QAC/D,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QAC5D,MAAM,GAAG,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC;QACtC,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5C,IAAI,QAA+B,CAAC;QACpC,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,QAAQ,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,CAAC,QAAQ,CAAI,SAAS,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAC1E,CAAC;aAAM,CAAC;YACJ,MAAM,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACpC,QAAQ,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE;gBAC5B,MAAM,GAAG,GAAG,QAAQ,CAAI,SAAS,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;gBACjD,IAAI,GAAG,IAAI,IAAI;oBAAE,OAAO,IAAI,CAAC;gBAC7B,OAAO,EAAE,CAAC,GAAG,CAAM,CAAC;YACxB,CAAC,CAAC;QACN,CAAC;QACD,cAAc,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3E,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9E,OAAO,QAAiC,CAAC;IAC7C,CAAC;IAED,uBAAuB;IACvB,QAAQ,CAAC,QAAmC,EAAE,KAAwB;QAClE,IAAI,QAAQ,IAAI,IAAI;YAAE,OAAO,EAAE,CAAC;QAChC,MAAM,MAAM,GAAG,KAAK,EAAE,MAAM,IAAI,IAAI,CAAC;QACrC,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAClD,MAAM,MAAM,GAAG,QAAQ,CAAS,IAAI,EAAE,KAAK,EAAE,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC;QAC9E,IAAI,OAAO,MAAM,IAAI,QAAQ;YAAE,OAAO,MAAM,CAAC;QAC7C,OAAO,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACrC,CAAC;IAsBD,SAAS;IACT,QAAQ,CACJ,UAA2E,EAC3E,KAA+B,EAC/B,WAAqB,IAAI;QAEzB,IAAI,UAAU,IAAI,IAAI;YAAE,OAAO,QAAQ,CAAC;QAExC,IAAI,OAAO,UAAU,IAAI,UAAU,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC;YAC/D,IAAI,CAAC;gBACD,MAAM,GAAG,GAAG,UAAU,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;gBAClD,IAAI,GAAG,IAAI,IAAI;oBAAE,OAAO,QAAQ,CAAC;gBACjC,OAAO,GAAG,CAAC;YACf,CAAC;YAAC,OAAO,EAAE,EAAE,CAAC;gBACV,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,EAAE,CAAC;oBACxB,MAAM,EAAE,CAAC;gBACb,CAAC;gBACD,OAAO,QAAQ,CAAC;YACpB,CAAC;QACL,CAAC;QAED,IAAI,CAAC,YAAY,CAAI,UAAU,CAAC,EAAE,CAAC;YAC/B,OAAO,UAAU,CAAC;QACtB,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC7D,IAAI,MAAM,IAAI,IAAI;YAAE,OAAO,QAAQ,CAAC;QAEpC,MAAM,GAAG,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC;QACtC,IAAI,CAAC,GAAG;YAAE,OAAO,MAAM,CAAC;QACxB,OAAO,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,CAAM,CAAC;IACzC,CAAC;IAcD,SAAS;IACT,cAAc,CACV,UAAsD,EACtD,KAA+B,EAC/B,WAAqB,IAAI;QAEzB,IAAI,UAAU,IAAI,IAAI;YAAE,OAAO,QAAQ,CAAC;QACxC,IAAI,OAAO,UAAU,IAAI,QAAQ;YAAE,OAAO,UAAU,CAAC;QAErD,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC;QACrB,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;QACzB,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QACrD,MAAM,MAAM,GAAG,QAAQ,CAAI,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAC/C,IAAI,MAAM,IAAI,IAAI;YAAE,OAAO,QAAQ,CAAC;QAEpC,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,UAAU;IACV,iBAAiB,CACb,SAAiD,EACjD,KAA+B,EAC/B,QAAQ,GAAG,IAAI;QAEf,IAAI,SAAS,IAAI,IAAI,IAAI,SAAS,KAAK,EAAE;YAAE,OAAO,QAAQ,CAAC;QAC3D,IAAI,OAAO,SAAS,IAAI,SAAS;YAAE,OAAO,SAAS,CAAC;QACpD,IAAI,SAAS,KAAK,MAAM;YAAE,OAAO,IAAI,CAAC;QACtC,IAAI,SAAS,KAAK,OAAO;YAAE,OAAO,KAAK,CAAC;QACxC,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;YAC/D,IAAI,OAAO,MAAM,IAAI,SAAS;gBAAE,OAAO,MAAM,CAAC;YAC9C,MAAM,IAAI,KAAK,CAAC,4BAA4B,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACvE,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACV,IAAI,KAAK,EAAE,MAAM,EAAE,CAAC;gBAChB,MAAM,EAAE,CAAC;YACb,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;YAC1C,OAAO,QAAQ,CAAC;QACpB,CAAC;IACL,CAAC;IAED,YAAY;IACZ,eAAe,CACX,UAA+D,EAC/D,KAA+B;QAE/B,MAAM,GAAG,GAAa,EAAE,CAAC;QACzB,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;QACrC,MAAM,SAAS,GAAG,IAAI,KAAK,SAAS,CAAC;QACrC,MAAM,UAAU,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;QACnD,MAAM,YAAY,GAAG,CAAC,SAAS;YAC3B,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,UAAU,KAAK,SAAS;gBACxB,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC;gBACf,CAAC,CAAC,UAAU,KAAK,QAAQ;oBACvB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBACR,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACrB,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;YAClB,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YACvD,IAAI,gBAAgB,IAAI,IAAI,EAAE,CAAC;gBAC3B,aAAa;YACjB,CAAC;iBAAM,IAAI,CAAC,OAAO,CAAC,gBAA6B,CAAC,EAAE,CAAC;gBACjD,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,EAAE,CAAC;oBACxB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;gBAC/C,CAAC;YACL,CAAC;iBAAM,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACrC,MAAM,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;gBAC1C,IAAI,GAAG,GAAG,gBAAgB,CAAC,MAAM,CAAC;gBAClC,IAAI,SAAS,IAAI,GAAG,GAAG,CAAC;oBAAE,GAAG,GAAG,CAAC,CAAC;gBAClC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;oBAC3B,IAAI,CAAC;wBACD,MAAM,IAAI,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;wBACjC,MAAM,GAAG,GAAG,EAAE,CAAC,IAAI,EAAE,GAAG,IAAI,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;wBAClD,MAAM,IAAI,GAAG,IAAI,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;wBAC1D,MAAM,WAAW,GAAG,IAAI,EAAE,WAAW,IAAI,EAAE,CAAC;wBAC5C,MAAM,SAAS,GAAG,IAAI,EAAE,SAAS,IAAI,SAAS,CAAC;wBAC/C,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC;oBACnD,CAAC;oBAAC,OAAO,EAAE,EAAE,CAAC;wBACV,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,EAAE,CAAC;4BACxB,MAAM,IAAI,KAAK,CAAC,yBAAyB,SAAS,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE;gCACvE,KAAK,EAAE,EAAE;6BACZ,CAAC,CAAC;wBACP,CAAC;wBACD,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;oBAChF,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;QACD,IAAI,SAAS,EAAE,CAAC;YACZ,OAAO,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACpB,GAAG,CAAC,IAAI,CAAC;oBACL,GAAG,EAAE,YAAY,CAAC,GAAG,CAAC,MAAM,CAAE;oBAC9B,IAAI,EAAE,EAAE;oBACR,WAAW,EAAE,EAAE;oBACf,SAAS,EAAE,SAAS;iBACvB,CAAC,CAAC;YACP,CAAC;QACL,CAAC;QACD,OAAO,GAA0B,CAAC;IACtC,CAAC;IAED,WAAW;IACX,WAAW,CACP,UAAmD,EACnD,KAA+B,EAC/B,UAAqB;QAErB,wBAAwB;QACxB,UAAU,KAAK,UAAU,CAAC,KAA6B,CAAC;QACxD,aAAa;QACb,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAI,UAAU,EAAE,KAAK,EAAE,UAAU,CAAC,KAAU,CAAC,CAAC;QAC1E,MAAM,SAAS,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC;QAChD,eAAe;QACf,OAAO,SAAS,CAAC,MAAM,EAAE,MAAM,CAAM,CAAC;IAC1C,CAAC;IACD,iBAAiB;IACjB,YAAY,CACR,IAAuC,EACvC,KAA+B,EAC/B,UAAwD;QAExD,MAAM,CAAC,GAAG,eAAe,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAC5C,MAAM,GAAG,GAAkC,EAAE,CAAC;QAC9C,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE,CAAC;YAC7B,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;gBAC9B,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC;gBACtB,IAAI,CAAC,GAAG;oBAAE,SAAS;gBACnB,MAAM,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;gBACnB,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;YACnD,CAAC;QACL,CAAC;QACD,OAAO,GAAQ,CAAC;IACpB,CAAC;IACD,YAAY;IACZ,QAAQ,CAAoB,UAAyB;QACjD,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YAClD,MAAM,IAAI,KAAK,CAAC,GAAG,UAAU,CAAC,MAAM,IAAI,MAAM,CAAC,UAAU,CAAC,4BAA4B,CAAC,CAAC;QAC5F,CAAC;QACD,MAAM,GAAG,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC;QACtC,IAAI,GAAG;YAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC7B,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC;IAED,YAAY;IACZ,OAAO,CAAoB,UAAyB,EAAE,KAAoB;QACtE,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YAClD,MAAM,IAAI,KAAK,CAAC,GAAG,UAAU,CAAC,MAAM,IAAI,MAAM,CAAC,UAAU,CAAC,4BAA4B,CAAC,CAAC;QAC5F,CAAC;QACD,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC;QACrB,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAChE,8DAA8D;QAC9D,IAAI,GAAG,CAAC,KAAK;YAAE,OAAO,EAAE,CAAC;QACzB,OAAO,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IACrC,CAAC;CACJ"}
|
package/dist/migrate.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { VmValue } from '@mirascript/mirascript';
|
|
2
|
+
import type { Scope } from './scope.js';
|
|
2
3
|
import type { ExpressionSource } from './expression.js';
|
|
3
|
-
import { Scope } from './scope.js';
|
|
4
4
|
/** MathJs 表达式转为 MiraScript 表达式 */
|
|
5
5
|
export declare function migrateMathJs<const T extends VmValue>(expr: ExpressionSource<T>, condition: boolean, context: Scope | undefined): ExpressionSource<T>;
|
|
6
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,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,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,CAmCrB"}
|