fix #435: should skip unpaired and self-closing nodes

NaturalIntelligence · Mar 3, 2022 · 83fef6d · 83fef6d
1 parent 7788846
commit 83fef6d
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 3 deletions.
diff --git a/spec/stopNodes_spec.js b/spec/stopNodes_spec.js
@@ -251,4 +251,48 @@ describe("XMLParser StopNodes", function() {
 
         expect(expected).toEqual(result);
   });
+
+  it("should skip self-closing stop nodes", function() {
+      const XMLdata = `<root><foo name="bar"></foo><bar name="bar"/></root>`;
+
+      const expected = [{
+          root: [
+            { foo: [ { '#text': '' } ] },
+            { bar: [ { '#text': '' } ] }
+          ]
+      }];
+
+        const options = {
+          // ignoreAttributes: true,
+          stopNodes: ["*.foo", "*.bar"],
+          preserveOrder: true,
+        };
+        const parser = new XMLParser(options);
+        let result = parser.parse(XMLdata);
+        // console.log(JSON.stringify(result, null,4));
+
+        expect(expected).toEqual(result);
+  });
+  it("should skip unpaired stop nodes", function() {
+      const XMLdata = `<root><foo name="bar"></foo><bar name="bar"></root>`;
+
+      const expected = [{
+          root: [
+            { foo: [ { '#text': '' } ] },
+            { bar: [ { '#text': '' } ] }
+          ]
+      }];
+
+        const options = {
+          // ignoreAttributes: true,
+          stopNodes: ["*.foo", "*.bar"],
+          unpairedTags: ["bar"],
+          preserveOrder: true,
+        };
+        const parser = new XMLParser(options);
+        let result = parser.parse(XMLdata);
+        // console.log(JSON.stringify(result, null,4));
+
+        expect(expected).toEqual(result);
+  });
 });
diff --git a/src/xmlparser/OrderedObjParser.js b/src/xmlparser/OrderedObjParser.js
@@ -285,9 +285,13 @@ const parseXml = function(xmlData) {
         if (this.isItStopNode(this.options.stopNodes, jPath, tagName)) { //TODO: namespace
           let tagContent = "";
           //self-closing tag
-          if(tagExp.length > 0 && tagExp.lastIndexOf("/") === tagExp.length - 1){}
+          if(tagExp.length > 0 && tagExp.lastIndexOf("/") === tagExp.length - 1){
+            i = result.closeIndex;
+          }
           //boolean tag
-          else if(this.options.unpairedTags.indexOf(tagName) !== -1){}
+          else if(this.options.unpairedTags.indexOf(tagName) !== -1){
+            i = result.closeIndex;
+          }
           //normal tag
           else{
             //read until closing tag is found
@@ -312,7 +316,6 @@ const parseXml = function(xmlData) {
         }else{
   //selfClosing tag
           if(tagExp.length > 0 && tagExp.lastIndexOf("/") === tagExp.length - 1){
-
             if(tagName[tagName.length - 1] === "/"){ //remove trailing '/'
               tagName = tagName.substr(0, tagName.length - 1);
               tagExp = tagName;