binhend 2.1.12 → 2.1.14

package/package.json

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

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.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.method.js

@@ -9,7 +9,7 @@ const binh = {};
 
 global.binh = binh;
 
-binh.context = function(module, defaultRequire) {
+binh.context = function (module, defaultRequire) {
     var context = { module, require: defaultRequire };
 
     return {
@@ -43,8 +43,10 @@ function script() {
 }
 
 function customRequire(filePath) {
-    filePath = filePath.endsWith('.css') ? (filePath+'.js') : filePath;
-    return this.require(filePath);
+    filePath = filePath.endsWith('.css') ? (filePath + '.js') : filePath;
+    var childComponent = this.require(filePath);
+    childComponent.parent = this.component;
+    return childComponent;
 }
 
 function applyDefaultFileCSS() {
@@ -53,7 +55,7 @@ function applyDefaultFileCSS() {
         var cssModule = this.require('./' + cssModuleFile);
         css.bind(this)(cssModule);
     }
-    catch (error) {}
+    catch (error) { }
 }
 
 function css() {
@@ -62,7 +64,7 @@ function css() {
     appliedStyles.push.apply(appliedStyles, csses);
 }
 
-binh.component = function(context, ui, service, style) {
+binh.component = function (context, ui, service, style) {
     var component = ui || service || style;
     var type = ui && 'ui' || service && 'service' || style && 'style';
 
@@ -72,6 +74,7 @@ binh.component = function(context, ui, service, style) {
 
     var module = context.module;
     module.exports = component;
+    module.exportss = component;
 
     component.module = module;
     component.constructor = Component;
@@ -86,17 +89,18 @@ binh.component = function(context, ui, service, style) {
     component.varname = getVariableName(component.filename);
     component.as = alias;
     component.eachChild = loopComponentChildren;
-    
+
     if (type === 'ui') applyDefaultFileCSS.bind(context)();
 };
 
-binh.final = function(module) {
-    var component = module.exports;
+binh.final = function (module) {
+    var component = module.exportss || {};
+    module.exports = component;
 
     component.eachChild && component.eachChild(childComponent => {
-        if (childComponent.alias) {
-            component.vars[childComponent.filename] = childComponent.alias;
-            delete childComponent.alias;
+        if (childComponent.alias?.[component.filename]) {
+            component.vars[childComponent.filename] = childComponent.alias?.[component.filename];
+            delete childComponent.alias?.[component.filename];
         }
 
         if (childComponent.type === 'service') {
@@ -113,7 +117,7 @@ function loopComponentChildren(callback) {
     });
 }
 
-binh.css = function(module, cssFilename) {
+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);
@@ -123,12 +127,18 @@ 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;
     name = name.trim();
-    this.alias = name;
+
+    var alias = this.alias || (this.alias = {});
+    if (this.parent) alias[this.parent.filename] = name;
+    delete this.parent;
+
     return this;
 }