binhend 1.1.5 → 1.1.6

package/package.json

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

package/src/binh.web.builder.js

@@ -4,42 +4,42 @@ const path = require('path');
 const Component = require('./component');
 
 function WebBuilder(binh, Binh) {
-    binh.ui = function(amodule, component, htmltags, links) {
+    binh.ui = function(module, component, htmltags, links) {
         component.htmltags = htmltags;
         component.links = links;
-        binh.bundle('ui', amodule, component);
+        binh.bundle('ui', module, component);
     };
 
-    binh.service = function(amodule, component, links) {
+    binh.service = function(module, component, links) {
         component.links = links;
-        binh.bundle('service', amodule, component);
+        binh.bundle('service', module, component);
     };
 
-    binh.style = function(amodule, component) {
-        binh.bundle('style', amodule, component);
+    binh.style = function(module, component) {
+        binh.bundle('style', module, component);
     };
 
-    binh.css = function(amodule, cssFilename) {
-        var cssFilePath = cssFilename && path.join(amodule.path, cssFilename) || amodule.filename.replace(/.js$/, '');
+    binh.css = function(module, cssFilename) {
+        var cssFilePath = cssFilename && path.join(module.path, cssFilename) || module.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('style', module, component);
     };
 
-    binh.bundle = function(type, amodule, component) {
+    binh.bundle = function(type, module, component) {
         if (!(component instanceof Function)) return;
 
         component.type = type;
-        component.filename = amodule.filename;
+        component.filename = module.filename;
         component.constructor = Component;
-        component.module = amodule;
+        component.module = module;
         component.as = alias;
         component.vars = {};
 
-        amodule.exports = component;
+        module.exports = component;
 
-        amodule.children.forEach(function(child) {
+        module.children.forEach(function(child) {
             child = child.exports;
             if (child.constructor !== Component) return;
             if (child.alias) component.vars[child.filename] = child.alias;

package/src/code.js

@@ -125,15 +125,29 @@ function IIF(codes) {
 }
 
 function distinctValues(component, key) {
-    var arrays = [component[key]];
+    var arrays = [component[key]], ref = {};
+
+    ref[component.filename] = true;
 
     component.module.children.forEach(function(child) {
+        if (ref[child.filename]) return;
+        ref[child.filename] = true;
         arrays.push(child.exports[key]);
+        getArraysFromDeeperChildren(ref, arrays, child, key);
     });
 
     return uniquefy(arrays);
 }
 
+function getArraysFromDeeperChildren(ref, arrays, module, key) {
+    module.children.forEach(function(child) {
+        if (ref[child.filename]) return;
+        ref[child.filename] = true;
+        arrays.push(child.exports[key]);
+        getArraysFromDeeperChildren(ref, arrays, child, key);
+    });
+}
+
 function uniquefy(arrays) {
     var map = {};