fix #775: transformTagName with allowBooleanAttributes adds an unnecessary attribute

Author: amitguptagwl

spec/transform_tagname_spec.js

@@ -33,4 +33,52 @@ describe("XMLParser", function() {
 
         expect(result).toEqual(expected);
     });
+    it("should parse tag name with attributes", function() {
+        const tagMap = { 'list-item': 'li' };
+        const xmlData = `<?xml version="1.0"?>
+            <root>
+                <ul>
+                    <list-item/>
+                    <list-item>foo</list-item>
+                    <list-item checked>bar</list-item>
+                    <list-item attr="value">bar</list-item>
+                </ul>
+            </root>`
+        const expected = {
+    "?xml": {
+        "@_version": "1.0"
+    },
+    "root": {
+        "ul": {
+            "li": [
+                "",
+                "foo",
+                {
+                    "#text": "bar",
+                    "@_checked": true
+                },
+                {
+                    "#text": "bar",
+                    "@_attr": "value"
+                }
+            ]
+        }
+    }
+}
+        const options = {
+                //preserveOrder: true,
+                allowBooleanAttributes: true,
+                ignoreAttributes: false,
+                transformTagName: (tagName) => tagMap[tagName] ?? tagName,
+        };
+        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

@@ -140,7 +140,7 @@ 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) {
   if (this.options.ignoreAttributes !== true && typeof attrStr === 'string') {
     // attrStr = attrStr.replace(/\r?\n/g, ' ');
     //attrStr = attrStr || attrStr.trim();
@@ -252,14 +252,14 @@ const parseXml = function(xmlData) {
 
         textData = this.saveTextToParentTag(textData, currentNode, jPath);
         if( (this.options.ignoreDeclaration && tagData.tagName === "?xml") || this.options.ignorePiTags){
-
+          //do nothing
         }else{
 
           const childNode = new xmlNode(tagData.tagName);
           childNode.add(this.options.textNodeName, "");
 
           if(tagData.tagName !== tagData.tagExp && tagData.attrExpPresent){
-            childNode[":@"] = this.buildAttributesMap(tagData.tagExp, jPath, tagData.tagName);
+            childNode[":@"] = this.buildAttributesMap(tagData.tagExp, jPath);
           }
           this.addChild(currentNode, childNode, jPath, i);
         }
@@ -306,7 +306,12 @@ const parseXml = function(xmlData) {
         let closeIndex = result.closeIndex;
 
         if (this.options.transformTagName) {
-          tagName = this.options.transformTagName(tagName);
+          //console.log(tagExp, tagName)
+          const newTagName = this.options.transformTagName(tagName);
+          if(tagExp === tagName) {
+            tagExp = newTagName
+          }
+          tagName = newTagName;
         }
 
         //save text as child node
@@ -357,7 +362,8 @@ const parseXml = function(xmlData) {
           const childNode = new xmlNode(tagName);
 
           if(tagName !== tagExp && attrExpPresent){
-            childNode[":@"] = this.buildAttributesMap(tagExp, jPath, tagName);
+            childNode[":@"] = this.buildAttributesMap(tagExp, jPath
+            );
           }
           if(tagContent) {
             tagContent = this.parseTextData(tagContent, tagName, jPath, true, attrExpPresent, true, true);
@@ -379,12 +385,16 @@ const parseXml = function(xmlData) {
             }
 
             if(this.options.transformTagName) {
-              tagName = this.options.transformTagName(tagName);
+              const newTagName = this.options.transformTagName(tagName);
+              if(tagExp === tagName) {
+                tagExp = newTagName
+              }
+              tagName = newTagName;
             }
 
             const childNode = new xmlNode(tagName);
             if(tagName !== tagExp && attrExpPresent){
-              childNode[":@"] = this.buildAttributesMap(tagExp, jPath, tagName);
+              childNode[":@"] = this.buildAttributesMap(tagExp, jPath);
             }
             this.addChild(currentNode, childNode, jPath, startIndex);
             jPath = jPath.substr(0, jPath.lastIndexOf("."));
@@ -395,7 +405,7 @@ const parseXml = function(xmlData) {
             this.tagsNodeStack.push(currentNode);
 
             if(tagName !== tagExp && attrExpPresent){
-              childNode[":@"] = this.buildAttributesMap(tagExp, jPath, tagName);
+              childNode[":@"] = this.buildAttributesMap(tagExp, jPath);
             }
             this.addChild(currentNode, childNode, jPath, startIndex);
             currentNode = childNode;
@@ -416,6 +426,7 @@ function addChild(currentNode, childNode, jPath, startIndex){
   if (!this.options.captureMetaData) startIndex = undefined;
   const result = this.options.updateTag(childNode.tagname, jPath, childNode[":@"])
   if(result === false){
+    //do nothing
   } else if(typeof result === "string"){
     childNode.tagname = result
     currentNode.addChild(childNode, startIndex);