@celljs/core 4.2.0 → 4.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +48 -20
- package/cell.schema.json +84 -0
- package/cell.yml +13 -12
- package/esm/browser/application/frontend-application.d.ts +2 -2
- package/esm/browser/application/frontend-application.js +6 -25
- package/esm/browser/application/frontend-application.js.map +1 -1
- package/esm/common/annotation/component.js +1 -2
- package/esm/common/annotation/component.js.map +1 -1
- package/esm/common/annotation/service.js +2 -1
- package/esm/common/annotation/service.js.map +1 -1
- package/esm/common/application/application-entry.js +4 -0
- package/esm/common/application/application-entry.js.map +1 -1
- package/esm/common/application/application-protocol.d.ts +9 -3
- package/esm/common/application/application-protocol.js +19 -7
- package/esm/common/application/application-protocol.js.map +1 -1
- package/esm/common/application/application.js +1 -1
- package/esm/common/application/application.js.map +1 -1
- package/esm/common/config/config-util.d.ts +3 -0
- package/esm/common/config/config-util.js +6 -1
- package/esm/common/config/config-util.js.map +1 -1
- package/esm/common/config/dynamic-config.d.ts +3 -0
- package/esm/common/config/dynamic-config.js +3 -1
- package/esm/common/config/dynamic-config.js.map +1 -1
- package/esm/common/config/env-config-util.d.ts +32 -26
- package/esm/common/config/env-config-util.js +84 -40
- package/esm/common/config/env-config-util.js.map +1 -1
- package/esm/common/constants.d.ts +1 -1
- package/esm/common/constants.js +1 -1
- package/esm/common/constants.js.map +1 -1
- package/esm/common/container/auto-bind.js +2 -2
- package/esm/common/container/auto-bind.js.map +1 -1
- package/esm/common/container/container.js +3 -3
- package/esm/common/container/container.js.map +1 -1
- package/esm/common/el/core-context-initializer.js +3 -1
- package/esm/common/el/core-context-initializer.js.map +1 -1
- package/esm/common/el/expression-engine.d.ts +3 -3
- package/esm/common/el/expression-engine.js +18 -9
- package/esm/common/el/expression-engine.js.map +1 -1
- package/esm/common/el/expression-handler.js +2 -1
- package/esm/common/el/expression-handler.js.map +1 -1
- package/esm/common/el/expression-util.d.ts +17 -4
- package/esm/common/el/expression-util.js +28 -9
- package/esm/common/el/expression-util.js.map +1 -1
- package/esm/common/index.d.ts +1 -0
- package/esm/common/index.js +1 -0
- package/esm/common/index.js.map +1 -1
- package/esm/common/logger/abstract-logger.d.ts +2 -1
- package/esm/common/logger/abstract-logger.js +28 -17
- package/esm/common/logger/abstract-logger.js.map +1 -1
- package/esm/common/logger/logger-protocol.d.ts +2 -2
- package/esm/common/logger/logger-protocol.js +1 -1
- package/esm/common/logger/logger-protocol.js.map +1 -1
- package/esm/common/logger/logger.js +11 -4
- package/esm/common/logger/logger.js.map +1 -1
- package/esm/common/security-check/index.d.ts +2 -0
- package/esm/common/security-check/index.js +3 -0
- package/esm/common/security-check/index.js.map +1 -0
- package/esm/common/security-check/security-check-protocol.d.ts +40 -0
- package/esm/common/security-check/security-check-protocol.js +24 -0
- package/esm/common/security-check/security-check-protocol.js.map +1 -0
- package/esm/common/security-check/security-checker.d.ts +14 -0
- package/esm/common/security-check/security-checker.js +61 -0
- package/esm/common/security-check/security-checker.js.map +1 -0
- package/esm/common/utils/emitter.d.ts +2 -0
- package/esm/common/utils/emitter.js +4 -0
- package/esm/common/utils/emitter.js.map +1 -1
- package/esm/common/utils/error-util.d.ts +8 -0
- package/esm/common/utils/error-util.js +24 -0
- package/esm/common/utils/error-util.js.map +1 -1
- package/esm/common/utils/event.d.ts +6 -1
- package/esm/common/utils/event.js +20 -6
- package/esm/common/utils/event.js.map +1 -1
- package/esm/common/utils/uuid.d.ts +1 -1
- package/esm/common/utils/uuid.js +1 -1
- package/esm/common/utils/uuid.js.map +1 -1
- package/esm/node/application/backend-application.js +1 -1
- package/esm/node/application/backend-application.js.map +1 -1
- package/esm/node/context/context.js +3 -3
- package/esm/node/context/context.js.map +1 -1
- package/lib/browser/application/frontend-application.d.ts +2 -2
- package/lib/browser/application/frontend-application.d.ts.map +1 -1
- package/lib/browser/application/frontend-application.js +6 -25
- package/lib/browser/application/frontend-application.js.map +1 -1
- package/lib/common/annotation/component.js +1 -2
- package/lib/common/annotation/component.js.map +1 -1
- package/lib/common/annotation/service.d.ts.map +1 -1
- package/lib/common/annotation/service.js +2 -1
- package/lib/common/annotation/service.js.map +1 -1
- package/lib/common/annotation/service.spec.d.ts +2 -0
- package/lib/common/annotation/service.spec.d.ts.map +1 -0
- package/lib/common/annotation/service.spec.js +43 -0
- package/lib/common/annotation/service.spec.js.map +1 -0
- package/lib/common/aop/aop.spec.js +4 -4
- package/lib/common/aop/aop.spec.js.map +1 -1
- package/lib/common/application/application-entry.js +4 -0
- package/lib/common/application/application-entry.js.map +1 -1
- package/lib/common/application/application-protocol.d.ts +9 -3
- package/lib/common/application/application-protocol.d.ts.map +1 -1
- package/lib/common/application/application-protocol.js +19 -7
- package/lib/common/application/application-protocol.js.map +1 -1
- package/lib/common/application/application.js +1 -1
- package/lib/common/application/application.js.map +1 -1
- package/lib/common/application/lifecycle.spec.js +54 -7
- package/lib/common/application/lifecycle.spec.js.map +1 -1
- package/lib/common/config/config-util.d.ts +3 -0
- package/lib/common/config/config-util.d.ts.map +1 -1
- package/lib/common/config/config-util.js +5 -0
- package/lib/common/config/config-util.js.map +1 -1
- package/lib/common/config/dynamic-config.d.ts +3 -0
- package/lib/common/config/dynamic-config.d.ts.map +1 -1
- package/lib/common/config/dynamic-config.js +4 -2
- package/lib/common/config/dynamic-config.js.map +1 -1
- package/lib/common/config/env-config-util.d.ts +32 -26
- package/lib/common/config/env-config-util.d.ts.map +1 -1
- package/lib/common/config/env-config-util.js +84 -40
- package/lib/common/config/env-config-util.js.map +1 -1
- package/lib/common/config/env-config-util.spec.js +148 -132
- package/lib/common/config/env-config-util.spec.js.map +1 -1
- package/lib/common/constants.d.ts +1 -1
- package/lib/common/constants.d.ts.map +1 -1
- package/lib/common/constants.js +1 -1
- package/lib/common/constants.js.map +1 -1
- package/lib/common/container/auto-bind.js +2 -2
- package/lib/common/container/auto-bind.js.map +1 -1
- package/lib/common/container/container.js +3 -3
- package/lib/common/container/container.js.map +1 -1
- package/lib/common/el/core-context-initializer.d.ts.map +1 -1
- package/lib/common/el/core-context-initializer.js +3 -1
- package/lib/common/el/core-context-initializer.js.map +1 -1
- package/lib/common/el/expression-engine.d.ts +3 -3
- package/lib/common/el/expression-engine.js +18 -9
- package/lib/common/el/expression-engine.js.map +1 -1
- package/lib/common/el/expression-engine.spec.js +15 -7
- package/lib/common/el/expression-engine.spec.js.map +1 -1
- package/lib/common/el/expression-handler.d.ts.map +1 -1
- package/lib/common/el/expression-handler.js +2 -1
- package/lib/common/el/expression-handler.js.map +1 -1
- package/lib/common/el/expression-util.d.ts +17 -4
- package/lib/common/el/expression-util.d.ts.map +1 -1
- package/lib/common/el/expression-util.js +28 -10
- package/lib/common/el/expression-util.js.map +1 -1
- package/lib/common/index.d.ts +1 -0
- package/lib/common/index.d.ts.map +1 -1
- package/lib/common/index.js +1 -0
- package/lib/common/index.js.map +1 -1
- package/lib/common/logger/abstract-logger.d.ts +2 -1
- package/lib/common/logger/abstract-logger.d.ts.map +1 -1
- package/lib/common/logger/abstract-logger.js +28 -17
- package/lib/common/logger/abstract-logger.js.map +1 -1
- package/lib/common/logger/logger-protocol.d.ts +2 -2
- package/lib/common/logger/logger-protocol.d.ts.map +1 -1
- package/lib/common/logger/logger-protocol.js +1 -1
- package/lib/common/logger/logger-protocol.js.map +1 -1
- package/lib/common/logger/logger.d.ts.map +1 -1
- package/lib/common/logger/logger.js +11 -4
- package/lib/common/logger/logger.js.map +1 -1
- package/lib/common/logger/logger.spec.js +35 -0
- package/lib/common/logger/logger.spec.js.map +1 -1
- package/lib/common/security-check/index.d.ts +3 -0
- package/lib/common/security-check/index.d.ts.map +1 -0
- package/lib/common/security-check/index.js +19 -0
- package/lib/common/security-check/index.js.map +1 -0
- package/lib/common/security-check/security-check-protocol.d.ts +41 -0
- package/lib/common/security-check/security-check-protocol.d.ts.map +1 -0
- package/lib/common/security-check/security-check-protocol.js +28 -0
- package/lib/common/security-check/security-check-protocol.js.map +1 -0
- package/lib/common/security-check/security-checker.d.ts +15 -0
- package/lib/common/security-check/security-checker.d.ts.map +1 -0
- package/lib/common/security-check/security-checker.js +64 -0
- package/lib/common/security-check/security-checker.js.map +1 -0
- package/lib/common/security-check/security-checker.spec.d.ts +2 -0
- package/lib/common/security-check/security-checker.spec.d.ts.map +1 -0
- package/lib/common/security-check/security-checker.spec.js +68 -0
- package/lib/common/security-check/security-checker.spec.js.map +1 -0
- package/lib/common/utils/emitter.d.ts +2 -0
- package/lib/common/utils/emitter.d.ts.map +1 -1
- package/lib/common/utils/emitter.js +4 -0
- package/lib/common/utils/emitter.js.map +1 -1
- package/lib/common/utils/error-util.d.ts +8 -0
- package/lib/common/utils/error-util.d.ts.map +1 -1
- package/lib/common/utils/error-util.js +24 -0
- package/lib/common/utils/error-util.js.map +1 -1
- package/lib/common/utils/event.d.ts +6 -1
- package/lib/common/utils/event.d.ts.map +1 -1
- package/lib/common/utils/event.js +20 -6
- package/lib/common/utils/event.js.map +1 -1
- package/lib/common/utils/utils-behavior.spec.js +21 -2
- package/lib/common/utils/utils-behavior.spec.js.map +1 -1
- package/lib/common/utils/uuid.d.ts +1 -1
- package/lib/common/utils/uuid.d.ts.map +1 -1
- package/lib/common/utils/uuid.js +2 -2
- package/lib/common/utils/uuid.js.map +1 -1
- package/lib/node/application/backend-application.js +1 -1
- package/lib/node/application/backend-application.js.map +1 -1
- package/lib/node/context/context.d.ts.map +1 -1
- package/lib/node/context/context.js +3 -3
- package/lib/node/context/context.js.map +1 -1
- package/lib/node/context/context.spec.js +13 -0
- package/lib/node/context/context.spec.js.map +1 -1
- package/package.json +6 -2
- package/src/browser/application/frontend-application.ts +7 -28
- package/src/common/annotation/component.ts +1 -1
- package/src/common/annotation/service.spec.ts +29 -0
- package/src/common/annotation/service.ts +2 -1
- package/src/common/aop/aop.spec.ts +4 -4
- package/src/common/application/application-entry.ts +4 -0
- package/src/common/application/application-protocol.ts +21 -11
- package/src/common/application/application.ts +1 -1
- package/src/common/application/lifecycle.spec.ts +52 -8
- package/src/common/config/config-util.ts +7 -1
- package/src/common/config/dynamic-config.ts +6 -1
- package/src/common/config/env-config-util.spec.ts +152 -149
- package/src/common/config/env-config-util.ts +95 -51
- package/src/common/constants.ts +1 -1
- package/src/common/container/auto-bind.ts +1 -1
- package/src/common/container/container.ts +3 -3
- package/src/common/el/core-context-initializer.ts +4 -2
- package/src/common/el/expression-engine.spec.ts +17 -8
- package/src/common/el/expression-engine.ts +17 -9
- package/src/common/el/expression-handler.ts +2 -1
- package/src/common/el/expression-util.ts +37 -8
- package/src/common/index.ts +1 -0
- package/src/common/logger/abstract-logger.ts +30 -17
- package/src/common/logger/logger-protocol.ts +1 -1
- package/src/common/logger/logger.spec.ts +37 -0
- package/src/common/logger/logger.ts +12 -4
- package/src/common/security-check/index.ts +2 -0
- package/src/common/security-check/security-check-protocol.ts +59 -0
- package/src/common/security-check/security-checker.spec.ts +70 -0
- package/src/common/security-check/security-checker.ts +48 -0
- package/src/common/utils/emitter.ts +5 -0
- package/src/common/utils/error-util.ts +27 -1
- package/src/common/utils/event.ts +20 -9
- package/src/common/utils/utils-behavior.spec.ts +23 -3
- package/src/common/utils/uuid.ts +1 -1
- package/src/node/application/backend-application.ts +1 -1
- package/src/node/context/context.spec.ts +14 -0
- package/src/node/context/context.ts +2 -3
- package/cell.remote.yml +0 -8
|
@@ -2,37 +2,50 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.EnvConfigUtil = void 0;
|
|
4
4
|
/**
|
|
5
|
-
* Overrides configuration keys from environment variables: `
|
|
6
|
-
* `
|
|
7
|
-
*
|
|
8
|
-
* `serve-static`); array items are addressed by canonical index. The first key is looked up at the
|
|
9
|
-
* top level, then under `cell`, so `SERVER__PORT` is short for `CELL__SERVER__PORT` unless the
|
|
10
|
-
* project has a top-level `server` of its own; `CELL__...` always means `cell`.
|
|
5
|
+
* Overrides configuration keys from environment variables: `CELL_SERVER__PORT=8080` sets
|
|
6
|
+
* `server.port`. Segments are separated by `__` and matched against existing keys ignoring case,
|
|
7
|
+
* `_` and `-` (`ORM_CONFIG` matches `ormConfig`); array items are addressed by canonical index.
|
|
11
8
|
*
|
|
12
9
|
* Only existing keys can be overridden, so a misspelled variable is reported instead of silently
|
|
13
10
|
* ignored. Each key is set by one variable at most: variables that set the same key, or a key and
|
|
14
11
|
* one inside it, are all reported and none applies, whatever their order. The value is converted to
|
|
15
|
-
* the type of the
|
|
16
|
-
*
|
|
17
|
-
*
|
|
18
|
-
*
|
|
19
|
-
*
|
|
12
|
+
* the type of the key: its schema type when the key holds an expression (`types`), else the type of
|
|
13
|
+
* the value it replaces (a finite number in JSON syntax, `true` / `false`, JSON for objects and
|
|
14
|
+
* arrays, JSON or text where cell.yml has `null`, text for strings); a value that is one `${...}`
|
|
15
|
+
* expression is kept and evaluated like cell.yml. Overrides land before `${...}` expressions are
|
|
16
|
+
* evaluated, so references such as `${server.port}` see the new value. The server applies the
|
|
17
|
+
* variables at startup; the build applies them to the public keys it puts into the frontend.
|
|
20
18
|
*/
|
|
21
19
|
var EnvConfigUtil;
|
|
22
20
|
(function (EnvConfigUtil) {
|
|
23
|
-
EnvConfigUtil.
|
|
24
|
-
/**
|
|
25
|
-
|
|
21
|
+
EnvConfigUtil.PREFIX = 'CELL_';
|
|
22
|
+
/** Variables of the toolchain that share the prefix and are never configuration (`CELL_MODE` would hit the key `mode`). */
|
|
23
|
+
EnvConfigUtil.RESERVED = ['CELL_PRESET', 'CELL_MODE', 'CELL_EVENT', 'CELL_OUT_DIR', 'CELL_DEBUG'];
|
|
24
|
+
/** Variables that apply: the prefix, not reserved. */
|
|
25
|
+
function isOverride(name) {
|
|
26
|
+
return name.startsWith(EnvConfigUtil.PREFIX) && !EnvConfigUtil.RESERVED.includes(name);
|
|
27
|
+
}
|
|
28
|
+
EnvConfigUtil.isOverride = isOverride;
|
|
29
|
+
/**
|
|
30
|
+
* Applies the `CELL_*` variables of `env` to `config` in place. A variable of one segment whose
|
|
31
|
+
* name is no top-level key (`CELL_REGION`, a variable of another tool) is not configuration and is
|
|
32
|
+
* left alone; with `__` in it, a name that matches no key is reported.
|
|
33
|
+
*/
|
|
34
|
+
function apply(config, env, types = {}) {
|
|
26
35
|
const result = { applied: [], problems: [] };
|
|
27
|
-
const prefix = EnvConfigUtil.
|
|
36
|
+
const prefix = EnvConfigUtil.PREFIX;
|
|
28
37
|
const resolved = [];
|
|
29
|
-
for (const variable of Object.keys(env).filter(
|
|
38
|
+
for (const variable of Object.keys(env).filter(isOverride).sort()) {
|
|
30
39
|
const value = env[variable];
|
|
31
40
|
if (value === undefined) {
|
|
32
41
|
continue;
|
|
33
42
|
}
|
|
43
|
+
const segments = variable.slice(prefix.length).split('__');
|
|
44
|
+
if (segments.length === 1 && find(config, segments[0]) === undefined) {
|
|
45
|
+
continue;
|
|
46
|
+
}
|
|
34
47
|
try {
|
|
35
|
-
resolved.push({ variable, value, ...resolve(config,
|
|
48
|
+
resolved.push({ variable, value, ...resolve(config, segments) });
|
|
36
49
|
}
|
|
37
50
|
catch (error) {
|
|
38
51
|
result.problems.push({ variable, message: error.message });
|
|
@@ -48,8 +61,12 @@ var EnvConfigUtil;
|
|
|
48
61
|
continue;
|
|
49
62
|
}
|
|
50
63
|
try {
|
|
51
|
-
assign(config, entry.keys, entry.value);
|
|
52
|
-
|
|
64
|
+
assign(config, entry.keys, entry.value, types[path]);
|
|
65
|
+
// An expression set on a number or boolean key converts to that type when it is evaluated.
|
|
66
|
+
if (types[path] === undefined && isExpression(entry.value) && (entry.type === 'number' || entry.type === 'boolean')) {
|
|
67
|
+
types[path] = entry.type;
|
|
68
|
+
}
|
|
69
|
+
result.applied.push({ variable: entry.variable, path });
|
|
53
70
|
}
|
|
54
71
|
catch (error) {
|
|
55
72
|
result.problems.push({ variable: entry.variable, message: error.message });
|
|
@@ -59,9 +76,9 @@ var EnvConfigUtil;
|
|
|
59
76
|
return result;
|
|
60
77
|
}
|
|
61
78
|
EnvConfigUtil.apply = apply;
|
|
62
|
-
/** Applies the
|
|
63
|
-
function applyProcessEnv(config) {
|
|
64
|
-
const result = apply(config, process.env,
|
|
79
|
+
/** Applies the `CELL_*` variables of `process.env` and warns about the ones that do not apply. */
|
|
80
|
+
function applyProcessEnv(config, types = {}) {
|
|
81
|
+
const result = apply(config, process.env, types);
|
|
65
82
|
for (const problem of result.problems) {
|
|
66
83
|
console.warn(`[cell] ${problem.variable} is ignored: ${problem.message}`);
|
|
67
84
|
}
|
|
@@ -74,19 +91,17 @@ var EnvConfigUtil;
|
|
|
74
91
|
return a.slice(0, length).every((key, i) => key === b[i]);
|
|
75
92
|
}
|
|
76
93
|
function resolve(config, segments) {
|
|
94
|
+
if (segments[0].startsWith('_')) {
|
|
95
|
+
throw new Error(`one underscore after CELL, then \`__\` between keys: CELL_${segments[0].replace(/^_+/, '')}${segments.length > 1 ? '__' + segments.slice(1).join('__') : ''}.`);
|
|
96
|
+
}
|
|
97
|
+
if (/^(BACKEND|FRONTEND)$/i.test(segments[0]) && find(config, segments[0]) === undefined) {
|
|
98
|
+
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'}.`);
|
|
99
|
+
}
|
|
77
100
|
if (segments.some(segment => !segment)) {
|
|
78
101
|
throw new Error('empty segment; separate keys with exactly two underscores.');
|
|
79
102
|
}
|
|
80
|
-
const
|
|
81
|
-
|
|
82
|
-
const inCell = cell ? find(cell, segments[0]) : undefined;
|
|
83
|
-
if (top === undefined && inCell === undefined) {
|
|
84
|
-
const cellKeys = cell ? ` or under cell (keys: ${Object.keys(cell).join(', ') || '(none)'})` : '';
|
|
85
|
-
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.`);
|
|
86
|
-
}
|
|
87
|
-
const keys = top === undefined ? ['cell'] : [];
|
|
88
|
-
const shadows = top !== undefined && inCell !== undefined && top !== 'cell' ? `cell.${inCell}` : undefined;
|
|
89
|
-
let node = top === undefined ? cell : config;
|
|
103
|
+
const keys = [];
|
|
104
|
+
let node = config;
|
|
90
105
|
for (let i = 0; i < segments.length; i++) {
|
|
91
106
|
const key = find(node, segments[i]);
|
|
92
107
|
if (key === undefined) {
|
|
@@ -102,12 +117,44 @@ var EnvConfigUtil;
|
|
|
102
117
|
node = node[key];
|
|
103
118
|
}
|
|
104
119
|
}
|
|
105
|
-
return { keys,
|
|
120
|
+
return { keys, type: typeof node[keys[keys.length - 1]] };
|
|
106
121
|
}
|
|
107
|
-
function assign(config, keys, value) {
|
|
122
|
+
function assign(config, keys, value, type) {
|
|
108
123
|
const parent = keys.slice(0, -1).reduce((node, key) => node[key], config);
|
|
109
124
|
const last = keys[keys.length - 1];
|
|
110
|
-
|
|
125
|
+
const path = keys.join('.');
|
|
126
|
+
parent[last] = type && !isExpression(value) ? toType(type, value, path) : convert(parent[last], value, path);
|
|
127
|
+
}
|
|
128
|
+
/**
|
|
129
|
+
* Converts the text an expression or a variable gave to the scalar type of the key's schema:
|
|
130
|
+
* `${env.PORT ?? 3000}` is a number when `PORT` is set. Values that are not text are kept.
|
|
131
|
+
*/
|
|
132
|
+
function toType(type, value, path) {
|
|
133
|
+
if (typeof value !== 'string') {
|
|
134
|
+
return value;
|
|
135
|
+
}
|
|
136
|
+
switch (type) {
|
|
137
|
+
case 'number':
|
|
138
|
+
return number(value, path);
|
|
139
|
+
case 'integer': {
|
|
140
|
+
const result = number(value, path);
|
|
141
|
+
if (!Number.isInteger(result)) {
|
|
142
|
+
throw new Error(`${path} is an integer, got '${value}'.`);
|
|
143
|
+
}
|
|
144
|
+
return result;
|
|
145
|
+
}
|
|
146
|
+
case 'boolean':
|
|
147
|
+
return boolean(value, path);
|
|
148
|
+
default:
|
|
149
|
+
return value;
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
EnvConfigUtil.toType = toType;
|
|
153
|
+
function boolean(value, path) {
|
|
154
|
+
if (!/^(true|false)$/i.test(value)) {
|
|
155
|
+
throw new Error(`${path} is a boolean, got '${value}'. Use true or false.`);
|
|
156
|
+
}
|
|
157
|
+
return value.toLowerCase() === 'true';
|
|
111
158
|
}
|
|
112
159
|
function find(node, segment) {
|
|
113
160
|
var _a;
|
|
@@ -131,7 +178,7 @@ var EnvConfigUtil;
|
|
|
131
178
|
/**
|
|
132
179
|
* Converts `value` to the type of `current`, the value in cell.yml. A value that is one `${...}`
|
|
133
180
|
* expression is kept for evaluation, as if written in cell.yml, so its result decides the type:
|
|
134
|
-
* `
|
|
181
|
+
* `CELL_SERVER__PORT='${env.PORT}'` works although the port is a number.
|
|
135
182
|
*/
|
|
136
183
|
function convert(current, value, path) {
|
|
137
184
|
if (isExpression(value)) {
|
|
@@ -141,10 +188,7 @@ var EnvConfigUtil;
|
|
|
141
188
|
case 'number':
|
|
142
189
|
return number(value, path);
|
|
143
190
|
case 'boolean':
|
|
144
|
-
|
|
145
|
-
throw new Error(`${path} is a boolean, got '${value}'. Use true or false.`);
|
|
146
|
-
}
|
|
147
|
-
return value.toLowerCase() === 'true';
|
|
191
|
+
return boolean(value, path);
|
|
148
192
|
case 'object':
|
|
149
193
|
if (current === null) {
|
|
150
194
|
// 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":";;;
|
|
1
|
+
{"version":3,"file":"env-config-util.js","sourceRoot":"","sources":["../../../src/common/config/env-config-util.ts"],"names":[],"mappings":"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"}
|