fix bug with multiple components

Author: HenrikJoreteg

index.js

@@ -1,8 +1,4 @@
-var parse = require('./lib/parse');
-var stringify = require('./lib/stringify');
-
-
 module.exports = {
-    parse: parse,
-    stringify: stringify
+    parse: require('./lib/parse'),
+    stringify: require('./lib/stringify')
 };

lib/parse.js

@@ -14,9 +14,13 @@ module.exports = function parse(html, options) {
     var inComponent = false;
 
     html.replace(tagRE, function (tag, index) {
-        if (inComponent && tag !== ('</' + current.name + '>')) {
-            return;
-        }
+        if (inComponent) {
+            if (tag !== ('</' + current.name + '>')) {
+                return;
+            } else {
+                inComponent = false;
+            }
+        } 
         var isOpen = tag.charAt(1) !== '/';
         var start = index + tag.length;
         var nextChar = html.charAt(start);
@@ -33,7 +37,7 @@ module.exports = function parse(html, options) {
                 inComponent = true;
             }
 
-            if (nextChar !== '<') {
+            if (!inComponent && nextChar !== '<') {
                 current.children.push({
                     type: 'text',
                     content: html.slice(start, html.indexOf('<', start))

test/parse.js

@@ -158,5 +158,39 @@ test('parse', function (t) {
         ]
     }, 'should not include children of registered components in AST');
 
+    html = '<div><my-component thing="one">ok</my-component><my-component thing="two">ok</my-component></div>';
+    parsed = HTML.parse(html, {
+        components: {
+            'my-component': 'something'
+        }
+    });
+
+    t.deepEqual(parsed, {
+        type: 'tag',
+        name: 'div',
+        attrs: {},
+        selfClosing: false,
+        children: [
+            {
+                type: 'component',
+                name: 'my-component',
+                attrs: {
+                    thing: 'one'
+                },
+                selfClosing: false,
+                children: []
+            },
+            {
+                type: 'component',
+                name: 'my-component',
+                attrs: {
+                    thing: 'two'
+                },
+                selfClosing: false,
+                children: []
+            }
+        ]
+    })
+
     t.end();
 });