fast-xml-parser 4.0.4 → 4.0.7

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 Note: If you find missing information about particular minor version, that version must have been changed without any functional change in this library.
 
+**4.0.7 / 2022-03-18**
+* support CDATA even if tag order is not preserved
+* support Comments even if tag order is not preserved
+* fix #446: XMLbuilder should not indent XML declaration
+
+**4.0.6 / 2022-03-08**
+* fix: call tagValueProcessor only once for array items
+* fix: missing changed for #437
+
+**4.0.5 / 2022-03-06**
+* fix #437: call tagValueProcessor from XML builder
+
 **4.0.4 / 2022-03-03**
 * fix #435: should skip unpaired and self-closing nodes when set as stopnodes
 

package/README.md

@@ -18,6 +18,9 @@ Validate XML, Parse XML to JS Object, or Build XML from JS Object without C/C++
 
 Check [ThankYouBackers](https://github.com/NaturalIntelligence/ThankYouBackers) for our contributors
 
+>Want to focus more on opensource, further study, and family. So open for part-time good job in technical architect, node js backend developer, research assistant, or IT teacher. https://amitkumargupta.work/
+
+[![](static/img/ni_ads_ads.gif)](https://github.com/NaturalIntelligence/ads/)
 ## Users
 
 <a href="https://github.com/renovatebot/renovate" title="renovate" ><img src="https://avatars1.githubusercontent.com/u/38656520" width="60px" ></a>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fast-xml-parser",
-  "version": "4.0.4",
+  "version": "4.0.7",
   "description": "Validate XML, Parse XML, Build XML without C/C++ based libraries",
   "main": "./src/fxp.js",
   "scripts": {

package/src/xmlbuilder/json2xml.js

@@ -156,7 +156,7 @@ function buildAttrPairStr(attrName, val){
 function processTextOrObjNode (object, key, level) {
   const result = this.j2x(object, level + 1);
   if (object[this.options.textNodeName] !== undefined && Object.keys(object).length === 1) {
-    return this.buildTextNode(result.val, key, result.attrStr, level);
+    return this.buildTextNode(object[this.options.textNodeName], key, result.attrStr, level);
   } else {
     return this.buildObjNode(result.val, key, result.attrStr, level);
   }
@@ -172,11 +172,10 @@ function buildObjectNode(val, key, attrStr, level) {
   }
 
   if (attrStr && val.indexOf('<') === -1) {
-    return (
-      this.indentate(level) + '<' +  key + attrStr + piClosingChar + '>' +
-      val +
-      tagEndExp    );
-  } else {
+    return ( this.indentate(level) + '<' +  key + attrStr + piClosingChar + '>' + val + tagEndExp );
+  } else if (this.options.commentPropName !== false && key === this.options.commentPropName && piClosingChar.length === 0) {
+    return this.indentate(level) + `<!--${val}-->` + this.newLine;
+  }else {
     return (
       this.indentate(level) + '<' + key + attrStr + piClosingChar + this.tagEndChar +
       val +
@@ -194,19 +193,27 @@ function buildEmptyObjNode(val, key, attrStr, level) {
 }
 
 function buildTextValNode(val, key, attrStr, level) {
-  const textValue = this.replaceEntitiesValue(val);
-
-  if( textValue === '' && this.options.unpairedTags.indexOf(key) !== -1){ //unpaired
-    if(this.options.suppressUnpairedNode){
-      return this.indentate(level) + '<' + key + this.tagEndChar;
-    }else{
-      return this.indentate(level) + '<' + key + "/" + this.tagEndChar;
-    }
+  if (this.options.cdataPropName !== false && key === this.options.cdataPropName) {
+    return this.indentate(level) + `<![CDATA[${val}]]>` +  this.newLine;
+  }else if (this.options.commentPropName !== false && key === this.options.commentPropName) {
+    return this.indentate(level) + `<!--${val}-->` +  this.newLine;
   }else{
-    return (
-      this.indentate(level) + '<' + key + attrStr + '>' +
-       textValue +
-      '</' + key + this.tagEndChar  );
+    let textValue = this.options.tagValueProcessor(key, val);
+    textValue = this.replaceEntitiesValue(textValue);
+  
+    if( textValue === '' && this.options.unpairedTags.indexOf(key) !== -1){ //unpaired
+      if(this.options.suppressUnpairedNode){
+        return this.indentate(level) + '<' + key + this.tagEndChar;
+      }else{
+        return this.indentate(level) + '<' + key + "/" + this.tagEndChar;
+      }
+    } else{
+      return (
+        this.indentate(level) + '<' + key + attrStr + '>' +
+         textValue +
+        '</' + key + this.tagEndChar  );
+    }
+
   }
 }
 

package/src/xmlbuilder/orderedJs2Xml.js

@@ -41,7 +41,10 @@ function arrToStr(arr, options, jPath, level){
             continue;
         }else if( tagName[0] === "?"){
             const attStr = attr_to_str(tagObj[":@"], options);
-            xmlStr += indentation + `<${tagName} ${tagObj[tagName][0][options.textNodeName]} ${attStr}?>`;
+            const tempInd = tagName === "?xml" ? "" : indentation;
+            let piTextNodeName = tagObj[tagName][0][options.textNodeName];
+            piTextNodeName = piTextNodeName.length !== 0 ? " " + piTextNodeName : ""; //remove extra spacing
+            xmlStr += tempInd + `<${tagName}${piTextNodeName}${attStr}?>`;
             continue;
         }
         const attStr = attr_to_str(tagObj[":@"], options);