@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.
Files changed (219) hide show
  1. package/README.md +0 -6
  2. package/cell.remote.yml +8 -0
  3. package/cell.yml +0 -3
  4. package/esm/common/application/application-entry.js +21 -3
  5. package/esm/common/application/application-entry.js.map +1 -1
  6. package/esm/common/application/application-host.d.ts +38 -0
  7. package/esm/common/application/application-host.js +17 -0
  8. package/esm/common/application/application-host.js.map +1 -0
  9. package/esm/common/application/application-protocol.js +1 -1
  10. package/esm/common/application/application-protocol.js.map +1 -1
  11. package/esm/common/application/index.d.ts +1 -0
  12. package/esm/common/application/index.js +1 -0
  13. package/esm/common/application/index.js.map +1 -1
  14. package/esm/common/config/config-provider.js +2 -1
  15. package/esm/common/config/config-provider.js.map +1 -1
  16. package/esm/common/config/env-config-util.d.ts +48 -0
  17. package/esm/common/config/env-config-util.js +185 -0
  18. package/esm/common/config/env-config-util.js.map +1 -0
  19. package/esm/common/config/index.d.ts +1 -0
  20. package/esm/common/config/index.js +1 -0
  21. package/esm/common/config/index.js.map +1 -1
  22. package/esm/common/container/auto-bind.js +26 -12
  23. package/esm/common/container/auto-bind.js.map +1 -1
  24. package/esm/common/el/expression-compiler.d.ts +4 -15
  25. package/esm/common/el/expression-compiler.js +6 -163
  26. package/esm/common/el/expression-compiler.js.map +1 -1
  27. package/esm/common/el/expression-handler.d.ts +7 -2
  28. package/esm/common/el/expression-handler.js +14 -53
  29. package/esm/common/el/expression-handler.js.map +1 -1
  30. package/esm/common/el/expression-util.d.ts +68 -0
  31. package/esm/common/el/expression-util.js +347 -0
  32. package/esm/common/el/expression-util.js.map +1 -0
  33. package/esm/common/el/index.d.ts +1 -0
  34. package/esm/common/el/index.js +1 -0
  35. package/esm/common/el/index.js.map +1 -1
  36. package/esm/common/logger/abstract-logger.d.ts +4 -2
  37. package/esm/common/logger/abstract-logger.js +11 -6
  38. package/esm/common/logger/abstract-logger.js.map +1 -1
  39. package/esm/common/logger/logger-protocol.d.ts +4 -0
  40. package/esm/common/logger/logger-protocol.js +2 -0
  41. package/esm/common/logger/logger-protocol.js.map +1 -1
  42. package/esm/common/logger/logger.js +7 -7
  43. package/esm/common/logger/logger.js.map +1 -1
  44. package/esm/common/test/mock-logger.d.ts +1 -0
  45. package/esm/common/test/mock-logger.js +3 -0
  46. package/esm/common/test/mock-logger.js.map +1 -1
  47. package/esm/common/utils/emitter.d.ts +1 -10
  48. package/esm/common/utils/emitter.js +0 -56
  49. package/esm/common/utils/emitter.js.map +1 -1
  50. package/esm/common/utils/mime-type-util.js +1 -1
  51. package/esm/common/utils/mime-type-util.js.map +1 -1
  52. package/esm/common/utils/mime-type.js +1 -1
  53. package/esm/common/utils/mime-type.js.map +1 -1
  54. package/esm/node/context/context.d.ts +11 -2
  55. package/esm/node/context/context.js +36 -12
  56. package/esm/node/context/context.js.map +1 -1
  57. package/esm/node/index.d.ts +0 -1
  58. package/esm/node/index.js +0 -1
  59. package/esm/node/index.js.map +1 -1
  60. package/lib/common/aop/aop.spec.d.ts +2 -0
  61. package/lib/common/aop/aop.spec.d.ts.map +1 -0
  62. package/lib/common/aop/aop.spec.js +170 -0
  63. package/lib/common/aop/aop.spec.js.map +1 -0
  64. package/lib/common/application/application-entry.d.ts.map +1 -1
  65. package/lib/common/application/application-entry.js +21 -3
  66. package/lib/common/application/application-entry.js.map +1 -1
  67. package/lib/common/application/application-host.d.ts +39 -0
  68. package/lib/common/application/application-host.d.ts.map +1 -0
  69. package/lib/common/application/application-host.js +20 -0
  70. package/lib/common/application/application-host.js.map +1 -0
  71. package/lib/common/application/application-protocol.js +1 -1
  72. package/lib/common/application/application-protocol.js.map +1 -1
  73. package/lib/common/application/index.d.ts +1 -0
  74. package/lib/common/application/index.d.ts.map +1 -1
  75. package/lib/common/application/index.js +1 -0
  76. package/lib/common/application/index.js.map +1 -1
  77. package/lib/common/application/lifecycle.spec.d.ts +2 -0
  78. package/lib/common/application/lifecycle.spec.d.ts.map +1 -0
  79. package/lib/common/application/lifecycle.spec.js +155 -0
  80. package/lib/common/application/lifecycle.spec.js.map +1 -0
  81. package/lib/common/config/config-provider.js +2 -1
  82. package/lib/common/config/config-provider.js.map +1 -1
  83. package/lib/common/config/env-config-util.d.ts +49 -0
  84. package/lib/common/config/env-config-util.d.ts.map +1 -0
  85. package/lib/common/config/env-config-util.js +188 -0
  86. package/lib/common/config/env-config-util.js.map +1 -0
  87. package/lib/common/config/env-config-util.spec.d.ts +2 -0
  88. package/lib/common/config/env-config-util.spec.d.ts.map +1 -0
  89. package/lib/common/config/env-config-util.spec.js +314 -0
  90. package/lib/common/config/env-config-util.spec.js.map +1 -0
  91. package/lib/common/config/index.d.ts +1 -0
  92. package/lib/common/config/index.d.ts.map +1 -1
  93. package/lib/common/config/index.js +1 -0
  94. package/lib/common/config/index.js.map +1 -1
  95. package/lib/common/container/assembly.spec.d.ts +2 -0
  96. package/lib/common/container/assembly.spec.d.ts.map +1 -0
  97. package/lib/common/container/assembly.spec.js +464 -0
  98. package/lib/common/container/assembly.spec.js.map +1 -0
  99. package/lib/common/container/auto-bind.js +26 -12
  100. package/lib/common/container/auto-bind.js.map +1 -1
  101. package/lib/common/el/expression-compiler.d.ts +4 -15
  102. package/lib/common/el/expression-compiler.d.ts.map +1 -1
  103. package/lib/common/el/expression-compiler.js +6 -163
  104. package/lib/common/el/expression-compiler.js.map +1 -1
  105. package/lib/common/el/expression-handler.d.ts +7 -2
  106. package/lib/common/el/expression-handler.d.ts.map +1 -1
  107. package/lib/common/el/expression-handler.js +14 -56
  108. package/lib/common/el/expression-handler.js.map +1 -1
  109. package/lib/common/el/expression-handler.spec.d.ts +2 -0
  110. package/lib/common/el/expression-handler.spec.d.ts.map +1 -0
  111. package/lib/common/el/expression-handler.spec.js +99 -0
  112. package/lib/common/el/expression-handler.spec.js.map +1 -0
  113. package/lib/common/el/expression-util.d.ts +69 -0
  114. package/lib/common/el/expression-util.d.ts.map +1 -0
  115. package/lib/common/el/expression-util.js +352 -0
  116. package/lib/common/el/expression-util.js.map +1 -0
  117. package/lib/common/el/expression-util.spec.d.ts +2 -0
  118. package/lib/common/el/expression-util.spec.d.ts.map +1 -0
  119. package/lib/common/el/expression-util.spec.js +45 -0
  120. package/lib/common/el/expression-util.spec.js.map +1 -0
  121. package/lib/common/el/index.d.ts +1 -0
  122. package/lib/common/el/index.d.ts.map +1 -1
  123. package/lib/common/el/index.js +1 -0
  124. package/lib/common/el/index.js.map +1 -1
  125. package/lib/common/el/value-and-el.spec.d.ts +2 -0
  126. package/lib/common/el/value-and-el.spec.d.ts.map +1 -0
  127. package/lib/common/el/value-and-el.spec.js +216 -0
  128. package/lib/common/el/value-and-el.spec.js.map +1 -0
  129. package/lib/common/logger/abstract-logger.d.ts +4 -2
  130. package/lib/common/logger/abstract-logger.d.ts.map +1 -1
  131. package/lib/common/logger/abstract-logger.js +10 -5
  132. package/lib/common/logger/abstract-logger.js.map +1 -1
  133. package/lib/common/logger/logger-protocol.d.ts +4 -0
  134. package/lib/common/logger/logger-protocol.d.ts.map +1 -1
  135. package/lib/common/logger/logger-protocol.js +3 -1
  136. package/lib/common/logger/logger-protocol.js.map +1 -1
  137. package/lib/common/logger/logger.js +7 -7
  138. package/lib/common/logger/logger.js.map +1 -1
  139. package/lib/common/logger/logger.spec.d.ts +2 -0
  140. package/lib/common/logger/logger.spec.d.ts.map +1 -0
  141. package/lib/common/logger/logger.spec.js +57 -0
  142. package/lib/common/logger/logger.spec.js.map +1 -0
  143. package/lib/common/test/mock-logger.d.ts +1 -0
  144. package/lib/common/test/mock-logger.d.ts.map +1 -1
  145. package/lib/common/test/mock-logger.js +3 -0
  146. package/lib/common/test/mock-logger.js.map +1 -1
  147. package/lib/common/utils/emitter.d.ts +1 -10
  148. package/lib/common/utils/emitter.d.ts.map +1 -1
  149. package/lib/common/utils/emitter.js +1 -58
  150. package/lib/common/utils/emitter.js.map +1 -1
  151. package/lib/common/utils/mime-type-util.js +1 -1
  152. package/lib/common/utils/mime-type-util.js.map +1 -1
  153. package/lib/common/utils/mime-type.js +1 -1
  154. package/lib/common/utils/mime-type.js.map +1 -1
  155. package/lib/common/utils/utils-behavior.spec.d.ts +2 -0
  156. package/lib/common/utils/utils-behavior.spec.d.ts.map +1 -0
  157. package/lib/common/utils/utils-behavior.spec.js +232 -0
  158. package/lib/common/utils/utils-behavior.spec.js.map +1 -0
  159. package/lib/node/context/context.d.ts +11 -2
  160. package/lib/node/context/context.d.ts.map +1 -1
  161. package/lib/node/context/context.js +36 -10
  162. package/lib/node/context/context.js.map +1 -1
  163. package/lib/node/context/context.spec.d.ts +2 -0
  164. package/lib/node/context/context.spec.d.ts.map +1 -0
  165. package/lib/node/context/context.spec.js +202 -0
  166. package/lib/node/context/context.spec.js.map +1 -0
  167. package/lib/node/index.d.ts +0 -1
  168. package/lib/node/index.d.ts.map +1 -1
  169. package/lib/node/index.js +0 -1
  170. package/lib/node/index.js.map +1 -1
  171. package/package.json +20 -41
  172. package/src/common/aop/aop.spec.ts +145 -0
  173. package/src/common/application/application-entry.ts +20 -4
  174. package/src/common/application/application-host.ts +46 -0
  175. package/src/common/application/application-protocol.ts +1 -1
  176. package/src/common/application/index.ts +1 -0
  177. package/src/common/application/lifecycle.spec.ts +148 -0
  178. package/src/common/config/config-provider.ts +1 -1
  179. package/src/common/config/env-config-util.spec.ts +341 -0
  180. package/src/common/config/env-config-util.ts +225 -0
  181. package/src/common/config/index.ts +1 -0
  182. package/src/common/container/assembly.spec.ts +293 -0
  183. package/src/common/container/auto-bind.ts +23 -10
  184. package/src/common/el/expression-compiler.ts +6 -166
  185. package/src/common/el/expression-handler.spec.ts +110 -0
  186. package/src/common/el/expression-handler.ts +14 -51
  187. package/src/common/el/expression-util.spec.ts +45 -0
  188. package/src/common/el/expression-util.ts +363 -0
  189. package/src/common/el/index.ts +2 -1
  190. package/src/common/el/value-and-el.spec.ts +186 -0
  191. package/src/common/logger/abstract-logger.ts +12 -6
  192. package/src/common/logger/logger-protocol.ts +5 -0
  193. package/src/common/logger/logger.spec.ts +61 -0
  194. package/src/common/logger/logger.ts +7 -7
  195. package/src/common/test/mock-logger.ts +3 -0
  196. package/src/common/utils/emitter.ts +1 -63
  197. package/src/common/utils/mime-type-util.ts +1 -1
  198. package/src/common/utils/mime-type.ts +1 -1
  199. package/src/common/utils/utils-behavior.spec.ts +259 -0
  200. package/src/node/context/context.spec.ts +219 -0
  201. package/src/node/context/context.ts +35 -10
  202. package/src/node/index.ts +0 -1
  203. package/cell-remote.yml +0 -3
  204. package/esm/node/utils/crc.d.ts +0 -1
  205. package/esm/node/utils/crc.js +0 -7
  206. package/esm/node/utils/crc.js.map +0 -1
  207. package/esm/node/utils/index.d.ts +0 -1
  208. package/esm/node/utils/index.js +0 -2
  209. package/esm/node/utils/index.js.map +0 -1
  210. package/lib/node/utils/crc.d.ts +0 -2
  211. package/lib/node/utils/crc.d.ts.map +0 -1
  212. package/lib/node/utils/crc.js +0 -10
  213. package/lib/node/utils/crc.js.map +0 -1
  214. package/lib/node/utils/index.d.ts +0 -2
  215. package/lib/node/utils/index.d.ts.map +0 -1
  216. package/lib/node/utils/index.js +0 -18
  217. package/lib/node/utils/index.js.map +0 -1
  218. package/src/node/utils/crc.ts +0 -7
  219. package/src/node/utils/index.ts +0 -1
@@ -7,173 +7,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
7
7
  var __metadata = (this && this.__metadata) || function (k, v) {
8
8
  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
9
9
  };
10
- import { ExpressionCompiler, JexlEngineProvider } from './expression-protocol.js';
11
10
  import { Component, Autowired } from '../annotation/index.js';
11
+ import { ExpressionCompiler, JexlEngineProvider } from './expression-protocol.js';
12
+ import { ExpressionSectionCompiler } from './expression-util.js';
13
+ /** The {@link ExpressionSectionCompiler} on the jexl engine of the container (with its transforms). */
12
14
  let ExpressionCompilerImpl = class ExpressionCompilerImpl {
13
15
  constructor() {
14
- this.ESCAPE_CHAR = '\\';
15
- this.SPECIAL_CHAR = '$';
16
- this.BRACKET_BEGIN = '{';
17
- this.BRACKET_END = '}';
18
- }
19
- getSpecialChar(opitons) {
20
- if (opitons.ignoreSpecialChar) {
21
- return '';
22
- }
23
- return opitons.specialChar;
24
- }
25
- equalsSpecialChar(opitons, char) {
26
- if (opitons.ignoreSpecialChar) {
27
- return false;
28
- }
29
- return char === opitons.specialChar;
30
- }
31
- compileSections(text, options) {
32
- const merged = {
33
- ...{ escapeChar: this.ESCAPE_CHAR, specialChar: this.SPECIAL_CHAR, bracketBegin: this.BRACKET_BEGIN, bracketEnd: this.BRACKET_END, ...options }
34
- };
35
- if (!text || text.indexOf(`${this.getSpecialChar(merged)}${merged.bracketBegin}`) < 0) {
36
- return [];
37
- }
38
- const sections = [];
39
- let middleText = text;
40
- while (middleText) {
41
- const me = this.middleCompile(middleText, merged);
42
- if (!me) {
43
- sections.push(middleText);
44
- middleText = undefined;
45
- }
46
- else {
47
- sections.push(me.expression);
48
- middleText = me.nextText;
49
- }
50
- }
51
- return sections;
52
- }
53
- middleCompile(text, options) {
54
- let me;
55
- const prefix = `${this.getSpecialChar(options)}${options.bracketBegin}`;
56
- const prefix2 = `${prefix}${options.bracketBegin}`;
57
- if (text.startsWith(prefix2)) {
58
- me = this.nextMiddleExpression(text.substring(prefix2.length), 2, options);
59
- }
60
- else if (text.startsWith(prefix)) {
61
- me = this.nextMiddleExpression(text.substring(prefix.length), undefined, options);
62
- }
63
- else {
64
- me = this.nextString(text, options);
65
- }
66
- return me;
67
- }
68
- nextMiddleExpression(text, bracketBeginCharNum = 1, options) {
69
- let stringed = false;
70
- let escaped = false;
71
- let bracketBeginCharFound = 0;
72
- const section = [];
73
- for (let i = 0; i < text.length; i++) {
74
- const c = text[i];
75
- if (!escaped) {
76
- if ('\'' === c || '"' === c) {
77
- stringed = !stringed;
78
- section.push(c);
79
- continue;
80
- }
81
- else if (c === options.escapeChar) {
82
- escaped = true;
83
- continue;
84
- }
85
- }
86
- if (stringed) {
87
- section.push(c);
88
- escaped = false;
89
- }
90
- else if (escaped) {
91
- if (this.equalsSpecialChar(options, c) || options.bracketBegin === c || options.bracketEnd === c) {
92
- section.push(c);
93
- }
94
- else {
95
- section.push(options.escapeChar);
96
- section.push(c);
97
- }
98
- escaped = false;
99
- }
100
- else if (options.bracketBegin === c) {
101
- bracketBeginCharFound++;
102
- section.push(c);
103
- }
104
- else if (options.bracketEnd === c) {
105
- if (bracketBeginCharFound === 0 && bracketBeginCharNum === 1) {
106
- const jexlEngine = this.jexlEngineProvider.provide();
107
- const expression = jexlEngine.createExpression(section.join(''));
108
- let nextText;
109
- if (i !== text.length - 1) {
110
- nextText = text.substring(i + 1);
111
- }
112
- return { expression, nextText };
113
- }
114
- else if (bracketBeginCharFound > 0) {
115
- bracketBeginCharFound--;
116
- section.push(c);
117
- }
118
- else {
119
- bracketBeginCharNum--;
120
- }
121
- }
122
- else {
123
- section.push(c);
124
- }
125
- }
16
+ this.sectionCompiler = new ExpressionSectionCompiler(() => this.jexlEngineProvider.provide());
126
17
  }
127
- nextString(text, options) {
128
- let escaped = false;
129
- let specialCharFound = false;
130
- const section = [];
131
- for (let i = 0; i < text.length; i++) {
132
- const c = text[i];
133
- if (!escaped) {
134
- if ('\'' === c || '"' === c) {
135
- section.push(c);
136
- continue;
137
- }
138
- else if (c === options.escapeChar) {
139
- escaped = true;
140
- continue;
141
- }
142
- }
143
- if (escaped) {
144
- if (this.equalsSpecialChar(options, c) || options.bracketBegin === c || options.bracketEnd === c) {
145
- section.push(c);
146
- }
147
- else {
148
- section.push(options.escapeChar);
149
- section.push(c);
150
- }
151
- escaped = false;
152
- }
153
- else if (specialCharFound || options.ignoreSpecialChar) {
154
- if (options.bracketBegin === c) {
155
- const expression = section.join('');
156
- const nextText = options.ignoreSpecialChar ? text.substring(i) : text.substring(i - 1);
157
- return { expression, nextText };
158
- }
159
- else {
160
- if (!options.ignoreSpecialChar) {
161
- specialCharFound = false;
162
- section.push(options.specialChar);
163
- }
164
- section.push(c);
165
- }
166
- }
167
- else {
168
- if (this.equalsSpecialChar(options, c)) {
169
- specialCharFound = true;
170
- }
171
- else {
172
- section.push(c);
173
- }
174
- }
175
- }
176
- return { expression: section.join('') };
18
+ compileSections(text, options = {}) {
19
+ return this.sectionCompiler.compileSections(text, options);
177
20
  }
178
21
  };
179
22
  __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"expression-compiler.js","sourceRoot":"","sources":["../../../src/common/el/expression-compiler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"expression-compiler.js","sourceRoot":"","sources":["../../../src/common/el/expression-compiler.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAA6B,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC1G,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAE9D,uGAAuG;AAEhG,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAA5B;QAKgB,oBAAe,GAAG,IAAI,yBAAyB,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,SAAS,CAAC,kBAAkB,CAAC;;kEACiC;AAHtD,sBAAsB;IADlC,SAAS,CAAC,kBAAkB,CAAC;GACjB,sBAAsB,CAWlC"}
@@ -1,4 +1,10 @@
1
1
  import { JexlEngineProvider, ExpressionHandler, ExpressionContextProvider, ExpressionCompiler, ExpressionContext, ExpressionCompilerOptions } from './expression-protocol.js';
2
+ import { ExpressionUtil } from './expression-util.js';
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,6 +12,5 @@ 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 doHandle(text: string, ctx?: ExpressionContext, expressionCompilerOptions?: ExpressionCompilerOptions): any;
10
- protected hasExpression(sections: any[]): boolean;
15
+ protected options(compilerOptions?: ExpressionCompilerOptions): ExpressionUtil.Options;
11
16
  }
@@ -9,71 +9,32 @@ var __metadata = (this && this.__metadata) || function (k, v) {
9
9
  };
10
10
  import { Component, Autowired } from '../annotation/index.js';
11
11
  import { JexlEngineProvider, ExpressionHandler, ExpressionContextProvider, ExpressionCompiler } from './expression-protocol.js';
12
- import traverse from 'traverse';
12
+ import { ExpressionUtil } from './expression-util.js';
13
+ /**
14
+ * Evaluates `${...}` expressions with {@link ExpressionUtil}: the result of an expression is never
15
+ * evaluated again, references between configuration keys still resolve. Evaluate a text on purpose
16
+ * with the `eval` transform.
17
+ */
13
18
  let ExpressionHandlerImpl = class ExpressionHandlerImpl {
14
19
  getContext(ctx, expressionCompilerOptions) {
15
20
  const c = ctx || this.expressionContextProvider.provide();
16
21
  if (!ctx && c !== this._ctx && !(expressionCompilerOptions === null || expressionCompilerOptions === void 0 ? void 0 : expressionCompilerOptions.ignoreContextExpression)) {
17
22
  this._ctx = c;
18
- this.handle(c, c);
23
+ ExpressionUtil.evaluateConfiguration(c, this.options(expressionCompilerOptions));
19
24
  }
20
25
  return c;
21
26
  }
22
27
  handle(textOrObj, ctx, expressionCompilerOptions) {
28
+ const options = this.options(expressionCompilerOptions);
29
+ const context = () => this.getContext(ctx, expressionCompilerOptions);
23
30
  if (typeof textOrObj === 'string') {
24
- return this.doHandle(textOrObj, ctx, expressionCompilerOptions);
31
+ return ExpressionUtil.evaluateText(textOrObj, context, options);
25
32
  }
26
- else {
27
- /* eslint-disable-next-line @typescript-eslint/no-this-alias */
28
- const self = this;
29
- traverse(textOrObj).forEach(function (value) {
30
- if (typeof value === 'string') {
31
- this.update(self.handle(value, ctx, expressionCompilerOptions));
32
- }
33
- else if (value && value._ignoreEl === true) {
34
- this.update(value, true);
35
- }
36
- });
37
- return textOrObj;
38
- }
39
- }
40
- doHandle(text, ctx, expressionCompilerOptions) {
41
- const sections = this.expressionCompiler.compileSections(text, expressionCompilerOptions);
42
- if (sections.length > 0) {
43
- if (this.hasExpression(sections)) {
44
- const c = this.getContext(ctx, expressionCompilerOptions);
45
- if (sections.length === 1) {
46
- let value = sections[0].evalSync(c);
47
- if (typeof value === 'string') {
48
- value = this.handle(value, c);
49
- }
50
- return value;
51
- }
52
- const result = [];
53
- for (const section of sections) {
54
- if (typeof section === 'string') {
55
- result.push(section);
56
- }
57
- else {
58
- let value = section.evalSync(c);
59
- if (typeof value === 'string') {
60
- value = this.handle(value, c);
61
- }
62
- result.push(value);
63
- }
64
- }
65
- return result.join('');
66
- }
67
- }
68
- return text;
33
+ ExpressionUtil.walk(textOrObj, text => ExpressionUtil.evaluateText(text, context, options));
34
+ return textOrObj;
69
35
  }
70
- hasExpression(sections) {
71
- for (const section of sections) {
72
- if (typeof section !== 'string') {
73
- return true;
74
- }
75
- }
76
- return false;
36
+ options(compilerOptions) {
37
+ return { compiler: this.expressionCompiler, compilerOptions };
77
38
  }
78
39
  };
79
40
  __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"expression-handler.js","sourceRoot":"","sources":["../../../src/common/el/expression-handler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"expression-handler.js","sourceRoot":"","sources":["../../../src/common/el/expression-handler.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,kBAAkB,EAAgD,MAAM,uBAAuB,CAAC;AAC3K,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;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,cAAc,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,cAAc,CAAC,YAAY,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QACpE,CAAC;QACD,cAAc,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,cAAc,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,SAAS,CAAC,kBAAkB,CAAC;;iEACiC;AAG5C;IADlB,SAAS,CAAC,yBAAyB,CAAC;;wEACmC;AAGrD;IADlB,SAAS,CAAC,kBAAkB,CAAC;;iEAC4B;AATjD,qBAAqB;IADjC,SAAS,CAAC,iBAAiB,CAAC;GAChB,qBAAqB,CAqCjC"}
@@ -0,0 +1,68 @@
1
+ import { ExpressionCompiler, ExpressionCompilerOptions, ExpressionContext } from './expression-protocol.js';
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 {};