6.0.8

changelog.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 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.0.8",
   "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",

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@push.rocks/qenv',
-  version: '6.0.6',
+  version: '6.0.8',
   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;
       }