binhend 1.4.2 → 1.4.4

package/package.json

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

package/src/binh.web.builder.js

@@ -14,16 +14,25 @@ function WebBuilder(binh, Binh) {
         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 tags = typeof tagNames === 'string' ? tagNames.split(/\s+/) : [];
         var htmltags = this.component.htmltags;
-        htmltags.push.apply(htmltags, tags);
+        htmltags.push.apply(htmltags, tagnames(tagNames));
+    }
+
+    function svg(tagNames) {
+        var svgtags = this.component.svgtags;
+        svgtags.push.apply(svgtags, tagnames(tagNames));
     }
 
     function script() {
@@ -60,6 +69,7 @@ function WebBuilder(binh, Binh) {
         component.type = type;
 
         component.htmltags = [];
+        component.svgtags = [];
         component.links = [];
         component.options = { csses: [] };
         component.vars = {};

package/src/code.js

@@ -43,7 +43,7 @@ function getCodeOfDependencies(component, rootPath, metadata) {
 }
 
 function injectFunctionCodeContent(functionCodeString, injectionCode) {
-    return functionCodeString.replace(/(\(.*\)\s*{|\(.*\)\s*=>\s*{)/, `$1\r\n${injectionCode}`);
+    return functionCodeString.replace(/(\(.*?\)\s*{|\(.*?\)\s*=>\s*{)/, `$1\r\n${injectionCode}`);
 }
 
 function getDependencyDelaration(component, rootPath) {
@@ -143,7 +143,6 @@ function getRelativeFilePath(filePath, rootPath) {
 getRelativeFilePath.cache = {};
 
 function bundle(component, rootPath) {
-    var codeOfDependencies = getCodeOfDependencies(component, rootPath);
     var dependencyDelaration = getDependencyDelaration(component, rootPath);
     var optionCode = generateOptionCode(component, '', rootPath);
     var componentCode = component.toString();
@@ -154,11 +153,13 @@ function bundle(component, rootPath) {
 
     var codes = [];
 
-    if (codeOfDependencies) codes.push(codeOfDependencies);
     if (componentCode) {
         codes.push(`Binh.${component.type}(${component.type})${optionCode};`);
-        codes.push(`${componentCode}`);
+        codes.push(`${componentCode}\r\n`);
     }
+    
+    var codeOfDependencies = getCodeOfDependencies(component, rootPath);
+    if (codeOfDependencies) codes.push(codeOfDependencies);
 
     return codes.join('\r\n');
 }
@@ -188,6 +189,23 @@ function htmltags(component) {
     .join(`\r\n`);
 }
 
+function svgtags(component) {
+    var tags = distinctValues(component, 'svgtags');
+
+    if (!tags.length) return '';
+    
+    var variablesList = tags.join(',');
+    tags = tags.map((tag) => JSON.stringify(tag));
+
+    return [
+        `Binh.SVGs = Binh.svgs(${tags.join(',')});`,
+        '',
+        `var {${variablesList}} = Binh.SVGs;`,
+        ''
+    ]
+    .join(`\r\n`);
+}
+
 function prequire(component, codes) {
     var code = '', links = distinctValues(component, 'links');
 
@@ -248,6 +266,7 @@ function uniquefy(arrays) {
 module.exports = {
     bundle,
     htmltags,
+    svgtags,
     prequire,
     IIF
 };

package/src/component.build.js

@@ -45,6 +45,7 @@ function joinCodes(component, rootPath) {
     var mainCode = CodeFormat.prequire(component, [
         `var _Binh = Binh;\r\n`,
         CodeFormat.htmltags(component),
+        CodeFormat.svgtags(component),
         CodeFormat.bundle(component, rootPath)
     ]);
 

package/src/component.format.js

@@ -7,7 +7,7 @@ const { scanNestedFiles, cloneFile, printError, makeFullDirPath } = require('./c
 // [-] Enhance code by removing sync logics (except for existsSync, mkdirSync): readdir, readFileSync, (statSync?)
 
 const PREFIX_CODE =
-`var { context, tag, script, require, css } = binh.context(module, require);
+`var { context, tag, svg, script, require, css } = binh.context(module, require);
 binh.component(context, ui, service, style);
 var ui = null, service = null, style = null;\r\n\r\n`;