@rotty3000/config-node 0.5.0 → 0.6.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 (46) hide show
  1. package/README.md +28 -12
  2. package/dist/config-lxc/index.js +33 -35
  3. package/dist/config-lxc/index.js.map +1 -1
  4. package/dist/config-node/index.js +74 -30
  5. package/dist/config-node/index.js.map +1 -1
  6. package/dist/config-node/providers/1000-application-packaged.d.ts +1 -2
  7. package/dist/config-node/providers/1000-application-packaged.js +14 -21
  8. package/dist/config-node/providers/1000-application-packaged.js.map +1 -1
  9. package/dist/config-node/providers/10000-cli.js +1 -1
  10. package/dist/config-node/providers/10000-cli.js.map +1 -1
  11. package/dist/config-node/providers/11000-config-node-devtools.d.ts +7 -2
  12. package/dist/config-node/providers/11000-config-node-devtools.js +13 -12
  13. package/dist/config-node/providers/11000-config-node-devtools.js.map +1 -1
  14. package/dist/config-node/providers/2000-application.d.ts +1 -2
  15. package/dist/config-node/providers/2000-application.js +5 -11
  16. package/dist/config-node/providers/2000-application.js.map +1 -1
  17. package/dist/config-node/providers/3000-application-config.d.ts +1 -2
  18. package/dist/config-node/providers/3000-application-config.js +5 -11
  19. package/dist/config-node/providers/3000-application-config.js.map +1 -1
  20. package/dist/config-node/providers/4000-application-profile.d.ts +1 -2
  21. package/dist/config-node/providers/4000-application-profile.js +9 -15
  22. package/dist/config-node/providers/4000-application-profile.js.map +1 -1
  23. package/dist/config-node/providers/5000-application-profile-config.d.ts +1 -2
  24. package/dist/config-node/providers/5000-application-profile-config.js +9 -15
  25. package/dist/config-node/providers/5000-application-profile-config.js.map +1 -1
  26. package/dist/config-node/providers/6000-config-trees.js +5 -4
  27. package/dist/config-node/providers/6000-config-trees.js.map +1 -1
  28. package/dist/config-node/providers/7000-individual-env-vars.js +1 -1
  29. package/dist/config-node/providers/7000-individual-env-vars.js.map +1 -1
  30. package/dist/config-node/providers/8000-env-application-json.js +1 -1
  31. package/dist/config-node/providers/8000-env-application-json.js.map +1 -1
  32. package/dist/config-node/providers/9000-cli-application-json.js +1 -1
  33. package/dist/config-node/providers/9000-cli-application-json.js.map +1 -1
  34. package/dist/config-node/providers/active-profile.d.ts +5 -0
  35. package/dist/config-node/providers/active-profile.js +19 -0
  36. package/dist/config-node/providers/active-profile.js.map +1 -0
  37. package/dist/config-node/providers/json-file.d.ts +19 -0
  38. package/dist/config-node/providers/json-file.js +30 -0
  39. package/dist/config-node/providers/json-file.js.map +1 -0
  40. package/dist/config-node/util/index.d.ts +35 -3
  41. package/dist/config-node/util/index.js +95 -10
  42. package/dist/config-node/util/index.js.map +1 -1
  43. package/package.json +6 -7
  44. package/.github/workflows/node.js.yml +0 -30
  45. package/.nvmrc +0 -1
  46. package/RELEASE_PROCESS.md +0 -4
package/README.md CHANGED
@@ -10,12 +10,12 @@ Optionally [custom providers](#custom-providers) can be added to search more exo
10
10
  ```typescript
11
11
  import {lookupConfig, defaultConfig} from '@rotty3000/config-node';
12
12
 
13
- // It's best not to store the value and to always look it up because providers may invalidate their caches in order to give updated values
13
+ // Look the value up where you need it rather than storing it: the first lookup is cached, and clearCache()
14
+ // (or a provider that refreshes its own cache) is how a value is brought up to date
14
15
  let value = lookupConfig('a.configuration.key');
15
16
 
16
- // Setting a default value to be used when no provider can locate a configured value
17
-
18
- // do this before any access for the key has been performed
17
+ // Setting a default value to be used when no provider can locate a configured value. Do this as early as
18
+ // possible, ideally before the first lookup of that key.
19
19
  defaultConfig('config.node.config.trees', ['/configtree']);
20
20
  ```
21
21
 
@@ -23,7 +23,7 @@ defaultConfig('config.node.config.trees', ['/configtree']);
23
23
 
24
24
  The following configuration providers are pre-packaged and searched in order of precedence until a value is found.
25
25
 
26
- 1. A JSON file `~/.config-node-devtools.json` in the user home directory which contains configuration keys. (See [Structure of JSON configuration](#structure-of-json-configuration).)
26
+ 1. A JSON file `~/.config-node-devtools.json` in the user home directory which contains configuration keys. It is a development convenience, so it is **not consulted when `NODE_ENV` is `production`**. (See [Structure of JSON configuration](#structure-of-json-configuration).)
27
27
  1. Command line arguments formatted as `--key=value`.
28
28
  1. From command line argument `--application.json=<json>` where the inline JSON is structured as in 1. (See [Structure of JSON configuration](#structure-of-json-configuration).)
29
29
  1. Properties from the `APPLICATION_JSON` environment variable whose value is inline JSON. (See [Structure of JSON configuration](#structure-of-json-configuration).)
@@ -39,27 +39,39 @@ The following configuration providers are pre-packaged and searched in order of
39
39
  The key `a-configuration-key` becomes an environment variable called `ACONFIGURATIONKEY`
40
40
  1. From config tree structured directories (a.k.a. Volume mounted ConfigMaps/Secrets) specified (as an array) in the configuration property `config.node.config.trees`.
41
41
 
42
- Setting the configuration property `config.node.config.trees` (using any of the sources described in this list, for instance as an environment variable `CONFIG_NODE_CONFIG_TREES=/config-map,/secrets`) indicates the directories where keys will be looked up (where _key_ matches the file name and file contents become the _value_).
42
+ Setting the configuration property `config.node.config.trees` (using any of the sources described in this list, for instance as an environment variable `CONFIG_NODE_CONFIG_TREES=/config-map,/secrets`) indicates the directories where keys will be looked up (where _key_ matches the file name and file contents become the _value_). A key is a single file name: it may not contain a path separator, and a resolved path or symlink that leaves the configured directory is refused.
43
43
 
44
44
  _e.g._
45
45
 
46
- Given a Kubernetes ConfigMap or Secret mounted at `/config-map` with a data file located at `/config-map/a.config.map.key`, looking up the property `a.config.map.key` will return the contents of the file as the value.
46
+ Given a Kubernetes ConfigMap or Secret mounted at `/config-map` with a data file located at `/config-map/a.config.map.key`, looking up the property `a.config.map.key` will return the contents of the file as the value (without the trailing newline the file carries).
47
47
  1. From application profile property json files in `${CWD}/config/application-{profile}.json` where _profile_ is set using the property `config.node.profiles.active` (using any of the sources described in this list, for instance as an environment variable `CONFIG_NODE_PROFILES_ACTIVE=test`). (See [Structure of JSON configuration](#structure-of-json-configuration).)
48
48
  1. From application profile property json files in `${CWD}/application-{profile}.json` where _profile_ is set using the property `config.node.profiles.active` (using any of the sources described in this list, for instance as an environment variable `CONFIG_NODE_PROFILES_ACTIVE=test`). (See [Structure of JSON configuration](#structure-of-json-configuration).)
49
49
  1. From application property json files in `${CWD}/config/application.json`. (See [Structure of JSON configuration](#structure-of-json-configuration).)
50
50
  1. From application property json files in `${CWD}/application.json`. (See [Structure of JSON configuration](#structure-of-json-configuration).)
51
- 1. From application property json files packaged with the node.js app (i.e. adjacent to the main script). (See [Structure of JSON configuration](#structure-of-json-configuration).)
52
- 1. From programer provided defaults. As demonstrated in the sample code above a developer can pre-set values to act as the defaults when no other source provides a value.
51
+ 1. From application property json files packaged with the node.js app: the nearest `package.json` at or above the working directory, falling back to the directory of the main script. (See [Structure of JSON configuration](#structure-of-json-configuration).)
52
+ 1. From programmer provided defaults. As demonstrated in the sample code above a developer can pre-set values to act as the defaults when no other source provides a value.
53
53
 
54
54
  e.g.
55
55
  ```typescript
56
56
  defaultConfig('my.custom.config', 'some value');
57
57
  ```
58
58
 
59
+ The properties `config.node.config.trees`, `config.node.profiles.active` and `config.node.config.verbose` are protected: the config tree and profile providers will never satisfy them for themselves, so the profiles and trees cannot be redefined by the very sources they configure.
60
+
61
+ ## Value types
62
+
63
+ `lookupConfig` returns a `string`, a `string[]` or `undefined`.
64
+
65
+ * A JSON array of strings is returned as a `string[]`; any other array is returned as its JSON text.
66
+ * A JSON `false`, `0` or a number arrives as a string (`"false"`, `"0"`, `"5"`), because a provider answers with a falsy value when it has nothing to contribute. An empty array is not an answer and lets the search continue.
67
+ * A comma delimited value is split into a `string[]` **only for the flat text sources** — an environment variable and a file in a config tree. A JSON file can express an array for real, so a comma inside a JSON string value (`"Hello, world"`, a JDBC/PostgreSQL URL) stays part of that value.
68
+
59
69
  ## Interpolation of placeholders in config values
60
70
 
61
71
  When a value returned from a lookup contains a placeholder of the form `${key}` the `key` will be looked up and its value, if found, will replace the placeholder. A single value may contain multiple placeholders and it is also possible to have nested placeholders. For example; given the two environment variables `VAR_ONE="env var one value"` and `VAR_TWO="ONE"`, a third property `nested.placeholder=${VAR_${VAR_TWO}}` would result in the value `env var one value`.
62
72
 
73
+ A placeholder that cannot be resolved is left in place as written, and a value that references itself (or that would keep re-substituting) stops after a bounded number of steps instead of looping. Treat `${...}` as a way to reference configuration you control: the placeholder names a key that is looked up through every source, so a value that arrives from an untrusted source should not be interpolated.
74
+
63
75
  ## Structure of JSON configuration
64
76
 
65
77
  The configuration JSON structure expects keys to be at the root, as follows:
@@ -69,13 +81,13 @@ The configuration JSON structure expects keys to be at the root, as follows:
69
81
  "key.with.array.value": ["one", "two"],
70
82
  "key.with.object.value": {"some.value": "foo"},
71
83
  "key.with.number.value": 5,
72
- "key.with.string.value": "dev",
84
+ "key.with.string.value": "dev"
73
85
  }
74
86
  ```
75
87
 
76
88
  ## Custom Providers
77
89
 
78
- Custom providers can be added as middle ware to without affecting other parts of the code.
90
+ Custom providers can be added as middleware without affecting other parts of the code.
79
91
 
80
92
  ```typescript
81
93
  import {addProvider, computeIfAbsent, ConfigProvider} from '@rotty3000/config-node';
@@ -100,6 +112,10 @@ const customProvider: ConfigProvider = {
100
112
  addProvider(customProvider);
101
113
  ```
102
114
 
115
+ A provider signals "I have no value for this key" by returning a falsy value; the search then continues with the next provider. `priority` is compared numerically and the highest priority provider is asked first.
116
+
103
117
  ## Debugging and Verbosity
104
118
 
105
- There is an internal property `config.node.config.verbose` which allows external operators to set the verbosity level of the library. When the value is set to `'true'` the library will emit additional information about it's processing activities.
119
+ There is an internal property `config.node.config.verbose` which allows external operators to set the verbosity level of the library. When the value is set to `'true'` the library will emit additional information about its processing activities.
120
+
121
+ Values of sensitive keys (anything whose key contains `secret`, `password`, `token`, `credential` or an API/private key) are logged as `[redacted]`, and a configuration file that fails to parse is reported by path and reason, never by dumping its contents.
@@ -7,7 +7,6 @@ var OAuthApplicationProfile;
7
7
  OAuthApplicationProfile[OAuthApplicationProfile["HEADLESS_SERVER"] = 0] = "HEADLESS_SERVER";
8
8
  OAuthApplicationProfile[OAuthApplicationProfile["USER_AGENT"] = 1] = "USER_AGENT";
9
9
  })(OAuthApplicationProfile || (exports.OAuthApplicationProfile = OAuthApplicationProfile = {}));
10
- const oauthApplications = new Map();
11
10
  /**
12
11
  * Values reach this API in three shapes depending on where they came from: a comma delimited env var arrives
13
12
  * already split into a string[] by `unquote`, a multi-line value (the volume mounted ConfigMap/Secret form)
@@ -27,50 +26,49 @@ function toList(value) {
27
26
  }
28
27
  return values.map((entry) => entry.trim()).filter((entry) => entry.length > 0);
29
28
  }
29
+ /**
30
+ * The single valued lxc settings (protocol, audience, URIs, …) arrive through the same sources as the list
31
+ * valued ones, so a comma delimited value must not leak an array into a scalar accessor.
32
+ */
33
+ function first(value) {
34
+ return toList(value)[0];
35
+ }
30
36
  exports.lxcConfig = {
31
37
  dxpDomains: () => toList((0, config_node_1.lookupConfig)('com.liferay.lxc.dxp.domains')),
32
38
  dxpMainDomain: () => {
33
- let value = toList((0, config_node_1.lookupConfig)('com.liferay.lxc.dxp.main.domain'))[0];
39
+ let value = first((0, config_node_1.lookupConfig)('com.liferay.lxc.dxp.main.domain'));
34
40
  if (!value) {
35
- value = toList((0, config_node_1.lookupConfig)('com.liferay.lxc.dxp.mainDomain'))[0];
41
+ value = first((0, config_node_1.lookupConfig)('com.liferay.lxc.dxp.mainDomain'));
36
42
  }
37
43
  return value;
38
44
  },
39
- dxpProtocol: () => (0, config_node_1.lookupConfig)('com.liferay.lxc.dxp.server.protocol'),
45
+ dxpProtocol: () => first((0, config_node_1.lookupConfig)('com.liferay.lxc.dxp.server.protocol')),
40
46
  oauthApplication: (erc) => {
41
- let oauthApplication = oauthApplications.get(erc);
42
- if (oauthApplication) {
43
- return oauthApplication;
44
- }
45
- let ercs = (0, config_node_1.lookupConfig)('liferay.oauth.application.external.reference.codes');
46
- if (ercs) {
47
- ercs = Array.isArray(ercs) ? ercs : [ercs];
47
+ const ercs = toList((0, config_node_1.lookupConfig)('liferay.oauth.application.external.reference.codes'));
48
+ if (!ercs.includes(erc)) {
49
+ return undefined;
48
50
  }
49
- if (ercs && ercs.includes(erc)) {
50
- let applicationType = OAuthApplicationProfile.USER_AGENT;
51
- if ((0, config_node_1.lookupConfig)(`${erc}.oauth2.headless.server.client.id`)) {
52
- applicationType = OAuthApplicationProfile.HEADLESS_SERVER;
53
- }
54
- oauthApplication = {
55
- applicationType,
56
- audience: () => (applicationType === OAuthApplicationProfile.HEADLESS_SERVER ?
57
- (0, config_node_1.lookupConfig)(`${erc}.oauth2.headless.server.audience`) :
58
- (0, config_node_1.lookupConfig)(`${erc}.oauth2.user.agent.audience`)),
59
- authorizationUri: () => (0, config_node_1.lookupConfig)(`${erc}.oauth2.authorization.uri`),
60
- clientId: () => (applicationType === OAuthApplicationProfile.HEADLESS_SERVER ?
61
- (0, config_node_1.lookupConfig)(`${erc}.oauth2.headless.server.client.id`) :
62
- (0, config_node_1.lookupConfig)(`${erc}.oauth2.user.agent.client.id`)),
63
- clientSecret: () => (0, config_node_1.lookupConfig)(`${erc}.oauth2.headless.server.client.secret`),
64
- introspectionUri: () => (0, config_node_1.lookupConfig)(`${erc}.oauth2.introspection.uri`),
65
- jwksUri: () => (0, config_node_1.lookupConfig)(`${erc}.oauth2.jwks.uri`),
66
- scopes: () => (applicationType === OAuthApplicationProfile.HEADLESS_SERVER ?
67
- (0, config_node_1.lookupConfig)(`${erc}.oauth2.headless.server.scopes`) :
68
- (0, config_node_1.lookupConfig)(`${erc}.oauth2.user.agent.scopes`)),
69
- tokenUri: () => (0, config_node_1.lookupConfig)(`${erc}.oauth2.token.uri`),
70
- };
71
- oauthApplications.set(erc, oauthApplication);
51
+ let applicationType = OAuthApplicationProfile.USER_AGENT;
52
+ if ((0, config_node_1.lookupConfig)(`${erc}.oauth2.headless.server.client.id`)) {
53
+ applicationType = OAuthApplicationProfile.HEADLESS_SERVER;
72
54
  }
73
- return oauthApplication;
55
+ const family = applicationType === OAuthApplicationProfile.HEADLESS_SERVER ? 'headless.server' : 'user.agent';
56
+ // deliberately not memoized: the values live in the provider caches that clearCache() owns, and a module
57
+ // level map would keep serving the old application type after a flush
58
+ return {
59
+ applicationType,
60
+ audience: () => first((0, config_node_1.lookupConfig)(`${erc}.oauth2.${family}.audience`)),
61
+ authorizationUri: () => first((0, config_node_1.lookupConfig)(`${erc}.oauth2.authorization.uri`)),
62
+ clientId: () => first((0, config_node_1.lookupConfig)(`${erc}.oauth2.${family}.client.id`)),
63
+ clientSecret: () => first((0, config_node_1.lookupConfig)(`${erc}.oauth2.${family}.client.secret`)),
64
+ introspectionUri: () => first((0, config_node_1.lookupConfig)(`${erc}.oauth2.introspection.uri`)),
65
+ jwksUri: () => first((0, config_node_1.lookupConfig)(`${erc}.oauth2.jwks.uri`)),
66
+ scopes: () => {
67
+ const scopes = toList((0, config_node_1.lookupConfig)(`${erc}.oauth2.${family}.scopes`));
68
+ return scopes.length > 0 ? scopes : undefined;
69
+ },
70
+ tokenUri: () => first((0, config_node_1.lookupConfig)(`${erc}.oauth2.token.uri`)),
71
+ };
74
72
  },
75
73
  };
76
74
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config-lxc/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config-lxc/index.ts"],"names":[],"mappings":"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"}
@@ -17,18 +17,24 @@ const util_1 = require("./util");
17
17
  Object.defineProperty(exports, "computeIfAbsent", { enumerable: true, get: function () { return util_1.computeIfAbsent; } });
18
18
  Object.defineProperty(exports, "setVerbose", { enumerable: true, get: function () { return util_1.setVerbose; } });
19
19
  class ConfigProviderHolder {
20
+ priority;
21
+ provider;
22
+ cache;
20
23
  constructor(provider) {
21
24
  this.provider = provider;
22
25
  this.priority = this.provider.priority;
23
26
  this.cache = new Map;
24
27
  }
25
28
  }
26
- class KeyProviderPair {
27
- }
28
29
  const configProviderHolders = [];
29
30
  const commonCache = new Map();
30
31
  const stack = [];
31
32
  const regex = /\$\{[^\$]+?\}/;
33
+ /**
34
+ * A value that keeps reproducing its own placeholder (or a pair of values that reference each other) would
35
+ * otherwise spin forever; stop after this many substitutions and leave the remainder literal.
36
+ */
37
+ const MAX_INTERPOLATION_STEPS = 100;
32
38
  /**
33
39
  * Register one or more configuration providers.
34
40
  *
@@ -54,7 +60,16 @@ exports.clearCache = clearCache;
54
60
  * @param value - the configuration value to store
55
61
  */
56
62
  function defaultConfig(key, value) {
63
+ // a boolean or a number is a legitimate configuration value; providers answer with a falsy value when they
64
+ // have nothing, so hand the core a string the way a JSON file would
65
+ if (typeof value === 'boolean' || typeof value === 'number') {
66
+ value = String(value);
67
+ }
57
68
  commonCache.set(key, value);
69
+ // a lookup made before this call (including the one this library performs when it is imported) may have
70
+ // cached the absence of a value for the key; drop that entry so the default is not shadowed by a stale miss
71
+ const programmaticHolder = configProviderHolders.find(holder => holder.provider === _0000_programmatic_1.programmatic);
72
+ programmaticHolder?.cache.delete(key);
58
73
  }
59
74
  exports.defaultConfig = defaultConfig;
60
75
  /**
@@ -73,27 +88,7 @@ function lookupConfig(key) {
73
88
  try {
74
89
  let valueFromCache = false;
75
90
  if (!holder.cache.has(key)) {
76
- value = holder.provider.get(key, holder.cache, commonCache);
77
- if (value) {
78
- if (Array.isArray(value)) {
79
- if (value.length > 0 && typeof value[0] === 'string') {
80
- value = value;
81
- }
82
- else {
83
- value = [];
84
- }
85
- value = value.map(v => _interpolatePlaceholders(v));
86
- }
87
- else if (typeof value !== 'string') {
88
- value = JSON.stringify(value);
89
- value = _interpolatePlaceholders(value);
90
- }
91
- else {
92
- value = _interpolatePlaceholders(value);
93
- }
94
- holder.cache.set(key, value);
95
- }
96
- // map undefined value so we don't process it over and over again
91
+ value = _normalizeValue(holder.provider.get(key, holder.cache, commonCache));
97
92
  holder.cache.set(key, value);
98
93
  }
99
94
  else {
@@ -101,7 +96,7 @@ function lookupConfig(key) {
101
96
  valueFromCache = true;
102
97
  }
103
98
  if (value) {
104
- util_1.verbose && console.debug('[config-node]', `Provider [${holder.provider.key}] returned${valueFromCache ? ' (from cache)' : ''}: `, key, '=', value);
99
+ util_1.verbose && console.debug('[config-node]', `Provider [${_providerLabel(holder.provider)}] returned${valueFromCache ? ' (from cache)' : ''}: `, key, '=', (0, util_1.redactValue)(key, value));
105
100
  return value;
106
101
  }
107
102
  }
@@ -112,6 +107,43 @@ function lookupConfig(key) {
112
107
  util_1.verbose && console.debug('[config-node]', `No Providers returned a value for:`, key);
113
108
  }
114
109
  exports.lookupConfig = lookupConfig;
110
+ /**
111
+ * Normalize whatever a provider returned into the `string | string[]` shape this API promises, interpolating
112
+ * any `${key}` placeholders on the way through.
113
+ */
114
+ function _normalizeValue(value) {
115
+ // a provider answers with a falsy value (undefined, or the `key === 'x' && 'value'` idiom) when it has
116
+ // nothing to contribute
117
+ if (!value) {
118
+ return undefined;
119
+ }
120
+ if (Array.isArray(value)) {
121
+ // an empty list is not an answer, let the lower precedence providers have a turn
122
+ if (value.length === 0) {
123
+ return undefined;
124
+ }
125
+ if (typeof value[0] === 'string') {
126
+ return value.map(v => _interpolatePlaceholders(v));
127
+ }
128
+ // a list of objects or numbers is data the caller asked for; returning [] here would lose it
129
+ return _interpolatePlaceholders(_stringify(value));
130
+ }
131
+ if (typeof value === 'string') {
132
+ return _interpolatePlaceholders(value);
133
+ }
134
+ return _interpolatePlaceholders(_stringify(value));
135
+ }
136
+ function _providerLabel(provider) {
137
+ return provider.description ? `${provider.key}: ${provider.description}` : provider.key;
138
+ }
139
+ function _stringify(value) {
140
+ try {
141
+ return JSON.stringify(value);
142
+ }
143
+ catch (e) {
144
+ util_1.verbose && console.error('[config-node]', 'Could not serialize the value:', e.message);
145
+ }
146
+ }
115
147
  function _compareProviders(a, b) {
116
148
  if (a.priority < b.priority) {
117
149
  return 1;
@@ -122,18 +154,30 @@ function _compareProviders(a, b) {
122
154
  return 0;
123
155
  }
124
156
  function _interpolatePlaceholders(v) {
157
+ if (typeof v !== 'string') {
158
+ return v;
159
+ }
125
160
  let match = regex.exec(v);
161
+ let steps = 0;
126
162
  while (match) {
127
- // verbose && console.debug('[config-node]', 'Interpolating:', v, 'matched:', match);
163
+ if (++steps > MAX_INTERPOLATION_STEPS) {
164
+ util_1.verbose && console.warn('[config-node]', 'Stopped interpolating after', MAX_INTERPOLATION_STEPS, 'steps:', v);
165
+ break;
166
+ }
128
167
  const key = match[0].slice(2, -1);
129
168
  const lookedUpValue = lookupConfig(key);
130
- if (lookedUpValue) {
131
- v = v.replace(match[0], lookedUpValue);
132
- match = regex.exec(v);
169
+ if (!lookedUpValue) {
170
+ break;
133
171
  }
134
- else {
135
- match = undefined;
172
+ // a function replacement keeps `$&`, `$'` and `` $` `` in the resolved value literal instead of letting
173
+ // String.replace interpret them as replacement patterns
174
+ const next = v.replace(match[0], () => lookedUpValue);
175
+ // the value reproduced the placeholder exactly: making progress is impossible, leave it as written
176
+ if (next === v) {
177
+ break;
136
178
  }
179
+ v = next;
180
+ match = regex.exec(v);
137
181
  }
138
182
  return v;
139
183
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config-node/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config-node/index.ts"],"names":[],"mappings":"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"}
@@ -1,2 +1 @@
1
- import { ConfigProvider } from '../types';
2
- export declare const applicationPackaged: ConfigProvider;
1
+ export declare const applicationPackaged: import("..").ConfigProvider;
@@ -4,31 +4,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.applicationPackaged = void 0;
7
- const node_fs_1 = __importDefault(require("node:fs"));
8
7
  const node_path_1 = __importDefault(require("node:path"));
9
8
  const util_1 = require("../util");
10
- exports.applicationPackaged = {
9
+ const json_file_1 = require("./json-file");
10
+ exports.applicationPackaged = (0, json_file_1.jsonFileProvider)({
11
11
  key: 'application.json',
12
12
  description: 'From application property json files packaged with the app',
13
- priority: 1000,
14
- get: (key, providerCache, commonCache) => {
15
- const mainPath = (0, util_1.computeIfAbsent)(commonCache, 'require.main.path', () => {
16
- var _a;
17
- const mainPath = (0, util_1.getProjectRoot)();
18
- if (mainPath) {
19
- return mainPath;
20
- }
21
- return (_a = require.main) === null || _a === void 0 ? void 0 : _a.path;
22
- });
23
- if (mainPath) {
24
- const configPath = node_path_1.default.join(mainPath, 'application.json');
25
- if (node_fs_1.default.existsSync(configPath)) {
26
- const json = (0, util_1.computeIfAbsent)(providerCache, configPath, () => (0, util_1.readJSONFile)(configPath));
27
- if (json) {
28
- return (0, util_1.unquote)(json[key]);
29
- }
30
- }
13
+ priority: 500,
14
+ resolvePath: (commonCache) => {
15
+ let mainPath;
16
+ if (commonCache.has('require.main.path')) {
17
+ mainPath = commonCache.get('require.main.path');
31
18
  }
19
+ else {
20
+ mainPath = (0, util_1.getProjectRoot)() ?? require.main?.path;
21
+ // remember the miss as well: walking up to the filesystem root on every cold key is expensive
22
+ commonCache.set('require.main.path', mainPath);
23
+ }
24
+ return mainPath ? node_path_1.default.join(mainPath, 'application.json') : undefined;
32
25
  },
33
- };
26
+ });
34
27
  //# sourceMappingURL=1000-application-packaged.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"1000-application-packaged.js","sourceRoot":"","sources":["../../../src/config-node/providers/1000-application-packaged.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAyB;AACzB,0DAA6B;AAE7B,kCAA+E;AAElE,QAAA,mBAAmB,GAAmB;IACjD,GAAG,EAAE,kBAAkB;IACvB,WAAW,EAAE,4DAA4D;IACzE,QAAQ,EAAE,IAAI;IACd,GAAG,EAAE,CAAC,GAAG,EAAE,aAAa,EAAE,WAAW,EAAE,EAAE;QACvC,MAAM,QAAQ,GAAG,IAAA,sBAAe,EAAC,WAAW,EAAE,mBAAmB,EAAE,GAAG,EAAE;;YACtE,MAAM,QAAQ,GAAG,IAAA,qBAAc,GAAE,CAAC;YAClC,IAAI,QAAQ,EAAE,CAAC;gBACb,OAAO,QAAQ,CAAC;YAClB,CAAC;YACD,OAAO,MAAA,OAAO,CAAC,IAAI,0CAAE,IAAI,CAAC;QAC5B,CAAC,CAAC,CAAC;QACH,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,UAAU,GAAG,mBAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;YAC3D,IAAI,iBAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC9B,MAAM,IAAI,GAAG,IAAA,sBAAe,EAAC,aAAa,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,IAAA,mBAAY,EAAC,UAAU,CAAC,CAAC,CAAC;gBACxF,IAAI,IAAI,EAAE,CAAC;oBACT,OAAO,IAAA,cAAO,EAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC5B,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;CACF,CAAC"}
1
+ {"version":3,"file":"1000-application-packaged.js","sourceRoot":"","sources":["../../../src/config-node/providers/1000-application-packaged.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA6B;AAC7B,kCAAuC;AACvC,2CAA6C;AAEhC,QAAA,mBAAmB,GAAG,IAAA,4BAAgB,EAAC;IAClD,GAAG,EAAE,kBAAkB;IACvB,WAAW,EAAE,4DAA4D;IACzE,QAAQ,EAAE,GAAG;IACb,WAAW,EAAE,CAAC,WAAW,EAAE,EAAE;QAC3B,IAAI,QAAQ,CAAC;QAEb,IAAI,WAAW,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACzC,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QAClD,CAAC;aACI,CAAC;YACJ,QAAQ,GAAG,IAAA,qBAAc,GAAE,IAAI,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC;YAClD,8FAA8F;YAC9F,WAAW,CAAC,GAAG,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;QACjD,CAAC;QAED,OAAO,QAAQ,CAAC,CAAC,CAAC,mBAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACxE,CAAC;CACF,CAAC,CAAC"}
@@ -5,7 +5,7 @@ const util_1 = require("../util");
5
5
  exports.cli = {
6
6
  key: 'command-line-arguments',
7
7
  description: 'From command line arguments (--key=value)',
8
- priority: 1000,
8
+ priority: 10000,
9
9
  get: (key, providerCache) => (0, util_1.computeIfAbsent)(providerCache, `process.args.${key}`, () => {
10
10
  const prefix = `--${key}=`;
11
11
  for (var arg of process.argv) {
@@ -1 +1 @@
1
- {"version":3,"file":"10000-cli.js","sourceRoot":"","sources":["../../../src/config-node/providers/10000-cli.ts"],"names":[],"mappings":";;;AACA,kCAAiD;AAEpC,QAAA,GAAG,GAAmB;IACjC,GAAG,EAAE,wBAAwB;IAC7B,WAAW,EAAE,2CAA2C;IACxD,QAAQ,EAAE,IAAI;IACd,GAAG,EAAE,CAAC,GAAG,EAAE,aAAa,EAAE,EAAE,CAAC,IAAA,sBAAe,EAAC,aAAa,EAAE,gBAAgB,GAAG,EAAE,EAAE,GAAG,EAAE;QACtF,MAAM,MAAM,GAAG,KAAK,GAAG,GAAG,CAAA;QAC1B,KAAK,IAAI,GAAG,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YAC7B,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC3B,MAAM,KAAK,GAAG,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAC3C,OAAO,IAAA,cAAO,EAAC,KAAK,CAAC,CAAC;YACxB,CAAC;QACH,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC;CACH,CAAC"}
1
+ {"version":3,"file":"10000-cli.js","sourceRoot":"","sources":["../../../src/config-node/providers/10000-cli.ts"],"names":[],"mappings":";;;AACA,kCAAiD;AAEpC,QAAA,GAAG,GAAmB;IACjC,GAAG,EAAE,wBAAwB;IAC7B,WAAW,EAAE,2CAA2C;IACxD,QAAQ,EAAE,KAAK;IACf,GAAG,EAAE,CAAC,GAAG,EAAE,aAAa,EAAE,EAAE,CAAC,IAAA,sBAAe,EAAC,aAAa,EAAE,gBAAgB,GAAG,EAAE,EAAE,GAAG,EAAE;QACtF,MAAM,MAAM,GAAG,KAAK,GAAG,GAAG,CAAA;QAC1B,KAAK,IAAI,GAAG,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YAC7B,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC3B,MAAM,KAAK,GAAG,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAC3C,OAAO,IAAA,cAAO,EAAC,KAAK,CAAC,CAAC;YACxB,CAAC;QACH,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC;CACH,CAAC"}
@@ -1,2 +1,7 @@
1
- import { ConfigProvider } from '../types';
2
- export declare const configNodeDevtools: ConfigProvider;
1
+ /**
2
+ * A file in the user's home directory is a developer convenience, not configuration: it outranks every other
3
+ * source by design (that is what makes it useful for overriding a packaged default while debugging), which is
4
+ * also why it is not consulted in production where it would let whoever can write to $HOME take over the
5
+ * application's configuration.
6
+ */
7
+ export declare const configNodeDevtools: import("..").ConfigProvider;
@@ -4,23 +4,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.configNodeDevtools = void 0;
7
- const fs_1 = __importDefault(require("fs"));
8
7
  const os_1 = __importDefault(require("os"));
9
8
  const node_path_1 = __importDefault(require("node:path"));
10
9
  const util_1 = require("../util");
11
- exports.configNodeDevtools = {
10
+ const json_file_1 = require("./json-file");
11
+ /**
12
+ * A file in the user's home directory is a developer convenience, not configuration: it outranks every other
13
+ * source by design (that is what makes it useful for overriding a packaged default while debugging), which is
14
+ * also why it is not consulted in production where it would let whoever can write to $HOME take over the
15
+ * application's configuration.
16
+ */
17
+ exports.configNodeDevtools = (0, json_file_1.jsonFileProvider)({
12
18
  key: '~/.config-node-devtools.json',
13
19
  description: 'From ~/.config-node-devtools.json',
14
20
  priority: 11000,
15
- get: (key, providerCache, commonCache) => (0, util_1.computeIfAbsent)(providerCache, key, () => {
21
+ isEnabled: () => process.env.NODE_ENV !== 'production',
22
+ resolvePath: (commonCache) => {
16
23
  const homedir = (0, util_1.computeIfAbsent)(commonCache, 'homedir', () => os_1.default.homedir());
17
- const filePath = node_path_1.default.join(homedir, '.config-node-devtools.json');
18
- if (fs_1.default.existsSync(filePath)) {
19
- const json = (0, util_1.computeIfAbsent)(providerCache, filePath, () => (0, util_1.readJSONFile)(filePath));
20
- if (json) {
21
- return (0, util_1.unquote)(json[key]);
22
- }
23
- }
24
- }),
25
- };
24
+ return node_path_1.default.join(homedir, '.config-node-devtools.json');
25
+ },
26
+ });
26
27
  //# sourceMappingURL=11000-config-node-devtools.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"11000-config-node-devtools.js","sourceRoot":"","sources":["../../../src/config-node/providers/11000-config-node-devtools.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,4CAAoB;AACpB,0DAA6B;AAE7B,kCAA+D;AAElD,QAAA,kBAAkB,GAAmB;IAChD,GAAG,EAAE,8BAA8B;IACnC,WAAW,EAAE,mCAAmC;IAChD,QAAQ,EAAE,KAAK;IACf,GAAG,EAAE,CAAC,GAAG,EAAE,aAAa,EAAE,WAAW,EAAE,EAAE,CAAC,IAAA,sBAAe,EAAC,aAAa,EAAE,GAAG,EAAE,GAAG,EAAE;QACjF,MAAM,OAAO,GAAG,IAAA,sBAAe,EAAC,WAAW,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,YAAE,CAAC,OAAO,EAAE,CAAC,CAAC;QAC5E,MAAM,QAAQ,GAAG,mBAAI,CAAC,IAAI,CAAC,OAAO,EAAE,4BAA4B,CAAC,CAAC;QAClE,IAAI,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5B,MAAM,IAAI,GAAG,IAAA,sBAAe,EAAC,aAAa,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAA,mBAAY,EAAC,QAAQ,CAAC,CAAC,CAAC;YACpF,IAAI,IAAI,EAAE,CAAC;gBACT,OAAO,IAAA,cAAO,EAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;IACH,CAAC,CAAC;CACH,CAAC"}
1
+ {"version":3,"file":"11000-config-node-devtools.js","sourceRoot":"","sources":["../../../src/config-node/providers/11000-config-node-devtools.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,0DAA6B;AAC7B,kCAAwC;AACxC,2CAA6C;AAE7C;;;;;GAKG;AACU,QAAA,kBAAkB,GAAG,IAAA,4BAAgB,EAAC;IACjD,GAAG,EAAE,8BAA8B;IACnC,WAAW,EAAE,mCAAmC;IAChD,QAAQ,EAAE,KAAK;IACf,SAAS,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY;IACtD,WAAW,EAAE,CAAC,WAAW,EAAE,EAAE;QAC3B,MAAM,OAAO,GAAG,IAAA,sBAAe,EAAC,WAAW,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,YAAE,CAAC,OAAO,EAAE,CAAC,CAAC;QAE5E,OAAO,mBAAI,CAAC,IAAI,CAAC,OAAO,EAAE,4BAA4B,CAAC,CAAC;IAC1D,CAAC;CACF,CAAC,CAAC"}
@@ -1,2 +1 @@
1
- import { ConfigProvider } from '../types';
2
- export declare const application: ConfigProvider;
1
+ export declare const application: import("..").ConfigProvider;
@@ -4,22 +4,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.application = void 0;
7
- const node_fs_1 = __importDefault(require("node:fs"));
8
7
  const node_path_1 = __importDefault(require("node:path"));
9
8
  const util_1 = require("../util");
10
- exports.application = {
9
+ const json_file_1 = require("./json-file");
10
+ exports.application = (0, json_file_1.jsonFileProvider)({
11
11
  key: '${CWD}/application.json',
12
12
  description: 'From application property json files in ${CWD}',
13
13
  priority: 2000,
14
- get: (key, providerCache, commonCache) => {
14
+ resolvePath: (commonCache) => {
15
15
  const cwd = (0, util_1.computeIfAbsent)(commonCache, 'cwd', () => process.cwd());
16
- const configPath = node_path_1.default.join(cwd, 'application.json');
17
- if (node_fs_1.default.existsSync(configPath)) {
18
- const json = (0, util_1.computeIfAbsent)(providerCache, configPath, () => (0, util_1.readJSONFile)(configPath));
19
- if (json) {
20
- return (0, util_1.unquote)(json[key]);
21
- }
22
- }
16
+ return node_path_1.default.join(cwd, 'application.json');
23
17
  },
24
- };
18
+ });
25
19
  //# sourceMappingURL=2000-application.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"2000-application.js","sourceRoot":"","sources":["../../../src/config-node/providers/2000-application.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAyB;AACzB,0DAA6B;AAE7B,kCAA+D;AAElD,QAAA,WAAW,GAAmB;IACzC,GAAG,EAAE,yBAAyB;IAC9B,WAAW,EAAE,gDAAgD;IAC7D,QAAQ,EAAE,IAAI;IACd,GAAG,EAAE,CAAC,GAAG,EAAE,aAAa,EAAE,WAAW,EAAE,EAAE;QACvC,MAAM,GAAG,GAAG,IAAA,sBAAe,EAAC,WAAW,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QACrE,MAAM,UAAU,GAAG,mBAAI,CAAC,IAAI,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC;QACtD,IAAI,iBAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YAC9B,MAAM,IAAI,GAAG,IAAA,sBAAe,EAAC,aAAa,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,IAAA,mBAAY,EAAC,UAAU,CAAC,CAAC,CAAC;YACxF,IAAI,IAAI,EAAE,CAAC;gBACT,OAAO,IAAA,cAAO,EAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;IACH,CAAC;CACF,CAAC"}
1
+ {"version":3,"file":"2000-application.js","sourceRoot":"","sources":["../../../src/config-node/providers/2000-application.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA6B;AAC7B,kCAAwC;AACxC,2CAA6C;AAEhC,QAAA,WAAW,GAAG,IAAA,4BAAgB,EAAC;IAC1C,GAAG,EAAE,yBAAyB;IAC9B,WAAW,EAAE,gDAAgD;IAC7D,QAAQ,EAAE,IAAI;IACd,WAAW,EAAE,CAAC,WAAW,EAAE,EAAE;QAC3B,MAAM,GAAG,GAAG,IAAA,sBAAe,EAAC,WAAW,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QAErE,OAAO,mBAAI,CAAC,IAAI,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC;IAC5C,CAAC;CACF,CAAC,CAAC"}
@@ -1,2 +1 @@
1
- import { ConfigProvider } from '../types';
2
- export declare const applicationConfig: ConfigProvider;
1
+ export declare const applicationConfig: import("..").ConfigProvider;
@@ -4,22 +4,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.applicationConfig = void 0;
7
- const node_fs_1 = __importDefault(require("node:fs"));
8
7
  const node_path_1 = __importDefault(require("node:path"));
9
8
  const util_1 = require("../util");
10
- exports.applicationConfig = {
9
+ const json_file_1 = require("./json-file");
10
+ exports.applicationConfig = (0, json_file_1.jsonFileProvider)({
11
11
  key: '${CWD}/config/application.json',
12
12
  description: 'From application property json files in ${CWD}/config',
13
13
  priority: 3000,
14
- get: (key, providerCache, commonCache) => {
14
+ resolvePath: (commonCache) => {
15
15
  const cwd = (0, util_1.computeIfAbsent)(commonCache, 'cwd', () => process.cwd());
16
- const configPath = node_path_1.default.join(cwd, 'config', 'application.json');
17
- if (node_fs_1.default.existsSync(configPath)) {
18
- const json = (0, util_1.computeIfAbsent)(providerCache, configPath, () => (0, util_1.readJSONFile)(configPath));
19
- if (json) {
20
- return (0, util_1.unquote)(json[key]);
21
- }
22
- }
16
+ return node_path_1.default.join(cwd, 'config', 'application.json');
23
17
  },
24
- };
18
+ });
25
19
  //# sourceMappingURL=3000-application-config.js.map