cbml - npm Package Compare versions

Comparing version 0.0.3 to 0.0.4

package.json

 {
   "name": "cbml",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "CBML Parser",
@@ -32,4 +32,4 @@ "homepage": "https://github.com/cbml/cbmljs",
   "scripts": {
-    "test": "mocha -R spec && npm run coverage",
-    "dist": "jdists src/cbml.js -o cbml.js && uglifyjs cbml.js -o cbml.min.js -p 5 -c -m",
+    "test": "mocha -R spec",
+    "dist": "jdists src/cbml.js -o cbml.js -r debug && uglifyjs cbml.js -o cbml.min.js -p 5 -c -m",
     "lint": "jshint src/*.js"
@@ -36,0 +36,0 @@ },

src/cbml.js

@@ -1,2 +0,2 @@
-(function(exportName) {
+(function (exportName) {
 
@@ -31,3 +31,3 @@ 'use strict';
       /&((quot|lt|gt|amp|nbsp)|#x([a-f\d]+)|#(\d+));/ig,
-      function(all, group, key, hex, dec) {
+      function (all, group, key, hex, dec) {
         return key ? htmlDecodeDict[key.toLowerCase()] :
@@ -49,3 +49,3 @@ hex ? String.fromCharCode(parseInt(hex, 16)) :
     code = String(code).replace(/\r\n?|[\n\u2028\u2029]/g, '\n')
-        .replace(/^\uFEFF/, ''); // 数据清洗
+      .replace(/^\uFEFF/, ''); // 数据清洗
     options = options || {};
@@ -110,6 +110,8 @@ /**
     while (S.pos < S.text.length) {
-      // find tagName // 「<!--jdists」-->
+      // find tagName // 「《！--jdists」--》
+
       var match = S.text.substring(S.pos).match(
-        /(<!--|\/\*<|\(\*<|'''<|--\[\[<)\s*(\/?)([\w_-]+)\s*/
+        /(<!--|\/\*<|\(\*<|'''<|--\[\[<)(\/?)([\w_-]+)\s*|(<\/)([\w_-]+)(>\*\/|>\*\)|>'''|>\]\]|-->)/
       );
+
       if (!match) {
@@ -128,27 +130,55 @@ break;
 
-      switch (match[1]) {
-        case '<!--':
-          find = /^\s*(\/?-->)/;
+      if (!tag) {
+        tag = match[5];
+        switch (match[6]) {
+        case '-->':
           language = 'xml';
           break;
-        case '/*<':
-          find = /^\s*(\/?>\*\/)/;
+        case '>*/':
           language = 'c';
           break;
-        case '(*<':
-          find = /^\s*(\/?>\*\))/;
+        case '>*)':
           language = 'pascal';
           break;
-        case "'''<":
-          find = /^\s*(\/?>''')/;
+        case ">'''":
           language = 'python';
           break;
-        case "--[[<":
-          find = /^\s*(\/?>\]\])/;
+        case ">]]":
           language = 'lua';
           break;
+        }
+
+        pushToken('commentRight', S.pos, S.pos + offset, {
+          tag: tag,
+          language: language
+        });
+
+        continue;
       }
 
-      if (match[2] === '/') { // 闭合便签 // <!--「/」jdists-->
-        match = S.text.substring(S.pos + offset).match( // <!--/jdists「-->」
+      switch (match[1]) {
+      case '<!--':
+        find = /^\s*(\/?-->)/;
+        language = 'xml';
+        break;
+      case '/*<':
+        find = /^\s*(\/?>\*\/)/;
+        language = 'c';
+        break;
+      case '(*<':
+        find = /^\s*(\/?>\*\))/;
+        language = 'pascal';
+        break;
+      case "'''<":
+        find = /^\s*(\/?>''')/;
+        language = 'python';
+        break;
+      case "--[[<":
+        find = /^\s*(\/?>\]\])/;
+        language = 'lua';
+        break;
+      }
+
+      if (match[2] === '/') { // 闭合便签 // 《！--「/」jdists--》
+        match = S.text.substring(S.pos + offset).match( // 《！--/jdists「--》」
           find
@@ -168,3 +198,3 @@ );
       }
-      else { // 属性 // <!--/jdists「file="1.js" clean」-->」
+      else { // 属性 // 《！--/jdists「file="1.js" clean」--》」
 
@@ -195,6 +225,6 @@ // find attrs
           switch (attrValue[0]) {
-            case '"':
-            case "'":
-              attrValue = attrValue.slice(1, -1);
-              break;
+          case '"':
+          case "'":
+            attrValue = attrValue.slice(1, -1);
+            break;
           }
@@ -205,17 +235,17 @@ attrs[attrName] = decodeHTML(attrValue);
         switch (language) {
-          case 'xml':
-            find = /^\s*(\/?-->|>)/;
-            break;
-          case 'c':
-            find = /^\s*(\/?>\*\/|>)/;
-            break;
-          case 'pascal':
-            find = /^\s*(\/?>\*\)|>)/;
-            break;
-          case "python":
-            find = /^\s*(\/?>'''|>)/;
-            break;
-          case 'lua':
-            find = /^\s*(\/?>\]\]|>)/;
-            break;
+        case 'xml':
+          find = /^\s*(\/?-->|>)/;
+          break;
+        case 'c':
+          find = /^\s*(\/?>\*\/|>)/;
+          break;
+        case 'pascal':
+          find = /^\s*(\/?>\*\)|>)/;
+          break;
+        case "python":
+          find = /^\s*(\/?>'''|>)/;
+          break;
+        case 'lua':
+          find = /^\s*(\/?>\]\]|>)/;
+          break;
         }
@@ -227,35 +257,19 @@
         if (!match) {
-          throw new Error('parse error.');
+
+          var buffer = code.slice(0, S.pos + offset).split('\n');
+          var line = buffer.length;
+          var col = buffer[buffer.length - 1].length + 1;
+
+          throw 'parse error. (line:' + line + ' col:' + col + ')';
         }
         offset += match[0].length;
-        var left = '';
-        if (match[1] === '>') { // 需要闭合 // <!--/jdists>...</jdists-->」
-          left += '</' + tag;
-          switch (language) {
-            case 'xml':
-              left += '-->';
-              break;
-            case 'c':
-              left += '>*/';
-              break;
-            case 'pascal':
-              left += '>*)';
-              break;
-            case 'python':
-              left += ">'''";
-              break;
-            case 'lua':
-              left += ']';
-              break;
-          }
-
-          var pos = S.text.substring(S.pos + offset).indexOf(left);
-          if (pos >= 0) {
-            pushToken('comment', S.pos, S.pos + offset + pos + left.length, {
+        if (match[1] === '>') { // 需要闭合 // 《！--/jdists》...《/jdists--》」
+          pushToken('commentLeft',
+            S.pos,
+            S.pos + offset, {
               tag: tag,
               language: language,
-              attrs: attrs,
-              content: S.text.slice(S.pos + offset, S.pos + offset + pos)
-            });
-          }
+              attrs: attrs
+            }
+          );
         }
@@ -289,3 +303,3 @@ else {
     if (nodes) {
-      nodes.forEach(function(node) {
+      nodes.forEach(function (node) {
         return result += node.value;
@@ -316,55 +330,88 @@ });
     var tokens = tokenizer(code, options);
+    /*<debug>
+    console.log(JSON.stringify(tokens, null, '  '));
+    //</debug>*/
     var lefts = [];
-    tokens.forEach(function(token) {
+    var commentLefts = [];
+    var items = [];
+    tokens.forEach(function (token) {
       switch (token.type) {
-        case 'single':
-        case 'comment':
-        case 'text':
-          current.nodes.push(token);
-          if (root !== current) {
-            current.value += token.value;
-          }
-          current.endpos = token.endpos;
-          break;
-        case 'left':
-          token.nodes = [];
-          lefts.push(token);
-          current.nodes.push(token);
-          current = token;
-          break;
-        case 'right':
-          for (var i = lefts.length - 1; i >= 0; i--) {
-            var curr = lefts[i];
-            var prev = lefts[i - 1];
-            if (curr.tag === token.tag && curr.language === token.language) {
-              curr.type = 'block';
-              curr.value += token.value;
-              curr.endpos = token.endpos;
-              curr.content = nodesContent(curr.nodes);
+      case 'single':
+      case 'text':
+        current.nodes.push(token);
+        if (root !== current) {
+          current.value += token.value;
+        }
+        current.endpos = token.endpos;
+        break;
+      case 'commentLeft':
+      case 'left':
+        if (token.type === 'left') {
+          items = lefts;
+        }
+        else {
+          items = commentLefts;
+        }
+        token.nodes = [];
+        items.push(token);
+        current.nodes.push(token);
+        current = token;
+        break;
+      case 'commentRight':
+        if (token.type === 'right') {
+          items = lefts;
+        }
+        else {
+          items = commentLefts;
+        }
+        for (var i = items.length - 1; i >= 0; i--) {
+          var curr = items[i];
+          var prev = items[i - 1];
+          if (curr.tag === token.tag && curr.language === token.language) {
+            curr.type = 'block';
 
-              if (prev) {
-                current = prev;
-                current.value += curr.value;
-              }
-              else {
-                current = root;
-              }
-              current.endpos = curr.endpos;
-              lefts = lefts.slice(0, i);
-              break;
+            curr.value += token.value;
+            curr.endpos = token.endpos;
+            curr.content = nodesContent(curr.nodes);
+
+            if (prev) {
+              current = prev;
+              current.value += curr.value;
             }
-            else { // 不匹配的开始。。。
-              if (!prev) {
-                throw new Error('parse error.');
-              }
-              curr.type = 'text';
-              delete curr.nodes; // 移除子节点
-              delete curr.tag;
-              delete curr.attrs;
-              delete curr.language;
-              prev.value += curr.value;
-              prev.endpos = curr.endpos;
+            else {
+              current = root;
             }
+            current.endpos = curr.endpos;
+
+            // 计算前缀和后缀
+            if (curr.nodes && curr.nodes.length) {
+              var begin = curr.nodes[0];
+              var end = curr.nodes[curr.nodes.length - 1];
+              curr.prefix = curr.value.slice(0, begin.pos - curr.pos);
+              curr.suffix = curr.value.slice(-(curr.endpos - end.endpos));
+            }
+
+            items = items.slice(0, i);
+            break;
           }
-          break;
+          else { // 不匹配的开始。。。
+            if (!prev) {
+              throw new Error('parse error.');
+            }
+            curr.type = 'text';
+            delete curr.nodes; // 移除子节点
+            delete curr.tag;
+            delete curr.attrs;
+            delete curr.language;
+            prev.value += curr.value;
+            prev.endpos = curr.endpos;
+          }
+        }
+        if (token.type === 'right') {
+          lefts = items;
+        }
+        else {
+          commentLefts = items;
+        }
+        break;
       }
@@ -397,3 +444,3 @@ });
     if (define.amd || define.cmd) {
-      define(function() {
+      define(function () {
         return exports;
@@ -400,0 +447,0 @@ });

No alert changes

Improved metrics

Total package byte prevSize

13283

increased by7.16%

Lines of code

448

increased by9.27%

No dependency changes