3xpr 1.10.4 → 1.10.5
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.
|
@@ -6,7 +6,7 @@ export interface IExpressions {
|
|
|
6
6
|
get constants(): [string, any][];
|
|
7
7
|
get operators(): [string, OperatorMetadata][];
|
|
8
8
|
get functions(): [string, OperatorMetadata][];
|
|
9
|
-
operandService: IOperandService;
|
|
9
|
+
get operandService(): IOperandService;
|
|
10
10
|
addOperator(sing: string, source: any, additionalInfo: OperatorAdditionalInfo): void;
|
|
11
11
|
addFunction(sing: string, source: any, additionalInfo?: FunctionAdditionalInfo): void;
|
|
12
12
|
addOperatorAlias(alias: string, reference: string): void;
|
|
@@ -4,11 +4,12 @@ import { IExpressions } from '../../application';
|
|
|
4
4
|
export declare class Expressions implements IExpressions {
|
|
5
5
|
readonly _model: IModelService;
|
|
6
6
|
private readonly parameterService;
|
|
7
|
-
|
|
7
|
+
private _operandService;
|
|
8
8
|
private convertFromFunction;
|
|
9
9
|
private convertFromGraphql;
|
|
10
10
|
private observers;
|
|
11
11
|
constructor(_model: IModelService, typeService: ITypeService, parameterService: IParameterService, cache: ICache<string, Operand>);
|
|
12
|
+
get operandService(): IOperandService;
|
|
12
13
|
get model(): IModelService;
|
|
13
14
|
get operators(): [string, OperatorMetadata][];
|
|
14
15
|
get enums(): [string, [string, any][]][];
|
|
@@ -11,15 +11,18 @@ class Expressions {
|
|
|
11
11
|
this._model = _model;
|
|
12
12
|
this.parameterService = parameterService;
|
|
13
13
|
this.observers = [];
|
|
14
|
-
this.
|
|
14
|
+
this._operandService = new application_1.OperandService(typeService, cache);
|
|
15
15
|
const basic = new application_1.BasicOperandBuilder(_model);
|
|
16
16
|
const process = new application_1.ProcessOperandBuilder(_model);
|
|
17
17
|
new application_1.CoreLibrary(_model, basic).load();
|
|
18
|
-
this.
|
|
19
|
-
this.
|
|
20
|
-
this.convertFromFunction = new convertFromFunction_1.ExpressionConvertFromFunction(this.
|
|
18
|
+
this._operandService.addBuilder(basic);
|
|
19
|
+
this._operandService.addBuilder(process);
|
|
20
|
+
this.convertFromFunction = new convertFromFunction_1.ExpressionConvertFromFunction(this._operandService);
|
|
21
21
|
this.convertFromGraphql = new convertFromGraphql_1.ExpressionConvertFromGraphql();
|
|
22
22
|
}
|
|
23
|
+
get operandService() {
|
|
24
|
+
return this._operandService;
|
|
25
|
+
}
|
|
23
26
|
get model() {
|
|
24
27
|
return this._model;
|
|
25
28
|
}
|
|
@@ -60,7 +63,7 @@ class Expressions {
|
|
|
60
63
|
this.model.addFunctionAlias(alias, reference);
|
|
61
64
|
}
|
|
62
65
|
addOperandBuilder(builder) {
|
|
63
|
-
this.
|
|
66
|
+
this._operandService.addBuilder(builder);
|
|
64
67
|
}
|
|
65
68
|
/**
|
|
66
69
|
* Convert a lambda expression to a query expression
|
|
@@ -80,7 +83,7 @@ class Expressions {
|
|
|
80
83
|
* @returns Parameters of expression
|
|
81
84
|
*/
|
|
82
85
|
parameters(expression) {
|
|
83
|
-
const operand = this.
|
|
86
|
+
const operand = this._operandService.typed(expression, 'basic');
|
|
84
87
|
return this.parameterService.parameters(operand);
|
|
85
88
|
}
|
|
86
89
|
/**
|
|
@@ -89,7 +92,7 @@ class Expressions {
|
|
|
89
92
|
* @returns Type of expression
|
|
90
93
|
*/
|
|
91
94
|
type(expression) {
|
|
92
|
-
const operand = this.
|
|
95
|
+
const operand = this._operandService.typed(expression, 'basic');
|
|
93
96
|
return typ3s_1.Type.stringify(operand.returnType);
|
|
94
97
|
}
|
|
95
98
|
/**
|
|
@@ -102,7 +105,7 @@ class Expressions {
|
|
|
102
105
|
const context = new domain_1.Context(new domain_1.Data(data));
|
|
103
106
|
try {
|
|
104
107
|
this.beforeExecutionNotify(expression, context);
|
|
105
|
-
const operand = this.
|
|
108
|
+
const operand = this._operandService.build(expression, 'basic', true);
|
|
106
109
|
const result = operand.eval(context);
|
|
107
110
|
this.afterExecutionNotify(expression, context, result);
|
|
108
111
|
return result;
|
|
@@ -116,7 +119,7 @@ class Expressions {
|
|
|
116
119
|
const context = new domain_1.Context(new domain_1.Data(data));
|
|
117
120
|
try {
|
|
118
121
|
this.beforeExecutionNotify(expression, context);
|
|
119
|
-
const operand = this.
|
|
122
|
+
const operand = this._operandService.build(expression, 'process', true);
|
|
120
123
|
const result = operand.eval(context);
|
|
121
124
|
this.afterExecutionNotify(expression, context, result);
|
|
122
125
|
return result;
|
|
@@ -138,10 +141,10 @@ class Expressions {
|
|
|
138
141
|
this.observers.splice(index, 1);
|
|
139
142
|
}
|
|
140
143
|
build(expression, useCache) {
|
|
141
|
-
return this.
|
|
144
|
+
return this._operandService.build(expression, 'basic', useCache);
|
|
142
145
|
}
|
|
143
146
|
clone(source) {
|
|
144
|
-
return this.
|
|
147
|
+
return this._operandService.clone(source, 'basic');
|
|
145
148
|
}
|
|
146
149
|
beforeExecutionNotify(expression, context) {
|
|
147
150
|
const args = { expression, context };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expressions.js","sourceRoot":"","sources":["../../../../src/lib/infrastructure/expression/expressions.ts"],"names":[],"mappings":";;;AAAA,iCAA4B;AAE5B,yCAIqB;AACrB,mDAAyH;AACzH,+DAAqE;AACrE,6DAAmE;AAEnE,MAAa,WAAW;IAKvB,YACiB,MAAqB,EACrC,WAAyB,EACR,gBAAmC,EACpD,KAA8B;QAHd,WAAM,GAAN,MAAM,CAAe;QAEpB,qBAAgB,GAAhB,gBAAgB,CAAmB;QAJ7C,cAAS,GAAoB,EAAE,CAAA;QAOtC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"expressions.js","sourceRoot":"","sources":["../../../../src/lib/infrastructure/expression/expressions.ts"],"names":[],"mappings":"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"}
|