binhend 2.1.24 → 2.1.26

package/package.json

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

package/src/configuration.js

@@ -1,15 +1,12 @@
 const fs = require('fs');
 const path = require('path');
-const { isEmptyArray, isArray, isObject } = require('./utils/types');
+const { isEmptyArray, isArray, isObject, mustString, isNullish } = require('./utils/types');
 
 // @ts-ignore
-function ConfigLoader(configObject, { module } = {}) {
+function ConfigLoader(configObject, { rootPath } = {}) {
     const configs = configObject || {};
-    const rootPath = module?.path || require.main.path;
 
-    this.getConfigs = () => {
-        return configs;
-    };
+    rootPath = mustString(rootPath) || require.main.path;
 
     function getConfigPosition(key) {
         return key == undefined ? configs : configs[key] || (configs[key] = {});
@@ -18,12 +15,12 @@ function ConfigLoader(configObject, { module } = {}) {
     // @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(e) {
-            return failed(e, object);
+        catch (error) {
+            failed(error, object);
         }
 
         return this;
@@ -33,20 +30,37 @@ function ConfigLoader(configObject, { module } = {}) {
         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 {};
-    
+
     var filtered = {};
 
     filterKeys.forEach((field) => {
@@ -62,7 +76,7 @@ function json(path) {
     try {
         return require.main.require(path);
     }
-    catch(e) {
+    catch (e) {
         return failed(e, path);
     }
 }
@@ -82,7 +96,7 @@ function file(path, encoding) {
 
         return processKeyValueStrings(lines);
     }
-    catch(e) {
+    catch (e) {
         return failed(e, path);
     }
 }
@@ -96,7 +110,7 @@ function processKeyValueStrings(strings) {
 
     var regex_is_comment = /^#/;
 
-    strings.forEach(function(string) {
+    strings.forEach(function (string) {
         if (regex_is_comment.test(string.trim())) return;
 
         var parsed = parseKeyValue(string);

package/src/middleware/cors.js

@@ -53,7 +53,8 @@ module.exports = (options) => {
 
         // Handle preflight OPTIONS request
         if (req.method === 'OPTIONS' && !preflightContinue) {
-            return res.sendStatus(mustNumber(optionsSuccessStatus, 204));
+            var statusCode = mustNumber(optionsSuccessStatus) || 204; // 204 - No Content
+            return res.sendStatus(statusCode);
         }
 
         return next();

package/src/web/component.format.js

@@ -30,16 +30,22 @@ function generate(sourceRootPath, outputRootPath, callbackDone) {
                 writeToFileIfNew(fileOutputPath + '.js', cssModuleCode);
                 // not return here, but wait for next "if" statement to be copied to build folder, then return there.
             }
-    
-            if (fileExtension !== '.js' && fileExtension !== '.mjs') {
+
+            if (fileExtension !== '.js' && fileExtension !== '.cjs' && fileExtension !== '.mjs') {
                 // any files not JS (.css, .jpg, etc.) will be copied to build folder.
-                return cloneFileIfNew(fileSourcePath, fileOutputPath);
+                cloneFileIfNew(fileSourcePath, fileOutputPath);
+                return;
             }
 
-            var content = readFileSync(fileSourcePath, { encoding: 'utf8', flag: 'r' });
-            var code = PREFIX_CODE + mapConfigValues(content.trim()) + '\r\n\r\n;binh.final(module);';
+            var fileContent = readFileSync(fileSourcePath, { encoding: 'utf8', flag: 'r' });
+            var formatCode = mapConfigValues(fileContent.trim()); // for .cjs (common js) and .mjs (module js) files, not build code but still bind config values
+
+            if (fileExtension === '.js') {
+                // for .js files, build code and bind config values
+                formatCode = PREFIX_CODE + formatCode + '\r\n\r\n;binh.final(module);';
+            }
 
-            writeToFileIfNew(fileOutputPath, code);
+            writeToFileIfNew(fileOutputPath, formatCode);
         }
         catch (error) {
             printError('Failed formatting file:', fileSourcePath, error);