binhend 2.1.27 → 2.1.29

package/package.json

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

package/src/api/routes.js

@@ -71,9 +71,9 @@ async function buildRoutes(dirPath) {
  * @param {Object} corsOptions - CORS configuration options
  */
 async function loadRoutes(dirPath, corsOptions) {
-    server.use(cors(corsOptions));
+    server().use(cors(corsOptions));
     const router = await buildRoutes(dirPath);
-    server.use(router);
+    server().use(router);
 }
 
 const routes = {

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, isEmptyString } = 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;
     };
@@ -38,18 +30,6 @@ function ConfigLoader(configObject, { rootPath } = {}) {
     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);
     };
 
@@ -78,6 +58,31 @@ function filter(object, filterKeys) {
     return filtered;
 };
 
+function assign(config, filtered, overwrite) {
+    if (overwrite !== false) {
+        Object.assign(config, filtered);
+    }
+    else for (var key in filtered) {
+        if (isNullish(config[key])) {
+            config[key] = filtered[key];
+        }
+    }
+    return config;
+};
+
+function remap(object, use) {
+    if (isEmptyString(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 json(path) {
     try {
         // return require.main.require(path);

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('='));
     });

package/src/web/index.js

@@ -45,8 +45,8 @@ function WebBuilder(source, { output, external } = {}) {
     };
 
     setTimeout(() => {
-        server.use(express.static(web));
-        server.get('/*', (req, res) => res.sendFile('index.html', { root: web }));
+        server().use(express.static(web));
+        server().get('/*', (req, res) => res.sendFile('index.html', { root: web }));
     });
 
     binh.webModulePath = module;