@cloudpss/expression 0.6.7 → 0.6.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/definitions/utils.d.ts.map +1 -1
- package/dist/definitions/utils.js +6 -3
- package/dist/definitions/utils.js.map +1 -1
- package/dist/main.d.ts.map +1 -1
- package/dist/main.js +21 -6
- package/dist/main.js.map +1 -1
- package/dist/re-exports.d.ts +1 -1
- package/dist/re-exports.d.ts.map +1 -1
- package/dist/re-exports.js +1 -1
- package/dist/re-exports.js.map +1 -1
- package/package.json +2 -2
- package/src/definitions/utils.ts +4 -3
- package/src/main.ts +21 -6
- package/src/re-exports.ts +2 -0
- package/tests/main.ts +63 -3
- package/tests/migrate.ts +1 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/definitions/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAiE,KAAK,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAErH,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,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/definitions/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAiE,KAAK,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAErH,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,GAAG,EAAE,CAkCf;AAED,eAAe;AACf,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,mBAAmB,CAE1E;AAmFD,mDAAmD;AACnD,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,SAAS,GAAG,iBAAiB,CAkD1E;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"}
|
|
@@ -39,10 +39,13 @@ export function choiceParameterType(definition) {
|
|
|
39
39
|
}
|
|
40
40
|
// 认为枚举选项值类型一致，推测枚举类型
|
|
41
41
|
for (const choice of choices) {
|
|
42
|
-
|
|
43
|
-
if (!isChoiceValue(v))
|
|
42
|
+
if (choice == null)
|
|
44
43
|
continue;
|
|
45
|
-
|
|
44
|
+
if (isChoiceValue(choice))
|
|
45
|
+
return typeof choice;
|
|
46
|
+
const { key } = choice;
|
|
47
|
+
if (isChoiceValue(key))
|
|
48
|
+
return typeof key;
|
|
46
49
|
}
|
|
47
50
|
return typeByDefault || typeByType;
|
|
48
51
|
}
|
|
@@ -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,SAAS,EAAE,UAAU,EAA6C,MAAM,wBAAwB,CAAC;AACrH,OAAO,EAAE,UAAU,EAAE,YAAY,EAA0B,MAAM,kBAAkB,CAAC;AAEpF,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGtC,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;AAQ1B,UAAU;AACV,SAAS,UAAU,CAAI,QAAuB;IAC1C,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,IAAI,SAAS,CAAC,kDAAkD,CAAC,CAAC;IAC5E,CAAC;IACD,OAAO,QAAiC,CAAC;AAC7C,CAAC;AACD;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAC/B,UAAiF;IAEjF,cAAc;IACd,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC;IACxE,aAAa;IACb,IAAI,aAAa,GAAkB,EAAE,CAAC;IACtC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;IACtC,IAAI,UAAU,CAAC,IAAI,KAAK,aAAa,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC5D,MAAM,CAAC,GAAY,KAAK,CAAC,CAAC,CAAC,CAAC;QAC5B,IAAI,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;YACnB,aAAa,GAAG,OAAO,CAAa,CAAC;QACzC,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;YACvB,aAAa,GAAG,OAAO,KAAiB,CAAC;QAC7C,CAAC;IACL,CAAC;IAED,IAAI,OAAO,OAAO,IAAI,UAAU,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;QACxD,sEAAsE;QACtE,OAAO,aAAa,CAAC;IACzB,CAAC;IAED,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;QACnB,OAAO,aAAa,IAAI,UAAU,CAAC;IACvC,CAAC;IAED,qBAAqB;IACrB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC3B,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/definitions/utils.ts"],"names":[],"mappings":"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"}
|
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,EAA+B,KAAK,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEnF,OAAO,EAAkB,KAAK,MAAM,EAAE,KAAK,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAE3E,OAAO,EAAW,KAAK,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAClE,OAAO,EACH,kBAAkB,EAClB,KAAK,UAAU,EACf,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EAGxB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
|
package/dist/main.js
CHANGED
|
@@ -7,7 +7,7 @@ import { CompiledExpression, ExpressionTag, isExpression, } from './expression.j
|
|
|
7
7
|
import { evaluate } from './eval.js';
|
|
8
8
|
import { TypeInfo } from './type.js';
|
|
9
9
|
import { Scope } from './scope.js';
|
|
10
|
-
import { argumentConverter, choiceParameterType, fillArgumentMap, } from './definitions.js';
|
|
10
|
+
import { argumentConverter, choiceParameterType, fillArgumentMap, isChoiceValue, } from './definitions.js';
|
|
11
11
|
const { isArray } = Array;
|
|
12
12
|
/**
|
|
13
13
|
* 表达式求值
|
|
@@ -171,11 +171,26 @@ export class Evaluator {
|
|
|
171
171
|
for (let i = 0; i < len; i++) {
|
|
172
172
|
try {
|
|
173
173
|
const item = evaluatedChoices[i];
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
174
|
+
let key, name, description, condition;
|
|
175
|
+
if (item != null && typeof item == 'object') {
|
|
176
|
+
key = item.key;
|
|
177
|
+
name = item.name;
|
|
178
|
+
description = item.description;
|
|
179
|
+
condition = item.condition;
|
|
180
|
+
}
|
|
181
|
+
else if (isChoiceValue(item)) {
|
|
182
|
+
key = item;
|
|
183
|
+
name = undefined;
|
|
184
|
+
description = undefined;
|
|
185
|
+
condition = undefined;
|
|
186
|
+
}
|
|
187
|
+
key ??= fallbackKeys[i] ?? i;
|
|
188
|
+
ret[i] = {
|
|
189
|
+
key: to(key),
|
|
190
|
+
name: name ?? (isLogical ? '' : String(key)),
|
|
191
|
+
description: description ?? '',
|
|
192
|
+
condition: condition == null || condition === '' ? undefined : condition,
|
|
193
|
+
};
|
|
179
194
|
}
|
|
180
195
|
catch (ex) {
|
|
181
196
|
if (scope?.throws ?? true) {
|
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,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,EACH,kBAAkB,EAKlB,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,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
|
package/dist/re-exports.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export { isVmAny, isVmArray, isVmConst, isVmContext, isVmExtern, isVmFunction, isVmImmutable, isVmModule, isVmPrimitive, isVmRecord, isVmArrayLikeRecord, isVmArrayLikeRecordByEntires, isVmArrayLikeRecordByKeys, isVmCallable, isVmScript, isVmWrapper, isVmValue, VmExtern, VmFunction, VmModule, VmError, defineVmContextValue, configCheckpoint, } from '@mirascript/mirascript';
|
|
1
|
+
export { isVmAny, isVmArray, isVmConst, isVmContext, isVmExtern, isVmFunction, isVmImmutable, isVmModule, isVmPrimitive, isVmRecord, isVmArrayLikeRecord, isVmArrayLikeRecordByEntires, isVmArrayLikeRecordByKeys, isVmCallable, isVmScript, isVmWrapper, isVmValue, VmExtern, VmFunction, VmModule, VmError, wrapToVmValue, unwrapFromVmValue, defineVmContextValue, configCheckpoint, } from '@mirascript/mirascript';
|
|
2
2
|
export type { VmScript, VmValueMap, VmAny, VmArray, VmConst, VmContext, VmImmutable, VmPrimitive, VmRecord, VmUninitialized, VmValue, } from '@mirascript/mirascript';
|
|
3
3
|
export { serialize, serializeRecordKey, serializeString, type SerializeOptions, constants, DefaultVmContext, lib, operations, } from '@mirascript/mirascript/subtle';
|
|
4
4
|
//# sourceMappingURL=re-exports.d.ts.map
|
package/dist/re-exports.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"re-exports.d.ts","sourceRoot":"","sources":["../src/re-exports.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,OAAO,EACP,SAAS,EACT,SAAS,EACT,WAAW,EACX,UAAU,EACV,YAAY,EACZ,aAAa,EACb,UAAU,EACV,aAAa,EACb,UAAU,EACV,mBAAmB,EACnB,4BAA4B,EAC5B,yBAAyB,EACzB,YAAY,EACZ,UAAU,EACV,WAAW,EACX,SAAS,EACT,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,OAAO,EACP,oBAAoB,EACpB,gBAAgB,GACnB,MAAM,wBAAwB,CAAC;AAChC,YAAY,EACR,QAAQ,EACR,UAAU,EACV,KAAK,EACL,OAAO,EACP,OAAO,EACP,SAAS,EACT,WAAW,EACX,WAAW,EACX,QAAQ,EACR,eAAe,EACf,OAAO,GACV,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACH,SAAS,EACT,kBAAkB,EAClB,eAAe,EACf,KAAK,gBAAgB,EACrB,SAAS,EACT,gBAAgB,EAChB,GAAG,EACH,UAAU,GACb,MAAM,+BAA+B,CAAC"}
|
|
1
|
+
{"version":3,"file":"re-exports.d.ts","sourceRoot":"","sources":["../src/re-exports.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,OAAO,EACP,SAAS,EACT,SAAS,EACT,WAAW,EACX,UAAU,EACV,YAAY,EACZ,aAAa,EACb,UAAU,EACV,aAAa,EACb,UAAU,EACV,mBAAmB,EACnB,4BAA4B,EAC5B,yBAAyB,EACzB,YAAY,EACZ,UAAU,EACV,WAAW,EACX,SAAS,EACT,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,OAAO,EACP,aAAa,EACb,iBAAiB,EACjB,oBAAoB,EACpB,gBAAgB,GACnB,MAAM,wBAAwB,CAAC;AAChC,YAAY,EACR,QAAQ,EACR,UAAU,EACV,KAAK,EACL,OAAO,EACP,OAAO,EACP,SAAS,EACT,WAAW,EACX,WAAW,EACX,QAAQ,EACR,eAAe,EACf,OAAO,GACV,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACH,SAAS,EACT,kBAAkB,EAClB,eAAe,EACf,KAAK,gBAAgB,EACrB,SAAS,EACT,gBAAgB,EAChB,GAAG,EACH,UAAU,GACb,MAAM,+BAA+B,CAAC"}
|
package/dist/re-exports.js
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
export { isVmAny, isVmArray, isVmConst, isVmContext, isVmExtern, isVmFunction, isVmImmutable, isVmModule, isVmPrimitive, isVmRecord, isVmArrayLikeRecord, isVmArrayLikeRecordByEntires, isVmArrayLikeRecordByKeys, isVmCallable, isVmScript, isVmWrapper, isVmValue, VmExtern, VmFunction, VmModule, VmError, defineVmContextValue, configCheckpoint, } from '@mirascript/mirascript';
|
|
1
|
+
export { isVmAny, isVmArray, isVmConst, isVmContext, isVmExtern, isVmFunction, isVmImmutable, isVmModule, isVmPrimitive, isVmRecord, isVmArrayLikeRecord, isVmArrayLikeRecordByEntires, isVmArrayLikeRecordByKeys, isVmCallable, isVmScript, isVmWrapper, isVmValue, VmExtern, VmFunction, VmModule, VmError, wrapToVmValue, unwrapFromVmValue, defineVmContextValue, configCheckpoint, } from '@mirascript/mirascript';
|
|
2
2
|
export { serialize, serializeRecordKey, serializeString, constants, DefaultVmContext, lib, operations, } from '@mirascript/mirascript/subtle';
|
|
3
3
|
//# sourceMappingURL=re-exports.js.map
|
package/dist/re-exports.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"re-exports.js","sourceRoot":"","sources":["../src/re-exports.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,OAAO,EACP,SAAS,EACT,SAAS,EACT,WAAW,EACX,UAAU,EACV,YAAY,EACZ,aAAa,EACb,UAAU,EACV,aAAa,EACb,UAAU,EACV,mBAAmB,EACnB,4BAA4B,EAC5B,yBAAyB,EACzB,YAAY,EACZ,UAAU,EACV,WAAW,EACX,SAAS,EACT,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,OAAO,EACP,oBAAoB,EACpB,gBAAgB,GACnB,MAAM,wBAAwB,CAAC;AAchC,OAAO,EACH,SAAS,EACT,kBAAkB,EAClB,eAAe,EAEf,SAAS,EACT,gBAAgB,EAChB,GAAG,EACH,UAAU,GACb,MAAM,+BAA+B,CAAC"}
|
|
1
|
+
{"version":3,"file":"re-exports.js","sourceRoot":"","sources":["../src/re-exports.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,OAAO,EACP,SAAS,EACT,SAAS,EACT,WAAW,EACX,UAAU,EACV,YAAY,EACZ,aAAa,EACb,UAAU,EACV,aAAa,EACb,UAAU,EACV,mBAAmB,EACnB,4BAA4B,EAC5B,yBAAyB,EACzB,YAAY,EACZ,UAAU,EACV,WAAW,EACX,SAAS,EACT,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,OAAO,EACP,aAAa,EACb,iBAAiB,EACjB,oBAAoB,EACpB,gBAAgB,GACnB,MAAM,wBAAwB,CAAC;AAchC,OAAO,EACH,SAAS,EACT,kBAAkB,EAClB,eAAe,EAEf,SAAS,EACT,gBAAgB,EAChB,GAAG,EACH,UAAU,GACb,MAAM,+BAA+B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloudpss/expression",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.10",
|
|
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.34",
|
|
16
16
|
"klona": "^2.0.6",
|
|
17
17
|
"lru-cache": "^11.2.4",
|
|
18
18
|
"mathjs": "^15.1.0",
|
package/src/definitions/utils.ts
CHANGED
|
@@ -53,9 +53,10 @@ export function choiceParameterType(
|
|
|
53
53
|
|
|
54
54
|
// 认为枚举选项值类型一致，推测枚举类型
|
|
55
55
|
for (const choice of choices) {
|
|
56
|
-
|
|
57
|
-
if (
|
|
58
|
-
|
|
56
|
+
if (choice == null) continue;
|
|
57
|
+
if (isChoiceValue(choice)) return typeof choice as TypeInfo;
|
|
58
|
+
const { key } = choice;
|
|
59
|
+
if (isChoiceValue(key)) return typeof key as TypeInfo;
|
|
59
60
|
}
|
|
60
61
|
return typeByDefault || typeByType;
|
|
61
62
|
}
|
package/src/main.ts
CHANGED
|
@@ -19,6 +19,7 @@ import {
|
|
|
19
19
|
argumentConverter,
|
|
20
20
|
choiceParameterType,
|
|
21
21
|
fillArgumentMap,
|
|
22
|
+
isChoiceValue,
|
|
22
23
|
type ArgumentMap,
|
|
23
24
|
type ArgumentValue,
|
|
24
25
|
type Choice,
|
|
@@ -239,12 +240,26 @@ export class Evaluator {
|
|
|
239
240
|
if (isLogical && len > 2) len = 2;
|
|
240
241
|
for (let i = 0; i < len; i++) {
|
|
241
242
|
try {
|
|
242
|
-
const item = evaluatedChoices[i];
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
243
|
+
const item = evaluatedChoices[i] as Choice | ChoiceArgumentValue | null | undefined;
|
|
244
|
+
let key, name, description, condition;
|
|
245
|
+
if (item != null && typeof item == 'object') {
|
|
246
|
+
key = item.key;
|
|
247
|
+
name = item.name;
|
|
248
|
+
description = item.description;
|
|
249
|
+
condition = item.condition;
|
|
250
|
+
} else if (isChoiceValue(item)) {
|
|
251
|
+
key = item;
|
|
252
|
+
name = undefined;
|
|
253
|
+
description = undefined;
|
|
254
|
+
condition = undefined;
|
|
255
|
+
}
|
|
256
|
+
key ??= fallbackKeys[i] ?? i;
|
|
257
|
+
ret[i] = {
|
|
258
|
+
key: to(key) as ChoiceArgumentValue,
|
|
259
|
+
name: name ?? (isLogical ? '' : String(key)),
|
|
260
|
+
description: description ?? '',
|
|
261
|
+
condition: condition == null || condition === '' ? undefined : condition,
|
|
262
|
+
};
|
|
248
263
|
} catch (ex) {
|
|
249
264
|
if (scope?.throws ?? true) {
|
|
250
265
|
throw new Error(`Invalid choice value: ${serialize(evaluatedChoices[i])}`, {
|
package/src/re-exports.ts
CHANGED
package/tests/main.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Expression } from '../dist/expression.js';
|
|
1
2
|
import { Evaluator } from '../dist/main.js';
|
|
2
3
|
|
|
3
4
|
describe('Evaluator', () => {
|
|
@@ -20,7 +21,7 @@ describe('Evaluator', () => {
|
|
|
20
21
|
{
|
|
21
22
|
type: 'logical',
|
|
22
23
|
// @ts-expect-error Incomplete choice definition
|
|
23
|
-
choices: [{}, { key: true, name: 'Yes' }],
|
|
24
|
+
choices: [{}, { key: true, name: 'Yes', condition: false }],
|
|
24
25
|
value: null as never,
|
|
25
26
|
},
|
|
26
27
|
null,
|
|
@@ -30,12 +31,13 @@ describe('Evaluator', () => {
|
|
|
30
31
|
expect(c1[1].key).toBe(true);
|
|
31
32
|
expect(c1[0].name).toBe('');
|
|
32
33
|
expect(c1[1].name).toBe('Yes');
|
|
34
|
+
expect(c1[1].condition).toBe(false);
|
|
33
35
|
|
|
34
36
|
const c2 = e.evaluateChoices(
|
|
35
37
|
{
|
|
36
38
|
type: 'logical',
|
|
37
39
|
// @ts-expect-error Incomplete choice definition
|
|
38
|
-
choices: [{ key: 0 }, { key: '1' }, { key: 2 }],
|
|
40
|
+
choices: [{ key: 0, condition: true }, { key: '1', condition: null }, { key: 2 }],
|
|
39
41
|
value: null as never,
|
|
40
42
|
},
|
|
41
43
|
null,
|
|
@@ -43,6 +45,8 @@ describe('Evaluator', () => {
|
|
|
43
45
|
expect(c2.length).toBe(2);
|
|
44
46
|
expect(c2[0].key).toBe(0);
|
|
45
47
|
expect(c2[1].key).toBe(1);
|
|
48
|
+
expect(c2[0].condition).toBe(true);
|
|
49
|
+
expect(c2[1].condition).toBe(undefined);
|
|
46
50
|
|
|
47
51
|
const c3 = e.evaluateChoices({ type: 'logical', choices: [], value: 0 }, null);
|
|
48
52
|
expect(c3.length).toBe(2);
|
|
@@ -95,7 +99,7 @@ describe('Evaluator', () => {
|
|
|
95
99
|
{
|
|
96
100
|
type: 'multiSelect',
|
|
97
101
|
// @ts-expect-error Incomplete choice definition
|
|
98
|
-
choices: [{}, { key: 2, name: 'Two' }, { key: 3 }],
|
|
102
|
+
choices: [{ condition: '' }, { key: 2, name: 'Two', condition: 'true' }, { key: 3 }],
|
|
99
103
|
value: ['2'],
|
|
100
104
|
},
|
|
101
105
|
null,
|
|
@@ -103,10 +107,13 @@ describe('Evaluator', () => {
|
|
|
103
107
|
expect(c2.length).toBe(3);
|
|
104
108
|
expect(c2[0].key).toBe(0);
|
|
105
109
|
expect(c2[0].name).toBe('0');
|
|
110
|
+
expect(c2[0].condition).toBe(undefined);
|
|
106
111
|
expect(c2[1].key).toBe(2);
|
|
107
112
|
expect(c2[1].name).toBe('Two');
|
|
113
|
+
expect(c2[1].condition).toBe('true');
|
|
108
114
|
expect(c2[2].key).toBe(3);
|
|
109
115
|
expect(c2[2].name).toBe('3');
|
|
116
|
+
expect(c2[2].condition).toBe(undefined);
|
|
110
117
|
|
|
111
118
|
const c3 = e.evaluateChoices(
|
|
112
119
|
{
|
|
@@ -142,5 +149,58 @@ describe('Evaluator', () => {
|
|
|
142
149
|
expect(c4[2].key).toBe(3);
|
|
143
150
|
expect(c4[2].name).toBe('3');
|
|
144
151
|
});
|
|
152
|
+
|
|
153
|
+
it('with only keys', () => {
|
|
154
|
+
const c1 = e.evaluateChoices(
|
|
155
|
+
{
|
|
156
|
+
type: 'choice',
|
|
157
|
+
// @ts-expect-error Incomplete choice definition
|
|
158
|
+
choices: [1, 2, '3'],
|
|
159
|
+
value: 'b',
|
|
160
|
+
},
|
|
161
|
+
null,
|
|
162
|
+
);
|
|
163
|
+
expect(c1.length).toBe(3);
|
|
164
|
+
expect(c1[0].key).toBe(1);
|
|
165
|
+
expect(c1[1].key).toBe(2);
|
|
166
|
+
expect(c1[2].key).toBe(3);
|
|
167
|
+
expect(c1[0].name).toBe('1');
|
|
168
|
+
expect(c1[1].name).toBe('2');
|
|
169
|
+
expect(c1[2].name).toBe('3');
|
|
170
|
+
|
|
171
|
+
const c2 = e.evaluateChoices(
|
|
172
|
+
{
|
|
173
|
+
type: 'choice',
|
|
174
|
+
// @ts-expect-error Incomplete choice definition
|
|
175
|
+
choices: () => [1, 2, '3'],
|
|
176
|
+
value: 'b',
|
|
177
|
+
},
|
|
178
|
+
null,
|
|
179
|
+
);
|
|
180
|
+
expect(c2.length).toBe(3);
|
|
181
|
+
expect(c2[0].key).toBe('1');
|
|
182
|
+
expect(c2[1].key).toBe('2');
|
|
183
|
+
expect(c2[2].key).toBe('3');
|
|
184
|
+
expect(c2[0].name).toBe('1');
|
|
185
|
+
expect(c2[1].name).toBe('2');
|
|
186
|
+
expect(c2[2].name).toBe('3');
|
|
187
|
+
|
|
188
|
+
const c3 = e.evaluateChoices(
|
|
189
|
+
{
|
|
190
|
+
type: 'choice',
|
|
191
|
+
// @ts-expect-error Incomplete choice definition
|
|
192
|
+
choices: Expression('[1, 2, "3"]'),
|
|
193
|
+
value: 'b',
|
|
194
|
+
},
|
|
195
|
+
null,
|
|
196
|
+
);
|
|
197
|
+
expect(c3.length).toBe(3);
|
|
198
|
+
expect(c3[0].key).toBe('1');
|
|
199
|
+
expect(c3[1].key).toBe('2');
|
|
200
|
+
expect(c3[2].key).toBe('3');
|
|
201
|
+
expect(c3[0].name).toBe('1');
|
|
202
|
+
expect(c3[1].name).toBe('2');
|
|
203
|
+
expect(c3[2].name).toBe('3');
|
|
204
|
+
});
|
|
145
205
|
});
|
|
146
206
|
});
|
package/tests/migrate.ts
CHANGED
|
@@ -375,6 +375,7 @@ describe('migrate', () => {
|
|
|
375
375
|
[`s.split('b')`, `s::split('b')`, ['a', 'c']],
|
|
376
376
|
[`a.join('\`')`, `a::join(\`\\\`\`)`, '1`2`3'],
|
|
377
377
|
[`[a, s, f, 'x'].join()`, '`$(a),$(s),$(f),x`', '1, 2, 3,abc,1,x'],
|
|
378
|
+
[`0xffffi16`, `-1`, -1],
|
|
378
379
|
])('should migrate expression: %s', (f, t, r) => {
|
|
379
380
|
const migrated = migrateMathJs(f as ExpressionSource, false, s);
|
|
380
381
|
expect(migrated).toBe(t);
|