@cenk1cenk2/oclif-common 3.1.0-beta.3 → 3.1.0-beta.6

package/dist/index.js

@@ -661,7 +661,6 @@ var ConfigService = class {
                 },
                 ...extras
               ];
-              this.logger.trace("Added to search for environment variables: %o", variable);
               return variable;
             } else {
               return iter(value, location);
@@ -669,24 +668,28 @@ var ConfigService = class {
           }
         })
       );
-      return data.flatMap((d) => d);
+      return data.flatMap((d) => d).filter(Boolean);
     }, "iter");
     const parsed = await iter(env);
+    this.logger.trace("Environment variable injection: %o", parsed);
+    const cb = /* @__PURE__ */ __name(async (variable, data) => {
+      if (variable.parser) {
+        try {
+          variable = await this.parser.parse(variable.parser, data);
+        } catch (e) {
+          this.logger.trace("Can not parse environment environment variable for config: %s -> %s with %s", variable.key.join("."), variable.env, variable.parser);
+          throw e;
+        }
+      }
+      return import_object_path_immutable.default.update(config, variable.key, () => {
+        this.logger.trace("Overwriting config with environment variable: %s -> %s", variable.key.join("."), variable.env);
+        return variable;
+      });
+    }, "cb");
     await Promise.all(
       parsed.map(async (variable) => {
-        let data = process.env[variable.env];
-        if (!data) {
-          return;
-        }
-        if (variable.parser) {
-          try {
-            data = await this.parser.parse(variable.parser, data);
-          } catch (e) {
-            this.logger.trace("Can not parse environment variable for config: %s -> %s with %s", variable.key.join("."), variable.env, variable.parser);
-            throw e;
-          }
-        }
-        if (variable.key.includes("__element" /* ELEMENT */)) {
+        let data;
+        if (variable.key?.includes("__element" /* ELEMENT */)) {
           const timeout = 6e4;
           const startedAt = Date.now();
           for (let i = 0; i < Infinity; i++) {
@@ -694,24 +697,23 @@ var ConfigService = class {
               throw new Error(`Timed-out in ${timeout}ms while looking for element environment variables.`);
             }
             const clone = JSON.parse(JSON.stringify(variable));
+            clone.env = clone.env.replace("${i}" /* ELEMENT_REPLACER */, i.toString());
             this.logger.trace("Looking for environment variable element: %o", clone);
-            data = process.env[clone.env.replace("${i}" /* ELEMENT_REPLACER */, i.toString())];
+            data = process.env[clone.env];
             if (!data) {
               this.logger.trace("No more variable available: %s -> %d", variable.env, i);
               break;
             }
             clone.key[clone.key.findIndex((value) => value === "__element" /* ELEMENT */)] = i;
-            config = import_object_path_immutable.default.update(config, clone.key, () => {
-              this.logger.trace("Overwriting config with element environment variable: %s -> %s", clone.key.join("."), variable.env);
-              return data;
-            });
+            config = await cb(clone, data);
           }
-        } else {
-          config = import_object_path_immutable.default.update(config, variable.key, () => {
-            this.logger.trace("Overwriting config with environment variable: %s -> %s", variable.key.join("."), variable.env);
-            return data;
-          });
+          return;
+        }
+        data = process.env[variable.env];
+        if (!data) {
+          return;
         }
+        config = await cb(variable, data);
       })
     );
     return config;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cenk1cenk2/oclif-common",
-  "version": "3.1.0-beta.3",
+  "version": "3.1.0-beta.6",
   "description": "Oclif common package for oclif2 projects.",
   "repository": "https://gitlab.kilic.dev/libraries/oclif-tools",
   "author": {