fix (#785) unpairedTag node should not have tag content

Author: amitguptagwl

spec/unpairedTags_spec.js

@@ -531,4 +531,27 @@ describe("unpaired tas position", function () {
 
   });
 
+  it("XMLParser should not move tag data into the unpairedTag node #785", function () {
+
+    const xmlData = `<p>hello<br>world</p>`;
+    const options = {
+      ignoreAttributes: false,
+      unpairedTags: ["hr", "br", "link", "meta"],
+    };
+    const expected = {
+      "p": {
+          "br": "",
+          "#text": "helloworld"
+      }
+  }
+    const parser = new XMLParser(options);
+    // console.log(JSON.stringify(parser.parse(xml)));
+
+    let result = parser.parse(xmlData);
+
+    // console.log(JSON.stringify(result, null, 4));
+    expect(result).toEqual(expected);
+
+  });
+
 });

src/xmlparser/OrderedObjParser.js

@@ -414,6 +414,17 @@ const parseXml = function (xmlData) {
             this.addChild(currentNode, childNode, jPath, startIndex);
             jPath = jPath.substr(0, jPath.lastIndexOf("."));
           }
+          else if(this.options.unpairedTags.indexOf(tagName) !== -1){//unpaired tag
+            const childNode = new xmlNode(tagName);
+            if(tagName !== tagExp && attrExpPresent){
+              childNode[":@"] = this.buildAttributesMap(tagExp, jPath);
+            }
+            this.addChild(currentNode, childNode, jPath, startIndex);
+            jPath = jPath.substr(0, jPath.lastIndexOf("."));
+            i = result.closeIndex;
+            // Continue to next iteration without changing currentNode
+            continue;
+          }
           //opening tag
           else {
             const childNode = new xmlNode(tagName);
@@ -535,19 +546,19 @@ const replaceEntitiesValue = function (val, tagName, jPath) {
 }
 
 
-function saveTextToParentTag(textData, currentNode, jPath, isLeafNode) {
+function saveTextToParentTag(textData, parentNode, jPath, isLeafNode) {
   if (textData) { //store previously collected data as textNode
-    if (isLeafNode === undefined) isLeafNode = currentNode.child.length === 0
+    if (isLeafNode === undefined) isLeafNode = parentNode.child.length === 0
 
     textData = this.parseTextData(textData,
-      currentNode.tagname,
+      parentNode.tagname,
       jPath,
       false,
-      currentNode[":@"] ? Object.keys(currentNode[":@"]).length !== 0 : false,
+      parentNode[":@"] ? Object.keys(parentNode[":@"]).length !== 0 : false,
       isLeafNode);
 
     if (textData !== undefined && textData !== "")
-      currentNode.add(this.options.textNodeName, textData);
+      parentNode.add(this.options.textNodeName, textData);
     textData = "";
   }
   return textData;