@cenk1cenk2/oclif-common 3.0.2 → 3.1.0-beta.1

package/dist/index.d.ts

@@ -204,7 +204,7 @@ declare class ConfigService implements GlobalConfig {
     constructor(oclif: Command['config'], command: Command['ctor'], config: Omit<GlobalConfig, 'isVerbose' | 'isDebug' | 'isSilent'>);
     read<T extends LockableData = LockableData>(path: string): Promise<T>;
     extend<T extends LockableData = LockableData>(paths: string[], strategy?: MergeStrategy): Promise<T>;
-    merge<T extends LockableData = LockableData>(configs: Partial<T>[], strategy?: MergeStrategy): Promise<T>;
+    merge<T extends LockableData = LockableData>(configs: Partial<T>[], strategy?: MergeStrategy): T;
     env<T extends LockableData = LockableData>(definition: string, config: T): Promise<T>;
     write<T extends LockableData = LockableData>(path: string, data: T): Promise<void>;
     private recalculate;

package/dist/index.js

@@ -626,13 +626,12 @@ var ConfigService = class {
           return config;
         } catch (e) {
           this.logger.trace("Failed to extend config from: %s", e.message);
-          return {};
         }
       })
     )).filter(Boolean);
     return this.merge(configs, strategy);
   }
-  async merge(configs, strategy = "OVERWRITE" /* OVERWRITE */) {
+  merge(configs, strategy = "OVERWRITE" /* OVERWRITE */) {
     if (configs.length === 0) {
       throw new Error("Nothing to merge, configuration files are empty.");
     }
@@ -648,13 +647,18 @@ var ConfigService = class {
           if (typeof value === "string") {
             return [{ key: location, env: value }];
           } else if (typeof value === "object") {
-            if ("__name" in value && "__format" in value) {
+            const extras = [];
+            if ("__element" /* ELEMENT */ in value) {
+              extras.push(await iter(value, [...location, "__element" /* ELEMENT */]));
+            }
+            if ("__name" /* NAME */ in value && "__format" /* PARSER */ in value) {
               return [
                 {
                   key: location,
-                  env: value.__name,
-                  parser: value.__format
-                }
+                  env: value["__name" /* NAME */],
+                  parser: value["__format" /* PARSER */]
+                },
+                ...extras
               ];
             } else {
               return iter(value, location);
@@ -679,10 +683,31 @@ var ConfigService = class {
             throw e;
           }
         }
-        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;
-        });
+        if (variable.key.includes("__element" /* ELEMENT */)) {
+          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.`);
+            }
+            data = process.env[variable.env.replace("${i}", i.toString())];
+            if (!data) {
+              this.logger.trace("No more variable available: %s -> %d", variable.env, i);
+              break;
+            }
+            const clone = JSON.parse(JSON.stringify(variable.key));
+            clone[clone.findIndex("__element" /* ELEMENT */)] = i;
+            config = import_object_path_immutable.default.update(config, clone, () => {
+              this.logger.trace("Overwriting config with element environment variable: %s -> %s", clone.join("."), variable.env);
+              return 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 config;

package/package.json

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