3xpr 1.9.9 → 1.9.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.
- package/application/expression/index.d.ts +5 -0
- package/application/expression/index.js +22 -0
- package/application/expression/index.js.map +1 -0
- package/application/{operand → expression/services}/parser.d.ts +4 -4
- package/application/{operand → expression/services}/parser.js +14 -12
- package/application/expression/services/parser.js.map +1 -0
- package/application/expression/useCases/convertFromFunction.d.ts +11 -0
- package/application/expression/useCases/convertFromFunction.js +45 -0
- package/application/expression/useCases/convertFromFunction.js.map +1 -0
- package/application/expression/useCases/convertFromGraphql.d.ts +3 -0
- package/application/{graphql/parser.js → expression/useCases/convertFromGraphql.js} +9 -1
- package/application/expression/useCases/convertFromGraphql.js.map +1 -0
- package/application/expression/useCases/normalize.d.ts +3 -0
- package/application/expression/useCases/normalize.js +55 -0
- package/application/expression/useCases/normalize.js.map +1 -0
- package/application/expression/useCases/parse.d.ts +6 -0
- package/application/expression/useCases/parse.js +15 -0
- package/application/expression/useCases/parse.js.map +1 -0
- package/application/index.d.ts +4 -2
- package/application/index.js +4 -2
- package/application/index.js.map +1 -1
- package/application/model/index.d.ts +2 -0
- package/{domain/services → application/model}/index.js +2 -5
- package/application/model/index.js.map +1 -0
- package/application/model/library.js.map +1 -0
- package/application/{operand/model.js → model/modelService.js} +1 -1
- package/application/model/modelService.js.map +1 -0
- package/application/operand/index.d.ts +9 -10
- package/application/operand/index.js +9 -10
- package/application/operand/index.js.map +1 -1
- package/application/operand/services/operandService.d.ts +13 -0
- package/application/operand/services/operandService.js +62 -0
- package/application/operand/services/operandService.js.map +1 -0
- package/application/operand/{parameters.d.ts → services/parameterService.d.ts} +1 -1
- package/application/operand/{parameters.js → services/parameterService.js} +4 -4
- package/application/operand/services/parameterService.js.map +1 -0
- package/application/operand/{type.d.ts → services/typeService.d.ts} +3 -3
- package/application/operand/{type.js → services/typeService.js} +26 -26
- package/application/operand/services/typeService.js.map +1 -0
- package/application/operand/useCases/build/basicOperandBuilder.d.ts +6 -0
- package/application/operand/useCases/build/basicOperandBuilder.js +15 -0
- package/application/operand/useCases/build/basicOperandBuilder.js.map +1 -0
- package/application/operand/{factory → useCases/build/factory}/basic/evaluators.d.ts +1 -1
- package/application/operand/{factory → useCases/build/factory}/basic/evaluators.js +6 -6
- package/application/operand/useCases/build/factory/basic/evaluators.js.map +1 -0
- package/application/operand/{factory → useCases/build/factory}/basic/factory.d.ts +1 -1
- package/application/operand/{factory → useCases/build/factory}/basic/factory.js +3 -3
- package/application/operand/useCases/build/factory/basic/factory.js.map +1 -0
- package/application/operand/useCases/build/factory/index.js.map +1 -0
- package/application/operand/{factory → useCases/build/factory}/process/evaluators.d.ts +1 -1
- package/application/operand/{factory → useCases/build/factory}/process/evaluators.js +1 -1
- package/application/operand/useCases/build/factory/process/evaluators.js.map +1 -0
- package/application/operand/{factory → useCases/build/factory}/process/factory.d.ts +2 -2
- package/application/operand/{factory → useCases/build/factory}/process/factory.js +4 -4
- package/application/operand/useCases/build/factory/process/factory.js.map +1 -0
- package/application/operand/useCases/build/operandBuilder.d.ts +15 -0
- package/application/operand/{builder.js → useCases/build/operandBuilder.js} +16 -14
- package/application/operand/useCases/build/operandBuilder.js.map +1 -0
- package/application/operand/useCases/build/processOperandBuilder.d.ts +6 -0
- package/application/operand/useCases/build/processOperandBuilder.js +15 -0
- package/application/operand/useCases/build/processOperandBuilder.js.map +1 -0
- package/application/operand/{normalizer.d.ts → useCases/normalizer.d.ts} +2 -2
- package/application/operand/{normalizer.js → useCases/normalizer.js} +4 -4
- package/application/operand/useCases/normalizer.js.map +1 -0
- package/application/operand/{reducer.d.ts → useCases/reducer.d.ts} +2 -2
- package/application/operand/{reducer.js → useCases/reducer.js} +5 -5
- package/application/operand/useCases/reducer.js.map +1 -0
- package/application/operand/{serializer.d.ts → useCases/serializer.d.ts} +1 -1
- package/application/operand/{serializer.js → useCases/serializer.js} +4 -4
- package/application/operand/useCases/serializer.js.map +1 -0
- package/{domain/services → application/ports}/expressions.d.ts +1 -2
- package/application/ports/expressions.js.map +1 -0
- package/domain/entities/base.js.map +1 -0
- package/domain/entities/context.js.map +1 -0
- package/domain/{model → entities}/index.d.ts +0 -1
- package/domain/{model → entities}/index.js +0 -1
- package/domain/entities/index.js.map +1 -0
- package/domain/entities/observer.js.map +1 -0
- package/domain/entities/signals.js.map +1 -0
- package/domain/index.d.ts +4 -3
- package/domain/index.js +4 -3
- package/domain/index.js.map +1 -1
- package/domain/{services/model.d.ts → model/services.d.ts} +2 -1
- package/domain/{services/type.js → model/services.js} +1 -1
- package/domain/model/services.js.map +1 -0
- package/domain/{model/operand.d.ts → operand/entities.d.ts} +1 -1
- package/domain/{model/operand.js → operand/entities.js} +1 -1
- package/domain/operand/entities.js.map +1 -0
- package/domain/operand/services.d.ts +23 -0
- package/domain/{services/model.js → operand/services.js} +1 -1
- package/domain/operand/services.js.map +1 -0
- package/{application/expressions.d.ts → infrastructure/adapters/expressionsAdapter.d.ts} +10 -11
- package/{application/expressions.js → infrastructure/adapters/expressionsAdapter.js} +30 -102
- package/infrastructure/adapters/expressionsAdapter.js.map +1 -0
- package/infrastructure/builder.d.ts +2 -1
- package/infrastructure/builder.js +4 -6
- package/infrastructure/builder.js.map +1 -1
- package/infrastructure/index.d.ts +1 -1
- package/package.json +2 -2
- package/application/expressions.js.map +0 -1
- package/application/graphql/parser.d.ts +0 -0
- package/application/graphql/parser.js.map +0 -1
- package/application/operand/builder.d.ts +0 -11
- package/application/operand/builder.js.map +0 -1
- package/application/operand/factory/basic/evaluators.js.map +0 -1
- package/application/operand/factory/basic/factory.js.map +0 -1
- package/application/operand/factory/index.js.map +0 -1
- package/application/operand/factory/process/evaluators.js.map +0 -1
- package/application/operand/factory/process/factory.js.map +0 -1
- package/application/operand/library.js.map +0 -1
- package/application/operand/model.js.map +0 -1
- package/application/operand/normalizer.js.map +0 -1
- package/application/operand/parameters.js.map +0 -1
- package/application/operand/parser.js.map +0 -1
- package/application/operand/reducer.js.map +0 -1
- package/application/operand/serializer.js.map +0 -1
- package/application/operand/type.js.map +0 -1
- package/domain/model/base.js.map +0 -1
- package/domain/model/context.js.map +0 -1
- package/domain/model/index.js.map +0 -1
- package/domain/model/observer.js.map +0 -1
- package/domain/model/operand.js.map +0 -1
- package/domain/model/signals.js.map +0 -1
- package/domain/services/expressions.js.map +0 -1
- package/domain/services/index.d.ts +0 -5
- package/domain/services/index.js.map +0 -1
- package/domain/services/model.js.map +0 -1
- package/domain/services/operand.d.ts +0 -14
- package/domain/services/operand.js +0 -3
- package/domain/services/operand.js.map +0 -1
- package/domain/services/parameter.d.ts +0 -4
- package/domain/services/parameter.js +0 -3
- package/domain/services/parameter.js.map +0 -1
- package/domain/services/type.d.ts +0 -5
- package/domain/services/type.js.map +0 -1
- /package/application/{operand → model}/library.d.ts +0 -0
- /package/application/{operand → model}/library.js +0 -0
- /package/application/{operand/model.d.ts → model/modelService.d.ts} +0 -0
- /package/application/operand/{factory → useCases/build/factory}/index.d.ts +0 -0
- /package/application/operand/{factory → useCases/build/factory}/index.js +0 -0
- /package/{domain/services → application/ports}/expressions.js +0 -0
- /package/domain/{model → entities}/base.d.ts +0 -0
- /package/domain/{model → entities}/base.js +0 -0
- /package/domain/{model → entities}/context.d.ts +0 -0
- /package/domain/{model → entities}/context.js +0 -0
- /package/domain/{model → entities}/observer.d.ts +0 -0
- /package/domain/{model → entities}/observer.js +0 -0
- /package/domain/{model → entities}/signals.d.ts +0 -0
- /package/domain/{model → entities}/signals.js +0 -0
|
@@ -2,21 +2,23 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.OperandBuilder = void 0;
|
|
4
4
|
/* eslint-disable no-case-declarations */
|
|
5
|
-
const domain_1 = require("
|
|
6
|
-
const
|
|
5
|
+
const domain_1 = require("../../../../domain");
|
|
6
|
+
const __1 = require("../../");
|
|
7
|
+
const expression_1 = require("../../../expression");
|
|
7
8
|
class OperandBuilder {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
this.
|
|
11
|
-
this.
|
|
12
|
-
this.
|
|
13
|
-
this.
|
|
9
|
+
constructor(evaluatorFactory, modelService) {
|
|
10
|
+
this.evaluatorFactory = evaluatorFactory;
|
|
11
|
+
this.expressionNormalize = new expression_1.ExpressionNormalize();
|
|
12
|
+
this.expressionParse = new expression_1.ExpressionParse(modelService);
|
|
13
|
+
this.normalize = new __1.OperandNormalize(modelService);
|
|
14
|
+
this.reduce = new __1.OperandReduce(modelService);
|
|
14
15
|
}
|
|
15
16
|
build(expression) {
|
|
16
|
-
const
|
|
17
|
-
const
|
|
17
|
+
const expressionNormalized = this.expressionNormalize.normalize(expression);
|
|
18
|
+
const operand = this.expressionParse.parse(expressionNormalized);
|
|
19
|
+
const normalized = this.normalize.normalize(operand);
|
|
18
20
|
this.complete(normalized);
|
|
19
|
-
return this.
|
|
21
|
+
return this.reduce.reduce(normalized);
|
|
20
22
|
}
|
|
21
23
|
clone(source) {
|
|
22
24
|
const children = [];
|
|
@@ -25,7 +27,7 @@ class OperandBuilder {
|
|
|
25
27
|
}
|
|
26
28
|
const target = new domain_1.Operand(source.pos, source.name, source.type, children, source.returnType);
|
|
27
29
|
target.id = source.id;
|
|
28
|
-
target.evaluator = this.
|
|
30
|
+
target.evaluator = this.evaluatorFactory.create(target);
|
|
29
31
|
return target;
|
|
30
32
|
}
|
|
31
33
|
complete(operand, index = 0, parentId) {
|
|
@@ -37,8 +39,8 @@ class OperandBuilder {
|
|
|
37
39
|
}
|
|
38
40
|
}
|
|
39
41
|
operand.id = id;
|
|
40
|
-
operand.evaluator = this.
|
|
42
|
+
operand.evaluator = this.evaluatorFactory.create(operand);
|
|
41
43
|
}
|
|
42
44
|
}
|
|
43
45
|
exports.OperandBuilder = OperandBuilder;
|
|
44
|
-
//# sourceMappingURL=
|
|
46
|
+
//# sourceMappingURL=operandBuilder.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"operandBuilder.js","sourceRoot":"","sources":["../../../../../../src/lib/application/operand/useCases/build/operandBuilder.ts"],"names":[],"mappings":";;;AAAA,yCAAyC;AACzC,+CAA+F;AAC/F,8BAAuD;AACvD,oDAA0E;AAC1E,MAAsB,cAAc;IAKnC,YAAuC,gBAAmC,EAAC,YAA0B;QAA9D,qBAAgB,GAAhB,gBAAgB,CAAmB;QACzE,IAAI,CAAC,mBAAmB,GAAG,IAAI,gCAAmB,EAAE,CAAA;QACpD,IAAI,CAAC,eAAe,GAAG,IAAI,4BAAe,CAAC,YAAY,CAAC,CAAA;QACxD,IAAI,CAAC,SAAS,GAAG,IAAI,oBAAgB,CAAC,YAAY,CAAC,CAAA;QACnD,IAAI,CAAC,MAAM,GAAG,IAAI,iBAAa,CAAC,YAAY,CAAC,CAAA;IAC9C,CAAC;IAIM,KAAK,CAAE,UAAkB;QAC/B,MAAM,oBAAoB,GAAG,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;QAC3E,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAA;QAChE,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;QACpD,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;QACzB,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IACtC,CAAC;IAEM,KAAK,CAAE,MAAe;QAC5B,MAAM,QAAQ,GAAc,EAAE,CAAA;QAC9B,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,QAAQ,EAAE;YACpC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;SAChC;QACD,MAAM,MAAM,GAAG,IAAI,gBAAO,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC,CAAA;QAC7F,MAAM,CAAC,EAAE,GAAG,MAAM,CAAC,EAAE,CAAA;QACrB,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QACvD,OAAO,MAAM,CAAA;IACd,CAAC;IAES,QAAQ,CAAE,OAAgB,EAAE,KAAK,GAAG,CAAC,EAAE,QAAgB;QAChE,MAAM,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,GAAG,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAA;QAC/D,IAAI,OAAO,CAAC,QAAQ,EAAE;YACrB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACjD,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;gBACjC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;aAC3B;SACD;QACD,OAAO,CAAC,EAAE,GAAG,EAAE,CAAA;QACf,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IAC1D,CAAC;CACD;AA5CD,wCA4CC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ProcessOperandBuilder = void 0;
|
|
4
|
+
const operandBuilder_1 = require("./operandBuilder");
|
|
5
|
+
const factory_1 = require("./factory/process/factory");
|
|
6
|
+
class ProcessOperandBuilder extends operandBuilder_1.OperandBuilder {
|
|
7
|
+
constructor(model) {
|
|
8
|
+
super(new factory_1.ProcessEvaluatorFactory(model), model);
|
|
9
|
+
}
|
|
10
|
+
get key() {
|
|
11
|
+
return 'process';
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
exports.ProcessOperandBuilder = ProcessOperandBuilder;
|
|
15
|
+
//# sourceMappingURL=processOperandBuilder.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"processOperandBuilder.js","sourceRoot":"","sources":["../../../../../../src/lib/application/operand/useCases/build/processOperandBuilder.ts"],"names":[],"mappings":";;;AACA,qDAAgD;AAChD,uDAAiE;AAEjE,MAAa,qBAAuB,SAAQ,+BAAc;IAEzD,YAAoB,KAAmB;QACtC,KAAK,CAAC,IAAI,iCAAuB,CAAC,KAAK,CAAC,EAAC,KAAK,CAAC,CAAA;IAChD,CAAC;IAED,IAAW,GAAG;QACb,OAAO,SAAS,CAAA;IACjB,CAAC;CACD;AATD,sDASC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Operand, IModelService
|
|
2
|
-
export declare class
|
|
1
|
+
import { Operand, IModelService } from '../../../domain';
|
|
2
|
+
export declare class OperandNormalize {
|
|
3
3
|
protected readonly model: IModelService;
|
|
4
4
|
constructor(model: IModelService);
|
|
5
5
|
normalize(operand: Operand): Operand;
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.OperandNormalize = void 0;
|
|
4
4
|
/* eslint-disable no-case-declarations */
|
|
5
|
-
const domain_1 = require("
|
|
6
|
-
class
|
|
5
|
+
const domain_1 = require("../../../domain");
|
|
6
|
+
class OperandNormalize {
|
|
7
7
|
// eslint-disable-next-line no-useless-constructor
|
|
8
8
|
constructor(model) {
|
|
9
9
|
this.model = model;
|
|
@@ -40,5 +40,5 @@ class OperandNormalizer {
|
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
|
-
exports.
|
|
43
|
+
exports.OperandNormalize = OperandNormalize;
|
|
44
44
|
//# sourceMappingURL=normalizer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"normalizer.js","sourceRoot":"","sources":["../../../../../src/lib/application/operand/useCases/normalizer.ts"],"names":[],"mappings":";;;AAAA,yCAAyC;AACzC,4CAAqE;AAErE,MAAa,gBAAgB;IAC5B,kDAAkD;IAClD,YAAuC,KAAoB;QAApB,UAAK,GAAL,KAAK,CAAe;IAAG,CAAC;IAExD,SAAS,CAAE,OAAgB;QACjC,IAAI,OAAO,CAAC,IAAI,KAAK,oBAAW,CAAC,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YACtE,0CAA0C;YAC1C,MAAM,aAAa,GAAG,IAAI,gBAAO,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,oBAAW,CAAC,GAAG,CAAC,CAAA;YACpE,MAAM,SAAS,GAAG,IAAI,gBAAO,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,oBAAW,CAAC,GAAG,CAAC,CAAA;YAChE,MAAM,GAAG,GAAG,IAAI,gBAAO,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,oBAAW,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC,CAAA;YACnG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAA;YAC1B,OAAO,GAAG,CAAA;SACV;aAAM;YACN,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAA;YAC9B,OAAO,OAAO,CAAA;SACd;IACF,CAAC;IAES,gBAAgB,CAAE,OAAgB;QAC3C,IAAI,OAAO,CAAC,IAAI,KAAK,oBAAW,CAAC,KAAK,IAAI,OAAO,CAAC,IAAI,KAAK,oBAAW,CAAC,SAAS,IAAI,OAAO,CAAC,IAAI,KAAK,oBAAW,CAAC,QAAQ,EAAE;YAC1H,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;YACvE,IAAI,KAAK,EAAE;gBACV,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;aACvB;SACD;aAAM,IAAI,OAAO,CAAC,IAAI,KAAK,oBAAW,CAAC,QAAQ,EAAE;YACjD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;YACvE,IAAI,KAAK,EAAE;gBACV,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;aACvB;SACD;QACD,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,QAAQ,EAAE;YACrC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAA;SAC5B;IACF,CAAC;CACD;AAlCD,4CAkCC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Operand, IModelService
|
|
2
|
-
export declare class
|
|
1
|
+
import { Operand, IModelService } from '../../../domain';
|
|
2
|
+
export declare class OperandReduce {
|
|
3
3
|
protected readonly model: IModelService;
|
|
4
4
|
constructor(model: IModelService);
|
|
5
5
|
reduce(operand: Operand): Operand;
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.OperandReduce = void 0;
|
|
4
4
|
/* eslint-disable no-case-declarations */
|
|
5
|
-
const domain_1 = require("
|
|
6
|
-
const factory_1 = require("./factory");
|
|
7
|
-
class
|
|
5
|
+
const domain_1 = require("../../../domain");
|
|
6
|
+
const factory_1 = require("./build/factory");
|
|
7
|
+
class OperandReduce {
|
|
8
8
|
// eslint-disable-next-line no-useless-constructor
|
|
9
9
|
constructor(model) {
|
|
10
10
|
this.model = model;
|
|
@@ -47,5 +47,5 @@ class OperandReducer {
|
|
|
47
47
|
return operand;
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
|
-
exports.
|
|
50
|
+
exports.OperandReduce = OperandReduce;
|
|
51
51
|
//# sourceMappingURL=reducer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reducer.js","sourceRoot":"","sources":["../../../../../src/lib/application/operand/useCases/reducer.ts"],"names":[],"mappings":";;;AAAA,yCAAyC;AACzC,4CAA8E;AAC9E,6CAA8C;AAE9C,MAAa,aAAa;IACzB,kDAAkD;IAClD,YAAuC,KAAoB;QAApB,UAAK,GAAL,KAAK,CAAe;IAAG,CAAC;IAExD,MAAM,CAAE,OAAgB;QAC9B,IAAI,OAAO,CAAC,IAAI,KAAK,oBAAW,CAAC,QAAQ,EAAE;YAC1C,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;SAClC;aAAM,IAAI,OAAO,CAAC,IAAI,KAAK,oBAAW,CAAC,QAAQ,EAAE;YACjD,qEAAqE;YACrE,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YACrC,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;YACxC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;YACrD,IAAI,YAAY,IAAI,YAAY,CAAC,aAAa,EAAE;gBAC/C,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;aAClC;SACD;QACD,OAAO,OAAO,CAAA;IACf,CAAC;IAES,aAAa,CAAE,OAAgB;QACxC,IAAI,YAAY,GAAG,IAAI,CAAA;QACvB,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,QAAQ,EAAE;YACrC,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,oBAAW,CAAC,KAAK,CAAC,EAAE;gBACxC,YAAY,GAAG,KAAK,CAAA;gBACpB,MAAK;aACL;SACD;QACD,IAAI,YAAY,EAAE;YACjB,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,gBAAO,EAAE,CAAC,CAAA;YACzC,MAAM,QAAQ,GAAG,IAAI,sBAAY,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;YAC7D,QAAQ,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,CAAA;YACxB,OAAO,QAAQ,CAAA;SACf;aAAM;YACN,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACjD,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;gBACjC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;aACxC;SACD;QACD,OAAO,OAAO,CAAA;IACf,CAAC;CACD;AAxCD,sCAwCC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.OperandSerializer = void 0;
|
|
4
|
-
const domain_1 = require("
|
|
5
|
-
const
|
|
4
|
+
const domain_1 = require("../../../domain");
|
|
5
|
+
const typ3s_1 = require("typ3s");
|
|
6
6
|
class OperandSerializer {
|
|
7
7
|
clone(sentence) {
|
|
8
8
|
const serialized = this.serialize(sentence);
|
|
@@ -20,7 +20,7 @@ class OperandSerializer {
|
|
|
20
20
|
for (const child of operand.children) {
|
|
21
21
|
children.push(this._serialize(child));
|
|
22
22
|
}
|
|
23
|
-
return { pos: operand.pos, name: operand.name, children, number: operand.number, type: operand.type, returnType:
|
|
23
|
+
return { pos: operand.pos, name: operand.name, children, number: operand.number, type: operand.type, returnType: typ3s_1.Type.stringify(operand.returnType) };
|
|
24
24
|
}
|
|
25
25
|
_deserialize(metadata) {
|
|
26
26
|
const children = [];
|
|
@@ -31,7 +31,7 @@ class OperandSerializer {
|
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
33
|
// eslint-disable-next-line no-case-declarations
|
|
34
|
-
const operand = new domain_1.Operand(metadata.pos, metadata.name, domain_1.OperandType[metadata.type], children,
|
|
34
|
+
const operand = new domain_1.Operand(metadata.pos, metadata.name, domain_1.OperandType[metadata.type], children, typ3s_1.Type.to(metadata.returnType));
|
|
35
35
|
operand.number = metadata.number;
|
|
36
36
|
return operand;
|
|
37
37
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"serializer.js","sourceRoot":"","sources":["../../../../../src/lib/application/operand/useCases/serializer.ts"],"names":[],"mappings":";;;AACA,4CAAuE;AACvE,iCAA4B;AAC5B,MAAa,iBAAiB;IACtB,KAAK,CAAE,QAAiB;QAC9B,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;QAC3C,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAA;QACjD,OAAO,YAAY,CAAA;IACpB,CAAC;IAEM,SAAS,CAAE,QAAiB;QAClC,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAA;IACjD,CAAC;IAEM,WAAW,CAAE,KAAa;QAChC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAC9C,CAAC;IAEO,UAAU,CAAE,OAAgB;QACnC,MAAM,QAAQ,GAAqB,EAAE,CAAA;QACrC,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,QAAQ,EAAE;YACrC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAA;SACrC;QACD,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,YAAI,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAA;IACtJ,CAAC;IAEO,YAAY,CAAE,QAAyB;QAC9C,MAAM,QAAQ,GAAa,EAAE,CAAA;QAC7B,IAAI,QAAQ,CAAC,QAAQ,EAAE;YACtB,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,QAAQ,EAAE;gBACtC,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;gBAC7C,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;aAC3B;SACD;QACD,gDAAgD;QAChD,MAAM,OAAO,GAAG,IAAI,gBAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,EAAE,oBAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,YAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,UAAoB,CAAC,CAAC,CAAA;QACtI,OAAO,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAA;QAChC,OAAO,OAAO,CAAA;IACf,CAAC;CACD;AApCD,8CAoCC"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import { IModelService } from '
|
|
2
|
-
import { Parameter, Format, OperatorAdditionalInfo, FunctionAdditionalInfo, Operand, OperatorMetadata, ActionObserver } from '../model';
|
|
1
|
+
import { Parameter, Format, OperatorAdditionalInfo, FunctionAdditionalInfo, Operand, OperatorMetadata, ActionObserver, IModelService } from '../../domain';
|
|
3
2
|
export interface IExpressions {
|
|
4
3
|
get model(): IModelService;
|
|
5
4
|
get enums(): [string, [string, any][]][];
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"expressions.js","sourceRoot":"","sources":["../../../../src/lib/application/ports/expressions.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/lib/domain/entities/base.ts"],"names":[],"mappings":";;;AA4BA,MAAa,QAAQ;IACpB,kDAAkD;IAClD,YAA6B,EAAU,EAAW,GAAU;QAA/B,OAAE,GAAF,EAAE,CAAQ;QAAW,QAAG,GAAH,GAAG,CAAO;IAAG,CAAC;CAChE;AAHD,4BAGC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../src/lib/domain/entities/context.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./base"), exports);
|
|
18
18
|
__exportStar(require("./context"), exports);
|
|
19
|
-
__exportStar(require("./operand"), exports);
|
|
20
19
|
__exportStar(require("./observer"), exports);
|
|
21
20
|
__exportStar(require("./signals"), exports);
|
|
22
21
|
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/domain/entities/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAsB;AACtB,4CAAyB;AACzB,6CAA0B;AAC1B,4CAAyB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"observer.js","sourceRoot":"","sources":["../../../../src/lib/domain/entities/observer.ts"],"names":[],"mappings":";;;AAOA,MAAsB,cAAc;IACnC,kDAAkD;IAClD,YAAoC,SAAiB;QAAjB,cAAS,GAAT,SAAS,CAAQ;IAAG,CAAC;CAIzD;AAND,wCAMC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"signals.js","sourceRoot":"","sources":["../../../../src/lib/domain/entities/signals.ts"],"names":[],"mappings":""}
|
package/domain/index.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
-
export * from './
|
|
2
|
-
export * from './services';
|
|
3
|
-
export * from '
|
|
1
|
+
export * from './entities';
|
|
2
|
+
export * from './model/services';
|
|
3
|
+
export * from './operand/services';
|
|
4
|
+
export * from './operand/entities';
|
package/domain/index.js
CHANGED
|
@@ -14,7 +14,8 @@ 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("./
|
|
18
|
-
__exportStar(require("./services"), exports);
|
|
19
|
-
__exportStar(require("
|
|
17
|
+
__exportStar(require("./entities"), exports);
|
|
18
|
+
__exportStar(require("./model/services"), exports);
|
|
19
|
+
__exportStar(require("./operand/services"), exports);
|
|
20
|
+
__exportStar(require("./operand/entities"), exports);
|
|
20
21
|
//# sourceMappingURL=index.js.map
|
package/domain/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/domain/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/domain/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA0B;AAC1B,mDAAgC;AAChC,qDAAkC;AAClC,qDAAkC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { Format
|
|
1
|
+
import { Format } from '../entities';
|
|
2
|
+
import { OperatorAdditionalInfo, FunctionAdditionalInfo, OperatorMetadata } from '../operand/entities';
|
|
2
3
|
export interface IModelService {
|
|
3
4
|
get operatorAlias(): [string, any][];
|
|
4
5
|
get functionAlias(): [string, any][];
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"services.js","sourceRoot":"","sources":["../../../../src/lib/domain/model/services.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"entities.js","sourceRoot":"","sources":["../../../../src/lib/domain/operand/entities.ts"],"names":[],"mappings":";;;AAGA,IAAY,WA+BX;AA/BD,WAAY,WAAW;IACrB,8BAAe,CAAA;IACf,0BAAW,CAAA;IACX,0BAAW,CAAA;IACX,oCAAqB,CAAA;IACrB,oCAAqB,CAAA;IACrB,gCAAiB,CAAA;IACjB,4BAAa,CAAA;IACb,0BAAW,CAAA;IACX,oCAAqB,CAAA;IACrB,oCAAqB,CAAA;IACrB,8BAAe,CAAA;IACf,sCAAuB,CAAA;IACvB,8BAAe,CAAA;IACf,wBAAS,CAAA;IACT,gCAAiB,CAAA;IACjB,4BAAa,CAAA;IACb,8BAAe,CAAA;IACf,0BAAW,CAAA;IACX,8BAAe,CAAA;IACf,gCAAiB,CAAA;IACjB,4BAAa,CAAA;IACb,kCAAmB,CAAA;IACnB,8BAAe,CAAA;IACf,oCAAqB,CAAA;IACrB,4BAAa,CAAA;IACb,gCAAiB,CAAA;IACjB,0BAAW,CAAA;IACX,8BAAe,CAAA;IACf,8BAAe,CAAA;IACf,4BAAa,CAAA;AACf,CAAC,EA/BW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QA+BtB;AAwBD,MAAa,OAAO;IAInB,kDAAkD;IAClD,YAAoC,GAAY,EAAS,IAAQ,EAAkB,IAAgB,EAAS,WAAqB,EAAE,EAAS,UAAgB;QAAxH,QAAG,GAAH,GAAG,CAAS;QAAS,SAAI,GAAJ,IAAI,CAAI;QAAkB,SAAI,GAAJ,IAAI,CAAY;QAAS,aAAQ,GAAR,QAAQ,CAAe;QAAS,eAAU,GAAV,UAAU,CAAM;IAAI,CAAC;IAC1J,IAAI,CAAE,OAAgB;QAC5B,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAA;SAC5C;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACpC,CAAC;CACD;AAZD,0BAYC;AAED,MAAsB,SAAS;IAC9B,kDAAkD;IAClD,YAAuC,OAAgB;QAAhB,YAAO,GAAP,OAAO,CAAS;IAAG,CAAC;CAE3D;AAJD,8BAIC;AAED,uFAAuF;AACvF,MAAsB,kBAAkB;IACvC,kDAAkD;IAClD,YAA8B,OAAiB;QAAjB,YAAO,GAAP,OAAO,CAAU;IAAG,CAAC;CAGnD;AALD,gDAKC"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { IEvaluator, Operand } from './entities';
|
|
2
|
+
import { Parameter } from '../entities';
|
|
3
|
+
import { Type } from 'typ3s';
|
|
4
|
+
export interface IOperandBuilder {
|
|
5
|
+
get key(): string;
|
|
6
|
+
build(expression: string): Operand;
|
|
7
|
+
clone(source: Operand): Operand;
|
|
8
|
+
}
|
|
9
|
+
export interface ITypeService {
|
|
10
|
+
getType(operand: Operand): Type;
|
|
11
|
+
}
|
|
12
|
+
export interface IParameterService {
|
|
13
|
+
parameters(operand: Operand): Parameter[];
|
|
14
|
+
}
|
|
15
|
+
export interface IEvaluatorFactory {
|
|
16
|
+
create(operand: Operand): IEvaluator | undefined;
|
|
17
|
+
}
|
|
18
|
+
export interface IOperandService {
|
|
19
|
+
addBuilder(builder: IOperandBuilder): void;
|
|
20
|
+
build(expression: string, type: string, useCache: boolean): Operand;
|
|
21
|
+
typed(expression: string, type: string): Operand;
|
|
22
|
+
clone(operand: Operand, type: string): Operand;
|
|
23
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"services.js","sourceRoot":"","sources":["../../../../src/lib/domain/operand/services.ts"],"names":[],"mappings":""}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
1
|
+
import { ICache } from 'h3lp';
|
|
2
|
+
import { Operand, IParameterService, Parameter, Format, OperatorMetadata, ITypeService, IModelService, ActionObserver, FunctionAdditionalInfo, OperatorAdditionalInfo, IOperandBuilder } from '../../domain';
|
|
3
|
+
import { IExpressions } from '../../application';
|
|
4
|
+
export declare class ExpressionsAdapter implements IExpressions {
|
|
3
5
|
private readonly _model;
|
|
4
|
-
private readonly basic;
|
|
5
|
-
private readonly process;
|
|
6
|
-
private readonly typeService;
|
|
7
6
|
private readonly parameterService;
|
|
8
|
-
private
|
|
9
|
-
private
|
|
7
|
+
private operandService;
|
|
8
|
+
private convertFromFunction;
|
|
9
|
+
private convertFromGraphql;
|
|
10
10
|
private observers;
|
|
11
|
-
constructor(_model: IModelService,
|
|
11
|
+
constructor(_model: IModelService, typeService: ITypeService, parameterService: IParameterService, cache: ICache<string, Operand>);
|
|
12
12
|
get model(): IModelService;
|
|
13
13
|
get operators(): [string, OperatorMetadata][];
|
|
14
14
|
get enums(): [string, [string, any][]][];
|
|
@@ -22,19 +22,20 @@ export declare class Expressions implements IExpressions {
|
|
|
22
22
|
addConstant(key: string, value: any): void;
|
|
23
23
|
addOperatorAlias(alias: string, reference: string): void;
|
|
24
24
|
addFunctionAlias(alias: string, reference: string): void;
|
|
25
|
+
addOperandBuilder(builder: IOperandBuilder): void;
|
|
25
26
|
/**
|
|
26
27
|
* Convert a lambda expression to a query expression
|
|
27
28
|
* @param lambda lambda expression
|
|
28
29
|
* @returns Expression manager
|
|
29
30
|
*/
|
|
30
31
|
toExpression(func: Function): string;
|
|
32
|
+
graphqlToExpression(graphql: string): string;
|
|
31
33
|
/**
|
|
32
34
|
* Get parameters of expression
|
|
33
35
|
* @param expression expression
|
|
34
36
|
* @returns Parameters of expression
|
|
35
37
|
*/
|
|
36
38
|
parameters(expression: string): Parameter[];
|
|
37
|
-
graphqlToExpression(graphql: string): string;
|
|
38
39
|
/**
|
|
39
40
|
* Get type of expression
|
|
40
41
|
* @param expression expression
|
|
@@ -53,8 +54,6 @@ export declare class Expressions implements IExpressions {
|
|
|
53
54
|
unsubscribe(observer: ActionObserver): void;
|
|
54
55
|
build(expression: string, useCache: boolean): Operand;
|
|
55
56
|
clone(source: Operand): Operand;
|
|
56
|
-
private processBuild;
|
|
57
|
-
private typed;
|
|
58
57
|
private beforeExecutionNotify;
|
|
59
58
|
private afterExecutionNotify;
|
|
60
59
|
private errorExecutionNotify;
|
|
@@ -1,19 +1,22 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
const
|
|
5
|
-
const
|
|
6
|
-
const
|
|
7
|
-
class
|
|
8
|
-
constructor(_model,
|
|
3
|
+
exports.ExpressionsAdapter = void 0;
|
|
4
|
+
const typ3s_1 = require("typ3s");
|
|
5
|
+
const domain_1 = require("../../domain");
|
|
6
|
+
const application_1 = require("../../application");
|
|
7
|
+
class ExpressionsAdapter {
|
|
8
|
+
constructor(_model, typeService, parameterService, cache) {
|
|
9
9
|
this._model = _model;
|
|
10
|
-
this.basic = basic;
|
|
11
|
-
this.process = process;
|
|
12
|
-
this.typeService = typeService;
|
|
13
10
|
this.parameterService = parameterService;
|
|
14
11
|
this.observers = [];
|
|
15
|
-
this.
|
|
16
|
-
|
|
12
|
+
this.operandService = new application_1.OperandService(typeService, cache);
|
|
13
|
+
const basic = new application_1.BasicOperandBuilder(_model);
|
|
14
|
+
const process = new application_1.ProcessOperandBuilder(_model);
|
|
15
|
+
new application_1.CoreLibrary(_model, basic).load();
|
|
16
|
+
this.operandService.addBuilder(basic);
|
|
17
|
+
this.operandService.addBuilder(process);
|
|
18
|
+
this.convertFromFunction = new application_1.ExpressionConvertFromFunction(this.operandService);
|
|
19
|
+
this.convertFromGraphql = new application_1.ExpressionConvertFromGraphql();
|
|
17
20
|
}
|
|
18
21
|
get model() {
|
|
19
22
|
return this._model;
|
|
@@ -54,6 +57,9 @@ class Expressions {
|
|
|
54
57
|
addFunctionAlias(alias, reference) {
|
|
55
58
|
this.model.addFunctionAlias(alias, reference);
|
|
56
59
|
}
|
|
60
|
+
addOperandBuilder(builder) {
|
|
61
|
+
this.operandService.addBuilder(builder);
|
|
62
|
+
}
|
|
57
63
|
/**
|
|
58
64
|
* Convert a lambda expression to a query expression
|
|
59
65
|
* @param lambda lambda expression
|
|
@@ -61,30 +67,10 @@ class Expressions {
|
|
|
61
67
|
*/
|
|
62
68
|
// eslint-disable-next-line @typescript-eslint/ban-types
|
|
63
69
|
toExpression(func) {
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
const operand = this.build(expression, true);
|
|
69
|
-
let aux = operand;
|
|
70
|
-
while (aux.type !== domain_1.OperandType.Var) {
|
|
71
|
-
if (aux.children.length > 0) {
|
|
72
|
-
aux = aux.children[0];
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
if (aux.name.includes('.')) {
|
|
76
|
-
// Example: __model_1.Products.map(p=>p) => Products.map(p=>p)
|
|
77
|
-
// Example: __model_1.Orders.details.map(p=>p) => Orders.details.map(p=>p)
|
|
78
|
-
const names = aux.name.split('.');
|
|
79
|
-
if (names[0].startsWith('__')) {
|
|
80
|
-
// aux.name = names.slice(1).join('.')
|
|
81
|
-
const result = expression.replace(names[0] + '.', '');
|
|
82
|
-
return result;
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
// Example: Products.map(p=>p) => Products.map(p=>p)
|
|
86
|
-
// Example: Orders.details.map(p=>p) => Orders.details.map(p=>p)
|
|
87
|
-
return expression;
|
|
70
|
+
return this.convertFromFunction.toExpression(func);
|
|
71
|
+
}
|
|
72
|
+
graphqlToExpression(graphql) {
|
|
73
|
+
return this.convertFromGraphql.toExpression(graphql);
|
|
88
74
|
}
|
|
89
75
|
/**
|
|
90
76
|
* Get parameters of expression
|
|
@@ -92,20 +78,17 @@ class Expressions {
|
|
|
92
78
|
* @returns Parameters of expression
|
|
93
79
|
*/
|
|
94
80
|
parameters(expression) {
|
|
95
|
-
const operand = this.typed(expression);
|
|
81
|
+
const operand = this.operandService.typed(expression, 'basic');
|
|
96
82
|
return this.parameterService.parameters(operand);
|
|
97
83
|
}
|
|
98
|
-
graphqlToExpression(graphql) {
|
|
99
|
-
return graphql;
|
|
100
|
-
}
|
|
101
84
|
/**
|
|
102
85
|
* Get type of expression
|
|
103
86
|
* @param expression expression
|
|
104
87
|
* @returns Type of expression
|
|
105
88
|
*/
|
|
106
89
|
type(expression) {
|
|
107
|
-
const operand = this.typed(expression);
|
|
108
|
-
return
|
|
90
|
+
const operand = this.operandService.typed(expression, 'basic');
|
|
91
|
+
return typ3s_1.Type.stringify(operand.returnType);
|
|
109
92
|
}
|
|
110
93
|
/**
|
|
111
94
|
* Evaluate and solve expression
|
|
@@ -117,7 +100,7 @@ class Expressions {
|
|
|
117
100
|
const context = new domain_1.Context(new domain_1.Data(data));
|
|
118
101
|
try {
|
|
119
102
|
this.beforeExecutionNotify(expression, context);
|
|
120
|
-
const operand = this.build(expression, true);
|
|
103
|
+
const operand = this.operandService.build(expression, 'basic', true);
|
|
121
104
|
const result = operand.eval(context);
|
|
122
105
|
this.afterExecutionNotify(expression, context, result);
|
|
123
106
|
return result;
|
|
@@ -131,7 +114,7 @@ class Expressions {
|
|
|
131
114
|
const context = new domain_1.Context(new domain_1.Data(data));
|
|
132
115
|
try {
|
|
133
116
|
this.beforeExecutionNotify(expression, context);
|
|
134
|
-
const operand = this.
|
|
117
|
+
const operand = this.operandService.build(expression, 'process', true);
|
|
135
118
|
const result = operand.eval(context);
|
|
136
119
|
this.afterExecutionNotify(expression, context, result);
|
|
137
120
|
return result;
|
|
@@ -153,65 +136,10 @@ class Expressions {
|
|
|
153
136
|
this.observers.splice(index, 1);
|
|
154
137
|
}
|
|
155
138
|
build(expression, useCache) {
|
|
156
|
-
|
|
157
|
-
if (!useCache) {
|
|
158
|
-
return this.basic.build(expression);
|
|
159
|
-
}
|
|
160
|
-
const key = domain_1.helper.utils.hashCode(expression);
|
|
161
|
-
const value = this.cache.get(key);
|
|
162
|
-
if (!value) {
|
|
163
|
-
const operand = this.basic.build(expression);
|
|
164
|
-
this.cache.set(key, operand);
|
|
165
|
-
return operand;
|
|
166
|
-
}
|
|
167
|
-
else {
|
|
168
|
-
return value;
|
|
169
|
-
}
|
|
170
|
-
}
|
|
171
|
-
catch (error) {
|
|
172
|
-
throw new Error('expression: ' + expression + ' error: ' + error.toString());
|
|
173
|
-
}
|
|
139
|
+
return this.operandService.build(expression, 'basic', useCache);
|
|
174
140
|
}
|
|
175
141
|
clone(source) {
|
|
176
|
-
return this.
|
|
177
|
-
}
|
|
178
|
-
processBuild(expression, useCache) {
|
|
179
|
-
try {
|
|
180
|
-
if (!useCache) {
|
|
181
|
-
return this.process.build(expression);
|
|
182
|
-
}
|
|
183
|
-
const key = domain_1.helper.utils.hashCode(expression);
|
|
184
|
-
const value = this.processCache.get(key);
|
|
185
|
-
if (!value) {
|
|
186
|
-
const operand = this.process.build(expression);
|
|
187
|
-
this.processCache.set(key, operand);
|
|
188
|
-
return operand;
|
|
189
|
-
}
|
|
190
|
-
else {
|
|
191
|
-
return value;
|
|
192
|
-
}
|
|
193
|
-
}
|
|
194
|
-
catch (error) {
|
|
195
|
-
throw new Error('expression: ' + expression + ' error: ' + error.toString());
|
|
196
|
-
}
|
|
197
|
-
}
|
|
198
|
-
typed(expression) {
|
|
199
|
-
const key = domain_1.helper.utils.hashCode(expression);
|
|
200
|
-
const value = this.cache.get(key);
|
|
201
|
-
if (!value) {
|
|
202
|
-
const operand = this.basic.build(expression);
|
|
203
|
-
this.typeService.type(operand);
|
|
204
|
-
this.cache.set(key, operand);
|
|
205
|
-
return operand;
|
|
206
|
-
}
|
|
207
|
-
else if (value.returnType === undefined) {
|
|
208
|
-
this.typeService.type(value);
|
|
209
|
-
this.cache.set(key, value);
|
|
210
|
-
return value;
|
|
211
|
-
}
|
|
212
|
-
else {
|
|
213
|
-
return value;
|
|
214
|
-
}
|
|
142
|
+
return this.operandService.clone(source, 'basic');
|
|
215
143
|
}
|
|
216
144
|
beforeExecutionNotify(expression, context) {
|
|
217
145
|
const args = { expression, context };
|
|
@@ -253,5 +181,5 @@ class Expressions {
|
|
|
253
181
|
});
|
|
254
182
|
}
|
|
255
183
|
}
|
|
256
|
-
exports.
|
|
257
|
-
//# sourceMappingURL=
|
|
184
|
+
exports.ExpressionsAdapter = ExpressionsAdapter;
|
|
185
|
+
//# sourceMappingURL=expressionsAdapter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"expressionsAdapter.js","sourceRoot":"","sources":["../../../../src/lib/infrastructure/adapters/expressionsAdapter.ts"],"names":[],"mappings":"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"}
|