Entity declarations with XML elements or other entities

lib/sax.js

@@ -164,6 +164,7 @@
   } catch (ex) {
     Stream = function () {}
   }
+  if (!Stream) Stream = function () {}
 
   var streamWraps = sax.EVENTS.filter(function (ev) {
     return ev !== 'error' && ev !== 'end'
@@ -1482,9 +1483,16 @@
           }
 
           if (c === ';') {
-            parser[buffer] += parseEntity(parser)
-            parser.entity = ''
-            parser.state = returnState
+            if (parser.opt.unparsedEntities) {
+              var parsedEntity = parseEntity(parser)
+              parser.entity = ''
+              parser.state = returnState
+              parser.write(parsedEntity)
+            } else {
+              parser[buffer] += parseEntity(parser)
+              parser.entity = ''
+              parser.state = returnState
+            }
           } else if (isMatch(parser.entity.length ? entityBody : entityStart, c)) {
             parser.entity += c
           } else {

test/entity-attr.js

@@ -0,0 +1,12 @@
+var sax = require('../');
+sax.ENTITIES.elem = '<B/>';
+require(__dirname).test({
+  opt: {unparsedEntities: true},
+  xml: `<A ATTR="&elem;"/>`,
+  expect: [
+    ["opentagstart", {name: "A", attributes: {}}],
+    ["attribute", {name: 'ATTR', value: "<B/>"}],
+    ["opentag", {name: "A", attributes: {ATTR: "<B/>"}, isSelfClosing: true}],
+    ["closetag", "A"]
+  ]
+});

test/entity-elem.js

@@ -0,0 +1,19 @@
+var sax = require('../');
+sax.ENTITIES.attr = "1";
+sax.ENTITIES.text = "2.&attr;";
+sax.ENTITIES.elem = '<B ATTR="&attr;.3"/>';
+require(__dirname).test({
+  opt: {unparsedEntities: true},
+  xml: `<A ATTR="&attr;.2">&text;&elem;</A>`,
+  expect: [
+    ["opentagstart", {name: "A", attributes: {}}],
+    ["attribute", {name: 'ATTR', value: "1.2"}],
+    ["opentag", {name: "A", attributes: {ATTR: "1.2"}, isSelfClosing: false}],
+    ["text", "2.1"],
+    ["opentagstart", {name: "B", attributes: {}}],
+    ["attribute", {name: 'ATTR', value: "1.3"}],
+    ["opentag", {name: "B", attributes: {ATTR: "1.3"}, isSelfClosing: true}],
+    ["closetag", "B"],
+    ["closetag", "A"]
+  ]
+});

test/entity-recursive.js

@@ -0,0 +1,13 @@
+var sax = require('../');
+sax.ENTITIES.attr = "1";
+sax.ENTITIES.text = "2.&attr;";
+require(__dirname).test({
+  opt: {unparsedEntities: true},
+  xml: `<A>&text;</A>`,
+  expect: [
+    ["opentagstart", {name: "A", attributes: {}}],
+    ["opentag", {name: "A", attributes: {}, isSelfClosing: false}],
+    ["text", "2.1"],
+    ["closetag", "A"]
+  ]
+});