fast-xml-parser 3.17.0 → 3.17.4

package/README.md

@@ -1,8 +1,26 @@
+
+
 # [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)
+
+[quality-image]: http://npm.packagequality.com/shield/fast-xml-parser.svg?style=flat-square
+[quality-url]: http://packagequality.com/#?package=fast-xml-parser
+
+
 Validate XML, Parse XML to JS/JSON and vice versa, or parse XML to Nimn rapidly without C/C++ based libraries and no callback
 
-> This project welcomes **contributors**. If you have a feature you'd like to see implemented or a bug you'd liked fixed, the best and fastest way to make that happen is to implement it and submit a PR. Basic knowledge of JS is sufficient. Feel free to ask for any guidance.
+![Donate $5](static/img/donation_quote.png)
 
+<a href="https://opencollective.com/fast-xml-parser/donate" target="_blank">
+  <img src="https://opencollective.com/fast-xml-parser/donate/button@2x.png?color=blue" width=200 />
+</a>
+<a href="https://www.patreon.com/bePatron?u=9531404" data-patreon-widget-type="become-patron-button"><img src="https://c5.patreon.com/external/logo/become_a_patron_button.png" alt="Become a Patron!" width="200" /></a>
+<a href="https://paypal.me/naturalintelligence"> <img src="static/img/support_paypal.svg" alt="Stubmatic donate button" width="200"/></a>
 
 ## Users
 List of some applications/projects using Fast XML Parser. (Raise an issue to submit yours)
@@ -64,25 +82,8 @@ List of some applications/projects using Fast XML Parser. (Raise an issue to sub
 
 
 
-### Join this project as collaborator / maintainer.
 
 
-[![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)
-
-[quality-image]: http://npm.packagequality.com/shield/fast-xml-parser.svg?style=flat-square
-[quality-url]: http://packagequality.com/#?package=fast-xml-parser
-
-<a href="https://opencollective.com/fast-xml-parser/donate" target="_blank">
-  <img src="https://opencollective.com/fast-xml-parser/donate/button@2x.png?color=blue" width=200 />
-</a>
-<a href="https://www.patreon.com/bePatron?u=9531404" data-patreon-widget-type="become-patron-button"><img src="https://c5.patreon.com/external/logo/become_a_patron_button.png" alt="Become a Patron!" width="200" /></a>
-<a href="https://www.paypal.me/amitkumarguptagwl"> <img src="static/img/support_paypal.svg" alt="Stubmatic donate button" width="200"/></a>
-
 ### Main Features
 
 <img align="right" src="static/img/fxp_logo.png" width="180px" alt="FXP logo"/>
@@ -313,6 +314,7 @@ With the correct options, you can get the almost original XML without losing any
 - [शब्दावली (shabdawali)](https://github.com/amitguptagwl/shabdawali) : Amazing human like typing effects beyond your imagination.
 
 
+
 ## Contributors
 
 This project exists thanks to [all](graphs/contributors) the people who contribute. [[Contribute](CONTRIBUTING.md)].

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fast-xml-parser",
-  "version": "3.17.0",
+  "version": "3.17.4",
   "description": "Validate XML or Parse XML to JS/JSON very fast without C/C++ based libraries",
   "main": "./src/parser.js",
   "scripts": {
@@ -70,11 +70,11 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@babel/core": "^7.7.5",
-    "@babel/plugin-transform-runtime": "^7.7.6",
-    "@babel/preset-env": "^7.7.6",
-    "@babel/register": "^7.7.4",
-    "babel-loader": "^8.0.6",
+    "@babel/core": "^7.10.2",
+    "@babel/plugin-transform-runtime": "^7.10.1",
+    "@babel/preset-env": "^7.10.2",
+    "@babel/register": "^7.10.1",
+    "babel-loader": "^8.1.0",
     "eslint": "^5.16.0",
     "he": "^1.2.0",
     "http-server": "^0.12.3",
@@ -83,8 +83,12 @@
     "nimnjs": "^1.3.2",
     "prettier": "^1.19.1",
     "publish-please": "^5.5.1",
-    "webpack": "^4.41.2",
-    "webpack-cli": "^3.3.10"
+    "webpack": "^4.43.0",
+    "webpack-cli": "^3.3.11"
   },
-  "typings": "src/parser.d.ts"
+  "typings": "src/parser.d.ts",
+  "funding": {
+    "type": "paypal",
+    "url": "https://paypal.me/naturalintelligence"
+  }
 }

package/src/parser.js

@@ -44,12 +44,12 @@ function print(xmlNode, indentation){
     if(xmlNode.child){
       console.log(indentation + "\"child\": {")
       const indentation2 = indentation + indentation;
-      Object.keys(xmlNode.child).forEach( key =>{
+      Object.keys(xmlNode.child).forEach( function(key) {
         const node = xmlNode.child[key];
 
         if(Array.isArray(node)){
           console.log(indentation +  "\""+key+"\" :[")
-          node.forEach( (item,index) => {
+          node.forEach( function(item,index) {
             //console.log(indentation + " \""+index+"\" : [")
             print(item, indentation2);
           })

package/src/xmlstr2xmlnode.js

@@ -66,9 +66,9 @@ exports.props = props;
 
 /**
  * Trim -> valueProcessor -> parse value
- * @param {string} tagName 
- * @param {string} val 
- * @param {object} options 
+ * @param {string} tagName
+ * @param {string} val
+ * @param {object} options
  */
 function processTagValue(tagName, val, options) {
   if (val) {
@@ -168,18 +168,20 @@ function buildAttributesMap(attrStr, options) {
 }
 
 const getTraversalObj = function(xmlData, options) {
+  xmlData = xmlData.replace(/(\r\n)|\n/, " ");
   options = buildOptions(options, defaultOptions, props);
   const xmlObj = new xmlNode('!xml');
   let currentNode = xmlObj;
   let textData = "";
+
 //function match(xmlData){
   for(let i=0; i< xmlData.length; i++){
     const ch = xmlData[i];
     if(ch === '<'){
       if( xmlData[i+1] === '/') {//Closing Tag
-        const closeIndex = xmlData.indexOf(">", i);
+        const closeIndex = findClosingIndex(xmlData, ">", i, "Closing Tag is not closed.")
         let tagName = xmlData.substring(i+2,closeIndex).trim();
-        
+
         if(options.ignoreNameSpace){
           const colonIndex = tagName.indexOf(":");
           if(colonIndex !== -1){
@@ -207,29 +209,21 @@ const getTraversalObj = function(xmlData, options) {
         textData = "";
         i = closeIndex;
       } else if( xmlData[i+1] === '?') {
-        i = xmlData.indexOf("?>", i) + 1;
-      } else if( xmlData[i+2] === '-') {
-        i = xmlData.indexOf("-->", i) + 2;
-      } else if( xmlData[i+2] === 'D') {
-        const closeIndex = xmlData.indexOf(">",i)
-        const tagExp = xmlData.substr(i,closeIndex);
-        if(tagExp.indexOf("[")){
+        i = findClosingIndex(xmlData, "?>", i, "Pi Tag is not closed.")
+      } else if(xmlData.substr(i + 1, 3) === '!--') {
+        i = findClosingIndex(xmlData, "-->", i, "Comment is not closed.")
+      } else if( xmlData.substr(i + 1, 2) === '!D') {
+        const closeIndex = findClosingIndex(xmlData, ">", i, "DOCTYPE is not closed.")
+        const tagExp = xmlData.substring(i, closeIndex);
+        if(tagExp.indexOf("[") >= 0){
           i = xmlData.indexOf("]>", i) + 1;
         }else{
           i = closeIndex;
         }
-      }else if( xmlData[i+2] === '[') {
-        const closeIndex = xmlData.indexOf("]]>",i);
+      }else if(xmlData.substr(i + 1, 2) === '![') {
+        const closeIndex = findClosingIndex(xmlData, "]]>", i, "CDATA is not closed.") - 2
         const tagExp = xmlData.substring(i + 9,closeIndex);
 
-        //save previous value to the parent node
-        /* if(currentNode){
-          if(currentNode.val){
-            currentNode.val = util.getValue(currentNode.val) + '' + processTagValue2(currentNode.tagname, textData , options);
-          }else{
-            currentNode.val = processTagValue2(currentNode.tagname, textData , options);
-          }
-        } */
         //considerations
         //1. CDATA will always have parent node
         //2. A tag with CDATA is not a leaf node so it's value would be string type.
@@ -251,16 +245,16 @@ const getTraversalObj = function(xmlData, options) {
         } else {
           currentNode.val = (currentNode.val || '') + (tagExp || '');
         }
-        
+
         i = closeIndex + 2;
       }else {//Opening tag
-        const closeIndex = closingIndexForOpeningTag(xmlData, i)
-        //const closeIndex = xmlData.indexOf(">",i);
-        let tagExp = xmlData.substring(i + 1,closeIndex);
+        const result = closingIndexForOpeningTag(xmlData, i+1)
+        let tagExp = result.data;
+        const closeIndex = result.index;
         const separatorIndex = tagExp.indexOf(" ");
         let tagName = tagExp;
         if(separatorIndex !== -1){
-          tagName = tagExp.substr(0, separatorIndex);
+          tagName = tagExp.substr(0, separatorIndex).trimRight();
           tagExp = tagExp.substr(separatorIndex + 1);
         }
 
@@ -270,7 +264,7 @@ const getTraversalObj = function(xmlData, options) {
             tagName = tagName.substr(colonIndex+1);
           }
         }
-        
+
         //save text to parent node
         if (currentNode && textData) {
           if(currentNode.tagname !== '!xml'){
@@ -278,9 +272,9 @@ const getTraversalObj = function(xmlData, options) {
           }
         }
 
-        if(tagExp.lastIndexOf("/") === tagExp.length - 1){//selfClosing tag
-    
-          if(tagName[tagName.length - 1] === "/"){ //remove trailing '/' 
+        if(tagExp.length > 0 && tagExp.lastIndexOf("/") === tagExp.length - 1){//selfClosing tag
+
+          if(tagName[tagName.length - 1] === "/"){ //remove trailing '/'
             tagName = tagName.substr(0, tagName.length - 1);
             tagExp = tagName;
           }else{
@@ -293,7 +287,7 @@ const getTraversalObj = function(xmlData, options) {
           }
           currentNode.addChild(childNode);
         }else{//opening tag
-          
+
           const childNode = new xmlNode( tagName, currentNode );
           if (options.stopNodes.length && options.stopNodes.includes(childNode.tagname)) {
             childNode.startIndex=closeIndex;
@@ -316,6 +310,7 @@ const getTraversalObj = function(xmlData, options) {
 
 function closingIndexForOpeningTag(data, i){
   let attrBoundary;
+  let tagExp = "";
   for (let index = i; index < data.length; index++) {
     let ch = data[index];
     if (attrBoundary) {
@@ -323,8 +318,23 @@ function closingIndexForOpeningTag(data, i){
     } else if (ch === '"' || ch === "'") {
         attrBoundary = ch;
     } else if (ch === '>') {
-        return index
+        return {
+          data: tagExp,
+          index: index
+        }
+    } else if (ch === '\t') {
+      ch = " "
     }
+    tagExp += ch;
+  }
+}
+
+function findClosingIndex(xmlData, str, i, errMsg){
+  const closingIndex = xmlData.indexOf(str, i);
+  if(closingIndex === -1){
+    throw new Error(errMsg)
+  }else{
+    return closingIndex + str.length - 1;
   }
 }