Never allow for a level lower than -1

use solution from #26

Author: jperl

lib/parse.js

@@ -15,10 +15,11 @@ module.exports = function parse(html, options) {
     var byTag = {};
     var inComponent = false;
 
-    if (!new RegExp(tagRE).test(html)) {
+    if (html.indexOf('<') !== 0) {
+        var end = html.indexOf('<');
         result.push({
             type: 'text',
-            content: html
+            content: end === -1 ? html : html.substring(0, end)
         });
     }
 
@@ -68,7 +69,10 @@ module.exports = function parse(html, options) {
         }
 
         if (!isOpen || current.voidElement) {
-            level--;
+            if (level > -1 && (current.voidElement || current.name === tag.slice(2, tag.indexOf(' ')))) {
+                level--;
+            }
+
             if (!inComponent && nextChar !== '<' && nextChar) {
                 // trailing text node
                 // if we're at the root, push a base text node. otherwise add as
@@ -87,8 +91,10 @@ module.exports = function parse(html, options) {
                     });
                 }
             }
+
+            current = arr[level];
         }
     });
 
     return result;
-};
+};

test/parse.js

@@ -303,12 +303,6 @@ test('parse', function (t) {
         children: []
     }], 'should not explode on trailing whitespace');
 
-    html = ' Hi There ';
-    parsed = HTML.parse(html);
-    t.deepEqual(parsed, [{
-        type: 'text', content: ' Hi There '
-    }], 'should handle text nodes at the top-level');
-
     html = '<div>Hi</div> There ';
     parsed = HTML.parse(html);
     t.deepEqual(parsed, [{
@@ -323,6 +317,26 @@ test('parse', function (t) {
         type: 'text', content: ' There '
     }], 'should handle trailing text nodes at the top-level');
 
+    html = 'Hi <div>There</div>';
+    parsed = HTML.parse(html);
+    t.deepEqual(parsed, [{
+        type: 'text', content: 'Hi '
+    }, {
+        type: 'tag',
+        name: 'div',
+        attrs: {},
+        voidElement: false,
+        children: [
+            { type: 'text', content: 'There' }
+        ]
+    }], 'should handle leading text nodes at the top-level');
+
+    html = 'Hi There';
+    parsed = HTML.parse(html);
+    t.deepEqual(parsed, [{
+        type: 'text', content: 'Hi There'
+    }], 'should handle plain strings of text with no tags');
+
     html = '<div>Hi</div> There <span>something</span> <a></a>else ';
     parsed = HTML.parse(html);
     t.deepEqual(parsed, [{
@@ -391,6 +405,41 @@ test('parse', function (t) {
         voidElement: false,children: [ { content: '\n      !function() {\n        var cookies = document.cookie ? document.cookie.split(\';\') : [];\n        //                |   this less than is triggering probems\n        for (var i = 0; i ', type: 'text' } ]
     }], 'should parse a script tag');
 
+    html = '<div>Hi</span>There</div>';
+    parsed = HTML.parse(html);
+    t.deepEqual(parsed, [{
+        type: 'tag',
+        name: 'div',
+        attrs: {},
+        voidElement: false,
+        children: [
+            { type: 'text', content: 'Hi' },
+            { type: 'text', content: 'There' }
+        ]
+    }], 'should skip over closing tags that don\'t match the current tag name');
+
+    html = '<p>Hi There</p></span>root text</p><p>Try again</p>';
+    parsed = HTML.parse(html);
+    t.deepEqual(parsed, [{
+        type: 'tag',
+        name: 'p',
+        attrs: {},
+        voidElement: false,
+        children: [
+            { type: 'text', content: 'Hi There' }
+        ]
+    },{
+        type: 'text',
+        content: 'root text'
+    }, {
+        type: 'tag',
+        name: 'p',
+        attrs: {},
+        voidElement: false,
+        children: [
+            { type: 'text', content: 'Try again' }
+        ]
+    }], 'should not go lower than the root level (-1)');
     t.end();
 });