@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
@@ -0,0 +1,347 @@
1
+ import { Jexl } from 'jexl';
2
+ /**
3
+ * Splits a text into literal sections and compiled `${...}` expressions (jexl). It has no dependency
4
+ * injection, so the build (@celljs/vite) and the runtime share it through `@celljs/core/el`.
5
+ */
6
+ export class ExpressionSectionCompiler {
7
+ /** @param jexl the engine; the runtime passes the one of its JexlEngineProvider, which has the transforms */
8
+ constructor(jexl = () => { var _a; return ((_a = ExpressionSectionCompiler.jexlEngine) !== null && _a !== void 0 ? _a : (ExpressionSectionCompiler.jexlEngine = new Jexl())); }) {
9
+ this.jexl = jexl;
10
+ this.ESCAPE_CHAR = '\\';
11
+ this.SPECIAL_CHAR = '$';
12
+ this.BRACKET_BEGIN = '{';
13
+ this.BRACKET_END = '}';
14
+ }
15
+ getSpecialChar(opitons) {
16
+ if (opitons.ignoreSpecialChar) {
17
+ return '';
18
+ }
19
+ return opitons.specialChar;
20
+ }
21
+ equalsSpecialChar(opitons, char) {
22
+ if (opitons.ignoreSpecialChar) {
23
+ return false;
24
+ }
25
+ return char === opitons.specialChar;
26
+ }
27
+ compileSections(text, options) {
28
+ const merged = {
29
+ ...{ escapeChar: this.ESCAPE_CHAR, specialChar: this.SPECIAL_CHAR, bracketBegin: this.BRACKET_BEGIN, bracketEnd: this.BRACKET_END, ...options }
30
+ };
31
+ if (!text || text.indexOf(`${this.getSpecialChar(merged)}${merged.bracketBegin}`) < 0) {
32
+ return [];
33
+ }
34
+ const sections = [];
35
+ let middleText = text;
36
+ while (middleText) {
37
+ const me = this.middleCompile(middleText, merged);
38
+ if (!me) {
39
+ sections.push(middleText);
40
+ middleText = undefined;
41
+ }
42
+ else {
43
+ sections.push(me.expression);
44
+ middleText = me.nextText;
45
+ }
46
+ }
47
+ return sections;
48
+ }
49
+ middleCompile(text, options) {
50
+ let me;
51
+ const prefix = `${this.getSpecialChar(options)}${options.bracketBegin}`;
52
+ const prefix2 = `${prefix}${options.bracketBegin}`;
53
+ if (text.startsWith(prefix2)) {
54
+ me = this.nextMiddleExpression(text.substring(prefix2.length), 2, options);
55
+ }
56
+ else if (text.startsWith(prefix)) {
57
+ me = this.nextMiddleExpression(text.substring(prefix.length), undefined, options);
58
+ }
59
+ else {
60
+ me = this.nextString(text, options);
61
+ }
62
+ return me;
63
+ }
64
+ nextMiddleExpression(text, bracketBeginCharNum = 1, options) {
65
+ let stringed = false;
66
+ let escaped = false;
67
+ let bracketBeginCharFound = 0;
68
+ const section = [];
69
+ for (let i = 0; i < text.length; i++) {
70
+ const c = text[i];
71
+ if (!escaped) {
72
+ if ('\'' === c || '"' === c) {
73
+ stringed = !stringed;
74
+ section.push(c);
75
+ continue;
76
+ }
77
+ else if (c === options.escapeChar) {
78
+ escaped = true;
79
+ continue;
80
+ }
81
+ }
82
+ if (stringed) {
83
+ section.push(c);
84
+ escaped = false;
85
+ }
86
+ else if (escaped) {
87
+ if (this.equalsSpecialChar(options, c) || options.bracketBegin === c || options.bracketEnd === c) {
88
+ section.push(c);
89
+ }
90
+ else {
91
+ section.push(options.escapeChar);
92
+ section.push(c);
93
+ }
94
+ escaped = false;
95
+ }
96
+ else if (options.bracketBegin === c) {
97
+ bracketBeginCharFound++;
98
+ section.push(c);
99
+ }
100
+ else if (options.bracketEnd === c) {
101
+ if (bracketBeginCharFound === 0 && bracketBeginCharNum === 1) {
102
+ const jexlEngine = this.jexl();
103
+ const expression = jexlEngine.createExpression(section.join(''));
104
+ let nextText;
105
+ if (i !== text.length - 1) {
106
+ nextText = text.substring(i + 1);
107
+ }
108
+ return { expression, nextText };
109
+ }
110
+ else if (bracketBeginCharFound > 0) {
111
+ bracketBeginCharFound--;
112
+ section.push(c);
113
+ }
114
+ else {
115
+ bracketBeginCharNum--;
116
+ }
117
+ }
118
+ else {
119
+ section.push(c);
120
+ }
121
+ }
122
+ }
123
+ nextString(text, options) {
124
+ let escaped = false;
125
+ let specialCharFound = false;
126
+ const section = [];
127
+ for (let i = 0; i < text.length; i++) {
128
+ const c = text[i];
129
+ if (!escaped) {
130
+ if ('\'' === c || '"' === c) {
131
+ section.push(c);
132
+ continue;
133
+ }
134
+ else if (c === options.escapeChar) {
135
+ escaped = true;
136
+ continue;
137
+ }
138
+ }
139
+ if (escaped) {
140
+ if (this.equalsSpecialChar(options, c) || options.bracketBegin === c || options.bracketEnd === c) {
141
+ section.push(c);
142
+ }
143
+ else {
144
+ section.push(options.escapeChar);
145
+ section.push(c);
146
+ }
147
+ escaped = false;
148
+ }
149
+ else if (specialCharFound || options.ignoreSpecialChar) {
150
+ if (options.bracketBegin === c) {
151
+ const expression = section.join('');
152
+ const nextText = options.ignoreSpecialChar ? text.substring(i) : text.substring(i - 1);
153
+ return { expression, nextText };
154
+ }
155
+ else {
156
+ if (!options.ignoreSpecialChar) {
157
+ specialCharFound = false;
158
+ section.push(options.specialChar);
159
+ }
160
+ section.push(c);
161
+ }
162
+ }
163
+ else {
164
+ if (this.equalsSpecialChar(options, c)) {
165
+ specialCharFound = true;
166
+ }
167
+ else {
168
+ section.push(c);
169
+ }
170
+ }
171
+ }
172
+ return { expression: section.join('') };
173
+ }
174
+ }
175
+ /** An expression of the configuration that cannot be evaluated; `path` is its key, e.g. `cell.db.url`. */
176
+ export class ExpressionError extends Error {
177
+ constructor(path, template, message, cause) {
178
+ super(message);
179
+ this.path = path;
180
+ this.template = template;
181
+ this.cause = cause;
182
+ this.name = 'ExpressionError';
183
+ }
184
+ }
185
+ /**
186
+ * Evaluation of `${...}` expressions, shared by the runtime (ExpressionHandler) and the build
187
+ * (@celljs/vite) through `@celljs/core/el`. The result of an expression is never evaluated again: a value
188
+ * that comes from the environment (`${env.X}`), from a template variable or from another expression is
189
+ * text, whatever it contains. References between configuration keys still resolve: a key that refers to
190
+ * another one evaluates that key's own template (see {@link ExpressionUtil.evaluateConfiguration}).
191
+ */
192
+ export var ExpressionUtil;
193
+ (function (ExpressionUtil) {
194
+ let defaultCompiler;
195
+ function compilerOf(options) {
196
+ var _a;
197
+ return (_a = options.compiler) !== null && _a !== void 0 ? _a : (defaultCompiler !== null && defaultCompiler !== void 0 ? defaultCompiler : (defaultCompiler = new ExpressionSectionCompiler()));
198
+ }
199
+ /**
200
+ * Evaluates the expressions of `text`: a text with a single expression keeps the type of its value,
201
+ * mixed text is joined into a string. `context` may be a function, then it is only called when the text
202
+ * has an expression.
203
+ */
204
+ function evaluateText(text, context, options = {}) {
205
+ const sections = compilerOf(options).compileSections(text, options.compilerOptions);
206
+ if (!sections.some(section => typeof section !== 'string')) {
207
+ return text;
208
+ }
209
+ const c = typeof context === 'function' ? context() : context;
210
+ if (sections.length === 1) {
211
+ return sections[0].evalSync(c);
212
+ }
213
+ return sections.map(section => (typeof section === 'string' ? section : section.evalSync(c))).join('');
214
+ }
215
+ ExpressionUtil.evaluateText = evaluateText;
216
+ /**
217
+ * Replaces the templates (strings) of `node` by `evaluate`'s values, in place, depth first. Objects
218
+ * marked `_ignoreEl` are left alone, circular references are not followed, and values are not walked
219
+ * into: what an expression returns is not a template.
220
+ */
221
+ function walk(node, evaluate, enter) {
222
+ doWalk(node, [], evaluate, enter);
223
+ }
224
+ ExpressionUtil.walk = walk;
225
+ function doWalk(node, ancestors, evaluate, enter) {
226
+ if (typeof node !== 'object' || node === null || node._ignoreEl === true || ancestors.includes(node)) {
227
+ return;
228
+ }
229
+ ancestors.push(node);
230
+ for (const key of Object.keys(node)) {
231
+ const child = node[key];
232
+ if (typeof child === 'string') {
233
+ const value = evaluate(child, node, key);
234
+ if (value !== child) {
235
+ node[key] = value;
236
+ }
237
+ }
238
+ else {
239
+ if (enter && typeof child === 'object' && child !== null) {
240
+ enter(child, node, key);
241
+ }
242
+ doWalk(child, ancestors, evaluate, enter);
243
+ }
244
+ }
245
+ ancestors.pop();
246
+ }
247
+ /**
248
+ * Evaluates the configuration `root` in place. An expression sees the configuration through a view in
249
+ * which every template that it reaches is evaluated first (once, cached), so keys refer to each other in
250
+ * any order; a value an expression returns is never evaluated again. Objects marked `_ignoreEl` (such
251
+ * as `env`) are read as they are. Failures, including a circular reference, are {@link ExpressionError}s
252
+ * naming the key.
253
+ */
254
+ function evaluateConfiguration(root, options = {}) {
255
+ const values = new Map();
256
+ const resolving = [];
257
+ const paths = new WeakMap([[root, '']]);
258
+ const views = new WeakMap();
259
+ const targets = new WeakMap();
260
+ const pathOf = (owner, key) => {
261
+ const base = paths.get(owner);
262
+ return base ? `${base}.${key}` : key;
263
+ };
264
+ const unwrap = (value) => {
265
+ if (typeof value !== 'object' || value === null) {
266
+ return value;
267
+ }
268
+ const target = targets.get(value);
269
+ if (target) {
270
+ return target;
271
+ }
272
+ // Arrays and objects an expression builds may hold views of the configuration.
273
+ if (Array.isArray(value)) {
274
+ return value.map(unwrap);
275
+ }
276
+ if (Object.getPrototypeOf(value) === Object.prototype) {
277
+ return Object.fromEntries(Object.entries(value).map(([k, v]) => [k, unwrap(v)]));
278
+ }
279
+ return value;
280
+ };
281
+ const valueOf = (owner, key) => {
282
+ var _a;
283
+ const cached = values.get(owner);
284
+ if (cached === null || cached === void 0 ? void 0 : cached.has(key)) {
285
+ return cached.get(key);
286
+ }
287
+ const template = owner[key];
288
+ const path = pathOf(owner, key);
289
+ if (resolving.includes(path)) {
290
+ throw new ExpressionError(path, template, `Circular reference in the configuration: ${[...resolving, path].join(' -> ')}`);
291
+ }
292
+ resolving.push(path);
293
+ let value;
294
+ try {
295
+ value = unwrap(evaluateText(template, () => view(root), options));
296
+ }
297
+ catch (error) {
298
+ if (error instanceof ExpressionError) {
299
+ throw error;
300
+ }
301
+ throw new ExpressionError(path, template, `Cannot evaluate ${path}: ${template} (${(_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : error})`, error);
302
+ }
303
+ finally {
304
+ resolving.pop();
305
+ }
306
+ if (!values.has(owner)) {
307
+ values.set(owner, new Map());
308
+ }
309
+ values.get(owner).set(key, value);
310
+ return value;
311
+ };
312
+ const view = (target) => {
313
+ if (typeof target !== 'object' || target === null || target._ignoreEl === true) {
314
+ return target;
315
+ }
316
+ let proxy = views.get(target);
317
+ if (!proxy) {
318
+ const created = new Proxy(target, {
319
+ get: (t, key, receiver) => {
320
+ const value = Reflect.get(t, key, receiver);
321
+ if (typeof key !== 'string' || !Object.prototype.hasOwnProperty.call(t, key)) {
322
+ return value;
323
+ }
324
+ if (typeof value === 'string') {
325
+ return valueOf(t, key);
326
+ }
327
+ if (typeof value === 'object' && value !== null && !paths.has(value)) {
328
+ paths.set(value, pathOf(t, key));
329
+ }
330
+ return view(value);
331
+ }
332
+ });
333
+ views.set(target, created);
334
+ targets.set(created, target);
335
+ proxy = created;
336
+ }
337
+ return proxy;
338
+ };
339
+ walk(root, (text, owner, key) => valueOf(owner, key), (child, owner, key) => {
340
+ if (!paths.has(child)) {
341
+ paths.set(child, pathOf(owner, key));
342
+ }
343
+ });
344
+ }
345
+ ExpressionUtil.evaluateConfiguration = evaluateConfiguration;
346
+ })(ExpressionUtil || (ExpressionUtil = {}));
347
+ //# sourceMappingURL=expression-util.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"expression-util.js","sourceRoot":"","sources":["../../../src/common/el/expression-util.ts"],"names":[],"mappings":"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"}
@@ -2,5 +2,6 @@ export * from './expression-protocol.js';
2
2
  export * from './expression-compiler.js';
3
3
  export * from './expression-context-provider.js';
4
4
  export * from './expression-handler.js';
5
+ export * from './expression-util.js';
5
6
  export * from './jexl-engine-provider.js';
6
7
  export * from './core-context-initializer.js';
@@ -2,6 +2,7 @@ export * from './expression-protocol.js';
2
2
  export * from './expression-compiler.js';
3
3
  export * from './expression-context-provider.js';
4
4
  export * from './expression-handler.js';
5
+ export * from './expression-util.js';
5
6
  export * from './jexl-engine-provider.js';
6
7
  export * from './core-context-initializer.js';
7
8
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/el/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/el/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC"}
@@ -7,8 +7,10 @@ export declare abstract class AbstractLogger implements Logger {
7
7
  protected timeRecords: Map<string, number>;
8
8
  setContext(context?: string): void;
9
9
  protected resolveContextString(context?: string): string;
10
- protected resolvePrefix(): string;
11
- protected log(message: any, context?: string, logFn?: (...args: any[]) => void): void;
10
+ isEnabled(level: LogLevel): boolean;
11
+ /** `level` is the level of the message, not the configured one. */
12
+ protected resolvePrefix(level: LogLevel): string;
13
+ protected log(message: any, context?: string, logFn?: (...args: any[]) => void, level?: LogLevel): void;
12
14
  time(label: string): void;
13
15
  timeEnd(label: string, context?: string): number | undefined;
14
16
  abstract info(message: any, context?: string | undefined): void;
@@ -8,7 +8,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
10
  import { Autowired, Optional, Value } from '../annotation/index.js';
11
- import { LOGGER_LEVEL, onLogEmitter, TraceIdProvider } from './logger-protocol.js';
11
+ import { LOGGER_LEVEL, LOG_LEVELS, onLogEmitter, TraceIdProvider } from './logger-protocol.js';
12
12
  export class AbstractLogger {
13
13
  constructor() {
14
14
  this.timeRecords = new Map();
@@ -22,18 +22,23 @@ export class AbstractLogger {
22
22
  }
23
23
  return context ? `[${context}] ` : '';
24
24
  }
25
- resolvePrefix() {
25
+ isEnabled(level) {
26
+ const configured = LOG_LEVELS.indexOf(this.level);
27
+ return LOG_LEVELS.indexOf(level) >= (configured < 0 ? LOG_LEVELS.indexOf('info') : configured);
28
+ }
29
+ /** `level` is the level of the message, not the configured one. */
30
+ resolvePrefix(level) {
26
31
  const time = new Date().toISOString();
27
- return `${time} [${this.level}]`;
32
+ return `${time} [${level}]`;
28
33
  }
29
- log(message, context, logFn = console.info) {
34
+ log(message, context, logFn = console.info, level = 'info') {
30
35
  var _a;
31
36
  const traceId = (_a = this.traceIdProvider) === null || _a === void 0 ? void 0 : _a.provide();
32
37
  const traceStr = traceId ? ` [trace: ${traceId}]` : '';
33
38
  const contextStr = this.resolveContextString(context);
34
- logFn(`${this.resolvePrefix()}${traceStr}${contextStr}${message}`);
39
+ logFn(`${this.resolvePrefix(level)}${traceStr}${contextStr}${message}`);
35
40
  onLogEmitter.fire({
36
- level: this.level,
41
+ level,
37
42
  traceId,
38
43
  rootContext: this.context,
39
44
  context,
@@ -1 +1 @@
1
- {"version":3,"file":"abstract-logger.js","sourceRoot":"","sources":["../../../src/common/logger/abstract-logger.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAU,YAAY,EAAY,YAAY,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAElG,MAAM,OAAgB,cAAc;IAApC;QAUc,gBAAW,GAAwB,IAAI,GAAG,EAAE,CAAC;IAqD3D,CAAC;IAnDG,UAAU,CAAC,OAAgB;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAES,oBAAoB,CAAC,OAAgB;QAC3C,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,OAAO,OAAO,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,MAAM,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC;QAC9E,CAAC;QACD,OAAO,OAAO,CAAC,CAAC,CAAC,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1C,CAAC;IAES,aAAa;QACnB,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACtC,OAAO,GAAG,IAAI,KAAK,IAAI,CAAC,KAAK,GAAG,CAAC;IACrC,CAAC;IAES,GAAG,CAAC,OAAY,EAAE,OAAgB,EAAE,KAAK,GAA6B,OAAO,CAAC,IAAI;;QACxF,MAAM,OAAO,GAAG,MAAA,IAAI,CAAC,eAAe,0CAAE,OAAO,EAAE,CAAC;QAChD,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,YAAY,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACvD,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACtD,KAAK,CAAC,GAAG,IAAI,CAAC,aAAa,EAAE,GAAG,QAAQ,GAAG,UAAU,GAAG,OAAO,EAAE,CAAC,CAAC;QACnE,YAAY,CAAC,IAAI,CAAC;YACd,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,OAAO;YACP,WAAW,EAAE,IAAI,CAAC,OAAO;YACzB,OAAO;YACP,OAAO;SACV,CAAC,CAAC;IACP,CAAC;IAED,IAAI,CAAC,KAAa;QACd,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,CAAC,KAAa,EAAE,OAAgB;QACnC,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC1C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACtB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;YACpC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC/B,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,KAAK,QAAQ,KAAK,EAAE,OAAO,CAAC,CAAC;YAC9C,OAAO,QAAQ,CAAC;QACpB,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,GAAG,CAAC,kBAAkB,KAAK,cAAc,EAAE,OAAO,CAAC,CAAC;YACzD,OAAO;QACX,CAAC;IACL,CAAC;CAMJ;AA1DG;IADC,KAAK,CAAC,GAAG,YAAY,YAAY,CAAC;;6CACnB;AAGG;IADlB,SAAS,CAAC,eAAe,CAAC;IAAE,QAAQ,EAAE;;uDACc"}
1
+ {"version":3,"file":"abstract-logger.js","sourceRoot":"","sources":["../../../src/common/logger/abstract-logger.ts"],"names":[],"mappings":"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"}
@@ -5,6 +5,8 @@ export declare const Logger: unique symbol;
5
5
  export declare const TraceIdProvider: unique symbol;
6
6
  export declare const LoggerService: unique symbol;
7
7
  export type LogLevel = 'verbose' | 'debug' | 'info' | 'warn' | 'error';
8
+ /** Levels from the most to the least verbose: a logger at a level writes that level and the ones after it. */
9
+ export declare const LOG_LEVELS: readonly LogLevel[];
8
10
  export interface LogMessage {
9
11
  level: LogLevel;
10
12
  traceId?: string;
@@ -18,6 +20,8 @@ export interface Logger {
18
20
  error(message: any, context?: string): void;
19
21
  warn(message: any, context?: string): void;
20
22
  debug(message: any, context?: string): void;
23
+ /** Whether messages of `level` are written; check it before building an expensive message. */
24
+ isEnabled(level: LogLevel): boolean;
21
25
  time(label: string): void;
22
26
  timeEnd(label: string, context?: string): number | undefined;
23
27
  }
@@ -4,5 +4,7 @@ export const LOGGER_LEVEL = `${LOGGER_CONFIG}.level`;
4
4
  export const Logger = Symbol('Logger');
5
5
  export const TraceIdProvider = Symbol('TraceIdProvider');
6
6
  export const LoggerService = Symbol('LoggerService');
7
+ /** Levels from the most to the least verbose: a logger at a level writes that level and the ones after it. */
8
+ export const LOG_LEVELS = ['verbose', 'debug', 'info', 'warn', 'error'];
7
9
  export const onLogEmitter = new Emitter();
8
10
  //# sourceMappingURL=logger-protocol.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"logger-protocol.js","sourceRoot":"","sources":["../../../src/common/logger/logger-protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,MAAM,UAAU,CAAC;AAC1C,MAAM,CAAC,MAAM,aAAa,GAAG,aAAa,CAAC;AAC3C,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,aAAa,QAAQ,CAAC;AAErD,MAAM,CAAC,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;AACvC,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AACzD,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;AA0BrD,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,OAAO,EAAc,CAAC"}
1
+ {"version":3,"file":"logger-protocol.js","sourceRoot":"","sources":["../../../src/common/logger/logger-protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,MAAM,UAAU,CAAC;AAC1C,MAAM,CAAC,MAAM,aAAa,GAAG,aAAa,CAAC;AAC3C,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,aAAa,QAAQ,CAAC;AAErD,MAAM,CAAC,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;AACvC,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AACzD,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;AAIrD,8GAA8G;AAC9G,MAAM,CAAC,MAAM,UAAU,GAAwB,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AA0B7F,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,OAAO,EAAc,CAAC"}
@@ -10,21 +10,21 @@ import { AbstractLogger } from './abstract-logger.js';
10
10
  import { Logger } from './logger-protocol.js';
11
11
  let LoggerImpl = class LoggerImpl extends AbstractLogger {
12
12
  error(message, context) {
13
- this.log(message, context, console.error.bind(console));
13
+ this.log(message, context, console.error.bind(console), 'error');
14
14
  }
15
15
  info(message, context) {
16
- if (['info', 'debug'].includes(this.level)) {
17
- this.log(message, context);
16
+ if (this.isEnabled('info')) {
17
+ this.log(message, context, console.info.bind(console), 'info');
18
18
  }
19
19
  }
20
20
  warn(message, context) {
21
- if (['info', 'debug', 'warn'].includes(this.level)) {
22
- this.log(message, context, console.warn.bind(console));
21
+ if (this.isEnabled('warn')) {
22
+ this.log(message, context, console.warn.bind(console), 'warn');
23
23
  }
24
24
  }
25
25
  debug(message, context) {
26
- if (this.level === 'debug') {
27
- this.log(message, context, console.debug.bind(console));
26
+ if (this.isEnabled('debug')) {
27
+ this.log(message, context, console.debug.bind(console), 'debug');
28
28
  }
29
29
  }
30
30
  };
@@ -1 +1 @@
1
- {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/common/logger/logger.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAGpC,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,cAAc;IAE1C,KAAK,CAAC,OAAY,EAAE,OAAgB;QAChC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,CAAC,OAAY,EAAE,OAAgB;QAC/B,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACzC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC/B,CAAC;IACL,CAAC;IAED,IAAI,CAAC,OAAY,EAAE,OAAgB;QAC/B,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACjD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QAC3D,CAAC;IACL,CAAC;IAED,KAAK,CAAC,OAAY,EAAE,OAAgB;QAChC,IAAI,IAAI,CAAC,KAAK,KAAK,OAAO,EAAE,CAAC;YACzB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QAC5D,CAAC;IACL,CAAC;CAEJ,CAAA;AAxBY,UAAU;IADtB,SAAS,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC;GACrC,UAAU,CAwBtB"}
1
+ {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/common/logger/logger.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAGpC,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,cAAc;IAE1C,KAAK,CAAC,OAAY,EAAE,OAAgB;QAChC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;IACrE,CAAC;IAED,IAAI,CAAC,OAAY,EAAE,OAAgB;QAC/B,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC;QACnE,CAAC;IACL,CAAC;IAED,IAAI,CAAC,OAAY,EAAE,OAAgB;QAC/B,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC;QACnE,CAAC;IACL,CAAC;IAED,KAAK,CAAC,OAAY,EAAE,OAAgB;QAChC,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;QACrE,CAAC;IACL,CAAC;CAEJ,CAAA;AAxBY,UAAU;IADtB,SAAS,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC;GACrC,UAAU,CAwBtB"}
@@ -11,4 +11,5 @@ export declare class MockLogger implements Logger {
11
11
  error(message: any, context?: string): void;
12
12
  warn(message: any, context?: string): void;
13
13
  debug(message: any, context?: string): void;
14
+ isEnabled(level: LogLevel): boolean;
14
15
  }
@@ -33,6 +33,9 @@ let MockLogger = class MockLogger {
33
33
  debug(message, context) {
34
34
  // do nothing
35
35
  }
36
+ isEnabled(level) {
37
+ return false;
38
+ }
36
39
  };
37
40
  MockLogger = __decorate([
38
41
  Injectable()
@@ -1 +1 @@
1
- {"version":3,"file":"mock-logger.js","sourceRoot":"","sources":["../../../src/common/test/mock-logger.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAG5B,IAAM,UAAU,GAAhB,MAAM,UAAU;IAAhB;QACH,UAAK,GAAa,MAAM,CAAC;QACN,iBAAY,GAAG,IAAI,OAAO,EAAc,CAAC;QAC5D,UAAK,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC;IAsBpC,CAAC;IArBG,IAAI,CAAC,KAAa;QACd,aAAa;IACjB,CAAC;IACD,OAAO,CAAC,KAAa,EAAE,OAAgB;QACnC,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,UAAU,CAAC,OAAgB;QACvB,aAAa;IACjB,CAAC;IACD,IAAI,CAAC,OAAY,EAAE,OAAgB;QAC/B,aAAa;IACjB,CAAC;IACD,KAAK,CAAC,OAAY,EAAE,OAAgB;QAChC,aAAa;IACjB,CAAC;IACD,IAAI,CAAC,OAAY,EAAE,OAAgB;QAC/B,aAAa;IACjB,CAAC;IACD,KAAK,CAAC,OAAY,EAAE,OAAgB;QAChC,aAAa;IACjB,CAAC;CACJ,CAAA;AAzBY,UAAU;IADtB,UAAU,EAAE;GACA,UAAU,CAyBtB"}
1
+ {"version":3,"file":"mock-logger.js","sourceRoot":"","sources":["../../../src/common/test/mock-logger.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAG5B,IAAM,UAAU,GAAhB,MAAM,UAAU;IAAhB;QACH,UAAK,GAAa,MAAM,CAAC;QACN,iBAAY,GAAG,IAAI,OAAO,EAAc,CAAC;QAC5D,UAAK,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC;IAyBpC,CAAC;IAxBG,IAAI,CAAC,KAAa;QACd,aAAa;IACjB,CAAC;IACD,OAAO,CAAC,KAAa,EAAE,OAAgB;QACnC,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,UAAU,CAAC,OAAgB;QACvB,aAAa;IACjB,CAAC;IACD,IAAI,CAAC,OAAY,EAAE,OAAgB;QAC/B,aAAa;IACjB,CAAC;IACD,KAAK,CAAC,OAAY,EAAE,OAAgB;QAChC,aAAa;IACjB,CAAC;IACD,IAAI,CAAC,OAAY,EAAE,OAAgB;QAC/B,aAAa;IACjB,CAAC;IACD,KAAK,CAAC,OAAY,EAAE,OAAgB;QAChC,aAAa;IACjB,CAAC;IACD,SAAS,CAAC,KAAe;QACrB,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ,CAAA;AA5BY,UAAU;IADtB,UAAU,EAAE;GACA,UAAU,CA4BtB"}
@@ -1,4 +1,4 @@
1
- import { Event, Callback, CallbackList } from './event.js';
1
+ import { Event, CallbackList } from './event.js';
2
2
  import { MaybePromise } from './prioritizeable.js';
3
3
  export interface EmitterOptions {
4
4
  onFirstListenerAdd?: Function;
@@ -52,12 +52,3 @@ export declare namespace WaitUntilEvent {
52
52
  */
53
53
  function fire<T extends WaitUntilEvent>(emitter: Emitter<T>, event: Omit<T, 'waitUntil'>, timeout?: number | undefined): Promise<void>;
54
54
  }
55
- import { CancellationToken } from './cancellation.js';
56
- export declare class AsyncEmitter<T extends WaitUntilEvent> extends Emitter<T> {
57
- protected deliveryQueue: Promise<void> | undefined;
58
- /**
59
- * Fire listeners async one after another.
60
- */
61
- fire(event: Omit<T, 'waitUntil'>, token?: CancellationToken, promiseJoin?: (p: Promise<any>, listener: Function) => Promise<any>): Promise<void>;
62
- protected deliver(listeners: Callback[], event: Omit<T, 'waitUntil'>, token: CancellationToken, promiseJoin?: (p: Promise<any>, listener: Function) => Promise<any>): Promise<void>;
63
- }
@@ -162,60 +162,4 @@ export var WaitUntilEvent;
162
162
  }
163
163
  WaitUntilEvent.fire = fire;
164
164
  })(WaitUntilEvent || (WaitUntilEvent = {}));
165
- import { CancellationToken } from './cancellation.js';
166
- export class AsyncEmitter extends Emitter {
167
- /**
168
- * Fire listeners async one after another.
169
- */
170
- fire(event, token = CancellationToken.None, promiseJoin) {
171
- const callbacks = this._callbacks;
172
- if (!callbacks) {
173
- return Promise.resolve();
174
- }
175
- const listeners = [...callbacks];
176
- if (this.deliveryQueue) {
177
- return this.deliveryQueue = this.deliveryQueue.then(() => this.deliver(listeners, event, token, promiseJoin));
178
- }
179
- return this.deliveryQueue = this.deliver(listeners, event, token, promiseJoin);
180
- }
181
- async deliver(listeners, event, token, promiseJoin) {
182
- for (const listener of listeners) {
183
- if (token.isCancellationRequested) {
184
- return;
185
- }
186
- const waitables = [];
187
- const asyncEvent = Object.assign(event, {
188
- waitUntil: (thenable) => {
189
- if (Object.isFrozen(waitables)) {
190
- throw new Error('waitUntil cannot be called asynchronously.');
191
- }
192
- if (promiseJoin) {
193
- thenable = promiseJoin(thenable, listener);
194
- }
195
- waitables.push(thenable);
196
- }
197
- });
198
- try {
199
- listener(event);
200
- // Asynchronous calls to `waitUntil` should fail.
201
- Object.freeze(waitables);
202
- }
203
- catch (e) {
204
- console.error(e);
205
- }
206
- finally {
207
- delete asyncEvent['waitUntil'];
208
- }
209
- if (!waitables.length) {
210
- return;
211
- }
212
- try {
213
- await Promise.all(waitables);
214
- }
215
- catch (e) {
216
- console.error(e);
217
- }
218
- }
219
- }
220
- }
221
165
  //# sourceMappingURL=emitter.js.map