html2js - npm Package Compare versions

Comparing version 0.0.1 to 0.0.2

html2js.js

@@ -19,3 +19,6 @@ /**
             .replace(
-                new RegExp('(^[\\s\\t\\xa0\\u3000]+)|([\\u3000\\xa0\\s\\t]+\x24)', 'g'),
+                new RegExp(
+                    '(^[\\s\\t\\xa0\\u3000]+)|([\\u3000\\xa0\\s\\t]+\x24)',
+                    'g'
+                ),
                 ''
@@ -34,16 +37,9 @@ );
     function wrap(content, format) {
-        if(!!format){
-            return [
-                "define(function () {",
-                "    return ''",
-                "    + " + content + ";",
-                "});"
-            ].join('\n');
-        }
-        else{
-            return ""
-                + "define(function () { return '"
-                + content
-                + "';});";
-        }
+
+        return [
+            'define(function () {',
+            (!!format ? '    ' : '') + 'return ' + content + ';',
+            '});'
+        ].join(!!format ? '\n' : '');
+
     }
@@ -61,51 +57,59 @@
     function html2js(content, opt) {
-        var options = arguments.length > 1 ? opt : {};
-        var output;
 
+        var options = arguments.length > 1 ? opt : {};  // 默认配置
+        var output;                                     // 输出
+
+
+        // 默认 esacpe
+        // 不压缩 无+连接
+        // 参考 requirejs text
+        // see: http://github.com/requirejs/text for details
+        output = content.replace(/(['\\])/g, '\\$1')
+            .replace(/[\f]/g, '\\f')
+            .replace(/[\b]/g, '\\b')
+            .replace(/[\n]/g, '\\n')
+            .replace(/[\t]/g, '\\t')
+            .replace(/[\r]/g, '\\r')
+            .replace(/[\u2028]/g, '\\u2028')
+            .replace(/[\u2029]/g, '\\u2029');
+
+
+        // 全压缩
         if (options.mode === 'compress') {
-            // 全压缩
-            var arrCode = [];
-            content.replace(/\\/g, '\\\\')
-                .replace(/[\n]/g, '\\n')
-                .replace(/[\r]/g, '\\r')
-                .replace(/['"]/g, function (match) {
-                    return '\\' + match;
+
+            output = output.split('\\n')
+                .map(function (str) {
+                    return trim(str);
                 })
-                .split('\\n')
-                .forEach(function (str) {
-                    arrCode.push(trim(str));
-                });
+                .join('');
 
-            output = arrCode.join('');
         }
-        else if (options.mode === 'format') {
-            // 不压缩 + 连接
-            output = content.replace(/\\/g, '\\\\')
-                .replace(/'/g, '\\\'')
-                .replace(/\r?\n/g, '\\n\'\n    + \'');
 
-            output = "'" + output + "'";
+        // 不压缩 + 连接
+        // 编码规范
+        // https://github.com/ecomfe/spec/blob/master/javascript-code-style.md
+        if (options.mode === 'format') {
+
+            // fix 首行
+            output = '\\n' + output;
+
+            output = output.split('\\n')
+                .map(function (str) {
+                    return str.replace(/(^\s*)/g, '$1\'') + '\'';
+                })
+                .join('\n        + ');
+
         }
         else {
-            // 默认
-            // 不压缩 无+连接
-            // 参考 requirejs text
-            // see: http://github.com/requirejs/text for details
-            output = content.replace(/(['\\])/g, '\\$1')
-                .replace(/[\f]/g, '\\f')
-                .replace(/[\b]/g, '\\b')
-                .replace(/[\n]/g, '\\n')
-                .replace(/[\t]/g, '\\t')
-                .replace(/[\r]/g, '\\r')
-                .replace(/[\u2028]/g, '\\u2028')
-                .replace(/[\u2029]/g, '\\u2029');
+
+            // fix 左右 ’
+            output = '\'' + output + '\'';
+
         }
 
+        // 包起来
         if (options.wrap) {
-            if (options.mode === 'format') {
-                output = wrap(output, true);
-            }
-            else {
-                output = wrap(output);
-            }
+
+            output = wrap(output, options.mode === 'format');
+
         }
@@ -112,0 +116,0 @@

package.json

 {
   "name": "html2js",
   "description": "html2js",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "author": {
@@ -6,0 +6,0 @@ "name": "junmer",

README.md

@@ -28,14 +28,17 @@ html2js
 
-var mode = ['format', 'default', 'compress'];
+var modes = ['format', 'default', 'compress'];
 
-var arr = [];
-
-mode.forEach(
-    function (val) {
-        arr.push( '// ' + val );
-        arr.push( html2js( html, {mode: val, wrap: true} ) );
+var output = modes.map(
+    function (mode) {
+        return ''
+            + '// '
+            + mode
+            + '\n'
+            + html2js(html, {
+                mode: mode,
+                wrap: true
+            });
     }
-);
+).join('\n');
 
-var output = arr.join('\n');
 console.log(output);
@@ -49,13 +52,13 @@ fs.writeFile( filename + '.js', output );
     return ''
-    + '<div id="i-am-a-id">\n'
-    + '  <div class="i-am-a-class">\n'
-    + '    i am test\n'
-    + '  </div>\n'
-    + '</div>';
+        + '<div id="i-am-a-id">'
+        +   '<div class="i-am-a-class">'
+        +     'i am test'
+        +   '</div>'
+        + '</div>';
 });
 // default
-define(function () { return '<div id="i-am-a-id">\n  <div class="i-am-a-class">\n    i am test\n  </div>\n</div>';});
+define(function () {return '<div id="i-am-a-id">\n  <div class="i-am-a-class">\n    i am test\n  </div>\n</div>';});
 // compress
-define(function () { return '<div id=\"i-am-a-id\"><div class=\"i-am-a-class\">i am test</div></div>';});
+define(function () {return '<div id="i-am-a-id"><div class="i-am-a-class">i am test</div></div>';});
 ```
 

test/test.html.js

 // format
 define(function () {
     return ''
-    + '<div id="i-am-a-id">\n'
-    + '  <div class="i-am-a-class">\n'
-    + '    i am test\n'
-    + '  </div>\n'
-    + '</div>';
+        + '<div id="i-am-a-id">'
+        +   '<div class="i-am-a-class">'
+        +     'i am test'
+        +   '</div>'
+        + '</div>';
 });
 // default
-define(function () { return '<div id="i-am-a-id">\n  <div class="i-am-a-class">\n    i am test\n  </div>\n</div>';});
+define(function () {return '<div id="i-am-a-id">\n  <div class="i-am-a-class">\n    i am test\n  </div>\n</div>';});
 // compress
-define(function () { return '<div id=\"i-am-a-id\"><div class=\"i-am-a-class\">i am test</div></div>';});
+define(function () {return '<div id="i-am-a-id"><div class="i-am-a-class">i am test</div></div>';});

test/test.js

@@ -8,15 +8,18 @@ var fs = require('fs');
 
-var mode = ['format', 'default', 'compress'];
+var modes = ['format', 'default', 'compress'];
 
-var arr = [];
-
-mode.forEach(
-    function (val) {
-        arr.push( '// ' + val );
-        arr.push( html2js( html, {mode: val, wrap: true} ) );
+var output = modes.map(
+    function (mode) {
+        return ''
+            + '// '
+            + mode
+            + '\n'
+            + html2js(html, {
+                mode: mode,
+                wrap: true
+            });
     }
-);
+).join('\n');
 
-var output = arr.join('\n');
 console.log(output);
 fs.writeFile( filename + '.js', output );

No alert changes

Improved metrics

Number of lines in readme file

63

increased by5%

Worsened metrics

Total package byte prevSize

5392

decreased by-1.71%

Lines of code

128

decreased by-4.48%

No dependency changes