@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.
Files changed (27) hide show
  1. package/dist/definitions/utils.d.ts +11 -3
  2. package/dist/definitions/utils.d.ts.map +1 -1
  3. package/dist/definitions/utils.js +90 -75
  4. package/dist/definitions/utils.js.map +1 -1
  5. package/dist/expression.js +2 -2
  6. package/dist/expression.js.map +1 -1
  7. package/dist/main.d.ts +1 -1
  8. package/dist/main.d.ts.map +1 -1
  9. package/dist/main.js +29 -39
  10. package/dist/main.js.map +1 -1
  11. package/dist/migrator/call.d.ts.map +1 -1
  12. package/dist/migrator/call.js +35 -1
  13. package/dist/migrator/call.js.map +1 -1
  14. package/dist/type.d.ts +1 -1
  15. package/dist/type.d.ts.map +1 -1
  16. package/dist/type.js +4 -2
  17. package/dist/type.js.map +1 -1
  18. package/package.json +3 -3
  19. package/src/definitions/utils.ts +95 -62
  20. package/src/expression.ts +2 -2
  21. package/src/main.ts +30 -38
  22. package/src/migrator/call.ts +33 -1
  23. package/src/type.ts +6 -2
  24. package/tests/definition.ts +39 -9
  25. package/tests/eval-complex.ts +12 -1
  26. package/tests/main.ts +49 -0
  27. package/tests/migrate.ts +21 -0
package/dist/migrator/call.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"call.js","sourceRoot":"","sources":["../../src/migrator/call.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"call.js","sourceRoot":"","sources":["../../src/migrator/call.ts"],"names":[],"mappings":"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"}
package/dist/type.d.ts CHANGED
@@ -22,7 +22,7 @@ export declare namespace TypeInfo {
22
22
  /** 转换类型 */
23
23
  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
24
  /** 不转换 */
25
- function identity<T extends VmValue>(value: T | undefined): T | null;
25
+ function identity<T extends VmValue, F = undefined>(value: T | undefined, _fallback?: F): T;
26
26
  /** 获取转换器 */
27
27
  type Converters = {
28
28
  string: typeof convert.toString;
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,EAAY,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAC5E,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAExD,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,UAAU;IACV,SAAS,QAAQ,CAAC,CAAC,SAAS,OAAO,EAAE,KAAK,EAAE,CAAC,GAAG,SAAS,GAAG,CAAC,GAAG,IAAI,CAEnE;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,QAAQ,CAAC;KACvB,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"}
1
+ {"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../src/type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAY,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAC5E,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAExD,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,UAAU;IACV,SAAS,QAAQ,CAAC,CAAC,SAAS,OAAO,EAAE,CAAC,GAAG,SAAS,EAC9C,KAAK,EAAE,CAAC,GAAG,SAAS,EACpB,SAAS,CAAC,EAAE,CAAC,GACd,CAAC,CAGH;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,QAAQ,CAAC;KACvB,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
@@ -40,8 +40,10 @@ export var TypeInfo;
40
40
  }
41
41
  TypeInfo.to = to;
42
42
  /** 不转换 */
43
- function identity(value) {
44
- return value ?? null;
43
+ function identity(value, _fallback) {
44
+ if (value == null)
45
+ return null;
46
+ return value;
45
47
  }
46
48
  /** 获取转换器 */
47
49
  function converter(type) {
package/dist/type.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"type.js","sourceRoot":"","sources":["../src/type.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAKxD,MAAM,CAAC,GAAa,SAAS,CAAC;AAC9B,CAAoB,CAAC;AAgBrB,WAAW;AACX,MAAM,KAAW,QAAQ,CAuExB;AAvED,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,UAAU;IACV,SAAS,QAAQ,CAAoB,KAAoB;QACrD,OAAO,KAAK,IAAI,IAAI,CAAC;IACzB,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,QAAyB,CAAC;QACzC,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,EAvEgB,QAAQ,KAAR,QAAQ,QAuExB"}
1
+ {"version":3,"file":"type.js","sourceRoot":"","sources":["../src/type.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAKxD,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,UAAU;IACV,SAAS,QAAQ,CACb,KAAoB,EACpB,SAAa;QAEb,IAAI,KAAK,IAAI,IAAI;YAAE,OAAO,IAAS,CAAC;QACpC,OAAO,KAAK,CAAC;IACjB,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,QAAyB,CAAC;QACzC,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
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cloudpss/expression",
3
- "version": "0.6.0-alpha.19",
3
+ "version": "0.6.0-alpha.20",
4
4
  "author": "CloudPSS",
5
5
  "license": "MIT",
6
6
  "type": "module",
@@ -12,11 +12,11 @@
12
12
  "./*": "./dist/*.js"
13
13
  },
14
14
  "dependencies": {
15
- "@mirascript/mirascript": "^0.1.19",
15
+ "@mirascript/mirascript": "^0.1.22",
16
16
  "klona": "^2.0.6",
17
17
  "lru-cache": "^11.2.4",
18
18
  "mathjs": "^15.1.0",
19
- "type-fest": "^5.3.0"
19
+ "type-fest": "^5.3.1"
20
20
  },
21
21
  "devDependencies": {
22
22
  "dedent": "^1.7.0"
package/src/definitions/utils.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { klona } from 'klona';
2
- import { isVmArray, isVmRecord, type VmPrimitive, type VmValue } from '@mirascript/mirascript';
2
+ import { isVmArray, isVmConst, isVmRecord, type VmArray, type VmConst, type VmValue } from '@mirascript/mirascript';
3
3
  import { Expression, isExpression, type ExpressionOrValue } from '../expression.js';
4
4
  import type { ChoiceParameterType, Parameter, ParameterMap } from './parameter.js';
5
5
  import { TypeInfo } from '../type.js';
@@ -7,56 +7,76 @@ import type { ArgumentMap, ArgumentValue } from './argument.js';
7
7
  import type { ParameterGroup } from './parameter-group.js';
8
8
  const { isArray } = Array;
9
9
 
10
- /** 推测枚举类型 */
11
- export function enumType(definition: Pick<ParameterMap[ChoiceParameterType], 'type' | 'choices'>): TypeInfo | null {
12
- const { choices } = definition;
13
- if (typeof choices == 'function' || isExpression(choices)) return null;
10
+ /** 转换参数类型 */
11
+ export type ArgumentConverter<out R extends ArgumentValue = ArgumentValue> = <const D = undefined>(
12
+ value: VmValue | null | undefined,
13
+ defaults?: D,
14
+ ) => R | Exclude<D, undefined>;
15
+
16
+ /** 回退值 */
17
+ function toFallback<F>(fallback: F | undefined): Exclude<F, undefined> {
18
+ if (fallback === undefined) {
19
+ throw new TypeError('Conversion failed and no fallback value provided');
20
+ }
21
+ return fallback as Exclude<F, undefined>;
22
+ }
23
+ /**
24
+ * 通过枚举参数定义推测枚举类型
25
+ */
26
+ export function choiceParameterType(
27
+ definition: Pick<ParameterMap[ChoiceParameterType], 'type' | 'value' | 'choices'>,
28
+ ): TypeInfo {
14
29
  // 首先根据参数类型确定默认类型
15
30
  let defaultType: TypeInfo = definition.type === 'logical' ? 'boolean' : 'number';
16
31
  // 然后根据默认值调整默认类型
17
- if ('value' in definition) {
18
- const { value } = definition;
19
- if (typeof value == 'boolean') defaultType = 'boolean';
20
- else if (typeof value == 'number') defaultType = 'number';
21
- else if (typeof value == 'string') defaultType = 'string';
32
+ const { value, choices } = definition;
33
+ if (definition.type === 'multiSelect' && Array.isArray(value)) {
34
+ const v: unknown = value[0];
35
+ if (isChoiceValue(v)) {
36
+ defaultType = typeof v as TypeInfo;
37
+ }
38
+ } else {
39
+ if (isChoiceValue(value)) {
40
+ defaultType = typeof value as TypeInfo;
41
+ }
22
42
  }
23
- if (choices == null || choices.length === 0) return defaultType;
24
43
 
25
- let type: TypeInfo | null = null;
44
+ if (choices == null || typeof choices == 'function' || isExpression(choices) || !choices.length) {
45
+ return defaultType;
46
+ }
47
+
48
+ // 认为枚举选项值类型一致，推测枚举类型
26
49
  for (const choice of choices) {
27
50
  const v = choice?.key;
28
- // 选项值为空时，使用默认类型
29
- const t = v == null ? defaultType : typeof v;
30
- if (t === 'string') {
31
- if (type == null) type = 'string';
32
- else if (type !== 'string') return null;
33
- } else if (t === 'number') {
34
- if (type == null) type = 'number';
35
- else if (type !== 'number') return null;
36
- } else if (t === 'boolean') {
37
- if (type == null) type = 'boolean';
38
- else if (type !== 'boolean') return null;
39
- } else {
40
- return null;
41
- }
51
+ if (!isChoiceValue(v)) continue;
52
+ return typeof v as TypeInfo;
42
53
  }
43
- return type;
54
+ return defaultType;
44
55
  }
45
56
 
46
- /**
47
- * 转换参数值的类型，不回退到 {@link Parameter.value} 提供的默认值
48
- * 转换失败时返回 null
49
- */
50
- export function toArgumentValue<V extends ArgumentValue>(
51
- value: VmValue | null | undefined,
52
- definition: Parameter,
53
- ): V | null {
54
- // 避免无效的 VmValue 导致错误
55
- value ??= null;
57
+ /** 是否为枚举值类型 */
58
+ export function isChoiceValue(value: unknown): value is ChoiceParameterType {
59
+ return typeof value == 'string' || typeof value == 'number' || typeof value == 'boolean';
60
+ }
61
+
62
+ const defaultConverter: ArgumentConverter = (value, defaults) => {
63
+ if (value != null) return value as ArgumentValue;
64
+ return toFallback(defaults);
65
+ };
66
+ const tableConverter: ArgumentConverter<VmArray> = (value, defaults) => {
67
+ if (value == null) return [];
68
+ if (isVmArray(value)) return value;
69
+ if (isVmConst(value)) return [value];
70
+ return toFallback(defaults);
71
+ };
72
+
73
+ const FALLBACK = Symbol('FALLBACK');
74
+ /** 转换推测参数类型，不回退到 {@link Parameter.value} 提供的默认值 */
75
+ export function argumentConverter(definition: Parameter): ArgumentConverter {
56
76
  switch (definition.type) {
57
77
  case 'real':
58
78
  case 'integer':
59
- return TypeInfo.toNumber(value, null) as V;
79
+ return TypeInfo.converter('number');
60
80
  case 'text':
61
81
  case 'file':
62
82
  case 'code':
@@ -64,47 +84,60 @@ export function toArgumentValue<V extends ArgumentValue>(
64
84
  case 'cssColor' as never:
65
85
  case 'cssBackground' as never:
66
86
  case 'resourceId' as never:
67
- return TypeInfo.toString(value, null) as V;
87
+ return TypeInfo.converter('string');
68
88
 
69
89
  case 'choice':
70
90
  case 'logical': {
71
- if (value == null && Array.isArray(definition.choices) && definition.choices.length > 0) {
72
- value = definition.choices[0]?.key as V;
73
- }
74
- const type = enumType(definition);
75
- if (!type) return value as V;
76
- return TypeInfo.to(value, type, null) as V;
91
+ const type = choiceParameterType(definition);
92
+ return TypeInfo.converter(type);
77
93
  }
78
94
 
79
95
  case 'multiSelect': {
80
- const v = isVmArray(value) ? value : value != null ? ([value] as const) : [];
81
- if (v.length === 0) return v as V;
82
- const type = enumType(definition);
83
- if (!type) return v as V;
96
+ const type = choiceParameterType(definition);
84
97
  const to = TypeInfo.converter(type);
85
- const ret: VmPrimitive[] = [];
86
- for (const x of v) {
87
- const r = to(x, null);
88
- if (r != null) ret.push(r);
89
- }
90
- return ret as readonly VmPrimitive[] as V;
98
+ return (v, d) => {
99
+ const arr = tableConverter(v, FALLBACK);
100
+ if (arr === FALLBACK) return toFallback(d);
101
+ if (arr.length === 0) return arr;
102
+ let ret: Array<VmConst | undefined> | null = null;
103
+ for (let i = 0; i < arr.length; i++) {
104
+ const el = arr[i];
105
+ const r = to(el, FALLBACK);
106
+ if (r === FALLBACK) return toFallback(d);
107
+ if (!Object.is(r, el)) {
108
+ ret ??= [...arr];
109
+ ret[i] = r;
110
+ }
111
+ }
112
+ return ret ?? arr;
113
+ };
91
114
  }
92
115
 
93
116
  case 'table': {
94
- const v = isVmArray(value) ? value : value != null ? ([value] as const) : [];
95
- return v as V;
117
+ return tableConverter;
96
118
  }
97
119
 
98
120
  case 'grouped':
99
121
  case 'record': {
100
- if (!isVmRecord(value)) return null;
101
- return value as V;
122
+ return (v, d) => {
123
+ if (isVmRecord(v)) return v;
124
+ return toFallback(d);
125
+ };
102
126
  }
103
127
  default:
104
- return value as V;
128
+ return defaultConverter;
105
129
  }
106
130
  }
107
131
 
132
+ /**
133
+ * 转换参数值的类型，不回退到 {@link Parameter.value} 提供的默认值
134
+ * 转换失败时返回 null
135
+ */
136
+ export function toArgumentValue(value: VmValue | null | undefined, definition: Parameter): ArgumentValue | null {
137
+ const converter = argumentConverter(definition);
138
+ return converter(value, null);
139
+ }
140
+
108
141
  /** 参数定义数组 */
109
142
  type ParameterDefinitions = ReadonlyArray<Pick<ParameterGroup, 'items'>>;
110
143
  /** 是否为包含参数组的参数定义数组 */
@@ -161,7 +194,7 @@ export function fillArgumentMap<T extends Record<string, ArgumentValue>>(
161
194
  } else {
162
195
  const value =
163
196
  defaultValue != null && typeof defaultValue == 'object' ? klona(defaultValue) : defaultValue;
164
- args[key] = toArgumentValue<V>(value, param) ?? value;
197
+ args[key] = (toArgumentValue(value, param) as V | null) ?? value;
165
198
  }
166
199
  } else {
167
200
  // 已存在的参数值
@@ -169,7 +202,7 @@ export function fillArgumentMap<T extends Record<string, ArgumentValue>>(
169
202
  // 保留表达式
170
203
  } else {
171
204
  // 修复现有的参数值
172
- const castedValue = toArgumentValue<V>(currentValue, param);
205
+ const castedValue = toArgumentValue(currentValue, param) as V | null;
173
206
  if (castedValue != null && castedValue !== currentValue) {
174
207
  args[key] = castedValue;
175
208
  }
package/src/expression.ts CHANGED
@@ -42,13 +42,13 @@ export function Expression<T extends VmValue = VmValue>(
42
42
  if (source == null) throw new TypeError(`Invalid expression ${String(source)}`);
43
43
  const s = isExpression(source) ? source.source : source;
44
44
  if (typeof s != 'string') throw new TypeError(`Invalid expression ${String(s)}`);
45
- return { [ExpressionTag]: returnType, source: s as ExpressionSource<T> };
45
+ return { [ExpressionTag]: returnType || '', source: s as ExpressionSource<T> };
46
46
  }
47
47
 
48
48
  /** 检查是否为表达式 */
49
49
  export function isExpression<T extends VmValue>(value: unknown): value is Expression<T> | CompiledExpression<T> {
50
50
  if (value == null || (typeof value != 'object' && typeof value != 'function')) return false;
51
- return ExpressionTag in value;
51
+ return typeof (value as Expression<T>)[ExpressionTag] == 'string';
52
52
  }
53
53
 
54
54
  /** 表示一个表达式求值的结果 */
package/src/main.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { isVmFunction, isVmPrimitive, wrapToVmValue, type VmValue } from '@mirascript/mirascript';
1
+ import { isVmFunction, wrapToVmValue, type VmValue } from '@mirascript/mirascript';
2
2
  import { serialize } from '@mirascript/mirascript/subtle';
3
3
  import { defaultOptions, type Logger, type Options } from './interface.js';
4
4
  import { parse } from './parser.js';
@@ -16,9 +16,9 @@ import { evaluate } from './eval.js';
16
16
  import { TypeInfo } from './type.js';
17
17
  import { Scope } from './scope.js';
18
18
  import {
19
- enumType,
19
+ argumentConverter,
20
+ choiceParameterType,
20
21
  fillArgumentMap,
21
- toArgumentValue,
22
22
  type ArgumentMap,
23
23
  type ArgumentValue,
24
24
  type Choice,
@@ -214,53 +214,44 @@ export class Evaluator {
214
214
 
215
215
  /** 求选项列表 */
216
216
  evaluateChoices<T extends ChoiceParameterType>(
217
- definition: Pick<ParameterMap[T], 'type' | 'choices'>,
217
+ definition: Pick<ParameterMap[T], 'type' | 'choices' | 'value'>,
218
218
  scope: Scope | null | undefined,
219
219
  ): EvaluatedChoices<T> {
220
220
  const ret: Choice[] = [];
221
221
  const { type, choices } = definition;
222
+ const isLogical = type === 'logical';
223
+ const choiceType = choiceParameterType(definition);
224
+ const fallbackKeys = choiceType === 'boolean' ? [false, true] : choiceType === 'number' ? [0, 1] : ['0', '1'];
222
225
  if (choices != null) {
223
- const result = this.evaluate(choices, scope);
224
- if (result == null) {
226
+ const evaluatedChoices = this.evaluate(choices, scope);
227
+ if (evaluatedChoices == null) {
225
228
  // do nothing
226
- } else if (!isArray(result as unknown[])) {
229
+ } else if (!isArray(evaluatedChoices as unknown[])) {
227
230
  if (scope?.throws ?? true) {
228
231
  throw new Error(`Choices is not an array`);
229
232
  }
230
- } else {
231
- const len = result.length;
233
+ } else if (evaluatedChoices.length > 0) {
234
+ const to = TypeInfo.converter(choiceType);
235
+ let len = evaluatedChoices.length;
236
+ if (isLogical && len > 2) len = 2;
232
237
  for (let i = 0; i < len; i++) {
233
- const item = result[i];
234
- if (item == null) {
235
- ret[i] = { key: i, name: String(i), description: '', condition: undefined };
236
- } else if (isVmPrimitive(item)) {
237
- ret[i] = { key: item, name: String(item), description: '', condition: undefined };
238
- } else {
239
- const key = item.key ?? i;
240
- ret[i] = {
241
- key,
242
- name: item.name ?? String(key),
243
- description: item.description ?? '',
244
- condition: item.condition || undefined,
245
- };
246
- }
238
+ const item = evaluatedChoices[i];
239
+ const key = to(item?.key ?? fallbackKeys[i] ?? i);
240
+ const name = item?.name ?? (isLogical ? '' : String(key));
241
+ const description = item?.description ?? '';
242
+ const condition = item?.condition || undefined;
243
+ ret[i] = { key, name, description, condition };
247
244
  }
248
245
  }
249
246
  }
250
- if (type === 'logical') {
251
- if (ret.length >= 2) {
252
- ret.length = 2;
253
- } else {
254
- const type = enumType(definition) ?? 'boolean';
255
- const keys = type === 'boolean' ? [false, true] : type === 'number' ? [0, 1] : ['0', '1'];
256
- while (ret.length < 2) {
257
- ret.push({
258
- key: keys[ret.length]!,
259
- name: '',
260
- description: '',
261
- condition: undefined,
262
- });
263
- }
247
+ if (isLogical) {
248
+ while (ret.length < 2) {
249
+ ret.push({
250
+ key: fallbackKeys[ret.length]!,
251
+ name: '',
252
+ description: '',
253
+ condition: undefined,
254
+ });
264
255
  }
265
256
  }
266
257
  return ret as EvaluatedChoices<T>;
@@ -276,8 +267,9 @@ export class Evaluator {
276
267
  expression ??= definition.value as ExpressionOrValue<V>;
277
268
  // 求值失败时返回默认值
278
269
  const result = this.evaluate<V>(expression, scope, definition.value as V);
270
+ const converter = argumentConverter(definition);
279
271
  // 转换失败时返回转换前的值
280
- return toArgumentValue<V>(result, definition) ?? result;
272
+ return converter(result, result) as V;
281
273
  }
282
274
  /** 求参数表的所有参数值 */
283
275
  evaluateArgs<T extends Record<string, ArgumentValue>>(
package/src/migrator/call.ts CHANGED
@@ -42,6 +42,9 @@ const EXACT_UNARY_FUNCTION = new Map<string, Result['type']>([
42
42
  ['service', 'extern'],
43
43
  ]);
44
44
 
45
+ /** 只接受一个参数，返回数字的函数 */
46
+ const ENTRYWISE_UNARY_MATH_FUNCTION = new Set<string>(['abs', 'ceil', 'floor', 'round', 'sign']);
47
+
45
48
  /** 兜底 */
46
49
  function call(state: State, node: FunctionNode<MathNode>, done: (fn: Result, args: readonly Result[]) => void): Result {
47
50
  const { fn, args } = node;
@@ -74,8 +77,37 @@ function migrateFunctionCall(
74
77
  } else if (fnName === 'random' && args.length === 0) {
75
78
  return {
76
79
  type: 'number',
77
- code: `${globalFnName(state, 'random')}()`,
80
+ code: `${g('random')}()`,
81
+ };
82
+ } else if (ENTRYWISE_UNARY_MATH_FUNCTION.has(fnName) && args.length === 1) {
83
+ const arg = migrateAtomic(state, args[0]!);
84
+ if (arg.type === 'number' || arg.type === 'boolean' || arg.type === 'string') {
85
+ return {
86
+ type: 'number',
87
+ code: `${g(fnName)}(${arg.code})`,
88
+ };
89
+ }
90
+ return {
91
+ type: arg.type,
92
+ code: `${g('matrix')}.entrywise(${arg.code}, nil, ${g(fnName)})`,
78
93
  };
94
+ } else if (fnName === 'max' || fnName === 'min') {
95
+ if (args.length === 1) {
96
+ const arg = migrateAtomic(state, args[0]!);
97
+ return {
98
+ type: 'number',
99
+ code: `${g(fnName)}(${arg.code})`,
100
+ };
101
+ } else {
102
+ const argList = args.map((a) => migrateAtomic(state, a));
103
+ if (!argList.every((a) => a.type === 'number' || a.type === 'boolean' || a.type === 'string')) {
104
+ state.warn(`函数行为可能不一致: ${fnName}`);
105
+ }
106
+ return {
107
+ type: 'number',
108
+ code: `${g(fnName)}(${argList.map((a) => a.code).join(', ')})`,
109
+ };
110
+ }
79
111
  } else if (fnName === 're' || fnName === 'im') {
80
112
  const m = migrateAtomic(state, args[0]!);
81
113
  state.err(`不支持复数`);
package/src/type.ts CHANGED
@@ -59,8 +59,12 @@ export namespace TypeInfo {
59
59
  }
60
60
 
61
61
  /** 不转换 */
62
- function identity<T extends VmValue>(value: T | undefined): T | null {
63
- return value ?? null;
62
+ function identity<T extends VmValue, F = undefined>(
63
+ value: T | undefined,
64
+ _fallback?: F,
65
+ ): T /* | Exclude<F, undefined> */ {
66
+ if (value == null) return null as T;
67
+ return value;
64
68
  }
65
69
 
66
70
  /** 获取转换器 */