@push.rocks/qenv 6.1.2 → 6.1.3
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.
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/qenv',
|
|
6
|
-
version: '6.1.
|
|
6
|
+
version: '6.1.3',
|
|
7
7
|
description: 'A module for easily handling environment variables in Node.js projects with support for .yml and .json configuration.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxrQkFBa0I7SUFDeEIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLHVIQUF1SDtDQUNySSxDQUFBIn0=
|
|
@@ -52,7 +52,7 @@ export class Qenv {
|
|
|
52
52
|
loadAvailableEnvVars() {
|
|
53
53
|
for (const envVar of this.requiredEnvVars) {
|
|
54
54
|
const value = this.getEnvVarOnDemand(envVar);
|
|
55
|
-
if (value) {
|
|
55
|
+
if (value !== undefined) {
|
|
56
56
|
this.availableEnvVars.push(envVar);
|
|
57
57
|
this.keyValueObject[envVar] = value;
|
|
58
58
|
}
|
|
@@ -76,7 +76,7 @@ export class Qenv {
|
|
|
76
76
|
if (Array.isArray(envVarNameOrNames)) {
|
|
77
77
|
for (const envVarName of envVarNameOrNames) {
|
|
78
78
|
const value = await this.tryGetEnvVar(envVarName);
|
|
79
|
-
if (value) {
|
|
79
|
+
if (value !== undefined) {
|
|
80
80
|
return value;
|
|
81
81
|
}
|
|
82
82
|
}
|
|
@@ -93,7 +93,7 @@ export class Qenv {
|
|
|
93
93
|
*/
|
|
94
94
|
async getEnvVarOnDemandStrict(envVarNameOrNames) {
|
|
95
95
|
const value = await this.getEnvVarOnDemand(envVarNameOrNames);
|
|
96
|
-
if (
|
|
96
|
+
if (value === undefined) {
|
|
97
97
|
throw new Error(`Env var ${envVarNameOrNames} is not set!`);
|
|
98
98
|
}
|
|
99
99
|
return value;
|
|
@@ -103,7 +103,7 @@ export class Qenv {
|
|
|
103
103
|
if (Array.isArray(envVarNameOrNames)) {
|
|
104
104
|
for (const envVarName of envVarNameOrNames) {
|
|
105
105
|
const value = this.tryGetEnvVarSync(envVarName);
|
|
106
|
-
if (value) {
|
|
106
|
+
if (value !== undefined) {
|
|
107
107
|
return value;
|
|
108
108
|
}
|
|
109
109
|
}
|
|
@@ -125,16 +125,32 @@ export class Qenv {
|
|
|
125
125
|
if (typeof envVarRefArg === 'function') {
|
|
126
126
|
return await envVarRefArg();
|
|
127
127
|
}
|
|
128
|
-
|
|
129
|
-
this.
|
|
130
|
-
this.
|
|
131
|
-
this.
|
|
128
|
+
const sources = [
|
|
129
|
+
this.getFromEnvironmentVariable(envVarRefArg),
|
|
130
|
+
this.getFromEnvYamlOrJsonFile(envVarRefArg),
|
|
131
|
+
this.getFromDockerSecret(envVarRefArg),
|
|
132
|
+
this.getFromDockerSecretJson(envVarRefArg)
|
|
133
|
+
];
|
|
134
|
+
for (const value of sources) {
|
|
135
|
+
if (value !== undefined) {
|
|
136
|
+
return value;
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
return undefined;
|
|
132
140
|
}
|
|
133
141
|
tryGetEnvVarSync(envVarName) {
|
|
134
|
-
|
|
135
|
-
this.
|
|
136
|
-
this.
|
|
137
|
-
this.
|
|
142
|
+
const sources = [
|
|
143
|
+
this.getFromEnvironmentVariable(envVarName),
|
|
144
|
+
this.getFromEnvYamlOrJsonFile(envVarName),
|
|
145
|
+
this.getFromDockerSecret(envVarName),
|
|
146
|
+
this.getFromDockerSecretJson(envVarName)
|
|
147
|
+
];
|
|
148
|
+
for (const value of sources) {
|
|
149
|
+
if (value !== undefined) {
|
|
150
|
+
return value;
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
return undefined;
|
|
138
154
|
}
|
|
139
155
|
getFromEnvironmentVariable(envVarName) {
|
|
140
156
|
return process.env[envVarName];
|
|
@@ -146,10 +162,13 @@ export class Qenv {
|
|
|
146
162
|
try {
|
|
147
163
|
const envJson = plugins.smartfile.fs.toObjectSync(this.envFilePathAbsolute);
|
|
148
164
|
const value = envJson[envVarName];
|
|
165
|
+
if (value === undefined) {
|
|
166
|
+
return undefined;
|
|
167
|
+
}
|
|
149
168
|
if (typeof value === 'object') {
|
|
150
169
|
return 'base64Object:' + this.encodeBase64(value);
|
|
151
170
|
}
|
|
152
|
-
return value;
|
|
171
|
+
return String(value);
|
|
153
172
|
}
|
|
154
173
|
catch (error) {
|
|
155
174
|
return undefined;
|
|
@@ -169,10 +188,13 @@ export class Qenv {
|
|
|
169
188
|
if (secret.includes('secret.json')) {
|
|
170
189
|
const secretObject = plugins.smartfile.fs.toObjectSync(`/run/secrets/${secret}`);
|
|
171
190
|
const value = secretObject[envVarName];
|
|
191
|
+
if (value === undefined) {
|
|
192
|
+
continue;
|
|
193
|
+
}
|
|
172
194
|
if (typeof value === 'object') {
|
|
173
195
|
return 'base64Object:' + this.encodeBase64(value);
|
|
174
196
|
}
|
|
175
|
-
return value;
|
|
197
|
+
return String(value);
|
|
176
198
|
}
|
|
177
199
|
}
|
|
178
200
|
}
|
|
@@ -187,4 +209,4 @@ export class Qenv {
|
|
|
187
209
|
return JSON.parse(decodedString);
|
|
188
210
|
}
|
|
189
211
|
}
|
|
190
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
212
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"qenv.classes.qenv.js","sourceRoot":"","sources":["../ts/qenv.classes.qenv.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/qenv",
|
|
3
|
-
"version": "6.1.
|
|
3
|
+
"version": "6.1.3",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "A module for easily handling environment variables in Node.js projects with support for .yml and .json configuration.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
"last 1 chrome versions"
|
|
55
55
|
],
|
|
56
56
|
"scripts": {
|
|
57
|
-
"test": "(tstest test/)",
|
|
57
|
+
"test": "(tstest test/ --verbose --testlog --timeout 20)",
|
|
58
58
|
"build": "(tsbuild --web --allowimplicitany)",
|
|
59
59
|
"buildDocs": "tsdoc"
|
|
60
60
|
}
|
package/ts/00_commitinfo_data.ts
CHANGED
package/ts/qenv.classes.qenv.ts
CHANGED
|
@@ -71,7 +71,7 @@ export class Qenv {
|
|
|
71
71
|
private loadAvailableEnvVars() {
|
|
72
72
|
for (const envVar of this.requiredEnvVars) {
|
|
73
73
|
const value = this.getEnvVarOnDemand(envVar);
|
|
74
|
-
if (value) {
|
|
74
|
+
if (value !== undefined) {
|
|
75
75
|
this.availableEnvVars.push(envVar);
|
|
76
76
|
this.keyValueObject[envVar] = value;
|
|
77
77
|
}
|
|
@@ -101,7 +101,7 @@ export class Qenv {
|
|
|
101
101
|
if (Array.isArray(envVarNameOrNames)) {
|
|
102
102
|
for (const envVarName of envVarNameOrNames) {
|
|
103
103
|
const value = await this.tryGetEnvVar(envVarName);
|
|
104
|
-
if (value) {
|
|
104
|
+
if (value !== undefined) {
|
|
105
105
|
return value;
|
|
106
106
|
}
|
|
107
107
|
}
|
|
@@ -120,7 +120,7 @@ export class Qenv {
|
|
|
120
120
|
envVarNameOrNames: TEnvVarRef | TEnvVarRef[]
|
|
121
121
|
): Promise<string> {
|
|
122
122
|
const value = await this.getEnvVarOnDemand(envVarNameOrNames);
|
|
123
|
-
if (
|
|
123
|
+
if (value === undefined) {
|
|
124
124
|
throw new Error(`Env var ${envVarNameOrNames} is not set!`);
|
|
125
125
|
}
|
|
126
126
|
return value;
|
|
@@ -132,7 +132,7 @@ export class Qenv {
|
|
|
132
132
|
if (Array.isArray(envVarNameOrNames)) {
|
|
133
133
|
for (const envVarName of envVarNameOrNames) {
|
|
134
134
|
const value = this.tryGetEnvVarSync(envVarName);
|
|
135
|
-
if (value) {
|
|
135
|
+
if (value !== undefined) {
|
|
136
136
|
return value;
|
|
137
137
|
}
|
|
138
138
|
}
|
|
@@ -156,21 +156,37 @@ export class Qenv {
|
|
|
156
156
|
return await envVarRefArg();
|
|
157
157
|
}
|
|
158
158
|
|
|
159
|
-
|
|
160
|
-
this.getFromEnvironmentVariable(envVarRefArg)
|
|
161
|
-
this.getFromEnvYamlOrJsonFile(envVarRefArg)
|
|
162
|
-
this.getFromDockerSecret(envVarRefArg)
|
|
159
|
+
const sources = [
|
|
160
|
+
this.getFromEnvironmentVariable(envVarRefArg),
|
|
161
|
+
this.getFromEnvYamlOrJsonFile(envVarRefArg),
|
|
162
|
+
this.getFromDockerSecret(envVarRefArg),
|
|
163
163
|
this.getFromDockerSecretJson(envVarRefArg)
|
|
164
|
-
|
|
164
|
+
];
|
|
165
|
+
|
|
166
|
+
for (const value of sources) {
|
|
167
|
+
if (value !== undefined) {
|
|
168
|
+
return value;
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
return undefined;
|
|
165
173
|
}
|
|
166
174
|
|
|
167
175
|
private tryGetEnvVarSync(envVarName: string): string | undefined {
|
|
168
|
-
|
|
169
|
-
this.getFromEnvironmentVariable(envVarName)
|
|
170
|
-
this.getFromEnvYamlOrJsonFile(envVarName)
|
|
171
|
-
this.getFromDockerSecret(envVarName)
|
|
176
|
+
const sources = [
|
|
177
|
+
this.getFromEnvironmentVariable(envVarName),
|
|
178
|
+
this.getFromEnvYamlOrJsonFile(envVarName),
|
|
179
|
+
this.getFromDockerSecret(envVarName),
|
|
172
180
|
this.getFromDockerSecretJson(envVarName)
|
|
173
|
-
|
|
181
|
+
];
|
|
182
|
+
|
|
183
|
+
for (const value of sources) {
|
|
184
|
+
if (value !== undefined) {
|
|
185
|
+
return value;
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
return undefined;
|
|
174
190
|
}
|
|
175
191
|
|
|
176
192
|
private getFromEnvironmentVariable(envVarName: string): string | undefined {
|
|
@@ -184,10 +200,13 @@ export class Qenv {
|
|
|
184
200
|
try {
|
|
185
201
|
const envJson = plugins.smartfile.fs.toObjectSync(this.envFilePathAbsolute);
|
|
186
202
|
const value = envJson[envVarName];
|
|
203
|
+
if (value === undefined) {
|
|
204
|
+
return undefined;
|
|
205
|
+
}
|
|
187
206
|
if (typeof value === 'object') {
|
|
188
207
|
return 'base64Object:' + this.encodeBase64(value);
|
|
189
208
|
}
|
|
190
|
-
return value;
|
|
209
|
+
return String(value);
|
|
191
210
|
} catch (error) {
|
|
192
211
|
return undefined;
|
|
193
212
|
}
|
|
@@ -208,10 +227,13 @@ export class Qenv {
|
|
|
208
227
|
if (secret.includes('secret.json')) {
|
|
209
228
|
const secretObject = plugins.smartfile.fs.toObjectSync(`/run/secrets/${secret}`);
|
|
210
229
|
const value = secretObject[envVarName];
|
|
230
|
+
if (value === undefined) {
|
|
231
|
+
continue;
|
|
232
|
+
}
|
|
211
233
|
if (typeof value === 'object') {
|
|
212
234
|
return 'base64Object:' + this.encodeBase64(value);
|
|
213
235
|
}
|
|
214
|
-
return value;
|
|
236
|
+
return String(value);
|
|
215
237
|
}
|
|
216
238
|
}
|
|
217
239
|
}
|