set xml version to decoder even if attributes are ignored

Author: amitguptagwl

spec/entities_spec.js

@@ -718,4 +718,38 @@ describe("@nodable/entities", function () {
 
         expect(result).toEqual(expected);
     })
+
+    it("should remove '#x1B' ncr as per XML version 1.0 with default config", function () {
+
+        const xmlData = `<?xml version="1.0" ?><root>&#x1B;&#27;</root>`;
+        const expected = {
+            "root": '&#x1B;&#27;'
+        }
+        const options = {
+            //ignoreAttributes: false, //should work without this
+            processEntities: true,
+            // htmlEntities: true
+        };
+        const parser = new XMLParser(options);
+        let result = parser.parse(xmlData);
+        // console.log(JSON.stringify(result, null, 4));
+
+        expect(result.root.length).toEqual(0);
+    })
+    it("should leave '#x1B' ncr as per XML version 1.1 with default config", function () {
+
+        const xmlData = `<?xml version="1.1" ?><root>&#x1B;&#27;</root>`;
+        const expected = {
+            "root": '&#x1B;&#27;'
+        }
+        const options = {
+            //ignoreAttributes: false, //should work without this
+            processEntities: true
+        };
+        const parser = new XMLParser(options);
+        let result = parser.parse(xmlData);
+        // console.log(JSON.stringify(result, null, 4));
+
+        expect(result.root.length).toEqual(11);
+    })
 })

src/xmlparser/OrderedObjParser.js

@@ -193,9 +193,9 @@ function resolveNameSpace(tagname) {
 //const attrsRegx = new RegExp("([\\w\\-\\.\\:]+)\\s*=\\s*(['\"])((.|\n)*?)\\2","gm");
 const attrsRegx = new RegExp('([^\\s=]+)\\s*(=\\s*([\'"])([\\s\\S]*?)\\3)?', 'gm');
 
-function buildAttributesMap(attrStr, jPath, tagName) {
+function buildAttributesMap(attrStr, jPath, tagName, force = false) {
   const options = this.options;
-  if (options.ignoreAttributes !== true && typeof attrStr === 'string') {
+  if (force === true || (options.ignoreAttributes !== true && typeof attrStr === 'string')) {
     // attrStr = attrStr.replace(/\r?\n/g, ' ');
     //attrStr = attrStr || attrStr.trim();
 
@@ -339,9 +339,10 @@ const parseXml = function (xmlData) {
         if (!tagData) throw new Error("Pi Tag is not closed.");
 
         textData = this.saveTextToParentTag(textData, currentNode, this.readonlyMatcher);
-        const attsMap = this.buildAttributesMap(tagData.tagExp, this.matcher, tagData.tagName);
-        if (attsMap && attsMap["version"]) {
-          this.entityDecoder.setXmlVersion(attsMap["version"]);
+        const attsMap = this.buildAttributesMap(tagData.tagExp, this.matcher, tagData.tagName, true);
+        if (attsMap) {
+          const ver = attsMap[this.options.attributeNamePrefix + "version"];
+          this.entityDecoder.setXmlVersion(Number(ver) || 1.0);
         }
         if ((options.ignoreDeclaration && tagData.tagName === "?xml") || options.ignorePiTags) {
           //do nothing
@@ -350,7 +351,7 @@ const parseXml = function (xmlData) {
           const childNode = new xmlNode(tagData.tagName);
           childNode.add(options.textNodeName, "");
 
-          if (tagData.tagName !== tagData.tagExp && tagData.attrExpPresent) {
+          if (tagData.tagName !== tagData.tagExp && tagData.attrExpPresent && options.ignoreAttributes !== true) {
             childNode[":@"] = attsMap
           }
           this.addChild(currentNode, childNode, this.readonlyMatcher, i);
@@ -472,6 +473,7 @@ const parseXml = function (xmlData) {
 
           if (prefixedAttrs) {
             // Extract raw attributes (without prefix) for our use
+            //TODO: seems a performance overhead
             rawAttrs = extractRawAttributes(prefixedAttrs, options);
           }
         }