@push.rocks/qenv 7.0.0 → 8.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: '7.0.0',
6
+ version: '8.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=
@@ -1 +1,4 @@
1
1
  export * from './qenv.classes.qenv.js';
2
+ export * from './qenv.classes.invalidqenvfileerror.js';
3
+ export * from './qenv.classes.missingqenvfileerror.js';
4
+ export * from './qenv.classes.missingrequiredenvvarserror.js';
package/dist_ts/index.js CHANGED
@@ -1,2 +1,5 @@
1
1
  export * from './qenv.classes.qenv.js';
2
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLHdCQUF3QixDQUFDIn0=
2
+ export * from './qenv.classes.invalidqenvfileerror.js';
3
+ export * from './qenv.classes.missingqenvfileerror.js';
4
+ export * from './qenv.classes.missingrequiredenvvarserror.js';
5
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLHdCQUF3QixDQUFDO0FBQ3ZDLGNBQWMsd0NBQXdDLENBQUM7QUFDdkQsY0FBYyx3Q0FBd0MsQ0FBQztBQUN2RCxjQUFjLCtDQUErQyxDQUFDIn0=
@@ -0,0 +1,21 @@
1
+ /** which rule of the `required:` list a qenv.yml broke */
2
+ export type TQenvInvalidQenvFileReason = 'requiredNotAnArray' | 'requiredEntryNotAString';
3
+ export interface IQenvInvalidQenvFileErrorOptions {
4
+ qenvFilePathAbsolute: string;
5
+ reason: TQenvInvalidQenvFileReason;
6
+ /** the type name of the offending value, never the value itself */
7
+ invalidValueTypeName: string;
8
+ }
9
+ /**
10
+ * Thrown when qenv.yml declares a `required:` that qenv cannot read as a list of names. Such a
11
+ * declaration silently enforced nothing, which is the same fail-open as a missing qenv.yml.
12
+ * A file without any `required:` key, and one with an empty list, legitimately require nothing
13
+ * and never reach this error.
14
+ */
15
+ export declare class QenvInvalidQenvFileError extends Error {
16
+ readonly code = "QENV_INVALID_QENV_FILE";
17
+ readonly qenvFilePathAbsolute: string;
18
+ readonly reason: TQenvInvalidQenvFileReason;
19
+ readonly invalidValueTypeName: string;
20
+ constructor(optionsArg: IQenvInvalidQenvFileErrorOptions);
21
+ }
@@ -0,0 +1,25 @@
1
+ const reasonDescriptions = {
2
+ requiredNotAnArray: (typeNameArg) => `"required:" is of type ${typeNameArg} instead of a list of environment variable names`,
3
+ requiredEntryNotAString: (typeNameArg) => `"required:" contains an entry of type ${typeNameArg} instead of an environment variable name`,
4
+ };
5
+ /**
6
+ * Thrown when qenv.yml declares a `required:` that qenv cannot read as a list of names. Such a
7
+ * declaration silently enforced nothing, which is the same fail-open as a missing qenv.yml.
8
+ * A file without any `required:` key, and one with an empty list, legitimately require nothing
9
+ * and never reach this error.
10
+ */
11
+ export class QenvInvalidQenvFileError extends Error {
12
+ constructor(optionsArg) {
13
+ super(`The qenv.yml at ${optionsArg.qenvFilePathAbsolute} declares an unreadable requirement: ` +
14
+ `${reasonDescriptions[optionsArg.reason](optionsArg.invalidValueTypeName)}. ` +
15
+ `Write "required:" as a list of environment variable names, or omit it to require nothing.`);
16
+ this.code = 'QENV_INVALID_QENV_FILE';
17
+ this.name = 'QenvInvalidQenvFileError';
18
+ this.qenvFilePathAbsolute = optionsArg.qenvFilePathAbsolute;
19
+ this.reason = optionsArg.reason;
20
+ // only the type is carried and rendered: a malformed qenv.yml can hold a value where a name
21
+ // belongs, and a value may be a secret
22
+ this.invalidValueTypeName = optionsArg.invalidValueTypeName;
23
+ }
24
+ }
25
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicWVudi5jbGFzc2VzLmludmFsaWRxZW52ZmlsZWVycm9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvcWVudi5jbGFzc2VzLmludmFsaWRxZW52ZmlsZWVycm9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVVBLE1BQU0sa0JBQWtCLEdBQXdFO0lBQzlGLGtCQUFrQixFQUFFLENBQUMsV0FBVyxFQUFFLEVBQUUsQ0FDbEMsMEJBQTBCLFdBQVcsa0RBQWtEO0lBQ3pGLHVCQUF1QixFQUFFLENBQUMsV0FBVyxFQUFFLEVBQUUsQ0FDdkMseUNBQXlDLFdBQVcsMENBQTBDO0NBQ2pHLENBQUM7QUFFRjs7Ozs7R0FLRztBQUNILE1BQU0sT0FBTyx3QkFBeUIsU0FBUSxLQUFLO0lBTWpELFlBQVksVUFBNEM7UUFDdEQsS0FBSyxDQUNILG1CQUFtQixVQUFVLENBQUMsb0JBQW9CLHVDQUF1QztZQUN2RixHQUFHLGtCQUFrQixDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQyxVQUFVLENBQUMsb0JBQW9CLENBQUMsSUFBSTtZQUM3RSwyRkFBMkYsQ0FDOUYsQ0FBQztRQVZZLFNBQUksR0FBRyx3QkFBd0IsQ0FBQztRQVc5QyxJQUFJLENBQUMsSUFBSSxHQUFHLDBCQUEwQixDQUFDO1FBQ3ZDLElBQUksQ0FBQyxvQkFBb0IsR0FBRyxVQUFVLENBQUMsb0JBQW9CLENBQUM7UUFDNUQsSUFBSSxDQUFDLE1BQU0sR0FBRyxVQUFVLENBQUMsTUFBTSxDQUFDO1FBQ2hDLDRGQUE0RjtRQUM1Rix1Q0FBdUM7UUFDdkMsSUFBSSxDQUFDLG9CQUFvQixHQUFHLFVBQVUsQ0FBQyxvQkFBb0IsQ0FBQztJQUM5RCxDQUFDO0NBQ0YifQ==
@@ -0,0 +1,16 @@
1
+ export interface IQenvMissingQenvFileErrorOptions {
2
+ qenvFilePathAbsolute: string;
3
+ qenvDir: string;
4
+ }
5
+ /**
6
+ * Thrown when a Qenv that is set to fail on missing variables finds no qenv.yml at all.
7
+ * Without the file there is no `required:` list to enforce, so every check would pass by
8
+ * accident - a deployable that forgot to ship its qenv.yml would look healthy. `code` identifies
9
+ * the refusal even when two copies of qenv end up in one tree, which makes `instanceof` unreliable.
10
+ */
11
+ export declare class QenvMissingQenvFileError extends Error {
12
+ readonly code = "QENV_MISSING_QENV_FILE";
13
+ readonly qenvFilePathAbsolute: string;
14
+ readonly qenvDir: string;
15
+ constructor(optionsArg: IQenvMissingQenvFileErrorOptions);
16
+ }
@@ -0,0 +1,19 @@
1
+ /**
2
+ * Thrown when a Qenv that is set to fail on missing variables finds no qenv.yml at all.
3
+ * Without the file there is no `required:` list to enforce, so every check would pass by
4
+ * accident - a deployable that forgot to ship its qenv.yml would look healthy. `code` identifies
5
+ * the refusal even when two copies of qenv end up in one tree, which makes `instanceof` unreliable.
6
+ */
7
+ export class QenvMissingQenvFileError extends Error {
8
+ constructor(optionsArg) {
9
+ super(`qenv found no qenv.yml at ${optionsArg.qenvFilePathAbsolute}. It was constructed to fail ` +
10
+ `on missing required environment variables, and without qenv.yml there is no "required:" ` +
11
+ `list to enforce, so nothing would be checked. Ship qenv.yml with your deployable, or ` +
12
+ `construct Qenv with failOnMissing set to false.`);
13
+ this.code = 'QENV_MISSING_QENV_FILE';
14
+ this.name = 'QenvMissingQenvFileError';
15
+ this.qenvFilePathAbsolute = optionsArg.qenvFilePathAbsolute;
16
+ this.qenvDir = optionsArg.qenvDir;
17
+ }
18
+ }
19
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicWVudi5jbGFzc2VzLm1pc3NpbmdxZW52ZmlsZWVycm9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvcWVudi5jbGFzc2VzLm1pc3NpbmdxZW52ZmlsZWVycm9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUtBOzs7OztHQUtHO0FBQ0gsTUFBTSxPQUFPLHdCQUF5QixTQUFRLEtBQUs7SUFLakQsWUFBWSxVQUE0QztRQUN0RCxLQUFLLENBQ0gsNkJBQTZCLFVBQVUsQ0FBQyxvQkFBb0IsK0JBQStCO1lBQ3pGLDBGQUEwRjtZQUMxRix1RkFBdUY7WUFDdkYsaURBQWlELENBQ3BELENBQUM7UUFWWSxTQUFJLEdBQUcsd0JBQXdCLENBQUM7UUFXOUMsSUFBSSxDQUFDLElBQUksR0FBRywwQkFBMEIsQ0FBQztRQUN2QyxJQUFJLENBQUMsb0JBQW9CLEdBQUcsVUFBVSxDQUFDLG9CQUFvQixDQUFDO1FBQzVELElBQUksQ0FBQyxPQUFPLEdBQUcsVUFBVSxDQUFDLE9BQU8sQ0FBQztJQUNwQyxDQUFDO0NBQ0YifQ==
@@ -0,0 +1,18 @@
1
+ export interface IQenvMissingRequiredEnvVarsErrorOptions {
2
+ missingEnvVars: string[];
3
+ requiredEnvVars: string[];
4
+ qenvFilePathAbsolute: string;
5
+ }
6
+ /**
7
+ * Thrown when a variable listed under `required:` in qenv.yml is not provided by any source.
8
+ * The names are carried as data so a caller can report or branch on them without parsing the
9
+ * message, and `code` identifies the refusal even when two copies of qenv end up in one tree,
10
+ * which makes `instanceof` unreliable.
11
+ */
12
+ export declare class QenvMissingRequiredEnvVarsError extends Error {
13
+ readonly code = "QENV_MISSING_REQUIRED_ENV_VARS";
14
+ readonly missingEnvVars: string[];
15
+ readonly requiredEnvVars: string[];
16
+ readonly qenvFilePathAbsolute: string;
17
+ constructor(optionsArg: IQenvMissingRequiredEnvVarsErrorOptions);
18
+ }
@@ -0,0 +1,19 @@
1
+ /**
2
+ * Thrown when a variable listed under `required:` in qenv.yml is not provided by any source.
3
+ * The names are carried as data so a caller can report or branch on them without parsing the
4
+ * message, and `code` identifies the refusal even when two copies of qenv end up in one tree,
5
+ * which makes `instanceof` unreliable.
6
+ */
7
+ export class QenvMissingRequiredEnvVarsError extends Error {
8
+ constructor(optionsArg) {
9
+ super(`qenv is missing required environment variables: ${optionsArg.missingEnvVars.join(', ')}. ` +
10
+ `They are listed under "required:" in ${optionsArg.qenvFilePathAbsolute} and were found ` +
11
+ `neither in the process environment, nor in the env file, nor in the Docker secrets.`);
12
+ this.code = 'QENV_MISSING_REQUIRED_ENV_VARS';
13
+ this.name = 'QenvMissingRequiredEnvVarsError';
14
+ this.missingEnvVars = [...optionsArg.missingEnvVars];
15
+ this.requiredEnvVars = [...optionsArg.requiredEnvVars];
16
+ this.qenvFilePathAbsolute = optionsArg.qenvFilePathAbsolute;
17
+ }
18
+ }
19
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicWVudi5jbGFzc2VzLm1pc3NpbmdyZXF1aXJlZGVudnZhcnNlcnJvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3FlbnYuY2xhc3Nlcy5taXNzaW5ncmVxdWlyZWRlbnZ2YXJzZXJyb3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBTUE7Ozs7O0dBS0c7QUFDSCxNQUFNLE9BQU8sK0JBQWdDLFNBQVEsS0FBSztJQU14RCxZQUFZLFVBQW1EO1FBQzdELEtBQUssQ0FDSCxtREFBbUQsVUFBVSxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUk7WUFDekYsd0NBQXdDLFVBQVUsQ0FBQyxvQkFBb0Isa0JBQWtCO1lBQ3pGLHFGQUFxRixDQUN4RixDQUFDO1FBVlksU0FBSSxHQUFHLGdDQUFnQyxDQUFDO1FBV3RELElBQUksQ0FBQyxJQUFJLEdBQUcsaUNBQWlDLENBQUM7UUFDOUMsSUFBSSxDQUFDLGNBQWMsR0FBRyxDQUFDLEdBQUcsVUFBVSxDQUFDLGNBQWMsQ0FBQyxDQUFDO1FBQ3JELElBQUksQ0FBQyxlQUFlLEdBQUcsQ0FBQyxHQUFHLFVBQVUsQ0FBQyxlQUFlLENBQUMsQ0FBQztRQUN2RCxJQUFJLENBQUMsb0JBQW9CLEdBQUcsVUFBVSxDQUFDLG9CQUFvQixDQUFDO0lBQzlELENBQUM7Q0FDRiJ9
@@ -1,32 +1,82 @@
1
1
  import * as plugins from './qenv.plugins.js';
2
+ /**
3
+ * a reference to an environment variable: its name, or an async function that produces the value.
4
+ * The function form is only honoured by the async getters; the synchronous getter accepts names.
5
+ */
2
6
  export type TEnvVarRef = string | (() => Promise<string>);
3
- type TKeyValueObject = Record<string, any>;
7
+ /** the resolved value of every available required env var, always a string */
8
+ export type TEnvVarValueMap = Record<string, string>;
4
9
  export declare class Qenv {
10
+ /** the names listed under `required:` in qenv.yml */
5
11
  requiredEnvVars: string[];
12
+ /** the required names that a source provided */
6
13
  availableEnvVars: string[];
14
+ /** the required names that no source provided */
7
15
  missingEnvVars: string[];
8
- keyValueObject: TKeyValueObject;
16
+ /** the resolved value of every available required name */
17
+ keyValueObject: TEnvVarValueMap;
9
18
  logger: plugins.smartlog.ConsoleLog;
10
19
  qenvFilePathAbsolute: string;
11
20
  envFilePathAbsolute?: string;
21
+ /**
22
+ * Resolves every name listed under `required:` in qenv.yml while constructing.
23
+ * @param qenvFileBasePathArg directory that holds qenv.yml
24
+ * @param envFileBasePathArg directory that holds env.json, env.yml or env.yaml
25
+ * @param failOnMissing throws a QenvMissingRequiredEnvVarsError when a variable listed under
26
+ * `required:` in qenv.yml is not provided by any source, a QenvMissingQenvFileError when there
27
+ * is no qenv.yml to read that list from, and a QenvInvalidQenvFileError when the list cannot be
28
+ * read as names. Pass false to only record the names in `missingEnvVars` and continue.
29
+ * @throws QenvMissingQenvFileError
30
+ * @throws QenvInvalidQenvFileError
31
+ * @throws QenvMissingRequiredEnvVarsError
32
+ */
12
33
  constructor(qenvFileBasePathArg?: string, envFileBasePathArg?: string, failOnMissing?: boolean);
13
34
  private initializeFilePaths;
14
35
  private loadRequiredEnvVars;
36
+ /**
37
+ * Refuses a qenv.yml whose `required:` cannot be read as names: it enforces nothing, which is
38
+ * the fail-open a missing qenv.yml would be. A caller that opted out of failing keeps running,
39
+ * but hears the same named reason instead of losing the requirement silently.
40
+ */
41
+ private refuseInvalidQenvFile;
42
+ /** names the type of a value without rendering it: a value in a name's place may be a secret */
43
+ private describeValueType;
15
44
  private loadAvailableEnvVars;
16
45
  private checkForMissingEnvVars;
46
+ /**
47
+ * Resolves an env var from the process environment, the env file and the Docker secrets, in that
48
+ * order. An array is tried left to right and the first defined value wins.
49
+ * @param envVarNameOrNames a name, an async resolver function, or a list of either
50
+ */
17
51
  getEnvVarOnDemand(envVarNameOrNames: TEnvVarRef | TEnvVarRef[]): Promise<string | undefined>;
18
52
  /**
19
- * Like getEnvVarOnDemand, but throws an error if the env var is not set.
20
- * @param envVarNameOrNames
21
- * @returns
53
+ * Like getEnvVarOnDemand, but throws when no source provides a value.
54
+ * @param envVarNameOrNames a name, an async resolver function, or a list of either
22
55
  */
23
56
  getEnvVarOnDemandStrict(envVarNameOrNames: TEnvVarRef | TEnvVarRef[]): Promise<string>;
57
+ /**
58
+ * The synchronous counterpart of getEnvVarOnDemand. It resolves names only: an async resolver
59
+ * function cannot be awaited here, so the function form of TEnvVarRef is not accepted.
60
+ * @param envVarNameOrNames a name or a list of names
61
+ */
24
62
  getEnvVarOnDemandSync(envVarNameOrNames: string | string[]): string | undefined;
25
- getEnvVarOnDemandAsObject(envVarNameOrNames: string | string[]): Promise<any>;
63
+ /**
64
+ * Resolves an env var whose value was stored as a base64 encoded object and decodes it. A plain
65
+ * value is returned as the string it is, so the caller narrows what it gets.
66
+ * @param envVarNameOrNames a name or a list of names
67
+ */
68
+ getEnvVarOnDemandAsObject(envVarNameOrNames: string | string[]): Promise<unknown>;
26
69
  private tryGetEnvVar;
27
70
  private tryGetEnvVarSync;
71
+ /** renders env var references for an error message, naming a resolver function where it has one */
72
+ private describeEnvVarRefs;
28
73
  private getFromEnvironmentVariable;
29
74
  private getFromEnvYamlOrJsonFile;
75
+ /**
76
+ * the directory Docker mounts secrets into. It is a method so a test can point both secret
77
+ * readers at a directory it is allowed to create; a process can never write /run/secrets itself.
78
+ */
79
+ protected getDockerSecretsDirectoryPath(): string;
30
80
  private getFromDockerSecret;
31
81
  private getFromDockerSecretJson;
32
82
  private encodeBase64;
@@ -35,4 +85,3 @@ export declare class Qenv {
35
85
  private directoryExists;
36
86
  private readObjectFromFile;
37
87
  }
38
- export {};
@@ -1,14 +1,33 @@
1
1
  import * as plugins from './qenv.plugins.js';
2
+ import { QenvInvalidQenvFileError, } from './qenv.classes.invalidqenvfileerror.js';
3
+ import { QenvMissingQenvFileError } from './qenv.classes.missingqenvfileerror.js';
4
+ import { QenvMissingRequiredEnvVarsError } from './qenv.classes.missingrequiredenvvarserror.js';
2
5
  export class Qenv {
6
+ /**
7
+ * Resolves every name listed under `required:` in qenv.yml while constructing.
8
+ * @param qenvFileBasePathArg directory that holds qenv.yml
9
+ * @param envFileBasePathArg directory that holds env.json, env.yml or env.yaml
10
+ * @param failOnMissing throws a QenvMissingRequiredEnvVarsError when a variable listed under
11
+ * `required:` in qenv.yml is not provided by any source, a QenvMissingQenvFileError when there
12
+ * is no qenv.yml to read that list from, and a QenvInvalidQenvFileError when the list cannot be
13
+ * read as names. Pass false to only record the names in `missingEnvVars` and continue.
14
+ * @throws QenvMissingQenvFileError
15
+ * @throws QenvInvalidQenvFileError
16
+ * @throws QenvMissingRequiredEnvVarsError
17
+ */
3
18
  constructor(qenvFileBasePathArg = process.cwd(), envFileBasePathArg, failOnMissing = true) {
19
+ /** the names listed under `required:` in qenv.yml */
4
20
  this.requiredEnvVars = [];
21
+ /** the required names that a source provided */
5
22
  this.availableEnvVars = [];
23
+ /** the required names that no source provided */
6
24
  this.missingEnvVars = [];
25
+ /** the resolved value of every available required name */
7
26
  this.keyValueObject = {};
8
27
  this.logger = new plugins.smartlog.ConsoleLog();
9
28
  this.qenvFilePathAbsolute = '';
10
29
  this.initializeFilePaths(qenvFileBasePathArg, envFileBasePathArg);
11
- this.loadRequiredEnvVars();
30
+ this.loadRequiredEnvVars(failOnMissing);
12
31
  this.loadAvailableEnvVars();
13
32
  this.checkForMissingEnvVars(failOnMissing);
14
33
  }
@@ -37,21 +56,66 @@ export class Qenv {
37
56
  }
38
57
  }
39
58
  }
40
- loadRequiredEnvVars() {
41
- if (this.fileExists(this.qenvFilePathAbsolute)) {
42
- const qenvFile = this.readObjectFromFile(this.qenvFilePathAbsolute);
43
- const requiredEnvVars = qenvFile.required;
44
- if (Array.isArray(requiredEnvVars)) {
45
- this.requiredEnvVars.push(...requiredEnvVars.filter((envVar) => typeof envVar === 'string'));
46
- }
47
- else {
48
- this.logger.log('warn', 'qenv.yml does not contain a "required" Array!');
59
+ loadRequiredEnvVars(failOnMissing) {
60
+ if (!this.fileExists(this.qenvFilePathAbsolute)) {
61
+ if (failOnMissing) {
62
+ // enforcing without the file that declares what to enforce would pass every check by
63
+ // accident: a deployable that forgot to ship qenv.yml must be refused by name, not
64
+ // silently exempted
65
+ throw new QenvMissingQenvFileError({
66
+ qenvFilePathAbsolute: this.qenvFilePathAbsolute,
67
+ qenvDir: plugins.path.dirname(this.qenvFilePathAbsolute),
68
+ });
49
69
  }
70
+ return;
71
+ }
72
+ const qenvFile = this.readObjectFromFile(this.qenvFilePathAbsolute);
73
+ const declaredRequirements = qenvFile['required'];
74
+ if (declaredRequirements === undefined || declaredRequirements === null) {
75
+ // a qenv.yml that lists no requirement legitimately requires nothing
76
+ return;
50
77
  }
78
+ if (!Array.isArray(declaredRequirements)) {
79
+ this.refuseInvalidQenvFile(failOnMissing, 'requiredNotAnArray', declaredRequirements);
80
+ return;
81
+ }
82
+ const declaredEntries = declaredRequirements;
83
+ const invalidEntryIndex = declaredEntries.findIndex((entry) => typeof entry !== 'string');
84
+ if (invalidEntryIndex !== -1) {
85
+ this.refuseInvalidQenvFile(failOnMissing, 'requiredEntryNotAString', declaredEntries[invalidEntryIndex]);
86
+ }
87
+ this.requiredEnvVars.push(...declaredEntries.filter((entry) => typeof entry === 'string'));
88
+ }
89
+ /**
90
+ * Refuses a qenv.yml whose `required:` cannot be read as names: it enforces nothing, which is
91
+ * the fail-open a missing qenv.yml would be. A caller that opted out of failing keeps running,
92
+ * but hears the same named reason instead of losing the requirement silently.
93
+ */
94
+ refuseInvalidQenvFile(failOnMissing, reason, invalidValue) {
95
+ const invalidQenvFileError = new QenvInvalidQenvFileError({
96
+ qenvFilePathAbsolute: this.qenvFilePathAbsolute,
97
+ reason,
98
+ invalidValueTypeName: this.describeValueType(invalidValue),
99
+ });
100
+ if (failOnMissing) {
101
+ throw invalidQenvFileError;
102
+ }
103
+ this.logger.log('warn', invalidQenvFileError.message);
104
+ }
105
+ /** names the type of a value without rendering it: a value in a name's place may be a secret */
106
+ describeValueType(valueArg) {
107
+ if (valueArg === null) {
108
+ return 'null';
109
+ }
110
+ return Array.isArray(valueArg) ? 'array' : typeof valueArg;
51
111
  }
52
112
  loadAvailableEnvVars() {
113
+ // resolved synchronously: a required env var is always a name, and every source a name can come
114
+ // from - process environment, env file, Docker secrets - is a synchronous read. Resolving it
115
+ // here as a promise would store a pending promise instead of a value and make the check below
116
+ // pass for every name.
53
117
  for (const envVar of this.requiredEnvVars) {
54
- const value = this.getEnvVarOnDemand(envVar);
118
+ const value = this.tryGetEnvVarSync(envVar);
55
119
  if (value !== undefined) {
56
120
  this.availableEnvVars.push(envVar);
57
121
  this.keyValueObject[envVar] = value;
@@ -60,18 +124,24 @@ export class Qenv {
60
124
  }
61
125
  checkForMissingEnvVars(failOnMissing) {
62
126
  this.missingEnvVars = this.requiredEnvVars.filter((envVar) => !this.availableEnvVars.includes(envVar));
63
- if (this.missingEnvVars.length > 0) {
64
- console.info('Required Env Vars are:', this.requiredEnvVars);
65
- console.error('Missing Env Vars:', this.missingEnvVars);
66
- if (failOnMissing) {
67
- this.logger.log('error', 'Exiting due to missing env vars!');
68
- process.exit(1);
69
- }
70
- else {
71
- this.logger.log('warn', 'qenv is not set to fail on missing environment variables');
72
- }
127
+ if (this.missingEnvVars.length === 0) {
128
+ return;
129
+ }
130
+ if (failOnMissing) {
131
+ // a library must not end the process: the caller decides what an incomplete environment means
132
+ throw new QenvMissingRequiredEnvVarsError({
133
+ missingEnvVars: this.missingEnvVars,
134
+ requiredEnvVars: this.requiredEnvVars,
135
+ qenvFilePathAbsolute: this.qenvFilePathAbsolute,
136
+ });
73
137
  }
138
+ this.logger.log('warn', `qenv is not set to fail on missing environment variables. Missing: ${this.missingEnvVars.join(', ')}`);
74
139
  }
140
+ /**
141
+ * Resolves an env var from the process environment, the env file and the Docker secrets, in that
142
+ * order. An array is tried left to right and the first defined value wins.
143
+ * @param envVarNameOrNames a name, an async resolver function, or a list of either
144
+ */
75
145
  async getEnvVarOnDemand(envVarNameOrNames) {
76
146
  if (Array.isArray(envVarNameOrNames)) {
77
147
  for (const envVarName of envVarNameOrNames) {
@@ -87,19 +157,22 @@ export class Qenv {
87
157
  }
88
158
  }
89
159
  /**
90
- * Like getEnvVarOnDemand, but throws an error if the env var is not set.
91
- * @param envVarNameOrNames
92
- * @returns
160
+ * Like getEnvVarOnDemand, but throws when no source provides a value.
161
+ * @param envVarNameOrNames a name, an async resolver function, or a list of either
93
162
  */
94
163
  async getEnvVarOnDemandStrict(envVarNameOrNames) {
95
164
  const value = await this.getEnvVarOnDemand(envVarNameOrNames);
96
165
  if (value === undefined) {
97
- throw new Error(`Env var ${envVarNameOrNames} is not set!`);
166
+ throw new Error(`Env var ${this.describeEnvVarRefs(envVarNameOrNames)} is not set!`);
98
167
  }
99
168
  return value;
100
169
  }
170
+ /**
171
+ * The synchronous counterpart of getEnvVarOnDemand. It resolves names only: an async resolver
172
+ * function cannot be awaited here, so the function form of TEnvVarRef is not accepted.
173
+ * @param envVarNameOrNames a name or a list of names
174
+ */
101
175
  getEnvVarOnDemandSync(envVarNameOrNames) {
102
- console.warn('requesting env var sync leaves out potentially important async env sources.');
103
176
  if (Array.isArray(envVarNameOrNames)) {
104
177
  for (const envVarName of envVarNameOrNames) {
105
178
  const value = this.tryGetEnvVarSync(envVarName);
@@ -113,6 +186,11 @@ export class Qenv {
113
186
  return this.tryGetEnvVarSync(envVarNameOrNames);
114
187
  }
115
188
  }
189
+ /**
190
+ * Resolves an env var whose value was stored as a base64 encoded object and decodes it. A plain
191
+ * value is returned as the string it is, so the caller narrows what it gets.
192
+ * @param envVarNameOrNames a name or a list of names
193
+ */
116
194
  async getEnvVarOnDemandAsObject(envVarNameOrNames) {
117
195
  const rawValue = await this.getEnvVarOnDemand(envVarNameOrNames);
118
196
  if (rawValue && rawValue.startsWith('base64Object:')) {
@@ -125,33 +203,36 @@ export class Qenv {
125
203
  if (typeof envVarRefArg === 'function') {
126
204
  return await envVarRefArg();
127
205
  }
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;
206
+ // a name resolves from synchronous sources only, so both getters share one resolution order
207
+ return this.tryGetEnvVarSync(envVarRefArg);
140
208
  }
141
209
  tryGetEnvVarSync(envVarName) {
210
+ // read lazily: a source is only touched once every earlier one came back undefined, so a name
211
+ // the process environment answers never opens a secret file, and a malformed secret.json only
212
+ // ever affects the names that actually reach it
142
213
  const sources = [
143
- this.getFromEnvironmentVariable(envVarName),
144
- this.getFromEnvYamlOrJsonFile(envVarName),
145
- this.getFromDockerSecret(envVarName),
146
- this.getFromDockerSecretJson(envVarName)
214
+ () => this.getFromEnvironmentVariable(envVarName),
215
+ () => this.getFromEnvYamlOrJsonFile(envVarName),
216
+ () => this.getFromDockerSecret(envVarName),
217
+ () => this.getFromDockerSecretJson(envVarName),
147
218
  ];
148
- for (const value of sources) {
219
+ for (const readSource of sources) {
220
+ const value = readSource();
149
221
  if (value !== undefined) {
150
222
  return value;
151
223
  }
152
224
  }
153
225
  return undefined;
154
226
  }
227
+ /** renders env var references for an error message, naming a resolver function where it has one */
228
+ describeEnvVarRefs(envVarNameOrNames) {
229
+ const envVarRefs = Array.isArray(envVarNameOrNames) ? envVarNameOrNames : [envVarNameOrNames];
230
+ return envVarRefs
231
+ .map((envVarRef) => typeof envVarRef === 'function'
232
+ ? `${envVarRef.name || 'anonymous'}()`
233
+ : envVarRef)
234
+ .join(', ');
235
+ }
155
236
  getFromEnvironmentVariable(envVarName) {
156
237
  return process.env[envVarName];
157
238
  }
@@ -174,19 +255,27 @@ export class Qenv {
174
255
  return undefined;
175
256
  }
176
257
  }
258
+ /**
259
+ * the directory Docker mounts secrets into. It is a method so a test can point both secret
260
+ * readers at a directory it is allowed to create; a process can never write /run/secrets itself.
261
+ */
262
+ getDockerSecretsDirectoryPath() {
263
+ return '/run/secrets';
264
+ }
177
265
  getFromDockerSecret(envVarName) {
178
- const secretPath = `/run/secrets/${envVarName}`;
266
+ const secretPath = plugins.path.join(this.getDockerSecretsDirectoryPath(), envVarName);
179
267
  if (this.fileExists(secretPath)) {
180
268
  return plugins.fs.readFileSync(secretPath, 'utf8');
181
269
  }
182
270
  return undefined;
183
271
  }
184
272
  getFromDockerSecretJson(envVarName) {
185
- if (this.directoryExists('/run/secrets')) {
186
- const availableSecrets = plugins.fs.readdirSync('/run/secrets');
273
+ const secretsDirectoryPath = this.getDockerSecretsDirectoryPath();
274
+ if (this.directoryExists(secretsDirectoryPath)) {
275
+ const availableSecrets = plugins.fs.readdirSync(secretsDirectoryPath);
187
276
  for (const secret of availableSecrets) {
188
277
  if (secret.includes('secret.json')) {
189
- const secretObject = this.readObjectFromFile(`/run/secrets/${secret}`);
278
+ const secretObject = this.readObjectFromFile(plugins.path.join(secretsDirectoryPath, secret));
190
279
  const value = secretObject[envVarName];
191
280
  if (value === undefined) {
192
281
  continue;
@@ -227,7 +316,9 @@ export class Qenv {
227
316
  const parsedObject = filePath.endsWith('.json')
228
317
  ? JSON.parse(fileString)
229
318
  : plugins.yaml.parse(fileString);
230
- return typeof parsedObject === 'object' && parsedObject !== null ? parsedObject : {};
319
+ return typeof parsedObject === 'object' && parsedObject !== null
320
+ ? parsedObject
321
+ : {};
231
322
  }
232
323
  }
233
- //# 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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"}
324
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"qenv.classes.qenv.js","sourceRoot":"","sources":["../ts/qenv.classes.qenv.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EACL,wBAAwB,GAEzB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AAClF,OAAO,EAAE,+BAA+B,EAAE,MAAM,+CAA+C,CAAC;AAchG,MAAM,OAAO,IAAI;IAkBf;;;;;;;;;;;OAWG;IACH,YACE,sBAA8B,OAAO,CAAC,GAAG,EAAE,EAC3C,kBAA2B,EAC3B,gBAAyB,IAAI;QAhC/B,qDAAqD;QAC9C,oBAAe,GAAa,EAAE,CAAC;QAEtC,gDAAgD;QACzC,qBAAgB,GAAa,EAAE,CAAC;QAEvC,iDAAiD;QAC1C,mBAAc,GAAa,EAAE,CAAC;QAErC,0DAA0D;QACnD,mBAAc,GAAoB,EAAE,CAAC;QAErC,WAAM,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;QAE3C,yBAAoB,GAAG,EAAE,CAAC;QAoB/B,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,EAAE,kBAAkB,CAAC,CAAC;QAClE,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC;QACxC,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC5B,IAAI,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC;IAC7C,CAAC;IAEO,mBAAmB,CAAC,mBAA2B,EAAE,kBAA2B;QAClF,IAAI,CAAC,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAC3C,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,EACzC,UAAU,CACX,CAAC;QAEF,IAAI,kBAAkB,EAAE,CAAC;YACvB,MAAM,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;YAEjE,MAAM,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;YACvE,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;YACrE,MAAM,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;YAEvE,MAAM,iBAAiB,GAAG,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;YAC3D,MAAM,gBAAgB,GAAG,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;YACzD,MAAM,iBAAiB,GAAG,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;YAE3D,IAAI,iBAAiB,IAAI,CAAC,gBAAgB,IAAI,iBAAiB,CAAC,EAAE,CAAC;gBACjE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,uDAAuD,CAAC,CAAC;gBACjF,IAAI,CAAC,mBAAmB,GAAG,eAAe,CAAC;YAC7C,CAAC;iBAAM,IAAI,iBAAiB,EAAE,CAAC;gBAC7B,IAAI,CAAC,mBAAmB,GAAG,eAAe,CAAC;YAC7C,CAAC;iBAAM,IAAI,gBAAgB,EAAE,CAAC;gBAC5B,IAAI,CAAC,mBAAmB,GAAG,cAAc,CAAC;YAC5C,CAAC;iBAAM,IAAI,iBAAiB,EAAE,CAAC;gBAC7B,IAAI,CAAC,mBAAmB,GAAG,eAAe,CAAC;YAC7C,CAAC;QACH,CAAC;IACH,CAAC;IAEO,mBAAmB,CAAC,aAAsB;QAChD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC;YAChD,IAAI,aAAa,EAAE,CAAC;gBAClB,qFAAqF;gBACrF,mFAAmF;gBACnF,oBAAoB;gBACpB,MAAM,IAAI,wBAAwB,CAAC;oBACjC,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;oBAC/C,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC;iBACzD,CAAC,CAAC;YACL,CAAC;YACD,OAAO;QACT,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACpE,MAAM,oBAAoB,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;QAClD,IAAI,oBAAoB,KAAK,SAAS,IAAI,oBAAoB,KAAK,IAAI,EAAE,CAAC;YACxE,qEAAqE;YACrE,OAAO;QACT,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE,CAAC;YACzC,IAAI,CAAC,qBAAqB,CAAC,aAAa,EAAE,oBAAoB,EAAE,oBAAoB,CAAC,CAAC;YACtF,OAAO;QACT,CAAC;QACD,MAAM,eAAe,GAAc,oBAAoB,CAAC;QACxD,MAAM,iBAAiB,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC;QAC1F,IAAI,iBAAiB,KAAK,CAAC,CAAC,EAAE,CAAC;YAC7B,IAAI,CAAC,qBAAqB,CACxB,aAAa,EACb,yBAAyB,EACzB,eAAe,CAAC,iBAAiB,CAAC,CACnC,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,eAAe,CAAC,IAAI,CACvB,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,KAAK,EAAmB,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CACjF,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACK,qBAAqB,CAC3B,aAAsB,EACtB,MAAkC,EAClC,YAAqB;QAErB,MAAM,oBAAoB,GAAG,IAAI,wBAAwB,CAAC;YACxD,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;YAC/C,MAAM;YACN,oBAAoB,EAAE,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC;SAC3D,CAAC,CAAC;QACH,IAAI,aAAa,EAAE,CAAC;YAClB,MAAM,oBAAoB,CAAC;QAC7B,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC;IACxD,CAAC;IAED,gGAAgG;IACxF,iBAAiB,CAAC,QAAiB;QACzC,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;YACtB,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,OAAO,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,QAAQ,CAAC;IAC7D,CAAC;IAEO,oBAAoB;QAC1B,gGAAgG;QAChG,6FAA6F;QAC7F,8FAA8F;QAC9F,uBAAuB;QACvB,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;YAC5C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACxB,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACnC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC;YACtC,CAAC;QACH,CAAC;IACH,CAAC;IAEO,sBAAsB,CAAC,aAAsB;QACnD,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAC/C,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,CACpD,CAAC;QAEF,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrC,OAAO;QACT,CAAC;QAED,IAAI,aAAa,EAAE,CAAC;YAClB,8FAA8F;YAC9F,MAAM,IAAI,+BAA+B,CAAC;gBACxC,cAAc,EAAE,IAAI,CAAC,cAAc;gBACnC,eAAe,EAAE,IAAI,CAAC,eAAe;gBACrC,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;aAChD,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,MAAM,EACN,sEAAsE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACvG,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,iBAAiB,CAC5B,iBAA4C;QAE5C,IAAI,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACrC,KAAK,MAAM,UAAU,IAAI,iBAAiB,EAAE,CAAC;gBAC3C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;gBAClD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;oBACxB,OAAO,KAAK,CAAC;gBACf,CAAC;YACH,CAAC;YACD,OAAO,SAAS,CAAC;QACnB,CAAC;aAAM,CAAC;YACN,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC;QACpD,CAAC;IACH,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,uBAAuB,CAClC,iBAA4C;QAE5C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;QAC9D,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,WAAW,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;QACvF,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;OAIG;IACI,qBAAqB,CAAC,iBAAoC;QAC/D,IAAI,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACrC,KAAK,MAAM,UAAU,IAAI,iBAAiB,EAAE,CAAC;gBAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;gBAChD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;oBACxB,OAAO,KAAK,CAAC;gBACf,CAAC;YACH,CAAC;YACD,OAAO,SAAS,CAAC;QACnB,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;QAClD,CAAC;IACH,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,yBAAyB,CACpC,iBAAoC;QAEpC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;QACjE,IAAI,QAAQ,IAAI,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;YACrD,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;YACtD,OAAO,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QACvC,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,YAAwB;QACjD,IAAI,OAAO,YAAY,KAAK,UAAU,EAAE,CAAC;YACvC,OAAO,MAAM,YAAY,EAAE,CAAC;QAC9B,CAAC;QAED,4FAA4F;QAC5F,OAAO,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC7C,CAAC;IAEO,gBAAgB,CAAC,UAAkB;QACzC,8FAA8F;QAC9F,8FAA8F;QAC9F,gDAAgD;QAChD,MAAM,OAAO,GAAoC;YAC/C,GAAG,EAAE,CAAC,IAAI,CAAC,0BAA0B,CAAC,UAAU,CAAC;YACjD,GAAG,EAAE,CAAC,IAAI,CAAC,wBAAwB,CAAC,UAAU,CAAC;YAC/C,GAAG,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC;YAC1C,GAAG,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,UAAU,CAAC;SAC/C,CAAC;QAEF,KAAK,MAAM,UAAU,IAAI,OAAO,EAAE,CAAC;YACjC,MAAM,KAAK,GAAG,UAAU,EAAE,CAAC;YAC3B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACxB,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,mGAAmG;IAC3F,kBAAkB,CAAC,iBAA4C;QACrE,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;QAC9F,OAAO,UAAU;aACd,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CACjB,OAAO,SAAS,KAAK,UAAU;YAC7B,CAAC,CAAC,GAAG,SAAS,CAAC,IAAI,IAAI,WAAW,IAAI;YACtC,CAAC,CAAC,SAAS,CACd;aACA,IAAI,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC;IAEO,0BAA0B,CAAC,UAAkB;QACnD,OAAO,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACjC,CAAC;IAEO,wBAAwB,CAAC,UAAkB;QACjD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC;YAC/C,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;YAClE,MAAM,KAAK,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;YAClC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACxB,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBAChD,OAAO,eAAe,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;YACpD,CAAC;YACD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IAED;;;OAGG;IACO,6BAA6B;QACrC,OAAO,cAAc,CAAC;IACxB,CAAC;IAEO,mBAAmB,CAAC,UAAkB;QAC5C,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,6BAA6B,EAAE,EAAE,UAAU,CAAC,CAAC;QACvF,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YAChC,OAAO,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QACrD,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,uBAAuB,CAAC,UAAkB;QAChD,MAAM,oBAAoB,GAAG,IAAI,CAAC,6BAA6B,EAAE,CAAC;QAClE,IAAI,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,EAAE,CAAC;YAC/C,MAAM,gBAAgB,GAAG,OAAO,CAAC,EAAE,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC;YACtE,KAAK,MAAM,MAAM,IAAI,gBAAgB,EAAE,CAAC;gBACtC,IAAI,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;oBACnC,MAAM,YAAY,GAAG,IAAI,CAAC,kBAAkB,CAC1C,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAChD,CAAC;oBACF,MAAM,KAAK,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC;oBACvC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;wBACxB,SAAS;oBACX,CAAC;oBACD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;wBAChD,OAAO,eAAe,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;oBACpD,CAAC;oBACD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;gBACvB,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,YAAY,CAAC,IAAa;QAChC,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACxC,OAAO,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACpD,CAAC;IAEO,YAAY,CAAC,aAAqB;QACxC,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC7E,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IACnC,CAAC;IAEO,UAAU,CAAC,QAA4B;QAC7C,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC;IAEO,eAAe,CAAC,aAAqB;QAC3C,IAAI,CAAC;YACH,OAAO,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,CAAC;QAC1D,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAEO,kBAAkB,CAAC,QAAgB;QACzC,MAAM,UAAU,GAAG,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC7D,MAAM,YAAY,GAAY,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC;YACtD,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC;YACxB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACnC,OAAO,OAAO,YAAY,KAAK,QAAQ,IAAI,YAAY,KAAK,IAAI;YAC9D,CAAC,CAAE,YAAkC;YACrC,CAAC,CAAC,EAAE,CAAC;IACT,CAAC;CACF"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@push.rocks/qenv",
3
- "version": "7.0.0",
3
+ "version": "8.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",
@@ -22,14 +22,14 @@
22
22
  "author": "Task Venture Capital GmbH <hello@task.vc>",
23
23
  "license": "MIT",
24
24
  "bugs": {
25
- "url": "https://gitlab.com/pushrocks/qenv/issues"
25
+ "url": "https://code.foss.global/push.rocks/qenv/issues"
26
26
  },
27
27
  "homepage": "https://code.foss.global/push.rocks/qenv",
28
28
  "devDependencies": {
29
- "@git.zone/tsbuild": "^4.4.3",
29
+ "@git.zone/tsbuild": "^4.5.0",
30
30
  "@git.zone/tsrun": "^2.0.6",
31
- "@git.zone/tstest": "^6.1.0",
32
- "@types/node": "^26.5.0"
31
+ "@git.zone/tstest": "^6.1.1",
32
+ "@types/node": "^26.5.1"
33
33
  },
34
34
  "dependencies": {
35
35
  "@push.rocks/smartlog": "^3.2.2",