@cenk1cenk2/oclif-common 3.1.0-beta.5 → 3.1.0-beta.8

package/dist/index.d.ts

@@ -112,6 +112,7 @@ interface ConfigIterator {
     key: (string | number)[];
     env: string;
     parser?: string;
+    extensions?: ConfigIterator[];
 }
 
 declare const color: colorette.Colorette;

package/dist/index.js

@@ -647,19 +647,19 @@ var ConfigService = class {
           if (typeof value === "string") {
             return [{ key: location, env: value }];
           } else if (typeof value === "object") {
-            const extras = [];
+            let extensions;
             if ("__element" /* ELEMENT */ in value) {
               this.logger.trace("Expanding location to elements: %s", location);
-              extras.push(await iter(value["__element" /* ELEMENT */], [...location, "__element" /* ELEMENT */]));
+              extensions = await iter(value["__element" /* ELEMENT */], [...location, "__element" /* ELEMENT */]);
             }
             if ("__name" /* NAME */ in value && "__format" /* PARSER */ in value) {
               const variable = [
                 {
                   key: location,
                   env: value["__name" /* NAME */],
-                  parser: value["__format" /* PARSER */]
-                },
-                ...extras
+                  parser: value["__format" /* PARSER */],
+                  extensions
+                }
               ];
               return variable;
             } else {
@@ -668,10 +668,11 @@ var ConfigService = class {
           }
         })
       );
-      return data.flatMap((d) => d);
+      return data.flatMap((d) => d).filter(Boolean);
     }, "iter");
     const parsed = await iter(env);
-    const cb = /* @__PURE__ */ __name(async (variable, data) => {
+    this.logger.trace("Environment variable injection: %o", parsed);
+    const cb = /* @__PURE__ */ __name(async (config2, variable, data) => {
       if (variable.parser) {
         try {
           variable = await this.parser.parse(variable.parser, data);
@@ -680,39 +681,43 @@ var ConfigService = class {
           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;
-      });
+      this.logger.trace("Overwriting config with environment variable: %s -> %s", variable.key.join("."), variable.env);
+      return import_object_path_immutable.default.set(config2, variable.key, variable);
     }, "cb");
     await Promise.all(
       parsed.map(async (variable) => {
         let data;
-        if (variable.key.length && variable.key.includes("__element" /* ELEMENT */)) {
+        data = process.env[variable.env];
+        if (data) {
+          config = await cb(config, variable, data);
+        }
+        if (variable.extensions) {
           const timeout = 6e4;
           const startedAt = Date.now();
           for (let i = 0; i < Infinity; i++) {
             if (Date.now() - startedAt > timeout) {
               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];
-            if (!data) {
-              this.logger.trace("No more variable available: %s -> %d", variable.env, i);
+            const extensions = (await Promise.all(
+              variable.extensions.map(async (extension) => {
+                const clone = JSON.parse(JSON.stringify(extension));
+                clone.env = clone.env.replace("${i}" /* ELEMENT_REPLACER */, i.toString());
+                data = process.env[clone.env];
+                if (!data) {
+                  this.logger.trace("No extension for environment variable: %s -> %d", clone.env, i);
+                  return;
+                }
+                clone.key[clone.key.findIndex((value) => value === "__element" /* ELEMENT */)] = i;
+                return cb({}, clone, data);
+              })
+            )).filter(Boolean);
+            if (extensions.length === 0) {
+              this.logger.trace("No more extensions for environment variables: %s -> %d", variable.key.join("."), i);
               break;
             }
-            clone.key[clone.key.findIndex((value) => value === "__element" /* ELEMENT */)] = i;
-            config = await cb(clone, data);
+            config = this.merge([config, ...extensions]);
           }
-          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.5",
+  "version": "3.1.0-beta.8",
   "description": "Oclif common package for oclif2 projects.",
   "repository": "https://gitlab.kilic.dev/libraries/oclif-tools",
   "author": {