3xpr 1.5.10 → 1.6.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/expression/contract/managers.d.ts +1 -0
- package/expression/contract/operand.d.ts +0 -1
- package/expression/contract/operand.js +0 -1
- package/expression/contract/operand.js.map +1 -1
- package/expression/expressions.d.ts +2 -2
- package/expression/expressions.js +2 -2
- package/expression/expressions.js.map +1 -1
- package/package.json +1 -1
|
@@ -72,6 +72,7 @@ export interface IExpressions {
|
|
|
72
72
|
addFormat(key: string, pattern: string): void;
|
|
73
73
|
addConstant(key: string, value: any): void;
|
|
74
74
|
clone(operand: Operand): Operand;
|
|
75
|
+
build(expression: string): Operand;
|
|
75
76
|
parameters(expression: string): Parameter[];
|
|
76
77
|
type(expression: string): string;
|
|
77
78
|
eval(expression: string, data?: any): any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operand.js","sourceRoot":"","sources":["../../../../src/lib/expression/contract/operand.ts"],"names":[],"mappings":";;;AAEA,IAAY,
|
|
1
|
+
{"version":3,"file":"operand.js","sourceRoot":"","sources":["../../../../src/lib/expression/contract/operand.ts"],"names":[],"mappings":";;;AAEA,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"}
|
|
@@ -3,7 +3,7 @@ export declare class ExpressionsBuilder implements IBuilder<IExpressions> {
|
|
|
3
3
|
build(): IExpressions;
|
|
4
4
|
}
|
|
5
5
|
export declare class Expressions implements IExpressions {
|
|
6
|
-
|
|
6
|
+
readonly model: IModelManager;
|
|
7
7
|
private readonly basic;
|
|
8
8
|
private readonly process;
|
|
9
9
|
private readonly typeManager;
|
|
@@ -48,7 +48,7 @@ export declare class Expressions implements IExpressions {
|
|
|
48
48
|
run(expression: string, data?: any): any;
|
|
49
49
|
subscribe(observer: ActionObserver): void;
|
|
50
50
|
unsubscribe(observer: ActionObserver): void;
|
|
51
|
-
|
|
51
|
+
build(expression: string): Operand;
|
|
52
52
|
private processBuild;
|
|
53
53
|
private typed;
|
|
54
54
|
private beforeExecutionNotify;
|
|
@@ -103,7 +103,7 @@ class Expressions {
|
|
|
103
103
|
const context = new contract_1.Context(new contract_1.Data(data));
|
|
104
104
|
try {
|
|
105
105
|
this.beforeExecutionNotify(expression, context);
|
|
106
|
-
const operand = this.
|
|
106
|
+
const operand = this.build(expression);
|
|
107
107
|
const result = operand.eval(context);
|
|
108
108
|
this.afterExecutionNotify(expression, context, result);
|
|
109
109
|
return result;
|
|
@@ -138,7 +138,7 @@ class Expressions {
|
|
|
138
138
|
}
|
|
139
139
|
this.observers.splice(index, 1);
|
|
140
140
|
}
|
|
141
|
-
|
|
141
|
+
build(expression) {
|
|
142
142
|
try {
|
|
143
143
|
const key = h3lp_1.h3lp.utils.hashCode(expression);
|
|
144
144
|
const value = this.cache.get(key);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expressions.js","sourceRoot":"","sources":["../../../src/lib/expression/expressions.ts"],"names":[],"mappings":";;;AAAA,yCAAoO;AACpO,uCAAuH;AACvH,uCAAiD;AACjD,+BAAgD;AAChD,wBAAkC;AAElC,gDAAgD;AAChD,MAAa,kBAAkB;IACvB,KAAK;QACX,MAAM,KAAK,GAAG,IAAI,sBAAY,EAAE,CAAA;QAChC,MAAM,WAAW,GAAG,IAAI,qBAAW,CAAC,KAAK,CAAC,CAAA;QAC1C,MAAM,UAAU,GAAG,IAAI,2BAAiB,CAAC,KAAK,CAAC,CAAA;QAC/C,MAAM,OAAO,GAAG,IAAI,wBAAc,CAAC,KAAK,CAAC,CAAA;QACzC,MAAM,KAAK,GAAG,IAAI,iBAAc,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,0BAAgB,CAAC,KAAK,CAAC,CAAC,CAAA;QACzF,MAAM,OAAO,GAAG,IAAI,iBAAc,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,+BAAqB,CAAC,KAAK,CAAC,CAAC,CAAA;QAChG,IAAI,qBAAW,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAA;QAC7B,OAAO,IAAI,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,CAAC,CAAA;IAC3D,CAAC;CACD;AAXD,gDAWC;AAED,MAAa,WAAW;IAIvB,
|
|
1
|
+
{"version":3,"file":"expressions.js","sourceRoot":"","sources":["../../../src/lib/expression/expressions.ts"],"names":[],"mappings":"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"}
|