binhend 2.3.8 → 2.3.10

package/index.js

@@ -11,7 +11,7 @@ const path = require('path');
 
 //___ Run scripts ___//
 const moduleAlias = require('./packages/module-alias'); // path alias '@' for requiring modules: require('@/any/path') - use jsconfig.json
-moduleAlias.path('@binhend/*', [ path.join(__dirname, './packages') ]); // set path alias '@binhend' for all packages to call each others when 'npm install' in another project
+moduleAlias.path('@binhend/*', [path.join(__dirname, './packages')]); // set path alias '@binhend' for all packages to call each others when 'npm install' in another project
 
 
 //___ Load packages ___//
@@ -30,7 +30,7 @@ const csrf = require('./packages/middlewares/src/csrf');
 const trycatch = require('./packages/middlewares/src/trycatch');
 const { Auth } = require('./packages/middlewares/src/authorize');
 
-const { config, ConfigLoader } = require('./packages/config/src/configuration');
+const { config, ConfigLoader, env } = require('./packages/config');
 
 const CSD = require('./packages/csd/src/csd');
 const CinCSD = require('./packages/csd/src/controller');
@@ -53,7 +53,7 @@ module.exports = {
 
     cors, csrf, trycatch, Auth,
 
-    config, ConfigLoader,
+    env, config, ConfigLoader,
 
     CSD, CinCSD, SinCSD, DinCSD, // only use CSD, others for exposing methods (via IDE auto-suggestion)
 

package/jsconfig.json

@@ -2,7 +2,7 @@
     "compilerOptions": {
         "forceConsistentCasingInFileNames": true,
         "moduleResolution": "node",
-        "target": "ES2017",
+        "target": "ES2022",
         "checkJs": true,
         "allowJs": true,
         "noEmit": true,

package/package.json

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

package/packages/config/index.js

@@ -1,3 +1,4 @@
 module.exports = {
     ...require('./src/configuration'),
+    ...require('./src/process.env')
 };

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

@@ -0,0 +1,45 @@
+
+const path = require('path');
+const { cli } = require('./configuration').ConfigLoader;
+const { String } = require('@binhend/validation');
+const { isString } = require('@binhend/types');
+
+function Options(options = {}) {
+    options = options || {};
+
+    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);
+
+    try {
+        const localConfigs = require(configModuleFilePath);
+
+        for (var key in localConfigs) {
+            const value = localConfigs[key];
+            localConfigs[key] = typeof value === 'string' ? value : JSON.stringify(value);
+        }
+
+        return {
+            ...localConfigs,
+            ...process.env,
+            ...cli()
+        };
+    }
+    catch (error) {
+        throw new Error(`Failed loading config from: ${configModuleFilePath}`, { cause: error });
+    }
+};
+
+module.exports = { env };

package/packages/utils/src/HttpError.js

@@ -1,7 +1,7 @@
 
 class HttpError extends Error {
-    constructor(httpCode, message) {
-        super(message);
+    constructor(httpCode, message, options = {}) {
+        super(message, options);
         this.name = 'HttpError';
         this.httpCode = httpCode;
     }

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);
         }