@celljs/core 3.5.4 → 3.5.6
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/lib/common/el/expression-handler.d.ts +1 -1
- package/lib/common/el/expression-handler.d.ts.map +1 -1
- package/lib/common/el/expression-handler.js +3 -3
- package/lib/common/el/expression-handler.js.map +1 -1
- package/lib/common/el/expression-protocol.d.ts +1 -0
- package/lib/common/el/expression-protocol.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/common/el/expression-handler.ts +3 -3
- package/src/common/el/expression-protocol.ts +1 -0
|
@@ -4,7 +4,7 @@ export declare class ExpressionHandlerImpl implements ExpressionHandler {
|
|
|
4
4
|
protected readonly expressionContextProvider: ExpressionContextProvider;
|
|
5
5
|
protected readonly expressionCompiler: ExpressionCompiler;
|
|
6
6
|
protected _ctx: ExpressionContext;
|
|
7
|
-
protected getContext(ctx?: ExpressionContext): ExpressionContext;
|
|
7
|
+
protected getContext(ctx?: ExpressionContext, expressionCompilerOptions?: ExpressionCompilerOptions): ExpressionContext;
|
|
8
8
|
handle(textOrObj: string | Object, ctx?: ExpressionContext, expressionCompilerOptions?: ExpressionCompilerOptions): any;
|
|
9
9
|
protected doHandle(text: string, ctx?: ExpressionContext, expressionCompilerOptions?: ExpressionCompilerOptions): any;
|
|
10
10
|
protected hasExpression(sections: any[]): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expression-handler.d.ts","sourceRoot":"","sources":["../../../src/common/el/expression-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAG3K,qBACa,qBAAsB,YAAW,iBAAiB;IAG3D,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC;IAG/D,SAAS,CAAC,QAAQ,CAAC,yBAAyB,EAAE,yBAAyB,CAAC;IAGxE,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAE1D,SAAS,CAAC,IAAI,EAAE,iBAAiB,CAAC;IAElC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,iBAAiB;
|
|
1
|
+
{"version":3,"file":"expression-handler.d.ts","sourceRoot":"","sources":["../../../src/common/el/expression-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAG3K,qBACa,qBAAsB,YAAW,iBAAiB;IAG3D,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC;IAG/D,SAAS,CAAC,QAAQ,CAAC,yBAAyB,EAAE,yBAAyB,CAAC;IAGxE,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAE1D,SAAS,CAAC,IAAI,EAAE,iBAAiB,CAAC;IAElC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,iBAAiB,EAAE,yBAAyB,CAAC,EAAE,yBAAyB,GAAG,iBAAiB;IAUvH,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,EAAE,iBAAiB,EAAE,yBAAyB,CAAC,EAAE,yBAAyB,GAAG,GAAG;IAgBvH,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,iBAAiB,EAAE,yBAAyB,CAAC,EAAE,yBAAyB,GAAG,GAAG;IA8BrH,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,GAAG,EAAE;CAS1C"}
|
|
@@ -6,9 +6,9 @@ const annotation_1 = require("../annotation");
|
|
|
6
6
|
const expression_protocol_1 = require("./expression-protocol");
|
|
7
7
|
const traverse = require("traverse");
|
|
8
8
|
let ExpressionHandlerImpl = class ExpressionHandlerImpl {
|
|
9
|
-
getContext(ctx) {
|
|
9
|
+
getContext(ctx, expressionCompilerOptions) {
|
|
10
10
|
const c = ctx || this.expressionContextProvider.provide();
|
|
11
|
-
if (!ctx && c !== this._ctx) {
|
|
11
|
+
if (!ctx && c !== this._ctx && !(expressionCompilerOptions === null || expressionCompilerOptions === void 0 ? void 0 : expressionCompilerOptions.ignoreContextExpression)) {
|
|
12
12
|
this._ctx = c;
|
|
13
13
|
this.handle(c, c);
|
|
14
14
|
}
|
|
@@ -35,7 +35,7 @@ let ExpressionHandlerImpl = class ExpressionHandlerImpl {
|
|
|
35
35
|
const sections = this.expressionCompiler.compileSections(text, expressionCompilerOptions);
|
|
36
36
|
if (sections.length > 0) {
|
|
37
37
|
if (this.hasExpression(sections)) {
|
|
38
|
-
const c = this.getContext(ctx);
|
|
38
|
+
const c = this.getContext(ctx, expressionCompilerOptions);
|
|
39
39
|
if (sections.length === 1) {
|
|
40
40
|
let value = sections[0].evalSync(c);
|
|
41
41
|
if (typeof value === 'string') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expression-handler.js","sourceRoot":"","sources":["../../../src/common/el/expression-handler.ts"],"names":[],"mappings":";;;;AAAA,8CAAqD;AACrD,+DAA2K;AAC3K,qCAAqC;AAG9B,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAapB,UAAU,CAAC,GAAuB;
|
|
1
|
+
{"version":3,"file":"expression-handler.js","sourceRoot":"","sources":["../../../src/common/el/expression-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expression-protocol.d.ts","sourceRoot":"","sources":["../../../src/common/el/expression-protocol.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,kBAAkB,eAA+B,CAAC;AAC/D,eAAO,MAAM,iBAAiB,eAA8B,CAAC;AAC7D,eAAO,MAAM,kBAAkB,eAA+B,CAAC;AAC/D,eAAO,MAAM,yBAAyB,eAAsC,CAAC;AAC7E,eAAO,MAAM,kBAAkB,eAA+B,CAAC;AAE/D,MAAM,WAAW,kBAAkB;IAC/B,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,yBAAyB,GAAG,GAAG,EAAE,CAAA;CAC5E;AAED,MAAM,WAAW,iBAAiB;IAE9B,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,EAAE,iBAAiB,EAAE,yBAAyB,CAAC,EAAE,yBAAyB,GAAG,GAAG,CAAC;CAEtH;AAED,MAAM,WAAW,iBAAiB;IAC9B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACtB;AAED,MAAM,WAAW,yBAAyB;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"expression-protocol.d.ts","sourceRoot":"","sources":["../../../src/common/el/expression-protocol.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,kBAAkB,eAA+B,CAAC;AAC/D,eAAO,MAAM,iBAAiB,eAA8B,CAAC;AAC7D,eAAO,MAAM,kBAAkB,eAA+B,CAAC;AAC/D,eAAO,MAAM,yBAAyB,eAAsC,CAAC;AAC7E,eAAO,MAAM,kBAAkB,eAA+B,CAAC;AAE/D,MAAM,WAAW,kBAAkB;IAC/B,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,yBAAyB,GAAG,GAAG,EAAE,CAAA;CAC5E;AAED,MAAM,WAAW,iBAAiB;IAE9B,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,EAAE,iBAAiB,EAAE,yBAAyB,CAAC,EAAE,yBAAyB,GAAG,GAAG,CAAC;CAEtH;AAED,MAAM,WAAW,iBAAiB;IAC9B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACtB;AAED,MAAM,WAAW,yBAAyB;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACrC;AAED,MAAM,WAAW,kBAAkB;IAE/B,UAAU,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACzC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,yBAAyB;IAEtC,OAAO,IAAI,iBAAiB,CAAC;CAChC;AAED,MAAM,WAAW,kBAAkB,CAAC,CAAC;IAEjC,OAAO,IAAI,CAAC,CAAA;CACf"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@celljs/core",
|
|
3
|
-
"version": "3.5.
|
|
3
|
+
"version": "3.5.6",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "lib/common/index.js",
|
|
6
6
|
"typings": "lib/common/index.d.ts",
|
|
@@ -48,9 +48,9 @@
|
|
|
48
48
|
"test": "cell-component test:js"
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
51
|
-
"@celljs/component": "3.5.
|
|
51
|
+
"@celljs/component": "3.5.6",
|
|
52
52
|
"@types/jexl": "^2.2.0",
|
|
53
53
|
"@types/traverse": "^0.6.32"
|
|
54
54
|
},
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "0846bb0df3a8622813290987bc97d3c9486eab7e"
|
|
56
56
|
}
|
|
@@ -16,10 +16,10 @@ export class ExpressionHandlerImpl implements ExpressionHandler {
|
|
|
16
16
|
|
|
17
17
|
protected _ctx: ExpressionContext;
|
|
18
18
|
|
|
19
|
-
protected getContext(ctx?: ExpressionContext) {
|
|
19
|
+
protected getContext(ctx?: ExpressionContext, expressionCompilerOptions?: ExpressionCompilerOptions): ExpressionContext {
|
|
20
20
|
const c = ctx || this.expressionContextProvider.provide();
|
|
21
21
|
|
|
22
|
-
if (!ctx && c !== this._ctx) {
|
|
22
|
+
if (!ctx && c !== this._ctx && !expressionCompilerOptions?.ignoreContextExpression) {
|
|
23
23
|
this._ctx = c;
|
|
24
24
|
this.handle(c, c);
|
|
25
25
|
}
|
|
@@ -46,7 +46,7 @@ export class ExpressionHandlerImpl implements ExpressionHandler {
|
|
|
46
46
|
const sections = this.expressionCompiler.compileSections(text, expressionCompilerOptions);
|
|
47
47
|
if (sections.length > 0) {
|
|
48
48
|
if (this.hasExpression(sections)) {
|
|
49
|
-
const c = this.getContext(ctx);
|
|
49
|
+
const c = this.getContext(ctx, expressionCompilerOptions);
|
|
50
50
|
if (sections.length === 1) {
|
|
51
51
|
let value = sections[0].evalSync(c);
|
|
52
52
|
if (typeof value === 'string') {
|