binhend 1.1.0 → 1.1.1

package/example_api/routes/test/bb.js

@@ -1,4 +1,4 @@
-const { get } = binh().Router(module);
+const { get } = binh.router(module);
 
 // get('/', function(req, res) {
 //     res.json({ path:'/', dir: __dirname, file: __filename });

package/example_api/routes/test/index.js

@@ -1,4 +1,4 @@
-const { router, get, post } = binh().Router(module);
+const { router, get, post } = binh.router(module);
 
 get('/', function(req, res) {
     res.json({ path:'/', dir: __dirname, file: __filename });

package/example_api/routes/test/some.js

@@ -1,4 +1,4 @@
-const { router, get, post } = binh().Router(module);
+const { router, get, post } = binh.router(module);
 
 get('/', function(req, res) {
     res.json({ path:'/', dir: __dirname, file: __filename });

package/example_api/routes/test.js

@@ -1,4 +1,8 @@
-const { get } = binh().Router(module);
+const { get } = binh.router(module);
+
+get('/', function(req, res) {
+    res.json({ path:'/', dir: __dirname, file: __filename });
+});
 
 get('/bb', function(req, res) {
     res.json({ path:'/bb', dir: __dirname, file: __filename });

package/example_api/routes/testa.js

@@ -1,4 +1,4 @@
-const { router, get, post } = binh().Router(module);
+const { router, get, post } = binh.router(module);
 
 get('/', function(req, res) {
     res.json({ path:'/', dir: __dirname, file: __filename });

package/example_webcomp/components/common/InputText.js

@@ -1,10 +1,20 @@
 
+require('./../services/ServiceToDos').as('Toto');
+
 function main() {
+    // var addTodoItem = Toto.debounce('add', 1500, true);
+
+    // setTimeout(function() {
+    //     addTodoItem('over 10kms');
+    // }, 10000);
+    
     var inputbox = input({ type: 'text', placeholder: 'Enter to-do item' });
+
+    var submit = inputbox.action('submit');
     
     inputbox.on('keypress', function (event) {
         if (event.key === "Enter") {
-            inputbox.does('submit', inputbox.element.value);
+            submit(inputbox.element.value);
         }
     });
     

package/example_webcomp/components/common/Link.js

@@ -1,7 +1,7 @@
 
 
 function Link() {
-    var { a } = Binh.elements;
+    var { a } = Binh.element();
 
     var text = arguments[0];
     var path = arguments[1];

package/example_webcomp/components/common/Link2.js

@@ -1,6 +1,6 @@
 
 Binh.ui(function() {
-    var { a } = Binh.elements;
+    var { a } = Binh.element('a');
 
     var text = arguments[0];
     var path = arguments[1];

package/example_webcomp/components/index.js

@@ -1,6 +1,14 @@
 
+Binh.script('https://cdn.jsdelivr.net/gh/jquery/jquery@3.5.1/dist/jquery.min.js', function() {
+    Binh.link('https://cdn.jsdelivr.net/npm/bootstrap@3.4.1/dist/css/bootstrap.min.css');
+    Binh.script('https://cdn.jsdelivr.net/npm/bootstrap@3.4.1/dist/js/bootstrap.min.js');
+});
+
+Binh.Router.onload(function() {
+    console.log('#### ON ROUTING !!!');
+});
+
 Binh({
     '':         '/layouts/AppMainLayout.js',
     '/todos':    '/layouts/AppToDos.js'
 });
-

package/example_webcomp/components/layouts/AppMainLayout.js

@@ -19,4 +19,4 @@ function AppMainLayout() {
     return MainLayout;
 }
 
-binh.ui(module, AppMainLayout, ['div'], ['https://code.jquery.com/jquery-3.7.0.min.js']);
+binh.ui(module, AppMainLayout, ['div'], ['https://code.jquery.com/jquery-3.7.0.min.js', 'https://code.jquery.com/jquery-3.7.0.min.js']);

package/example_webcomp/components/layouts/AppToDos.js

@@ -1,13 +1,15 @@
 
-// require('./PageHeader');
+require('./PageHeader');
 // require('./ToDoItem');
 require('./../common/InputText');
-require('./../services/ServiceToDos');
+require('./Link');
+require('./../services/ServiceToDos').as('Dodo');
 
 
 function main() {
-    var PageHeader = this.ui('/layouts/PageHeader.js');
-    var ToDoItem = this.ui('/layouts/ToDoItem.js');
+    var ServiceToDos = Dodo;
+    // var PageHeader = Binh.ui('/layouts/PageHeader.js');
+    var ToDoItem = Binh.ui('/layouts/ToDoItem.js');
     // var addTodoItem = ServiceToDos.does('add');
     // var addTodoItem = ServiceToDos.debounce('add', 1500); // trailing only
     var addTodoItem = ServiceToDos.debounce('add', 1500, true); // both leading & trailing
@@ -44,4 +46,4 @@ function main() {
     return maindiv;
 }
 
-binh.ui(module, main, ['div', 'span']);
+binh.ui(module, main, ['div', 'span'], ['https://code.jquery.com/jquery-3.7.0.min.js']);

package/example_webcomp/{public/common → components/layouts}/Link.js

@@ -1,7 +1,7 @@
-!function(){
 
-Binh.ui(function Link() {
-    var { a } = Binh.elements;
+
+function Link() {
+    var { a } = Binh.element('a');
 
     var text = arguments[0];
     var path = arguments[1];
@@ -11,7 +11,6 @@ Binh.ui(function Link() {
     });
 
     return link;
-});
-
+}
 
-}();
+binh.ui(module, Link);

package/example_webcomp/components/layouts/PageContent.js

@@ -22,4 +22,4 @@ function PageContent() {
     return PageContent;
 }
 
-binh.ui(module, PageContent, ['div', 'trans']);
+binh.ui(module, PageContent, ['div', 'trans'], ['https://code.jquery.com/jquery-3.7.0.min.js']);

package/example_webcomp/components/layouts/PageHeader.js

@@ -1,8 +1,8 @@
 
-// var { Link } = require('./../common/Link');
+var { Link } = require('./../common/Link');
 
 function PageHeader() {
-    var Link = this.ui('/common/Link2.js');
+    // var Link = Binh.ui('/common/Link2.js');
     
     var PageHeader = div({ id: 'page-header' });
     

package/example_webcomp/components/layouts/ToDoItem.js

@@ -4,14 +4,15 @@ require('./../styles/ToDoItemStyle2');
 // require('../styles/todo.css.js');
 
 function main(props) {
-    // var ToDoItemStyle = this.style('/styles/todo.css');
+    // var ToDoItemStyle = Binh.style('/styles/todo.css');
 
     var todoitem = div({ style: 'margin: 3px;' });
+    var removeToDoItem = todoitem.action('remove');
 
     var remove_button = span({ class: 'btn-remove' })('X');
 
     remove_button.on('click', function() {
-        todoitem.does('remove', props.id);
+        removeToDoItem(props.id);
     });
 
     todoitem(span(props.text), span('-------'), remove_button);

package/example_webcomp/components/styles/temp.css

@@ -1,4 +1,7 @@
+
+@import url("/styles/todo.css");
+
 .btn-remove {
     color: purple;
     margin-left: '15px';
-}
+}

package/package.json

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

package/src/binh.js

@@ -1,159 +1,18 @@
-const crypto = require('crypto');
-const cluster = require('cluster');
-const os = require('os');
 const path = require('path');
-
-const { ConfigLoader } = require('./configuration');
-const { HTTPS } = require('./https');
-const { Server } = require('./server');
-const { APIs, Router } = require('./api');
-const Component = require('./component');
-
 const Crypto = require('./cryptography');
 
-const maxcpus = os.cpus().length;
-
-function generateId() {
-    crypto.randomUUID({ disableEntropyCache: true });
-}
-
-function defaultConfigLoader(loader) {
-    loader.object(process.env);
-
-    try {
-        loader.file('.env');
-    }
-    catch(e) {}
+const { HTTPS } = require('./https');
+const { ConfigLoader } = require('./configuration');
 
-    loader.cli();
-}
+const { ServerApp } = require('./binh.server.app');
+const { ServerConfig } = require('./binh.server.config');
+const { WebBuilder } = require('./binh.web.builder');
 
 function Binh() {
-    var _this = this,
-        forkcount = 0,
-        rootpath = require.main.path;
-
-    var config = {}, loadConfigs = null, groupLoadConfigs = [], configloader = new ConfigLoader(config);
-
-    var binh = function(module_path) {
-        return module_path == undefined ? module.exports : require(path.join(rootpath, module_path));
-    };
-
-    binh.path = function(any_path = '') {
-        return path.join(rootpath, any_path);
-    };
-
-    binh.config = function(key) {
-        if (typeof key !== 'string') return config;
-
-        if (config.hasOwnProperty(key)) return config[key];
-
-        var pointer = config, keys = key.split('.'), length = keys.length;
-
-        try {
-            for (var i = 0; i < length; i++) {
-                pointer = pointer[keys[i]];
-            }
-            return pointer;
-        }
-        catch (e) {
-            return undefined;
-        }
-    };
-
-    binh.config.reload = function() {
-        return new Promise(function(resolve) {
-            var loader = new ConfigLoader(config);
-
-            groupLoadConfigs.forEach(function(loadConfigs) {
-                if (loadConfigs instanceof Function) {
-                    loadConfigs(loader);
-                }
-            });
-            
-            loader.done(resolve);
-        });
-    };
-
-    binh.config.loader = function() {
-        return new ConfigLoader(config);
-    };
-
-    binh.ui = function(amodule, component, htmltags, links) {
-        component.htmltags = htmltags;
-        component.links = links;
-        binh.bundle('ui', amodule, component);
-    };
-
-    binh.service = function(amodule, component, links) {
-        component.links = links;
-        binh.bundle('service', amodule, component);
-    };
-
-    binh.style = function(amodule, component) {
-        binh.bundle('style', amodule, component);
-    };
-
-    binh.css = function(amodule, cssFilename) {
-        var cssFilePath = cssFilename && path.join(amodule.path, cssFilename) || amodule.filename.replace(/.js$/, '');
-        var content = require('fs').readFileSync(cssFilePath, { encoding: 'utf8', flag: 'r' });
-        content = content.replace(/\s+/g, ' ');
-        var component = new Function(`return ${JSON.stringify(content)};`);
-        binh.bundle('style', amodule, component);
-    };
-
-    binh.bundle = function(type, amodule, component) {
-        if (!(component instanceof Function)) return;
-
-        var dependencies = {};
-        handleDependencies(dependencies, amodule.children);
-
-        component.type = type;
-        component.dependencies = dependencies;
-        component.path = amodule.filename;
-        component.constructor = Component;
-
-        amodule.exports = component;
-    };
-
-    function handleDependencies(dependencies, children) {
-        children.forEach(function(child) {
-            if (dependencies[child.filename]) return;
-
-            var component = child.exports;
-
-            if (component.constructor === Component) {
-                dependencies[child.filename] = component;
-                handleDependencies(dependencies, child.children);
-            }
-        });
-    }
-
-    global.binh = binh;
-    global.config = binh.config;
-
-    this.web = function(buildpath, sourcepath) {
-        if (typeof buildpath !== 'string') return this;
-
-        var destination = path.join(rootpath, buildpath);
-
-        this.web.value = destination;
-        
-        if (typeof sourcepath === 'string') {
-            var source = path.join(rootpath, sourcepath);
-            Component.generate(source, destination);
-        }
-
-        return this;
-    };
-
-    this.rootpath = function(path) {
-        rootpath = typeof path === 'string' ? path : require.main.path;
-        return this;
-    };
+    var rootpath = require.main.path;
 
     this.id = function(id) {
-        binh.id = id == undefined ? generateId() : JSON.stringify(id);
+        binh.id = id == undefined ? Crypto.randomUUID() : JSON.stringify(id);
         return this;
     };
 
@@ -162,74 +21,28 @@ function Binh() {
         return this;
     };
 
-    this.config = function(module) {
-        if (module instanceof Function) {
-            loadConfigs = module;
-            loadConfigs(configloader);
-        }
-        else if (typeof module === 'string') {
-            loadConfigs = binh(module);
-            loadConfigs(configloader);
-        }
-        else {
-            loadConfigs = defaultConfigLoader;
-            loadConfigs(configloader);
-        }
-
-        groupLoadConfigs.push(loadConfigs);
-
+    this.rootpath = function(path) {
+        rootpath = typeof path === 'string' ? path : require.main.path;
         return this;
     };
 
-    this.cluster = {
-        fork: function(number) {
-            forkcount = Math.max(0, number >= 0 ? number : maxcpus + number);
-            return _this;
-        },
-        max: function() {
-            forkcount = maxcpus;
-            return _this;
-        }
-    };
-
-    this.api = function(api_path) {
-        this.api.value = path.join(rootpath, api_path);
-        return this;
+    this.getRootpath = function() {
+        return rootpath;
     };
 
-    this.port = function(port) {
-        if (typeof port === 'number') {
-            this.port.value = port;
-        }
-        else if (typeof port === 'string') {
-            this.port.value = binh.config(port);
-        }
-        return this;
+    function binh(modulePath) {
+        return modulePath == undefined ? module.exports : require(path.join(rootpath, modulePath));
     };
 
-    this.start = function(callback) {
-        if (forkcount > 0 && cluster.isMaster) {
-            for (var i = 0; i < forkcount; i++) {
-                cluster.fork(); 
-            }
-        }
-        else {
-            launch(callback);
-        }
+    binh.path = function(anyPath = '') {
+        return path.join(rootpath, anyPath);
     };
 
-    function launch(callback) {
-        configloader.done(function(configs) {
-            new Server({
-                port: _this.port.value,
-                api: APIs(_this.api.value),
-                web: _this.web.value,
-                callback: callback,
-                configs: configs
-            });
-        });
-    }
+    ServerApp(binh, this, ServerConfig(binh, this));
+    WebBuilder(binh, this);
 
+    global.binh = binh;
+    global.config = binh.config;
 }
 
-module.exports = { Binh, HTTPS, ConfigLoader, Crypto, Router };
+module.exports = { Binh, HTTPS, ConfigLoader, Crypto };

package/src/binh.server.app.js

@@ -0,0 +1,70 @@
+
+const os = require('os');
+const cluster = require('cluster');
+const path = require('path');
+const { Server } = require('./server');
+const { APIs, Router } = require('./api');
+
+const maxcpus = os.cpus().length;
+
+function ServerApp(binh, Binh, configloader) {
+    var forkcount = 0,
+        rootpath = Binh.getRootpath();
+
+    binh.router = function(module) {
+        return Router(module);
+    };
+
+    Binh.api = function(api_path) {
+        Binh.api.value = path.join(rootpath, api_path);
+        return Binh;
+    };
+
+    Binh.cluster = {
+        fork: function(number) {
+            forkcount = Math.max(0, number >= 0 ? number : maxcpus + number);
+            return Binh;
+        },
+        max: function() {
+            forkcount = maxcpus;
+            return Binh;
+        }
+    };
+
+    Binh.port = function(port) {
+        if (typeof port === 'number') {
+            Binh.port.value = port;
+        }
+        else if (typeof port === 'string') {
+            Binh.port.value = binh.config(port);
+        }
+        return Binh;
+    };
+
+    Binh.start = function(callback) {
+        if (forkcount > 0 && cluster.isMaster) {
+            for (var i = 0; i < forkcount; i++) {
+                cluster.fork(); 
+            }
+        }
+        else {
+            launch(callback);
+        }
+    };
+
+    function launch(callback) {
+        configloader.done(function(configs) {
+            new Server({
+                port: Binh.port.value,
+                api: APIs(Binh.api.value),
+                web: Binh.web.value,
+                callback: callback,
+                configs: configs
+            });
+        });
+    }
+}
+
+module.exports = {
+    ServerApp
+};

package/src/binh.server.config.js

@@ -0,0 +1,79 @@
+
+const { ConfigLoader } = require('./configuration');
+
+function ServerConfig(binh, Binh) {
+
+    var config = {}, loadConfigs = null, groupLoadConfigs = [], configloader = new ConfigLoader(config);
+
+    binh.config = function(key) {
+        if (typeof key !== 'string') return config;
+
+        if (config.hasOwnProperty(key)) return config[key];
+
+        var pointer = config, keys = key.split('.'), length = keys.length;
+
+        try {
+            for (var i = 0; i < length; i++) {
+                pointer = pointer[keys[i]];
+            }
+            return pointer;
+        }
+        catch (e) {
+            return undefined;
+        }
+    };
+
+    binh.config.reload = function() {
+        return new Promise(function(resolve) {
+            var loader = new ConfigLoader(config);
+
+            groupLoadConfigs.forEach(function(loadConfigs) {
+                if (loadConfigs instanceof Function) {
+                    loadConfigs(loader);
+                }
+            });
+            
+            loader.done(resolve);
+        });
+    };
+
+    binh.config.loader = function() {
+        return new ConfigLoader(config);
+    };
+
+    Binh.config = function(module) {
+        if (module instanceof Function) {
+            loadConfigs = module;
+            loadConfigs(configloader);
+        }
+        else if (typeof module === 'string') {
+            loadConfigs = binh(module);
+            loadConfigs(configloader);
+        }
+        else {
+            loadConfigs = defaultConfigLoader;
+            loadConfigs(configloader);
+        }
+
+        groupLoadConfigs.push(loadConfigs);
+
+        return Binh;
+    };
+
+    return configloader;
+}
+
+function defaultConfigLoader(loader) {
+    loader.object(process.env);
+
+    try {
+        loader.file('.env');
+    }
+    catch(e) {}
+
+    loader.cli();
+}
+
+module.exports = {
+    ServerConfig
+};

package/src/binh.web.builder.js

@@ -0,0 +1,72 @@
+
+const path = require('path');
+
+const Component = require('./component');
+
+function WebBuilder(binh, Binh) {
+    binh.ui = function(amodule, component, htmltags, links) {
+        component.htmltags = htmltags;
+        component.links = links;
+        binh.bundle('ui', amodule, component);
+    };
+
+    binh.service = function(amodule, component, links) {
+        component.links = links;
+        binh.bundle('service', amodule, component);
+    };
+
+    binh.style = function(amodule, component) {
+        binh.bundle('style', amodule, component);
+    };
+
+    binh.css = function(amodule, cssFilename) {
+        var cssFilePath = cssFilename && path.join(amodule.path, cssFilename) || amodule.filename.replace(/.js$/, '');
+        var content = require('fs').readFileSync(cssFilePath, { encoding: 'utf8', flag: 'r' });
+        content = content.replace(/\s+/g, ' ');
+        var component = new Function(`return ${JSON.stringify(content)};`);
+        binh.bundle('style', amodule, component);
+    };
+
+    binh.bundle = function(type, amodule, component) {
+        if (!(component instanceof Function)) return;
+
+        component.type = type;
+        component.filename = amodule.filename;
+        component.constructor = Component;
+        component.module = amodule;
+        component.as = alias;
+        component.vars = {};
+
+        amodule.exports = component;
+
+        amodule.children.forEach(function(child) {
+            child = child.exports;
+            if (child.constructor !== Component) return;
+            if (child.alias) component.vars[child.filename] = child.alias;
+        });
+    };
+
+    function alias(name) {
+        this.alias = name;
+    }
+
+    Binh.web = function(buildpath, sourcepath) {
+        if (typeof buildpath !== 'string') return this;
+
+        var rootpath = Binh.getRootpath(),
+            destination = path.join(rootpath, buildpath);
+        
+        if (typeof sourcepath === 'string') {
+            var source = path.join(rootpath, sourcepath);
+            Component.generate(source, destination);
+        }
+
+        Binh.web.value = destination;
+
+        return Binh;
+    };
+}
+
+module.exports = {
+    WebBuilder
+};