@cloudpss/expression 0.6.0-alpha.1 → 0.6.0-alpha.11

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 (154) hide show
  1. package/dist/analyze.d.ts +6 -3
  2. package/dist/analyze.d.ts.map +1 -1
  3. package/dist/analyze.js +67 -33
  4. package/dist/analyze.js.map +1 -1
  5. package/dist/definitions/argument.d.ts +2 -10
  6. package/dist/definitions/argument.d.ts.map +1 -1
  7. package/dist/definitions/constraint.d.ts +2 -2
  8. package/dist/definitions/constraint.d.ts.map +1 -1
  9. package/dist/definitions/constraint.js +1 -1
  10. package/dist/definitions/constraint.js.map +1 -1
  11. package/dist/definitions/parameter-decoration.d.ts +3 -3
  12. package/dist/definitions/parameter-decoration.d.ts.map +1 -1
  13. package/dist/definitions/parameter-decoration.js +0 -7
  14. package/dist/definitions/parameter-decoration.js.map +1 -1
  15. package/dist/definitions/parameter-group.d.ts +0 -4
  16. package/dist/definitions/parameter-group.d.ts.map +1 -1
  17. package/dist/definitions/parameter-group.js +5 -17
  18. package/dist/definitions/parameter-group.js.map +1 -1
  19. package/dist/definitions/parameter.d.ts +47 -40
  20. package/dist/definitions/parameter.d.ts.map +1 -1
  21. package/dist/definitions/parameter.js +9 -21
  22. package/dist/definitions/parameter.js.map +1 -1
  23. package/dist/definitions/utils.d.ts +19 -0
  24. package/dist/definitions/utils.d.ts.map +1 -0
  25. package/dist/definitions/utils.js +177 -0
  26. package/dist/definitions/utils.js.map +1 -0
  27. package/dist/definitions/variable.d.ts +0 -2
  28. package/dist/definitions/variable.d.ts.map +1 -1
  29. package/dist/definitions/variable.js +1 -5
  30. package/dist/definitions/variable.js.map +1 -1
  31. package/dist/definitions.d.ts +1 -0
  32. package/dist/definitions.d.ts.map +1 -1
  33. package/dist/definitions.js +1 -0
  34. package/dist/definitions.js.map +1 -1
  35. package/dist/eval.d.ts +3 -5
  36. package/dist/eval.d.ts.map +1 -1
  37. package/dist/eval.js +12 -20
  38. package/dist/eval.js.map +1 -1
  39. package/dist/expression.d.ts +10 -4
  40. package/dist/expression.d.ts.map +1 -1
  41. package/dist/expression.js +4 -4
  42. package/dist/expression.js.map +1 -1
  43. package/dist/index.d.ts +3 -1
  44. package/dist/index.d.ts.map +1 -1
  45. package/dist/index.js +1 -0
  46. package/dist/index.js.map +1 -1
  47. package/dist/interface.d.ts +30 -0
  48. package/dist/interface.d.ts.map +1 -0
  49. package/dist/interface.js +6 -0
  50. package/dist/interface.js.map +1 -0
  51. package/dist/main.d.ts +41 -28
  52. package/dist/main.d.ts.map +1 -1
  53. package/dist/main.js +145 -141
  54. package/dist/main.js.map +1 -1
  55. package/dist/migrate.d.ts +3 -2
  56. package/dist/migrate.d.ts.map +1 -1
  57. package/dist/migrate.js +25 -3
  58. package/dist/migrate.js.map +1 -1
  59. package/dist/migrator/access.d.ts.map +1 -1
  60. package/dist/migrator/access.js +44 -24
  61. package/dist/migrator/access.js.map +1 -1
  62. package/dist/migrator/call.d.ts.map +1 -1
  63. package/dist/migrator/call.js +254 -217
  64. package/dist/migrator/call.js.map +1 -1
  65. package/dist/migrator/concat.d.ts.map +1 -1
  66. package/dist/migrator/concat.js +15 -2
  67. package/dist/migrator/concat.js.map +1 -1
  68. package/dist/migrator/interface.d.ts +3 -1
  69. package/dist/migrator/interface.d.ts.map +1 -1
  70. package/dist/migrator/interface.js.map +1 -1
  71. package/dist/migrator/node.js +1 -1
  72. package/dist/migrator/node.js.map +1 -1
  73. package/dist/migrator/operator.d.ts.map +1 -1
  74. package/dist/migrator/operator.js +43 -29
  75. package/dist/migrator/operator.js.map +1 -1
  76. package/dist/migrator/state.d.ts +2 -2
  77. package/dist/migrator/state.d.ts.map +1 -1
  78. package/dist/migrator/state.js +1 -2
  79. package/dist/migrator/state.js.map +1 -1
  80. package/dist/migrator/symbol.d.ts.map +1 -1
  81. package/dist/migrator/symbol.js +13 -0
  82. package/dist/migrator/symbol.js.map +1 -1
  83. package/dist/migrator/to-type.d.ts.map +1 -1
  84. package/dist/migrator/to-type.js +20 -3
  85. package/dist/migrator/to-type.js.map +1 -1
  86. package/dist/migrator/utils.d.ts +4 -0
  87. package/dist/migrator/utils.d.ts.map +1 -1
  88. package/dist/migrator/utils.js +25 -0
  89. package/dist/migrator/utils.js.map +1 -1
  90. package/dist/parser.d.ts +2 -2
  91. package/dist/parser.d.ts.map +1 -1
  92. package/dist/parser.js +25 -8
  93. package/dist/parser.js.map +1 -1
  94. package/dist/re-exports.d.ts +4 -0
  95. package/dist/re-exports.d.ts.map +1 -0
  96. package/dist/re-exports.js +3 -0
  97. package/dist/re-exports.js.map +1 -0
  98. package/dist/scope.d.ts +13 -16
  99. package/dist/scope.d.ts.map +1 -1
  100. package/dist/scope.js +56 -49
  101. package/dist/scope.js.map +1 -1
  102. package/dist/type.d.ts +14 -5
  103. package/dist/type.d.ts.map +1 -1
  104. package/dist/type.js +35 -11
  105. package/dist/type.js.map +1 -1
  106. package/package.json +7 -4
  107. package/src/analyze.ts +77 -37
  108. package/src/definitions/argument.ts +2 -12
  109. package/src/definitions/constraint.ts +3 -3
  110. package/src/definitions/parameter-decoration.ts +3 -9
  111. package/src/definitions/parameter-group.ts +4 -19
  112. package/src/definitions/parameter.ts +62 -61
  113. package/src/definitions/utils.ts +175 -0
  114. package/src/definitions/variable.ts +1 -6
  115. package/src/definitions.ts +1 -0
  116. package/src/eval.ts +13 -26
  117. package/src/expression.ts +14 -6
  118. package/src/index.ts +3 -1
  119. package/src/interface.ts +35 -0
  120. package/src/main.ts +213 -194
  121. package/src/migrate.ts +30 -6
  122. package/src/migrator/access.ts +49 -32
  123. package/src/migrator/call.ts +246 -203
  124. package/src/migrator/concat.ts +15 -2
  125. package/src/migrator/interface.ts +3 -1
  126. package/src/migrator/node.ts +1 -1
  127. package/src/migrator/operator.ts +47 -33
  128. package/src/migrator/state.ts +2 -2
  129. package/src/migrator/symbol.ts +13 -0
  130. package/src/migrator/to-type.ts +22 -3
  131. package/src/migrator/utils.ts +29 -0
  132. package/src/parser.ts +27 -8
  133. package/src/re-exports.ts +28 -0
  134. package/src/scope.ts +75 -61
  135. package/src/type.ts +32 -11
  136. package/tests/analyze.ts +40 -6
  137. package/tests/compile.ts +65 -0
  138. package/tests/condition.ts +13 -5
  139. package/tests/definition.ts +205 -18
  140. package/tests/eval-complex.ts +7 -10
  141. package/tests/eval.ts +59 -12
  142. package/tests/import.ts +18 -4
  143. package/tests/main.ts +9 -0
  144. package/tests/migrate.ts +202 -0
  145. package/tests/scope.ts +3 -3
  146. package/tests/template.ts +36 -0
  147. package/dist/context.d.ts +0 -41
  148. package/dist/context.d.ts.map +0 -1
  149. package/dist/context.js +0 -18
  150. package/dist/context.js.map +0 -1
  151. package/jest.config.js +0 -3
  152. package/src/context.ts +0 -54
  153. package/tests/tsconfig.json +0 -3
  154. package/tsconfig.json +0 -3
@@ -0,0 +1,177 @@
1
+ import { klona } from 'klona';
2
+ import { isVmArray } from '@mirascript/mirascript';
3
+ import { Expression, isExpression } from '../expression.js';
4
+ import { TypeInfo } from '../type.js';
5
+ const { isArray } = Array;
6
+ /** 推测枚举类型 */
7
+ export function enumType(definition) {
8
+ const { choices } = definition;
9
+ if (typeof choices == 'function' || isExpression(choices))
10
+ return null;
11
+ let defaultType = definition.type === 'logical' ? 'boolean' : 'number';
12
+ if ('value' in definition) {
13
+ const { value } = definition;
14
+ if (typeof value == 'boolean')
15
+ defaultType = 'boolean';
16
+ else if (typeof value == 'number')
17
+ defaultType = 'number';
18
+ else if (typeof value == 'string')
19
+ defaultType = 'string';
20
+ }
21
+ if (choices == null || choices.length === 0)
22
+ return defaultType;
23
+ let type = null;
24
+ for (const choice of choices) {
25
+ const v = choice?.key;
26
+ const t = v == null ? defaultType : typeof v;
27
+ if (t === 'string') {
28
+ if (type == null)
29
+ type = 'string';
30
+ else if (type !== 'string')
31
+ return null;
32
+ }
33
+ else if (t === 'number') {
34
+ if (type == null)
35
+ type = 'number';
36
+ else if (type !== 'number')
37
+ return null;
38
+ }
39
+ else if (t === 'boolean') {
40
+ if (type == null)
41
+ type = 'boolean';
42
+ else if (type !== 'boolean')
43
+ return null;
44
+ }
45
+ else {
46
+ return null;
47
+ }
48
+ }
49
+ return type;
50
+ }
51
+ /**
52
+ * 转换参数值的类型,不回退到 {@link Parameter.value} 提供的默认值
53
+ */
54
+ export function toArgumentValue(value, definition) {
55
+ // 避免无效的 VmValue 导致错误
56
+ value ??= null;
57
+ switch (definition.type) {
58
+ case 'real':
59
+ case 'integer':
60
+ return TypeInfo.toNumber(value);
61
+ case 'text':
62
+ case 'file':
63
+ case 'code':
64
+ case 'pinLike':
65
+ case 'cssColor':
66
+ case 'cssBackground':
67
+ case 'resourceId':
68
+ return TypeInfo.toString(value);
69
+ case 'choice':
70
+ case 'logical': {
71
+ if (value == null && Array.isArray(definition.choices) && definition.choices.length > 0) {
72
+ value = definition.choices[0]?.key;
73
+ }
74
+ const type = enumType(definition);
75
+ if (!type)
76
+ return value;
77
+ return TypeInfo.to(value, type);
78
+ }
79
+ case 'multiSelect': {
80
+ const v = isVmArray(value) ? value : value != null ? [value] : [];
81
+ if (v.length === 0)
82
+ return v;
83
+ const type = enumType(definition);
84
+ if (!type)
85
+ return v;
86
+ return v.map((x) => TypeInfo.to(x, type));
87
+ }
88
+ case 'table': {
89
+ const v = isVmArray(value) ? value : value != null ? [value] : [];
90
+ return v;
91
+ }
92
+ case 'grouped':
93
+ case 'record':
94
+ default:
95
+ return value;
96
+ }
97
+ }
98
+ /** 是否为包含参数组的参数定义数组 */
99
+ function checkParameterDefinitions(value) {
100
+ return value != null && isArray(value) && value.length > 0;
101
+ }
102
+ /** 查找指定参数 */
103
+ function findParameterImpl(items, key) {
104
+ if (items.length === 0)
105
+ return undefined;
106
+ for (const item of items) {
107
+ if (item == null)
108
+ continue;
109
+ if (item.key === key)
110
+ return item;
111
+ }
112
+ return undefined;
113
+ }
114
+ /** 查找指定参数 */
115
+ export function findParameter(definition, key) {
116
+ if (!checkParameterDefinitions(definition))
117
+ return undefined;
118
+ for (const group of definition) {
119
+ if (group == null || !isArray(group.items))
120
+ continue;
121
+ const found = findParameterImpl(group.items, key);
122
+ if (found)
123
+ return found;
124
+ }
125
+ return undefined;
126
+ }
127
+ /** 获取参数默认值,修复现有的参数,填充缺失的参数,删除未定义的参数 */
128
+ export function fillArgumentMap(definition, args) {
129
+ args ??= {};
130
+ if (!checkParameterDefinitions(definition))
131
+ return args;
132
+ const keys = new Set(Object.keys(args));
133
+ // 根据定义填充或修复参数
134
+ for (const group of definition) {
135
+ for (const param of group.items) {
136
+ const key = param.key;
137
+ if (!key)
138
+ continue;
139
+ const currentValue = keys.has(key) ? args[key] : undefined;
140
+ if (currentValue == null) {
141
+ // 使用默认值填充
142
+ const defaultValue = param.value;
143
+ if (isExpression(defaultValue)) {
144
+ args[key] = Expression(defaultValue.source);
145
+ }
146
+ else {
147
+ const value = defaultValue != null && typeof defaultValue == 'object' ? klona(defaultValue) : defaultValue;
148
+ args[key] = toArgumentValue(value, param);
149
+ }
150
+ }
151
+ else {
152
+ // 已存在的参数值
153
+ if (isExpression(currentValue)) {
154
+ // 保留表达式
155
+ }
156
+ else {
157
+ // 修复现有的参数值
158
+ const castedValue = toArgumentValue(currentValue, param);
159
+ if (castedValue != null && castedValue !== currentValue) {
160
+ args[key] = castedValue;
161
+ }
162
+ }
163
+ }
164
+ keys.delete(key);
165
+ }
166
+ }
167
+ // 删除多余的参数
168
+ for (const key of keys) {
169
+ // 保留特殊参数和私有字段
170
+ const k0 = key[0];
171
+ if (k0 === '_' || k0 === '$' || k0 === '@' || k0 === 'ɵ')
172
+ continue;
173
+ delete args[key];
174
+ }
175
+ return args;
176
+ }
177
+ //# sourceMappingURL=utils.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/definitions/utils.ts"],"names":[],"mappings":"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"}
@@ -9,6 +9,4 @@ export type Variable<T extends ArgumentValue = ArgumentValue> = {
9
9
  };
10
10
  /** 检查是否为 `Variable` */
11
11
  export declare function isVariable(obj: unknown): obj is Variable;
12
- /** 创建空白 `Variable` */
13
- export declare function Variable(): Variable;
14
12
  //# sourceMappingURL=variable.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"variable.d.ts","sourceRoot":"","sources":["../../src/definitions/variable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD,eAAe;AACf,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,IAAI;IAC5D,aAAa;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU;IACV,KAAK,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC;CAC/B,CAAC;AAEF,uBAAuB;AACvB,wBAAgB,UAAU,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,QAAQ,CAKxD;AAED,sBAAsB;AACtB,wBAAgB,QAAQ,IAAI,QAAQ,CAEnC"}
1
+ {"version":3,"file":"variable.d.ts","sourceRoot":"","sources":["../../src/definitions/variable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD,eAAe;AACf,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,IAAI;IAC5D,aAAa;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU;IACV,KAAK,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC;CAC/B,CAAC;AAEF,uBAAuB;AACvB,wBAAgB,UAAU,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,QAAQ,CAKxD"}
@@ -2,13 +2,9 @@
2
2
  export function isVariable(obj) {
3
3
  if (obj == null || typeof obj != 'object')
4
4
  return false;
5
- if ('condition' in obj || 'description' in obj)
5
+ if ('condition' in obj || 'description' in obj || 'type' in obj)
6
6
  return false;
7
7
  const v = obj;
8
8
  return typeof v.key == 'string' && 'value' in v;
9
9
  }
10
- /** 创建空白 `Variable` */
11
- export function Variable() {
12
- return { key: '', value: '' };
13
- }
14
10
  //# sourceMappingURL=variable.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"variable.js","sourceRoot":"","sources":["../../src/definitions/variable.ts"],"names":[],"mappings":"AAWA,uBAAuB;AACvB,MAAM,UAAU,UAAU,CAAC,GAAY;IACnC,IAAI,GAAG,IAAI,IAAI,IAAI,OAAO,GAAG,IAAI,QAAQ;QAAE,OAAO,KAAK,CAAC;IACxD,IAAI,WAAW,IAAI,GAAG,IAAI,aAAa,IAAI,GAAG;QAAE,OAAO,KAAK,CAAC;IAC7D,MAAM,CAAC,GAAG,GAAe,CAAC;IAC1B,OAAO,OAAO,CAAC,CAAC,GAAG,IAAI,QAAQ,IAAI,OAAO,IAAI,CAAC,CAAC;AACpD,CAAC;AAED,sBAAsB;AACtB,MAAM,UAAU,QAAQ;IACpB,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;AAClC,CAAC"}
1
+ {"version":3,"file":"variable.js","sourceRoot":"","sources":["../../src/definitions/variable.ts"],"names":[],"mappings":"AAWA,uBAAuB;AACvB,MAAM,UAAU,UAAU,CAAC,GAAY;IACnC,IAAI,GAAG,IAAI,IAAI,IAAI,OAAO,GAAG,IAAI,QAAQ;QAAE,OAAO,KAAK,CAAC;IACxD,IAAI,WAAW,IAAI,GAAG,IAAI,aAAa,IAAI,GAAG,IAAI,MAAM,IAAI,GAAG;QAAE,OAAO,KAAK,CAAC;IAC9E,MAAM,CAAC,GAAG,GAAe,CAAC;IAC1B,OAAO,OAAO,CAAC,CAAC,GAAG,IAAI,QAAQ,IAAI,OAAO,IAAI,CAAC,CAAC;AACpD,CAAC"}
@@ -4,4 +4,5 @@ export * from './definitions/parameter.js';
4
4
  export * from './definitions/parameter-group.js';
5
5
  export * from './definitions/parameter-decoration.js';
6
6
  export * from './definitions/variable.js';
7
+ export * from './definitions/utils.js';
7
8
  //# sourceMappingURL=definitions.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"definitions.d.ts","sourceRoot":"","sources":["../src/definitions.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kCAAkC,CAAC;AACjD,cAAc,uCAAuC,CAAC;AACtD,cAAc,2BAA2B,CAAC"}
1
+ {"version":3,"file":"definitions.d.ts","sourceRoot":"","sources":["../src/definitions.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kCAAkC,CAAC;AACjD,cAAc,uCAAuC,CAAC;AACtD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC"}
@@ -4,4 +4,5 @@ export * from './definitions/parameter.js';
4
4
  export * from './definitions/parameter-group.js';
5
5
  export * from './definitions/parameter-decoration.js';
6
6
  export * from './definitions/variable.js';
7
+ export * from './definitions/utils.js';
7
8
  //# sourceMappingURL=definitions.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"definitions.js","sourceRoot":"","sources":["../src/definitions.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kCAAkC,CAAC;AACjD,cAAc,uCAAuC,CAAC;AACtD,cAAc,2BAA2B,CAAC"}
1
+ {"version":3,"file":"definitions.js","sourceRoot":"","sources":["../src/definitions.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kCAAkC,CAAC;AACjD,cAAc,uCAAuC,CAAC;AACtD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC"}
package/dist/eval.d.ts CHANGED
@@ -1,15 +1,13 @@
1
1
  import type { VmValue } from '@mirascript/mirascript';
2
- import type { Context } from './context.js';
3
2
  import type { EvalExpressionCache, ExpressionCache } from './parser.js';
4
3
  import { Scope } from './scope.js';
5
- import { TypeInfo } from './type.js';
6
- export declare const DEFAULTS: unique symbol;
4
+ import type { Evaluator } from './main.js';
7
5
  /**
8
6
  * 表达式求值
9
7
  */
10
- export declare function evaluateEval<T extends VmValue>(context: Context, expression: EvalExpressionCache, scope: Scope): T | typeof DEFAULTS;
8
+ export declare function evaluateEval<T extends VmValue>(evaluator: Evaluator, expression: EvalExpressionCache, scope: Scope): T | null;
11
9
  /**
12
10
  * 表达式求值
13
11
  */
14
- export declare function evaluate<T extends VmValue, D = T>(context: Context, expression: ExpressionCache, returnType: TypeInfo | null, scope: Scope | undefined, defaults: D): D | T;
12
+ export declare function evaluate<T extends VmValue>(evaluator: Evaluator, expression: ExpressionCache, scope: Scope): T | null;
15
13
  //# sourceMappingURL=eval.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"eval.d.ts","sourceRoot":"","sources":["../src/eval.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACxE,OAAO,EAAE,KAAK,EAAU,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAErC,eAAO,MAAM,QAAQ,eAAqB,CAAC;AAE3C;;GAEG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,OAAO,EAC1C,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,mBAAmB,EAC/B,KAAK,EAAE,KAAK,GACb,CAAC,GAAG,OAAO,QAAQ,CAgBrB;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAC,CAAC,SAAS,OAAO,EAAE,CAAC,GAAG,CAAC,EAC7C,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,eAAe,EAC3B,UAAU,EAAE,QAAQ,GAAG,IAAI,EAC3B,KAAK,EAAE,KAAK,GAAG,SAAS,EACxB,QAAQ,EAAE,CAAC,GACZ,CAAC,GAAG,CAAC,CAqBP"}
1
+ {"version":3,"file":"eval.d.ts","sourceRoot":"","sources":["../src/eval.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACxE,OAAO,EAAE,KAAK,EAAU,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE3C;;GAEG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,OAAO,EAC1C,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,mBAAmB,EAC/B,KAAK,EAAE,KAAK,GACb,CAAC,GAAG,IAAI,CAgBV;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAC,CAAC,SAAS,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,eAAe,EAAE,KAAK,EAAE,KAAK,GAAG,CAAC,GAAG,IAAI,CAiBrH"}
package/dist/eval.js CHANGED
@@ -1,54 +1,46 @@
1
1
  import { Scope, unwrap } from './scope.js';
2
- import { TypeInfo } from './type.js';
3
- export const DEFAULTS = Symbol('defaults');
4
2
  /**
5
3
  * 表达式求值
6
4
  */
7
- export function evaluateEval(context, expression, scope) {
5
+ export function evaluateEval(evaluator, expression, scope) {
8
6
  try {
9
7
  const result = expression.func(scope.proxy);
10
8
  if (result == null)
11
- return DEFAULTS;
9
+ return null;
12
10
  return unwrap(result);
13
11
  }
14
12
  catch (error) {
15
13
  if (scope.throws)
16
14
  throw error;
17
- context.logger.warn(`Failed to execute expression "${expression.source}": ${error.message || String(error)}.`, {
15
+ evaluator.logger.warn(`Failed to execute expression "${expression.source}": ${error.message || String(error)}.`, {
18
16
  error,
19
17
  scope,
20
18
  });
21
- return DEFAULTS;
19
+ return null;
22
20
  }
23
21
  }
24
22
  /**
25
23
  * 表达式求值
26
24
  */
27
- export function evaluate(context, expression, returnType, scope, defaults) {
28
- let ret;
25
+ export function evaluate(evaluator, expression, scope) {
26
+ let ret = null;
29
27
  if (expression.func != null) {
30
28
  scope ??= new Scope();
31
- const reset = scope.reset(context);
29
+ const reset = scope.reset(evaluator);
32
30
  try {
33
- ret = evaluateEval(context, expression, scope);
31
+ ret = evaluateEval(evaluator, expression, scope);
34
32
  }
35
33
  finally {
36
34
  reset();
37
35
  }
38
36
  }
39
37
  else if (expression.error != null) {
40
- if (scope?.throws ?? true) {
38
+ if (scope.throws) {
41
39
  throw expression.error;
42
40
  }
43
- ret = DEFAULTS;
44
41
  }
45
- else {
46
- ret = DEFAULTS;
47
- }
48
- if (ret === DEFAULTS)
49
- return defaults;
50
- if (!returnType)
51
- return ret;
52
- return TypeInfo.to(ret, returnType);
42
+ if (ret == null)
43
+ return null;
44
+ return ret;
53
45
  }
54
46
  //# sourceMappingURL=eval.js.map
package/dist/eval.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"eval.js","sourceRoot":"","sources":["../src/eval.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAErC,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AAE3C;;GAEG;AACH,MAAM,UAAU,YAAY,CACxB,OAAgB,EAChB,UAA+B,EAC/B,KAAY;IAEZ,IAAI,CAAC;QACD,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC5C,IAAI,MAAM,IAAI,IAAI;YAAE,OAAO,QAAQ,CAAC;QACpC,OAAO,MAAM,CAAC,MAAW,CAAC,CAAC;IAC/B,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACtB,IAAI,KAAK,CAAC,MAAM;YAAE,MAAM,KAAK,CAAC;QAC9B,OAAO,CAAC,MAAM,CAAC,IAAI,CACf,iCAAiC,UAAU,CAAC,MAAM,MAAO,KAAe,CAAC,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,EACpG;YACI,KAAK;YACL,KAAK;SACR,CACJ,CAAC;QACF,OAAO,QAAQ,CAAC;IACpB,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,QAAQ,CACpB,OAAgB,EAChB,UAA2B,EAC3B,UAA2B,EAC3B,KAAwB,EACxB,QAAW;IAEX,IAAI,GAAwB,CAAC;IAC7B,IAAI,UAAU,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;QAC1B,KAAK,KAAK,IAAI,KAAK,EAAE,CAAC;QACtB,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACnC,IAAI,CAAC;YACD,GAAG,GAAG,YAAY,CAAI,OAAO,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;QACtD,CAAC;gBAAS,CAAC;YACP,KAAK,EAAE,CAAC;QACZ,CAAC;IACL,CAAC;SAAM,IAAI,UAAU,CAAC,KAAK,IAAI,IAAI,EAAE,CAAC;QAClC,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,EAAE,CAAC;YACxB,MAAM,UAAU,CAAC,KAAK,CAAC;QAC3B,CAAC;QACD,GAAG,GAAG,QAAQ,CAAC;IACnB,CAAC;SAAM,CAAC;QACJ,GAAG,GAAG,QAAQ,CAAC;IACnB,CAAC;IACD,IAAI,GAAG,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAC;IACtC,IAAI,CAAC,UAAU;QAAE,OAAO,GAAG,CAAC;IAC5B,OAAO,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,CAAM,CAAC;AAC7C,CAAC"}
1
+ {"version":3,"file":"eval.js","sourceRoot":"","sources":["../src/eval.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAG3C;;GAEG;AACH,MAAM,UAAU,YAAY,CACxB,SAAoB,EACpB,UAA+B,EAC/B,KAAY;IAEZ,IAAI,CAAC;QACD,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC5C,IAAI,MAAM,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC;QAChC,OAAO,MAAM,CAAC,MAAW,CAAC,CAAC;IAC/B,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACtB,IAAI,KAAK,CAAC,MAAM;YAAE,MAAM,KAAK,CAAC;QAC9B,SAAS,CAAC,MAAM,CAAC,IAAI,CACjB,iCAAiC,UAAU,CAAC,MAAM,MAAO,KAAe,CAAC,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,EACpG;YACI,KAAK;YACL,KAAK;SACR,CACJ,CAAC;QACF,OAAO,IAAI,CAAC;IAChB,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,QAAQ,CAAoB,SAAoB,EAAE,UAA2B,EAAE,KAAY;IACvG,IAAI,GAAG,GAAa,IAAI,CAAC;IACzB,IAAI,UAAU,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;QAC1B,KAAK,KAAK,IAAI,KAAK,EAAE,CAAC;QACtB,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACrC,IAAI,CAAC;YACD,GAAG,GAAG,YAAY,CAAI,SAAS,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;QACxD,CAAC;gBAAS,CAAC;YACP,KAAK,EAAE,CAAC;QACZ,CAAC;IACL,CAAC;SAAM,IAAI,UAAU,CAAC,KAAK,IAAI,IAAI,EAAE,CAAC;QAClC,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACf,MAAM,UAAU,CAAC,KAAK,CAAC;QAC3B,CAAC;IACL,CAAC;IACD,IAAI,GAAG,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC;IAC7B,OAAO,GAAG,CAAC;AACf,CAAC"}
@@ -2,6 +2,7 @@ import type { VmValue } from '@mirascript/mirascript';
2
2
  import type { Tagged } from 'type-fest';
3
3
  import type { LegacyType, TsTypeOf, TypeInfo } from './type.js';
4
4
  import type { Scope } from './scope.js';
5
+ import type { Evaluator } from './main.js';
5
6
  /** 表达式的标记属性 */
6
7
  export declare const ExpressionTag: "\u0275exp";
7
8
  /** 表示一个表达式 */
@@ -14,10 +15,7 @@ export type Expression<T extends VmValue = VmValue> = {
14
15
  /**
15
16
  * 编译后的表达式
16
17
  */
17
- export interface CompiledExpression<T extends VmValue = VmValue> extends Expression<T> {
18
- (scope: Scope, defaults: T): T;
19
- (scope?: Scope): T | undefined;
20
- }
18
+ export type CompiledExpression<T extends VmValue = VmValue> = Expression<T> & ExpressionFunction<T>;
21
19
  /** 表示一个表达式内容 */
22
20
  export type ExpressionSource<T extends VmValue = VmValue> = Tagged<string, 'ExpressionResult', T>;
23
21
  /** 表示表达式或值 */
@@ -34,4 +32,12 @@ export type ExpressionResult<T> = T extends Expression<infer R> ? R : T;
34
32
  export type ExpressionResultObject<T> = {
35
33
  [K in keyof T]: ExpressionResult<T[K]>;
36
34
  };
35
+ /**
36
+ * 表示一个具有类似表达式功能的 JS 函数
37
+ */
38
+ export type ExpressionFunction<out T> = (
39
+ /** 当前作用域 */
40
+ scope: Scope,
41
+ /** 当前求值器 */
42
+ evaluator: Evaluator) => T | null;
37
43
  //# sourceMappingURL=expression.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"expression.d.ts","sourceRoot":"","sources":["../src/expression.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAExC,eAAe;AACf,eAAO,MAAM,aAAa,EAAG,WAAe,CAAC;AAG7C,cAAc;AACd,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,IAAI;IAClD,+BAA+B;IAC/B,QAAQ,CAAC,CAAC,aAAa,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,EAAE,CAAC;IACrD,YAAY;IACZ,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC;CACxC,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,kBAAkB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,CAAE,SAAQ,UAAU,CAAC,CAAC,CAAC;IAClF,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,CAAC,GAAG,SAAS,CAAC;CAClC;AAED,gBAAgB;AAChB,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC;AAElG,cAAc;AACd,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,IAAI,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAC/E,mBAAmB;AACnB,wBAAgB,UAAU,CAAC,CAAC,SAAS,QAAQ,GAAG,UAAU,EACtD,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EACxC,UAAU,EAAE,CAAC,GACd,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3B,sBAAsB;AACtB,wBAAgB,UAAU,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;AAavG,eAAe;AACf,wBAAgB,YAAY,CAAC,CAAC,SAAS,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,UAAU,CAAC,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAG9G;AAED,mBAAmB;AACnB,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI,CAAC,SAAS,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAExE,sBAAsB;AACtB,MAAM,MAAM,sBAAsB,CAAC,CAAC,IAAI;KACnC,CAAC,IAAI,MAAM,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACzC,CAAC"}
1
+ {"version":3,"file":"expression.d.ts","sourceRoot":"","sources":["../src/expression.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE3C,eAAe;AACf,eAAO,MAAM,aAAa,EAAG,WAAe,CAAC;AAG7C,cAAc;AACd,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,IAAI;IAClD,+BAA+B;IAC/B,QAAQ,CAAC,CAAC,aAAa,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,EAAE,CAAC;IACrD,YAAY;IACZ,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC;CACxC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,IAAI,UAAU,CAAC,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;AAEpG,gBAAgB;AAChB,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC;AAElG,cAAc;AACd,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,IAAI,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAC/E,mBAAmB;AACnB,wBAAgB,UAAU,CAAC,CAAC,SAAS,QAAQ,GAAG,UAAU,EACtD,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EACxC,UAAU,EAAE,CAAC,GACd,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3B,sBAAsB;AACtB,wBAAgB,UAAU,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;AAavG,eAAe;AACf,wBAAgB,YAAY,CAAC,CAAC,SAAS,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,UAAU,CAAC,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAG9G;AAED,mBAAmB;AACnB,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI,CAAC,SAAS,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAExE,sBAAsB;AACtB,MAAM,MAAM,sBAAsB,CAAC,CAAC,IAAI;KACnC,CAAC,IAAI,MAAM,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACzC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAAC,GAAG,CAAC,CAAC,IAAI;AACpC,YAAY;AACZ,KAAK,EAAE,KAAK;AACZ,YAAY;AACZ,SAAS,EAAE,SAAS,KACnB,CAAC,GAAG,IAAI,CAAC"}
@@ -2,11 +2,11 @@
2
2
  export const ExpressionTag = 'ɵexp';
3
3
  /** 创建一个表达式 */
4
4
  export function Expression(source, returnType = '') {
5
- if (!source)
6
- throw new Error(`Invalid expression ${String(source)}`);
5
+ if (source == null)
6
+ throw new TypeError(`Invalid expression ${String(source)}`);
7
7
  const s = isExpression(source) ? source.source : source;
8
- if (!s || typeof s != 'string')
9
- throw new Error(`Invalid expression ${String(s)}`);
8
+ if (typeof s != 'string')
9
+ throw new TypeError(`Invalid expression ${String(s)}`);
10
10
  return { [ExpressionTag]: returnType, source: s };
11
11
  }
12
12
  /** 检查是否为表达式 */
@@ -1 +1 @@
1
- {"version":3,"file":"expression.js","sourceRoot":"","sources":["../src/expression.ts"],"names":[],"mappings":"AAKA,eAAe;AACf,MAAM,CAAC,MAAM,aAAa,GAAG,MAAe,CAAC;AAgC7C,cAAc;AACd,MAAM,UAAU,UAAU,CACtB,MAA8B,EAC9B,aAAyC,EAAE;IAE3C,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACrE,MAAM,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;IACxD,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,IAAI,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACnF,OAAO,EAAE,CAAC,aAAa,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,CAAwB,EAAE,CAAC;AAC7E,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,aAAa,IAAI,KAAK,CAAC;AAClC,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,EAAE,MAAM,EAAE,CAAwB,EAAE,CAAC;AAC7E,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,aAAa,IAAI,KAAK,CAAC;AAClC,CAAC"}
package/dist/index.d.ts CHANGED
@@ -1,6 +1,8 @@
1
- export type { Options, Context } from './context.js';
1
+ export type { Options, Logger } from './interface.js';
2
2
  export { Scope } from './scope.js';
3
3
  export { Evaluator } from './main.js';
4
+ export type { AccessChain } from './analyze.js';
4
5
  export * from './expression.js';
5
6
  export * from './type.js';
7
+ export * from './re-exports.js';
6
8
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,YAAY,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAChD,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC;AAC1B,cAAc,iBAAiB,CAAC"}
package/dist/index.js CHANGED
@@ -2,4 +2,5 @@ export { Scope } from './scope.js';
2
2
  export { Evaluator } from './main.js';
3
3
  export * from './expression.js';
4
4
  export * from './type.js';
5
+ export * from './re-exports.js';
5
6
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC;AAC1B,cAAc,iBAAiB,CAAC"}
@@ -0,0 +1,30 @@
1
+ /** 日志 */
2
+ export interface Logger {
3
+ /**
4
+ * error
5
+ */
6
+ error(...args: unknown[]): void;
7
+ /**
8
+ * warning
9
+ */
10
+ warn(...args: unknown[]): void;
11
+ /**
12
+ * info
13
+ */
14
+ info(...args: unknown[]): void;
15
+ /**
16
+ * debug
17
+ */
18
+ debug(...args: unknown[]): void;
19
+ }
20
+ /** 选项 */
21
+ export interface Options {
22
+ /** 日志 */
23
+ logger: Logger;
24
+ /** 表达式缓存 */
25
+ expressionCacheSize: number;
26
+ /** 模板缓存 */
27
+ templateCacheSize: number;
28
+ }
29
+ export declare const defaultOptions: Options;
30
+ //# sourceMappingURL=interface.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../src/interface.ts"],"names":[],"mappings":"AAAA,SAAS;AACT,MAAM,WAAW,MAAM;IACnB;;OAEG;IACH,KAAK,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAChC;;OAEG;IACH,IAAI,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAC/B;;OAEG;IACH,IAAI,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAC/B;;OAEG;IACH,KAAK,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;CACnC;AAED,SAAS;AACT,MAAM,WAAW,OAAO;IACpB,SAAS;IACT,MAAM,EAAE,MAAM,CAAC;IACf,YAAY;IACZ,mBAAmB,EAAE,MAAM,CAAC;IAC5B,WAAW;IACX,iBAAiB,EAAE,MAAM,CAAC;CAC7B;AAED,eAAO,MAAM,cAAc,EAAE,OAI5B,CAAC"}
@@ -0,0 +1,6 @@
1
+ export const defaultOptions = {
2
+ logger: console,
3
+ expressionCacheSize: 50,
4
+ templateCacheSize: 50,
5
+ };
6
+ //# sourceMappingURL=interface.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"interface.js","sourceRoot":"","sources":["../src/interface.ts"],"names":[],"mappings":"AA8BA,MAAM,CAAC,MAAM,cAAc,GAAY;IACnC,MAAM,EAAE,OAAO;IACf,mBAAmB,EAAE,EAAE;IACvB,iBAAiB,EAAE,EAAE;CACxB,CAAC"}
package/dist/main.d.ts CHANGED
@@ -1,49 +1,62 @@
1
- import type { SetFieldType } from 'type-fest';
2
1
  import { type VmValue } from '@mirascript/mirascript';
3
- import { type Options } from './context.js';
4
- import { type CompiledExpression, Expression, type ExpressionOrValue } from './expression.js';
2
+ import { type Logger, type Options } from './interface.js';
3
+ import { type AccessChain } from './analyze.js';
4
+ import { type CompiledExpression, Expression, type ExpressionFunction, type ExpressionOrValue, type ExpressionSource } from './expression.js';
5
5
  import { Scope } from './scope.js';
6
- import type { ArgumentMap, ArgumentValue, Choice, ChoiceArgumentValue, ConditionExpression, Parameter, ParameterFunction, ParameterGroup } from './definitions.js';
6
+ import { type ArgumentMap, type ArgumentValue, type ChoiceParameterType, type ConditionExpression, type Parameter, type ParameterGroup, type ParameterMap } from './definitions.js';
7
+ /** 选项类型 */
8
+ export type EvaluatedChoices<T extends ChoiceParameterType> = {
9
+ [K in T]: ParameterMap[K] extends {
10
+ choices?: infer C;
11
+ } ? (C extends readonly unknown[] ? C : never) : never;
12
+ }[T];
7
13
  /**
8
14
  * 表达式求值
9
15
  */
10
16
  export declare class Evaluator {
11
- constructor(options?: Partial<Options>);
17
+ constructor(options?: Partial<Options> | null);
18
+ /** Logger */
19
+ get logger(): Logger;
12
20
  /** 选项 */
13
- get options(): Options;
14
- /** 上下文 */
15
- private readonly context;
21
+ readonly options: Readonly<Partial<Options>>;
16
22
  /** 默认执行环境 */
17
23
  private readonly scope;
18
- /** 导入到执行环境 */
19
- import(values: Record<string, unknown>): void;
24
+ private readonly __imported;
25
+ /** 执行环境 */
26
+ get imported(): ReadonlyMap<string, VmValue>;
20
27
  /**
21
- * 编译表达式
28
+ * 导入到执行环境
29
+ *
30
+ * 使用 `undefined` 删除已导入的变量
22
31
  */
32
+ import(values: Record<string, unknown>): void;
33
+ /** 编译表达式 */
23
34
  compile<T extends VmValue>(expression: Expression<T>, throws?: boolean): CompiledExpression<T>;
24
- /**
25
- * 求值
26
- */
27
- evaluate<T extends VmValue>(expression: ExpressionOrValue<T> | undefined, scope?: Scope): T | undefined;
28
- /**
29
- * 求值
30
- */
31
- evaluate<T extends VmValue, D = T>(expression: ExpressionOrValue<T> | undefined, scope: Scope | undefined, defaults: D): T | D;
35
+ /** 执行 MiraScript 模板 */
36
+ template(template: string | null | undefined, scope: Scope | undefined): string;
37
+ /** 求值 */
38
+ evaluate<T extends VmValue>(expression: ExpressionOrValue<T> | ExpressionFunction<T> | null | undefined, scope?: Scope | null): T | null;
39
+ /** 求值 */
40
+ evaluate<T extends VmValue, const D = NonNullable<T>>(expression: ExpressionOrValue<T> | ExpressionFunction<T> | null | undefined, scope: Scope | null | undefined, defaults: D): NonNullable<T> | D;
41
+ /** 求值 */
42
+ evaluate<T>(expression: ExpressionFunction<T> | T | null | undefined, scope?: Scope | null): T | null;
43
+ /** 求值 */
44
+ evaluate<T, const D = NonNullable<T>>(expression: ExpressionFunction<T> | T | null | undefined, scope: Scope | null | undefined, defaults: D): NonNullable<T> | D;
45
+ /** 求值 */
46
+ evaluateSource<T extends VmValue>(expression: ExpressionSource<T> | T | null | undefined, scope: Scope | null | undefined): T | null;
47
+ /** 求值 */
48
+ evaluateSource<T extends VmValue, const D = NonNullable<T>>(expression: ExpressionSource<T> | T | null | undefined, scope: Scope | null | undefined, defaults: D): NonNullable<T> | D;
32
49
  /** 求条件 */
33
- evaluateCondition(condition: ConditionExpression | undefined, scope: Scope | undefined, defaults?: boolean): boolean;
50
+ evaluateCondition(condition: ConditionExpression | null | undefined, scope: Scope | null | undefined, defaults?: boolean): boolean;
34
51
  /** 求选项列表 */
35
- evaluateChoices<V extends ChoiceArgumentValue>(choices: ExpressionOrValue<Array<Choice<V>>> | ParameterFunction<Array<Choice<V>>> | undefined, scope: Scope | undefined): ReadonlyArray<SetFieldType<Choice<V>, 'key', V>>;
36
- /** 转换参数值的类型 */
37
- toArg<V extends ArgumentValue>(value: VmValue, definition: Parameter): V;
52
+ evaluateChoices<T extends ChoiceParameterType>(definition: Pick<ParameterMap[T], 'type' | 'choices'>, scope: Scope | null | undefined): EvaluatedChoices<T>;
38
53
  /** 求参数值 */
39
- evaluateArg<V extends ArgumentValue>(expression: ExpressionOrValue<V> | undefined, scope: Scope | undefined, definition: Parameter): V;
54
+ evaluateArg<V extends ArgumentValue>(expression: ExpressionOrValue<V> | null | undefined, scope: Scope | null | undefined, definition: Parameter): V;
40
55
  /** 求参数表的所有参数值 */
41
- evaluateArgs<T extends Record<string, ArgumentValue>>(args: ArgumentMap<T> | undefined, scope: Scope | undefined, definition: ReadonlyArray<Pick<ParameterGroup, 'items'>>): T;
42
- /** 获取参数默认值,修复现有的参数,并填充缺失的参数 */
43
- defaultArgs<T extends Record<string, ArgumentValue>>(definition: ReadonlyArray<Pick<ParameterGroup, 'items'>> | undefined, args?: ArgumentMap<T>): ArgumentMap<T>;
56
+ evaluateArgs<T extends Record<string, ArgumentValue>>(args: ArgumentMap<T> | null | undefined, scope: Scope | null | undefined, definition: ReadonlyArray<Pick<ParameterGroup, 'items'>>): T;
44
57
  /** 解析表达式 */
45
58
  validate<T extends VmValue>(expression: Expression<T>): void;
46
59
  /** 分析表达式 */
47
- analyze<T extends VmValue>(expression: Expression<T>): string[][];
60
+ analyze<T extends VmValue>(expression: Expression<T>, scope?: Scope | null): readonly AccessChain[];
48
61
  }
49
62
  //# sourceMappingURL=main.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAgB,YAAY,EAAE,MAAM,WAAW,CAAC;AAC5D,OAAO,EAA4B,KAAK,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAGhF,OAAO,EAAW,KAAK,OAAO,EAAE,MAAM,cAAc,CAAC;AAGrD,OAAO,EACH,KAAK,kBAAkB,EACvB,UAAU,EACV,KAAK,iBAAiB,EAGzB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,EACR,WAAW,EACX,aAAa,EACb,MAAM,EACN,mBAAmB,EACnB,mBAAmB,EACnB,SAAS,EACT,iBAAiB,EACjB,cAAc,EAEjB,MAAM,kBAAkB,CAAC;AAI1B;;GAEG;AACH,qBAAa,SAAS;gBACN,OAAO,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC;IAGtC,SAAS;IACT,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,UAAU;IACV,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;IAElC,aAAa;IACb,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA8C;IAEpE,cAAc;IACd,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAU7C;;OAEG;IACH,OAAO,CAAC,CAAC,SAAS,OAAO,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,MAAM,UAAO,GAAG,kBAAkB,CAAC,CAAC,CAAC;IAa3F;;OAEG;IACH,QAAQ,CAAC,CAAC,SAAS,OAAO,EAAE,UAAU,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,SAAS,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,CAAC,GAAG,SAAS;IACvG;;OAEG;IACH,QAAQ,CAAC,CAAC,SAAS,OAAO,EAAE,CAAC,GAAG,CAAC,EAC7B,UAAU,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,SAAS,EAC5C,KAAK,EAAE,KAAK,GAAG,SAAS,EACxB,QAAQ,EAAE,CAAC,GACZ,CAAC,GAAG,CAAC;IAmBR,UAAU;IACV,iBAAiB,CAAC,SAAS,EAAE,mBAAmB,GAAG,SAAS,EAAE,KAAK,EAAE,KAAK,GAAG,SAAS,EAAE,QAAQ,UAAO,GAAG,OAAO;IAoBjH,YAAY;IACZ,eAAe,CAAC,CAAC,SAAS,mBAAmB,EACzC,OAAO,EAAE,iBAAiB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,iBAAiB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,EAC9F,KAAK,EAAE,KAAK,GAAG,SAAS,GACzB,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IA0BnD,eAAe;IACf,KAAK,CAAC,CAAC,SAAS,aAAa,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,GAAG,CAAC;IAgCxE,WAAW;IACX,WAAW,CAAC,CAAC,SAAS,aAAa,EAC/B,UAAU,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,SAAS,EAC5C,KAAK,EAAE,KAAK,GAAG,SAAS,EACxB,UAAU,EAAE,SAAS,GACtB,CAAC;IAMJ,iBAAiB;IACjB,YAAY,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,EAChD,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,SAAS,EAChC,KAAK,EAAE,KAAK,GAAG,SAAS,EACxB,UAAU,EAAE,aAAa,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,GACzD,CAAC;IAaJ,+BAA+B;IAC/B,WAAW,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,EAC/C,UAAU,EAAE,aAAa,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,EACpE,IAAI,GAAE,WAAW,CAAC,CAAC,CAAwB,GAC5C,WAAW,CAAC,CAAC,CAAC;IAqDjB,YAAY;IACZ,QAAQ,CAAC,CAAC,SAAS,OAAO,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,IAAI;IAS5D,YAAY;IACZ,OAAO,CAAC,CAAC,SAAS,OAAO,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,MAAM,EAAE,EAAE;CAOpE"}
1
+ {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}