3xpr 1.14.0 → 1.15.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/README.md +1 -1
- package/expression/application/expressions.d.ts +4 -3
- package/expression/application/expressions.js +8 -4
- package/expression/application/expressions.js.map +1 -1
- package/expression/application/index.d.ts +2 -2
- package/expression/application/index.js +2 -2
- package/expression/application/useCases/convert.js.map +1 -1
- package/expression/application/useCases/{evaluate.d.ts → executor.d.ts} +3 -2
- package/expression/application/useCases/executor.js +23 -0
- package/expression/application/useCases/executor.js.map +1 -0
- package/expression/application/useCases/{evaluateObserveDecorator.d.ts → executorObserveDecorator.d.ts} +5 -4
- package/expression/application/useCases/{evaluateObserveDecorator.js → executorObserveDecorator.js} +20 -8
- package/expression/application/useCases/executorObserveDecorator.js.map +1 -0
- package/expression/domain/expressions.d.ts +4 -3
- package/expression/infrastructure/convertFrom/convertFromFunction.js.map +1 -1
- package/expression/infrastructure/convertFrom/convertFromGraphql.js.map +1 -1
- package/expression/infrastructure/expressionsBuilder.js +3 -3
- package/expression/infrastructure/expressionsBuilder.js.map +1 -1
- package/expression/infrastructure/helper.js.map +1 -1
- package/expression/infrastructure/library.js +462 -19
- package/expression/infrastructure/library.js.map +1 -1
- package/model/application/modelService.js +4 -2
- package/model/application/modelService.js.map +1 -1
- package/operand/application/facade.js +4 -4
- package/operand/application/facade.js.map +1 -1
- package/operand/application/services/builderCacheDecorator.js.map +1 -1
- package/operand/application/services/factory.js.map +1 -1
- package/operand/application/services/normalizer.js.map +1 -1
- package/operand/application/services/parameterService.js.map +1 -1
- package/operand/application/services/parser.js.map +1 -1
- package/operand/application/services/serializer.js.map +1 -1
- package/operand/application/services/typeService.js.map +1 -1
- package/operand/application/useCases/build.js +1 -1
- package/operand/application/useCases/build.js.map +1 -1
- package/operand/application/useCases/clone.js.map +1 -1
- package/operand/application/useCases/complete.js.map +1 -1
- package/operand/application/useCases/normalize.js.map +1 -1
- package/operand/application/useCases/reduce.js.map +1 -1
- package/operand/domain/entities.d.ts +7 -0
- package/operand/domain/entities.js +14 -0
- package/operand/domain/entities.js.map +1 -1
- package/operand/infrastructure/constBuilder.js +2 -2
- package/operand/infrastructure/constBuilder.js.map +1 -1
- package/operand/infrastructure/{evaluators/sync.d.ts → executors/expression.d.ts} +11 -1
- package/operand/infrastructure/{evaluators/sync.js → executors/expression.js} +142 -7
- package/operand/infrastructure/executors/expression.js.map +1 -0
- package/operand/infrastructure/{evaluators/async.d.ts → executors/task.d.ts} +1 -1
- package/operand/infrastructure/{evaluators/async.js → executors/task.js} +96 -87
- package/operand/infrastructure/executors/task.js.map +1 -0
- package/operand/infrastructure/facadeBuilder.js +7 -6
- package/operand/infrastructure/facadeBuilder.js.map +1 -1
- package/operand/infrastructure/helper.js.map +1 -1
- package/package.json +1 -1
- package/shared/domain/context.js.map +1 -1
- package/shared/domain/operand.d.ts +4 -0
- package/shared/domain/operand.js +15 -0
- package/shared/domain/operand.js.map +1 -1
- package/expression/application/useCases/evaluate.js +0 -19
- package/expression/application/useCases/evaluate.js.map +0 -1
- package/expression/application/useCases/evaluateObserveDecorator.js.map +0 -1
- package/operand/infrastructure/evaluators/async.js.map +0 -1
- package/operand/infrastructure/evaluators/sync.js.map +0 -1
package/README.md
CHANGED
|
@@ -108,7 +108,7 @@ while (p=timezones.pop()) {
|
|
|
108
108
|
|
|
109
109
|
- [typ3s](https://www.npmjs.com/package/typ3s)
|
|
110
110
|
- [jexp](https://www.npmjs.com/package/jexp)
|
|
111
|
-
- [lambdaorm](https://
|
|
111
|
+
- [lambdaorm](https://www.npmjs.com/package/lambdaorm)
|
|
112
112
|
|
|
113
113
|
## Documentation
|
|
114
114
|
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { ModelService, Library } from '../../model/domain';
|
|
2
2
|
import { Operand, Parameter, Format, ActionObserver } from '../../shared/domain';
|
|
3
3
|
import { OperatorMetadata, FunctionAdditionalInfo, OperatorAdditionalInfo, ConstBuilder, OperandFacade, OperandBuilder } from '../../operand/domain';
|
|
4
|
-
import { ExpressionConvert, ExpressionConverter,
|
|
4
|
+
import { ExpressionConvert, ExpressionConverter, Executor, ExpressionListener, Expressions } from '../domain';
|
|
5
5
|
export declare class ExpressionsImpl implements Expressions {
|
|
6
6
|
private readonly model;
|
|
7
7
|
private readonly expressionConvert;
|
|
8
8
|
private readonly operandFacade;
|
|
9
|
-
private readonly
|
|
9
|
+
private readonly executor;
|
|
10
10
|
private readonly listener;
|
|
11
|
-
constructor(model: ModelService, expressionConvert: ExpressionConvert, operandFacade: OperandFacade,
|
|
11
|
+
constructor(model: ModelService, expressionConvert: ExpressionConvert, operandFacade: OperandFacade, executor: Executor, listener: ExpressionListener);
|
|
12
12
|
get operatorAlias(): [string, any][];
|
|
13
13
|
get functionAlias(): [string, any][];
|
|
14
14
|
get operators(): [string, OperatorMetadata][];
|
|
@@ -59,6 +59,7 @@ export declare class ExpressionsImpl implements Expressions {
|
|
|
59
59
|
*/
|
|
60
60
|
eval(expression: string, data?: any): any;
|
|
61
61
|
evalAsync(expression: string, data?: any): Promise<any>;
|
|
62
|
+
execute(task: string, data?: any): Promise<any>;
|
|
62
63
|
addConvert(key: string, converter: ExpressionConverter): ExpressionConvert;
|
|
63
64
|
getConvert(key: string): ExpressionConverter;
|
|
64
65
|
convert(source: any, from: string): [string, any];
|
|
@@ -4,11 +4,11 @@ exports.ExpressionsImpl = void 0;
|
|
|
4
4
|
const domain_1 = require("../../shared/domain");
|
|
5
5
|
class ExpressionsImpl {
|
|
6
6
|
// eslint-disable-next-line no-useless-constructor
|
|
7
|
-
constructor(model, expressionConvert, operandFacade,
|
|
7
|
+
constructor(model, expressionConvert, operandFacade, executor, listener) {
|
|
8
8
|
this.model = model;
|
|
9
9
|
this.expressionConvert = expressionConvert;
|
|
10
10
|
this.operandFacade = operandFacade;
|
|
11
|
-
this.
|
|
11
|
+
this.executor = executor;
|
|
12
12
|
this.listener = listener;
|
|
13
13
|
}
|
|
14
14
|
get operatorAlias() {
|
|
@@ -125,11 +125,15 @@ class ExpressionsImpl {
|
|
|
125
125
|
*/
|
|
126
126
|
eval(expression, data) {
|
|
127
127
|
const context = new domain_1.Context(new domain_1.Data(data));
|
|
128
|
-
return this.
|
|
128
|
+
return this.executor.eval(expression, context);
|
|
129
129
|
}
|
|
130
130
|
evalAsync(expression, data = {}) {
|
|
131
131
|
const context = new domain_1.Context(new domain_1.Data(data));
|
|
132
|
-
return this.
|
|
132
|
+
return this.executor.evalAsync(expression, context);
|
|
133
|
+
}
|
|
134
|
+
execute(task, data = {}) {
|
|
135
|
+
const context = new domain_1.Context(new domain_1.Data(data));
|
|
136
|
+
return this.executor.execute(task, context);
|
|
133
137
|
}
|
|
134
138
|
addConvert(key, converter) {
|
|
135
139
|
this.expressionConvert.addConvert(key, converter);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expressions.js","sourceRoot":"","sources":["../../../../src/lib/expression/application/expressions.ts"],"names":[],"mappings":";;;AACA,gDAA+F;AAI/F,MAAa,eAAe;IAC3B,kDAAkD;IAClD,YAA8B,KAAmB,EAC/B,iBAAmC,EACnC,aAA2B,EAC3B,
|
|
1
|
+
{"version":3,"file":"expressions.js","sourceRoot":"","sources":["../../../../src/lib/expression/application/expressions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
export * from './useCases/
|
|
2
|
-
export * from './useCases/
|
|
1
|
+
export * from './useCases/executor';
|
|
2
|
+
export * from './useCases/executorObserveDecorator';
|
|
3
3
|
export * from './expressions';
|
|
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./useCases/
|
|
18
|
-
__exportStar(require("./useCases/
|
|
17
|
+
__exportStar(require("./useCases/executor"), exports);
|
|
18
|
+
__exportStar(require("./useCases/executorObserveDecorator"), exports);
|
|
19
19
|
__exportStar(require("./expressions"), exports);
|
|
20
20
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert.js","sourceRoot":"","sources":["../../../../../src/lib/expression/application/useCases/convert.ts"],"names":[],"mappings":";;;AAEA,gDAAgD;AAChD,MAAa,oBAAoB;IAAjC;QACS,aAAQ,GAAO,EAAE,CAAA;IAkB1B,CAAC;IAhBO,UAAU,CAAE,GAAU,EAAE,SAA6B;QAC3D,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,SAAS,CAAA;QAC9B,OAAO,IAAI,CAAA;IACZ,CAAC;IAEM,UAAU,CAAE,GAAU;QAC5B,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAwB,CAAA;IACjD,CAAC;IAEM,OAAO,CAAE,MAAU,EAAE,IAAW;QACtC,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QACvC,IAAI,SAAS,KAAK,SAAS,EAAE;
|
|
1
|
+
{"version":3,"file":"convert.js","sourceRoot":"","sources":["../../../../../src/lib/expression/application/useCases/convert.ts"],"names":[],"mappings":";;;AAEA,gDAAgD;AAChD,MAAa,oBAAoB;IAAjC;QACS,aAAQ,GAAO,EAAE,CAAA;IAkB1B,CAAC;IAhBO,UAAU,CAAE,GAAU,EAAE,SAA6B;QAC3D,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,SAAS,CAAA;QAC9B,OAAO,IAAI,CAAA;IACZ,CAAC;IAEM,UAAU,CAAE,GAAU;QAC5B,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAwB,CAAA;IACjD,CAAC;IAEM,OAAO,CAAE,MAAU,EAAE,IAAW;QACtC,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QACvC,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,aAAa,IAAI,kBAAkB,CAAC,CAAA;QACrD,CAAC;QACD,OAAO,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACjC,CAAC;CACD;AAnBD,oDAmBC"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { Context } from '../../../shared/domain';
|
|
2
|
-
import {
|
|
2
|
+
import { Executor } from '../../domain';
|
|
3
3
|
import { OperandFacade } from '../../../operand/domain';
|
|
4
|
-
export declare class
|
|
4
|
+
export declare class ExecutorImpl implements Executor {
|
|
5
5
|
private readonly operand;
|
|
6
6
|
constructor(operand: OperandFacade);
|
|
7
7
|
eval(expression: string, context: Context): any;
|
|
8
8
|
evalAsync(expression: string, context: Context): Promise<any>;
|
|
9
|
+
execute(expression: string, context: Context): Promise<any>;
|
|
9
10
|
}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ExecutorImpl = void 0;
|
|
4
|
+
class ExecutorImpl {
|
|
5
|
+
// eslint-disable-next-line no-useless-constructor
|
|
6
|
+
constructor(operand) {
|
|
7
|
+
this.operand = operand;
|
|
8
|
+
}
|
|
9
|
+
eval(expression, context) {
|
|
10
|
+
const operand = this.operand.build(expression, 'expression');
|
|
11
|
+
return operand.eval(context);
|
|
12
|
+
}
|
|
13
|
+
async evalAsync(expression, context) {
|
|
14
|
+
const operand = this.operand.build(expression, 'expression');
|
|
15
|
+
return operand.evalAsync(context);
|
|
16
|
+
}
|
|
17
|
+
async execute(expression, context) {
|
|
18
|
+
const operand = this.operand.build(expression, 'task');
|
|
19
|
+
return operand.evalAsync(context);
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
exports.ExecutorImpl = ExecutorImpl;
|
|
23
|
+
//# sourceMappingURL=executor.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../src/lib/expression/application/useCases/executor.ts"],"names":[],"mappings":";;;AAIA,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,OAAO,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC7B,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,OAAO,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;IAClC,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;CACD;AAlBD,oCAkBC"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { Context, ActionObserver } from '../../../shared/domain';
|
|
2
|
-
import {
|
|
3
|
-
export declare class
|
|
4
|
-
private readonly
|
|
2
|
+
import { Executor, ExpressionListener } from '../../domain';
|
|
3
|
+
export declare class ExecutorObserveDecorator implements Executor, ExpressionListener {
|
|
4
|
+
private readonly executor;
|
|
5
5
|
private observers;
|
|
6
|
-
constructor(
|
|
6
|
+
constructor(executor: Executor);
|
|
7
7
|
eval(expression: string, context: Context): any;
|
|
8
8
|
evalAsync(expression: string, context: Context): Promise<any>;
|
|
9
|
+
execute(task: string, context: Context): Promise<any>;
|
|
9
10
|
subscribe(observer: ActionObserver): void;
|
|
10
11
|
unsubscribe(observer: ActionObserver): void;
|
|
11
12
|
private beforeExecutionNotify;
|
package/expression/application/useCases/{evaluateObserveDecorator.js → executorObserveDecorator.js}
RENAMED
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
class
|
|
3
|
+
exports.ExecutorObserveDecorator = void 0;
|
|
4
|
+
class ExecutorObserveDecorator {
|
|
5
5
|
// eslint-disable-next-line no-useless-constructor
|
|
6
|
-
constructor(
|
|
7
|
-
this.
|
|
6
|
+
constructor(executor) {
|
|
7
|
+
this.executor = executor;
|
|
8
8
|
this.observers = [];
|
|
9
9
|
}
|
|
10
10
|
eval(expression, context) {
|
|
11
11
|
try {
|
|
12
12
|
this.beforeExecutionNotify(expression, context);
|
|
13
|
-
const result = this.
|
|
13
|
+
const result = this.executor.eval(expression, context);
|
|
14
14
|
this.afterExecutionNotify(expression, context, result);
|
|
15
15
|
return result;
|
|
16
16
|
}
|
|
@@ -22,7 +22,7 @@ class ExpressionEvaluateObserveDecorator {
|
|
|
22
22
|
async evalAsync(expression, context) {
|
|
23
23
|
try {
|
|
24
24
|
this.beforeExecutionNotify(expression, context);
|
|
25
|
-
const result = await this.
|
|
25
|
+
const result = await this.executor.evalAsync(expression, context);
|
|
26
26
|
this.afterExecutionNotify(expression, context, result);
|
|
27
27
|
return result;
|
|
28
28
|
}
|
|
@@ -31,6 +31,18 @@ class ExpressionEvaluateObserveDecorator {
|
|
|
31
31
|
throw error;
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
|
+
async execute(task, context) {
|
|
35
|
+
try {
|
|
36
|
+
this.beforeExecutionNotify(task, context);
|
|
37
|
+
const result = await this.executor.execute(task, context);
|
|
38
|
+
this.afterExecutionNotify(task, context, result);
|
|
39
|
+
return result;
|
|
40
|
+
}
|
|
41
|
+
catch (error) {
|
|
42
|
+
this.errorExecutionNotify(task, context, error);
|
|
43
|
+
throw error;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
34
46
|
// Listeners and subscribers
|
|
35
47
|
subscribe(observer) {
|
|
36
48
|
this.observers.push(observer);
|
|
@@ -82,5 +94,5 @@ class ExpressionEvaluateObserveDecorator {
|
|
|
82
94
|
});
|
|
83
95
|
}
|
|
84
96
|
}
|
|
85
|
-
exports.
|
|
86
|
-
//# sourceMappingURL=
|
|
97
|
+
exports.ExecutorObserveDecorator = ExecutorObserveDecorator;
|
|
98
|
+
//# sourceMappingURL=executorObserveDecorator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"executorObserveDecorator.js","sourceRoot":"","sources":["../../../../../src/lib/expression/application/useCases/executorObserveDecorator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { OperandFacade } from '../../operand/domain';
|
|
2
2
|
import { ModelService } from '../../model/domain';
|
|
3
3
|
import { ActionObserver } from '../../shared/domain';
|
|
4
|
-
export interface
|
|
4
|
+
export interface Executor {
|
|
5
5
|
eval(expression: string, data?: any): any;
|
|
6
6
|
evalAsync(expression: string, data?: any): Promise<any>;
|
|
7
|
+
execute(task: string, data?: any): Promise<any>;
|
|
7
8
|
}
|
|
8
9
|
export interface ExpressionListener {
|
|
9
10
|
subscribe(observer: ActionObserver): void;
|
|
@@ -17,11 +18,11 @@ export interface ExpressionConvert {
|
|
|
17
18
|
getConvert(key: string): ExpressionConverter;
|
|
18
19
|
convert(source: any, from: string): [string, any];
|
|
19
20
|
}
|
|
20
|
-
export interface Expressions extends ModelService,
|
|
21
|
+
export interface Expressions extends ModelService, Executor, OperandFacade, ExpressionConvert, ExpressionListener {
|
|
21
22
|
}
|
|
22
23
|
export interface ExpressionConfig {
|
|
23
24
|
model: ModelService;
|
|
24
25
|
expressionConvert: ExpressionConvert;
|
|
25
26
|
operandFacade: OperandFacade;
|
|
26
|
-
|
|
27
|
+
executor: Executor;
|
|
27
28
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convertFromFunction.js","sourceRoot":"","sources":["../../../../../src/lib/expression/infrastructure/convertFrom/convertFromFunction.ts"],"names":[],"mappings":";;;AAAA,gCAAsD;AAEtD,mDAAoD;AAEpD,MAAa,yBAAyB;IACrC,kDAAkD;IAClD,YAA8B,cAA6B;QAA7B,mBAAc,GAAd,cAAc,CAAe;IAAG,CAAC;IAE/D;;;;OAIG;IACH,wDAAwD;IACjD,OAAO,CAAE,IAAc;QAC7B,IAAI,CAAC,IAAI,EAAE;
|
|
1
|
+
{"version":3,"file":"convertFromFunction.js","sourceRoot":"","sources":["../../../../../src/lib/expression/infrastructure/convertFrom/convertFromFunction.ts"],"names":[],"mappings":";;;AAAA,gCAAsD;AAEtD,mDAAoD;AAEpD,MAAa,yBAAyB;IACrC,kDAAkD;IAClD,YAA8B,cAA6B;QAA7B,mBAAc,GAAd,cAAc,CAAe;IAAG,CAAC;IAE/D;;;;OAIG;IACH,wDAAwD;IACjD,OAAO,CAAE,IAAc;QAC7B,IAAI,CAAC,IAAI,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;QAC1C,CAAC;QACD,MAAM,UAAU,GAAG,UAAM,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QACtD,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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convertFromGraphql.js","sourceRoot":"","sources":["../../../../../src/lib/expression/infrastructure/convertFrom/convertFromGraphql.ts"],"names":[],"mappings":";;;AAAA,+BAA2B;AAG3B,MAAa,wBAAwB;IAC7B,OAAO,CAAE,MAAW;QAC1B,OAAO,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAA;IACzC,CAAC;CACD;AAJD,4DAIC;AAED,MAAM,aAAa;IAMlB,YAAa,MAAc;QAC1B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QAC9B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAA;QAChC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAA;QACd,IAAI,CAAC,UAAU,GAAG,EAAE,CAAA;QACpB,IAAI,CAAC,OAAO,GAAG,EAAE,CAAA;IAClB,CAAC;IAED,IAAY,GAAG;QACd,OAAO,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,CAAA;IACjC,CAAC;IAED,IAAY,OAAO;QAClB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IAC/B,CAAC;IAEM,KAAK;QACX,IAAI,CAAC,IAAI,EAAE,CAAA;QACX,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;IAChD,CAAC;IAEO,IAAI,CAAE,KAAK,GAAG,CAAC,EAAE,MAAM,GAAG,EAAE,EAAE,MAAM,GAAG,EAAE;QAChD,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE;
|
|
1
|
+
{"version":3,"file":"convertFromGraphql.js","sourceRoot":"","sources":["../../../../../src/lib/expression/infrastructure/convertFrom/convertFromGraphql.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,10 +17,10 @@ class ExpressionsBuilder {
|
|
|
17
17
|
const model = new application_2.ModelServiceImpl();
|
|
18
18
|
const operandFacade = new infrastructure_1.OperandFacadeBuilder(model, this.helper).build();
|
|
19
19
|
const expressionConvert = new convert_1.ExpressionConvertImp()
|
|
20
|
-
.addConvert('function', new convertFromFunction_1.ExpressionConvertFunction(operandFacade.getBuilder('
|
|
20
|
+
.addConvert('function', new convertFromFunction_1.ExpressionConvertFunction(operandFacade.getBuilder('expression')))
|
|
21
21
|
.addConvert('graphql', new convertFromGraphql_1.ExpressionConvertGraphql());
|
|
22
|
-
new library_1.CoreLibrary(operandFacade.getBuilder('
|
|
23
|
-
const expressionEvaluator = new application_1.
|
|
22
|
+
new library_1.CoreLibrary(operandFacade.getBuilder('expression'), operandFacade).load(model);
|
|
23
|
+
const expressionEvaluator = new application_1.ExecutorObserveDecorator(new application_1.ExecutorImpl(operandFacade));
|
|
24
24
|
return new application_1.ExpressionsImpl(model, expressionConvert, operandFacade, expressionEvaluator, expressionEvaluator);
|
|
25
25
|
}
|
|
26
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expressionsBuilder.js","sourceRoot":"","sources":["../../../../src/lib/expression/infrastructure/expressionsBuilder.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,
|
|
1
|
+
{"version":3,"file":"expressionsBuilder.js","sourceRoot":"","sources":["../../../../src/lib/expression/infrastructure/expressionsBuilder.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,gDAAwF;AAExF,6DAAsE;AACtE,yDAA0D;AAC1D,2EAA6E;AAC7E,yEAA2E;AAC3E,iEAAmE;AAGnE,MAAa,kBAAkB;IAC9B,kDAAkD;IAClD,YAA8B,MAAa;QAAb,WAAM,GAAN,MAAM,CAAO;IAAG,CAAC;IAExC,KAAK;QACX,MAAM,KAAK,GAAG,IAAI,8BAAgB,EAAE,CAAA;QACpC,MAAM,aAAa,GAAG,IAAI,qCAAoB,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAA;QAC1E,MAAM,iBAAiB,GAAG,IAAI,8BAAoB,EAAE;aAClD,UAAU,CAAC,UAAU,EAAE,IAAI,+CAAyB,CAAC,aAAa,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC;aAC7F,UAAU,CAAC,SAAS,EAAE,IAAI,6CAAwB,EAAE,CAAC,CAAA;QACvD,IAAI,qBAAW,CAAC,aAAa,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,aAAa,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAClF,MAAM,mBAAmB,GAAG,IAAI,sCAAwB,CACvD,IAAI,0BAAY,CAAC,aAAa,CAAC,CAC/B,CAAA;QACD,OAAO,IAAI,6BAAe,CAAC,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,mBAAmB,EAAE,mBAAmB,CAAC,CAAA;IAC9G,CAAC;CACD;AAhBD,gDAgBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../../src/lib/expression/infrastructure/helper.ts"],"names":[],"mappings":";;;AAGA,MAAa,gBAAgB;IAC5B,kDAAkD;IAClD,YAA8B,GAAiB;QAAjB,QAAG,GAAH,GAAG,CAAc;IAAG,CAAC;IAEnD,wDAAwD;IACjD,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;
|
|
1
|
+
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../../src/lib/expression/infrastructure/helper.ts"],"names":[],"mappings":";;;AAGA,MAAa,gBAAgB;IAC5B,kDAAkD;IAClD,YAA8B,GAAiB;QAAjB,QAAG,GAAH,GAAG,CAAc;IAAG,CAAC;IAEnD,wDAAwD;IACjD,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"}
|