@celljs/core 4.0.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 (173) hide show
  1. package/README.md +0 -6
  2. package/esm/common/application/application-protocol.js +1 -1
  3. package/esm/common/application/application-protocol.js.map +1 -1
  4. package/esm/common/config/config-provider.js +2 -1
  5. package/esm/common/config/config-provider.js.map +1 -1
  6. package/esm/common/container/auto-bind.js +26 -12
  7. package/esm/common/container/auto-bind.js.map +1 -1
  8. package/esm/common/el/expression-compiler.d.ts +4 -15
  9. package/esm/common/el/expression-compiler.js +6 -163
  10. package/esm/common/el/expression-compiler.js.map +1 -1
  11. package/esm/common/el/expression-handler.d.ts +7 -2
  12. package/esm/common/el/expression-handler.js +14 -53
  13. package/esm/common/el/expression-handler.js.map +1 -1
  14. package/esm/common/el/expression-util.d.ts +68 -0
  15. package/esm/common/el/expression-util.js +347 -0
  16. package/esm/common/el/expression-util.js.map +1 -0
  17. package/esm/common/el/index.d.ts +1 -0
  18. package/esm/common/el/index.js +1 -0
  19. package/esm/common/el/index.js.map +1 -1
  20. package/esm/common/logger/abstract-logger.d.ts +4 -2
  21. package/esm/common/logger/abstract-logger.js +11 -6
  22. package/esm/common/logger/abstract-logger.js.map +1 -1
  23. package/esm/common/logger/logger-protocol.d.ts +4 -0
  24. package/esm/common/logger/logger-protocol.js +2 -0
  25. package/esm/common/logger/logger-protocol.js.map +1 -1
  26. package/esm/common/logger/logger.js +7 -7
  27. package/esm/common/logger/logger.js.map +1 -1
  28. package/esm/common/test/mock-logger.d.ts +1 -0
  29. package/esm/common/test/mock-logger.js +3 -0
  30. package/esm/common/test/mock-logger.js.map +1 -1
  31. package/esm/common/utils/emitter.d.ts +1 -10
  32. package/esm/common/utils/emitter.js +0 -56
  33. package/esm/common/utils/emitter.js.map +1 -1
  34. package/esm/common/utils/mime-type-util.js +1 -1
  35. package/esm/common/utils/mime-type-util.js.map +1 -1
  36. package/esm/common/utils/mime-type.js +1 -1
  37. package/esm/common/utils/mime-type.js.map +1 -1
  38. package/esm/node/context/context.d.ts +11 -2
  39. package/esm/node/context/context.js +36 -12
  40. package/esm/node/context/context.js.map +1 -1
  41. package/esm/node/index.d.ts +0 -1
  42. package/esm/node/index.js +0 -1
  43. package/esm/node/index.js.map +1 -1
  44. package/lib/common/aop/aop.spec.d.ts +2 -0
  45. package/lib/common/aop/aop.spec.d.ts.map +1 -0
  46. package/lib/common/aop/aop.spec.js +170 -0
  47. package/lib/common/aop/aop.spec.js.map +1 -0
  48. package/lib/common/application/application-protocol.js +1 -1
  49. package/lib/common/application/application-protocol.js.map +1 -1
  50. package/lib/common/application/lifecycle.spec.d.ts +2 -0
  51. package/lib/common/application/lifecycle.spec.d.ts.map +1 -0
  52. package/lib/common/application/lifecycle.spec.js +155 -0
  53. package/lib/common/application/lifecycle.spec.js.map +1 -0
  54. package/lib/common/config/config-provider.js +2 -1
  55. package/lib/common/config/config-provider.js.map +1 -1
  56. package/lib/common/container/assembly.spec.d.ts +2 -0
  57. package/lib/common/container/assembly.spec.d.ts.map +1 -0
  58. package/lib/common/container/assembly.spec.js +464 -0
  59. package/lib/common/container/assembly.spec.js.map +1 -0
  60. package/lib/common/container/auto-bind.js +26 -12
  61. package/lib/common/container/auto-bind.js.map +1 -1
  62. package/lib/common/el/expression-compiler.d.ts +4 -15
  63. package/lib/common/el/expression-compiler.d.ts.map +1 -1
  64. package/lib/common/el/expression-compiler.js +6 -163
  65. package/lib/common/el/expression-compiler.js.map +1 -1
  66. package/lib/common/el/expression-handler.d.ts +7 -2
  67. package/lib/common/el/expression-handler.d.ts.map +1 -1
  68. package/lib/common/el/expression-handler.js +14 -56
  69. package/lib/common/el/expression-handler.js.map +1 -1
  70. package/lib/common/el/expression-handler.spec.d.ts +2 -0
  71. package/lib/common/el/expression-handler.spec.d.ts.map +1 -0
  72. package/lib/common/el/expression-handler.spec.js +99 -0
  73. package/lib/common/el/expression-handler.spec.js.map +1 -0
  74. package/lib/common/el/expression-util.d.ts +69 -0
  75. package/lib/common/el/expression-util.d.ts.map +1 -0
  76. package/lib/common/el/expression-util.js +352 -0
  77. package/lib/common/el/expression-util.js.map +1 -0
  78. package/lib/common/el/expression-util.spec.d.ts +2 -0
  79. package/lib/common/el/expression-util.spec.d.ts.map +1 -0
  80. package/lib/common/el/expression-util.spec.js +45 -0
  81. package/lib/common/el/expression-util.spec.js.map +1 -0
  82. package/lib/common/el/index.d.ts +1 -0
  83. package/lib/common/el/index.d.ts.map +1 -1
  84. package/lib/common/el/index.js +1 -0
  85. package/lib/common/el/index.js.map +1 -1
  86. package/lib/common/el/value-and-el.spec.d.ts +2 -0
  87. package/lib/common/el/value-and-el.spec.d.ts.map +1 -0
  88. package/lib/common/el/value-and-el.spec.js +216 -0
  89. package/lib/common/el/value-and-el.spec.js.map +1 -0
  90. package/lib/common/logger/abstract-logger.d.ts +4 -2
  91. package/lib/common/logger/abstract-logger.d.ts.map +1 -1
  92. package/lib/common/logger/abstract-logger.js +10 -5
  93. package/lib/common/logger/abstract-logger.js.map +1 -1
  94. package/lib/common/logger/logger-protocol.d.ts +4 -0
  95. package/lib/common/logger/logger-protocol.d.ts.map +1 -1
  96. package/lib/common/logger/logger-protocol.js +3 -1
  97. package/lib/common/logger/logger-protocol.js.map +1 -1
  98. package/lib/common/logger/logger.js +7 -7
  99. package/lib/common/logger/logger.js.map +1 -1
  100. package/lib/common/logger/logger.spec.d.ts +2 -0
  101. package/lib/common/logger/logger.spec.d.ts.map +1 -0
  102. package/lib/common/logger/logger.spec.js +57 -0
  103. package/lib/common/logger/logger.spec.js.map +1 -0
  104. package/lib/common/test/mock-logger.d.ts +1 -0
  105. package/lib/common/test/mock-logger.d.ts.map +1 -1
  106. package/lib/common/test/mock-logger.js +3 -0
  107. package/lib/common/test/mock-logger.js.map +1 -1
  108. package/lib/common/utils/emitter.d.ts +1 -10
  109. package/lib/common/utils/emitter.d.ts.map +1 -1
  110. package/lib/common/utils/emitter.js +1 -58
  111. package/lib/common/utils/emitter.js.map +1 -1
  112. package/lib/common/utils/mime-type-util.js +1 -1
  113. package/lib/common/utils/mime-type-util.js.map +1 -1
  114. package/lib/common/utils/mime-type.js +1 -1
  115. package/lib/common/utils/mime-type.js.map +1 -1
  116. package/lib/common/utils/utils-behavior.spec.d.ts +2 -0
  117. package/lib/common/utils/utils-behavior.spec.d.ts.map +1 -0
  118. package/lib/common/utils/utils-behavior.spec.js +232 -0
  119. package/lib/common/utils/utils-behavior.spec.js.map +1 -0
  120. package/lib/node/context/context.d.ts +11 -2
  121. package/lib/node/context/context.d.ts.map +1 -1
  122. package/lib/node/context/context.js +36 -10
  123. package/lib/node/context/context.js.map +1 -1
  124. package/lib/node/context/context.spec.d.ts +2 -0
  125. package/lib/node/context/context.spec.d.ts.map +1 -0
  126. package/lib/node/context/context.spec.js +202 -0
  127. package/lib/node/context/context.spec.js.map +1 -0
  128. package/lib/node/index.d.ts +0 -1
  129. package/lib/node/index.d.ts.map +1 -1
  130. package/lib/node/index.js +0 -1
  131. package/lib/node/index.js.map +1 -1
  132. package/package.json +7 -17
  133. package/src/common/aop/aop.spec.ts +145 -0
  134. package/src/common/application/application-protocol.ts +1 -1
  135. package/src/common/application/lifecycle.spec.ts +148 -0
  136. package/src/common/config/config-provider.ts +1 -1
  137. package/src/common/container/assembly.spec.ts +293 -0
  138. package/src/common/container/auto-bind.ts +23 -10
  139. package/src/common/el/expression-compiler.ts +6 -166
  140. package/src/common/el/expression-handler.spec.ts +110 -0
  141. package/src/common/el/expression-handler.ts +14 -51
  142. package/src/common/el/expression-util.spec.ts +45 -0
  143. package/src/common/el/expression-util.ts +363 -0
  144. package/src/common/el/index.ts +2 -1
  145. package/src/common/el/value-and-el.spec.ts +186 -0
  146. package/src/common/logger/abstract-logger.ts +12 -6
  147. package/src/common/logger/logger-protocol.ts +5 -0
  148. package/src/common/logger/logger.spec.ts +61 -0
  149. package/src/common/logger/logger.ts +7 -7
  150. package/src/common/test/mock-logger.ts +3 -0
  151. package/src/common/utils/emitter.ts +1 -63
  152. package/src/common/utils/mime-type-util.ts +1 -1
  153. package/src/common/utils/mime-type.ts +1 -1
  154. package/src/common/utils/utils-behavior.spec.ts +259 -0
  155. package/src/node/context/context.spec.ts +219 -0
  156. package/src/node/context/context.ts +35 -10
  157. package/src/node/index.ts +0 -1
  158. package/esm/node/utils/crc.d.ts +0 -1
  159. package/esm/node/utils/crc.js +0 -7
  160. package/esm/node/utils/crc.js.map +0 -1
  161. package/esm/node/utils/index.d.ts +0 -1
  162. package/esm/node/utils/index.js +0 -2
  163. package/esm/node/utils/index.js.map +0 -1
  164. package/lib/node/utils/crc.d.ts +0 -2
  165. package/lib/node/utils/crc.d.ts.map +0 -1
  166. package/lib/node/utils/crc.js +0 -10
  167. package/lib/node/utils/crc.js.map +0 -1
  168. package/lib/node/utils/index.d.ts +0 -2
  169. package/lib/node/utils/index.d.ts.map +0 -1
  170. package/lib/node/utils/index.js +0 -18
  171. package/lib/node/utils/index.js.map +0 -1
  172. package/src/node/utils/crc.ts +0 -7
  173. package/src/node/utils/index.ts +0 -1
package/README.md CHANGED
@@ -19,12 +19,6 @@ Cell 核心组件是一个轻量级的应用框架,用于构建现代化的应
19
19
  npm install @celljs/core
20
20
  ```
21
21
 
22
- 或者使用 yarn:
23
-
24
- ```bash
25
- yarn add @celljs/core
26
- ```
27
-
28
22
  ## 快速开始
29
23
 
30
24
  以下是一个简单的依赖注入示例,展示如何使用 Cell 核心组件将一个类对象注入到 IoC 容器中:
@@ -78,7 +78,7 @@ export class AbstractApplicationStateService {
78
78
  }
79
79
  set state(state) {
80
80
  if (state !== this._state) {
81
- this.deferred[this._state] = new Deferred();
81
+ // A state that was reached stays reached: late `reachedState()` calls resolve at once.
82
82
  this._state = state;
83
83
  if (this.deferred[state] === undefined) {
84
84
  this.deferred[state] = new Deferred();
@@ -1 +1 @@
1
- {"version":3,"file":"application-protocol.js","sourceRoot":"","sources":["../../../src/common/application/application-protocol.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"application-protocol.js","sourceRoot":"","sources":["../../../src/common/application/application-protocol.ts"],"names":[],"mappings":"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"}
@@ -12,7 +12,8 @@ import { Component, Autowired } from '../annotation/index.js';
12
12
  import { ExpressionHandler } from '../el/index.js';
13
13
  let ConfigProviderImpl = class ConfigProviderImpl {
14
14
  get(key, defaultValue) {
15
- return this.expressionHandler.handle(`\${${key}}`) || defaultValue;
15
+ var _a;
16
+ return (_a = this.expressionHandler.handle(`\${${key}}`)) !== null && _a !== void 0 ? _a : defaultValue;
16
17
  }
17
18
  };
18
19
  __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"config-provider.js","sourceRoot":"","sources":["../../../src/common/config/config-provider.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAGnC,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAK3B,GAAG,CAAI,GAAW,EAAE,YAAgB;QAChC,OAAO,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,IAAI,YAAY,CAAC;IACvE,CAAC;CAEJ,CAAA;AANsB;IADlB,SAAS,CAAC,iBAAiB,CAAC;;6DAC2B;AAH/C,kBAAkB;IAD9B,SAAS,CAAC,cAAc,CAAC;GACb,kBAAkB,CAS9B"}
1
+ {"version":3,"file":"config-provider.js","sourceRoot":"","sources":["../../../src/common/config/config-provider.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAGnC,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAK3B,GAAG,CAAI,GAAW,EAAE,YAAgB;;QAChC,aAAO,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,mCAAI,YAAY,CAAC;IACvE,CAAC;CAEJ,CAAA;AANsB;IADlB,SAAS,CAAC,iBAAiB,CAAC;;6DAC2B;AAH/C,kBAAkB;IAD9B,SAAS,CAAC,cAAc,CAAC;GACb,kBAAkB,CAS9B"}
@@ -60,17 +60,26 @@ function resolve(metadata, bind, rebind) {
60
60
  else if (scope === Scope.Transient) {
61
61
  mid = mid.inTransientScope();
62
62
  }
63
- if (name) {
64
- mid = mid.whenTargetNamed(name);
65
- }
66
- else if (tag) {
67
- mid = mid.whenTargetTagged(tag.tag, tag.value);
68
- }
69
- else if (metadata.default) {
70
- mid = mid.whenTargetIsDefault();
71
- }
72
- else if (when) {
73
- mid = mid.when(when);
63
+ const constrain = (syntax) => {
64
+ if (name) {
65
+ return syntax.whenTargetNamed(name);
66
+ }
67
+ else if (tag) {
68
+ return syntax.whenTargetTagged(tag.tag, tag.value);
69
+ }
70
+ else if (metadata.default) {
71
+ return syntax.whenTargetIsDefault();
72
+ }
73
+ else if (when) {
74
+ return syntax.when(when);
75
+ }
76
+ return syntax;
77
+ };
78
+ // name / tag / default / when choose among the implementations of an id, so they go on the bindings of
79
+ // the ids (`@Component({ id, name })`); the class itself stays reachable without them.
80
+ const aliases = !metadata.rebind && (name || tag || metadata.default || when) ? _ids : [];
81
+ if (aliases.length === 0) {
82
+ mid = constrain(mid);
74
83
  }
75
84
  if (onActivation) {
76
85
  mid.onActivation(onActivation);
@@ -79,7 +88,12 @@ function resolve(metadata, bind, rebind) {
79
88
  mid.onActivation((context, t) => doProxyIfNeed(metadata, t));
80
89
  }
81
90
  for (const item of _ids) {
82
- bind(item).toService(id);
91
+ if (aliases.includes(item)) {
92
+ constrain(bind(item).toDynamicValue(context => context.container.get(id)));
93
+ }
94
+ else {
95
+ bind(item).toService(id);
96
+ }
83
97
  }
84
98
  }
85
99
  function resolveConstant(metadata, bind, rebind) {
@@ -1 +1 @@
1
- {"version":3,"file":"auto-bind.js","sourceRoot":"","sources":["../../../src/common/container/auto-bind.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"auto-bind.js","sourceRoot":"","sources":["../../../src/common/container/auto-bind.ts"],"names":[],"mappings":"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"}
@@ -1,19 +1,8 @@
1
1
  import { ExpressionCompiler, ExpressionCompilerOptions, JexlEngineProvider } from './expression-protocol.js';
2
- interface MiddleExpression {
3
- expression: any;
4
- nextText?: string;
5
- }
2
+ import { ExpressionSectionCompiler } from './expression-util.js';
3
+ /** The {@link ExpressionSectionCompiler} on the jexl engine of the container (with its transforms). */
6
4
  export declare class ExpressionCompilerImpl implements ExpressionCompiler {
7
- private ESCAPE_CHAR;
8
- private SPECIAL_CHAR;
9
- private BRACKET_BEGIN;
10
- private BRACKET_END;
11
5
  protected readonly jexlEngineProvider: JexlEngineProvider<any>;
12
- protected getSpecialChar(opitons: Required<ExpressionCompilerOptions>): string;
13
- protected equalsSpecialChar(opitons: Required<ExpressionCompilerOptions>, char: string): boolean;
14
- compileSections(text: string, options: ExpressionCompilerOptions): any[];
15
- protected middleCompile(text: string, options: Required<ExpressionCompilerOptions>): MiddleExpression | undefined;
16
- protected nextMiddleExpression(text: string, bracketBeginCharNum: number | undefined, options: Required<ExpressionCompilerOptions>): MiddleExpression | undefined;
17
- protected nextString(text: string, options: Required<ExpressionCompilerOptions>): MiddleExpression;
6
+ protected readonly sectionCompiler: ExpressionSectionCompiler;
7
+ compileSections(text: string, options?: ExpressionCompilerOptions): any[];
18
8
  }
19
- export {};
@@ -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 {};