3xpr 1.11.5 → 1.12.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.
Files changed (101) hide show
  1. package/expression/application/index.d.ts +3 -1
  2. package/expression/application/index.js +3 -1
  3. package/expression/application/index.js.map +1 -1
  4. package/expression/application/services/builder.d.ts +8 -4
  5. package/expression/application/services/builder.js +13 -12
  6. package/expression/application/services/builder.js.map +1 -1
  7. package/expression/application/services/builderCacheDecorator.d.ts +14 -0
  8. package/expression/application/services/builderCacheDecorator.js +40 -0
  9. package/expression/application/services/builderCacheDecorator.js.map +1 -0
  10. package/expression/application/services/expressionEvaluator.d.ts +9 -0
  11. package/expression/application/services/expressionEvaluator.js +19 -0
  12. package/expression/application/services/expressionEvaluator.js.map +1 -0
  13. package/expression/application/services/expressionEvaluatorObserveDecorator.d.ts +14 -0
  14. package/expression/application/services/expressionEvaluatorObserveDecorator.js +86 -0
  15. package/expression/application/services/expressionEvaluatorObserveDecorator.js.map +1 -0
  16. package/expression/application/services/parser.d.ts +4 -3
  17. package/expression/application/services/parser.js +4 -13
  18. package/expression/application/services/parser.js.map +1 -1
  19. package/expression/application/useCases/build.d.ts +5 -4
  20. package/expression/application/useCases/build.js +11 -36
  21. package/expression/application/useCases/build.js.map +1 -1
  22. package/expression/application/useCases/convert.d.ts +3 -1
  23. package/expression/application/useCases/convert.js +9 -16
  24. package/expression/application/useCases/convert.js.map +1 -1
  25. package/expression/domain/expressions.d.ts +8 -3
  26. package/expression/infrastructure/{convertFromFunction.d.ts → convertFrom/convertFromFunction.d.ts} +4 -2
  27. package/expression/infrastructure/{convertFromFunction.js → convertFrom/convertFromFunction.js} +8 -21
  28. package/expression/infrastructure/convertFrom/convertFromFunction.js.map +1 -0
  29. package/expression/infrastructure/{convertFromGraphql.d.ts → convertFrom/convertFromGraphql.d.ts} +1 -1
  30. package/expression/infrastructure/{convertFromGraphql.js → convertFrom/convertFromGraphql.js} +2 -11
  31. package/expression/infrastructure/convertFrom/convertFromGraphql.js.map +1 -0
  32. package/expression/{application → infrastructure}/expressions.d.ts +6 -8
  33. package/expression/infrastructure/expressions.js +123 -0
  34. package/expression/infrastructure/expressions.js.map +1 -0
  35. package/expression/infrastructure/index.d.ts +1 -0
  36. package/expression/infrastructure/index.js +1 -4
  37. package/expression/infrastructure/index.js.map +1 -1
  38. package/expression/infrastructure/library.d.ts +6 -4
  39. package/expression/infrastructure/library.js +241 -255
  40. package/expression/infrastructure/library.js.map +1 -1
  41. package/index.d.ts +1 -1
  42. package/index.js +4 -7
  43. package/index.js.map +1 -1
  44. package/model/application/modelService.d.ts +2 -2
  45. package/model/application/modelService.js +3 -3
  46. package/model/application/modelService.js.map +1 -1
  47. package/model/domain/index.d.ts +1 -0
  48. package/model/domain/index.js +1 -0
  49. package/model/domain/index.js.map +1 -1
  50. package/model/domain/library.d.ts +4 -0
  51. package/model/domain/library.js +3 -0
  52. package/model/domain/library.js.map +1 -0
  53. package/model/domain/services.d.ts +1 -1
  54. package/operand/application/index.d.ts +1 -0
  55. package/operand/application/index.js +1 -0
  56. package/operand/application/index.js.map +1 -1
  57. package/operand/application/services/constBuilder.d.ts +1 -1
  58. package/operand/application/services/factory.d.ts +5 -4
  59. package/operand/application/services/factory.js +9 -10
  60. package/operand/application/services/factory.js.map +1 -1
  61. package/operand/application/services/parameterService.d.ts +2 -2
  62. package/operand/application/services/parameterService.js +5 -5
  63. package/operand/application/services/parameterService.js.map +1 -1
  64. package/operand/application/services/serializer.d.ts +2 -1
  65. package/operand/application/services/serializer.js +3 -3
  66. package/operand/application/services/serializer.js.map +1 -1
  67. package/operand/application/services/typeService.d.ts +5 -3
  68. package/operand/application/services/typeService.js +11 -10
  69. package/operand/application/services/typeService.js.map +1 -1
  70. package/operand/application/useCases/complete.d.ts +4 -3
  71. package/operand/application/useCases/complete.js +8 -22
  72. package/operand/application/useCases/complete.js.map +1 -1
  73. package/operand/application/useCases/normalize.d.ts +3 -1
  74. package/operand/application/useCases/normalize.js +4 -14
  75. package/operand/application/useCases/normalize.js.map +1 -1
  76. package/operand/application/useCases/reduce.d.ts +5 -2
  77. package/operand/application/useCases/reduce.js +5 -18
  78. package/operand/application/useCases/reduce.js.map +1 -1
  79. package/operand/domain/services.d.ts +8 -3
  80. package/operand/infrastructure/constBuilder.d.ts +2 -1
  81. package/operand/infrastructure/constBuilder.js +4 -14
  82. package/operand/infrastructure/constBuilder.js.map +1 -1
  83. package/operand/infrastructure/evaluators/async.d.ts +6 -118
  84. package/operand/infrastructure/evaluators/async.js +97 -174
  85. package/operand/infrastructure/evaluators/async.js.map +1 -1
  86. package/operand/infrastructure/evaluators/sync.d.ts +8 -94
  87. package/operand/infrastructure/evaluators/sync.js +107 -193
  88. package/operand/infrastructure/evaluators/sync.js.map +1 -1
  89. package/operand/infrastructure/helper.d.ts +3 -1
  90. package/operand/infrastructure/helper.js +6 -5
  91. package/operand/infrastructure/helper.js.map +1 -1
  92. package/operand/infrastructure/index.d.ts +2 -0
  93. package/operand/infrastructure/index.js +2 -4
  94. package/operand/infrastructure/index.js.map +1 -1
  95. package/package.json +1 -1
  96. package/shared/domain/operand.js +1 -1
  97. package/shared/domain/operand.js.map +1 -1
  98. package/expression/application/expressions.js +0 -184
  99. package/expression/application/expressions.js.map +0 -1
  100. package/expression/infrastructure/convertFromFunction.js.map +0 -1
  101. package/expression/infrastructure/convertFromGraphql.js.map +0 -1
@@ -1,31 +1,24 @@
1
1
  "use strict";
2
- var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
3
- var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
4
- if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
5
- else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
6
- return c > 3 && r && Object.defineProperty(target, key, r), r;
7
- };
8
- var __metadata = (this && this.__metadata) || function (k, v) {
9
- if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
- };
11
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  exports.ExpressionConvert = void 0;
13
- const h3lp_1 = require("h3lp");
14
4
  class ExpressionConvert {
15
- getConverter(key) {
5
+ constructor() {
6
+ this.converts = {};
7
+ }
8
+ add(key, converter) {
9
+ this.converts[key] = converter;
10
+ return this;
11
+ }
12
+ get(key) {
16
13
  return this.converts[key];
17
14
  }
18
15
  convert(source, from) {
19
- const converter = this.getConverter(from);
16
+ const converter = this.get(from);
20
17
  if (converter === undefined) {
21
18
  throw new Error(`Converter ${from} not implemented`);
22
19
  }
23
20
  return converter.convert(source);
24
21
  }
25
22
  }
26
- __decorate([
27
- (0, h3lp_1.Autowired)('exp.expression.converter'),
28
- __metadata("design:type", Object)
29
- ], ExpressionConvert.prototype, "converts", void 0);
30
23
  exports.ExpressionConvert = ExpressionConvert;
31
24
  //# sourceMappingURL=convert.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"convert.js","sourceRoot":"","sources":["../../../../../src/lib/expression/application/useCases/convert.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,+BAAgC;AAGhC,MAAa,iBAAiB;IAIrB,YAAY,CAAE,GAAU;QAC/B,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAwB,CAAA;IACjD,CAAC;IAEM,OAAO,CAAE,MAAU,EAAE,IAAW;QACtC,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;QACzC,IAAI,SAAS,KAAK,SAAS,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,aAAa,IAAI,kBAAkB,CAAC,CAAA;SACpD;QACD,OAAO,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACjC,CAAC;CACD;AAdA;IAAC,IAAA,gBAAS,EAAC,0BAA0B,CAAC;;mDACjB;AAFtB,8CAeC"}
1
+ {"version":3,"file":"convert.js","sourceRoot":"","sources":["../../../../../src/lib/expression/application/useCases/convert.ts"],"names":[],"mappings":";;;AAGA,MAAa,iBAAiB;IAA9B;QACS,aAAQ,GAAO,EAAE,CAAA;IAkB1B,CAAC;IAhBO,GAAG,CAAE,GAAU,EAAE,SAA6B;QACpD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,SAAS,CAAA;QAC9B,OAAO,IAAI,CAAA;IACZ,CAAC;IAEM,GAAG,CAAE,GAAU;QACrB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAwB,CAAA;IACjD,CAAC;IAEM,OAAO,CAAE,MAAU,EAAE,IAAW;QACtC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAChC,IAAI,SAAS,KAAK,SAAS,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,aAAa,IAAI,kBAAkB,CAAC,CAAA;SACpD;QACD,OAAO,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACjC,CAAC;CACD;AAnBD,8CAmBC"}
@@ -1,8 +1,8 @@
1
1
  import { OperatorMetadata, OperatorAdditionalInfo, FunctionAdditionalInfo } from '../../operand/domain';
2
2
  import { Format, Parameter, ActionObserver, Operand } from '../../shared/domain';
3
- import { IModelService } from '../../model/domain';
3
+ import { ModelService, Library } from '../../model/domain';
4
4
  export interface IExpressions {
5
- get model(): IModelService;
5
+ get model(): ModelService;
6
6
  get enums(): [string, [string, any][]][];
7
7
  get formats(): [string, Format][];
8
8
  get constants(): [string, any][];
@@ -15,9 +15,10 @@ export interface IExpressions {
15
15
  addEnum(key: string, values: [string, any][] | any): void;
16
16
  addFormat(key: string, pattern: string): void;
17
17
  addConstant(key: string, value: any): void;
18
+ addLibrary(library: Library): IExpressions;
18
19
  convert(source: any, from: string): [string, any];
19
20
  clone(source: Operand): Operand;
20
- build(expression: string, useCache: boolean): Operand;
21
+ build(expression: string): Operand;
21
22
  parameters(expression: string): Parameter[];
22
23
  type(expression: string): string;
23
24
  eval(expression: string, data?: any): any;
@@ -25,3 +26,7 @@ export interface IExpressions {
25
26
  subscribe(observer: ActionObserver): void;
26
27
  unsubscribe(observer: ActionObserver): void;
27
28
  }
29
+ export interface ExpressionEvaluator {
30
+ eval(expression: string, data?: any): any;
31
+ evalAsync(expression: string, data?: any): Promise<any>;
32
+ }
@@ -1,6 +1,8 @@
1
- import { ExpressionConverter } from '../../';
1
+ import { ExpressionConverter } from '../../..';
2
+ import { OperandBuilder } from '../../../operand/domain';
2
3
  export declare class ExpressionConvertFunction implements ExpressionConverter {
3
- private operandBuilder;
4
+ private readonly operandBuilder;
5
+ constructor(operandBuilder: OperandBuilder);
4
6
  /**
5
7
  * Convert a lambda expression to a query expression
6
8
  * @param lambda lambda expression
@@ -1,19 +1,13 @@
1
1
  "use strict";
2
- var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
3
- var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
4
- if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
5
- else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
6
- return c > 3 && r && Object.defineProperty(target, key, r), r;
7
- };
8
- var __metadata = (this && this.__metadata) || function (k, v) {
9
- if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
- };
11
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  exports.ExpressionConvertFunction = void 0;
13
- const __1 = require("../../");
14
- const domain_1 = require("../../shared/domain");
15
- const h3lp_1 = require("h3lp");
16
- let ExpressionConvertFunction = class ExpressionConvertFunction {
4
+ const __1 = require("../../..");
5
+ const domain_1 = require("../../../shared/domain");
6
+ class ExpressionConvertFunction {
7
+ // eslint-disable-next-line no-useless-constructor
8
+ constructor(operandBuilder) {
9
+ this.operandBuilder = operandBuilder;
10
+ }
17
11
  /**
18
12
  * Convert a lambda expression to a query expression
19
13
  * @param lambda lambda expression
@@ -46,13 +40,6 @@ let ExpressionConvertFunction = class ExpressionConvertFunction {
46
40
  // Example: Orders.details.map(p=>p) => Orders.details.map(p=>p)
47
41
  return [expression, undefined];
48
42
  }
49
- };
50
- __decorate([
51
- (0, h3lp_1.Autowired)('exp.operand.builder.sync'),
52
- __metadata("design:type", Object)
53
- ], ExpressionConvertFunction.prototype, "operandBuilder", void 0);
54
- ExpressionConvertFunction = __decorate([
55
- (0, h3lp_1.Service)('exp.expression.converter.function')
56
- ], ExpressionConvertFunction);
43
+ }
57
44
  exports.ExpressionConvertFunction = ExpressionConvertFunction;
58
45
  //# sourceMappingURL=convertFromFunction.js.map
@@ -0,0 +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;YACV,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;SACzC;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;YACpC,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC5B,GAAG,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;aACrB;SACD;QACD,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAC3B,+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;gBAC9B,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;aAC1B;SACD;QACD,qDAAqD;QACrD,iEAAiE;QACjE,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,CAAA;IAC/B,CAAC;CACD;AApCD,8DAoCC"}
@@ -1,4 +1,4 @@
1
- import { ExpressionConverter } from '../application';
1
+ import { ExpressionConverter } from '../../application';
2
2
  export declare class ExpressionConvertGraphql implements ExpressionConverter {
3
3
  convert(source: any): [string, any];
4
4
  }
@@ -1,21 +1,12 @@
1
1
  "use strict";
2
- var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
3
- var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
4
- if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
5
- else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
6
- return c > 3 && r && Object.defineProperty(target, key, r), r;
7
- };
8
2
  Object.defineProperty(exports, "__esModule", { value: true });
9
3
  exports.ExpressionConvertGraphql = void 0;
10
4
  const h3lp_1 = require("h3lp");
11
- let ExpressionConvertGraphql = class ExpressionConvertGraphql {
5
+ class ExpressionConvertGraphql {
12
6
  convert(source) {
13
7
  return new GraphqlParser(source).parse();
14
8
  }
15
- };
16
- ExpressionConvertGraphql = __decorate([
17
- (0, h3lp_1.Service)('exp.expression.converter.graphql')
18
- ], ExpressionConvertGraphql);
9
+ }
19
10
  exports.ExpressionConvertGraphql = ExpressionConvertGraphql;
20
11
  class GraphqlParser {
21
12
  constructor(source) {
@@ -0,0 +1 @@
1
+ {"version":3,"file":"convertFromGraphql.js","sourceRoot":"","sources":["../../../../../src/lib/expression/infrastructure/convertFrom/convertFromGraphql.ts"],"names":[],"mappings":"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"}
@@ -1,15 +1,16 @@
1
- import { IModelService } from '../../model/domain';
1
+ import { ModelService, Library } from '../../model/domain';
2
2
  import { Operand, Parameter, Format, ActionObserver } from '../../shared/domain';
3
3
  import { OperatorMetadata, FunctionAdditionalInfo, OperatorAdditionalInfo } from '../../operand/domain';
4
4
  import { IExpressions } from '../domain';
5
5
  export declare class Expressions implements IExpressions {
6
- private observers;
7
- constructor();
6
+ model: ModelService;
8
7
  private expressionConvert;
9
8
  private parameterService;
10
9
  private operandBuild;
11
10
  private operandClone;
12
- model: IModelService;
11
+ private expressionEvaluator;
12
+ constructor();
13
+ addLibrary(library: Library): IExpressions;
13
14
  get operators(): [string, OperatorMetadata][];
14
15
  get enums(): [string, [string, any][]][];
15
16
  get formats(): [string, Format][];
@@ -45,9 +46,6 @@ export declare class Expressions implements IExpressions {
45
46
  evalAsync(expression: string, data?: any): Promise<any>;
46
47
  subscribe(observer: ActionObserver): void;
47
48
  unsubscribe(observer: ActionObserver): void;
48
- build(expression: string, useCache: boolean): Operand;
49
+ build(expression: string): Operand;
49
50
  clone(source: Operand): Operand;
50
- private beforeExecutionNotify;
51
- private afterExecutionNotify;
52
- private errorExecutionNotify;
53
51
  }
@@ -0,0 +1,123 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.Expressions = void 0;
4
+ const typ3s_1 = require("typ3s");
5
+ const h3lp_1 = require("h3lp");
6
+ const domain_1 = require("../../shared/domain");
7
+ const application_1 = require("../../operand/application");
8
+ const library_1 = require("./library");
9
+ const application_2 = require("../application");
10
+ const convert_1 = require("../application/useCases/convert");
11
+ const application_3 = require("../../model/application");
12
+ const infrastructure_1 = require("../../operand/infrastructure");
13
+ const convertFromFunction_1 = require("./convertFrom/convertFromFunction");
14
+ const convertFromGraphql_1 = require("./convertFrom/convertFromGraphql");
15
+ class Expressions {
16
+ constructor() {
17
+ const constBuilder = new infrastructure_1.ConstBuilderImpl();
18
+ this.model = new application_3.ModelServiceImpl();
19
+ this.operandClone = new application_1.OperandClone();
20
+ this.parameterService = new application_1.ParameterServiceImpl();
21
+ const operandSerializer = new application_1.OperandSerializerImpl();
22
+ const syncEvaluatorFactory = new infrastructure_1.SyncEvaluatorFactoryBuilder(this.model).build();
23
+ const asyncEvaluatorFactory = new infrastructure_1.AsyncEvaluatorFactoryBuilder(this.model).build();
24
+ this.operandBuild = new application_2.OperandBuild()
25
+ .add('sync', new application_2.OperandBuilderCacheDecorator(new application_2.OperandBuilderImpl(syncEvaluatorFactory, this.model, constBuilder), new h3lp_1.MemoryCache(), operandSerializer, syncEvaluatorFactory))
26
+ .add('async', new application_2.OperandBuilderCacheDecorator(new application_2.OperandBuilderImpl(asyncEvaluatorFactory, this.model, constBuilder), new h3lp_1.MemoryCache(), operandSerializer, asyncEvaluatorFactory));
27
+ this.expressionConvert = new convert_1.ExpressionConvert()
28
+ .add('function', new convertFromFunction_1.ExpressionConvertFunction(this.operandBuild.get('sync')))
29
+ .add('graphql', new convertFromGraphql_1.ExpressionConvertGraphql());
30
+ new library_1.CoreLibrary(this.operandBuild.get('sync')).load(this.model);
31
+ this.expressionEvaluator = new application_2.ExpressionEvaluatorObserveDecorator(new application_2.ExpressionEvaluatorImpl(this.operandBuild));
32
+ }
33
+ addLibrary(library) {
34
+ library.load(this.model);
35
+ return this;
36
+ }
37
+ get operators() {
38
+ return this.model.operators;
39
+ }
40
+ get enums() {
41
+ return this.model.enums;
42
+ }
43
+ get formats() {
44
+ return this.model.formats;
45
+ }
46
+ get constants() {
47
+ return this.model.constants;
48
+ }
49
+ get functions() {
50
+ return this.model.functions;
51
+ }
52
+ addOperator(sing, source, additionalInfo) {
53
+ this.model.addOperator(source, sing, additionalInfo);
54
+ }
55
+ addFunction(sing, source, additionalInfo) {
56
+ this.model.addFunction(sing, source, additionalInfo);
57
+ }
58
+ addEnum(key, values) {
59
+ this.model.addEnum(key, values);
60
+ }
61
+ addFormat(key, pattern) {
62
+ this.model.addFormat(key, pattern);
63
+ }
64
+ addConstant(key, value) {
65
+ this.model.addConstant(key, value);
66
+ }
67
+ addOperatorAlias(alias, reference) {
68
+ this.model.addOperatorAlias(alias, reference);
69
+ }
70
+ addFunctionAlias(alias, reference) {
71
+ this.model.addFunctionAlias(alias, reference);
72
+ }
73
+ convert(source, from) {
74
+ return this.expressionConvert.convert(source, from);
75
+ }
76
+ /**
77
+ * Get parameters of expression
78
+ * @param expression expression
79
+ * @returns Parameters of expression
80
+ */
81
+ parameters(expression) {
82
+ const operand = this.operandBuild.build(expression, 'sync');
83
+ return this.parameterService.parameters(operand);
84
+ }
85
+ /**
86
+ * Get type of expression
87
+ * @param expression expression
88
+ * @returns Type of expression
89
+ */
90
+ type(expression) {
91
+ const operand = this.operandBuild.build(expression, 'sync');
92
+ return typ3s_1.Type.stringify(operand.returnType);
93
+ }
94
+ /**
95
+ * Evaluate and solve expression
96
+ * @param expression string expression
97
+ * @param data Data with variables
98
+ * @returns Result of the evaluate expression
99
+ */
100
+ eval(expression, data) {
101
+ const context = new domain_1.Context(new domain_1.Data(data));
102
+ return this.expressionEvaluator.eval(expression, context);
103
+ }
104
+ evalAsync(expression, data = {}) {
105
+ const context = new domain_1.Context(new domain_1.Data(data));
106
+ return this.expressionEvaluator.evalAsync(expression, context);
107
+ }
108
+ // Listeners and subscribers
109
+ subscribe(observer) {
110
+ this.expressionEvaluator.subscribe(observer);
111
+ }
112
+ unsubscribe(observer) {
113
+ this.expressionEvaluator.unsubscribe(observer);
114
+ }
115
+ build(expression) {
116
+ return this.operandBuild.build(expression, 'sync');
117
+ }
118
+ clone(source) {
119
+ return this.operandClone.clone(source, 'sync');
120
+ }
121
+ }
122
+ exports.Expressions = Expressions;
123
+ //# sourceMappingURL=expressions.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"expressions.js","sourceRoot":"","sources":["../../../../src/lib/expression/infrastructure/expressions.ts"],"names":[],"mappings":"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"}
@@ -1 +1,2 @@
1
1
  export * from './helper';
2
+ export * from './expressions';
@@ -14,9 +14,6 @@ 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
- const h3lp_1 = require("h3lp");
18
- const application_1 = require("../application");
19
- h3lp_1.Factory.add('exp.operand.builder.sync', new application_1.OperandBuilder('sync'));
20
- h3lp_1.Factory.add('exp.operand.builder.async', new application_1.OperandBuilder('async'));
21
17
  __exportStar(require("./helper"), exports);
18
+ __exportStar(require("./expressions"), exports);
22
19
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/expression/infrastructure/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+BAA8B;AAC9B,gDAA+C;AAC/C,cAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,IAAI,4BAAc,CAAC,MAAM,CAAC,CAAC,CAAA;AACnE,cAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,IAAI,4BAAc,CAAC,OAAO,CAAC,CAAC,CAAA;AACrE,2CAAwB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/expression/infrastructure/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAwB;AACxB,gDAA6B"}
@@ -1,7 +1,9 @@
1
- export declare class CoreLibrary {
2
- private builder;
3
- private model;
4
- load(): void;
1
+ import { ModelService, Library } from '../../model/domain';
2
+ import { OperandBuilder } from '../../operand/domain';
3
+ export declare class CoreLibrary implements Library {
4
+ private readonly builder;
5
+ constructor(builder: OperandBuilder);
6
+ load(model: ModelService): void;
5
7
  private constants;
6
8
  private enums;
7
9
  private formats;