6.1.0

changelog.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 2024-11-22 - 6.1.0 - feat(core)
+Added new method getEnvVarOnDemandStrict to throw error for unset env vars
+
+- Introduced getEnvVarOnDemandStrict method in Qenv class for strict retrieval of environment variables.
+- Upgraded various @git.zone and @push.rocks dependencies for improved functionality and security.
+
+## 2024-11-18 - 6.0.8 - fix(Qenv)
+Fix environment file path initialization logic.
+
+- Corrected the logic for setting the environment file paths to prevent overwriting each other.
+
+## 2024-11-18 - 6.0.7 - fix(Qenv)
+Fix file path initialization for environment variable files
+
+- Corrected the logic for determining the absolute path for environment files
+- Added missing initialization for env.yml file paths
+
 ## 2024-11-18 - 6.0.6 - fix(core)
 Improve handling of env.json and env.yml file checks
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@push.rocks/qenv",
-  "version": "6.0.6",
+  "version": "6.1.0",
   "private": false,
   "description": "A module for easily handling environment variables in Node.js projects with support for .yml and .json configuration.",
   "main": "dist_ts/index.js",
@@ -31,18 +31,18 @@
   },
   "homepage": "https://code.foss.global/push.rocks/qenv",
   "devDependencies": {
-    "@git.zone/tsbuild": "^2.1.72",
+    "@git.zone/tsbuild": "^2.2.0",
-    "@git.zone/tsrun": "^1.2.44",
+    "@git.zone/tsrun": "^1.3.3",
-    "@git.zone/tstest": "^1.0.86",
+    "@git.zone/tstest": "^1.0.90",
-    "@push.rocks/tapbundle": "^5.0.15",
+    "@push.rocks/tapbundle": "^5.5.0",
-    "@types/node": "^20.11.17"
+    "@types/node": "^22.9.1"
   },
   "dependencies": {
-    "@api.global/typedrequest": "^3.0.4",
+    "@api.global/typedrequest": "^3.1.10",
     "@configvault.io/interfaces": "^1.0.17",
-    "@push.rocks/smartfile": "^11.0.4",
+    "@push.rocks/smartfile": "^11.0.21",
-    "@push.rocks/smartlog": "^3.0.3",
+    "@push.rocks/smartlog": "^3.0.7",
-    "@push.rocks/smartpath": "^5.0.11"
+    "@push.rocks/smartpath": "^5.0.18"
   },
   "files": [
     "ts/**/*",

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@push.rocks/qenv',
-  version: '6.0.6',
+  version: '6.1.0',
   description: 'A module for easily handling environment variables in Node.js projects with support for .yml and .json configuration.'
 }

ts/qenv.classes.qenv.ts

@@ -32,22 +32,25 @@ export class Qenv {
       plugins.path.resolve(qenvFileBasePathArg),
       'qenv.yml'
     );
+  
     if (envFileBasePathArg) {
-      const envFileJsonPath = this.envFilePathAbsolute = plugins.path.join(
+      const envFileBasePath = plugins.path.resolve(envFileBasePathArg);
-        plugins.path.resolve(envFileBasePathArg),
+  
-        'env.json'
+      const envFileJsonPath = plugins.path.join(envFileBasePath, 'env.json');
-      );
+      const envFileYmlPath = plugins.path.join(envFileBasePath, 'env.yml');
-      const envFileYamlPath = this.envFilePathAbsolute = plugins.path.join(
+      const envFileYamlPath = plugins.path.join(envFileBasePath, 'env.yaml');
-        plugins.path.resolve(envFileBasePathArg),
+  
-        'env.yml'
-      );
       const envFileJsonExists = plugins.smartfile.fs.fileExistsSync(envFileJsonPath);
+      const envFileYmlExists = plugins.smartfile.fs.fileExistsSync(envFileYmlPath);
       const envFileYamlExists = plugins.smartfile.fs.fileExistsSync(envFileYamlPath);
-
+  
-      if (envFileJsonExists && envFileYamlExists) {
+      if (envFileJsonExists && (envFileYmlExists || envFileYamlExists)) {
         this.logger.log('warn', 'Both env.json and env.yml files exist! Using env.json');
+        this.envFilePathAbsolute = envFileJsonPath;
       } else if (envFileJsonExists) {
         this.envFilePathAbsolute = envFileJsonPath;
+      } else if (envFileYmlExists) {
+        this.envFilePathAbsolute = envFileYmlPath;
       } else if (envFileYamlExists) {
         this.envFilePathAbsolute = envFileYamlPath;
       }
@@ -108,6 +111,21 @@ export class Qenv {
     }
   }
 
+  /**
+   * Like getEnvVarOnDemand, but throws an error if the env var is not set.
+   * @param envVarNameOrNames 
+   * @returns 
+   */
+  public async getEnvVarOnDemandStrict(
+    envVarNameOrNames: TEnvVarRef | TEnvVarRef[]
+  ): Promise<string> {
+    const value = await this.getEnvVarOnDemand(envVarNameOrNames);
+    if (!value) {
+      throw new Error(`Env var ${envVarNameOrNames} is not set!`);
+    }
+    return value;
+  }
+
   public getEnvVarOnDemandSync(envVarNameOrNames: string | string[]): string | undefined {
     console.warn('requesting env var sync leaves out potentially important async env sources.');