@celljs/core 3.9.0 → 4.1.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/README.md +0 -6
- package/cell.remote.yml +8 -0
- package/cell.yml +0 -3
- package/esm/common/application/application-entry.js +21 -3
- package/esm/common/application/application-entry.js.map +1 -1
- package/esm/common/application/application-host.d.ts +38 -0
- package/esm/common/application/application-host.js +17 -0
- package/esm/common/application/application-host.js.map +1 -0
- package/esm/common/application/application-protocol.js +1 -1
- package/esm/common/application/application-protocol.js.map +1 -1
- package/esm/common/application/index.d.ts +1 -0
- package/esm/common/application/index.js +1 -0
- package/esm/common/application/index.js.map +1 -1
- package/esm/common/config/config-provider.js +2 -1
- package/esm/common/config/config-provider.js.map +1 -1
- package/esm/common/config/env-config-util.d.ts +48 -0
- package/esm/common/config/env-config-util.js +185 -0
- package/esm/common/config/env-config-util.js.map +1 -0
- package/esm/common/config/index.d.ts +1 -0
- package/esm/common/config/index.js +1 -0
- package/esm/common/config/index.js.map +1 -1
- package/esm/common/container/auto-bind.js +26 -12
- package/esm/common/container/auto-bind.js.map +1 -1
- package/esm/common/el/expression-compiler.d.ts +4 -15
- package/esm/common/el/expression-compiler.js +6 -163
- package/esm/common/el/expression-compiler.js.map +1 -1
- package/esm/common/el/expression-handler.d.ts +7 -2
- package/esm/common/el/expression-handler.js +14 -53
- package/esm/common/el/expression-handler.js.map +1 -1
- package/esm/common/el/expression-util.d.ts +68 -0
- package/esm/common/el/expression-util.js +347 -0
- package/esm/common/el/expression-util.js.map +1 -0
- package/esm/common/el/index.d.ts +1 -0
- package/esm/common/el/index.js +1 -0
- package/esm/common/el/index.js.map +1 -1
- package/esm/common/logger/abstract-logger.d.ts +4 -2
- package/esm/common/logger/abstract-logger.js +11 -6
- package/esm/common/logger/abstract-logger.js.map +1 -1
- package/esm/common/logger/logger-protocol.d.ts +4 -0
- package/esm/common/logger/logger-protocol.js +2 -0
- package/esm/common/logger/logger-protocol.js.map +1 -1
- package/esm/common/logger/logger.js +7 -7
- package/esm/common/logger/logger.js.map +1 -1
- package/esm/common/test/mock-logger.d.ts +1 -0
- package/esm/common/test/mock-logger.js +3 -0
- package/esm/common/test/mock-logger.js.map +1 -1
- package/esm/common/utils/emitter.d.ts +1 -10
- package/esm/common/utils/emitter.js +0 -56
- package/esm/common/utils/emitter.js.map +1 -1
- package/esm/common/utils/mime-type-util.js +1 -1
- package/esm/common/utils/mime-type-util.js.map +1 -1
- package/esm/common/utils/mime-type.js +1 -1
- package/esm/common/utils/mime-type.js.map +1 -1
- package/esm/node/context/context.d.ts +11 -2
- package/esm/node/context/context.js +36 -12
- package/esm/node/context/context.js.map +1 -1
- package/esm/node/index.d.ts +0 -1
- package/esm/node/index.js +0 -1
- package/esm/node/index.js.map +1 -1
- package/lib/common/aop/aop.spec.d.ts +2 -0
- package/lib/common/aop/aop.spec.d.ts.map +1 -0
- package/lib/common/aop/aop.spec.js +170 -0
- package/lib/common/aop/aop.spec.js.map +1 -0
- package/lib/common/application/application-entry.d.ts.map +1 -1
- package/lib/common/application/application-entry.js +21 -3
- package/lib/common/application/application-entry.js.map +1 -1
- package/lib/common/application/application-host.d.ts +39 -0
- package/lib/common/application/application-host.d.ts.map +1 -0
- package/lib/common/application/application-host.js +20 -0
- package/lib/common/application/application-host.js.map +1 -0
- package/lib/common/application/application-protocol.js +1 -1
- package/lib/common/application/application-protocol.js.map +1 -1
- package/lib/common/application/index.d.ts +1 -0
- package/lib/common/application/index.d.ts.map +1 -1
- package/lib/common/application/index.js +1 -0
- package/lib/common/application/index.js.map +1 -1
- package/lib/common/application/lifecycle.spec.d.ts +2 -0
- package/lib/common/application/lifecycle.spec.d.ts.map +1 -0
- package/lib/common/application/lifecycle.spec.js +155 -0
- package/lib/common/application/lifecycle.spec.js.map +1 -0
- package/lib/common/config/config-provider.js +2 -1
- package/lib/common/config/config-provider.js.map +1 -1
- package/lib/common/config/env-config-util.d.ts +49 -0
- package/lib/common/config/env-config-util.d.ts.map +1 -0
- package/lib/common/config/env-config-util.js +188 -0
- package/lib/common/config/env-config-util.js.map +1 -0
- package/lib/common/config/env-config-util.spec.d.ts +2 -0
- package/lib/common/config/env-config-util.spec.d.ts.map +1 -0
- package/lib/common/config/env-config-util.spec.js +314 -0
- package/lib/common/config/env-config-util.spec.js.map +1 -0
- package/lib/common/config/index.d.ts +1 -0
- package/lib/common/config/index.d.ts.map +1 -1
- package/lib/common/config/index.js +1 -0
- package/lib/common/config/index.js.map +1 -1
- package/lib/common/container/assembly.spec.d.ts +2 -0
- package/lib/common/container/assembly.spec.d.ts.map +1 -0
- package/lib/common/container/assembly.spec.js +464 -0
- package/lib/common/container/assembly.spec.js.map +1 -0
- package/lib/common/container/auto-bind.js +26 -12
- package/lib/common/container/auto-bind.js.map +1 -1
- package/lib/common/el/expression-compiler.d.ts +4 -15
- package/lib/common/el/expression-compiler.d.ts.map +1 -1
- package/lib/common/el/expression-compiler.js +6 -163
- package/lib/common/el/expression-compiler.js.map +1 -1
- package/lib/common/el/expression-handler.d.ts +7 -2
- package/lib/common/el/expression-handler.d.ts.map +1 -1
- package/lib/common/el/expression-handler.js +14 -56
- package/lib/common/el/expression-handler.js.map +1 -1
- package/lib/common/el/expression-handler.spec.d.ts +2 -0
- package/lib/common/el/expression-handler.spec.d.ts.map +1 -0
- package/lib/common/el/expression-handler.spec.js +99 -0
- package/lib/common/el/expression-handler.spec.js.map +1 -0
- package/lib/common/el/expression-util.d.ts +69 -0
- package/lib/common/el/expression-util.d.ts.map +1 -0
- package/lib/common/el/expression-util.js +352 -0
- package/lib/common/el/expression-util.js.map +1 -0
- package/lib/common/el/expression-util.spec.d.ts +2 -0
- package/lib/common/el/expression-util.spec.d.ts.map +1 -0
- package/lib/common/el/expression-util.spec.js +45 -0
- package/lib/common/el/expression-util.spec.js.map +1 -0
- package/lib/common/el/index.d.ts +1 -0
- package/lib/common/el/index.d.ts.map +1 -1
- package/lib/common/el/index.js +1 -0
- package/lib/common/el/index.js.map +1 -1
- package/lib/common/el/value-and-el.spec.d.ts +2 -0
- package/lib/common/el/value-and-el.spec.d.ts.map +1 -0
- package/lib/common/el/value-and-el.spec.js +216 -0
- package/lib/common/el/value-and-el.spec.js.map +1 -0
- package/lib/common/logger/abstract-logger.d.ts +4 -2
- package/lib/common/logger/abstract-logger.d.ts.map +1 -1
- package/lib/common/logger/abstract-logger.js +10 -5
- package/lib/common/logger/abstract-logger.js.map +1 -1
- package/lib/common/logger/logger-protocol.d.ts +4 -0
- package/lib/common/logger/logger-protocol.d.ts.map +1 -1
- package/lib/common/logger/logger-protocol.js +3 -1
- package/lib/common/logger/logger-protocol.js.map +1 -1
- package/lib/common/logger/logger.js +7 -7
- package/lib/common/logger/logger.js.map +1 -1
- package/lib/common/logger/logger.spec.d.ts +2 -0
- package/lib/common/logger/logger.spec.d.ts.map +1 -0
- package/lib/common/logger/logger.spec.js +57 -0
- package/lib/common/logger/logger.spec.js.map +1 -0
- package/lib/common/test/mock-logger.d.ts +1 -0
- package/lib/common/test/mock-logger.d.ts.map +1 -1
- package/lib/common/test/mock-logger.js +3 -0
- package/lib/common/test/mock-logger.js.map +1 -1
- package/lib/common/utils/emitter.d.ts +1 -10
- package/lib/common/utils/emitter.d.ts.map +1 -1
- package/lib/common/utils/emitter.js +1 -58
- package/lib/common/utils/emitter.js.map +1 -1
- package/lib/common/utils/mime-type-util.js +1 -1
- package/lib/common/utils/mime-type-util.js.map +1 -1
- package/lib/common/utils/mime-type.js +1 -1
- package/lib/common/utils/mime-type.js.map +1 -1
- package/lib/common/utils/utils-behavior.spec.d.ts +2 -0
- package/lib/common/utils/utils-behavior.spec.d.ts.map +1 -0
- package/lib/common/utils/utils-behavior.spec.js +232 -0
- package/lib/common/utils/utils-behavior.spec.js.map +1 -0
- package/lib/node/context/context.d.ts +11 -2
- package/lib/node/context/context.d.ts.map +1 -1
- package/lib/node/context/context.js +36 -10
- package/lib/node/context/context.js.map +1 -1
- package/lib/node/context/context.spec.d.ts +2 -0
- package/lib/node/context/context.spec.d.ts.map +1 -0
- package/lib/node/context/context.spec.js +202 -0
- package/lib/node/context/context.spec.js.map +1 -0
- package/lib/node/index.d.ts +0 -1
- package/lib/node/index.d.ts.map +1 -1
- package/lib/node/index.js +0 -1
- package/lib/node/index.js.map +1 -1
- package/package.json +20 -41
- package/src/common/aop/aop.spec.ts +145 -0
- package/src/common/application/application-entry.ts +20 -4
- package/src/common/application/application-host.ts +46 -0
- package/src/common/application/application-protocol.ts +1 -1
- package/src/common/application/index.ts +1 -0
- package/src/common/application/lifecycle.spec.ts +148 -0
- package/src/common/config/config-provider.ts +1 -1
- package/src/common/config/env-config-util.spec.ts +341 -0
- package/src/common/config/env-config-util.ts +225 -0
- package/src/common/config/index.ts +1 -0
- package/src/common/container/assembly.spec.ts +293 -0
- package/src/common/container/auto-bind.ts +23 -10
- package/src/common/el/expression-compiler.ts +6 -166
- package/src/common/el/expression-handler.spec.ts +110 -0
- package/src/common/el/expression-handler.ts +14 -51
- package/src/common/el/expression-util.spec.ts +45 -0
- package/src/common/el/expression-util.ts +363 -0
- package/src/common/el/index.ts +2 -1
- package/src/common/el/value-and-el.spec.ts +186 -0
- package/src/common/logger/abstract-logger.ts +12 -6
- package/src/common/logger/logger-protocol.ts +5 -0
- package/src/common/logger/logger.spec.ts +61 -0
- package/src/common/logger/logger.ts +7 -7
- package/src/common/test/mock-logger.ts +3 -0
- package/src/common/utils/emitter.ts +1 -63
- package/src/common/utils/mime-type-util.ts +1 -1
- package/src/common/utils/mime-type.ts +1 -1
- package/src/common/utils/utils-behavior.spec.ts +259 -0
- package/src/node/context/context.spec.ts +219 -0
- package/src/node/context/context.ts +35 -10
- package/src/node/index.ts +0 -1
- package/cell-remote.yml +0 -3
- package/esm/node/utils/crc.d.ts +0 -1
- package/esm/node/utils/crc.js +0 -7
- package/esm/node/utils/crc.js.map +0 -1
- package/esm/node/utils/index.d.ts +0 -1
- package/esm/node/utils/index.js +0 -2
- package/esm/node/utils/index.js.map +0 -1
- package/lib/node/utils/crc.d.ts +0 -2
- package/lib/node/utils/crc.d.ts.map +0 -1
- package/lib/node/utils/crc.js +0 -10
- package/lib/node/utils/crc.js.map +0 -1
- package/lib/node/utils/index.d.ts +0 -2
- package/lib/node/utils/index.d.ts.map +0 -1
- package/lib/node/utils/index.js +0 -18
- package/lib/node/utils/index.js.map +0 -1
- package/src/node/utils/crc.ts +0 -7
- package/src/node/utils/index.ts +0 -1
|
@@ -10,173 +10,16 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.ExpressionCompilerImpl = void 0;
|
|
13
|
-
const expression_protocol_1 = require("./expression-protocol");
|
|
14
13
|
const annotation_1 = require("../annotation");
|
|
14
|
+
const expression_protocol_1 = require("./expression-protocol");
|
|
15
|
+
const expression_util_1 = require("./expression-util");
|
|
16
|
+
/** The {@link ExpressionSectionCompiler} on the jexl engine of the container (with its transforms). */
|
|
15
17
|
let ExpressionCompilerImpl = class ExpressionCompilerImpl {
|
|
16
18
|
constructor() {
|
|
17
|
-
this.
|
|
18
|
-
this.SPECIAL_CHAR = '$';
|
|
19
|
-
this.BRACKET_BEGIN = '{';
|
|
20
|
-
this.BRACKET_END = '}';
|
|
21
|
-
}
|
|
22
|
-
getSpecialChar(opitons) {
|
|
23
|
-
if (opitons.ignoreSpecialChar) {
|
|
24
|
-
return '';
|
|
25
|
-
}
|
|
26
|
-
return opitons.specialChar;
|
|
27
|
-
}
|
|
28
|
-
equalsSpecialChar(opitons, char) {
|
|
29
|
-
if (opitons.ignoreSpecialChar) {
|
|
30
|
-
return false;
|
|
31
|
-
}
|
|
32
|
-
return char === opitons.specialChar;
|
|
33
|
-
}
|
|
34
|
-
compileSections(text, options) {
|
|
35
|
-
const merged = {
|
|
36
|
-
...{ escapeChar: this.ESCAPE_CHAR, specialChar: this.SPECIAL_CHAR, bracketBegin: this.BRACKET_BEGIN, bracketEnd: this.BRACKET_END, ...options }
|
|
37
|
-
};
|
|
38
|
-
if (!text || text.indexOf(`${this.getSpecialChar(merged)}${merged.bracketBegin}`) < 0) {
|
|
39
|
-
return [];
|
|
40
|
-
}
|
|
41
|
-
const sections = [];
|
|
42
|
-
let middleText = text;
|
|
43
|
-
while (middleText) {
|
|
44
|
-
const me = this.middleCompile(middleText, merged);
|
|
45
|
-
if (!me) {
|
|
46
|
-
sections.push(middleText);
|
|
47
|
-
middleText = undefined;
|
|
48
|
-
}
|
|
49
|
-
else {
|
|
50
|
-
sections.push(me.expression);
|
|
51
|
-
middleText = me.nextText;
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
return sections;
|
|
55
|
-
}
|
|
56
|
-
middleCompile(text, options) {
|
|
57
|
-
let me;
|
|
58
|
-
const prefix = `${this.getSpecialChar(options)}${options.bracketBegin}`;
|
|
59
|
-
const prefix2 = `${prefix}${options.bracketBegin}`;
|
|
60
|
-
if (text.startsWith(prefix2)) {
|
|
61
|
-
me = this.nextMiddleExpression(text.substring(prefix2.length), 2, options);
|
|
62
|
-
}
|
|
63
|
-
else if (text.startsWith(prefix)) {
|
|
64
|
-
me = this.nextMiddleExpression(text.substring(prefix.length), undefined, options);
|
|
65
|
-
}
|
|
66
|
-
else {
|
|
67
|
-
me = this.nextString(text, options);
|
|
68
|
-
}
|
|
69
|
-
return me;
|
|
70
|
-
}
|
|
71
|
-
nextMiddleExpression(text, bracketBeginCharNum = 1, options) {
|
|
72
|
-
let stringed = false;
|
|
73
|
-
let escaped = false;
|
|
74
|
-
let bracketBeginCharFound = 0;
|
|
75
|
-
const section = [];
|
|
76
|
-
for (let i = 0; i < text.length; i++) {
|
|
77
|
-
const c = text[i];
|
|
78
|
-
if (!escaped) {
|
|
79
|
-
if ('\'' === c || '"' === c) {
|
|
80
|
-
stringed = !stringed;
|
|
81
|
-
section.push(c);
|
|
82
|
-
continue;
|
|
83
|
-
}
|
|
84
|
-
else if (c === options.escapeChar) {
|
|
85
|
-
escaped = true;
|
|
86
|
-
continue;
|
|
87
|
-
}
|
|
88
|
-
}
|
|
89
|
-
if (stringed) {
|
|
90
|
-
section.push(c);
|
|
91
|
-
escaped = false;
|
|
92
|
-
}
|
|
93
|
-
else if (escaped) {
|
|
94
|
-
if (this.equalsSpecialChar(options, c) || options.bracketBegin === c || options.bracketEnd === c) {
|
|
95
|
-
section.push(c);
|
|
96
|
-
}
|
|
97
|
-
else {
|
|
98
|
-
section.push(options.escapeChar);
|
|
99
|
-
section.push(c);
|
|
100
|
-
}
|
|
101
|
-
escaped = false;
|
|
102
|
-
}
|
|
103
|
-
else if (options.bracketBegin === c) {
|
|
104
|
-
bracketBeginCharFound++;
|
|
105
|
-
section.push(c);
|
|
106
|
-
}
|
|
107
|
-
else if (options.bracketEnd === c) {
|
|
108
|
-
if (bracketBeginCharFound === 0 && bracketBeginCharNum === 1) {
|
|
109
|
-
const jexlEngine = this.jexlEngineProvider.provide();
|
|
110
|
-
const expression = jexlEngine.createExpression(section.join(''));
|
|
111
|
-
let nextText;
|
|
112
|
-
if (i !== text.length - 1) {
|
|
113
|
-
nextText = text.substring(i + 1);
|
|
114
|
-
}
|
|
115
|
-
return { expression, nextText };
|
|
116
|
-
}
|
|
117
|
-
else if (bracketBeginCharFound > 0) {
|
|
118
|
-
bracketBeginCharFound--;
|
|
119
|
-
section.push(c);
|
|
120
|
-
}
|
|
121
|
-
else {
|
|
122
|
-
bracketBeginCharNum--;
|
|
123
|
-
}
|
|
124
|
-
}
|
|
125
|
-
else {
|
|
126
|
-
section.push(c);
|
|
127
|
-
}
|
|
128
|
-
}
|
|
19
|
+
this.sectionCompiler = new expression_util_1.ExpressionSectionCompiler(() => this.jexlEngineProvider.provide());
|
|
129
20
|
}
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
let specialCharFound = false;
|
|
133
|
-
const section = [];
|
|
134
|
-
for (let i = 0; i < text.length; i++) {
|
|
135
|
-
const c = text[i];
|
|
136
|
-
if (!escaped) {
|
|
137
|
-
if ('\'' === c || '"' === c) {
|
|
138
|
-
section.push(c);
|
|
139
|
-
continue;
|
|
140
|
-
}
|
|
141
|
-
else if (c === options.escapeChar) {
|
|
142
|
-
escaped = true;
|
|
143
|
-
continue;
|
|
144
|
-
}
|
|
145
|
-
}
|
|
146
|
-
if (escaped) {
|
|
147
|
-
if (this.equalsSpecialChar(options, c) || options.bracketBegin === c || options.bracketEnd === c) {
|
|
148
|
-
section.push(c);
|
|
149
|
-
}
|
|
150
|
-
else {
|
|
151
|
-
section.push(options.escapeChar);
|
|
152
|
-
section.push(c);
|
|
153
|
-
}
|
|
154
|
-
escaped = false;
|
|
155
|
-
}
|
|
156
|
-
else if (specialCharFound || options.ignoreSpecialChar) {
|
|
157
|
-
if (options.bracketBegin === c) {
|
|
158
|
-
const expression = section.join('');
|
|
159
|
-
const nextText = options.ignoreSpecialChar ? text.substring(i) : text.substring(i - 1);
|
|
160
|
-
return { expression, nextText };
|
|
161
|
-
}
|
|
162
|
-
else {
|
|
163
|
-
if (!options.ignoreSpecialChar) {
|
|
164
|
-
specialCharFound = false;
|
|
165
|
-
section.push(options.specialChar);
|
|
166
|
-
}
|
|
167
|
-
section.push(c);
|
|
168
|
-
}
|
|
169
|
-
}
|
|
170
|
-
else {
|
|
171
|
-
if (this.equalsSpecialChar(options, c)) {
|
|
172
|
-
specialCharFound = true;
|
|
173
|
-
}
|
|
174
|
-
else {
|
|
175
|
-
section.push(c);
|
|
176
|
-
}
|
|
177
|
-
}
|
|
178
|
-
}
|
|
179
|
-
return { expression: section.join('') };
|
|
21
|
+
compileSections(text, options = {}) {
|
|
22
|
+
return this.sectionCompiler.compileSections(text, options);
|
|
180
23
|
}
|
|
181
24
|
};
|
|
182
25
|
exports.ExpressionCompilerImpl = ExpressionCompilerImpl;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expression-compiler.js","sourceRoot":"","sources":["../../../src/common/el/expression-compiler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAA0G;AAC1G,
|
|
1
|
+
{"version":3,"file":"expression-compiler.js","sourceRoot":"","sources":["../../../src/common/el/expression-compiler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAAqD;AACrD,+DAA0G;AAC1G,uDAA8D;AAE9D,uGAAuG;AAEhG,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAA5B;QAKgB,oBAAe,GAAG,IAAI,2CAAyB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC,CAAC;IAMhH,CAAC;IAJG,eAAe,CAAC,IAAY,EAAE,OAAO,GAA8B,EAAE;QACjE,OAAO,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC/D,CAAC;CAEJ,CAAA;;AARsB;IADlB,IAAA,sBAAS,EAAC,wCAAkB,CAAC;;kEACiC;iCAHtD,sBAAsB;IADlC,IAAA,sBAAS,EAAC,wCAAkB,CAAC;GACjB,sBAAsB,CAWlC"}
|
|
@@ -1,4 +1,10 @@
|
|
|
1
1
|
import { JexlEngineProvider, ExpressionHandler, ExpressionContextProvider, ExpressionCompiler, ExpressionContext, ExpressionCompilerOptions } from './expression-protocol';
|
|
2
|
+
import { ExpressionUtil } from './expression-util';
|
|
3
|
+
/**
|
|
4
|
+
* Evaluates `${...}` expressions with {@link ExpressionUtil}: the result of an expression is never
|
|
5
|
+
* evaluated again, references between configuration keys still resolve. Evaluate a text on purpose
|
|
6
|
+
* with the `eval` transform.
|
|
7
|
+
*/
|
|
2
8
|
export declare class ExpressionHandlerImpl implements ExpressionHandler {
|
|
3
9
|
protected readonly jexlEngineProvider: JexlEngineProvider<any>;
|
|
4
10
|
protected readonly expressionContextProvider: ExpressionContextProvider;
|
|
@@ -6,7 +12,6 @@ export declare class ExpressionHandlerImpl implements ExpressionHandler {
|
|
|
6
12
|
protected _ctx: ExpressionContext;
|
|
7
13
|
protected getContext(ctx?: ExpressionContext, expressionCompilerOptions?: ExpressionCompilerOptions): ExpressionContext;
|
|
8
14
|
handle(textOrObj: string | Object, ctx?: ExpressionContext, expressionCompilerOptions?: ExpressionCompilerOptions): any;
|
|
9
|
-
protected
|
|
10
|
-
protected hasExpression(sections: any[]): boolean;
|
|
15
|
+
protected options(compilerOptions?: ExpressionCompilerOptions): ExpressionUtil.Options;
|
|
11
16
|
}
|
|
12
17
|
//# sourceMappingURL=expression-handler.d.ts.map
|
|
@@ -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;
|
|
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;AAC3K,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD;;;;GAIG;AACH,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,CAQtH;IAED,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,EAAE,iBAAiB,EAAE,yBAAyB,CAAC,EAAE,yBAAyB,GAAG,GAAG,CAQtH;IAED,SAAS,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,yBAAyB,GAAG,cAAc,CAAC,OAAO,CAErF;CAEJ"}
|
|
@@ -8,78 +8,36 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
-
};
|
|
14
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
12
|
exports.ExpressionHandlerImpl = void 0;
|
|
16
13
|
const annotation_1 = require("../annotation");
|
|
17
14
|
const expression_protocol_1 = require("./expression-protocol");
|
|
18
|
-
const
|
|
15
|
+
const expression_util_1 = require("./expression-util");
|
|
16
|
+
/**
|
|
17
|
+
* Evaluates `${...}` expressions with {@link ExpressionUtil}: the result of an expression is never
|
|
18
|
+
* evaluated again, references between configuration keys still resolve. Evaluate a text on purpose
|
|
19
|
+
* with the `eval` transform.
|
|
20
|
+
*/
|
|
19
21
|
let ExpressionHandlerImpl = class ExpressionHandlerImpl {
|
|
20
22
|
getContext(ctx, expressionCompilerOptions) {
|
|
21
23
|
const c = ctx || this.expressionContextProvider.provide();
|
|
22
24
|
if (!ctx && c !== this._ctx && !(expressionCompilerOptions === null || expressionCompilerOptions === void 0 ? void 0 : expressionCompilerOptions.ignoreContextExpression)) {
|
|
23
25
|
this._ctx = c;
|
|
24
|
-
|
|
26
|
+
expression_util_1.ExpressionUtil.evaluateConfiguration(c, this.options(expressionCompilerOptions));
|
|
25
27
|
}
|
|
26
28
|
return c;
|
|
27
29
|
}
|
|
28
30
|
handle(textOrObj, ctx, expressionCompilerOptions) {
|
|
31
|
+
const options = this.options(expressionCompilerOptions);
|
|
32
|
+
const context = () => this.getContext(ctx, expressionCompilerOptions);
|
|
29
33
|
if (typeof textOrObj === 'string') {
|
|
30
|
-
return
|
|
31
|
-
}
|
|
32
|
-
else {
|
|
33
|
-
/* eslint-disable-next-line @typescript-eslint/no-this-alias */
|
|
34
|
-
const self = this;
|
|
35
|
-
(0, traverse_1.default)(textOrObj).forEach(function (value) {
|
|
36
|
-
if (typeof value === 'string') {
|
|
37
|
-
this.update(self.handle(value, ctx, expressionCompilerOptions));
|
|
38
|
-
}
|
|
39
|
-
else if (value && value._ignoreEl === true) {
|
|
40
|
-
this.update(value, true);
|
|
41
|
-
}
|
|
42
|
-
});
|
|
43
|
-
return textOrObj;
|
|
34
|
+
return expression_util_1.ExpressionUtil.evaluateText(textOrObj, context, options);
|
|
44
35
|
}
|
|
36
|
+
expression_util_1.ExpressionUtil.walk(textOrObj, text => expression_util_1.ExpressionUtil.evaluateText(text, context, options));
|
|
37
|
+
return textOrObj;
|
|
45
38
|
}
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
if (sections.length > 0) {
|
|
49
|
-
if (this.hasExpression(sections)) {
|
|
50
|
-
const c = this.getContext(ctx, expressionCompilerOptions);
|
|
51
|
-
if (sections.length === 1) {
|
|
52
|
-
let value = sections[0].evalSync(c);
|
|
53
|
-
if (typeof value === 'string') {
|
|
54
|
-
value = this.handle(value, c);
|
|
55
|
-
}
|
|
56
|
-
return value;
|
|
57
|
-
}
|
|
58
|
-
const result = [];
|
|
59
|
-
for (const section of sections) {
|
|
60
|
-
if (typeof section === 'string') {
|
|
61
|
-
result.push(section);
|
|
62
|
-
}
|
|
63
|
-
else {
|
|
64
|
-
let value = section.evalSync(c);
|
|
65
|
-
if (typeof value === 'string') {
|
|
66
|
-
value = this.handle(value, c);
|
|
67
|
-
}
|
|
68
|
-
result.push(value);
|
|
69
|
-
}
|
|
70
|
-
}
|
|
71
|
-
return result.join('');
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
return text;
|
|
75
|
-
}
|
|
76
|
-
hasExpression(sections) {
|
|
77
|
-
for (const section of sections) {
|
|
78
|
-
if (typeof section !== 'string') {
|
|
79
|
-
return true;
|
|
80
|
-
}
|
|
81
|
-
}
|
|
82
|
-
return false;
|
|
39
|
+
options(compilerOptions) {
|
|
40
|
+
return { compiler: this.expressionCompiler, compilerOptions };
|
|
83
41
|
}
|
|
84
42
|
};
|
|
85
43
|
exports.ExpressionHandlerImpl = ExpressionHandlerImpl;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expression-handler.js","sourceRoot":"","sources":["../../../src/common/el/expression-handler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"expression-handler.js","sourceRoot":"","sources":["../../../src/common/el/expression-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAAqD;AACrD,+DAA2K;AAC3K,uDAAmD;AAEnD;;;;GAIG;AAEI,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAapB,UAAU,CAAC,GAAuB,EAAE,yBAAqD;QAC/F,MAAM,CAAC,GAAG,GAAG,IAAI,IAAI,CAAC,yBAAyB,CAAC,OAAO,EAAE,CAAC;QAE1D,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,IAAI,EAAC,yBAAyB,aAAzB,yBAAyB,uBAAzB,yBAAyB,CAAE,uBAAuB,CAAA,EAAE,CAAC;YACjF,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;YACd,gCAAc,CAAC,qBAAqB,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC,CAAC;QACrF,CAAC;QACD,OAAO,CAAC,CAAC;IACb,CAAC;IAED,MAAM,CAAC,SAA0B,EAAE,GAAuB,EAAE,yBAAqD;QAC7G,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;QACxD,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,yBAAyB,CAAC,CAAC;QACtE,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;YAChC,OAAO,gCAAc,CAAC,YAAY,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QACpE,CAAC;QACD,gCAAc,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,gCAAc,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;QAC5F,OAAO,SAAS,CAAC;IACrB,CAAC;IAES,OAAO,CAAC,eAA2C;QACzD,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,kBAAkB,EAAE,eAAe,EAAE,CAAC;IAClE,CAAC;CAEJ,CAAA;;AAlCsB;IADlB,IAAA,sBAAS,EAAC,wCAAkB,CAAC;;iEACiC;AAG5C;IADlB,IAAA,sBAAS,EAAC,+CAAyB,CAAC;;wEACmC;AAGrD;IADlB,IAAA,sBAAS,EAAC,wCAAkB,CAAC;;iEAC4B;gCATjD,qBAAqB;IADjC,IAAA,sBAAS,EAAC,uCAAiB,CAAC;GAChB,qBAAqB,CAqCjC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"expression-handler.spec.d.ts","sourceRoot":"","sources":["../../../src/common/el/expression-handler.spec.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const bun_test_1 = require("bun:test");
|
|
4
|
+
const chai_1 = require("chai");
|
|
5
|
+
const expression_compiler_1 = require("./expression-compiler");
|
|
6
|
+
const expression_handler_1 = require("./expression-handler");
|
|
7
|
+
const jexl_engine_provider_1 = require("./jexl-engine-provider");
|
|
8
|
+
function handler(configuration) {
|
|
9
|
+
const jexlEngineProvider = new jexl_engine_provider_1.JexlEngineProviderImpl();
|
|
10
|
+
const compiler = new expression_compiler_1.ExpressionCompilerImpl();
|
|
11
|
+
Object.defineProperty(compiler, 'jexlEngineProvider', { value: jexlEngineProvider });
|
|
12
|
+
const instance = new expression_handler_1.ExpressionHandlerImpl();
|
|
13
|
+
Object.defineProperty(instance, 'jexlEngineProvider', { value: jexlEngineProvider });
|
|
14
|
+
Object.defineProperty(instance, 'expressionCompiler', { value: compiler });
|
|
15
|
+
Object.defineProperty(instance, 'expressionContextProvider', { value: { provide: () => configuration } });
|
|
16
|
+
return instance;
|
|
17
|
+
}
|
|
18
|
+
(0, bun_test_1.describe)('ExpressionHandler', () => {
|
|
19
|
+
(0, bun_test_1.it)('evaluates every string of nested objects and arrays in place', () => {
|
|
20
|
+
const ctx = { a: { b: 2 }, name: 'cell' };
|
|
21
|
+
const target = { x: '${a.b + 1}', list: ['${name}', 'plain', 7, { deep: 'hi ${name}' }], n: 1, t: true, nil: null };
|
|
22
|
+
const result = handler().handle(target, ctx);
|
|
23
|
+
(0, chai_1.expect)(result).to.equal(target);
|
|
24
|
+
(0, chai_1.expect)(target).to.deep.equal({ x: 3, list: ['cell', 'plain', 7, { deep: 'hi cell' }], n: 1, t: true, nil: null });
|
|
25
|
+
});
|
|
26
|
+
(0, bun_test_1.it)('leaves objects marked _ignoreEl alone', () => {
|
|
27
|
+
const ignored = { _ignoreEl: true, value: '${name}' };
|
|
28
|
+
const target = { ignored, other: '${name}' };
|
|
29
|
+
handler().handle(target, { name: 'cell' });
|
|
30
|
+
(0, chai_1.expect)(target.ignored).to.equal(ignored);
|
|
31
|
+
(0, chai_1.expect)(ignored.value).to.equal('${name}');
|
|
32
|
+
(0, chai_1.expect)(target.other).to.equal('cell');
|
|
33
|
+
});
|
|
34
|
+
(0, bun_test_1.it)('does not walk into an object an expression evaluates to: values are not templates', () => {
|
|
35
|
+
const ctx = { obj: { greeting: 'hi ${name}' }, name: 'cell' };
|
|
36
|
+
const target = { value: '${obj}' };
|
|
37
|
+
handler().handle(target, ctx);
|
|
38
|
+
(0, chai_1.expect)(target.value).to.deep.equal({ greeting: 'hi ${name}' });
|
|
39
|
+
});
|
|
40
|
+
(0, bun_test_1.it)('stops at circular references', () => {
|
|
41
|
+
const target = { name: '${n}' };
|
|
42
|
+
target.self = target;
|
|
43
|
+
target.list = [target];
|
|
44
|
+
handler().handle(target, { n: 'cell' });
|
|
45
|
+
(0, chai_1.expect)(target.name).to.equal('cell');
|
|
46
|
+
(0, chai_1.expect)(target.self).to.equal(target);
|
|
47
|
+
(0, chai_1.expect)(target.list[0]).to.equal(target);
|
|
48
|
+
});
|
|
49
|
+
(0, bun_test_1.it)('does not assign unchanged values (frozen objects without expressions are fine)', () => {
|
|
50
|
+
const frozen = Object.freeze({ a: 1, b: 'text', c: Object.freeze([1, 2]) });
|
|
51
|
+
const target = { frozen, x: '${n}' };
|
|
52
|
+
handler().handle(target, { n: 2 });
|
|
53
|
+
(0, chai_1.expect)(target.x).to.equal(2);
|
|
54
|
+
(0, chai_1.expect)(target.frozen).to.equal(frozen);
|
|
55
|
+
});
|
|
56
|
+
(0, bun_test_1.describe)('F6: values are text, not expressions', () => {
|
|
57
|
+
const secret = 'S3CRET';
|
|
58
|
+
const env = (x) => ({ X: x, _ignoreEl: true });
|
|
59
|
+
(0, bun_test_1.it)('a value from the environment is not evaluated', () => {
|
|
60
|
+
const configuration = { cell: { secret, a: '${env.X}' }, env: env('${cell.secret}') };
|
|
61
|
+
(0, chai_1.expect)(handler(configuration).handle('${cell.a}')).to.equal('${cell.secret}');
|
|
62
|
+
(0, chai_1.expect)(configuration.cell.a).to.equal('${cell.secret}');
|
|
63
|
+
});
|
|
64
|
+
(0, bun_test_1.it)('nor through another key, in either order', () => {
|
|
65
|
+
const configuration = { cell: { b: '${cell.a}', secret, a: '${env.X}', c: 'x-${cell.a}' }, env: env('${cell.secret}') };
|
|
66
|
+
const h = handler(configuration);
|
|
67
|
+
(0, chai_1.expect)(h.handle('${cell.b}')).to.equal('${cell.secret}');
|
|
68
|
+
(0, chai_1.expect)(h.handle('${cell.c}')).to.equal('x-${cell.secret}');
|
|
69
|
+
(0, chai_1.expect)(configuration.cell.c).to.equal('x-${cell.secret}');
|
|
70
|
+
(0, chai_1.expect)(configuration.cell.b).to.equal('${cell.secret}');
|
|
71
|
+
});
|
|
72
|
+
(0, bun_test_1.it)('nor when it is part of a longer text', () => {
|
|
73
|
+
const configuration = { cell: { secret, url: 'http://${env.X}/path' }, env: env('${cell.secret}') };
|
|
74
|
+
(0, chai_1.expect)(handler(configuration).handle('${cell.url}')).to.equal('http://${cell.secret}/path');
|
|
75
|
+
});
|
|
76
|
+
(0, bun_test_1.it)('a template variable is not evaluated either (prompt templates)', () => {
|
|
77
|
+
const text = handler().handle('hi {name}', { name: '{secret}', secret: 'S' }, { ignoreSpecialChar: true, bracketBegin: '{', bracketEnd: '}', ignoreContextExpression: true });
|
|
78
|
+
(0, chai_1.expect)(text).to.equal('hi {secret}');
|
|
79
|
+
});
|
|
80
|
+
(0, bun_test_1.it)('keys still refer to each other in any order, through any depth', () => {
|
|
81
|
+
const configuration = { cell: { x: '${cell.y}-x', y: '${cell.deep.z}', deep: { z: 'z', n: '${cell.port * 2}' }, port: 21 } };
|
|
82
|
+
const h = handler(configuration);
|
|
83
|
+
(0, chai_1.expect)(h.handle('${cell.x}')).to.equal('z-x');
|
|
84
|
+
(0, chai_1.expect)(h.handle('${cell.deep.n}')).to.equal(42);
|
|
85
|
+
(0, chai_1.expect)(configuration.cell.y).to.equal('z');
|
|
86
|
+
});
|
|
87
|
+
(0, bun_test_1.it)('a circular reference fails with the keys involved', () => {
|
|
88
|
+
const configuration = { cell: { a: '${cell.b}', b: '${cell.a}' } };
|
|
89
|
+
(0, chai_1.expect)(() => handler(configuration).handle('${cell.a}')).to.throw('Circular reference in the configuration: cell.a -> cell.b -> cell.a');
|
|
90
|
+
});
|
|
91
|
+
(0, bun_test_1.it)('evaluating a value is still possible on purpose, with the eval transform', () => {
|
|
92
|
+
const instance = handler({ cell: { secret, a: '${env.X | eval}' }, env: env('${cell.secret}') });
|
|
93
|
+
const jexl = instance.jexlEngineProvider.provide();
|
|
94
|
+
jexl.addTransform('eval', (text) => instance.handle(text));
|
|
95
|
+
(0, chai_1.expect)(instance.handle('${cell.a}')).to.equal(secret);
|
|
96
|
+
});
|
|
97
|
+
});
|
|
98
|
+
});
|
|
99
|
+
//# sourceMappingURL=expression-handler.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"expression-handler.spec.js","sourceRoot":"","sources":["../../../src/common/el/expression-handler.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
import { ExpressionCompiler, ExpressionCompilerOptions, ExpressionContext } from './expression-protocol';
|
|
2
|
+
interface MiddleExpression {
|
|
3
|
+
expression: any;
|
|
4
|
+
nextText?: string;
|
|
5
|
+
}
|
|
6
|
+
/**
|
|
7
|
+
* Splits a text into literal sections and compiled `${...}` expressions (jexl). It has no dependency
|
|
8
|
+
* injection, so the build (@celljs/vite) and the runtime share it through `@celljs/core/el`.
|
|
9
|
+
*/
|
|
10
|
+
export declare class ExpressionSectionCompiler implements ExpressionCompiler {
|
|
11
|
+
protected readonly jexl: () => any;
|
|
12
|
+
protected static jexlEngine?: any;
|
|
13
|
+
/** @param jexl the engine; the runtime passes the one of its JexlEngineProvider, which has the transforms */
|
|
14
|
+
constructor(jexl?: () => any);
|
|
15
|
+
private ESCAPE_CHAR;
|
|
16
|
+
private SPECIAL_CHAR;
|
|
17
|
+
private BRACKET_BEGIN;
|
|
18
|
+
private BRACKET_END;
|
|
19
|
+
protected getSpecialChar(opitons: Required<ExpressionCompilerOptions>): string;
|
|
20
|
+
protected equalsSpecialChar(opitons: Required<ExpressionCompilerOptions>, char: string): boolean;
|
|
21
|
+
compileSections(text: string, options: ExpressionCompilerOptions): any[];
|
|
22
|
+
protected middleCompile(text: string, options: Required<ExpressionCompilerOptions>): MiddleExpression | undefined;
|
|
23
|
+
protected nextMiddleExpression(text: string, bracketBeginCharNum: number | undefined, options: Required<ExpressionCompilerOptions>): MiddleExpression | undefined;
|
|
24
|
+
protected nextString(text: string, options: Required<ExpressionCompilerOptions>): MiddleExpression;
|
|
25
|
+
}
|
|
26
|
+
/** An expression of the configuration that cannot be evaluated; `path` is its key, e.g. `cell.db.url`. */
|
|
27
|
+
export declare class ExpressionError extends Error {
|
|
28
|
+
readonly path: string;
|
|
29
|
+
readonly template: string;
|
|
30
|
+
readonly cause?: unknown;
|
|
31
|
+
readonly name = "ExpressionError";
|
|
32
|
+
constructor(path: string, template: string, message: string, cause?: unknown);
|
|
33
|
+
}
|
|
34
|
+
/**
|
|
35
|
+
* Evaluation of `${...}` expressions, shared by the runtime (ExpressionHandler) and the build
|
|
36
|
+
* (@celljs/vite) through `@celljs/core/el`. The result of an expression is never evaluated again: a value
|
|
37
|
+
* that comes from the environment (`${env.X}`), from a template variable or from another expression is
|
|
38
|
+
* text, whatever it contains. References between configuration keys still resolve: a key that refers to
|
|
39
|
+
* another one evaluates that key's own template (see {@link ExpressionUtil.evaluateConfiguration}).
|
|
40
|
+
*/
|
|
41
|
+
export declare namespace ExpressionUtil {
|
|
42
|
+
interface Options {
|
|
43
|
+
/** Defaults to an {@link ExpressionSectionCompiler} on a plain jexl engine (no transforms). */
|
|
44
|
+
compiler?: ExpressionCompiler;
|
|
45
|
+
compilerOptions?: ExpressionCompilerOptions;
|
|
46
|
+
}
|
|
47
|
+
/**
|
|
48
|
+
* Evaluates the expressions of `text`: a text with a single expression keeps the type of its value,
|
|
49
|
+
* mixed text is joined into a string. `context` may be a function, then it is only called when the text
|
|
50
|
+
* has an expression.
|
|
51
|
+
*/
|
|
52
|
+
function evaluateText(text: string, context: ExpressionContext | (() => ExpressionContext), options?: Options): any;
|
|
53
|
+
/**
|
|
54
|
+
* Replaces the templates (strings) of `node` by `evaluate`'s values, in place, depth first. Objects
|
|
55
|
+
* marked `_ignoreEl` are left alone, circular references are not followed, and values are not walked
|
|
56
|
+
* into: what an expression returns is not a template.
|
|
57
|
+
*/
|
|
58
|
+
function walk(node: any, evaluate: (text: string, owner: any, key: string) => any, enter?: (child: object, owner: object, key: string) => void): void;
|
|
59
|
+
/**
|
|
60
|
+
* Evaluates the configuration `root` in place. An expression sees the configuration through a view in
|
|
61
|
+
* which every template that it reaches is evaluated first (once, cached), so keys refer to each other in
|
|
62
|
+
* any order; a value an expression returns is never evaluated again. Objects marked `_ignoreEl` (such
|
|
63
|
+
* as `env`) are read as they are. Failures, including a circular reference, are {@link ExpressionError}s
|
|
64
|
+
* naming the key.
|
|
65
|
+
*/
|
|
66
|
+
function evaluateConfiguration(root: ExpressionContext, options?: Options): void;
|
|
67
|
+
}
|
|
68
|
+
export {};
|
|
69
|
+
//# sourceMappingURL=expression-util.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"expression-util.d.ts","sourceRoot":"","sources":["../../../src/common/el/expression-util.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAEzG,UAAU,gBAAgB;IACtB,UAAU,EAAE,GAAG,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;GAGG;AACH,qBAAa,yBAA0B,YAAW,kBAAkB;IAKpD,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG;IAH9C,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,GAAG,CAAC;IAElC,6GAA6G;IAC7G,YAA+B,IAAI,GAAE,MAAM,GAAiE,EAAK;IAEjH,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,YAAY,CAAO;IAC3B,OAAO,CAAC,aAAa,CAAO;IAC5B,OAAO,CAAC,WAAW,CAAO;IAE1B,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,yBAAyB,CAAC,GAAG,MAAM,CAK7E;IAED,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,QAAQ,CAAC,yBAAyB,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAK/F;IAED,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,yBAAyB,GAAG,GAAG,EAAE,CAsBvE;IAED,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,yBAAyB,CAAC,GAAG,gBAAgB,GAAG,SAAS,CAYhH;IAED,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,mBAAmB,oBAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,yBAAyB,CAAC,GAAG,gBAAgB,GAAG,SAAS,CAqDhJ;IAED,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,yBAAyB,CAAC,GAAG,gBAAgB,CAiDjG;CAEJ;AAED,0GAA0G;AAC1G,qBAAa,eAAgB,SAAQ,KAAK;IAI1B,QAAQ,CAAC,IAAI,EAAE,MAAM;IAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM;aAAqC,KAAK,CAAC,EAAE,OAAO;IAFhH,SAAkB,IAAI,qBAAqB;IAE3C,YAAqB,IAAI,EAAE,MAAM,EAAW,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAoB,KAAK,CAAC,EAAE,OAAO,EAE/G;CACJ;AAED;;;;;;GAMG;AACH,yBAAiB,cAAc,CAAC;IAE5B,UAAiB,OAAO;QACpB,+FAA+F;QAC/F,QAAQ,CAAC,EAAE,kBAAkB,CAAC;QAC9B,eAAe,CAAC,EAAE,yBAAyB,CAAC;KAC/C;IAQD;;;;OAIG;IACH,SAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,GAAG,CAAC,MAAM,iBAAiB,CAAC,EAAE,OAAO,GAAE,OAAY,GAAG,GAAG,CAU7H;IAED;;;;OAIG;IACH,SAAgB,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,KAAK,GAAG,EACpF,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAErE;IAyBD;;;;;;OAMG;IACH,SAAgB,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,EAAE,OAAO,GAAE,OAAY,GAAG,IAAI,CAyF1F;CACJ"}
|