binhend 2.3.9 → 2.3.11

package/package.json

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

package/packages/config/src/process.env.js

@@ -2,31 +2,45 @@
 const path = require('path');
 const { cli } = require('./configuration').ConfigLoader;
 const { String } = require('@binhend/validation');
+const { isString } = require('@binhend/types');
 
-function env(env = String(), rootPath = String()) {
-    rootPath = String(rootPath, { default: require.main.path });
+function Options(options = {}) {
+    options = options || {};
 
-    const envExtension = typeof env === 'string' ? `.${env}` : '';
-    const configModuleFileName = `./env${envExtension}`;
-    const configModuleFilePath = path.resolve(rootPath, configModuleFileName);
+    return {
+        cli: String(options.cli), // implicitly indicate env extension via a key in CLI configs
+        ext: String(options.ext), // explicitly declare env extension, lower priority
+        path: String(options.path, { default: require.main.path }), // root path where config module file located
+    };
+}
+
+function env(options = Options()) {
+    options = options || Options();
+
+    const cliConfigs = cli();
+    const env = isString(options.cli) && cliConfigs.hasOwnProperty(options.cli) ? cliConfigs[options.cli] : options.ext;
+    const envExtension = String(env, { default: undefined }) ? `.${env}` : '';
+    const configModuleFileName = `./env${envExtension}.js`;
+    const configModuleFilePath = path.resolve(options.path, configModuleFileName);
+    const localConfigs = {};
 
     try {
-        const localConfigs = require(configModuleFilePath);
+        const fileConfigs = require(configModuleFilePath);
 
-        for (var key in localConfigs) {
-            const value = localConfigs[key];
+        for (var key in fileConfigs) {
+            const value = fileConfigs[key];
             localConfigs[key] = typeof value === 'string' ? value : JSON.stringify(value);
         }
-
-        return {
-            ...localConfigs,
-            ...process.env,
-            ...cli()
-        };
     }
     catch (error) {
-        throw new Error(`[BINHEND][CONFIG] Failed loading config from: ${configModuleFilePath}`, { cause: error });
+        console.log(`[BINHEND][CONFIG] No config file: ${configModuleFilePath}`);
     }
+
+    return {
+        ...localConfigs,
+        ...process.env,
+        ...cli()
+    };
 };
 
 module.exports = { env };

package/packages/web/src/WebBuild.js

@@ -3,6 +3,7 @@ const path = require('path');
 const express = require('express');
 
 const { server } = require('@binhend/core');
+const { config } = require('@binhend/config');
 const { isEmptyString, isString } = require('@binhend/types');
 const must = require('@binhend/validation');
 const moduleAlias = require('@binhend/module-alias');
@@ -57,6 +58,11 @@ function WebBuild(source, { output, external } = {}) {
         return this;
     };
 
+    this.bind = (localConfigs = {}) => {
+        Object.assign(config, localConfigs);
+        return this;
+    };
+
     setTimeout(() => {
         server().use(express.static(web));
         server().get('/*', (req, res) => res.sendFile('index.html', { root: web }));

package/packages/web/src/component.build.js

@@ -40,6 +40,7 @@ function processEachFile({ source: sourceRootPath, web: outputRootPath, module:
             var component = require(fileStagePath);
         }
         catch (error) {
+            console.error('[BINHEND][WEB-BUILD] Failed web component:', fileStagePath);
             console.error('[BINHEND][WEB-BUILD]', error);
             return cloneFileIfNew(fileSourcePath, fileOutputPath);
         }