fast-xml-parser 4.0.9 → 4.0.11

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 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.11 / 2022-10-05**
+* fix #501: parse for entities only once
+
+**4.0.10 / 2022-09-14**
+* fix broken links in demo site (By [Yannick Lang](https://github.com/layaxx))
+* fix #491: tagValueProcessor type definition (By [Andrea Francesco Speziale](https://github.com/andreafspeziale))
+* Add jsdocs for tagValueProcessor
+
+
 **4.0.9 / 2022-07-10**
 * fix #470: stop-tag can have self-closing tag with same name
 * fix #472: stopNode can have any special tag inside

package/README.md

@@ -34,7 +34,6 @@ Check [ThankYouBackers](https://github.com/NaturalIntelligence/ThankYouBackers)
 <a href="https://github.com/prettier" title="Prettier" > <img src="https://avatars0.githubusercontent.com/u/25822731" width="60px" ></a>
 <a href="http://brain.js.org/" title="brain.js" > <img src="https://avatars2.githubusercontent.com/u/23732838" width="60px" ></a>
 <a href="https://github.com/aws" title="AWS SDK" > <img src="https://avatars.githubusercontent.com/u/2232217" width="60px" ></a>
-<a href="#" title="NHS Connect" > <img src="https://avatars3.githubusercontent.com/u/20316669" width="60px" ></a>
 <a href="http://www.fda.gov/" title="Food and Drug Administration " > <img src="https://avatars2.githubusercontent.com/u/6471964" width="60px" ></a>
 <a href="http://www.magento.com/" title="Magento" > <img src="https://avatars2.githubusercontent.com/u/168457" width="60px" ></a>
 
@@ -50,7 +49,7 @@ Check the list of all known users [here](./USERs.md);
 * Parse XML to JS Object
 * Build XML from JS Object
 * Works with node packages, in browser, and in CLI (press try me button above for demo)
-* Faster than any pure JS implementation.
+* Faster than any other pure JS implementation.
 * It can handle big files (tested up to 100mb).
 * Controlled parsing using various options
 * XML Entities, HTML entities, and DOCTYPE entites are supported.
@@ -121,7 +120,7 @@ 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/v4/5.Entities.md)
+5.  [Entities](./docs/v4/5.Entities.md)
 6.  [HTML Document Parsing](./docs/v4/6.HTMLParsing.md)
 7. [PI Tag processing](./docs/v4/7.PITags.md)
 ## Performance
@@ -191,4 +190,4 @@ Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com
 # License
 * MIT License
 
-![Donate $5](static/img/donation_quote.png)
+![Donate $5](static/img/donation_quote.png)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fast-xml-parser",
-  "version": "4.0.9",
+  "version": "4.0.11",
   "description": "Validate XML, Parse XML, Build XML without C/C++ based libraries",
   "main": "./src/fxp.js",
   "scripts": {
@@ -53,7 +53,7 @@
     "jasmine": "^3.6.4",
     "nyc": "^15.1.0",
     "prettier": "^1.19.1",
-    "publish-please": "^5.5.2",
+    "publish-please": "^2.4.1",
     "webpack": "^5.64.4",
     "webpack-cli": "^4.9.1"
   },

package/src/fxp.d.ts

@@ -11,7 +11,15 @@ type X2jOptions = {
   trimValues: boolean;
   cdataPropName: false | string;
   commentPropName: false | string;
-  tagValueProcessor: (tagName: string, tagValue: string, jPath: string, hasAttributes: boolean, isLeafNode: boolean) => string;
+    /**
+Control how tag value should be parsed. Called only if tag value is not empty
+
+@returns {undefined|null} `undefined` or `null` to set original value.
+@returns {unknown} 
+1. Different value or value with different data type to set new value. <br>
+2. Same value to set parsed value if `parseTagValue: true`.
+   */
+  tagValueProcessor: (tagName: string, tagValue: string, jPath: string, hasAttributes: boolean, isLeafNode: boolean) => unknown;
   attributeValueProcessor: (attrName: string, attrValue: string, jPath: string) => string;
   numberParseOptions: strnumOptions;
   stopNodes: string[];

package/src/xmlparser/OrderedObjParser.js

@@ -20,12 +20,12 @@ class OrderedObjParser{
     this.tagsNodeStack = [];
     this.docTypeEntities = {};
     this.lastEntities = {
-      "amp" : { regex: /&(amp|#38|#x26);/g, val : "&"},
       "apos" : { regex: /&(apos|#39|#x27);/g, val : "'"},
       "gt" : { regex: /&(gt|#62|#x3E);/g, val : ">"},
       "lt" : { regex: /&(lt|#60|#x3C);/g, val : "<"},
       "quot" : { regex: /&(quot|#34|#x22);/g, val : "\""},
     };
+    this.ampEntity = { regex: /&(amp|#38|#x26);/g, val : "&"};
     this.htmlEntities = {
       "space": { regex: /&(nbsp|#160);/g, val: " " },
       // "lt" : { regex: /&(lt|#60);/g, val: "<" },
@@ -364,6 +364,7 @@ const parseXml = function(xmlData) {
 }
 
 const replaceEntitiesValue = function(val){
+
   if(this.options.processEntities){
     for(let entityName in this.docTypeEntities){
       const entity = this.docTypeEntities[entityName];
@@ -379,6 +380,7 @@ const replaceEntitiesValue = function(val){
         val = val.replace( entity.regex, entity.val);
       }
     }
+    val = val.replace( this.ampEntity.regex, this.ampEntity.val);
   }
   return val;
 }

package/src/xmlparser/XMLParser.js

@@ -47,6 +47,8 @@ class XMLParser{
             throw new Error("Entity value can't have '&'")
         }else if(key.indexOf("&") !== -1 || key.indexOf(";") !== -1){
             throw new Error("An entity must be set without '&' and ';'. Eg. use '#xD' for '
'")
+        }else if(value === "&"){
+            throw new Error("An entity with value '&' is not permitted");
         }else{
             this.externalEntities[key] = value;
         }

package/src/fxp_cjs

@@ -1,8 +0,0 @@
-
-
-const XMLValidator = require('./validator.js');
-const XMLParser = require('./xmlparser/XMLParser.js');
-const XMLBuilder = require('./xmlbuilder/json2xml.js');
-
-module.exports = {XMLParser,XMLValidator, XMLBuilder};
-