@celljs/core 3.5.1 → 3.5.2
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expression-compiler.d.ts","sourceRoot":"","sources":["../../../src/common/el/expression-compiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAG1G,UAAU,gBAAgB;IACtB,UAAU,EAAE,GAAG,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBACa,sBAAuB,YAAW,kBAAkB;IAE7D,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,YAAY,CAAO;IAC3B,OAAO,CAAC,aAAa,CAAO;IAC5B,OAAO,CAAC,WAAW,CAAO;IAG1B,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC;IAE/D,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,yBAAyB,CAAC,GAAG,MAAM;IAO9E,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,QAAQ,CAAC,yBAAyB,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO;IAOhG,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,yBAAyB,GAAG,GAAG,EAAE;IAwBxE,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,yBAAyB,CAAC,GAAG,gBAAgB,GAAG,SAAS;
|
|
1
|
+
{"version":3,"file":"expression-compiler.d.ts","sourceRoot":"","sources":["../../../src/common/el/expression-compiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAG1G,UAAU,gBAAgB;IACtB,UAAU,EAAE,GAAG,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBACa,sBAAuB,YAAW,kBAAkB;IAE7D,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,YAAY,CAAO;IAC3B,OAAO,CAAC,aAAa,CAAO;IAC5B,OAAO,CAAC,WAAW,CAAO;IAG1B,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC;IAE/D,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,yBAAyB,CAAC,GAAG,MAAM;IAO9E,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,QAAQ,CAAC,yBAAyB,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO;IAOhG,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,yBAAyB,GAAG,GAAG,EAAE;IAwBxE,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,yBAAyB,CAAC,GAAG,gBAAgB,GAAG,SAAS;IAgBjH,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,mBAAmB,oBAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,yBAAyB,CAAC,GAAG,gBAAgB,GAAG,SAAS;IAuDjJ,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,yBAAyB,CAAC,GAAG,gBAAgB;CAmDrG"}
|
|
@@ -47,11 +47,13 @@ let ExpressionCompilerImpl = class ExpressionCompilerImpl {
|
|
|
47
47
|
}
|
|
48
48
|
middleCompile(text, options) {
|
|
49
49
|
let me;
|
|
50
|
-
|
|
51
|
-
|
|
50
|
+
const prefix = `${this.getSpecialChar(options)}${options.bracketBegin}`;
|
|
51
|
+
const prefix2 = `${prefix}${options.bracketBegin}`;
|
|
52
|
+
if (text.startsWith(prefix2)) {
|
|
53
|
+
me = this.nextMiddleExpression(text.substring(prefix2.length), 2, options);
|
|
52
54
|
}
|
|
53
|
-
else if (text.startsWith(
|
|
54
|
-
me = this.nextMiddleExpression(text.substring(
|
|
55
|
+
else if (text.startsWith(prefix)) {
|
|
56
|
+
me = this.nextMiddleExpression(text.substring(prefix.length), undefined, options);
|
|
55
57
|
}
|
|
56
58
|
else {
|
|
57
59
|
me = this.nextString(text, options);
|
|
@@ -143,15 +145,17 @@ let ExpressionCompilerImpl = class ExpressionCompilerImpl {
|
|
|
143
145
|
}
|
|
144
146
|
escaped = false;
|
|
145
147
|
}
|
|
146
|
-
else if (specialCharFound) {
|
|
148
|
+
else if (specialCharFound || options.ignoreSpecialChar) {
|
|
147
149
|
if (options.bracketBegin === c) {
|
|
148
150
|
const expression = section.join('');
|
|
149
|
-
const nextText = text.substring(i - 1);
|
|
151
|
+
const nextText = options.ignoreSpecialChar ? text.substring(i) : text.substring(i - 1);
|
|
150
152
|
return { expression, nextText };
|
|
151
153
|
}
|
|
152
154
|
else {
|
|
153
|
-
|
|
154
|
-
|
|
155
|
+
if (!options.ignoreSpecialChar) {
|
|
156
|
+
specialCharFound = false;
|
|
157
|
+
section.push(options.specialChar);
|
|
158
|
+
}
|
|
155
159
|
section.push(c);
|
|
156
160
|
}
|
|
157
161
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expression-compiler.js","sourceRoot":"","sources":["../../../src/common/el/expression-compiler.ts"],"names":[],"mappings":";;;;AAAA,+DAA0G;AAC1G,8CAAqD;AAQ9C,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAA5B;QAEK,gBAAW,GAAG,IAAI,CAAC;QACnB,iBAAY,GAAG,GAAG,CAAC;QACnB,kBAAa,GAAG,GAAG,CAAC;QACpB,gBAAW,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"expression-compiler.js","sourceRoot":"","sources":["../../../src/common/el/expression-compiler.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@celljs/core",
|
|
3
|
-
"version": "3.5.
|
|
3
|
+
"version": "3.5.2",
|
|
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.2",
|
|
52
52
|
"@types/jexl": "^2.2.0",
|
|
53
53
|
"@types/traverse": "^0.6.32"
|
|
54
54
|
},
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "4dc9306d54b4ff068f18e0183426946a4afe2500"
|
|
56
56
|
}
|
|
@@ -57,10 +57,12 @@ export class ExpressionCompilerImpl implements ExpressionCompiler {
|
|
|
57
57
|
|
|
58
58
|
protected middleCompile(text: string, options: Required<ExpressionCompilerOptions>): MiddleExpression | undefined {
|
|
59
59
|
let me: MiddleExpression | undefined;
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
me = this.nextMiddleExpression(text.substring(
|
|
60
|
+
const prefix = `${this.getSpecialChar(options)}${options.bracketBegin}`;
|
|
61
|
+
const prefix2 = `${prefix}${options.bracketBegin}`;
|
|
62
|
+
if (text.startsWith(prefix2)) {
|
|
63
|
+
me = this.nextMiddleExpression(text.substring(prefix2.length), 2, options);
|
|
64
|
+
} else if (text.startsWith(prefix)) {
|
|
65
|
+
me = this.nextMiddleExpression(text.substring(prefix.length), undefined, options);
|
|
64
66
|
} else {
|
|
65
67
|
me = this.nextString(text, options);
|
|
66
68
|
}
|
|
@@ -149,14 +151,16 @@ export class ExpressionCompilerImpl implements ExpressionCompiler {
|
|
|
149
151
|
}
|
|
150
152
|
escaped = false;
|
|
151
153
|
} else
|
|
152
|
-
if (specialCharFound) {
|
|
154
|
+
if (specialCharFound || options.ignoreSpecialChar) {
|
|
153
155
|
if (options.bracketBegin === c) {
|
|
154
156
|
const expression = section.join('');
|
|
155
|
-
const nextText = text.substring(i - 1);
|
|
157
|
+
const nextText = options.ignoreSpecialChar ? text.substring(i) : text.substring(i - 1);
|
|
156
158
|
return { expression, nextText };
|
|
157
159
|
} else {
|
|
158
|
-
|
|
159
|
-
|
|
160
|
+
if (!options.ignoreSpecialChar) {
|
|
161
|
+
specialCharFound = false;
|
|
162
|
+
section.push(options.specialChar);
|
|
163
|
+
}
|
|
160
164
|
section.push(c);
|
|
161
165
|
}
|
|
162
166
|
} else {
|