@push.rocks/qenv 6.0.7 → 6.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/qenv',
|
|
6
|
-
version: '6.0
|
|
6
|
+
version: '6.1.0',
|
|
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=
|
|
@@ -18,6 +18,12 @@ export declare class Qenv {
|
|
|
18
18
|
private loadAvailableEnvVars;
|
|
19
19
|
private checkForMissingEnvVars;
|
|
20
20
|
getEnvVarOnDemand(envVarNameOrNames: TEnvVarRef | TEnvVarRef[]): Promise<string | undefined>;
|
|
21
|
+
/**
|
|
22
|
+
* Like getEnvVarOnDemand, but throws an error if the env var is not set.
|
|
23
|
+
* @param envVarNameOrNames
|
|
24
|
+
* @returns
|
|
25
|
+
*/
|
|
26
|
+
getEnvVarOnDemandStrict(envVarNameOrNames: TEnvVarRef | TEnvVarRef[]): Promise<string>;
|
|
21
27
|
getEnvVarOnDemandSync(envVarNameOrNames: string | string[]): string | undefined;
|
|
22
28
|
getEnvVarOnDemandAsObject(envVarNameOrNames: string | string[]): Promise<any>;
|
|
23
29
|
private tryGetEnvVar;
|
|
@@ -16,14 +16,16 @@ export class Qenv {
|
|
|
16
16
|
initializeFilePaths(qenvFileBasePathArg, envFileBasePathArg) {
|
|
17
17
|
this.qenvFilePathAbsolute = plugins.path.join(plugins.path.resolve(qenvFileBasePathArg), 'qenv.yml');
|
|
18
18
|
if (envFileBasePathArg) {
|
|
19
|
-
const
|
|
20
|
-
const
|
|
21
|
-
const
|
|
19
|
+
const envFileBasePath = plugins.path.resolve(envFileBasePathArg);
|
|
20
|
+
const envFileJsonPath = plugins.path.join(envFileBasePath, 'env.json');
|
|
21
|
+
const envFileYmlPath = plugins.path.join(envFileBasePath, 'env.yml');
|
|
22
|
+
const envFileYamlPath = plugins.path.join(envFileBasePath, 'env.yaml');
|
|
22
23
|
const envFileJsonExists = plugins.smartfile.fs.fileExistsSync(envFileJsonPath);
|
|
23
24
|
const envFileYmlExists = plugins.smartfile.fs.fileExistsSync(envFileYmlPath);
|
|
24
25
|
const envFileYamlExists = plugins.smartfile.fs.fileExistsSync(envFileYamlPath);
|
|
25
|
-
if (envFileJsonExists && (
|
|
26
|
+
if (envFileJsonExists && (envFileYmlExists || envFileYamlExists)) {
|
|
26
27
|
this.logger.log('warn', 'Both env.json and env.yml files exist! Using env.json');
|
|
28
|
+
this.envFilePathAbsolute = envFileJsonPath;
|
|
27
29
|
}
|
|
28
30
|
else if (envFileJsonExists) {
|
|
29
31
|
this.envFilePathAbsolute = envFileJsonPath;
|
|
@@ -84,6 +86,18 @@ export class Qenv {
|
|
|
84
86
|
return await this.tryGetEnvVar(envVarNameOrNames);
|
|
85
87
|
}
|
|
86
88
|
}
|
|
89
|
+
/**
|
|
90
|
+
* Like getEnvVarOnDemand, but throws an error if the env var is not set.
|
|
91
|
+
* @param envVarNameOrNames
|
|
92
|
+
* @returns
|
|
93
|
+
*/
|
|
94
|
+
async getEnvVarOnDemandStrict(envVarNameOrNames) {
|
|
95
|
+
const value = await this.getEnvVarOnDemand(envVarNameOrNames);
|
|
96
|
+
if (!value) {
|
|
97
|
+
throw new Error(`Env var ${envVarNameOrNames} is not set!`);
|
|
98
|
+
}
|
|
99
|
+
return value;
|
|
100
|
+
}
|
|
87
101
|
getEnvVarOnDemandSync(envVarNameOrNames) {
|
|
88
102
|
console.warn('requesting env var sync leaves out potentially important async env sources.');
|
|
89
103
|
if (Array.isArray(envVarNameOrNames)) {
|
|
@@ -173,4 +187,4 @@ export class Qenv {
|
|
|
173
187
|
return JSON.parse(decodedString);
|
|
174
188
|
}
|
|
175
189
|
}
|
|
176
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
190
|
+
//# 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.0
|
|
3
|
+
"version": "6.1.0",
|
|
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",
|
|
@@ -26,18 +26,18 @@
|
|
|
26
26
|
},
|
|
27
27
|
"homepage": "https://code.foss.global/push.rocks/qenv",
|
|
28
28
|
"devDependencies": {
|
|
29
|
-
"@git.zone/tsbuild": "^2.
|
|
30
|
-
"@git.zone/tsrun": "^1.
|
|
31
|
-
"@git.zone/tstest": "^1.0.
|
|
32
|
-
"@push.rocks/tapbundle": "^5.0
|
|
33
|
-
"@types/node": "^
|
|
29
|
+
"@git.zone/tsbuild": "^2.2.0",
|
|
30
|
+
"@git.zone/tsrun": "^1.3.3",
|
|
31
|
+
"@git.zone/tstest": "^1.0.90",
|
|
32
|
+
"@push.rocks/tapbundle": "^5.5.0",
|
|
33
|
+
"@types/node": "^22.9.1"
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"@api.global/typedrequest": "^3.
|
|
36
|
+
"@api.global/typedrequest": "^3.1.10",
|
|
37
37
|
"@configvault.io/interfaces": "^1.0.17",
|
|
38
|
-
"@push.rocks/smartfile": "^11.0.
|
|
39
|
-
"@push.rocks/smartlog": "^3.0.
|
|
40
|
-
"@push.rocks/smartpath": "^5.0.
|
|
38
|
+
"@push.rocks/smartfile": "^11.0.21",
|
|
39
|
+
"@push.rocks/smartlog": "^3.0.7",
|
|
40
|
+
"@push.rocks/smartpath": "^5.0.18"
|
|
41
41
|
},
|
|
42
42
|
"files": [
|
|
43
43
|
"ts/**/*",
|
package/ts/00_commitinfo_data.ts
CHANGED
package/ts/qenv.classes.qenv.ts
CHANGED
|
@@ -32,25 +32,21 @@ export class Qenv {
|
|
|
32
32
|
plugins.path.resolve(qenvFileBasePathArg),
|
|
33
33
|
'qenv.yml'
|
|
34
34
|
);
|
|
35
|
+
|
|
35
36
|
if (envFileBasePathArg) {
|
|
36
|
-
const
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
);
|
|
40
|
-
const
|
|
41
|
-
|
|
42
|
-
'env.yml'
|
|
43
|
-
);
|
|
44
|
-
const envFileYamlPath = this.envFilePathAbsolute = plugins.path.join(
|
|
45
|
-
plugins.path.resolve(envFileBasePathArg),
|
|
46
|
-
'env.yaml'
|
|
47
|
-
);
|
|
37
|
+
const envFileBasePath = plugins.path.resolve(envFileBasePathArg);
|
|
38
|
+
|
|
39
|
+
const envFileJsonPath = plugins.path.join(envFileBasePath, 'env.json');
|
|
40
|
+
const envFileYmlPath = plugins.path.join(envFileBasePath, 'env.yml');
|
|
41
|
+
const envFileYamlPath = plugins.path.join(envFileBasePath, 'env.yaml');
|
|
42
|
+
|
|
48
43
|
const envFileJsonExists = plugins.smartfile.fs.fileExistsSync(envFileJsonPath);
|
|
49
44
|
const envFileYmlExists = plugins.smartfile.fs.fileExistsSync(envFileYmlPath);
|
|
50
45
|
const envFileYamlExists = plugins.smartfile.fs.fileExistsSync(envFileYamlPath);
|
|
51
|
-
|
|
52
|
-
if (envFileJsonExists && (
|
|
46
|
+
|
|
47
|
+
if (envFileJsonExists && (envFileYmlExists || envFileYamlExists)) {
|
|
53
48
|
this.logger.log('warn', 'Both env.json and env.yml files exist! Using env.json');
|
|
49
|
+
this.envFilePathAbsolute = envFileJsonPath;
|
|
54
50
|
} else if (envFileJsonExists) {
|
|
55
51
|
this.envFilePathAbsolute = envFileJsonPath;
|
|
56
52
|
} else if (envFileYmlExists) {
|
|
@@ -115,6 +111,21 @@ export class Qenv {
|
|
|
115
111
|
}
|
|
116
112
|
}
|
|
117
113
|
|
|
114
|
+
/**
|
|
115
|
+
* Like getEnvVarOnDemand, but throws an error if the env var is not set.
|
|
116
|
+
* @param envVarNameOrNames
|
|
117
|
+
* @returns
|
|
118
|
+
*/
|
|
119
|
+
public async getEnvVarOnDemandStrict(
|
|
120
|
+
envVarNameOrNames: TEnvVarRef | TEnvVarRef[]
|
|
121
|
+
): Promise<string> {
|
|
122
|
+
const value = await this.getEnvVarOnDemand(envVarNameOrNames);
|
|
123
|
+
if (!value) {
|
|
124
|
+
throw new Error(`Env var ${envVarNameOrNames} is not set!`);
|
|
125
|
+
}
|
|
126
|
+
return value;
|
|
127
|
+
}
|
|
128
|
+
|
|
118
129
|
public getEnvVarOnDemandSync(envVarNameOrNames: string | string[]): string | undefined {
|
|
119
130
|
console.warn('requesting env var sync leaves out potentially important async env sources.');
|
|
120
131
|
|