3xpr 4.1.0 → 5.1.0
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/CHANGELOG.md +66 -0
- package/README.md +38 -0
- package/expression/application/expressions.d.ts +9 -4
- package/expression/application/expressions.d.ts.map +1 -1
- package/expression/application/expressions.js +11 -6
- package/expression/application/expressions.js.map +1 -1
- package/expression/application/useCases/executor.d.ts +2 -0
- package/expression/application/useCases/executor.d.ts.map +1 -1
- package/expression/application/useCases/executor.js +23 -2
- package/expression/application/useCases/executor.js.map +1 -1
- package/expression/domain/expressions.d.ts +4 -4
- package/expression/domain/expressions.d.ts.map +1 -1
- package/expression/infrastructure/convertFrom/convertFromFunction.js +1 -1
- package/expression/infrastructure/convertFrom/convertFromFunction.js.map +1 -1
- package/expression/infrastructure/helper.js +1 -1
- package/expression/infrastructure/helper.js.map +1 -1
- package/expression/infrastructure/library.js +5 -5
- package/expression/infrastructure/library.js.map +1 -1
- package/index.d.ts +3 -3
- package/index.d.ts.map +1 -1
- package/index.js +4 -4
- package/index.js.map +1 -1
- package/model/application/modelService.d.ts.map +1 -1
- package/model/application/modelService.js +4 -1
- package/model/application/modelService.js.map +1 -1
- package/operand/application/services/parser.d.ts +5 -0
- package/operand/application/services/parser.d.ts.map +1 -1
- package/operand/application/services/parser.js +54 -10
- package/operand/application/services/parser.js.map +1 -1
- package/operand/application/services/typeService.d.ts.map +1 -1
- package/operand/application/services/typeService.js +15 -4
- package/operand/application/services/typeService.js.map +1 -1
- package/operand/application/useCases/reduce.d.ts.map +1 -1
- package/operand/application/useCases/reduce.js +2 -1
- package/operand/application/useCases/reduce.js.map +1 -1
- package/operand/domain/entities.d.ts +2 -1
- package/operand/domain/entities.d.ts.map +1 -1
- package/operand/domain/entities.js +4 -3
- package/operand/domain/entities.js.map +1 -1
- package/operand/infrastructure/executors/expression.d.ts +2 -3
- package/operand/infrastructure/executors/expression.d.ts.map +1 -1
- package/operand/infrastructure/executors/expression.js +173 -43
- package/operand/infrastructure/executors/expression.js.map +1 -1
- package/operand/infrastructure/executors/task.js +1 -1
- package/operand/infrastructure/executors/task.js.map +1 -1
- package/package.json +3 -3
- package/shared/domain/context.d.ts +17 -1
- package/shared/domain/context.d.ts.map +1 -1
- package/shared/domain/context.js +21 -3
- package/shared/domain/context.js.map +1 -1
- package/shared/domain/operand.d.ts +1 -0
- package/shared/domain/operand.d.ts.map +1 -1
- package/shared/domain/operand.js +4 -0
- package/shared/domain/operand.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,71 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 5.1.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- f3cfa0f: `evalAsync` can now run expressions with side effects (scripts that call async functions):
|
|
8
|
+
|
|
9
|
+
- The statements of a block run one after the other (they ran concurrently with `Promise.all`): each statement sees
|
|
10
|
+
the variables set by the previous ones, the block returns its last value (it returned an array), and an error stops
|
|
11
|
+
it — the next statements no longer run after the promise rejected.
|
|
12
|
+
- Async calls are awaited everywhere: as arguments of another function, in properties (`f().id`), in object and list
|
|
13
|
+
literals (also inside an assignment), in `else if` conditions, and when the function has no async arguments.
|
|
14
|
+
- An async function is never run while the expression is being built: with constant arguments it used to run once at
|
|
15
|
+
build time and its promise was cached as a constant.
|
|
16
|
+
- `throw`, `try`/`catch`, `return`, `break` and `continue` are implemented (`eval` and `evalAsync`). `break` inside a
|
|
17
|
+
`switch` ends it, and `case 1:` (an unquoted number) is compared as a number — both failed before.
|
|
18
|
+
- `now()`, `today()`, `curTime()`, `unixTimestamp()` and `age()` are no longer folded into constants (they returned the
|
|
19
|
+
same value on every evaluation).
|
|
20
|
+
- New `options` argument on `eval`, `evalAsync` and `execute`: `{ env: false }` refuses `$VAR` and keeps templates
|
|
21
|
+
from reading `process.env`, for expressions written by untrusted clients.
|
|
22
|
+
- Parser: `{}` (empty object), `else if (` with a space, `return value` / `return`, and a statement ending in a block
|
|
23
|
+
(`if`, `for`, `while`, …) followed by more statements inside a block.
|
|
24
|
+
|
|
25
|
+
### Patch Changes
|
|
26
|
+
|
|
27
|
+
- 22854ec: Dependency updates: `js-yaml` 5 (config-extends, jexp), `glob` 13 (jemv, dev), `@typescript-eslint` 8.72, `@types/node`
|
|
28
|
+
26, `typescript` 5.9 where it was pinned to 5.3/5.4, `@changesets/cli` 2.31.1.
|
|
29
|
+
|
|
30
|
+
- jexp: `require('jexp')` crashed (3xpr looped forever on its function signatures without parameters); the functions
|
|
31
|
+
now have full signatures. A YAML source without any document (empty or only comments) answers "can not parse
|
|
32
|
+
content" again (js-yaml 5 throws on it), and `.yml` sources are accepted (the extension was compared without the dot).
|
|
33
|
+
- 3xpr: `addFunction`/`addOperator` with a malformed signature fails with a clear error instead of looping forever.
|
|
34
|
+
- jemv: `contains` is typed `Schema | boolean` (was the `Boolean` wrapper type).
|
|
35
|
+
- config-extends: same output with js-yaml 5 (checked on lambdaorm's dialect configs).
|
|
36
|
+
|
|
37
|
+
## 5.0.0
|
|
38
|
+
|
|
39
|
+
### Major Changes
|
|
40
|
+
|
|
41
|
+
- 560d3a1: update version
|
|
42
|
+
|
|
43
|
+
### Minor Changes
|
|
44
|
+
|
|
45
|
+
- 824c145: test
|
|
46
|
+
|
|
47
|
+
### Patch Changes
|
|
48
|
+
|
|
49
|
+
- Updated dependencies [560d3a1]
|
|
50
|
+
- Updated dependencies [824c145]
|
|
51
|
+
- typ3s@5.0.0
|
|
52
|
+
- h3lp@5.0.0
|
|
53
|
+
|
|
54
|
+
## 5.0.0
|
|
55
|
+
|
|
56
|
+
### Major Changes
|
|
57
|
+
|
|
58
|
+
- 1b07b2e: Publish under the `@data7expressions/` npm scope instead of unscoped
|
|
59
|
+
package names. Update your dependency and imports accordingly, e.g.
|
|
60
|
+
`h3lp` -> `@data7expressions/h3lp`. The old unscoped packages remain
|
|
61
|
+
on npm but no longer receive updates.
|
|
62
|
+
|
|
63
|
+
### Patch Changes
|
|
64
|
+
|
|
65
|
+
- Updated dependencies [1b07b2e]
|
|
66
|
+
- @data7expressions/h3lp@5.0.0
|
|
67
|
+
- @data7expressions/typ3s@5.0.0
|
|
68
|
+
|
|
3
69
|
## 4.1.0
|
|
4
70
|
|
|
5
71
|
### Minor Changes
|
package/README.md
CHANGED
|
@@ -133,6 +133,44 @@ exp.addFunction(
|
|
|
133
133
|
)
|
|
134
134
|
```
|
|
135
135
|
|
|
136
|
+
## Async functions and scripts
|
|
137
|
+
|
|
138
|
+
A function registered with `async: true` returns a promise; evaluate expressions that call it with `evalAsync`.
|
|
139
|
+
A function with side effects (or a clock) must not be folded into a constant while the expression is built: async
|
|
140
|
+
functions never are, and a sync one needs `deterministic: false`.
|
|
141
|
+
|
|
142
|
+
```typescript
|
|
143
|
+
exp.addFunction('db.save(entity:string,data:any):any', async (entity: string, data: any) => save(entity, data), {
|
|
144
|
+
async: true, description: 'Save a row'
|
|
145
|
+
})
|
|
146
|
+
|
|
147
|
+
const result = await exp.evalAsync(`
|
|
148
|
+
order = db.save("Orders", { customer: customer });
|
|
149
|
+
if (order.id == null) { throw "order not saved"; }
|
|
150
|
+
for (line in lines) {
|
|
151
|
+
db.save("OrderLines", { orderId: order.id, product: line.product });
|
|
152
|
+
}
|
|
153
|
+
order.id
|
|
154
|
+
`, { customer: 'c1', lines: [{ product: 'p1' }, { product: 'p2' }] })
|
|
155
|
+
```
|
|
156
|
+
|
|
157
|
+
- Statements run one after the other and each async call is awaited (also in arguments, properties, object and list
|
|
158
|
+
literals, conditions and loops). The result is the value of the last statement, or of `return`.
|
|
159
|
+
- An error, or `throw <value>`, rejects the promise and the next statements don't run. `try { … } catch (e) { … }`
|
|
160
|
+
catches it (`e.message`); `break` and `continue` work in `for`, `for … in` and `while`, and `break` ends a `switch`
|
|
161
|
+
(only the matching `case` runs: there is no fall-through).
|
|
162
|
+
- `&&` and `||` short-circuit. There is no `? :` operator; `iif(condition, a, b)` is a function, so it evaluates both
|
|
163
|
+
`a` and `b`: use `if`/`else` when they have side effects.
|
|
164
|
+
|
|
165
|
+
### Options of an evaluation
|
|
166
|
+
|
|
167
|
+
`eval`, `evalAsync` and `execute` take an optional third argument. `{ env: false }` makes `$VAR` fail and keeps
|
|
168
|
+
templates from reading `process.env`: use it for expressions written by clients you don't trust.
|
|
169
|
+
|
|
170
|
+
```typescript
|
|
171
|
+
await exp.evalAsync(script, data, { env: false })
|
|
172
|
+
```
|
|
173
|
+
|
|
136
174
|
## Related projects
|
|
137
175
|
|
|
138
176
|
- [typ3s](https://www.npmjs.com/package/typ3s)
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ModelService, Library } from '../../model/domain';
|
|
2
|
-
import { Operand, Parameter, Format, ActionObserver } from '../../shared/domain';
|
|
2
|
+
import { Operand, Parameter, Format, ActionObserver, EvalOptions } from '../../shared/domain';
|
|
3
3
|
import { OperatorMetadata, FunctionAdditionalInfo, OperatorAdditionalInfo, ConstBuilder, OperandFacade, OperandBuilder } from '../../operand/domain';
|
|
4
4
|
import { ExpressionConvert, ExpressionConverter, Executor, ExpressionListener, Expressions } from '../domain';
|
|
5
5
|
export declare class ExpressionsImpl implements Expressions {
|
|
@@ -55,11 +55,16 @@ export declare class ExpressionsImpl implements Expressions {
|
|
|
55
55
|
* Evaluate and solve expression
|
|
56
56
|
* @param expression string expression
|
|
57
57
|
* @param data Data with variables
|
|
58
|
+
* @param options Options of this evaluation (e.g. `{ env: false }`: no access to environment variables)
|
|
58
59
|
* @returns Result of the evaluate expression
|
|
59
60
|
*/
|
|
60
|
-
eval(expression: string, data?: any): any;
|
|
61
|
-
|
|
62
|
-
|
|
61
|
+
eval(expression: string, data?: any, options?: EvalOptions): any;
|
|
62
|
+
/**
|
|
63
|
+
* Evaluate an expression that calls async functions: statements run one after the other, each call is awaited,
|
|
64
|
+
* and an error (or `throw`) rejects the promise without running the next statements.
|
|
65
|
+
*/
|
|
66
|
+
evalAsync(expression: string, data?: any, options?: EvalOptions): Promise<any>;
|
|
67
|
+
execute(task: string, data?: any, options?: EvalOptions): Promise<any>;
|
|
63
68
|
addConvert(key: string, converter: ExpressionConverter): ExpressionConvert;
|
|
64
69
|
getConvert(key: string): ExpressionConverter;
|
|
65
70
|
convert(source: any, from: string): [string, any];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expressions.d.ts","sourceRoot":"","sources":["../../../../../src/lib/expression/application/expressions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAC1D,OAAO,EAAQ,OAAO,EAAW,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"expressions.d.ts","sourceRoot":"","sources":["../../../../../src/lib/expression/application/expressions.ts"],"names":[],"mappings":"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"}
|
|
@@ -121,18 +121,23 @@ class ExpressionsImpl {
|
|
|
121
121
|
* Evaluate and solve expression
|
|
122
122
|
* @param expression string expression
|
|
123
123
|
* @param data Data with variables
|
|
124
|
+
* @param options Options of this evaluation (e.g. `{ env: false }`: no access to environment variables)
|
|
124
125
|
* @returns Result of the evaluate expression
|
|
125
126
|
*/
|
|
126
|
-
eval(expression, data) {
|
|
127
|
-
const context = new domain_1.Context(new domain_1.Data(data));
|
|
127
|
+
eval(expression, data, options) {
|
|
128
|
+
const context = new domain_1.Context(new domain_1.Data(data), undefined, undefined, options);
|
|
128
129
|
return this.executor.eval(expression, context);
|
|
129
130
|
}
|
|
130
|
-
|
|
131
|
-
|
|
131
|
+
/**
|
|
132
|
+
* Evaluate an expression that calls async functions: statements run one after the other, each call is awaited,
|
|
133
|
+
* and an error (or `throw`) rejects the promise without running the next statements.
|
|
134
|
+
*/
|
|
135
|
+
evalAsync(expression, data = {}, options) {
|
|
136
|
+
const context = new domain_1.Context(new domain_1.Data(data), undefined, undefined, options);
|
|
132
137
|
return this.executor.evalAsync(expression, context);
|
|
133
138
|
}
|
|
134
|
-
execute(task, data = {}) {
|
|
135
|
-
const context = new domain_1.Context(new domain_1.Data(data));
|
|
139
|
+
execute(task, data = {}, options) {
|
|
140
|
+
const context = new domain_1.Context(new domain_1.Data(data), undefined, undefined, options);
|
|
136
141
|
return this.executor.execute(task, context);
|
|
137
142
|
}
|
|
138
143
|
addConvert(key, converter) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expressions.js","sourceRoot":"","sources":["../../../../../src/lib/expression/application/expressions.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"expressions.js","sourceRoot":"","sources":["../../../../../src/lib/expression/application/expressions.ts"],"names":[],"mappings":";;;AACA,gDAA4G;AAI5G,MAAa,eAAe;IAC3B,kDAAkD;IAClD,YAA8B,KAAmB,EAC/B,iBAAmC,EACnC,aAA2B,EAC3B,QAAiB,EACjB,QAA2B;QAJf,UAAK,GAAL,KAAK,CAAc;QAC/B,sBAAiB,GAAjB,iBAAiB,CAAkB;QACnC,kBAAa,GAAb,aAAa,CAAc;QAC3B,aAAQ,GAAR,QAAQ,CAAS;QACjB,aAAQ,GAAR,QAAQ,CAAmB;IAAG,CAAC;IAEjD,IAAI,aAAa;QAChB,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,CAAA;IAChC,CAAC;IAED,IAAI,aAAa;QAChB,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,CAAA;IAChC,CAAC;IAED,IAAW,SAAS;QACnB,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAA;IAC5B,CAAC;IAED,IAAW,KAAK;QACf,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAA;IACxB,CAAC;IAED,IAAW,OAAO;QACjB,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAA;IAC1B,CAAC;IAED,IAAW,SAAS;QACnB,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAA;IAC5B,CAAC;IAED,IAAW,SAAS;QACnB,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAA;IAC5B,CAAC;IAEM,WAAW,CAAE,IAAW,EAAE,MAAU,EAAE,cAAsC;QAClF,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,EAAE,cAAc,CAAC,CAAA;IACrD,CAAC;IAEM,WAAW,CAAE,IAAW,EAAE,MAAU,EAAE,cAAsC;QAClF,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,CAAC,CAAA;IACrD,CAAC;IAEM,OAAO,CAAE,GAAU,EAAE,MAA4B;QACvD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;IAChC,CAAC;IAEM,SAAS,CAAE,GAAU,EAAE,OAAc;QAC3C,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IACnC,CAAC;IAEM,WAAW,CAAE,GAAU,EAAE,KAAS;QACxC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IACnC,CAAC;IAEM,gBAAgB,CAAE,KAAY,EAAE,SAAgB;QACtD,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;IAC9C,CAAC;IAEM,gBAAgB,CAAE,KAAY,EAAE,SAAgB;QACtD,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;IAC9C,CAAC;IAEM,UAAU,CAAE,OAAe;QACjC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;IAC/B,CAAC;IAEM,gBAAgB,CAAE,IAAW;QACnC,OAAO,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAA;IACzC,CAAC;IAEM,YAAY,CAAE,IAAW,EAAE,MAAa;QAC9C,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IAC7C,CAAC;IAEM,OAAO,CAAE,IAAW;QAC1B,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IAChC,CAAC;IAEM,SAAS,CAAE,IAAW;QAC5B,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAClC,CAAC;IAEM,WAAW,CAAE,QAAe,EAAE,QAAgB;QACpD,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;IAClD,CAAC;IAEM,WAAW,CAAE,IAAY;QAC/B,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;IACpC,CAAC;IAEM,QAAQ,CAAE,IAAY,EAAE,WAAmB;QACjD,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;IAC9C,CAAC;IAEM,MAAM,CAAE,IAAW;QACzB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAC/B,CAAC;IAEM,UAAU,CAAE,IAAW;QAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;IACnC,CAAC;IAEM,UAAU,CAAE,IAAW,EAAE,QAAgB;QAC/C,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;IAC7C,CAAC;IAEM,UAAU,CAAE,IAAW;QAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;IACnC,CAAC;IAED,IAAW,YAAY;QACtB,OAAO,IAAI,CAAC,aAAa,CAAC,YAAY,CAAA;IACvC,CAAC;IAEM,UAAU,CAAE,GAAU;QAC5B,OAAO,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;IAC1C,CAAC;IAED;;;;OAIG;IACI,UAAU,CAAE,UAAkB;QACpC,OAAO,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,UAAU,CAAC,CAAA;IACjD,CAAC;IAED;;;;OAIG;IACI,IAAI,CAAE,UAAkB;QAC9B,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IAC3C,CAAC;IAEM,KAAK,CAAE,UAAkB,EAAE,GAAW;QAC5C,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,UAAU,EAAE,GAAG,CAAC,CAAA;IACjD,CAAC;IAEM,KAAK,CAAE,MAAc,EAAE,GAAW;QACxC,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC7C,CAAC;IAED;;;;;;OAMG;IACI,IAAI,CAAE,UAAkB,EAAE,IAAU,EAAE,OAAqB;QACjE,MAAM,OAAO,GAAG,IAAI,gBAAO,CAAC,IAAI,aAAI,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;QAC1E,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;IAC/C,CAAC;IAED;;;OAGG;IACI,SAAS,CAAE,UAAkB,EAAE,OAAY,EAAE,EAAE,OAAqB;QAC1E,MAAM,OAAO,GAAG,IAAI,gBAAO,CAAC,IAAI,aAAI,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;QAC1E,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;IACpD,CAAC;IAEM,OAAO,CAAE,IAAY,EAAE,OAAY,EAAE,EAAE,OAAqB;QAClE,MAAM,OAAO,GAAG,IAAI,gBAAO,CAAC,IAAI,aAAI,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;QAC1E,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;IAC5C,CAAC;IAEM,UAAU,CAAE,GAAW,EAAE,SAA8B;QAC7D,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;QACjD,OAAO,IAAI,CAAA;IACZ,CAAC;IAEM,UAAU,CAAE,GAAW;QAC7B,OAAO,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;IAC9C,CAAC;IAEM,OAAO,CAAE,MAAW,EAAE,IAAW;QACvC,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACpD,CAAC;IAED,4BAA4B;IACrB,SAAS,CAAE,QAAuB;QACxC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;IAClC,CAAC;IAEM,WAAW,CAAE,QAAuB;QAC1C,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;IACpC,CAAC;CACD;AAjMD,0CAiMC"}
|
|
@@ -7,5 +7,7 @@ export declare class ExecutorImpl implements Executor {
|
|
|
7
7
|
eval(expression: string, context: Context): any;
|
|
8
8
|
evalAsync(expression: string, context: Context): Promise<any>;
|
|
9
9
|
execute(expression: string, context: Context): Promise<any>;
|
|
10
|
+
/** `return` ends the expression with its value; `break`/`continue` outside a loop are errors; anything else is rethrown. */
|
|
11
|
+
private solveSignal;
|
|
10
12
|
}
|
|
11
13
|
//# sourceMappingURL=executor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/expression/application/useCases/executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/expression/application/useCases/executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAA6C,MAAM,wBAAwB,CAAA;AAC3F,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AAEvD,qBAAa,YAAa,YAAW,QAAQ;IAE/B,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAC,aAAa;IAE5C,IAAI,CAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAC,OAAO,GAAG,GAAG;IASzC,SAAS,CAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAS7D,OAAO,CAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAKxE,4HAA4H;IAC5H,OAAO,CAAC,WAAW;CAMnB"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ExecutorImpl = void 0;
|
|
4
|
+
const domain_1 = require("../../../shared/domain");
|
|
4
5
|
class ExecutorImpl {
|
|
5
6
|
// eslint-disable-next-line no-useless-constructor
|
|
6
7
|
constructor(operand) {
|
|
@@ -8,16 +9,36 @@ class ExecutorImpl {
|
|
|
8
9
|
}
|
|
9
10
|
eval(expression, context) {
|
|
10
11
|
const operand = this.operand.build(expression, 'expression');
|
|
11
|
-
|
|
12
|
+
try {
|
|
13
|
+
return operand.eval(context);
|
|
14
|
+
}
|
|
15
|
+
catch (error) {
|
|
16
|
+
return this.solveSignal(error);
|
|
17
|
+
}
|
|
12
18
|
}
|
|
13
19
|
async evalAsync(expression, context) {
|
|
14
20
|
const operand = this.operand.build(expression, 'expression');
|
|
15
|
-
|
|
21
|
+
try {
|
|
22
|
+
return await operand.evalAsync(context);
|
|
23
|
+
}
|
|
24
|
+
catch (error) {
|
|
25
|
+
return this.solveSignal(error);
|
|
26
|
+
}
|
|
16
27
|
}
|
|
17
28
|
async execute(expression, context) {
|
|
18
29
|
const operand = this.operand.build(expression, 'task');
|
|
19
30
|
return operand.evalAsync(context);
|
|
20
31
|
}
|
|
32
|
+
/** `return` ends the expression with its value; `break`/`continue` outside a loop are errors; anything else is rethrown. */
|
|
33
|
+
solveSignal(error) {
|
|
34
|
+
if (error instanceof domain_1.ReturnSignal)
|
|
35
|
+
return error.value;
|
|
36
|
+
if (error instanceof domain_1.BreakSignal)
|
|
37
|
+
throw new Error('break outside a loop');
|
|
38
|
+
if (error instanceof domain_1.ContinueSignal)
|
|
39
|
+
throw new Error('continue outside a loop');
|
|
40
|
+
throw error;
|
|
41
|
+
}
|
|
21
42
|
}
|
|
22
43
|
exports.ExecutorImpl = ExecutorImpl;
|
|
23
44
|
//# sourceMappingURL=executor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../src/lib/expression/application/useCases/executor.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../src/lib/expression/application/useCases/executor.ts"],"names":[],"mappings":";;;AAAA,mDAA2F;AAI3F,MAAa,YAAY;IACxB,kDAAkD;IAClD,YAA8B,OAAqB;QAArB,YAAO,GAAP,OAAO,CAAc;IAAG,CAAC;IAEhD,IAAI,CAAE,UAAkB,EAAE,OAAe;QAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,YAAY,CAAC,CAAA;QAC5D,IAAI,CAAC;YACJ,OAAO,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAC7B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;QAC/B,CAAC;IACF,CAAC;IAEM,KAAK,CAAC,SAAS,CAAE,UAAkB,EAAE,OAAe;QAC1D,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,YAAY,CAAC,CAAA;QAC5D,IAAI,CAAC;YACJ,OAAO,MAAM,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;QACxC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;QAC/B,CAAC;IACF,CAAC;IAEM,KAAK,CAAC,OAAO,CAAE,UAAkB,EAAE,OAAe;QACxD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;QACtD,OAAO,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;IAClC,CAAC;IAED,4HAA4H;IACpH,WAAW,CAAE,KAAU;QAC9B,IAAI,KAAK,YAAY,qBAAY;YAAE,OAAO,KAAK,CAAC,KAAK,CAAA;QACrD,IAAI,KAAK,YAAY,oBAAW;YAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;QACzE,IAAI,KAAK,YAAY,uBAAc;YAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;QAC/E,MAAM,KAAK,CAAA;IACZ,CAAC;CACD;AAlCD,oCAkCC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { OperandFacade } from '../../operand/domain';
|
|
2
2
|
import { ModelService } from '../../model/domain';
|
|
3
|
-
import { ActionObserver } from '../../shared/domain';
|
|
3
|
+
import { ActionObserver, EvalOptions } from '../../shared/domain';
|
|
4
4
|
export interface Executor {
|
|
5
|
-
eval(expression: string, data?: any): any;
|
|
6
|
-
evalAsync(expression: string, data?: any): Promise<any>;
|
|
7
|
-
execute(task: string, data?: any): Promise<any>;
|
|
5
|
+
eval(expression: string, data?: any, options?: EvalOptions): any;
|
|
6
|
+
evalAsync(expression: string, data?: any, options?: EvalOptions): Promise<any>;
|
|
7
|
+
execute(task: string, data?: any, options?: EvalOptions): Promise<any>;
|
|
8
8
|
}
|
|
9
9
|
export interface ExpressionListener {
|
|
10
10
|
subscribe(observer: ActionObserver): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expressions.d.ts","sourceRoot":"","sources":["../../../../../src/lib/expression/domain/expressions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"expressions.d.ts","sourceRoot":"","sources":["../../../../../src/lib/expression/domain/expressions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAEjE,MAAM,WAAW,QAAQ;IACxB,IAAI,CAAE,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,GAAG,CAAA;IACjE,SAAS,CAAE,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;IAC/E,OAAO,CAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;CACvE;AAED,MAAM,WAAW,kBAAkB;IAClC,SAAS,CAAE,QAAQ,EAAC,cAAc,GAAE,IAAI,CAAA;IACxC,WAAW,CAAE,QAAQ,EAAC,cAAc,GAAG,IAAI,CAAA;CAC3C;AAED,MAAM,WAAW,mBAAmB;IACnC,OAAO,CAAC,MAAM,EAAC,GAAG,GAAE,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CACjC;AACD,MAAM,WAAW,iBAAiB;IACjC,UAAU,CAAE,GAAG,EAAC,MAAM,EAAE,SAAS,EAAC,mBAAmB,GAAG,iBAAiB,CAAA;IACzE,UAAU,CAAE,GAAG,EAAC,MAAM,GAAE,mBAAmB,CAAA;IAC3C,OAAO,CAAE,MAAM,EAAC,GAAG,EAAE,IAAI,EAAC,MAAM,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAChD;AACD,MAAM,WAAW,WAAY,SAAQ,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,iBAAiB,EAAE,kBAAkB;CAAG;AAEpH,MAAM,WAAW,gBAAgB;IAChC,KAAK,EAAE,YAAY,CAAA;IACnB,iBAAiB,EAAC,iBAAiB,CAAA;IACnC,aAAa,EAAC,aAAa,CAAA;IAC3B,QAAQ,EAAC,QAAQ,CAAA;CACjB"}
|
|
@@ -13,7 +13,7 @@ class ExpressionConvertFunction {
|
|
|
13
13
|
* @param lambda lambda expression
|
|
14
14
|
* @returns Expression manager
|
|
15
15
|
*/
|
|
16
|
-
// eslint-disable-next-line @typescript-eslint/
|
|
16
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
|
|
17
17
|
convert(func) {
|
|
18
18
|
if (!func) {
|
|
19
19
|
throw new Error('empty lambda function}');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convertFromFunction.js","sourceRoot":"","sources":["../../../../../../src/lib/expression/infrastructure/convertFrom/convertFromFunction.ts"],"names":[],"mappings":";;;AAEA,mDAAoD;AAGpD,MAAa,yBAAyB;IACrC,kDAAkD;IAClD,YAA8B,cAA6B,EAAmB,MAAgB;QAAhE,mBAAc,GAAd,cAAc,CAAe;QAAmB,WAAM,GAAN,MAAM,CAAU;IAAG,CAAC;IAElG;;;;OAIG;IACH,
|
|
1
|
+
{"version":3,"file":"convertFromFunction.js","sourceRoot":"","sources":["../../../../../../src/lib/expression/infrastructure/convertFrom/convertFromFunction.ts"],"names":[],"mappings":";;;AAEA,mDAAoD;AAGpD,MAAa,yBAAyB;IACrC,kDAAkD;IAClD,YAA8B,cAA6B,EAAmB,MAAgB;QAAhE,mBAAc,GAAd,cAAc,CAAe;QAAmB,WAAM,GAAN,MAAM,CAAU;IAAG,CAAC;IAElG;;;;OAIG;IACH,sEAAsE;IAC/D,OAAO,CAAE,IAAc;QAC7B,IAAI,CAAC,IAAI,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;QAC1C,CAAC;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QAC3D,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;QACrD,IAAI,GAAG,GAAG,OAAO,CAAA;QACjB,OAAO,GAAG,CAAC,IAAI,KAAK,oBAAW,CAAC,GAAG,EAAE,CAAC;YACrC,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7B,GAAG,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;YACtB,CAAC;QACF,CAAC;QACD,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC5B,+DAA+D;YAC/D,2EAA2E;YAC3E,MAAM,KAAK,GAAY,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC1C,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC/B,sCAAsC;gBACtC,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,EAAE,CAAC,CAAA;gBACrD,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;YAC3B,CAAC;QACF,CAAC;QACD,qDAAqD;QACrD,iEAAiE;QACjE,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,CAAA;IAC/B,CAAC;CACD;AApCD,8DAoCC"}
|
|
@@ -6,7 +6,7 @@ class ExpressionHelper {
|
|
|
6
6
|
constructor(str) {
|
|
7
7
|
this.str = str;
|
|
8
8
|
}
|
|
9
|
-
// eslint-disable-next-line @typescript-eslint/
|
|
9
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
|
|
10
10
|
clearLambda(func) {
|
|
11
11
|
let str = func.toString().trim();
|
|
12
12
|
let index = str.indexOf('=>') + 2;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../../../src/lib/expression/infrastructure/helper.ts"],"names":[],"mappings":";;;AAEA,MAAa,gBAAgB;IAC5B,kDAAkD;IAClD,YAA8B,GAAiB;QAAjB,QAAG,GAAH,GAAG,CAAc;IAAG,CAAC;IAEnD,
|
|
1
|
+
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../../../src/lib/expression/infrastructure/helper.ts"],"names":[],"mappings":";;;AAEA,MAAa,gBAAgB;IAC5B,kDAAkD;IAClD,YAA8B,GAAiB;QAAjB,QAAG,GAAH,GAAG,CAAc;IAAG,CAAC;IAEnD,sEAAsE;IAC/D,WAAW,CAAE,IAAa;QAChC,IAAI,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAA;QAChC,IAAI,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACjC,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAA;QAC7C,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QACxB,IAAI,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC;YAChB,8BAA8B;YAC9B,MAAM,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,IAAI,EAAE,CAAA;YAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC7B,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtB,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,EAAE,CAAC,CAAA;YACjD,CAAC;QACF,CAAC;aAAM,CAAC;YACP,wBAAwB;YACxB,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC5B,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtB,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,EAAE,CAAC,CAAA;YACjD,CAAC;QACF,CAAC;QACD,OAAO,GAAG,CAAA;IACX,CAAC;CACD;AA1BD,4CA0BC"}
|
|
@@ -299,12 +299,12 @@ class CoreLibrary {
|
|
|
299
299
|
model.addFunction('curTime():time', () => {
|
|
300
300
|
const d = new Date();
|
|
301
301
|
return `${String(d.getHours()).padStart(2, '0')}:${String(d.getMinutes()).padStart(2, '0')}:${String(d.getSeconds()).padStart(2, '0')}`;
|
|
302
|
-
}, { description: 'Current time' });
|
|
302
|
+
}, { deterministic: false, description: 'Current time' });
|
|
303
303
|
model.addFunction('today():date', () => {
|
|
304
304
|
const d = new Date();
|
|
305
305
|
return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
|
|
306
|
-
}, { description: 'Current date' });
|
|
307
|
-
model.addFunction('now():dateTime', () => new Date().toISOString(), { description: 'Current date time' });
|
|
306
|
+
}, { deterministic: false, description: 'Current date' });
|
|
307
|
+
model.addFunction('now():dateTime', () => new Date().toISOString(), { deterministic: false, description: 'Current date time' });
|
|
308
308
|
model.addFunction('time(value: string):time', (value) => {
|
|
309
309
|
const d = new Date(value);
|
|
310
310
|
return `${String(d.getHours()).padStart(2, '0')}:${String(d.getMinutes()).padStart(2, '0')}:${String(d.getSeconds()).padStart(2, '0')}`;
|
|
@@ -501,7 +501,7 @@ class CoreLibrary {
|
|
|
501
501
|
const d = new Date(year, 0, dayOfYear);
|
|
502
502
|
return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
|
|
503
503
|
}, { description: 'Create date from year and day-of-year' });
|
|
504
|
-
model.addFunction('unixTimestamp(date?:dateTime):integer', (date) => Math.floor((date ? new Date(date) : new Date()).getTime() / 1000), { description: 'Unix timestamp in seconds' });
|
|
504
|
+
model.addFunction('unixTimestamp(date?:dateTime):integer', (date) => Math.floor((date ? new Date(date) : new Date()).getTime() / 1000), { deterministic: false, description: 'Unix timestamp in seconds' });
|
|
505
505
|
model.addFunction('fromUnixTime(ts:integer):dateTime', (ts) => new Date(ts * 1000).toISOString(), { description: 'Date from Unix timestamp' });
|
|
506
506
|
model.addFunction('age(date1:dateTime,date2?:dateTime):string', (date1, date2) => {
|
|
507
507
|
const d1 = new Date(date1);
|
|
@@ -518,7 +518,7 @@ class CoreLibrary {
|
|
|
518
518
|
months += 12;
|
|
519
519
|
}
|
|
520
520
|
return `${years} years ${months} months ${days} days`;
|
|
521
|
-
}, { description: 'Age between two dates as text' });
|
|
521
|
+
}, { deterministic: false, description: 'Age between two dates as text' });
|
|
522
522
|
}
|
|
523
523
|
arrayFunctions(model) {
|
|
524
524
|
model.addFunction('map(list: any[], predicate: T):T[]', new MapEval(this.builder, this.cloner, this.helper), { description: 'Map' });
|