binhend 2.0.4 → 2.0.6

package/package.json

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

package/src/web/component.method.js

@@ -1,7 +1,9 @@
 
 const path = require('path');
-const { isString } = require('../utils/typeOf');
+const fs = require('fs');
+const UglifyCSS = require('uglifycss');
 const Component = require('./component');
+const { isString } = require('../utils/typeOf');
 
 const binh = {};
 

package/src/web/index.js

@@ -3,7 +3,9 @@ const path = require('path');
 const { isEmptyString, isString } = require('../utils/typeOf');
 const ComponentFormat = require('./component.format');
 const ComponentBuild = require('./component.build');
+const Component = require('./component');
 const { server } = require('../server');
+const express = require('express');
 
 function WebBuilder(source, { output } = {}) {
 

package/src/web/binh.web.builder.js

@@ -1,216 +0,0 @@
-
-const path = require('path');
-const fs = require('fs');
-
-const Component = require('./component');
-const ComponentFormat = require('./component.format');
-const ComponentBuild = require('./component.build');
-
-const UglifyCSS = require('uglifycss');
-
-function WebBuilder(binh, Binh) {
-    binh.context = function(module, defaultRequire) {
-        var context = { module, require: defaultRequire };
-        return {
-            context,
-            tag: tag.bind(context),
-            svg: svg.bind(context),
-            script: script.bind(context),
-            require: customRequire.bind(context),
-            css: css.bind(context)
-        };
-    };
-
-    function tagnames(tagNames) {
-        return typeof tagNames === 'string' ? tagNames.split(/\s+/) : [];
-    }
-
-    function tag(tagNames) {
-        var htmltags = this.component.htmltags;
-        htmltags.push.apply(htmltags, tagnames(tagNames));
-    }
-
-    function svg(tagNames) {
-        var svgtags = this.component.svgtags;
-        svgtags.push.apply(svgtags, tagnames(tagNames));
-    }
-
-    function script() {
-        var scripts = Array.from(arguments);
-        var links = this.component.links;
-        links.push.apply(links, scripts);
-    }
-
-    function customRequire(filePath) {
-        filePath = filePath.endsWith('.css') ? (filePath+'.js') : filePath;
-        return this.require(filePath);
-    }
-
-    function css() {
-        var csses = Array.from(arguments);
-        var appliedStyles = this.component.options.csses;
-        appliedStyles.push.apply(appliedStyles, csses);
-    }
-    
-    binh.component = function(context, ui, service, style) {
-        var component = ui || service || style;
-        var type = ui && 'ui' || service && 'service' || style && 'style';
-
-        if (!(component instanceof Function)) return;
-
-        context.component = component;
-
-        var module = context.module;
-        module.exports = component;
-
-        component.module = module;
-        component.constructor = Component;
-        component.filename = module.filename;
-        component.type = type;
-
-        component.htmltags = [];
-        component.svgtags = [];
-        component.links = [];
-        component.options = { csses: [] };
-        component.vars = {};
-        component.varname = getVariableName(component.filename);
-        component.as = alias;
-        component.eachChild = loopComponentChildren;
-    };
-
-    binh.final = function(module) {
-        var component = module.exports;
-
-        component.eachChild(childComponent => {
-            if (childComponent.alias) {
-                component.vars[childComponent.filename] = childComponent.alias;
-            }
-        });
-    };
-
-    function loopComponentChildren(callback) {
-        this.module.children.forEach(childModule => {
-            var childComponent = childModule.exports;
-            if (!(childComponent instanceof Function) || childComponent.constructor !== Component) return;
-            callback(childComponent);
-        });
-    }
-
-    binh.ui = function(module, component, htmltags, links) {
-        binh.component({ module }, component);
-        component.htmltags = htmltags;
-        component.links = links;
-        binh.final(module);
-    };
-
-    binh.service = function(module, component, links) {
-        binh.component({ module }, null, component, null);
-        component.links = links;
-        binh.final(module);
-    };
-
-    binh.style = function(module, component) {
-        binh.component({ module }, null, null, component);
-        binh.final(module);
-    };
-
-    binh.css = function(module, cssFilename) {
-        var cssFilePath = cssFilename && path.join(module.path, cssFilename) || module.filename.replace(/.js$/, '');
-        var content = fs.readFileSync(cssFilePath, { encoding: 'utf8', flag: 'r' });
-        content = UglifyCSS.processString(content);
-        var component = new Function(`return function style() { return ${JSON.stringify(content)}; };`)();
-        component.cssFilePath = cssFilePath;
-        binh.component({ module }, null, null, component);
-        binh.final(module);
-    };
-
-    function alias(name) {
-        if (!isString(name)) return this;
-        name = name.trim();
-        this.alias = name;
-        return this;
-    }
-
-    function getVariableName(filePath) {
-        return path.parse(filePath).name.replace(/-/g, '').replace(/\W.*/, '').trim();
-    }
-
-    Binh.minify = function(flag = true) {
-        Component.minification = flag;
-        return Binh;
-    };
-
-    Binh.webStatic = function(webPath) {
-        Binh.web.value = getAbsolutePath(webPath);
-        return Binh;
-    };
-
-    Binh.webModule = function({ source, module }, onDone) {
-        if (!(isString(source) && isString(module))) {
-            throw new Error(`[BINHEND][WEB-BUILDER] Require paths for source and module. Current: { source: ${source}, module: ${module} }`);
-        }
-        
-        var { source, module } = getAbsolutePaths({ source, module });
-
-        ComponentFormat.generate(source, module, onDone);
-
-        return Binh;
-    };
-
-    Binh.webModuleBundle = function({ source, module, web }) {
-        var { source, module, web } = processWebBuildPaths({ source, module, web });
-        ComponentBuild.bundle({ source, module, web });
-        return Binh;
-    };
-
-    Binh.webModuleLazy = function({ source, module, web }) {
-        var { source, module, web } = processWebBuildPaths({ source, module, web });
-        ComponentBuild.lazyload({ source, module, web });
-        return Binh;
-    };
-
-    Binh.webBundle = function({ source, module, web }) {
-        var absolutePaths = processWebBuildPaths({ source, module, web });
-        return Binh.webModule({ source, module }, () => ComponentBuild.bundle(absolutePaths));
-    };
-
-    Binh.webLazy = function({ source, module, web, external }) {
-        var absolutePaths = processWebBuildPaths({ source, module, web });
-        absolutePaths.external = external || 'NPM';
-        return Binh.webModule({ source, module }, () => ComponentBuild.lazyload(absolutePaths));
-    };
-
-    Binh.web = Binh.webBundle;
-
-    function getAbsolutePath(relativePath) {
-        return isString(relativePath) ? path.join(Binh.getRootpath(), relativePath) : null;
-    }
-
-    function getAbsolutePaths({ source, module, web }) {
-        return {
-            source: getAbsolutePath(source),
-            module: getAbsolutePath(module),
-            web: getAbsolutePath(web)
-        };
-    }
-
-    function processWebBuildPaths({ source, module, web }) {
-        if (!(isString(source) && isString(module) && isString(web))) {
-            throw new Error(`[BINHEND][WEB-BUILDER] Require paths for source, module and web. Current: { source: ${source}, module: ${module}, web: ${web} }`);
-        }
-
-        var absolutePaths = getAbsolutePaths({ source, module, web });
-
-        Binh.web.value = absolutePaths.web;
-
-        return absolutePaths;
-    }
-
-    function isString(input) {
-        return typeof input === 'string';
-    }
-}
-
-module.exports = {
-    WebBuilder
-};

package/src/z_api.js

@@ -1,133 +0,0 @@
-const { Module } = require('module');
-const { readdirSync, statSync } = require('fs');
-const { join, parse, resolve } = require('path');
-const { isUndefined, isFunction } = require('./utils/typeOf');
-const { ServerResponse } = require('http');
-
-const express = require('express');
-const { server } = require('./server');
-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 = Router().router;
-            mapRoutes(childRouter, path);
-        }
-
-        router.use(`/${route}`, childRouter);
-        console.log('[BINHEND] Mapping routes from:', path);
-    });
-}
-
-function loadRoutes(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;
-    }
-
-    server.use(router);
-
-    return router;
-}
-
-function Router(moduleInstance) {
-    var router = express.Router();
-
-    var output = { router };
-
-    for (var key in router) {
-        let method = router[key]; // use 'let' to not lose reference, 'var' will override 'method' reference in this function scope => error on run-time
-
-        if (!isFunction(method)) continue;
-
-        output[key] = function() {
-            let args = [];
-
-            Array.from(arguments).forEach((arg) => {
-                if (!isFunction(arg)) return args.push(arg);
-                args.push(createErrorHandler(router, arg));
-            });
-
-            return method.apply(router, args);
-        };
-    }
-
-    if (moduleInstance instanceof Module) {
-        moduleInstance.exports = router;
-    }
-
-    output.trycatch = trycatch;
-
-    return output;
-}
-
-function createErrorHandler(router, callback) {
-    if (callback.isAppliedTryCatch) return callback;
-
-    return async function(request, response, next) {
-        try {
-            return await callback.apply(router, arguments);
-        }
-        catch (error) {
-            if (arguments.length < 3 || !(response instanceof ServerResponse)) throw error;
-            responseErrorByDefault(error, response, next);
-        }
-    }
-}
-
-function trycatch(callback) {
-    var trycatchCallback = async function(request, response, next) {
-        try {
-            return await callback(request, response, next);
-        }
-        catch (error) {
-            responseErrorByDefault(error, response, next);
-        }
-    };
-
-    trycatchCallback.isAppliedTryCatch = true;
-
-    return trycatchCallback;
-}
-
-function responseErrorByDefault(error, response, next) {
-    if (!(error instanceof HttpError)) return next(error);
-    response.status(error.httpCode || 500).json({ error: error.message || 'Internal Server Error' });
-}
-
-class HttpError extends Error {
-    constructor(httpCode, message) {
-        super(message);
-        this.name = 'HttpError';
-        this.httpCode = httpCode;
-    }
-}
-
-module.exports = {
-    loadRoutes, mapRoutes,
-    trycatch, HttpError, Router
-};