binhend 2.1.13 → 2.1.15

package/demo.js

@@ -0,0 +1,10 @@
+
+const { HttpCodes, ConfigLoader, WebBuilder } = require('./index');
+
+HttpCodes.ACCEPTED;
+
+new ConfigLoader({}).cli;
+
+// const builder = new WebBuilder('src', { output: 'build/bundle' });
+
+// builder.bundle();

package/index.js

@@ -6,4 +6,46 @@
 
 'use strict';
 
-module.exports = require('./src/binh');
+/** SERVER - Backend */
+const { server } = require('./src/server');
+const { ConfigLoader, config } = require('./src/configuration');
+const { HTTPS } = require('./src/https');
+
+const HttpError = require('./src/api/HttpError');
+const HttpCodes = require('./src/api/HttpCodes');
+
+const Router = require('./src/api/Router');
+const { routes, loadRoutes, buildRoutes, mapRoutes } = require('./src/api/routes');
+const trycatch = require('./src/api/trycatch');
+
+const cors = require('./src/middleware/cors');
+
+const createCSD = require('./src/csd');
+const security = require('./src/security');
+const typeOf = require('./src/utils/typeOf');
+const Bromise = require('./src/utils/bromise');
+
+/** CLIENT - Frontend */
+const { WebBuilder } = require('./src/web');
+const { binh } = require('./src/web/component.method');
+
+// Run scripts
+require('./src/supportRequireAliasPath');
+
+module.exports = {
+    server,
+    ConfigLoader, config,
+    HTTPS,
+    HttpError,
+    HttpCodes,
+    Router,
+    routes, buildRoutes, loadRoutes, mapRoutes,
+    trycatch,
+    cors,
+    createCSD,
+    security,
+    typeOf,
+    Bromise,
+    WebBuilder,
+    binh
+};

package/jsconfig.json

@@ -0,0 +1,19 @@
+{
+    "compilerOptions": {
+        "moduleResolution": "node",
+        "target": "ES2017",
+        "checkJs": true,
+        "allowJs": true,
+        "noEmit": true,
+
+        "baseUrl": "./src",
+        "paths": {
+            "@/*": [
+                "./*"
+            ],
+            "@test/*": [
+                "../test/*"
+            ]
+        }
+    }
+}

package/package.json

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

package/src/{utils/httpCodes.js → api/HttpCodes.js}

@@ -1,4 +1,4 @@
-const HttpCodes = {
+module.exports =  {
     CONTINUE: 100,
     SWITCHING_PROTOCOLS: 101,
     PROCESSING: 102,
@@ -63,7 +63,3 @@ const HttpCodes = {
     NOT_EXTENDED: 510,
     NETWORK_AUTHENTICATION_REQUIRED: 511,
 };
-
-module.exports = {
-    HttpCodes
-};

package/src/api/Router.js

@@ -35,6 +35,11 @@ function Router(moduleInstance) {
     return output;
 }
 
+/**
+ * @param {any} router
+ * @param {Function & { isAppliedTryCatch?: boolean }} callback
+ * @returns {Function}
+ */
 function createErrorHandler(router, callback) {
     if (callback.isAppliedTryCatch) return callback;
 

package/src/api/routes.js

@@ -0,0 +1,83 @@
+const { readdir, stat } = require('fs/promises');
+const { join, parse, resolve } = require('path');
+const { isUndefined } = require('../utils/typeOf');
+const { server } = require('../server');
+const cors = require('../middleware/cors');
+const express = require('express');
+const parseBasicAuthToken = require('../middleware/parseBasicAuthToken');
+
+/**
+ * Maps routes recursively from a directory
+ * @param {express.Router} router - Express router
+ * @param {string} dirpath - Directory path to scan
+ */
+async function mapRoutes(router, dirpath) {
+    try {
+        const files = await readdir(dirpath);
+        
+        for (const direntName of files) {
+            const path = join(dirpath, direntName);
+            const route = parse(direntName).name;
+            const stats = await stat(path);
+            let childRouter;
+            
+            if (stats.isFile()) {
+                childRouter = require(path);
+            } else if (stats.isDirectory()) {
+                childRouter = express.Router();
+                await mapRoutes(childRouter, path);
+            }
+            
+            router.use(`/${route}`, childRouter);
+            console.log('[BINHEND] Mapping routes from:', path);
+        }
+    } catch (error) {
+        console.error(`[BINHEND] Error in mapping routes for directory: ${dirpath}`, error);
+        throw error;
+    }
+}
+
+/**
+ * Loads router with routes from the specified directory
+ * @param {string} dirPath - Directory path to load routes from
+ * @returns {Promise<express.Router>} router - Configured Express router
+ */
+async function buildRoutes(dirPath) {
+    if (isUndefined(dirPath)) {
+        console.error(`[BINHEND] Error missing directory path: ${dirPath}.\n`);
+        throw new Error('Require directory path to load routes.');
+    }
+    
+    const router = express.Router();
+    router.use(express.urlencoded({ extended: false }));
+    router.use(express.json());
+    router.use(parseBasicAuthToken);
+    
+    try {
+        await mapRoutes(router, resolve(dirPath));
+    } catch (error) {
+        console.error(`[BINHEND] Error mapping routes from: ${resolve(dirPath)}.\n` + error);
+        throw error;
+    }
+    
+    return router;
+}
+
+/**
+ * Loads routes into the server with CORS options
+ * @param {string} dirPath - Directory path to load routes from
+ * @param {Object} corsOptions - CORS configuration options
+ */
+async function loadRoutes(dirPath, corsOptions) {
+    server.use(cors(corsOptions));
+    const router = await buildRoutes(dirPath);
+    server.use(router);
+}
+
+const routes = {
+    load: loadRoutes,
+    build: buildRoutes,
+    map: mapRoutes
+};
+
+module.exports = { routes, loadRoutes, buildRoutes, mapRoutes };

package/src/configuration.js

@@ -2,7 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const { isEmptyArray, isArray, isObject } = require('./utils/typeOf');
 
-
+// @ts-ignore
 function ConfigLoader(configObject, { module } = {}) {
     const configs = configObject || {};
     const rootPath = module?.path || require.main.path;
@@ -15,6 +15,7 @@ function ConfigLoader(configObject, { module } = {}) {
         return key == undefined ? configs : configs[key] || (configs[key] = {});
     };
 
+    // @ts-ignore
     this.object = (object, { key, filter: filters } = {}) => {
         try {
             var config = getConfigPosition(key);
@@ -74,7 +75,9 @@ function file(path, 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');
 
         return processKeyValueStrings(lines);

package/src/csd/controller.js

@@ -1,6 +1,9 @@
-const { trycatch, HttpError } = require('../api');
+
 const { isEmptyObject, isString } = require('../utils/typeOf');
-const { OK, CREATED, BAD_REQUEST } = require('../utils/httpCodes').HttpCodes;
+const trycatch = require('../api/trycatch');
+const HttpError = require('../api/HttpError');
+
+const { OK, CREATED, BAD_REQUEST } = require('../api/HttpCodes');
 
 const
 ERROR_MISSING_ID = 'Missing required parameter: id',

package/src/https.js

@@ -1,3 +1,4 @@
+// @ts-nocheck
 
 const https = require('https');
 

package/src/{cors.js → middleware/cors.js}

@@ -1,5 +1,5 @@
 
-const { isArray, mustArray, mustNumber } = require('./utils/typeOf');
+const { isArray, mustArray, mustNumber } = require('../utils/typeOf');
 
 const defaultOptions = {
     origins: [],

package/src/security.js

@@ -1,3 +1,4 @@
+// @ts-nocheck
 
 const crypto = require('crypto');
 const algorithm = 'aes-256-cbc';

package/src/{alias.js → supportRequireAliasPath.js}

@@ -1,3 +1,4 @@
+// @ts-nocheck
 
 const path = require('path');
 const DefaultModule = require('module');
@@ -37,7 +38,6 @@ for (const alias in paths) {
 const originalResolveFilename = Module._resolveFilename;
 
 Module._resolveFilename = function (request, parent, isMain, options) {
-    // console.log(request, parent, isMain, options);
     for (const alias in aliasMap) {
         if (!request.startsWith(alias)) continue;
         // Loop through the array of resolved paths for this alias

package/src/utils/bromise.js

@@ -2,19 +2,17 @@
 function Bromise() {
     var resolve, reject, promise = new Promise((res, rej) => (resolve = res) && (reject = rej));
 
-    return {
-        promise,
-        resolve: (value) => {
-            resolve(value);
-            return promise;
-        },
-        reject: (error) => {
-            reject(error);
-            return promise;
-        }
+    this.promise = promise;
+
+    this.resolve = (value) => {
+        resolve(value);
+        return promise;
+    };
+
+    this.reject = (error) => {
+        reject(error);
+        return promise;
     };
 }
 
-module.exports = {
-    Bromise
-};
+module.exports = Bromise;

package/src/utils/typeOf.js

@@ -69,7 +69,7 @@ function isNullOrUndefined(input) {
     return isNull(input) || isUndefined(input);
 }
 
-module.exports = Object.assign(typeOf, {
+module.exports = {
     typeOf,
     isObject,
     isEmptyObject,
@@ -88,4 +88,4 @@ module.exports = Object.assign(typeOf, {
     mustString,
     isSymbol,
     isBigInt
-});
+};

package/src/web/code.js

@@ -66,7 +66,7 @@ function getDependencyDelaration(component) {
     var declarationCode = codes.join(',');
 
     codes = [];
-    codes.push(`var Binh = _Binh;`);
+    codes.push(`var Binh = _Binh, require = Binh.r;`);
 
     if (declarationCode) {
         codes.push(`var${declarationCode};`);

package/src/web/component.build.js

@@ -1,3 +1,4 @@
+// @ts-nocheck
 
 const path = require('path');
 const { scanNestedFiles, cloneFileIfNew, writeToFileIfNew, makeFullDirPath } = require('./component.file');

package/src/web/component.file.js

@@ -1,3 +1,4 @@
+// @ts-nocheck
 
 const { readdir, statSync, existsSync, copyFile, writeFile, writeFileSync, readFileSync, mkdirSync, rm } = require('fs');
 const { join, dirname } = require('path');

package/src/web/component.format.js

@@ -7,7 +7,7 @@ const PREFIX_CODE =
 `var { context, tag, svg, script, require, css } = binh.context(module, require);
 var Binh = binh.Binh;
 binh.component(context, ui, service, style);
-var ui = null, service = null, style = null;\r\n\r\n`;
+var ui = ui || null, service = service || null, style = style || null;\r\n\r\n`;
 
 function generate(sourceRootPath, outputRootPath, callbackDone) {
     if (sourceRootPath == undefined || outputRootPath == undefined) return;

package/src/web/component.js

@@ -1,3 +1,4 @@
+// @ts-nocheck
 
 const { readdir, statSync, writeFile, existsSync, mkdirSync, copyFile, readFileSync } = require('fs');
 const { join, dirname, parse } = require('path');

package/src/web/component.method.js

@@ -1,3 +1,4 @@
+// @ts-nocheck
 
 const path = require('path');
 const fs = require('fs');
@@ -74,6 +75,7 @@ binh.component = function (context, ui, service, style) {
 
     var module = context.module;
     module.exports = component;
+    module.exportss = component;
 
     component.module = module;
     component.constructor = Component;
@@ -93,7 +95,8 @@ binh.component = function (context, ui, service, style) {
 };
 
 binh.final = function (module) {
-    var component = module.exports;
+    var component = module.exportss || {};
+    module.exports = component;
 
     component.eachChild && component.eachChild(childComponent => {
         if (childComponent.alias?.[component.filename]) {
@@ -125,7 +128,9 @@ binh.css = function (module, cssFilename) {
     binh.final(module);
 };
 
-binh.Binh = function () { }; // dummy Binh object for binhjs => build web not logging error of undefined
+/** Dummy Binh object for binhjs => build web not logging error of undefined */
+binh.Binh = function () { };
+binh.Binh.Util = { require: function () {} };
 
 function alias(name) {
     if (!isString(name)) return this;

package/src/web/index.js

@@ -1,3 +1,4 @@
+// @ts-nocheck
 
 const path = require('path');
 const { isEmptyString, isString, mustString } = require('../utils/typeOf');

package/bin/templates/component/UI.js

@@ -1,8 +0,0 @@
-
-tag('div');
-
-function ui() {
-    var content = div({ class: 'new-ui' });
-
-    return content;
-}

package/bin/templates/component/ui/Component.js

@@ -1,26 +0,0 @@
-
-require('./UI');
-require('./Service');
-
-css(
-    require('./Style.css')
-);
-
-function ui() {
-    Service(); // initialize service instance (singleton)
-
-    var component = UI(),
-    handleStateChanged = component.action('handleStateChanged'),
-    makeRequest = Service.instant('makeRequest');
-
-    component.listen('stateId', function(data) {
-        // ... transform data if need
-        handleStateChanged(data);
-    })
-    .when('request', function(data) {
-        // ... transform data if need
-        makeRequest(data);
-    });
-
-    return component;
-}

package/bin/templates/component/ui/Service.js

@@ -1,7 +0,0 @@
-
-function service({ state, http, sid, define, _this }) {
-    this.makeRequest = function(data) {
-        // use data to handle logic, call API, or change state
-        console.log('Service received data from UI:', data);
-    }
-}

package/bin/templates/component/ui/Style.css

@@ -1,3 +0,0 @@
-.new-ui {
-    color: red;
-}

package/bin/templates/component/ui/UI.js

@@ -1,17 +0,0 @@
-
-tag('div');
-
-function ui() {
-    var newUI = div({ class: 'new-ui' }),
-    requestService = newUI.action('request');
-
-    newUI.when('handleStateChanged', function(data) {
-        // use data to handle logic, e.g. render UI
-        console.log('UI received state data:', data);
-    })
-    .on('click', function(event) {
-        requestService(event.currentTarget.innerText);
-    });
-
-    return newUI('New UI');
-}

package/src/api/index.js

@@ -1,9 +0,0 @@
-
-const { loadRouter, loadRoutes, mapRoutes } = require('./loader');
-const HttpError = require('./HttpError');
-const Router = require('./Router');
-const trycatch = require('./trycatch');
-
-module.exports = {
-    loadRouter, loadRoutes, mapRoutes, trycatch, Router, HttpError
-};

package/src/api/loader.js

@@ -1,59 +0,0 @@
-const { readdirSync, statSync } = require('fs');
-const { join, parse, resolve } = require('path');
-const { isUndefined } = require('../utils/typeOf');
-const { server } = require('../server');
-const cors = require('../cors');
-const express = require('express');
-const parseBasicAuthToken = require('../middleware/parseBasicAuthToken');
-
-
-function mapRoutes(router, dirpath) {
-    readdirSync(dirpath).forEach(function(direntName) {
-        var path = join(dirpath, direntName),
-            route = parse(direntName).name;
-
-        var stat = statSync(path);
-        var childRouter;
-        
-        if (stat.isFile()) {
-            childRouter = require(path);
-        }
-        else if (stat.isDirectory()) {
-            childRouter = express.Router();
-            mapRoutes(childRouter, path);
-        }
-
-        router.use(`/${route}`, childRouter);
-        console.log('[BINHEND] Mapping routes from:', path);
-    });
-}
-
-function loadRouter(dirPath) {
-    if (isUndefined(dirPath)) {
-        console.error(`[BINHEND] Error missing directory path: ${dirPath}.\n`);
-        throw new Error('Require directory path to load routes.');
-    }
-
-    const router = express.Router();
-    router.use(express.urlencoded({ extended: false }));
-    router.use(express.json());
-    router.use(parseBasicAuthToken);
-
-    try {
-        mapRoutes(router, resolve(dirPath));
-    }
-    catch (error) {
-        console.error(`[BINHEND] Error mapping routes from: ${resolve(dirPath)}.\n` + error);
-        throw error;
-    }
-
-    return router;
-}
-
-function loadRoutes(dirPath, corsOptions) {
-    server.use(cors(corsOptions));
-    const router = loadRouter(dirPath);
-    server.use(router);
-}
-
-module.exports = { loadRouter, loadRoutes, mapRoutes };

package/src/binh.js

@@ -1,29 +0,0 @@
-
-const typeOf = require('./utils/typeOf');
-const security = require('./security');
-const createCSD = require('./csd');
-const cors = require('./cors');
-const { server } = require('./server');
-const { loadRouter, loadRoutes, mapRoutes, trycatch, Router, HttpError } = require('./api');
-const { ConfigLoader, config } = require('./configuration');
-const { WebBuilder } = require('./web');
-const { binh } = require('./web/component.method');
-const { HttpCodes } = require('./utils/httpCodes');
-const { HTTPS } = require('./https');
-
-// Run scripts
-require('./alias');
-
-module.exports = {
-    typeOf,
-    security,
-    createCSD,
-    cors,
-    server,
-    loadRouter, loadRoutes, mapRoutes, trycatch, Router, HttpError,
-    ConfigLoader, config,
-    WebBuilder,
-    binh,
-    HttpCodes,
-    HTTPS
-};