binhend 2.1.25 → 2.1.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "binhend",
-  "version": "2.1.25",
+  "version": "2.1.26",
   "description": "",
   "main": "index.js",
   "author": "Nguyen Duc Binh",

package/src/configuration.js

@@ -1,6 +1,6 @@
 const fs = require('fs');
 const path = require('path');
-const { isEmptyArray, isArray, isObject, mustString } = require('./utils/types');
+const { isEmptyArray, isArray, isObject, mustString, isNullish } = require('./utils/types');
 
 // @ts-ignore
 function ConfigLoader(configObject, { rootPath } = {}) {
@@ -8,10 +8,6 @@ function ConfigLoader(configObject, { rootPath } = {}) {
 
     rootPath = mustString(rootPath) || require.main.path;
 
-    this.getConfigs = () => {
-        return configs;
-    };
-
     function getConfigPosition(key) {
         return key == undefined ? configs : configs[key] || (configs[key] = {});
     };
@@ -19,12 +15,12 @@ function ConfigLoader(configObject, { rootPath } = {}) {
     // @ts-ignore
     this.object = (object, { key, filter: filters } = {}) => {
         try {
-            var config = getConfigPosition(key);
-            var filtered = isArray(filters) ? filter(object, filters) : object;
+            let config = getConfigPosition(key);
+            let filtered = isArray(filters) ? filter(object, filters) : object;
             Object.assign(config, filtered);
         }
         catch (error) {
-            return failed(error, object);
+            failed(error, object);
         }
 
         return this;
@@ -34,17 +30,34 @@ function ConfigLoader(configObject, { rootPath } = {}) {
         return this.object(cli(), options);
     };
 
-    this.json = (filepath, options) => {
-        var filePath = path.resolve(rootPath, filepath);
-        return this.object(json(filePath), options);
+    this.json = (filepath, options = {}) => {
+        let filePath = path.resolve(rootPath, filepath);
+        let jsonObject = json(filePath);
+
+        if (options.hasOwnProperty('env')) {
+            let env = options.env;
+            for (let key in jsonObject) {
+                let value = jsonObject[key];
+                if (isObject(value) && value.hasOwnProperty(env)) {
+                    // if object has no "env" key, it means the intended value is the whole object => no new assignment
+                    jsonObject[key] = value[env];
+                }
+            }
+        }
+
+        return this.object(jsonObject, options);
     };
 
     this.file = (filepath, options) => {
-        var filePath = path.resolve(rootPath, filepath);
+        let filePath = path.resolve(rootPath, filepath);
         return this.object(file(filePath, options?.encoding), options);
     };
 }
 
+ConfigLoader.cli = cli;
+ConfigLoader.json = json;
+ConfigLoader.file = file;
+
 function filter(object, filterKeys) {
     if (!isObject(object) || isEmptyArray(filterKeys)) return {};