Correctly append children; don't wrap text nodes

Author: CMTegner

index.js

@@ -27,29 +27,24 @@ JSONMLParser.prototype._createSourceOptions = function() {
     var transform = this;
     return {
         onopentag: function(tagName, attributes) {
-            var elementList = [];
-            var element = [tagName, attributes, elementList];
+            var element = [tagName];
+            if (!isEmpty(attributes)) {
+                element.push(attributes);
+            }
             transform._parent.push(element);
-            elementList.parent = transform._parent;
-            transform._parent = elementList;
+            element.parent = transform._parent;
+            transform._parent = element;
         },
         ontext: function(text) {
-            transform._parent.push(['#text', text]);
+            transform._parent.push(text);
         },
         oncomment: function(text) {
             transform._parent.push(['#comment', text]);
         },
         onclosetag: function() {
-            var p = transform._parent.parent;
-            // Delete elementList and/or attributes if empty
-            var lastChild = p[p.length - 1];
-            for (var i = 2; i > 0; i--) {
-                if (isEmpty(lastChild[i])) {
-                    lastChild.splice(i, 1);
-                }
-            }
+            var parent = transform._parent.parent;
             delete transform._parent.parent;
-            transform._parent = p;
+            transform._parent = parent;
         },
         onerror: function(err) {
             transform.emit('error', err);

test/04-nested-tags/expected.json

@@ -1,9 +1,9 @@
-[["ul", [
-    ["#text", "\n    "],
-    ["li", [["#text", "One"]]],
-    ["#text", "\n    "],
-    ["li", { "class": "selected" }, [["#text", "Two"]]],
-    ["#text", "\n    "],
-    ["li", [["#text", "Three"]]],
-    ["#text", "\n"]
-]]]
+[["ul",
+    "\n    ",
+    ["li", "One"],
+    "\n    ",
+    ["li", { "class": "selected" }, "Two"],
+    "\n    ",
+    ["li", "Three"],
+    "\n"
+]]

test/05-comments/expected.json

@@ -1,5 +1,5 @@
 [
     ["#comment", " this is a comment "],
-    ["#text", "\nNot a comment\n"],
+    "\nNot a comment\n",
     ["#comment", " another comment "]
 ]