@cloudpss/expression 0.6.0-alpha.19 → 0.6.0-alpha.20
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/definitions/utils.d.ts +11 -3
- package/dist/definitions/utils.d.ts.map +1 -1
- package/dist/definitions/utils.js +90 -75
- package/dist/definitions/utils.js.map +1 -1
- package/dist/expression.js +2 -2
- package/dist/expression.js.map +1 -1
- package/dist/main.d.ts +1 -1
- package/dist/main.d.ts.map +1 -1
- package/dist/main.js +29 -39
- package/dist/main.js.map +1 -1
- package/dist/migrator/call.d.ts.map +1 -1
- package/dist/migrator/call.js +35 -1
- package/dist/migrator/call.js.map +1 -1
- package/dist/type.d.ts +1 -1
- package/dist/type.d.ts.map +1 -1
- package/dist/type.js +4 -2
- package/dist/type.js.map +1 -1
- package/package.json +3 -3
- package/src/definitions/utils.ts +95 -62
- package/src/expression.ts +2 -2
- package/src/main.ts +30 -38
- package/src/migrator/call.ts +33 -1
- package/src/type.ts +6 -2
- package/tests/definition.ts +39 -9
- package/tests/eval-complex.ts +12 -1
- package/tests/main.ts +49 -0
- package/tests/migrate.ts +21 -0
|
@@ -3,13 +3,21 @@ import type { ChoiceParameterType, Parameter, ParameterMap } from './parameter.j
|
|
|
3
3
|
import { TypeInfo } from '../type.js';
|
|
4
4
|
import type { ArgumentMap, ArgumentValue } from './argument.js';
|
|
5
5
|
import type { ParameterGroup } from './parameter-group.js';
|
|
6
|
-
/**
|
|
7
|
-
export
|
|
6
|
+
/** 转换参数类型 */
|
|
7
|
+
export type ArgumentConverter<out R extends ArgumentValue = ArgumentValue> = <const D = undefined>(value: VmValue | null | undefined, defaults?: D) => R | Exclude<D, undefined>;
|
|
8
|
+
/**
|
|
9
|
+
* 通过枚举参数定义推测枚举类型
|
|
10
|
+
*/
|
|
11
|
+
export declare function choiceParameterType(definition: Pick<ParameterMap[ChoiceParameterType], 'type' | 'value' | 'choices'>): TypeInfo;
|
|
12
|
+
/** 是否为枚举值类型 */
|
|
13
|
+
export declare function isChoiceValue(value: unknown): value is ChoiceParameterType;
|
|
14
|
+
/** 转换推测参数类型，不回退到 {@link Parameter.value} 提供的默认值 */
|
|
15
|
+
export declare function argumentConverter(definition: Parameter): ArgumentConverter;
|
|
8
16
|
/**
|
|
9
17
|
* 转换参数值的类型，不回退到 {@link Parameter.value} 提供的默认值
|
|
10
18
|
* 转换失败时返回 null
|
|
11
19
|
*/
|
|
12
|
-
export declare function toArgumentValue
|
|
20
|
+
export declare function toArgumentValue(value: VmValue | null | undefined, definition: Parameter): ArgumentValue | null;
|
|
13
21
|
/** 参数定义数组 */
|
|
14
22
|
type ParameterDefinitions = ReadonlyArray<Pick<ParameterGroup, 'items'>>;
|
|
15
23
|
/** 查找指定参数 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/definitions/utils.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/definitions/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAgE,KAAK,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEpH,OAAO,KAAK,EAAE,mBAAmB,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnF,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAG3D,aAAa;AACb,MAAM,MAAM,iBAAiB,CAAC,GAAG,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,SAAS,EAC7F,KAAK,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,EACjC,QAAQ,CAAC,EAAE,CAAC,KACX,CAAC,GAAG,OAAO,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;AAS/B;;GAEG;AACH,wBAAgB,mBAAmB,CAC/B,UAAU,EAAE,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC,GAClF,QAAQ,CA2BV;AAED,eAAe;AACf,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,mBAAmB,CAE1E;AAcD,mDAAmD;AACnD,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,SAAS,GAAG,iBAAiB,CAuD1E;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,EAAE,UAAU,EAAE,SAAS,GAAG,aAAa,GAAG,IAAI,CAG9G;AAED,aAAa;AACb,KAAK,oBAAoB,GAAG,aAAa,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC;AAgBzE,aAAa;AACb,wBAAgB,aAAa,CAAC,UAAU,EAAE,oBAAoB,GAAG,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAQ9G;AAED,uCAAuC;AACvC,wBAAgB,eAAe,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,EACnE,UAAU,EAAE,oBAAoB,GAAG,SAAS,EAC5C,IAAI,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI,GAC7B,WAAW,CAAC,CAAC,CAAC,CAmDhB"}
|
|
@@ -1,67 +1,71 @@
|
|
|
1
1
|
import { klona } from 'klona';
|
|
2
|
-
import { isVmArray, isVmRecord } from '@mirascript/mirascript';
|
|
2
|
+
import { isVmArray, isVmConst, isVmRecord } from '@mirascript/mirascript';
|
|
3
3
|
import { Expression, isExpression } from '../expression.js';
|
|
4
4
|
import { TypeInfo } from '../type.js';
|
|
5
5
|
const { isArray } = Array;
|
|
6
|
-
/**
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
6
|
+
/** 回退值 */
|
|
7
|
+
function toFallback(fallback) {
|
|
8
|
+
if (fallback === undefined) {
|
|
9
|
+
throw new TypeError('Conversion failed and no fallback value provided');
|
|
10
|
+
}
|
|
11
|
+
return fallback;
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* 通过枚举参数定义推测枚举类型
|
|
15
|
+
*/
|
|
16
|
+
export function choiceParameterType(definition) {
|
|
11
17
|
// 首先根据参数类型确定默认类型
|
|
12
18
|
let defaultType = definition.type === 'logical' ? 'boolean' : 'number';
|
|
13
19
|
// 然后根据默认值调整默认类型
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
const { value, choices } = definition;
|
|
21
|
+
if (definition.type === 'multiSelect' && Array.isArray(value)) {
|
|
22
|
+
const v = value[0];
|
|
23
|
+
if (isChoiceValue(v)) {
|
|
24
|
+
defaultType = typeof v;
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
else {
|
|
28
|
+
if (isChoiceValue(value)) {
|
|
29
|
+
defaultType = typeof value;
|
|
30
|
+
}
|
|
22
31
|
}
|
|
23
|
-
if (choices == null || choices.length
|
|
32
|
+
if (choices == null || typeof choices == 'function' || isExpression(choices) || !choices.length) {
|
|
24
33
|
return defaultType;
|
|
25
|
-
|
|
34
|
+
}
|
|
35
|
+
// 认为枚举选项值类型一致，推测枚举类型
|
|
26
36
|
for (const choice of choices) {
|
|
27
37
|
const v = choice?.key;
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
if (type == null)
|
|
32
|
-
type = 'string';
|
|
33
|
-
else if (type !== 'string')
|
|
34
|
-
return null;
|
|
35
|
-
}
|
|
36
|
-
else if (t === 'number') {
|
|
37
|
-
if (type == null)
|
|
38
|
-
type = 'number';
|
|
39
|
-
else if (type !== 'number')
|
|
40
|
-
return null;
|
|
41
|
-
}
|
|
42
|
-
else if (t === 'boolean') {
|
|
43
|
-
if (type == null)
|
|
44
|
-
type = 'boolean';
|
|
45
|
-
else if (type !== 'boolean')
|
|
46
|
-
return null;
|
|
47
|
-
}
|
|
48
|
-
else {
|
|
49
|
-
return null;
|
|
50
|
-
}
|
|
38
|
+
if (!isChoiceValue(v))
|
|
39
|
+
continue;
|
|
40
|
+
return typeof v;
|
|
51
41
|
}
|
|
52
|
-
return
|
|
42
|
+
return defaultType;
|
|
53
43
|
}
|
|
54
|
-
/**
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
44
|
+
/** 是否为枚举值类型 */
|
|
45
|
+
export function isChoiceValue(value) {
|
|
46
|
+
return typeof value == 'string' || typeof value == 'number' || typeof value == 'boolean';
|
|
47
|
+
}
|
|
48
|
+
const defaultConverter = (value, defaults) => {
|
|
49
|
+
if (value != null)
|
|
50
|
+
return value;
|
|
51
|
+
return toFallback(defaults);
|
|
52
|
+
};
|
|
53
|
+
const tableConverter = (value, defaults) => {
|
|
54
|
+
if (value == null)
|
|
55
|
+
return [];
|
|
56
|
+
if (isVmArray(value))
|
|
57
|
+
return value;
|
|
58
|
+
if (isVmConst(value))
|
|
59
|
+
return [value];
|
|
60
|
+
return toFallback(defaults);
|
|
61
|
+
};
|
|
62
|
+
const FALLBACK = Symbol('FALLBACK');
|
|
63
|
+
/** 转换推测参数类型，不回退到 {@link Parameter.value} 提供的默认值 */
|
|
64
|
+
export function argumentConverter(definition) {
|
|
61
65
|
switch (definition.type) {
|
|
62
66
|
case 'real':
|
|
63
67
|
case 'integer':
|
|
64
|
-
return TypeInfo.
|
|
68
|
+
return TypeInfo.converter('number');
|
|
65
69
|
case 'text':
|
|
66
70
|
case 'file':
|
|
67
71
|
case 'code':
|
|
@@ -69,47 +73,58 @@ export function toArgumentValue(value, definition) {
|
|
|
69
73
|
case 'cssColor':
|
|
70
74
|
case 'cssBackground':
|
|
71
75
|
case 'resourceId':
|
|
72
|
-
return TypeInfo.
|
|
76
|
+
return TypeInfo.converter('string');
|
|
73
77
|
case 'choice':
|
|
74
78
|
case 'logical': {
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
}
|
|
78
|
-
const type = enumType(definition);
|
|
79
|
-
if (!type)
|
|
80
|
-
return value;
|
|
81
|
-
return TypeInfo.to(value, type, null);
|
|
79
|
+
const type = choiceParameterType(definition);
|
|
80
|
+
return TypeInfo.converter(type);
|
|
82
81
|
}
|
|
83
82
|
case 'multiSelect': {
|
|
84
|
-
const
|
|
85
|
-
if (v.length === 0)
|
|
86
|
-
return v;
|
|
87
|
-
const type = enumType(definition);
|
|
88
|
-
if (!type)
|
|
89
|
-
return v;
|
|
83
|
+
const type = choiceParameterType(definition);
|
|
90
84
|
const to = TypeInfo.converter(type);
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
85
|
+
return (v, d) => {
|
|
86
|
+
const arr = tableConverter(v, FALLBACK);
|
|
87
|
+
if (arr === FALLBACK)
|
|
88
|
+
return toFallback(d);
|
|
89
|
+
if (arr.length === 0)
|
|
90
|
+
return arr;
|
|
91
|
+
let ret = null;
|
|
92
|
+
for (let i = 0; i < arr.length; i++) {
|
|
93
|
+
const el = arr[i];
|
|
94
|
+
const r = to(el, FALLBACK);
|
|
95
|
+
if (r === FALLBACK)
|
|
96
|
+
return toFallback(d);
|
|
97
|
+
if (!Object.is(r, el)) {
|
|
98
|
+
ret ??= [...arr];
|
|
99
|
+
ret[i] = r;
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
return ret ?? arr;
|
|
103
|
+
};
|
|
98
104
|
}
|
|
99
105
|
case 'table': {
|
|
100
|
-
|
|
101
|
-
return v;
|
|
106
|
+
return tableConverter;
|
|
102
107
|
}
|
|
103
108
|
case 'grouped':
|
|
104
109
|
case 'record': {
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
110
|
+
return (v, d) => {
|
|
111
|
+
if (isVmRecord(v))
|
|
112
|
+
return v;
|
|
113
|
+
return toFallback(d);
|
|
114
|
+
};
|
|
108
115
|
}
|
|
109
116
|
default:
|
|
110
|
-
return
|
|
117
|
+
return defaultConverter;
|
|
111
118
|
}
|
|
112
119
|
}
|
|
120
|
+
/**
|
|
121
|
+
* 转换参数值的类型，不回退到 {@link Parameter.value} 提供的默认值
|
|
122
|
+
* 转换失败时返回 null
|
|
123
|
+
*/
|
|
124
|
+
export function toArgumentValue(value, definition) {
|
|
125
|
+
const converter = argumentConverter(definition);
|
|
126
|
+
return converter(value, null);
|
|
127
|
+
}
|
|
113
128
|
/** 是否为包含参数组的参数定义数组 */
|
|
114
129
|
function checkParameterDefinitions(value) {
|
|
115
130
|
return value != null && isArray(value) && value.length > 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/definitions/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/definitions/utils.ts"],"names":[],"mappings":"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"}
|
package/dist/expression.js
CHANGED
|
@@ -7,12 +7,12 @@ export function Expression(source, returnType = '') {
|
|
|
7
7
|
const s = isExpression(source) ? source.source : source;
|
|
8
8
|
if (typeof s != 'string')
|
|
9
9
|
throw new TypeError(`Invalid expression ${String(s)}`);
|
|
10
|
-
return { [ExpressionTag]: returnType, source: s };
|
|
10
|
+
return { [ExpressionTag]: returnType || '', source: s };
|
|
11
11
|
}
|
|
12
12
|
/** 检查是否为表达式 */
|
|
13
13
|
export function isExpression(value) {
|
|
14
14
|
if (value == null || (typeof value != 'object' && typeof value != 'function'))
|
|
15
15
|
return false;
|
|
16
|
-
return ExpressionTag
|
|
16
|
+
return typeof value[ExpressionTag] == 'string';
|
|
17
17
|
}
|
|
18
18
|
//# sourceMappingURL=expression.js.map
|
package/dist/expression.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expression.js","sourceRoot":"","sources":["../src/expression.ts"],"names":[],"mappings":"AAMA,eAAe;AACf,MAAM,CAAC,MAAM,aAAa,GAAG,MAAe,CAAC;AA6B7C,cAAc;AACd,MAAM,UAAU,UAAU,CACtB,MAA8B,EAC9B,aAAyC,EAAE;IAE3C,IAAI,MAAM,IAAI,IAAI;QAAE,MAAM,IAAI,SAAS,CAAC,sBAAsB,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAChF,MAAM,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;IACxD,IAAI,OAAO,CAAC,IAAI,QAAQ;QAAE,MAAM,IAAI,SAAS,CAAC,sBAAsB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACjF,OAAO,EAAE,CAAC,aAAa,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,CAAwB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"expression.js","sourceRoot":"","sources":["../src/expression.ts"],"names":[],"mappings":"AAMA,eAAe;AACf,MAAM,CAAC,MAAM,aAAa,GAAG,MAAe,CAAC;AA6B7C,cAAc;AACd,MAAM,UAAU,UAAU,CACtB,MAA8B,EAC9B,aAAyC,EAAE;IAE3C,IAAI,MAAM,IAAI,IAAI;QAAE,MAAM,IAAI,SAAS,CAAC,sBAAsB,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAChF,MAAM,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;IACxD,IAAI,OAAO,CAAC,IAAI,QAAQ;QAAE,MAAM,IAAI,SAAS,CAAC,sBAAsB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACjF,OAAO,EAAE,CAAC,aAAa,CAAC,EAAE,UAAU,IAAI,EAAE,EAAE,MAAM,EAAE,CAAwB,EAAE,CAAC;AACnF,CAAC;AAED,eAAe;AACf,MAAM,UAAU,YAAY,CAAoB,KAAc;IAC1D,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,QAAQ,IAAI,OAAO,KAAK,IAAI,UAAU,CAAC;QAAE,OAAO,KAAK,CAAC;IAC5F,OAAO,OAAQ,KAAuB,CAAC,aAAa,CAAC,IAAI,QAAQ,CAAC;AACtE,CAAC"}
|
package/dist/main.d.ts
CHANGED
|
@@ -49,7 +49,7 @@ export declare class Evaluator {
|
|
|
49
49
|
/** 求条件 */
|
|
50
50
|
evaluateCondition(condition: ConditionExpression | null | undefined, scope: Scope | null | undefined, defaults?: boolean): boolean;
|
|
51
51
|
/** 求选项列表 */
|
|
52
|
-
evaluateChoices<T extends ChoiceParameterType>(definition: Pick<ParameterMap[T], 'type' | 'choices'>, scope: Scope | null | undefined): EvaluatedChoices<T>;
|
|
52
|
+
evaluateChoices<T extends ChoiceParameterType>(definition: Pick<ParameterMap[T], 'type' | 'choices' | 'value'>, scope: Scope | null | undefined): EvaluatedChoices<T>;
|
|
53
53
|
/** 求参数值 */
|
|
54
54
|
evaluateArg<V extends ArgumentValue>(expression: ExpressionOrValue<V> | null | undefined, scope: Scope | null | undefined, definition: Parameter): V;
|
|
55
55
|
/** 求参数表的所有参数值 */
|
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,
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
|
package/dist/main.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { isVmFunction,
|
|
1
|
+
import { isVmFunction, wrapToVmValue } from '@mirascript/mirascript';
|
|
2
2
|
import { serialize } from '@mirascript/mirascript/subtle';
|
|
3
3
|
import { defaultOptions } from './interface.js';
|
|
4
4
|
import { parse } from './parser.js';
|
|
@@ -7,7 +7,7 @@ import { ExpressionTag, isExpression, } from './expression.js';
|
|
|
7
7
|
import { evaluate } from './eval.js';
|
|
8
8
|
import { TypeInfo } from './type.js';
|
|
9
9
|
import { Scope } from './scope.js';
|
|
10
|
-
import {
|
|
10
|
+
import { argumentConverter, choiceParameterType, fillArgumentMap, } from './definitions.js';
|
|
11
11
|
const { isArray } = Array;
|
|
12
12
|
const { defineProperty } = Object;
|
|
13
13
|
/**
|
|
@@ -149,53 +149,42 @@ export class Evaluator {
|
|
|
149
149
|
evaluateChoices(definition, scope) {
|
|
150
150
|
const ret = [];
|
|
151
151
|
const { type, choices } = definition;
|
|
152
|
+
const isLogical = type === 'logical';
|
|
153
|
+
const choiceType = choiceParameterType(definition);
|
|
154
|
+
const fallbackKeys = choiceType === 'boolean' ? [false, true] : choiceType === 'number' ? [0, 1] : ['0', '1'];
|
|
152
155
|
if (choices != null) {
|
|
153
|
-
const
|
|
154
|
-
if (
|
|
156
|
+
const evaluatedChoices = this.evaluate(choices, scope);
|
|
157
|
+
if (evaluatedChoices == null) {
|
|
155
158
|
// do nothing
|
|
156
159
|
}
|
|
157
|
-
else if (!isArray(
|
|
160
|
+
else if (!isArray(evaluatedChoices)) {
|
|
158
161
|
if (scope?.throws ?? true) {
|
|
159
162
|
throw new Error(`Choices is not an array`);
|
|
160
163
|
}
|
|
161
164
|
}
|
|
162
|
-
else {
|
|
163
|
-
const
|
|
165
|
+
else if (evaluatedChoices.length > 0) {
|
|
166
|
+
const to = TypeInfo.converter(choiceType);
|
|
167
|
+
let len = evaluatedChoices.length;
|
|
168
|
+
if (isLogical && len > 2)
|
|
169
|
+
len = 2;
|
|
164
170
|
for (let i = 0; i < len; i++) {
|
|
165
|
-
const item =
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
}
|
|
172
|
-
else {
|
|
173
|
-
const key = item.key ?? i;
|
|
174
|
-
ret[i] = {
|
|
175
|
-
key,
|
|
176
|
-
name: item.name ?? String(key),
|
|
177
|
-
description: item.description ?? '',
|
|
178
|
-
condition: item.condition || undefined,
|
|
179
|
-
};
|
|
180
|
-
}
|
|
171
|
+
const item = evaluatedChoices[i];
|
|
172
|
+
const key = to(item?.key ?? fallbackKeys[i] ?? i);
|
|
173
|
+
const name = item?.name ?? (isLogical ? '' : String(key));
|
|
174
|
+
const description = item?.description ?? '';
|
|
175
|
+
const condition = item?.condition || undefined;
|
|
176
|
+
ret[i] = { key, name, description, condition };
|
|
181
177
|
}
|
|
182
178
|
}
|
|
183
179
|
}
|
|
184
|
-
if (
|
|
185
|
-
|
|
186
|
-
ret.
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
ret.push({
|
|
193
|
-
key: keys[ret.length],
|
|
194
|
-
name: '',
|
|
195
|
-
description: '',
|
|
196
|
-
condition: undefined,
|
|
197
|
-
});
|
|
198
|
-
}
|
|
180
|
+
if (isLogical) {
|
|
181
|
+
while (ret.length < 2) {
|
|
182
|
+
ret.push({
|
|
183
|
+
key: fallbackKeys[ret.length],
|
|
184
|
+
name: '',
|
|
185
|
+
description: '',
|
|
186
|
+
condition: undefined,
|
|
187
|
+
});
|
|
199
188
|
}
|
|
200
189
|
}
|
|
201
190
|
return ret;
|
|
@@ -206,8 +195,9 @@ export class Evaluator {
|
|
|
206
195
|
expression ??= definition.value;
|
|
207
196
|
// 求值失败时返回默认值
|
|
208
197
|
const result = this.evaluate(expression, scope, definition.value);
|
|
198
|
+
const converter = argumentConverter(definition);
|
|
209
199
|
// 转换失败时返回转换前的值
|
|
210
|
-
return
|
|
200
|
+
return converter(result, result);
|
|
211
201
|
}
|
|
212
202
|
/** 求参数表的所有参数值 */
|
|
213
203
|
evaluateArgs(args, scope, definition) {
|
package/dist/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.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,EAChB,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,EAChB,MAAM,QAAQ,CAAC;AAChB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAoVxC,aAAa;AACb,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,OAAO,GAAG,MAAM,CA8IhG"}
|
package/dist/migrator/call.js
CHANGED
|
@@ -28,6 +28,8 @@ const EXACT_UNARY_FUNCTION = new Map([
|
|
|
28
28
|
// XStudio 提供的函数
|
|
29
29
|
['service', 'extern'],
|
|
30
30
|
]);
|
|
31
|
+
/** 只接受一个参数，返回数字的函数 */
|
|
32
|
+
const ENTRYWISE_UNARY_MATH_FUNCTION = new Set(['abs', 'ceil', 'floor', 'round', 'sign']);
|
|
31
33
|
/** 兜底 */
|
|
32
34
|
function call(state, node, done) {
|
|
33
35
|
const { fn, args } = node;
|
|
@@ -53,9 +55,41 @@ function migrateFunctionCall(state, node, fnName, args, options) {
|
|
|
53
55
|
else if (fnName === 'random' && args.length === 0) {
|
|
54
56
|
return {
|
|
55
57
|
type: 'number',
|
|
56
|
-
code: `${
|
|
58
|
+
code: `${g('random')}()`,
|
|
57
59
|
};
|
|
58
60
|
}
|
|
61
|
+
else if (ENTRYWISE_UNARY_MATH_FUNCTION.has(fnName) && args.length === 1) {
|
|
62
|
+
const arg = migrateAtomic(state, args[0]);
|
|
63
|
+
if (arg.type === 'number' || arg.type === 'boolean' || arg.type === 'string') {
|
|
64
|
+
return {
|
|
65
|
+
type: 'number',
|
|
66
|
+
code: `${g(fnName)}(${arg.code})`,
|
|
67
|
+
};
|
|
68
|
+
}
|
|
69
|
+
return {
|
|
70
|
+
type: arg.type,
|
|
71
|
+
code: `${g('matrix')}.entrywise(${arg.code}, nil, ${g(fnName)})`,
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
else if (fnName === 'max' || fnName === 'min') {
|
|
75
|
+
if (args.length === 1) {
|
|
76
|
+
const arg = migrateAtomic(state, args[0]);
|
|
77
|
+
return {
|
|
78
|
+
type: 'number',
|
|
79
|
+
code: `${g(fnName)}(${arg.code})`,
|
|
80
|
+
};
|
|
81
|
+
}
|
|
82
|
+
else {
|
|
83
|
+
const argList = args.map((a) => migrateAtomic(state, a));
|
|
84
|
+
if (!argList.every((a) => a.type === 'number' || a.type === 'boolean' || a.type === 'string')) {
|
|
85
|
+
state.warn(`函数行为可能不一致: ${fnName}`);
|
|
86
|
+
}
|
|
87
|
+
return {
|
|
88
|
+
type: 'number',
|
|
89
|
+
code: `${g(fnName)}(${argList.map((a) => a.code).join(', ')})`,
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
}
|
|
59
93
|
else if (fnName === 're' || fnName === 'im') {
|
|
60
94
|
const m = migrateAtomic(state, args[0]);
|
|
61
95
|
state.err(`不支持复数`);
|