Emit each top-level node as separate data events

Author: CMTegner

index.js

@@ -9,7 +9,6 @@ util.inherits(JSONMLParser, Transform);
 function JSONMLParser() {
     Transform.call(this);
     this._readableState.objectMode = true;
-    this._parent = [];
     this.source = new Parser(this._createSourceOptions());
 }
 
@@ -21,37 +20,41 @@ JSONMLParser.prototype._transform = function(chunk, encoding, done) {
 JSONMLParser.prototype._flush = function(done) {
     this._onParseDone = done;
     this.source.end();
-    done();
 };
 
 JSONMLParser.prototype._createSourceOptions = function() {
     var transform = this;
+    var parent;
     return {
         onopentag: function(tagName, attributes) {
             var element = [tagName];
             if (!isEmpty(attributes)) {
                 element.push(attributes);
             }
-            transform._parent.push(element);
-            element.parent = transform._parent;
-            transform._parent = element;
+            if (parent) {
+                parent.push(element);
+                element.parent = parent;
+            }
+            parent = element;
         },
         ontext: function(text) {
-            transform._parent.push(decode(text));
+            (parent || transform).push(decode(text));
         },
         oncomment: function(text) {
-            transform._parent.push(['#comment', text]);
+            (parent || transform).push(['#comment', text]);
         },
         onclosetag: function() {
-            var parent = transform._parent.parent;
-            delete transform._parent.parent;
-            transform._parent = parent;
+            var p = parent.parent;
+            delete parent.parent;
+            if (!p) {
+                transform.push(parent);
+            }
+            parent = p;
         },
         onerror: function(err) {
             transform.emit('error', err);
         },
         onend: function() {
-            transform.push(transform._parent);
             transform._onParseDone();
         }
     };
@@ -62,8 +65,15 @@ module.exports = function(markup, callback) {
     if (isEmpty(arguments)) {
         return parser;
     } else {
+        var result = [];
         parser.on('data', function(data) {
-            callback(null, data);
+            result.push(data);
+        });
+        parser.on('end', function() {
+            if (result.length < 2) {
+                result = result[0];
+            }
+            callback(null, result);
         });
         parser.on('error', callback);
         parser.end(markup);

package.json

@@ -7,7 +7,7 @@
     "jshint": "jshint index.js test",
     "jscs": "jscs index.js test",
     "validate": "npm run jshint && npm run jscs",
-    "testling": "browserify -t brfs test/test.js | testling",
+    "testling": "browserify test/test.js | testling",
     "unit": "(cd test; covert test.js && ./cli.sh)",
     "test": "npm run validate && npm run unit"
   },
@@ -38,7 +38,6 @@
     "nomnom": "^1.8.0"
   },
   "devDependencies": {
-    "brfs": "^1.2.0",
     "browserify": "^5.9.1",
     "covert": "^0.4.0",
     "jscs": "^1.5.9",

test/01-empty/expected.json

@@ -1,13 +1,12 @@
-var fs = require('fs');
 var test = require('tape');
 var Transform = require('stream').Transform;
 var parse = require('../');
 
 function verify(markup, expected, t) {
-    var result;
+    var result = [];
     parse()
         .on('data', function(data) {
-            result = data;
+            result.push(data);
         })
         .on('end', function() {
             t.deepEqual(result, expected);
@@ -27,47 +26,80 @@ test('should not return anything in \'callback mode\'', function(t) {
     t.end();
 });
 
-test('should emit an empty array for empty input markup', function(t) {
-    var markup = fs.readFileSync(__dirname + '/01-empty/markup.html', 'utf8');
-    var expected = require('./01-empty/expected.json');
-    verify(markup, expected, t);
+test('should not emit anything for empty input markup', function(t) {
+    verify('', [], t);
 });
 
 test('should not set a node-list array on the node if it has no children', function(t) {
-    var markup = fs.readFileSync(__dirname + '/02-single-shallow-tag/markup.html', 'utf8');
-    var expected = require('./02-single-shallow-tag/expected.json');
+    var markup = '<button class="btn"></button>';
+    var expected = [['button', { 'class': 'btn' }]];
     verify(markup, expected, t);
 });
 
 test('should not set a attribute hash on the node if it has none', function(t) {
-    var markup = fs.readFileSync(__dirname + '/03-no-attributes/markup.html', 'utf8');
-    var expected = require('./03-no-attributes/expected.json');
+    var markup = '<div></div>';
+    var expected = [['div']];
     verify(markup, expected, t);
 });
 
 test('should parse nested tags and text nodes', function(t) {
-    var markup = fs.readFileSync(__dirname + '/04-nested-tags/markup.html', 'utf8');
-    var expected = require('./04-nested-tags/expected.json');
+    var markup =
+        '<ul>\n' +
+        '    <li>One</li>\n' +
+        '    <li class="selected">Two</li>\n' +
+        '    <li>Three</li>\n' +
+        '</ul>';
+    var expected = [['ul',
+        '\n    ',
+        ['li', 'One'],
+        '\n    ',
+        ['li', { 'class': 'selected' }, 'Two'],
+        '\n    ',
+        ['li', 'Three'],
+        '\n'
+    ]];
     verify(markup, expected, t);
 });
 
 test('should parse comments', function(t) {
-    var markup = fs.readFileSync(__dirname + '/05-comments/markup.html', 'utf8');
-    var expected = require('./05-comments/expected.json');
+    var markup =
+        '<!-- this is a comment -->\n' +
+        'Not a comment\n' +
+        '<!-- another comment -->';
+    var expected = [
+        ['#comment', ' this is a comment '],
+        '\nNot a comment\n',
+        ['#comment', ' another comment ']
+    ];
     verify(markup, expected, t);
 });
 
 test('should convert HTML entities into unicode characters', function(t) {
-    var markup = fs.readFileSync(__dirname + '/06-html-entities/markup.html', 'utf8');
-    var expected = require('./06-html-entities/expected.json');
+    var markup =
+        '<button class="close">&times;</button>\n' +
+        '&laquo;Yeah, ok&raquo;\n' +
+        '&aelig;&oslash;&aring;\n' +
+        '&copy; Awesome Inc.';
+    var expected = [
+        ['button', { 'class': 'close' }, '×'],
+        '\n«Yeah, ok»\næøå\n© Awesome Inc.'
+    ];
     verify(markup, expected, t);
 });
 
 test('should also offer a node-style callback API', function(t) {
     parse('<div></div>', function(err, result) {
         t.notOk(err);
-        t.deepEqual(result, [['div']]);
-        t.end();
+        t.deepEqual(result, ['div']);
+        parse('<b></b><i><u></u></i>', function(err, result) {
+            t.notOk(err);
+            t.deepEqual(result, [['b'], ['i', ['u']]]);
+            parse('', function(err, result) {
+                t.notOk(err);
+                t.equal(result, undefined);
+                t.end();
+            });
+        });
     });
 });