@celljs/core 4.3.0 → 4.4.1

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 (239) hide show
  1. package/README.md +48 -20
  2. package/cell.schema.json +84 -0
  3. package/cell.yml +13 -12
  4. package/esm/browser/application/frontend-application.d.ts +2 -2
  5. package/esm/browser/application/frontend-application.js +6 -25
  6. package/esm/browser/application/frontend-application.js.map +1 -1
  7. package/esm/common/annotation/component.js +1 -2
  8. package/esm/common/annotation/component.js.map +1 -1
  9. package/esm/common/annotation/service.js +2 -1
  10. package/esm/common/annotation/service.js.map +1 -1
  11. package/esm/common/application/application-entry.js +4 -0
  12. package/esm/common/application/application-entry.js.map +1 -1
  13. package/esm/common/application/application-protocol.d.ts +9 -3
  14. package/esm/common/application/application-protocol.js +19 -7
  15. package/esm/common/application/application-protocol.js.map +1 -1
  16. package/esm/common/application/application.js +1 -1
  17. package/esm/common/application/application.js.map +1 -1
  18. package/esm/common/config/config-util.d.ts +3 -0
  19. package/esm/common/config/config-util.js +6 -1
  20. package/esm/common/config/config-util.js.map +1 -1
  21. package/esm/common/config/dynamic-config.d.ts +3 -0
  22. package/esm/common/config/dynamic-config.js +3 -1
  23. package/esm/common/config/dynamic-config.js.map +1 -1
  24. package/esm/common/config/env-config-util.d.ts +32 -26
  25. package/esm/common/config/env-config-util.js +84 -40
  26. package/esm/common/config/env-config-util.js.map +1 -1
  27. package/esm/common/constants.d.ts +1 -1
  28. package/esm/common/constants.js +1 -1
  29. package/esm/common/constants.js.map +1 -1
  30. package/esm/common/container/auto-bind.js +2 -2
  31. package/esm/common/container/auto-bind.js.map +1 -1
  32. package/esm/common/container/container.js +3 -3
  33. package/esm/common/container/container.js.map +1 -1
  34. package/esm/common/el/core-context-initializer.js +3 -1
  35. package/esm/common/el/core-context-initializer.js.map +1 -1
  36. package/esm/common/el/expression-engine.d.ts +3 -3
  37. package/esm/common/el/expression-engine.js +18 -9
  38. package/esm/common/el/expression-engine.js.map +1 -1
  39. package/esm/common/el/expression-handler.js +2 -1
  40. package/esm/common/el/expression-handler.js.map +1 -1
  41. package/esm/common/el/expression-util.d.ts +17 -4
  42. package/esm/common/el/expression-util.js +28 -9
  43. package/esm/common/el/expression-util.js.map +1 -1
  44. package/esm/common/index.d.ts +1 -0
  45. package/esm/common/index.js +1 -0
  46. package/esm/common/index.js.map +1 -1
  47. package/esm/common/logger/abstract-logger.d.ts +2 -1
  48. package/esm/common/logger/abstract-logger.js +28 -17
  49. package/esm/common/logger/abstract-logger.js.map +1 -1
  50. package/esm/common/logger/logger-protocol.d.ts +2 -2
  51. package/esm/common/logger/logger-protocol.js +1 -1
  52. package/esm/common/logger/logger-protocol.js.map +1 -1
  53. package/esm/common/logger/logger.js +11 -4
  54. package/esm/common/logger/logger.js.map +1 -1
  55. package/esm/common/security-check/index.d.ts +2 -0
  56. package/esm/common/security-check/index.js +3 -0
  57. package/esm/common/security-check/index.js.map +1 -0
  58. package/esm/common/security-check/security-check-protocol.d.ts +40 -0
  59. package/esm/common/security-check/security-check-protocol.js +24 -0
  60. package/esm/common/security-check/security-check-protocol.js.map +1 -0
  61. package/esm/common/security-check/security-checker.d.ts +14 -0
  62. package/esm/common/security-check/security-checker.js +61 -0
  63. package/esm/common/security-check/security-checker.js.map +1 -0
  64. package/esm/common/utils/emitter.d.ts +2 -0
  65. package/esm/common/utils/emitter.js +4 -0
  66. package/esm/common/utils/emitter.js.map +1 -1
  67. package/esm/common/utils/error-util.d.ts +8 -0
  68. package/esm/common/utils/error-util.js +24 -0
  69. package/esm/common/utils/error-util.js.map +1 -1
  70. package/esm/common/utils/event.d.ts +6 -1
  71. package/esm/common/utils/event.js +20 -6
  72. package/esm/common/utils/event.js.map +1 -1
  73. package/esm/common/utils/uuid.d.ts +1 -1
  74. package/esm/common/utils/uuid.js +1 -1
  75. package/esm/common/utils/uuid.js.map +1 -1
  76. package/esm/node/application/backend-application.js +1 -1
  77. package/esm/node/application/backend-application.js.map +1 -1
  78. package/esm/node/context/context.js +3 -3
  79. package/esm/node/context/context.js.map +1 -1
  80. package/lib/browser/application/frontend-application.d.ts +2 -2
  81. package/lib/browser/application/frontend-application.d.ts.map +1 -1
  82. package/lib/browser/application/frontend-application.js +6 -25
  83. package/lib/browser/application/frontend-application.js.map +1 -1
  84. package/lib/common/annotation/component.js +1 -2
  85. package/lib/common/annotation/component.js.map +1 -1
  86. package/lib/common/annotation/service.d.ts.map +1 -1
  87. package/lib/common/annotation/service.js +2 -1
  88. package/lib/common/annotation/service.js.map +1 -1
  89. package/lib/common/annotation/service.spec.d.ts +2 -0
  90. package/lib/common/annotation/service.spec.d.ts.map +1 -0
  91. package/lib/common/annotation/service.spec.js +43 -0
  92. package/lib/common/annotation/service.spec.js.map +1 -0
  93. package/lib/common/aop/aop.spec.js +4 -4
  94. package/lib/common/aop/aop.spec.js.map +1 -1
  95. package/lib/common/application/application-entry.js +4 -0
  96. package/lib/common/application/application-entry.js.map +1 -1
  97. package/lib/common/application/application-protocol.d.ts +9 -3
  98. package/lib/common/application/application-protocol.d.ts.map +1 -1
  99. package/lib/common/application/application-protocol.js +19 -7
  100. package/lib/common/application/application-protocol.js.map +1 -1
  101. package/lib/common/application/application.js +1 -1
  102. package/lib/common/application/application.js.map +1 -1
  103. package/lib/common/application/lifecycle.spec.js +54 -7
  104. package/lib/common/application/lifecycle.spec.js.map +1 -1
  105. package/lib/common/config/config-util.d.ts +3 -0
  106. package/lib/common/config/config-util.d.ts.map +1 -1
  107. package/lib/common/config/config-util.js +5 -0
  108. package/lib/common/config/config-util.js.map +1 -1
  109. package/lib/common/config/dynamic-config.d.ts +3 -0
  110. package/lib/common/config/dynamic-config.d.ts.map +1 -1
  111. package/lib/common/config/dynamic-config.js +4 -2
  112. package/lib/common/config/dynamic-config.js.map +1 -1
  113. package/lib/common/config/env-config-util.d.ts +32 -26
  114. package/lib/common/config/env-config-util.d.ts.map +1 -1
  115. package/lib/common/config/env-config-util.js +84 -40
  116. package/lib/common/config/env-config-util.js.map +1 -1
  117. package/lib/common/config/env-config-util.spec.js +148 -132
  118. package/lib/common/config/env-config-util.spec.js.map +1 -1
  119. package/lib/common/constants.d.ts +1 -1
  120. package/lib/common/constants.d.ts.map +1 -1
  121. package/lib/common/constants.js +1 -1
  122. package/lib/common/constants.js.map +1 -1
  123. package/lib/common/container/auto-bind.js +2 -2
  124. package/lib/common/container/auto-bind.js.map +1 -1
  125. package/lib/common/container/container.js +3 -3
  126. package/lib/common/container/container.js.map +1 -1
  127. package/lib/common/el/core-context-initializer.d.ts.map +1 -1
  128. package/lib/common/el/core-context-initializer.js +3 -1
  129. package/lib/common/el/core-context-initializer.js.map +1 -1
  130. package/lib/common/el/expression-engine.d.ts +3 -3
  131. package/lib/common/el/expression-engine.js +18 -9
  132. package/lib/common/el/expression-engine.js.map +1 -1
  133. package/lib/common/el/expression-engine.spec.js +15 -7
  134. package/lib/common/el/expression-engine.spec.js.map +1 -1
  135. package/lib/common/el/expression-handler.d.ts.map +1 -1
  136. package/lib/common/el/expression-handler.js +2 -1
  137. package/lib/common/el/expression-handler.js.map +1 -1
  138. package/lib/common/el/expression-util.d.ts +17 -4
  139. package/lib/common/el/expression-util.d.ts.map +1 -1
  140. package/lib/common/el/expression-util.js +28 -10
  141. package/lib/common/el/expression-util.js.map +1 -1
  142. package/lib/common/index.d.ts +1 -0
  143. package/lib/common/index.d.ts.map +1 -1
  144. package/lib/common/index.js +1 -0
  145. package/lib/common/index.js.map +1 -1
  146. package/lib/common/logger/abstract-logger.d.ts +2 -1
  147. package/lib/common/logger/abstract-logger.d.ts.map +1 -1
  148. package/lib/common/logger/abstract-logger.js +28 -17
  149. package/lib/common/logger/abstract-logger.js.map +1 -1
  150. package/lib/common/logger/logger-protocol.d.ts +2 -2
  151. package/lib/common/logger/logger-protocol.d.ts.map +1 -1
  152. package/lib/common/logger/logger-protocol.js +1 -1
  153. package/lib/common/logger/logger-protocol.js.map +1 -1
  154. package/lib/common/logger/logger.d.ts.map +1 -1
  155. package/lib/common/logger/logger.js +11 -4
  156. package/lib/common/logger/logger.js.map +1 -1
  157. package/lib/common/logger/logger.spec.js +35 -0
  158. package/lib/common/logger/logger.spec.js.map +1 -1
  159. package/lib/common/security-check/index.d.ts +3 -0
  160. package/lib/common/security-check/index.d.ts.map +1 -0
  161. package/lib/common/security-check/index.js +19 -0
  162. package/lib/common/security-check/index.js.map +1 -0
  163. package/lib/common/security-check/security-check-protocol.d.ts +41 -0
  164. package/lib/common/security-check/security-check-protocol.d.ts.map +1 -0
  165. package/lib/common/security-check/security-check-protocol.js +28 -0
  166. package/lib/common/security-check/security-check-protocol.js.map +1 -0
  167. package/lib/common/security-check/security-checker.d.ts +15 -0
  168. package/lib/common/security-check/security-checker.d.ts.map +1 -0
  169. package/lib/common/security-check/security-checker.js +64 -0
  170. package/lib/common/security-check/security-checker.js.map +1 -0
  171. package/lib/common/security-check/security-checker.spec.d.ts +2 -0
  172. package/lib/common/security-check/security-checker.spec.d.ts.map +1 -0
  173. package/lib/common/security-check/security-checker.spec.js +68 -0
  174. package/lib/common/security-check/security-checker.spec.js.map +1 -0
  175. package/lib/common/utils/emitter.d.ts +2 -0
  176. package/lib/common/utils/emitter.d.ts.map +1 -1
  177. package/lib/common/utils/emitter.js +4 -0
  178. package/lib/common/utils/emitter.js.map +1 -1
  179. package/lib/common/utils/error-util.d.ts +8 -0
  180. package/lib/common/utils/error-util.d.ts.map +1 -1
  181. package/lib/common/utils/error-util.js +24 -0
  182. package/lib/common/utils/error-util.js.map +1 -1
  183. package/lib/common/utils/event.d.ts +6 -1
  184. package/lib/common/utils/event.d.ts.map +1 -1
  185. package/lib/common/utils/event.js +20 -6
  186. package/lib/common/utils/event.js.map +1 -1
  187. package/lib/common/utils/utils-behavior.spec.js +21 -2
  188. package/lib/common/utils/utils-behavior.spec.js.map +1 -1
  189. package/lib/common/utils/uuid.d.ts +1 -1
  190. package/lib/common/utils/uuid.d.ts.map +1 -1
  191. package/lib/common/utils/uuid.js +2 -2
  192. package/lib/common/utils/uuid.js.map +1 -1
  193. package/lib/node/application/backend-application.js +1 -1
  194. package/lib/node/application/backend-application.js.map +1 -1
  195. package/lib/node/context/context.d.ts.map +1 -1
  196. package/lib/node/context/context.js +3 -3
  197. package/lib/node/context/context.js.map +1 -1
  198. package/lib/node/context/context.spec.js +13 -0
  199. package/lib/node/context/context.spec.js.map +1 -1
  200. package/package.json +6 -2
  201. package/src/browser/application/frontend-application.ts +7 -28
  202. package/src/common/annotation/component.ts +1 -1
  203. package/src/common/annotation/service.spec.ts +29 -0
  204. package/src/common/annotation/service.ts +2 -1
  205. package/src/common/aop/aop.spec.ts +4 -4
  206. package/src/common/application/application-entry.ts +4 -0
  207. package/src/common/application/application-protocol.ts +21 -11
  208. package/src/common/application/application.ts +1 -1
  209. package/src/common/application/lifecycle.spec.ts +52 -8
  210. package/src/common/config/config-util.ts +7 -1
  211. package/src/common/config/dynamic-config.ts +6 -1
  212. package/src/common/config/env-config-util.spec.ts +152 -149
  213. package/src/common/config/env-config-util.ts +95 -51
  214. package/src/common/constants.ts +1 -1
  215. package/src/common/container/auto-bind.ts +1 -1
  216. package/src/common/container/container.ts +3 -3
  217. package/src/common/el/core-context-initializer.ts +4 -2
  218. package/src/common/el/expression-engine.spec.ts +17 -8
  219. package/src/common/el/expression-engine.ts +17 -9
  220. package/src/common/el/expression-handler.ts +2 -1
  221. package/src/common/el/expression-util.ts +37 -8
  222. package/src/common/index.ts +1 -0
  223. package/src/common/logger/abstract-logger.ts +30 -17
  224. package/src/common/logger/logger-protocol.ts +1 -1
  225. package/src/common/logger/logger.spec.ts +37 -0
  226. package/src/common/logger/logger.ts +12 -4
  227. package/src/common/security-check/index.ts +2 -0
  228. package/src/common/security-check/security-check-protocol.ts +59 -0
  229. package/src/common/security-check/security-checker.spec.ts +70 -0
  230. package/src/common/security-check/security-checker.ts +48 -0
  231. package/src/common/utils/emitter.ts +5 -0
  232. package/src/common/utils/error-util.ts +27 -1
  233. package/src/common/utils/event.ts +20 -9
  234. package/src/common/utils/utils-behavior.spec.ts +23 -3
  235. package/src/common/utils/uuid.ts +1 -1
  236. package/src/node/application/backend-application.ts +1 -1
  237. package/src/node/context/context.spec.ts +14 -0
  238. package/src/node/context/context.ts +2 -3
  239. package/cell.remote.yml +0 -8
@@ -1,13 +1,8 @@
1
1
  /** An environment variable that was applied to the configuration. */
2
2
  export interface EnvOverride {
3
3
  variable: string;
4
- /** Dotted path of the overridden key, e.g. `cell.server.port`. */
4
+ /** Dotted path of the overridden key, e.g. `server.port`. */
5
5
  path: string;
6
- /**
7
- * Set when the first key also exists under `cell`: the top-level key wins, and this is the path
8
- * under `cell` that the variable does not set (reach it with `CELL_<TARGET>__CELL__...`).
9
- */
10
- shadows?: string;
11
6
  }
12
7
  /** An environment variable with the override prefix that could not be applied. */
13
8
  export interface EnvOverrideProblem {
@@ -18,31 +13,42 @@ export interface EnvOverrideResult {
18
13
  applied: EnvOverride[];
19
14
  problems: EnvOverrideProblem[];
20
15
  }
16
+ /** Scalar types the configuration schemas give to keys whose value is an expression (`ConfigTypes`). */
17
+ export type ConfigScalarType = 'number' | 'integer' | 'boolean' | 'string';
18
+ /** Schema types of keys whose value is a `${...}` expression, by dotted path (`server.port`, `typeorm.dataSources.0.port`). */
19
+ export type ConfigTypes = Record<string, ConfigScalarType>;
21
20
  /**
22
- * Overrides configuration keys from environment variables: `CELL_BACKEND__SERVER__PORT=8080` sets
23
- * `cell.server.port` of the backend. Segments are separated by `__` and matched against existing
24
- * keys ignoring case, `_` and `-` (`ORM_CONFIG` matches `ormConfig`, `SERVE_STATIC` matches
25
- * `serve-static`); array items are addressed by canonical index. The first key is looked up at the
26
- * top level, then under `cell`, so `SERVER__PORT` is short for `CELL__SERVER__PORT` unless the
27
- * project has a top-level `server` of its own; `CELL__...` always means `cell`.
21
+ * Overrides configuration keys from environment variables: `CELL_SERVER__PORT=8080` sets
22
+ * `server.port`. Segments are separated by `__` and matched against existing keys ignoring case,
23
+ * `_` and `-` (`ORM_CONFIG` matches `ormConfig`); array items are addressed by canonical index.
28
24
  *
29
25
  * Only existing keys can be overridden, so a misspelled variable is reported instead of silently
30
26
  * ignored. Each key is set by one variable at most: variables that set the same key, or a key and
31
27
  * one inside it, are all reported and none applies, whatever their order. The value is converted to
32
- * the type of the value it replaces (a finite number in JSON syntax, `true` / `false`, JSON for
33
- * objects and arrays, JSON or text where cell.yml has `null`, text for strings); a value that is one
34
- * `${...}` expression is kept and evaluated like cell.yml. Overrides land before `${...}`
35
- * expressions are evaluated, so references such as `${cell.server.port}` see the new value. The
36
- * backend applies its variables at startup; the frontend applies them when it is built.
28
+ * the type of the key: its schema type when the key holds an expression (`types`), else the type of
29
+ * the value it replaces (a finite number in JSON syntax, `true` / `false`, JSON for objects and
30
+ * arrays, JSON or text where cell.yml has `null`, text for strings); a value that is one `${...}`
31
+ * expression is kept and evaluated like cell.yml. Overrides land before `${...}` expressions are
32
+ * evaluated, so references such as `${server.port}` see the new value. The server applies the
33
+ * variables at startup; the build applies them to the public keys it puts into the frontend.
37
34
  */
38
35
  export declare namespace EnvConfigUtil {
39
- const PREFIXES: {
40
- readonly backend: 'CELL_BACKEND__';
41
- readonly frontend: 'CELL_FRONTEND__';
42
- };
43
- type Target = keyof typeof PREFIXES;
44
- /** Applies the variables of `target` in `env` to `config` in place. */
45
- function apply(config: Record<string, any>, env: Record<string, string | undefined>, target: Target): EnvOverrideResult;
46
- /** Applies the backend variables of `process.env` and warns about the ones that do not apply. */
47
- function applyProcessEnv(config: Record<string, any>): EnvOverrideResult;
36
+ const PREFIX = "CELL_";
37
+ /** Variables of the toolchain that share the prefix and are never configuration (`CELL_MODE` would hit the key `mode`). */
38
+ const RESERVED: readonly string[];
39
+ /** Variables that apply: the prefix, not reserved. */
40
+ function isOverride(name: string): boolean;
41
+ /**
42
+ * Applies the `CELL_*` variables of `env` to `config` in place. A variable of one segment whose
43
+ * name is no top-level key (`CELL_REGION`, a variable of another tool) is not configuration and is
44
+ * left alone; with `__` in it, a name that matches no key is reported.
45
+ */
46
+ function apply(config: Record<string, any>, env: Record<string, string | undefined>, types?: ConfigTypes): EnvOverrideResult;
47
+ /** Applies the `CELL_*` variables of `process.env` and warns about the ones that do not apply. */
48
+ function applyProcessEnv(config: Record<string, any>, types?: ConfigTypes): EnvOverrideResult;
49
+ /**
50
+ * Converts the text an expression or a variable gave to the scalar type of the key's schema:
51
+ * `${env.PORT ?? 3000}` is a number when `PORT` is set. Values that are not text are kept.
52
+ */
53
+ function toType(type: ConfigScalarType, value: unknown, path: string): unknown;
48
54
  }
@@ -1,35 +1,48 @@
1
1
  /**
2
- * Overrides configuration keys from environment variables: `CELL_BACKEND__SERVER__PORT=8080` sets
3
- * `cell.server.port` of the backend. Segments are separated by `__` and matched against existing
4
- * keys ignoring case, `_` and `-` (`ORM_CONFIG` matches `ormConfig`, `SERVE_STATIC` matches
5
- * `serve-static`); array items are addressed by canonical index. The first key is looked up at the
6
- * top level, then under `cell`, so `SERVER__PORT` is short for `CELL__SERVER__PORT` unless the
7
- * project has a top-level `server` of its own; `CELL__...` always means `cell`.
2
+ * Overrides configuration keys from environment variables: `CELL_SERVER__PORT=8080` sets
3
+ * `server.port`. Segments are separated by `__` and matched against existing keys ignoring case,
4
+ * `_` and `-` (`ORM_CONFIG` matches `ormConfig`); array items are addressed by canonical index.
8
5
  *
9
6
  * Only existing keys can be overridden, so a misspelled variable is reported instead of silently
10
7
  * ignored. Each key is set by one variable at most: variables that set the same key, or a key and
11
8
  * one inside it, are all reported and none applies, whatever their order. The value is converted to
12
- * the type of the value it replaces (a finite number in JSON syntax, `true` / `false`, JSON for
13
- * objects and arrays, JSON or text where cell.yml has `null`, text for strings); a value that is one
14
- * `${...}` expression is kept and evaluated like cell.yml. Overrides land before `${...}`
15
- * expressions are evaluated, so references such as `${cell.server.port}` see the new value. The
16
- * backend applies its variables at startup; the frontend applies them when it is built.
9
+ * the type of the key: its schema type when the key holds an expression (`types`), else the type of
10
+ * the value it replaces (a finite number in JSON syntax, `true` / `false`, JSON for objects and
11
+ * arrays, JSON or text where cell.yml has `null`, text for strings); a value that is one `${...}`
12
+ * expression is kept and evaluated like cell.yml. Overrides land before `${...}` expressions are
13
+ * evaluated, so references such as `${server.port}` see the new value. The server applies the
14
+ * variables at startup; the build applies them to the public keys it puts into the frontend.
17
15
  */
18
16
  export var EnvConfigUtil;
19
17
  (function (EnvConfigUtil) {
20
- EnvConfigUtil.PREFIXES = { backend: 'CELL_BACKEND__', frontend: 'CELL_FRONTEND__' };
21
- /** Applies the variables of `target` in `env` to `config` in place. */
22
- function apply(config, env, target) {
18
+ EnvConfigUtil.PREFIX = 'CELL_';
19
+ /** Variables of the toolchain that share the prefix and are never configuration (`CELL_MODE` would hit the key `mode`). */
20
+ EnvConfigUtil.RESERVED = ['CELL_PRESET', 'CELL_MODE', 'CELL_EVENT', 'CELL_OUT_DIR', 'CELL_DEBUG'];
21
+ /** Variables that apply: the prefix, not reserved. */
22
+ function isOverride(name) {
23
+ return name.startsWith(EnvConfigUtil.PREFIX) && !EnvConfigUtil.RESERVED.includes(name);
24
+ }
25
+ EnvConfigUtil.isOverride = isOverride;
26
+ /**
27
+ * Applies the `CELL_*` variables of `env` to `config` in place. A variable of one segment whose
28
+ * name is no top-level key (`CELL_REGION`, a variable of another tool) is not configuration and is
29
+ * left alone; with `__` in it, a name that matches no key is reported.
30
+ */
31
+ function apply(config, env, types = {}) {
23
32
  const result = { applied: [], problems: [] };
24
- const prefix = EnvConfigUtil.PREFIXES[target];
33
+ const prefix = EnvConfigUtil.PREFIX;
25
34
  const resolved = [];
26
- for (const variable of Object.keys(env).filter(name => name.startsWith(prefix)).sort()) {
35
+ for (const variable of Object.keys(env).filter(isOverride).sort()) {
27
36
  const value = env[variable];
28
37
  if (value === undefined) {
29
38
  continue;
30
39
  }
40
+ const segments = variable.slice(prefix.length).split('__');
41
+ if (segments.length === 1 && find(config, segments[0]) === undefined) {
42
+ continue;
43
+ }
31
44
  try {
32
- resolved.push({ variable, value, ...resolve(config, variable.slice(prefix.length).split('__')) });
45
+ resolved.push({ variable, value, ...resolve(config, segments) });
33
46
  }
34
47
  catch (error) {
35
48
  result.problems.push({ variable, message: error.message });
@@ -45,8 +58,12 @@ export var EnvConfigUtil;
45
58
  continue;
46
59
  }
47
60
  try {
48
- assign(config, entry.keys, entry.value);
49
- result.applied.push({ variable: entry.variable, path, ...(entry.shadows ? { shadows: entry.shadows } : {}) });
61
+ assign(config, entry.keys, entry.value, types[path]);
62
+ // An expression set on a number or boolean key converts to that type when it is evaluated.
63
+ if (types[path] === undefined && isExpression(entry.value) && (entry.type === 'number' || entry.type === 'boolean')) {
64
+ types[path] = entry.type;
65
+ }
66
+ result.applied.push({ variable: entry.variable, path });
50
67
  }
51
68
  catch (error) {
52
69
  result.problems.push({ variable: entry.variable, message: error.message });
@@ -56,9 +73,9 @@ export var EnvConfigUtil;
56
73
  return result;
57
74
  }
58
75
  EnvConfigUtil.apply = apply;
59
- /** Applies the backend variables of `process.env` and warns about the ones that do not apply. */
60
- function applyProcessEnv(config) {
61
- const result = apply(config, process.env, 'backend');
76
+ /** Applies the `CELL_*` variables of `process.env` and warns about the ones that do not apply. */
77
+ function applyProcessEnv(config, types = {}) {
78
+ const result = apply(config, process.env, types);
62
79
  for (const problem of result.problems) {
63
80
  console.warn(`[cell] ${problem.variable} is ignored: ${problem.message}`);
64
81
  }
@@ -71,19 +88,17 @@ export var EnvConfigUtil;
71
88
  return a.slice(0, length).every((key, i) => key === b[i]);
72
89
  }
73
90
  function resolve(config, segments) {
91
+ if (segments[0].startsWith('_')) {
92
+ throw new Error(`one underscore after CELL, then \`__\` between keys: CELL_${segments[0].replace(/^_+/, '')}${segments.length > 1 ? '__' + segments.slice(1).join('__') : ''}.`);
93
+ }
94
+ if (/^(BACKEND|FRONTEND)$/i.test(segments[0]) && find(config, segments[0]) === undefined) {
95
+ throw new Error(`the CELL_BACKEND__ / CELL_FRONTEND__ prefixes are gone: the same variable serves both sides, e.g. CELL_${segments.slice(1).join('__') || 'SERVER__PORT'}.`);
96
+ }
74
97
  if (segments.some(segment => !segment)) {
75
98
  throw new Error('empty segment; separate keys with exactly two underscores.');
76
99
  }
77
- const cell = config.cell && typeof config.cell === 'object' ? config.cell : undefined;
78
- const top = find(config, segments[0]);
79
- const inCell = cell ? find(cell, segments[0]) : undefined;
80
- if (top === undefined && inCell === undefined) {
81
- const cellKeys = cell ? ` or under cell (keys: ${Object.keys(cell).join(', ') || '(none)'})` : '';
82
- throw new Error(`no key '${segments[0]}' at the top level (keys: ${Object.keys(config).join(', ') || '(none)'})${cellKeys}. Only keys present in cell.yml can be overridden.`);
83
- }
84
- const keys = top === undefined ? ['cell'] : [];
85
- const shadows = top !== undefined && inCell !== undefined && top !== 'cell' ? `cell.${inCell}` : undefined;
86
- let node = top === undefined ? cell : config;
100
+ const keys = [];
101
+ let node = config;
87
102
  for (let i = 0; i < segments.length; i++) {
88
103
  const key = find(node, segments[i]);
89
104
  if (key === undefined) {
@@ -99,12 +114,44 @@ export var EnvConfigUtil;
99
114
  node = node[key];
100
115
  }
101
116
  }
102
- return { keys, ...(shadows ? { shadows } : {}) };
117
+ return { keys, type: typeof node[keys[keys.length - 1]] };
103
118
  }
104
- function assign(config, keys, value) {
119
+ function assign(config, keys, value, type) {
105
120
  const parent = keys.slice(0, -1).reduce((node, key) => node[key], config);
106
121
  const last = keys[keys.length - 1];
107
- parent[last] = convert(parent[last], value, keys.join('.'));
122
+ const path = keys.join('.');
123
+ parent[last] = type && !isExpression(value) ? toType(type, value, path) : convert(parent[last], value, path);
124
+ }
125
+ /**
126
+ * Converts the text an expression or a variable gave to the scalar type of the key's schema:
127
+ * `${env.PORT ?? 3000}` is a number when `PORT` is set. Values that are not text are kept.
128
+ */
129
+ function toType(type, value, path) {
130
+ if (typeof value !== 'string') {
131
+ return value;
132
+ }
133
+ switch (type) {
134
+ case 'number':
135
+ return number(value, path);
136
+ case 'integer': {
137
+ const result = number(value, path);
138
+ if (!Number.isInteger(result)) {
139
+ throw new Error(`${path} is an integer, got '${value}'.`);
140
+ }
141
+ return result;
142
+ }
143
+ case 'boolean':
144
+ return boolean(value, path);
145
+ default:
146
+ return value;
147
+ }
148
+ }
149
+ EnvConfigUtil.toType = toType;
150
+ function boolean(value, path) {
151
+ if (!/^(true|false)$/i.test(value)) {
152
+ throw new Error(`${path} is a boolean, got '${value}'. Use true or false.`);
153
+ }
154
+ return value.toLowerCase() === 'true';
108
155
  }
109
156
  function find(node, segment) {
110
157
  var _a;
@@ -128,7 +175,7 @@ export var EnvConfigUtil;
128
175
  /**
129
176
  * Converts `value` to the type of `current`, the value in cell.yml. A value that is one `${...}`
130
177
  * expression is kept for evaluation, as if written in cell.yml, so its result decides the type:
131
- * `CELL_BACKEND__SERVER__PORT='${env.PORT}'` works although the port is a number.
178
+ * `CELL_SERVER__PORT='${env.PORT}'` works although the port is a number.
132
179
  */
133
180
  function convert(current, value, path) {
134
181
  if (isExpression(value)) {
@@ -138,10 +185,7 @@ export var EnvConfigUtil;
138
185
  case 'number':
139
186
  return number(value, path);
140
187
  case 'boolean':
141
- if (!/^(true|false)$/i.test(value)) {
142
- throw new Error(`${path} is a boolean, got '${value}'. Use true or false.`);
143
- }
144
- return value.toLowerCase() === 'true';
188
+ return boolean(value, path);
145
189
  case 'object':
146
190
  if (current === null) {
147
191
  // No type to follow: JSON when it is JSON (null, 5, true, "x", [], {}), else the text.
@@ -1 +1 @@
1
- {"version":3,"file":"env-config-util.js","sourceRoot":"","sources":["../../../src/common/config/env-config-util.ts"],"names":[],"mappings":"AAuBA;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,KAAW,aAAa,CAwL7B;AAxLD,WAAiB,aAAa;IAEb,sBAAQ,GAAG,EAAE,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,iBAAiB,EAAW,CAAC;IAY5F,uEAAuE;IACvE,SAAgB,KAAK,CAAC,MAA2B,EAAE,GAAuC,EAAE,MAAc;QACtG,MAAM,MAAM,GAAsB,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;QAChE,MAAM,MAAM,GAAG,sBAAQ,CAAC,MAAM,CAAC,CAAC;QAChC,MAAM,QAAQ,GAAe,EAAE,CAAC;QAChC,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;YACrF,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC5B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACtB,SAAS;YACb,CAAC;YACD,IAAI,CAAC;gBACD,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC;YACtG,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAG,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;YAC1E,CAAC;QACL,CAAC;QACD,2HAA2H;QAC3H,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;YAC3B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAClC,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,KAAK,IAAI,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;YAC7F,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACpB,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,QAAQ,KAAK,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC3F,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,IAAI,WAAW,IAAI,YAAY,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,gHAAgH,EAAE,CAAC,CAAC;gBACnP,SAAS;YACb,CAAC;YACD,IAAI,CAAC;gBACD,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;gBACxC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YAClH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAG,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;YAC1F,CAAC;QACL,CAAC;QACD,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACjG,OAAO,MAAM,CAAC;IAClB,CAAC;IAjCe,cAAA,KAAK,QAiCpB,CAAA;IAED,iGAAiG;IACjG,SAAgB,eAAe,CAAC,MAA2B;QACvD,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QACrD,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpC,OAAO,CAAC,IAAI,CAAC,UAAU,OAAO,CAAC,QAAQ,gBAAgB,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QAC9E,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IANe,cAAA,eAAe,kBAM9B,CAAA;IAED,6CAA6C;IAC7C,SAAS,QAAQ,CAAC,CAAW,EAAE,CAAW;QACtC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;QAC5C,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,SAAS,OAAO,CAAC,MAA2B,EAAE,QAAkB;QAC5D,IAAI,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;YACrC,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;QAClF,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;QACtF,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QACtC,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC1D,IAAI,GAAG,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,yBAAyB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YAClG,MAAM,IAAI,KAAK,CACX,WAAW,QAAQ,CAAC,CAAC,CAAC,6BAA6B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,QAAQ,IAAI,QAAQ,oDAAoD,CAChK,CAAC;QACN,CAAC;QACD,MAAM,IAAI,GAAa,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACzD,MAAM,OAAO,GAAG,GAAG,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS,IAAI,GAAG,KAAK,MAAM,CAAC,CAAC,CAAC,QAAQ,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QAC3G,IAAI,IAAI,GAAQ,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;QAClD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACvC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YACpC,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;gBACpB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC;gBACjE,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,aAAa,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,QAAQ,EAAE,CAAC;gBAC7H,MAAM,IAAI,KAAK,CAAC,WAAW,QAAQ,CAAC,CAAC,CAAC,WAAW,KAAK,KAAK,SAAS,qDAAqD,CAAC,CAAC;YAC/H,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACf,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC1B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,QAAQ,EAAE,CAAC;oBAC9C,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,wCAAwC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC;gBAClG,CAAC;gBACD,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC;QACL,CAAC;QACD,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;IACrD,CAAC;IAED,SAAS,MAAM,CAAC,MAA2B,EAAE,IAAc,EAAE,KAAa;QACtE,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;QAC1E,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACnC,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,SAAS,IAAI,CAAC,IAAS,EAAE,OAAe;;QACpC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACtB,4EAA4E;YAC5E,OAAO,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;QACjG,CAAC;QACD,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,aAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,OAAO,CAAC,mCAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,MAAM,CAAC,CAAC;IAC5F,CAAC;IAED,SAAS,SAAS,CAAC,GAAW;QAC1B,OAAO,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;IAClD,CAAC;IAED,uFAAuF;IACvF,MAAM,MAAM,GAAG,yCAAyC,CAAC;IAEzD,gEAAgE;IAChE,SAAS,YAAY,CAAC,KAAa;QAC/B,OAAO,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IAC1F,CAAC;IAED;;;;OAIG;IACH,SAAS,OAAO,CAAC,OAAgB,EAAE,KAAa,EAAE,IAAY;QAC1D,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;YACtB,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,QAAQ,OAAO,OAAO,EAAE,CAAC;YACrB,KAAK,QAAQ;gBACT,OAAO,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YAC/B,KAAK,SAAS;gBACV,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;oBACjC,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,uBAAuB,KAAK,uBAAuB,CAAC,CAAC;gBAChF,CAAC;gBACD,OAAO,KAAK,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC;YAC1C,KAAK,QAAQ;gBACT,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;oBACnB,uFAAuF;oBACvF,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;oBAC5B,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;gBACzC,CAAC;gBACD,OAAO,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;YACtC;gBACI,OAAO,KAAK,CAAC;QACrB,CAAC;IACL,CAAC;IAED,SAAS,MAAM,CAAC,KAAa,EAAE,IAAY;QACvC,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QACxD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,sBAAsB,KAAK,kDAAkD,CAAC,CAAC;QAC1G,CAAC;QACD,yEAAyE;QACzE,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;YACzD,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,sBAAsB,KAAK,kFAAkF,CAAC,CAAC;QAC1I,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,SAAS,IAAI,CAAC,OAAe,EAAE,KAAa,EAAE,IAAY;;QACtD,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC;QAC/D,MAAM,MAAM,GAAG,MAAA,KAAK,CAAC,KAAK,CAAC,0CAAE,KAAK,CAAC;QACnC,IAAI,MAAM,KAAK,IAAI,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YACpG,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,OAAO,IAAI,qDAAqD,CAAC,CAAC;QAC7F,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,SAAS,KAAK,CAAC,KAAa;QACxB,IAAI,CAAC;YACD,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;QACxC,CAAC;mBAAO,CAAC;YACL,OAAO,SAAS,CAAC;QACrB,CAAC;IACL,CAAC;AACL,CAAC,EAxLgB,aAAa,KAAb,aAAa,QAwL7B"}
1
+ {"version":3,"file":"env-config-util.js","sourceRoot":"","sources":["../../../src/common/config/env-config-util.ts"],"names":[],"mappings":"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"}
@@ -2,4 +2,4 @@ export declare const METADATA_KEY: {
2
2
  constantValue: string;
3
3
  component: string;
4
4
  };
5
- export declare const TENANT_ENABLED = "cell.tenant.enabled";
5
+ export declare const TENANT_ENABLED = "tenant.enabled";
@@ -2,5 +2,5 @@ export const METADATA_KEY = {
2
2
  constantValue: 'cell:constant-value',
3
3
  component: 'cell:component'
4
4
  };
5
- export const TENANT_ENABLED = 'cell.tenant.enabled';
5
+ export const TENANT_ENABLED = 'tenant.enabled';
6
6
  //# sourceMappingURL=constants.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,YAAY,GAAG;IACxB,aAAa,EAAE,qBAAqB;IACpC,SAAS,EAAE,gBAAgB;CAC9B,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,qBAAqB,CAAC"}
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,YAAY,GAAG;IACxB,aAAa,EAAE,qBAAqB;IACpC,SAAS,EAAE,gBAAgB;CAC9B,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAgB,CAAC"}
@@ -24,8 +24,8 @@ export function autoBind(registry) {
24
24
  });
25
25
  }
26
26
  function proxyIfNeeded(container, metadata, instance) {
27
- var _a, _b;
28
- if (((_b = (_a = ConfigUtil.getRaw().cell) === null || _a === void 0 ? void 0 : _a.aop) === null || _b === void 0 ? void 0 : _b.enabled) && (instance === null || instance === void 0 ? void 0 : instance.constructor)) {
27
+ var _a;
28
+ if (((_a = ConfigUtil.getRaw().aop) === null || _a === void 0 ? void 0 : _a.enabled) && (instance === null || instance === void 0 ? void 0 : instance.constructor)) {
29
29
  if (container.get(ClassFilter).matches(instance.constructor, metadata)) {
30
30
  return container.get(AopProxyFactory).create({ target: instance, metadata }).getProxy();
31
31
  }
@@ -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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"}
@@ -177,13 +177,13 @@ export class Container {
177
177
  this.resolving.push(binding);
178
178
  this.requests.push(target);
179
179
  try {
180
- const context = { container: this, target };
181
180
  let value;
181
+ // Classes, the most common bindings, need no ResolveContext: it is only created for a factory or an activation.
182
182
  if (binding.type === 'class') {
183
183
  value = this.construct(binding.implementation);
184
184
  }
185
185
  else if (binding.factory) {
186
- value = binding.factory(context);
186
+ value = binding.factory({ container: this, target });
187
187
  }
188
188
  else {
189
189
  throw new ContainerError({
@@ -194,7 +194,7 @@ export class Container {
194
194
  });
195
195
  }
196
196
  if (binding.activation) {
197
- value = binding.activation(context, value);
197
+ value = binding.activation({ container: this, target }, value);
198
198
  }
199
199
  if (binding.scope === Scope.Singleton) {
200
200
  binding.value = value;
@@ -1 +1 @@
1
- {"version":3,"file":"container.js","sourceRoot":"","sources":["../../../src/common/container/container.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"container.js","sourceRoot":"","sources":["../../../src/common/container/container.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAmB,aAAa,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAsBhC,2FAA2F;AAC3F,MAAM,OAAO,OAAO;IAehB,YAAqB,EAAkB;QAAlB,OAAE,GAAF,EAAE,CAAgB;QATvC,UAAK,GAAG,KAAK,CAAC,SAAS,CAAC;QAKxB,6CAA6C;QAC7C,aAAQ,GAAG,KAAK,CAAC;IAG0B,CAAC;IAE5C,EAAE,CAAC,cAA0B;QACzB,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC;QACpB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,eAAe,CAAC,KAAQ;QACpB,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC;QACvB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC;QAC7B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,cAAc,CAAC,OAAuC;QAClD,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,6FAA6F;IAC7F,SAAS,CAAC,EAAkB;QACxB,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACpD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,gBAAgB;QACZ,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC;QAC7B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,gBAAgB;QACZ,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC;QAC7B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,CAAC,UAA6B,EAAE,SAAS,GAAG,MAAM;QAClD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,eAAe,CAAC,IAA8B;QAC1C,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE,SAAS,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC9E,CAAC;IAED,gBAAgB,CAAC,GAA6B,EAAE,KAAc;QAC1D,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE,UAAU,MAAM,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAClI,CAAC;IAED,sDAAsD;IACtD,mBAAmB;QACf,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,SAAS,CAAC,CAAC;IAClG,CAAC;IAED,sGAAsG;IACtG,YAAY,CAAC,OAA6B;QACtC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC;QAC1B,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AASD,oGAAoG;AACpG,MAAM,OAAO,eAAe;IACxB,YAAqB,QAAiC;wBAAjC,QAAQ;IAA6B,CAAC;CAC9D;AAED,MAAM,KAAK,GAAuB,EAAE,CAAC;AAErC;;;;GAIG;AACH,MAAM,OAAO,SAAS;IAMlB,YAAY,GAAG,OAA0B;QALtB,QAAG,GAAG,IAAI,GAAG,EAA0B,CAAC;QAC3D,2GAA2G;QACxF,cAAS,GAAc,EAAE,CAAC;QAC1B,aAAQ,GAAsB,EAAE,CAAC;QAGhD,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;IAC1B,CAAC;IAED,IAAI,CAAC,GAAG,OAA0B;QAC9B,MAAM,IAAI,GAAG,CAAI,EAAkB,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,CAAC,EAAe,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACpD,MAAM,OAAO,GAAG,CAAC,EAAe,EAAE,KAAoB,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QACnF,MAAM,MAAM,GAAG,CAAI,EAAkB,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC1D,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC3B,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QACnD,CAAC;IACL,CAAC;IAED,IAAI,CAAI,EAAkB;QACtB,MAAM,OAAO,GAAG,IAAI,OAAO,CAAI,EAAE,CAAC,CAAC;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAClC,IAAI,QAAQ,EAAE,CAAC;YACX,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3B,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;QAChC,CAAC;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,+CAA+C;IAC/C,MAAM,CAAI,EAAkB;QACxB,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAChB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACzB,CAAC;IAED,MAAM,CAAC,EAAe;QAClB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACxB,CAAC;IAED,+EAA+E;IAC/E,OAAO,CAAC,EAAe,EAAE,KAAoB;QACzC,OAAO,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACjF,CAAC;IAED,4GAA4G;IAC5G,GAAG,CAAI,EAAkB,EAAE,KAAoB;QAC3C,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAC3D,CAAC;IAED;;;OAGG;IACH,MAAM,CAAI,EAAkB,EAAE,KAAoB;QAC9C,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;IACtE,CAAC;IAED,uGAAuG;IACvG,OAAO,CAAI,MAAuB;QAC9B,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACf,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAM,CAAC;QACxC,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACvC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YAC3C,OAAO,SAAc,CAAC;QAC1B,CAAC;QACD,MAAM,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC5F,CAAC;IAED,iHAAiH;IACjH,QAAQ;QACJ,OAAO,IAAI,CAAC,GAAG,CAAC;IACpB,CAAC;IAES,UAAU,CAAI,MAAuB,EAAE,aAAa,GAAG,KAAK;;QAClE,MAAM,QAAQ,GAAG,aAAa,CAAC,CAAC,OAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,mCAAI,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC1F,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YAC5C,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACjC,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,KAAK,CAAI,QAAQ,CAAC,MAAM,CAAC,CAAC;QAChD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACvC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QACtD,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAES,QAAQ,CAAC,MAAuB;QACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACzC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC7B,IAAI,OAAO,CAAC,UAAU,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;gBACpD,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;YACvE,CAAC;QACL,CAAC;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;IAES,QAAQ,CAAI,OAAmB,EAAE,MAAuB;QAC9D,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACnB,OAAO,OAAO,CAAC,KAAU,CAAC;QAC9B,CAAC;QACD,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YACnC,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAChC,CAAC;QACD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3B,IAAI,CAAC;YACD,IAAI,KAAQ,CAAC;YACb,gHAAgH;YAChH,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAC3B,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,cAAe,CAAC,CAAC;YACpD,CAAC;iBAAM,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACzB,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;YACzD,CAAC;iBAAM,CAAC;gBACJ,MAAM,IAAI,cAAc,CAAC;oBACrB,IAAI,EAAE,4BAA4B;oBAClC,OAAO,EAAE,kBAAkB,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,iCAAiC;oBACxF,IAAI,EAAE,yGAAyG;oBAC/G,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE;iBACpB,CAAC,CAAC;YACP,CAAC;YACD,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;gBACrB,KAAK,GAAG,OAAO,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,CAAC;YACnE,CAAC;YACD,IAAI,OAAO,CAAC,KAAK,KAAK,KAAK,CAAC,SAAS,EAAE,CAAC;gBACpC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;gBACtB,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;YAC5B,CAAC;YACD,OAAO,KAAK,CAAC;QACjB,CAAC;gBAAS,CAAC;YACP,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;YACrB,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QACxB,CAAC;IACL,CAAC;IAES,SAAS,CAAI,IAAgB;QACnC,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtC,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACnC,MAAM,IAAI,GAAG,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC1C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACzC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,CAAC;QACD,MAAM,QAAQ,GAAQ,IAAI,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;QACxC,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACrC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACrC,mGAAmG;YACnG,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;gBAC5C,QAAQ,CAAC,QAAQ,CAAC,GAAI,CAAC,GAAG,KAAK,CAAC;YACpC,CAAC;QACL,CAAC;QACD,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;YACnC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;QACnC,CAAC;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,iFAAiF;IACvE,IAAI,CAAC,MAAwB;QACnC,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;QACxE,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAClE,CAAC;IAES,QAAQ,CAAC,MAAuB;QACtC,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,eAAe,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/E,CAAC;IAES,SAAS,CAAC,MAAuB;;QACvC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC/B,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACzC,MAAM,KAAK,SAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,mCAAI,EAAE,CAAC;QAC5C,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnB,UAAU,GAAG,oBAAoB,IAAI,kBAAkB,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;QACvG,CAAC;aAAM,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,IAAI,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,IAAI,CAAC,EAAE,CAAC;YAC5F,UAAU,GAAG,qCAAqC,IAAI,yDAAyD,CAAC;QACpH,CAAC;QACD,OAAO,IAAI,cAAc,CAAC;YACtB,IAAI,EAAE,oBAAoB;YAC1B,OAAO,EAAE,kBAAkB,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,UAAU,EAAE;YAC5J,IAAI,EAAE,wHAAwH;YAC9H,IAAI;SACP,CAAC,CAAC;IACP,CAAC;IAES,SAAS,CAAC,MAAuB,EAAE,QAA4B;QACrE,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC/B,OAAO,IAAI,cAAc,CAAC;YACtB,IAAI,EAAE,mBAAmB;YACzB,OAAO,EAAE,GAAG,QAAQ,CAAC,MAAM,mBAAmB,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;YAC5K,IAAI,EAAE,mIAAmI;YACzI,IAAI;SACP,CAAC,CAAC;IACP,CAAC;IAES,QAAQ,CAAC,MAAuB;QACtC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC/B,OAAO,IAAI,cAAc,CAAC;YACtB,IAAI,EAAE,kBAAkB;YACxB,OAAO,EAAE,wBAAwB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG;YACpD,IAAI,EAAE,qJAAqJ;YAC3J,IAAI;SACP,CAAC,CAAC;IACP,CAAC;IAES,MAAM,CAAC,KAAK,CAAC,IAAc;QACjC,OAAO,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3D,CAAC;IAES,MAAM,CAAC,KAAK,CAAC,MAAuB;QAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;IACpD,CAAC;IAED,+DAA+D;IAC/D,MAAM,CAAC,QAAQ,CAAC,OAAuD;;QACnE,IAAI,OAAO,YAAY,OAAO,EAAE,CAAC;YAC7B,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,cAAe,CAAC,IAAI,IAAI,mBAAmB;gBACvF,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,OAAC,OAAO,CAAC,IAAI,mCAAI,YAAY,CAAC,CAAC;YAC7G,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,KAAK,OAAO,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;QACvE,CAAC;QACD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,WAAW,MAAM,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3I,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC;IACzH,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,EAAW;QACrB,IAAI,OAAO,EAAE,KAAK,UAAU,EAAE,CAAC;YAC3B,OAAO,EAAE,CAAC,IAAI,IAAI,mBAAmB,CAAC;QAC1C,CAAC;QACD,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC;IACtB,CAAC;CACJ"}
@@ -11,13 +11,15 @@ import { Component, Autowired } from '../annotation/index.js';
11
11
  import { ContainerUtil } from '../container/index.js';
12
12
  import { ContextInitializer, ExpressionHandler } from './expression-protocol.js';
13
13
  import { ExpressionEngine } from './expression-engine.js';
14
+ import { ExpressionUtil } from './expression-util.js';
14
15
  let CoreContextInitializer = class CoreContextInitializer {
15
16
  constructor() {
16
17
  this.priority = 500;
17
18
  }
18
19
  initialize(ctx) {
19
20
  if (typeof process !== 'undefined') {
20
- ctx.env = { ...process.env, _ignoreEl: true };
21
+ // An empty variable counts as unset, so `${env.PORT ?? 3000}` takes the default.
22
+ ctx.env = { ...ExpressionUtil.definedEnv(process.env), _ignoreEl: true };
21
23
  }
22
24
  const expressionHandler = ContainerUtil.get(ExpressionHandler);
23
25
  this.engine.addTransforms({
@@ -1 +1 @@
1
- {"version":3,"file":"core-context-initializer.js","sourceRoot":"","sources":["../../../src/common/el/core-context-initializer.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAqB,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AACjG,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGhD,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAA5B;QAiBH,aAAQ,GAAG,GAAG,CAAC;IAEnB,CAAC;IAdG,UAAU,CAAC,GAAsB;QAC7B,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE,CAAC;YACjC,GAAG,CAAC,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;QAClD,CAAC;QACD,MAAM,iBAAiB,GAAG,aAAa,CAAC,GAAG,CAAoB,iBAAiB,CAAC,CAAC;QAClF,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;YACtB,OAAO,EAAE,CAAC,GAAW,EAAE,WAA4B,EAAE,YAAoB,EAAE,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,EAAE,YAAY,CAAC;YAC5I,MAAM,EAAE,CAAC,OAAe,EAAE,KAAc,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC;YACvE,IAAI,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC;SACzD,CAAC,CAAC;IACP,CAAC;CAIJ,CAAA;AAhBsB;IADlB,SAAS,CAAC,gBAAgB,CAAC;8BACD,gBAAgB;sDAAC;AAHnC,sBAAsB;IADlC,SAAS,CAAC,kBAAkB,CAAC;GACjB,sBAAsB,CAmBlC"}
1
+ {"version":3,"file":"core-context-initializer.js","sourceRoot":"","sources":["../../../src/common/el/core-context-initializer.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAqB,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AACjG,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAG5C,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAA5B;QAkBH,aAAQ,GAAG,GAAG,CAAC;IAEnB,CAAC;IAfG,UAAU,CAAC,GAAsB;QAC7B,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE,CAAC;YACjC,iFAAiF;YACjF,GAAG,CAAC,GAAG,GAAG,EAAE,GAAG,cAAc,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;QAC7E,CAAC;QACD,MAAM,iBAAiB,GAAG,aAAa,CAAC,GAAG,CAAoB,iBAAiB,CAAC,CAAC;QAClF,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;YACtB,OAAO,EAAE,CAAC,GAAW,EAAE,WAA4B,EAAE,YAAoB,EAAE,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,EAAE,YAAY,CAAC;YAC5I,MAAM,EAAE,CAAC,OAAe,EAAE,KAAc,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC;YACvE,IAAI,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC;SACzD,CAAC,CAAC;IACP,CAAC;CAIJ,CAAA;AAjBsB;IADlB,SAAS,CAAC,gBAAgB,CAAC;8BACD,gBAAgB;sDAAC;AAHnC,sBAAsB;IADlC,SAAS,CAAC,kBAAkB,CAAC;GACjB,sBAAsB,CAoBlC"}
@@ -3,11 +3,11 @@
3
3
  * policies evaluate. Its grammar is the one of jexl 2, which Cell used before:
4
4
  *
5
5
  * - literals: `'text'`, `"text"`, `42`, `1.5`, `true`, `false`, `[a, b]`, `{ key: value }`;
6
- * - names: `cell.server.port`, `list[0]`, `map['key']`, filters `users[.age > 18]` (`.age` is a
6
+ * - names: `server.port`, `list[0]`, `map['key']`, filters `users[.age > 18]` (`.age` is a
7
7
  * property of each element); a missing property is `undefined`, never an error; a property of an
8
8
  * array is the property of its first element;
9
- * - operators, loosest first: `a ? b : c` and `a ?: b` (`b` when `a` is falsy), `||` and `&&` (same
10
- * precedence, left to right), `== != > >= < <= in`, `+ -`, `* / //` (`//` rounds down), `% ^`
9
+ * - operators, loosest first: `a ? b : c`, `??` `||` and `&&` (same precedence, left to right; `a ?? b`
10
+ * is `b` when `a` is `null` or `undefined`, as in JavaScript), `== != > >= < <= in`, `+ -`, `* / //` (`//` rounds down), `% ^`
11
11
  * (`^` is power), then `!` and `-` in front;
12
12
  * - transforms `value|name(args)` and functions `name(args)`: only the ones added to the engine.
13
13
  *
@@ -3,11 +3,11 @@
3
3
  * policies evaluate. Its grammar is the one of jexl 2, which Cell used before:
4
4
  *
5
5
  * - literals: `'text'`, `"text"`, `42`, `1.5`, `true`, `false`, `[a, b]`, `{ key: value }`;
6
- * - names: `cell.server.port`, `list[0]`, `map['key']`, filters `users[.age > 18]` (`.age` is a
6
+ * - names: `server.port`, `list[0]`, `map['key']`, filters `users[.age > 18]` (`.age` is a
7
7
  * property of each element); a missing property is `undefined`, never an error; a property of an
8
8
  * array is the property of its first element;
9
- * - operators, loosest first: `a ? b : c` and `a ?: b` (`b` when `a` is falsy), `||` and `&&` (same
10
- * precedence, left to right), `== != > >= < <= in`, `+ -`, `* / //` (`//` rounds down), `% ^`
9
+ * - operators, loosest first: `a ? b : c`, `??` `||` and `&&` (same precedence, left to right; `a ?? b`
10
+ * is `b` when `a` is `null` or `undefined`, as in JavaScript), `== != > >= < <= in`, `+ -`, `* / //` (`//` rounds down), `% ^`
11
11
  * (`^` is power), then `!` and `-` in front;
12
12
  * - transforms `value|name(args)` and functions `name(args)`: only the ones added to the engine.
13
13
  *
@@ -95,10 +95,10 @@ export class ExpressionEngine {
95
95
  }
96
96
  ExpressionEngine.CACHE_SIZE = 1000;
97
97
  /** Longest first, so that `//` is not `/`. */
98
- const OPERATORS = ['//', '==', '!=', '>=', '<=', '&&', '||', '+', '-', '*', '/', '%', '^', '>', '<', '!'];
98
+ const OPERATORS = ['??', '//', '==', '!=', '>=', '<=', '&&', '||', '+', '-', '*', '/', '%', '^', '>', '<', '!'];
99
99
  const PUNCTUATION = '.[]|{}:,()?';
100
100
  const PRECEDENCE = {
101
- '||': 10, '&&': 10,
101
+ '??': 10, '||': 10, '&&': 10,
102
102
  '==': 20, '!=': 20, '>': 20, '>=': 20, '<': 20, '<=': 20, in: 20,
103
103
  '+': 30, '-': 30,
104
104
  '*': 40, '/': 40, '//': 40,
@@ -149,11 +149,17 @@ class ExpressionParser {
149
149
  if (!this.accept('?')) {
150
150
  return test;
151
151
  }
152
- const consequent = this.accept(':') ? undefined : this.ternaryThen();
153
- const alternate = this.ternary();
154
- if (!consequent) {
155
- return (c, e) => test(c, e) || alternate(c, e);
152
+ if (this.peek().type === 'punctuation' && this.peek().value === ':') {
153
+ throw new ExpressionSyntaxError({
154
+ code: 'CELL_EL_SYNTAX',
155
+ message: `'?:' is not an operator at position ${this.peek().start - 1} of: ${this.source}`,
156
+ hint: "Write a default with ??, e.g. ${env.PORT ?? 3000}; || takes the right side for any falsy value.",
157
+ expression: this.source,
158
+ position: this.peek().start - 1
159
+ });
156
160
  }
161
+ const consequent = this.ternaryThen();
162
+ const alternate = this.ternary();
157
163
  return (c, e) => test(c, e) ? consequent(c, e) : alternate(c, e);
158
164
  }
159
165
  ternaryThen() {
@@ -179,6 +185,9 @@ class ExpressionParser {
179
185
  else if (token.value === '||') {
180
186
  left = (c, e) => l(c, e) || r(c, e);
181
187
  }
188
+ else if (token.value === '??') {
189
+ left = (c, e) => { var _a; return (_a = l(c, e)) !== null && _a !== void 0 ? _a : r(c, e); };
190
+ }
182
191
  else {
183
192
  const apply = BINARY[token.value];
184
193
  left = (c, e) => apply(l(c, e), r(c, e));