fast-xml-parser 4.0.0 → 4.0.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 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.1 / 2022-01-08**
+* fix builder for pi tag
+* fix: support suppressBooleanAttrs by builder
+
 **4.0.0 / 2022-01-06**
 * Generating different combined, parser only, builder only, validator only browser bundles
 * Keeping cjs modules as they can be imported in cjs and esm modules both. Otherwise refer `esm` branch.

package/README.md

@@ -1,7 +1,6 @@
 # [fast-xml-parser](https://www.npmjs.com/package/fast-xml-parser)
 [![Backers on Open Collective](https://opencollective.com/fast-xml-parser/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/fast-xml-parser/sponsors/badge.svg)](#sponsors) [![Known Vulnerabilities](https://snyk.io/test/github/naturalintelligence/fast-xml-parser/badge.svg)](https://snyk.io/test/github/naturalintelligence/fast-xml-parser)
 [![NPM quality][quality-image]][quality-url]
-[![Travis ci Build Status](https://travis-ci.org/NaturalIntelligence/fast-xml-parser.svg?branch=master)](https://travis-ci.org/NaturalIntelligence/fast-xml-parser)
 [![Coverage Status](https://coveralls.io/repos/github/NaturalIntelligence/fast-xml-parser/badge.svg?branch=master)](https://coveralls.io/github/NaturalIntelligence/fast-xml-parser?branch=master)
 [<img src="https://img.shields.io/badge/Try-me-blue.svg?colorA=FFA500&colorB=0000FF" alt="Try me"/>](https://naturalintelligence.github.io/fast-xml-parser/)
 [![NPM total downloads](https://img.shields.io/npm/dt/fast-xml-parser.svg)](https://npm.im/fast-xml-parser)
@@ -117,9 +116,9 @@ Check lib folder for different browser bundles
 2.  [XML Parser](./docs/v4/2.XMLparseOptions.md)
 3.  [XML Builder](./docs/v4/3.XMLBuilder.md)
 4.  [XML Validator](./docs/v4/4.XMLValidator.md)
-5.  [Entites](./docs/5.Entities.md)
-6.  [HTML Document Parsing](./docs/6.HTMLParsing.md)
-7. [PI Tag processing](./docs/7.PITags.md)
+5.  [Entites](./docs/v4/5.Entities.md)
+6.  [HTML Document Parsing](./docs/v4/6.HTMLParsing.md)
+7. [PI Tag processing](./docs/v4/7.PITags.md)
 ## Performance
 
 ### XML Parser

package/package.json

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

package/src/xmlbuilder/json2xml.js

@@ -68,6 +68,7 @@ function Builder(options) {
   this.buildObjectNode = buildObjectNode;
 
   this.replaceEntitiesValue = replaceEntitiesValue;
+  this.buildAttrPairStr = buildAttrPairStr;
 }
 
 Builder.prototype.build = function(jObj) {
@@ -90,16 +91,16 @@ Builder.prototype.j2x = function(jObj, level) {
     if (typeof jObj[key] === 'undefined') {
       // supress undefined node
     } else if (jObj[key] === null) {
-      val += this.indentate(level) + '<' + key + '/' + this.tagEndChar;
+      if(key[0] === "?") val += this.indentate(level) + '<' + key + '?' + this.tagEndChar;
+      else val += this.indentate(level) + '<' + key + '/' + this.tagEndChar;
+      // val += this.indentate(level) + '<' + key + '/' + this.tagEndChar;
     } else if (jObj[key] instanceof Date) {
       val += this.buildTextNode(jObj[key], key, '', level);
     } else if (typeof jObj[key] !== 'object') {
       //premitive type
       const attr = this.isAttribute(key);
       if (attr) {
-        let val = this.options.attributeValueProcessor(attr, '' + jObj[key]);
-        val = this.replaceEntitiesValue(val);
-        attrStr += ' ' + attr + '="' + val + '"';
+        attrStr += this.buildAttrPairStr(attr, '' + jObj[key]);
       }else {
         //tag value
         if (key === this.options.textNodeName) {
@@ -117,7 +118,9 @@ Builder.prototype.j2x = function(jObj, level) {
         if (typeof item === 'undefined') {
           // supress undefined node
         } else if (item === null) {
-          val += this.indentate(level) + '<' + key + '/' + this.tagEndChar;
+          if(key[0] === "?") val += this.indentate(level) + '<' + key + '?' + this.tagEndChar;
+          else val += this.indentate(level) + '<' + key + '/' + this.tagEndChar;
+          // val += this.indentate(level) + '<' + key + '/' + this.tagEndChar;
         } else if (typeof item === 'object') {
           val += this.processTextOrObjNode(item, key, level)
         } else {
@@ -130,9 +133,7 @@ Builder.prototype.j2x = function(jObj, level) {
         const Ks = Object.keys(jObj[key]);
         const L = Ks.length;
         for (let j = 0; j < L; j++) {
-          let val = this.options.attributeValueProcessor(Ks[j], '' + jObj[key][Ks[j]]);
-          val = this.replaceEntitiesValue(val);
-          attrStr += ' ' + Ks[j] + '="' + val + '"';
+          attrStr += this.buildAttrPairStr(Ks[j], '' + jObj[key][Ks[j]]);
         }
       } else {
         val += this.processTextOrObjNode(jObj[key], key, level)
@@ -142,6 +143,14 @@ Builder.prototype.j2x = function(jObj, level) {
   return {attrStr: attrStr, val: val};
 };
 
+function buildAttrPairStr(attrName, val){
+  val = this.options.attributeValueProcessor(attrName, '' + val);
+  val = this.replaceEntitiesValue(val);
+  if (this.options.suppressBooleanAttributes && val === "true") {
+    return ' ' + attrName;
+  } else return ' ' + 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) {
@@ -152,34 +161,24 @@ function processTextOrObjNode (object, key, level) {
 }
 
 function buildObjectNode(val, key, attrStr, level) {
+  let tagEndExp = '</' + key + this.tagEndChar;
+  let piClosingChar = "";
+  
+  if(key[0] === "?") {
+    piClosingChar = "?";
+    tagEndExp = "";
+  }
+
   if (attrStr && val.indexOf('<') === -1) {
     return (
-      this.indentate(level) +
-      '<' +
-      key +
-      attrStr +
-      '>' +
+      this.indentate(level) + '<' +  key + attrStr + piClosingChar + '>' +
       val +
-      //+ this.newLine
-      // + this.indentate(level)
-      '</' +
-      key +
-      this.tagEndChar
-    );
+      tagEndExp    );
   } else {
     return (
-      this.indentate(level) +
-      '<' +
-      key +
-      attrStr +
-      this.tagEndChar +
+      this.indentate(level) + '<' + key + attrStr + piClosingChar + this.tagEndChar +
       val +
-      //+ this.newLine
-      this.indentate(level) +
-      '</' +
-      key +
-      this.tagEndChar
-    );
+      this.indentate(level) + tagEndExp    );
   }
 }
 
@@ -187,8 +186,8 @@ function buildEmptyObjNode(val, key, attrStr, level) {
   if (val !== '') {
     return this.buildObjectNode(val, key, attrStr, level);
   } else {
-    return this.indentate(level) + '<' + key + attrStr + '/' + this.tagEndChar;
-    //+ this.newLine
+    if(key[0] === "?") return  this.indentate(level) + '<' + key + attrStr+ '?' + this.tagEndChar;
+    else return  this.indentate(level) + '<' + key + attrStr + '/' + this.tagEndChar;
   }
 }
 
@@ -197,16 +196,9 @@ function buildTextValNode(val, key, attrStr, level) {
   textValue = this.replaceEntitiesValue(textValue);
   
   return (
-    this.indentate(level) +
-    '<' +
-    key +
-    attrStr +
-    '>' +
+    this.indentate(level) + '<' + key + attrStr + '>' +
      textValue +
-    '</' +
-    key +
-    this.tagEndChar
-  );
+    '</' + key + this.tagEndChar  );
 }
 
 function replaceEntitiesValue(textValue){
@@ -225,7 +217,8 @@ function buildEmptyTextNode(val, key, attrStr, level) {
   }else if (val !== '') {
     return this.buildTextValNode(val, key, attrStr, level);
   } else {
-    return this.indentate(level) + '<' + key + attrStr + '/' + this.tagEndChar;
+    if(key[0] === "?") return  this.indentate(level) + '<' + key + attrStr+ '?' + this.tagEndChar;
+    else return  this.indentate(level) + '<' + key + attrStr + '/' + this.tagEndChar;
   }
 }