fast-xml-parser 3.17.2 → 3.17.6

package/LICENSE

@@ -1,4 +1,4 @@
-MIT License
+Modified MIT License
 
 Copyright (c) 2017 Amit Kumar Gupta
 
@@ -9,7 +9,15 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-If you use this library in a public repository then you give us the right to mention your company name and logo in user's list without further permission required, but you can request them to be taken down within 30 days. 
+If you use this library then you give us the rights to mention your 
+company/project name and logo in user's list without further permission required. 
+However, you can request to remove it when you're not the user of this library anymore.
+We'll do the necessary changes within 30 days from the notice.
+
+You're not allowed to publish the code of this library without giving credits to 
+the original author/maintainers or without permission. You're required to take 
+the permission from original author to remove any non-code changes which are purposefully 
+added to this project including pre/post install message, notification on README, etc.
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.

package/README.md

@@ -1,8 +1,28 @@
+
+
 # [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.
+To cover expenses, we're planning to launch [FXP Enterprise](https://github.com/NaturalIntelligence/fxp-ent) edition in parallel. Watch it for further updates, if you're interested.
+
+![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 +84,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"/>
@@ -300,9 +303,6 @@ With the correct options, you can get the almost original XML without losing any
 
 </details>
 
-### Limitations
- Currently FXP fails to parse XML with attributes has ">" in the value. This problem is left open as change in regex for its fix is degrading the performance. And the parser become very slow in case of long attribute names. However, it is not ignored and we're working on the fix.
-
 ### Worth to mention
 
 - **[BigBit standard)](https://github.com/amitguptagwl/bigbit)** : A standard to represent any number in the universe in comparatively less space and without precision loss. A standard to save memory to represent any text string in comparision of UTF encodings.
@@ -313,9 +313,10 @@ 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)].
+This project exists thanks to [all](graphs/contributors) the people who contribute. [[Contribute](docs/CONTRIBUTING.md)].
 <!-- <a href="graphs/contributors"><img src="https://opencollective.com/fast-xml-parser/contributors.svg?width=890&button=false" /></a> -->
 <!--
 ### Lead Maintainers

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fast-xml-parser",
-  "version": "3.17.2",
+  "version": "3.17.6",
   "description": "Validate XML or Parse XML to JS/JSON very fast without C/C++ based libraries",
   "main": "./src/parser.js",
   "scripts": {
@@ -11,7 +11,6 @@
     "bundle": "webpack && webpack --config webpack-prod.config.js",
     "coverage": "istanbul cover -x \"cli.js\" -x \"spec/*spec.js\" jasmine spec/*spec.js;",
     "coverage:check": "istanbul check-coverage --branch 90 --statement 90",
-    "postinstall": "node tasks/postinstall.js || exit 0",
     "prettier": "prettier --write src/**/*.js",
     "publish-please": "publish-please",
     "prepublishOnly": "publish-please guard"
@@ -68,23 +67,27 @@
       "url": "https://github.com/Tatsh"
     }
   ],
-  "license": "MIT",
+  "license": "MIT Modified",
   "devDependencies": {
-    "@babel/core": "^7.9.6",
-    "@babel/plugin-transform-runtime": "^7.9.6",
-    "@babel/preset-env": "^7.9.6",
-    "@babel/register": "^7.9.0",
-    "babel-loader": "^8.1.0",
+    "@babel/core": "^7.12.10",
+    "@babel/plugin-transform-runtime": "^7.12.10",
+    "@babel/preset-env": "^7.12.11",
+    "@babel/register": "^7.12.10",
+    "babel-loader": "^8.2.2",
     "eslint": "^5.16.0",
     "he": "^1.2.0",
     "http-server": "^0.12.3",
     "istanbul": "^0.4.5",
-    "jasmine": "^3.5.0",
+    "jasmine": "^3.6.3",
     "nimnjs": "^1.3.2",
     "prettier": "^1.19.1",
-    "publish-please": "^5.5.1",
-    "webpack": "^4.43.0",
-    "webpack-cli": "^3.3.11"
+    "publish-please": "^5.5.2",
+    "webpack": "^4.44.2",
+    "webpack-cli": "^3.3.12"
   },
-  "typings": "src/parser.d.ts"
+  "typings": "src/parser.d.ts",
+  "funding": {
+    "type": "paypal",
+    "url": "https://paypal.me/naturalintelligence"
+  }
 }

package/src/node2json.js

@@ -29,8 +29,9 @@ const convertToJson = function(node, options) {
     if (node.child[tagname] && node.child[tagname].length > 1) {
       jObj[tagname] = [];
       for (var tag in node.child[tagname]) {
-        jObj[tagname].push(convertToJson(node.child[tagname][tag], options));
-      }
+        if (node.child[tagname].hasOwnProperty(tag)){
+          jObj[tagname].push(convertToJson(node.child[tagname][tag], options));}
+        }
     } else {
       if(options.arrayMode === true){
         const result = convertToJson(node.child[tagname][0], options)

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?/g, "\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,19 +209,19 @@ const getTraversalObj = function(xmlData, options) {
         textData = "";
         i = closeIndex;
       } else if( xmlData[i+1] === '?') {
-        i = xmlData.indexOf("?>", i) + 1;
-      } else if( xmlData[i+1] === '!' && xmlData[i+2] === '-') {
-        i = xmlData.indexOf("-->", i) + 2;
-      } else if( xmlData[i+1] === '!' && xmlData[i+2] === 'D') {
-        const closeIndex = xmlData.indexOf(">",i)
-        const tagExp = xmlData.substr(i,closeIndex);
-        if(tagExp.indexOf("[") !== -1 ){
+        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);
 
         //considerations
@@ -243,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).trimRight();
+          tagName = tagExp.substr(0, separatorIndex).replace(/\s\s*$/, '');
           tagExp = tagExp.substr(separatorIndex + 1);
         }
 
@@ -262,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'){
@@ -270,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{
@@ -285,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;
@@ -308,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) {
@@ -315,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;
   }
 }
 

package/tasks/postinstall.js

@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-
-
-const msg = '\u001b[96m\u001b[1mLove fast-xml-parser? Check \u001b[32mhttps://amitkumargupta.work \u001b[96m\u001b[1mfor more projects and contribution.\u001b[0m\n';
-console.log(msg)