@incanta/config 0.1.6 → 0.1.8

package/lib/config-env.js

@@ -7,10 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const child_process_1 = require("child_process");
 const lodash_merge_1 = __importDefault(require("lodash.merge"));
 const index_1 = __importDefault(require("./index"));
-const command = process.argv
-    .slice(2)
-    .map((arg) => `"${arg}"`)
-    .join(" ");
+const command = process.argv.slice(2).join(" ");
 const env = {};
 (0, lodash_merge_1.default)(env, process.env, index_1.default.getConfiguredEnv());
 (0, child_process_1.execSync)(command, {

package/lib/config-env.js.map

@@ -1 +1 @@
-{"version":3,"file":"config-env.js","sourceRoot":"","sources":["../src/config-env.ts"],"names":[],"mappings":";;;;;;AAEA,iDAAyC;AACzC,gEAAiC;AACjC,oDAA6B;AAE7B,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI;KACzB,KAAK,CAAC,CAAC,CAAC;KACR,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,GAAG,GAAG,CAAC;KACxB,IAAI,CAAC,GAAG,CAAC,CAAC;AAEb,MAAM,GAAG,GAAQ,EAAE,CAAC;AAEpB,IAAA,sBAAK,EAAC,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,eAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC;AAEnD,IAAA,wBAAQ,EAAC,OAAO,EAAE;IAChB,GAAG;IACH,KAAK,EAAE,SAAS;CACjB,CAAC,CAAC"}
+{"version":3,"file":"config-env.js","sourceRoot":"","sources":["../src/config-env.ts"],"names":[],"mappings":";;;;;;AAEA,iDAAyC;AACzC,gEAAiC;AACjC,oDAA6B;AAE7B,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAEhD,MAAM,GAAG,GAAQ,EAAE,CAAC;AAEpB,IAAA,sBAAK,EAAC,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,eAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC;AAEnD,IAAA,wBAAQ,EAAC,OAAO,EAAE;IAChB,GAAG;IACH,KAAK,EAAE,SAAS;CACjB,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@incanta/config",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "main": "lib/index.js",
   "exports": {
     ".": "./lib/index.js",

package/src/config-env.ts

@@ -4,10 +4,7 @@ import { execSync } from "child_process";
 import merge from "lodash.merge";
 import config from "./index";
 
-const command = process.argv
-  .slice(2)
-  .map((arg) => `"${arg}"`)
-  .join(" ");
+const command = process.argv.slice(2).join(" ");
 
 const env: any = {};
 

package/src/config.ts

@@ -127,17 +127,48 @@ export class Config {
       obj = obj[part];
     }
 
+    const variableRegex = /\$\{[a-zA-Z\-_0-9.]+\}/g;
+
+    const replaceValue = (value: string): void => {
+      const regexResult = value.matchAll(variableRegex);
+      for (const match of regexResult) {
+        const keyToReplace = match[0].slice(2, match[0].length - 1);
+        const value = this.tryGet<string | number | boolean>(keyToReplace);
+        if (value !== null) {
+          obj = obj.replace(match[0], `${value}`);
+        }
+      }
+    };
+
+    // replace all ${value} with the value from the config
+    if (typeof obj === "string") {
+      replaceValue(obj);
+    } else if (typeof obj === "object") {
+      // walk the object and replace all strings with the value from the config
+      const walkObject = (curObj: any): void => {
+        for (const property of Object.keys(curObj)) {
+          const value = curObj[property];
+          if (typeof value === "string") {
+            replaceValue(value);
+          } else if (typeof value === "object") {
+            walkObject(value);
+          }
+        }
+      };
+
+      walkObject(obj);
+    }
+
     return obj as T;
   }
 
-  public has(key: string): boolean {
+  public tryGet<T>(key: string): T | null {
     try {
-      this.get(key);
+      const value = this.get<T>(key);
+      return value;
     } catch {
-      return false;
+      return null;
     }
-
-    return true;
   }
 
   public set<T>(key: string, value: T): void {