3xpr 1.15.12 → 1.15.14
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/expression/infrastructure/convertFrom/convertFromFunction.d.ts +3 -1
- package/expression/infrastructure/convertFrom/convertFromFunction.js +3 -3
- package/expression/infrastructure/convertFrom/convertFromFunction.js.map +1 -1
- package/expression/infrastructure/expressionsBuilder.d.ts +2 -2
- package/expression/infrastructure/expressionsBuilder.js +2 -2
- package/expression/infrastructure/expressionsBuilder.js.map +1 -1
- package/expression/infrastructure/helper.d.ts +1 -2
- package/expression/infrastructure/helper.js.map +1 -1
- package/expression/infrastructure/helperBuilder.d.ts +0 -4
- package/expression/infrastructure/helperBuilder.js +12 -15
- package/expression/infrastructure/helperBuilder.js.map +1 -1
- package/expression/infrastructure/index.d.ts +1 -2
- package/expression/infrastructure/index.js +1 -2
- package/expression/infrastructure/index.js.map +1 -1
- package/expression/infrastructure/library.d.ts +3 -1
- package/expression/infrastructure/library.js +134 -85
- package/expression/infrastructure/library.js.map +1 -1
- package/index.d.ts +3 -2
- package/index.js +7 -7
- package/index.js.map +1 -1
- package/operand/infrastructure/helper.d.ts +1 -2
- package/operand/infrastructure/helper.js.map +1 -1
- package/package.json +3 -3
- package/shared/infrastructure/helper.d.ts +8 -0
- package/shared/infrastructure/helper.js +16 -0
- package/shared/infrastructure/helper.js.map +1 -0
- package/shared/infrastructure/index.d.ts +1 -0
- package/shared/{application → infrastructure}/index.js +1 -3
- package/shared/infrastructure/index.js.map +1 -0
- package/shared/application/helper/expression.d.ts +0 -3
- package/shared/application/helper/expression.js +0 -3
- package/shared/application/helper/expression.js.map +0 -1
- package/shared/application/helper/helper.d.ts +0 -8
- package/shared/application/helper/helper.js +0 -13
- package/shared/application/helper/helper.js.map +0 -1
- package/shared/application/helper/operand.d.ts +0 -16
- package/shared/application/helper/operand.js +0 -3
- package/shared/application/helper/operand.js.map +0 -1
- package/shared/application/index.d.ts +0 -3
- package/shared/application/index.js.map +0 -1
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { ExpressionConverter } from '../../..';
|
|
2
2
|
import { OperandBuilder } from '../../../operand/domain';
|
|
3
|
+
import { ExprH3lp } from '../../../shared/infrastructure';
|
|
3
4
|
export declare class ExpressionConvertFunction implements ExpressionConverter {
|
|
4
5
|
private readonly operandBuilder;
|
|
5
|
-
|
|
6
|
+
private readonly helper;
|
|
7
|
+
constructor(operandBuilder: OperandBuilder, helper: ExprH3lp);
|
|
6
8
|
/**
|
|
7
9
|
* Convert a lambda expression to a query expression
|
|
8
10
|
* @param lambda lambda expression
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ExpressionConvertFunction = void 0;
|
|
4
|
-
const __1 = require("../../..");
|
|
5
4
|
const domain_1 = require("../../../shared/domain");
|
|
6
5
|
class ExpressionConvertFunction {
|
|
7
6
|
// eslint-disable-next-line no-useless-constructor
|
|
8
|
-
constructor(operandBuilder) {
|
|
7
|
+
constructor(operandBuilder, helper) {
|
|
9
8
|
this.operandBuilder = operandBuilder;
|
|
9
|
+
this.helper = helper;
|
|
10
10
|
}
|
|
11
11
|
/**
|
|
12
12
|
* Convert a lambda expression to a query expression
|
|
@@ -18,7 +18,7 @@ class ExpressionConvertFunction {
|
|
|
18
18
|
if (!func) {
|
|
19
19
|
throw new Error('empty lambda function}');
|
|
20
20
|
}
|
|
21
|
-
const expression =
|
|
21
|
+
const expression = this.helper.expression.clearLambda(func);
|
|
22
22
|
const operand = this.operandBuilder.build(expression);
|
|
23
23
|
let aux = operand;
|
|
24
24
|
while (aux.type !== domain_1.OperandType.Var) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convertFromFunction.js","sourceRoot":"","sources":["../../../../../src/lib/expression/infrastructure/convertFrom/convertFromFunction.ts"],"names":[],"mappings":";;;
|
|
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,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,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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Expressions } from '../domain';
|
|
2
|
-
import {
|
|
2
|
+
import { ExprH3lp } from '../../shared/infrastructure';
|
|
3
3
|
export declare class ExpressionsBuilder {
|
|
4
4
|
private readonly helper;
|
|
5
|
-
constructor(helper:
|
|
5
|
+
constructor(helper: ExprH3lp);
|
|
6
6
|
build(): Expressions;
|
|
7
7
|
}
|
|
@@ -17,9 +17,9 @@ 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('expression')))
|
|
20
|
+
.addConvert('function', new convertFromFunction_1.ExpressionConvertFunction(operandFacade.getBuilder('expression'), this.helper))
|
|
21
21
|
.addConvert('graphql', new convertFromGraphql_1.ExpressionConvertGraphql());
|
|
22
|
-
new library_1.CoreLibrary(operandFacade.getBuilder('expression'), operandFacade).load(model);
|
|
22
|
+
new library_1.CoreLibrary(operandFacade.getBuilder('expression'), operandFacade, this.helper).load(model);
|
|
23
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
|
}
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,MAAe;QAAf,WAAM,GAAN,MAAM,CAAS;IAAG,CAAC;IAE1C,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,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;aAC1G,UAAU,CAAC,SAAS,EAAE,IAAI,6CAAwB,EAAE,CAAC,CAAA;QACvD,IAAI,qBAAW,CAAC,aAAa,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC/F,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,6 +1,5 @@
|
|
|
1
1
|
import { IStringHelper } from 'h3lp';
|
|
2
|
-
|
|
3
|
-
export declare class ExpressionHelper implements IExpressionHelper {
|
|
2
|
+
export declare class ExpressionHelper {
|
|
4
3
|
private readonly str;
|
|
5
4
|
constructor(str: IStringHelper);
|
|
6
5
|
clearLambda(func: Function): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../../src/lib/expression/infrastructure/helper.ts"],"names":[],"mappings":";;;
|
|
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,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"}
|
|
@@ -1,17 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
}
|
|
15
|
-
}
|
|
16
|
-
exports.HelperBuilder = HelperBuilder;
|
|
2
|
+
// import { h3lp } from 'h3lp'
|
|
3
|
+
// import { Helper } from '../../shared/application'
|
|
4
|
+
// import { ConstBuilderImpl, OperandHelper } from '../../operand/infrastructure'
|
|
5
|
+
// import { ExpressionHelper } from './helper'
|
|
6
|
+
// export class HelperBuilder {
|
|
7
|
+
// public build ():Helper {
|
|
8
|
+
// const constBuilder = new ConstBuilderImpl()
|
|
9
|
+
// const operandHelper = new OperandHelper(constBuilder)
|
|
10
|
+
// const expressionHelper = new ExpressionHelper(h3lp.str)
|
|
11
|
+
// return new Helper(expressionHelper, operandHelper, h3lp)
|
|
12
|
+
// }
|
|
13
|
+
// }
|
|
17
14
|
//# sourceMappingURL=helperBuilder.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helperBuilder.js","sourceRoot":"","sources":["../../../../src/lib/expression/infrastructure/helperBuilder.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"helperBuilder.js","sourceRoot":"","sources":["../../../../src/lib/expression/infrastructure/helperBuilder.ts"],"names":[],"mappings":";AAAA,8BAA8B;AAC9B,oDAAoD;AACpD,iFAAiF;AACjF,8CAA8C;AAE9C,+BAA+B;AAC/B,2BAA2B;AAC3B,8CAA8C;AAC9C,wDAAwD;AACxD,0DAA0D;AAC1D,2DAA2D;AAC3D,IAAI;AACJ,IAAI"}
|
|
@@ -1,2 +1 @@
|
|
|
1
|
-
export * from './
|
|
2
|
-
export * from './helperBuilder';
|
|
1
|
+
export * from './helper';
|
|
@@ -14,6 +14,5 @@ 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("./helperBuilder"), exports);
|
|
17
|
+
__exportStar(require("./helper"), exports);
|
|
19
18
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/expression/infrastructure/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/expression/infrastructure/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAwB"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { ModelService, Library } from '../../model/domain';
|
|
2
2
|
import { OperandBuilder, OperandCloner } from '../../operand/domain';
|
|
3
|
+
import { ExprH3lp } from '../../shared/infrastructure';
|
|
3
4
|
export declare class CoreLibrary implements Library {
|
|
4
5
|
private readonly builder;
|
|
5
6
|
private readonly cloner;
|
|
6
|
-
|
|
7
|
+
private readonly helper;
|
|
8
|
+
constructor(builder: OperandBuilder, cloner: OperandCloner, helper: ExprH3lp);
|
|
7
9
|
load(model: ModelService): void;
|
|
8
10
|
private constants;
|
|
9
11
|
private enums;
|