binhend 2.1.28 → 2.1.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "binhend",
-  "version": "2.1.28",
+  "version": "2.1.30",
   "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, isNullish } = require('./utils/types');
+const { isEmptyArray, isArray, isObject, mustString, isNullish, isString } = require('./utils/types');
 
 // @ts-ignore
 function ConfigLoader(configObject, { rootPath } = {}) {
@@ -13,20 +13,12 @@ function ConfigLoader(configObject, { rootPath } = {}) {
     };
 
     // @ts-ignore
-    this.object = (object, { key, filter: filters, overwrite } = {}) => {
+    this.object = (object, { key, filter: filters, overwrite, use } = {}) => {
         let config = getConfigPosition(key);
         let filtered = isArray(filters) ? filter(object, filters) : object;
 
-        if (overwrite === false) {
-            for (let key in filtered) {
-                if (isNullish(config[key])) {
-                    config[key] = filtered[key];
-                }
-            }
-        }
-        else {
-            Object.assign(config, filtered);
-        }
+        remap(object, use);
+        assign(config, filtered, overwrite);
 
         return this;
     };
@@ -35,24 +27,6 @@ function ConfigLoader(configObject, { rootPath } = {}) {
         return this.object(cli(), 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) => {
         let filePath = path.resolve(rootPath, filepath);
         return this.object(file(filePath, options?.encoding), options);
@@ -60,7 +34,6 @@ function ConfigLoader(configObject, { rootPath } = {}) {
 }
 
 ConfigLoader.cli = cli;
-ConfigLoader.json = json;
 ConfigLoader.file = file;
 ConfigLoader.require = require.main.require;
 
@@ -78,33 +51,60 @@ function filter(object, filterKeys) {
     return filtered;
 };
 
-function json(path) {
-    try {
-        // return require.main.require(path);
-        return ConfigLoader.require(path);
+function assign(config, filtered, overwrite) {
+    if (overwrite !== false) {
+        Object.assign(config, filtered);
     }
-    catch (e) {
-        return failed(e, path);
+    else for (var key in filtered) {
+        if (isNullish(config[key])) {
+            config[key] = filtered[key];
+        }
     }
-}
+    return config;
+};
+
+function remap(object, use) {
+    if (!isString(use)) return object;
+
+    for (var key in object) {
+        const value = object[key];
+        const hasValue = isObject(value) && value.hasOwnProperty(use);
+        if (hasValue) object[key] = value[use];
+        // else if value is not an object or has no "env" key, then the desired value is itself => no new assignment
+    }
+
+    return object;
+};
 
 function cli() {
     return processKeyValueStrings(process.argv);
 }
 
-function file(path, encoding) {
+function file(filepath, encoding) {
     encoding = encoding || 'utf8';
+
     try {
-        var source = fs.readFileSync(path, { encoding });
-        // @ts-ignore
-        source = source.replace(/\r\n?/mg, '\n');
-        // @ts-ignore
-        var lines = source.split('\n');
+        var fileExtension = path.parse(filepath).ext;
 
-        return processKeyValueStrings(lines);
+        switch (fileExtension) {
+            case '.js':
+            case '.json':
+                return ConfigLoader.require(filepath);
+
+            default:
+                var source = fs.readFileSync(filepath, { encoding });
+                // @ts-ignore
+                source = source.replace(/\r\n?/mg, '\n');
+                // @ts-ignore
+                var lines = source.split('\n');
+
+                return processKeyValueStrings(lines);
+        }
     }
-    catch (e) {
-        return failed(e, path);
+    catch (error) {
+        console.log(`[BINHEND] Failed loading config from: ${filepath}`);
+        console.log('[BINHEND] Details:', error);
+        return {};
     }
 }
 
@@ -141,10 +141,4 @@ function parseKeyValue(string) {
     return { key, value, success: true };
 }
 
-function failed(error, source) {
-    console.log(`[BINHEND] Failed loading config from: ${source}`);
-    console.log('[BINHEND] Details:', error);
-    return {};
-};
-
 module.exports = { ConfigLoader, config: {} };

package/src/middleware/parseCookies.js

@@ -3,7 +3,7 @@ module.exports = (request, response, next) => {
     const header = request.headers.cookie;
     const cookies = {};
 
-    header.split(';').forEach(cookie => {
+    if (header) header.split(';').forEach(cookie => {
         const [key, ...val] = cookie.trim().split('=');
         cookies[key] = decodeURIComponent(val.join('='));
     });