binhend 1.5.6 → 1.5.7

package/package.json

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

package/src/binh.web.builder.js

@@ -119,6 +119,7 @@ function WebBuilder(binh, Binh) {
         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);
     };

package/src/component.build.js

@@ -13,6 +13,7 @@ function processEachFile({ source: sourceRootPath, web: outputRootPath, module:
     console.info('[BINHEND][COMPONENT] to:', outputRootPath);
 
     var ref = {};
+    externalPath = typeof externalPath === 'string' ? `/${externalPath}/` : null;
 
     scanNestedFiles(stageRootPath, (file, done) => {
         if (done) return callbackDone instanceof Function ? callbackDone({ outputRootPath }) : null;
@@ -37,11 +38,11 @@ function processEachFile({ source: sourceRootPath, web: outputRootPath, module:
             return cloneFileIfNew(fileSourcePath, fileOutputPath);
         }
 
-        injectComponentURL(component, stageRootPath + path.sep, externalPath ? `/${externalPath}/` : null, ref);
+        injectComponentURL(component, stageRootPath + path.sep, externalPath, ref);
 
         if (buildCodeMethod === buildLazyCode) collectExternalComponents(component, externalPath);
 
-        var code = buildCodeMethod(component, externalPath);
+        var code = buildCodeMethod(component);
         code = Component.minification ? minifyCode(code) : beautifyCode(code);
 
         writeToFileIfNew(fileOutputPath, code);
@@ -69,7 +70,8 @@ function lazyload(paths) {
 }
 
 function copyExternalComponentFiles({ outputRootPath }) {
-    var cache = copyExternalComponentFiles.cache;
+    var cache = copyExternalComponentFiles.cache,
+        csses = copyExternalComponentFiles.csses;
 
     for (var npmPath in cache) {
         var component = cache[npmPath].component;
@@ -84,17 +86,36 @@ function copyExternalComponentFiles({ outputRootPath }) {
 
         writeToFileIfNew(fileOutputPath, code);
     }
+
+    for (var cssFileSourcePath in csses) {
+        var cssURL = csses[cssFileSourcePath],
+            cssFileOutputPath = path.join(outputRootPath, cssURL);
+
+        makeFullDirPath(cssFileOutputPath);
+        cloneFileIfNew(cssFileSourcePath, cssFileOutputPath);
+    }
 }
 
 function collectExternalComponents(component, externalPath) {
-    var cache = copyExternalComponentFiles.cache || (copyExternalComponentFiles.cache = {});
+    var cache = copyExternalComponentFiles.cache || (copyExternalComponentFiles.cache = {}),
+        csses = copyExternalComponentFiles.csses || (copyExternalComponentFiles.csses = {});
+
+    component.options.csses.forEach(cssModule => {
+        var cssFilePath = cssModule.cssFilePath;
+
+        if (csses[cssFilePath]) return;
+
+        if (cssModule.url.startsWith(externalPath)) {
+            csses[cssFilePath] = cssModule.url.replace(/.js$/, '');
+        }
+    });
 
     component.eachChild(childComponent => {
         var url = childComponent.url;
 
         if (cache[url]) return;
 
-        if (url.startsWith(`/${externalPath}/`)) {
+        if (url.startsWith(externalPath)) {
             cache[url] = {
                 component: childComponent
             };

package/test.js

@@ -1,48 +0,0 @@
-// const path = require('path');
-
-// function parseFilePathToVariableName(filePath) {
-//     return path.parse(filePath).name.replace(/-/g, '').replace(/\W.*/, '');
-//     // try {
-//     // }
-//     // catch (error) {
-//     //     return '';
-//     // }
-// };
-
-// // console.log(parseFilePathToVariableName(1));
-// console.log(parseFilePathToVariableName(''));
-// // console.log(parseFilePathToVariableName(null));
-// // console.log(parseFilePathToVariableName());
-// // console.log(parseFilePathToVariableName('abc.js'));
-// // console.log(parseFilePathToVariableName('abc,.js'));
-// // console.log(parseFilePathToVariableName('abc.css.js'));
-// // console.log(parseFilePathToVariableName('./uhm/abc.css.js'));
-// console.log(parseFilePathToVariableName('.css.js'));
-
-// var abc = function ab() { return 123; };
-// var cc = () => {};
-
-// !function(callback1, callback2) {
-//     delete callback1.name;
-//     console.log(callback1.toString());
-//     console.log(callback2.toString());
-// }(abc, cc);
-
-// console.log(abc.toString());
-// console.log(cc.toString());
-
-const path = require('path');
-
-// console.log(__dirname);
-// console.log(path.join(__dirname, null));
-
-function abc({ a, b, c }) {
-    console.log(path.join(__dirname, a));
-    console.log(path.join(__dirname, b));
-    console.log(path.join(__dirname, c));
-}
-
-abc({
-    a: 'a',
-    b: 'b'
-});