@cloudpss/expression 0.6.1 → 0.6.3
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 +1 -1
- package/dist/definitions/utils.d.ts.map +1 -1
- package/dist/definitions/utils.js +13 -8
- package/dist/definitions/utils.js.map +1 -1
- package/dist/main.d.ts.map +1 -1
- package/dist/main.js +7 -2
- 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/dist/type.d.ts +5 -4
- package/dist/type.d.ts.map +1 -1
- package/dist/type.js +11 -7
- package/dist/type.js.map +1 -1
- package/package.json +1 -1
- package/src/definitions/utils.ts +15 -9
- package/src/main.ts +9 -3
- package/src/re-exports.ts +1 -0
- package/src/type.ts +12 -11
- package/tests/main.ts +88 -0
|
@@ -8,7 +8,7 @@ export type ArgumentConverter<out R extends ArgumentValue = ArgumentValue> = <co
|
|
|
8
8
|
/**
|
|
9
9
|
* 通过枚举参数定义推测枚举类型
|
|
10
10
|
*/
|
|
11
|
-
export declare function choiceParameterType(definition: Pick<ParameterMap[ChoiceParameterType], 'type' | 'value' | 'choices'>): TypeInfo;
|
|
11
|
+
export declare function choiceParameterType(definition: Pick<ParameterMap[ChoiceParameterType], 'type' | 'value' | 'choices'>): TypeInfo | '';
|
|
12
12
|
/** 是否为枚举值类型 */
|
|
13
13
|
export declare function isChoiceValue(value: unknown): value is ChoiceParameterType;
|
|
14
14
|
/** 转换推测参数类型，不回退到 {@link Parameter.value} 提供的默认值 */
|
|
@@ -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,
|
|
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,CAiCf;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"}
|
|
@@ -14,23 +14,28 @@ function toFallback(fallback) {
|
|
|
14
14
|
* 通过枚举参数定义推测枚举类型
|
|
15
15
|
*/
|
|
16
16
|
export function choiceParameterType(definition) {
|
|
17
|
-
//
|
|
18
|
-
|
|
19
|
-
//
|
|
17
|
+
// 根据参数类型确定的类型
|
|
18
|
+
const typeByType = definition.type === 'logical' ? 'boolean' : 'number';
|
|
19
|
+
// 根据默认值确定的类型
|
|
20
|
+
let typeByDefault = '';
|
|
20
21
|
const { value, choices } = definition;
|
|
21
22
|
if (definition.type === 'multiSelect' && Array.isArray(value)) {
|
|
22
23
|
const v = value[0];
|
|
23
24
|
if (isChoiceValue(v)) {
|
|
24
|
-
|
|
25
|
+
typeByDefault = typeof v;
|
|
25
26
|
}
|
|
26
27
|
}
|
|
27
28
|
else {
|
|
28
29
|
if (isChoiceValue(value)) {
|
|
29
|
-
|
|
30
|
+
typeByDefault = typeof value;
|
|
30
31
|
}
|
|
31
32
|
}
|
|
32
|
-
if (
|
|
33
|
-
|
|
33
|
+
if (typeof choices == 'function' || isExpression(choices)) {
|
|
34
|
+
// 此时只根据默认值推测类型，避免 { type: 'multiSelect', value: [] } 导致类型推断为 'number'
|
|
35
|
+
return typeByDefault;
|
|
36
|
+
}
|
|
37
|
+
if (!choices?.length) {
|
|
38
|
+
return typeByDefault || typeByType;
|
|
34
39
|
}
|
|
35
40
|
// 认为枚举选项值类型一致，推测枚举类型
|
|
36
41
|
for (const choice of choices) {
|
|
@@ -39,7 +44,7 @@ export function choiceParameterType(definition) {
|
|
|
39
44
|
continue;
|
|
40
45
|
return typeof v;
|
|
41
46
|
}
|
|
42
|
-
return
|
|
47
|
+
return typeByDefault || typeByType;
|
|
43
48
|
}
|
|
44
49
|
/** 是否为枚举值类型 */
|
|
45
50
|
export function isChoiceValue(value) {
|
|
@@ -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,
|
|
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,KAAK,kBAAkB,EACvB,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,EAIH,KAAK,WAAW,EAChB,KAAK,aAAa,
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
|
package/dist/main.js
CHANGED
|
@@ -151,7 +151,7 @@ export class Evaluator {
|
|
|
151
151
|
const choiceType = choiceParameterType(definition);
|
|
152
152
|
const fallbackKeys = !isLogical
|
|
153
153
|
? []
|
|
154
|
-
: choiceType === 'boolean'
|
|
154
|
+
: choiceType === 'boolean' || !choiceType
|
|
155
155
|
? [false, true]
|
|
156
156
|
: choiceType === 'number'
|
|
157
157
|
? [0, 1]
|
|
@@ -186,7 +186,12 @@ export class Evaluator {
|
|
|
186
186
|
cause: ex,
|
|
187
187
|
});
|
|
188
188
|
}
|
|
189
|
-
ret[i] = {
|
|
189
|
+
ret[i] = {
|
|
190
|
+
key: to(i, i),
|
|
191
|
+
name: '',
|
|
192
|
+
description: '',
|
|
193
|
+
condition: undefined,
|
|
194
|
+
};
|
|
190
195
|
}
|
|
191
196
|
}
|
|
192
197
|
}
|
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,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,
|
|
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, } 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, 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,
|
|
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"}
|
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, } 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, 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,
|
|
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"}
|
package/dist/type.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type VmAny, type VmValue, type VmValueMap } from '@mirascript/mirascript';
|
|
2
2
|
import { convert } from '@mirascript/mirascript/subtle';
|
|
3
|
+
import type { ArgumentValue } from './definitions.js';
|
|
3
4
|
/** 类型信息 */
|
|
4
5
|
export type TypeInfo = 'string' | 'number' | 'boolean';
|
|
5
6
|
/** 类型映射 */
|
|
@@ -21,8 +22,8 @@ export declare namespace TypeInfo {
|
|
|
21
22
|
export function is<T extends TypeInfo | LegacyType>(value: VmValue | undefined, type: T): value is TsTypeOf<T>;
|
|
22
23
|
/** 转换类型 */
|
|
23
24
|
export function to<T extends TypeInfo | LegacyType | '', I extends VmValue = VmValue, F = undefined>(value: I | undefined, type: T, fallback?: F): TsTypeOf<T> | Exclude<F, undefined>;
|
|
24
|
-
/**
|
|
25
|
-
function
|
|
25
|
+
/** 检查是否为 ArgumentValue */
|
|
26
|
+
function assertArgumentValue<F = undefined>(value: VmAny, fallback?: F): ArgumentValue | Exclude<F, undefined>;
|
|
26
27
|
/** 获取转换器 */
|
|
27
28
|
type Converters = {
|
|
28
29
|
string: typeof convert.toString;
|
|
@@ -31,7 +32,7 @@ export declare namespace TypeInfo {
|
|
|
31
32
|
f: typeof convert.toNumber;
|
|
32
33
|
boolean: typeof convert.toBoolean;
|
|
33
34
|
b: typeof convert.toBoolean;
|
|
34
|
-
'': typeof
|
|
35
|
+
'': typeof assertArgumentValue;
|
|
35
36
|
};
|
|
36
37
|
/** 获取转换器 */
|
|
37
38
|
export function converter<T extends TypeInfo | LegacyType | ''>(type: T): Converters[T];
|
package/dist/type.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../src/type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../src/type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqC,KAAK,KAAK,EAAE,KAAK,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACtH,OAAO,EAAE,OAAO,EAAuB,MAAM,+BAA+B,CAAC;AAC7E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEtD,WAAW;AACX,MAAM,MAAM,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC;AAKvD,WAAW;AACX,KAAK,OAAO,GAAG,UAAU,GAAG;IACxB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,OAAO,CAAC;IACX,EAAE,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,YAAY;AACZ,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,QAAQ,GAAG,UAAU,GAAG,EAAE,EAAE,CAAC,SAAS,OAAO,GAAG,OAAO,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAExH,aAAa;AACb,MAAM,MAAM,UAAU,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;AAEzC,WAAW;AACX,yBAAiB,QAAQ,CAAC;IACtB,WAAW;IACX,MAAM,UAAU,KAAK,CAAC,IAAI,EAAE,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAK3D;IACD,WAAW;IACX,MAAM,UAAU,EAAE,CAAC,CAAC,SAAS,QAAQ,GAAG,UAAU,EAAE,KAAK,EAAE,OAAO,GAAG,SAAS,EAAE,IAAI,EAAE,CAAC,GAAG,KAAK,IAAI,QAAQ,CAAC,CAAC,CAAC,CAe7G;IAED,WAAW;IACX,MAAM,UAAU,EAAE,CAAC,CAAC,SAAS,QAAQ,GAAG,UAAU,GAAG,EAAE,EAAE,CAAC,SAAS,OAAO,GAAG,OAAO,EAAE,CAAC,GAAG,SAAS,EAC/F,KAAK,EAAE,CAAC,GAAG,SAAS,EACpB,IAAI,EAAE,CAAC,EACP,QAAQ,CAAC,EAAE,CAAC,GACb,QAAQ,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,EAAE,SAAS,CAAC,CAGrC;IAED,0BAA0B;IAC1B,SAAS,mBAAmB,CAAC,CAAC,GAAG,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,aAAa,GAAG,OAAO,CAAC,CAAC,EAAE,SAAS,CAAC,CAM7G;IAED,YAAY;IACZ,KAAK,UAAU,GAAG;QACd,MAAM,EAAE,OAAO,OAAO,CAAC,QAAQ,CAAC;QAChC,CAAC,EAAE,OAAO,OAAO,CAAC,QAAQ,CAAC;QAC3B,MAAM,EAAE,OAAO,OAAO,CAAC,QAAQ,CAAC;QAChC,CAAC,EAAE,OAAO,OAAO,CAAC,QAAQ,CAAC;QAC3B,OAAO,EAAE,OAAO,OAAO,CAAC,SAAS,CAAC;QAClC,CAAC,EAAE,OAAO,OAAO,CAAC,SAAS,CAAC;QAC5B,EAAE,EAAE,OAAO,mBAAmB,CAAC;KAClC,CAAC;IACF,YAAY;IACZ,MAAM,UAAU,SAAS,CAAC,CAAC,SAAS,QAAQ,GAAG,UAAU,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAgBtF;IAED,MAAM,CAAC,MAAQ,SAAS,4BAAE,QAAQ,2BAAE,QAAQ,2BAAE,QAAQ,yBAAY,CAAC;;CACtE"}
|
package/dist/type.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { isVmConst, VmError } from '@mirascript/mirascript';
|
|
2
|
+
import { convert, serializeForDisplay } from '@mirascript/mirascript/subtle';
|
|
2
3
|
const x = 'boolean';
|
|
3
4
|
x;
|
|
4
5
|
/** 类型信息 */
|
|
@@ -39,11 +40,14 @@ export var TypeInfo;
|
|
|
39
40
|
return c(value, fallback);
|
|
40
41
|
}
|
|
41
42
|
TypeInfo.to = to;
|
|
42
|
-
/**
|
|
43
|
-
function
|
|
44
|
-
if (value
|
|
45
|
-
return
|
|
46
|
-
|
|
43
|
+
/** 检查是否为 ArgumentValue */
|
|
44
|
+
function assertArgumentValue(value, fallback) {
|
|
45
|
+
if (value != null && isVmConst(value))
|
|
46
|
+
return value;
|
|
47
|
+
if (fallback === undefined) {
|
|
48
|
+
throw new VmError(`Value is not ArgumentValue: ${serializeForDisplay(value)}`, undefined);
|
|
49
|
+
}
|
|
50
|
+
return fallback;
|
|
47
51
|
}
|
|
48
52
|
/** 获取转换器 */
|
|
49
53
|
function converter(type) {
|
|
@@ -60,7 +64,7 @@ export var TypeInfo;
|
|
|
60
64
|
return TypeInfo.toString;
|
|
61
65
|
default:
|
|
62
66
|
(type);
|
|
63
|
-
return
|
|
67
|
+
return assertArgumentValue;
|
|
64
68
|
}
|
|
65
69
|
}
|
|
66
70
|
TypeInfo.converter = converter;
|
package/dist/type.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.js","sourceRoot":"","sources":["../src/type.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"type.js","sourceRoot":"","sources":["../src/type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAA4D,MAAM,wBAAwB,CAAC;AACtH,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAM7E,MAAM,CAAC,GAAa,SAAS,CAAC;AAC9B,CAAoB,CAAC;AAgBrB,WAAW;AACX,MAAM,KAAW,QAAQ,CA2ExB;AA3ED,WAAiB,QAAQ;IACrB,WAAW;IACX,SAAgB,KAAK,CAAC,IAA2B;QAC7C,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,QAAQ;YAAE,OAAO,QAAQ,CAAC;QACvD,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,QAAQ;YAAE,OAAO,QAAQ,CAAC;QACvD,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QACzD,MAAM,IAAI,SAAS,CAAC,iBAAiB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1D,CAAC;IALe,cAAK,QAKpB,CAAA;IACD,WAAW;IACX,SAAgB,EAAE,CAAkC,KAA0B,EAAE,IAAO;QACnF,QAAQ,IAAI,EAAE,CAAC;YACX,KAAK,GAAG,CAAC;YACT,KAAK,SAAS;gBACV,OAAO,OAAO,KAAK,KAAK,SAAS,CAAC;YACtC,KAAK,GAAG,CAAC;YACT,KAAK,QAAQ;gBACT,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC;YACrC,KAAK,GAAG,CAAC;YACT,KAAK,QAAQ;gBACT,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC;YACrC;gBACI,CAAC,IAAI,CAAiB,CAAC;gBACvB,OAAO,KAAK,CAAC;QACrB,CAAC;IACL,CAAC;IAfe,WAAE,KAejB,CAAA;IAED,WAAW;IACX,SAAgB,EAAE,CACd,KAAoB,EACpB,IAAO,EACP,QAAY;QAEZ,MAAM,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;QAC1B,OAAQ,CAA6B,CAAC,KAAK,EAAE,QAAQ,CAAgB,CAAC;IAC1E,CAAC;IAPe,WAAE,KAOjB,CAAA;IAED,0BAA0B;IAC1B,SAAS,mBAAmB,CAAgB,KAAY,EAAE,QAAY;QAClE,IAAI,KAAK,IAAI,IAAI,IAAI,SAAS,CAAC,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QACpD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,IAAI,OAAO,CAAC,+BAA+B,mBAAmB,CAAC,KAAK,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;QAC9F,CAAC;QACD,OAAO,QAAiC,CAAC;IAC7C,CAAC;IAYD,YAAY;IACZ,SAAgB,SAAS,CAAuC,IAAO;QACnE,0EAA0E;QAC1E,QAAQ,IAAI,EAAE,CAAC;YACX,KAAK,GAAG,CAAC;YACT,KAAK,SAAS;gBACV,OAAO,SAAA,SAA0B,CAAC;YACtC,KAAK,GAAG,CAAC;YACT,KAAK,QAAQ;gBACT,OAAO,SAAA,QAAyB,CAAC;YACrC,KAAK,GAAG,CAAC;YACT,KAAK,QAAQ;gBACT,OAAO,SAAA,QAAyB,CAAC;YACrC;gBACI,CAAC,IAAI,CAAc,CAAC;gBACpB,OAAO,mBAAoC,CAAC;QACpD,CAAC;IACL,CAAC;IAhBe,kBAAS,YAgBxB,CAAA;IAEc,kBAAS,GAAmC,OAAO,UAA1C,EAAE,iBAAQ,GAAyB,OAAO,SAAhC,EAAE,iBAAQ,GAAe,OAAO,SAAtB,EAAE,iBAAQ,GAAK,OAAO,SAAZ,CAAa;AACvE,CAAC,EA3EgB,QAAQ,KAAR,QAAQ,QA2ExB"}
|
package/package.json
CHANGED
package/src/definitions/utils.ts
CHANGED
|
@@ -25,24 +25,30 @@ function toFallback<F>(fallback: F | undefined): Exclude<F, undefined> {
|
|
|
25
25
|
*/
|
|
26
26
|
export function choiceParameterType(
|
|
27
27
|
definition: Pick<ParameterMap[ChoiceParameterType], 'type' | 'value' | 'choices'>,
|
|
28
|
-
): TypeInfo {
|
|
29
|
-
//
|
|
30
|
-
|
|
31
|
-
//
|
|
28
|
+
): TypeInfo | '' {
|
|
29
|
+
// 根据参数类型确定的类型
|
|
30
|
+
const typeByType = definition.type === 'logical' ? 'boolean' : 'number';
|
|
31
|
+
// 根据默认值确定的类型
|
|
32
|
+
let typeByDefault: TypeInfo | '' = '';
|
|
32
33
|
const { value, choices } = definition;
|
|
33
34
|
if (definition.type === 'multiSelect' && Array.isArray(value)) {
|
|
34
35
|
const v: unknown = value[0];
|
|
35
36
|
if (isChoiceValue(v)) {
|
|
36
|
-
|
|
37
|
+
typeByDefault = typeof v as TypeInfo;
|
|
37
38
|
}
|
|
38
39
|
} else {
|
|
39
40
|
if (isChoiceValue(value)) {
|
|
40
|
-
|
|
41
|
+
typeByDefault = typeof value as TypeInfo;
|
|
41
42
|
}
|
|
42
43
|
}
|
|
43
44
|
|
|
44
|
-
if (
|
|
45
|
-
|
|
45
|
+
if (typeof choices == 'function' || isExpression(choices)) {
|
|
46
|
+
// 此时只根据默认值推测类型，避免 { type: 'multiSelect', value: [] } 导致类型推断为 'number'
|
|
47
|
+
return typeByDefault;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
if (!choices?.length) {
|
|
51
|
+
return typeByDefault || typeByType;
|
|
46
52
|
}
|
|
47
53
|
|
|
48
54
|
// 认为枚举选项值类型一致，推测枚举类型
|
|
@@ -51,7 +57,7 @@ export function choiceParameterType(
|
|
|
51
57
|
if (!isChoiceValue(v)) continue;
|
|
52
58
|
return typeof v as TypeInfo;
|
|
53
59
|
}
|
|
54
|
-
return
|
|
60
|
+
return typeByDefault || typeByType;
|
|
55
61
|
}
|
|
56
62
|
|
|
57
63
|
/** 是否为枚举值类型 */
|
package/src/main.ts
CHANGED
|
@@ -22,6 +22,7 @@ import {
|
|
|
22
22
|
type ArgumentMap,
|
|
23
23
|
type ArgumentValue,
|
|
24
24
|
type Choice,
|
|
25
|
+
type ChoiceArgumentValue,
|
|
25
26
|
type ChoiceParameterType,
|
|
26
27
|
type ConditionExpression,
|
|
27
28
|
type Parameter,
|
|
@@ -222,7 +223,7 @@ export class Evaluator {
|
|
|
222
223
|
const choiceType = choiceParameterType(definition);
|
|
223
224
|
const fallbackKeys = !isLogical
|
|
224
225
|
? []
|
|
225
|
-
: choiceType === 'boolean'
|
|
226
|
+
: choiceType === 'boolean' || !choiceType
|
|
226
227
|
? [false, true]
|
|
227
228
|
: choiceType === 'number'
|
|
228
229
|
? [0, 1]
|
|
@@ -242,7 +243,7 @@ export class Evaluator {
|
|
|
242
243
|
for (let i = 0; i < len; i++) {
|
|
243
244
|
try {
|
|
244
245
|
const item = evaluatedChoices[i];
|
|
245
|
-
const key = to(item?.key ?? fallbackKeys[i] ?? i);
|
|
246
|
+
const key = to(item?.key ?? fallbackKeys[i] ?? i) as ChoiceArgumentValue;
|
|
246
247
|
const name = item?.name ?? (isLogical ? '' : String(key));
|
|
247
248
|
const description = item?.description ?? '';
|
|
248
249
|
const condition = item?.condition || undefined;
|
|
@@ -253,7 +254,12 @@ export class Evaluator {
|
|
|
253
254
|
cause: ex,
|
|
254
255
|
});
|
|
255
256
|
}
|
|
256
|
-
ret[i] = {
|
|
257
|
+
ret[i] = {
|
|
258
|
+
key: to(i, i) as ChoiceArgumentValue,
|
|
259
|
+
name: '',
|
|
260
|
+
description: '',
|
|
261
|
+
condition: undefined,
|
|
262
|
+
};
|
|
257
263
|
}
|
|
258
264
|
}
|
|
259
265
|
}
|
package/src/re-exports.ts
CHANGED
package/src/type.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import type
|
|
2
|
-
import { convert } from '@mirascript/mirascript/subtle';
|
|
1
|
+
import { isVmConst, VmError, type TypeName, type VmAny, type VmValue, type VmValueMap } from '@mirascript/mirascript';
|
|
2
|
+
import { convert, serializeForDisplay } from '@mirascript/mirascript/subtle';
|
|
3
|
+
import type { ArgumentValue } from './definitions.js';
|
|
3
4
|
|
|
4
5
|
/** 类型信息 */
|
|
5
6
|
export type TypeInfo = 'string' | 'number' | 'boolean';
|
|
@@ -58,13 +59,13 @@ export namespace TypeInfo {
|
|
|
58
59
|
return (c as typeof convert.toNumber)(value, fallback) as TsTypeOf<T>;
|
|
59
60
|
}
|
|
60
61
|
|
|
61
|
-
/**
|
|
62
|
-
function
|
|
63
|
-
value
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
return
|
|
62
|
+
/** 检查是否为 ArgumentValue */
|
|
63
|
+
function assertArgumentValue<F = undefined>(value: VmAny, fallback?: F): ArgumentValue | Exclude<F, undefined> {
|
|
64
|
+
if (value != null && isVmConst(value)) return value;
|
|
65
|
+
if (fallback === undefined) {
|
|
66
|
+
throw new VmError(`Value is not ArgumentValue: ${serializeForDisplay(value)}`, undefined);
|
|
67
|
+
}
|
|
68
|
+
return fallback as Exclude<F, undefined>;
|
|
68
69
|
}
|
|
69
70
|
|
|
70
71
|
/** 获取转换器 */
|
|
@@ -75,7 +76,7 @@ export namespace TypeInfo {
|
|
|
75
76
|
f: typeof convert.toNumber;
|
|
76
77
|
boolean: typeof convert.toBoolean;
|
|
77
78
|
b: typeof convert.toBoolean;
|
|
78
|
-
'': typeof
|
|
79
|
+
'': typeof assertArgumentValue;
|
|
79
80
|
};
|
|
80
81
|
/** 获取转换器 */
|
|
81
82
|
export function converter<T extends TypeInfo | LegacyType | ''>(type: T): Converters[T] {
|
|
@@ -92,7 +93,7 @@ export namespace TypeInfo {
|
|
|
92
93
|
return toString as Converters[T];
|
|
93
94
|
default:
|
|
94
95
|
(type) satisfies '';
|
|
95
|
-
return
|
|
96
|
+
return assertArgumentValue as Converters[T];
|
|
96
97
|
}
|
|
97
98
|
}
|
|
98
99
|
|
package/tests/main.ts
CHANGED
|
@@ -53,6 +53,94 @@ describe('Evaluator', () => {
|
|
|
53
53
|
expect(c4.length).toBe(2);
|
|
54
54
|
expect(c4[0].key).toBe('0');
|
|
55
55
|
expect(c4[1].key).toBe('1');
|
|
56
|
+
|
|
57
|
+
const c5 = e.evaluateChoices({ type: 'logical', choices: null as never, value: null as never }, null);
|
|
58
|
+
expect(c5.length).toBe(2);
|
|
59
|
+
expect(c5[0].key).toBe(false);
|
|
60
|
+
expect(c5[1].key).toBe(true);
|
|
61
|
+
|
|
62
|
+
const c6 = e.evaluateChoices(
|
|
63
|
+
{
|
|
64
|
+
type: 'logical',
|
|
65
|
+
// @ts-expect-error Incomplete choice definition
|
|
66
|
+
choices: () => [{ key: 0 }, { key: '1' }, { key: 2 }] as const,
|
|
67
|
+
value: null as never,
|
|
68
|
+
},
|
|
69
|
+
null,
|
|
70
|
+
);
|
|
71
|
+
expect(c6.length).toBe(2);
|
|
72
|
+
expect(c6[0].key).toBe(0);
|
|
73
|
+
expect(c6[1].key).toBe('1');
|
|
74
|
+
});
|
|
75
|
+
|
|
76
|
+
it('on multiSelect type', () => {
|
|
77
|
+
const c1 = e.evaluateChoices(
|
|
78
|
+
{
|
|
79
|
+
type: 'multiSelect',
|
|
80
|
+
// @ts-expect-error Incomplete choice definition
|
|
81
|
+
choices: [{}, { key: 2, name: 'Two' }, { key: 3 }],
|
|
82
|
+
value: [2],
|
|
83
|
+
},
|
|
84
|
+
null,
|
|
85
|
+
);
|
|
86
|
+
expect(c1.length).toBe(3);
|
|
87
|
+
expect(c1[0].key).toBe(0);
|
|
88
|
+
expect(c1[0].name).toBe('0');
|
|
89
|
+
expect(c1[1].key).toBe(2);
|
|
90
|
+
expect(c1[1].name).toBe('Two');
|
|
91
|
+
expect(c1[2].key).toBe(3);
|
|
92
|
+
expect(c1[2].name).toBe('3');
|
|
93
|
+
|
|
94
|
+
const c2 = e.evaluateChoices(
|
|
95
|
+
{
|
|
96
|
+
type: 'multiSelect',
|
|
97
|
+
// @ts-expect-error Incomplete choice definition
|
|
98
|
+
choices: [{}, { key: 2, name: 'Two' }, { key: 3 }],
|
|
99
|
+
value: ['2'],
|
|
100
|
+
},
|
|
101
|
+
null,
|
|
102
|
+
);
|
|
103
|
+
expect(c2.length).toBe(3);
|
|
104
|
+
expect(c2[0].key).toBe(0);
|
|
105
|
+
expect(c2[0].name).toBe('0');
|
|
106
|
+
expect(c2[1].key).toBe(2);
|
|
107
|
+
expect(c2[1].name).toBe('Two');
|
|
108
|
+
expect(c2[2].key).toBe(3);
|
|
109
|
+
expect(c2[2].name).toBe('3');
|
|
110
|
+
|
|
111
|
+
const c3 = e.evaluateChoices(
|
|
112
|
+
{
|
|
113
|
+
type: 'multiSelect',
|
|
114
|
+
// @ts-expect-error Incomplete choice definition
|
|
115
|
+
choices: () => [{}, { key: '2', name: 'Two' }, { key: 3 }],
|
|
116
|
+
value: [],
|
|
117
|
+
},
|
|
118
|
+
null,
|
|
119
|
+
);
|
|
120
|
+
expect(c3.length).toBe(3);
|
|
121
|
+
expect(c3[0].key).toBe(0);
|
|
122
|
+
expect(c3[0].name).toBe('0');
|
|
123
|
+
expect(c3[1].key).toBe('2');
|
|
124
|
+
expect(c3[1].name).toBe('Two');
|
|
125
|
+
expect(c3[2].key).toBe(3);
|
|
126
|
+
expect(c3[2].name).toBe('3');
|
|
127
|
+
|
|
128
|
+
const c4 = e.evaluateChoices(
|
|
129
|
+
{
|
|
130
|
+
type: 'multiSelect',
|
|
131
|
+
// @ts-expect-error Incomplete choice definition
|
|
132
|
+
choices: () => [{}, { key: '2', name: 'Two' }, { key: 3 }],
|
|
133
|
+
value: [1],
|
|
134
|
+
},
|
|
135
|
+
null,
|
|
136
|
+
);
|
|
137
|
+
expect(c4.length).toBe(3);
|
|
138
|
+
expect(c4[0].key).toBe(0);
|
|
139
|
+
expect(c4[0].name).toBe('0');
|
|
140
|
+
expect(c4[1].key).toBe(2);
|
|
141
|
+
expect(c4[1].name).toBe('Two');
|
|
142
|
+
expect(c4[2].key).toBe(3);
|
|
143
|
+
expect(c4[2].name).toBe('3');
|
|
56
144
|
});
|
|
57
145
|
});
|
|
58
146
|
});
|