fast-xml-parser - npm Package Compare versions

Comparing version 2.5.1 to 2.6.0

bin/parser.js

@@ -15,3 +15,3 @@ var getAllMatches = require("./util").getAllMatches;
 //var tagsRegx = new RegExp("<(\\/?[\\w:-]+)([^>]*)>([^<]+)?","g");
-var cdataRegx = "<!\\[CDATA\\[([^\\]\\]]*)\\]\\]>"
+var cdataRegx = "<!\\[CDATA\\[([^\\]\\]]*)\\]\\]>";
 var tagsRegx = new RegExp("<(\\/?[\\w:\\-\._]+)([^>]*)>(<!\\[CDATA\\[([^\\]\\]]*)\\]\\]>)*([^<]+)?","g");
@@ -26,3 +26,4 @@
     ignoreRootElement : false,
-    textNodeConversion : true
+    textNodeConversion : true,
+    textAttrConversion : false
 };
@@ -32,3 +33,3 @@
     if(!options) options = {};
-    var props = ["attrPrefix","ignoreNonTextNodeAttr","ignoreTextNodeAttr","ignoreNameSpace","ignoreRootElement","textNodeName","textNodeConversion"];
+    var props = ["attrPrefix","ignoreNonTextNodeAttr","ignoreTextNodeAttr","ignoreNameSpace","ignoreRootElement","textNodeName","textNodeConversion","textAttrConversion"];
     for (var i = 0; i < props.length; i++) {
@@ -64,7 +65,7 @@ if(options[props[i]] === undefined){
         if(selfClosingTag){
-            attrs = buildAttributesArr(attrsStr,options.ignoreTextNodeAttr,options.attrPrefix,options.ignoreNameSpace);
+            attrs = buildAttributesArr(attrsStr,options.ignoreTextNodeAttr,options.attrPrefix,options.ignoreNameSpace,options.textAttrConversion);
             childNode.val = attrs || "";
             currentNode.addChild(childNode);
         }else if( ("/" + tag) === nexttag){ //Text node
-            attrs = buildAttributesArr(attrsStr,options.ignoreTextNodeAttr,options.attrPrefix,options.ignoreNameSpace);
+            attrs = buildAttributesArr(attrsStr,options.ignoreTextNodeAttr,options.attrPrefix,options.ignoreNameSpace,options.textAttrConversion);
             val = parseValue(val,options.textNodeConversion);
@@ -80,6 +81,8 @@ if(attrs){
         }else{//starting tag
-            attrs = buildAttributesArr(attrsStr,options.ignoreNonTextNodeAttr,options.attrPrefix,options.ignoreNameSpace);
+            attrs = buildAttributesArr(attrsStr,options.ignoreNonTextNodeAttr,options.attrPrefix,options.ignoreNameSpace,options.textAttrConversion);
             if(attrs){
                 for (var prop in attrs) {
-                  attrs.hasOwnProperty(prop) && childNode.addChild(new xmlNode(prop,childNode,attrs[prop]));
+                  if(attrs.hasOwnProperty(prop)){
+                    childNode.addChild(new xmlNode(prop,childNode,attrs[prop]));
+                  }
                 }
@@ -140,3 +143,3 @@ }
 var attrsRegx = new RegExp("(\\S+)\\s*=\\s*(['\"])(.*?)\\2","g");
-function buildAttributesArr(attrStr,ignore,prefix,ignoreNS){
+function buildAttributesArr(attrStr,ignore,prefix,ignoreNS,conversion){
     attrStr = attrStr || attrStr.trim();
@@ -150,3 +153,3 @@
             var attrName = prefix + resolveNameSpace( matches[i][1],ignoreNS);
-            attrs[attrName] = matches[i][3];
+            attrs[attrName] = parseValue(matches[i][3],conversion);
         }
@@ -153,0 +156,0 @@ return attrs;

lib/parser.js

@@ -16,3 +16,3 @@ (function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.parser = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
 //var tagsRegx = new RegExp("<(\\/?[\\w:-]+)([^>]*)>([^<]+)?","g");
-var cdataRegx = "<!\\[CDATA\\[([^\\]\\]]*)\\]\\]>"
+var cdataRegx = "<!\\[CDATA\\[([^\\]\\]]*)\\]\\]>";
 var tagsRegx = new RegExp("<(\\/?[\\w:\\-\._]+)([^>]*)>(<!\\[CDATA\\[([^\\]\\]]*)\\]\\]>)*([^<]+)?","g");
@@ -27,3 +27,4 @@
     ignoreRootElement : false,
-    textNodeConversion : true
+    textNodeConversion : true,
+    textAttrConversion : false
 };
@@ -33,3 +34,3 @@
     if(!options) options = {};
-    var props = ["attrPrefix","ignoreNonTextNodeAttr","ignoreTextNodeAttr","ignoreNameSpace","ignoreRootElement","textNodeName","textNodeConversion"];
+    var props = ["attrPrefix","ignoreNonTextNodeAttr","ignoreTextNodeAttr","ignoreNameSpace","ignoreRootElement","textNodeName","textNodeConversion","textAttrConversion"];
     for (var i = 0; i < props.length; i++) {
@@ -65,7 +66,7 @@ if(options[props[i]] === undefined){
         if(selfClosingTag){
-            attrs = buildAttributesArr(attrsStr,options.ignoreTextNodeAttr,options.attrPrefix,options.ignoreNameSpace);
+            attrs = buildAttributesArr(attrsStr,options.ignoreTextNodeAttr,options.attrPrefix,options.ignoreNameSpace,options.textAttrConversion);
             childNode.val = attrs || "";
             currentNode.addChild(childNode);
         }else if( ("/" + tag) === nexttag){ //Text node
-            attrs = buildAttributesArr(attrsStr,options.ignoreTextNodeAttr,options.attrPrefix,options.ignoreNameSpace);
+            attrs = buildAttributesArr(attrsStr,options.ignoreTextNodeAttr,options.attrPrefix,options.ignoreNameSpace,options.textAttrConversion);
             val = parseValue(val,options.textNodeConversion);
@@ -81,6 +82,8 @@ if(attrs){
         }else{//starting tag
-            attrs = buildAttributesArr(attrsStr,options.ignoreNonTextNodeAttr,options.attrPrefix,options.ignoreNameSpace);
+            attrs = buildAttributesArr(attrsStr,options.ignoreNonTextNodeAttr,options.attrPrefix,options.ignoreNameSpace,options.textAttrConversion);
             if(attrs){
                 for (var prop in attrs) {
-                  attrs.hasOwnProperty(prop) && childNode.addChild(new xmlNode(prop,childNode,attrs[prop]));
+                  if(attrs.hasOwnProperty(prop)){
+                    childNode.addChild(new xmlNode(prop,childNode,attrs[prop]));
+                  }
                 }
@@ -141,3 +144,3 @@ }
 var attrsRegx = new RegExp("(\\S+)\\s*=\\s*(['\"])(.*?)\\2","g");
-function buildAttributesArr(attrStr,ignore,prefix,ignoreNS){
+function buildAttributesArr(attrStr,ignore,prefix,ignoreNS,conversion){
     attrStr = attrStr || attrStr.trim();
@@ -151,3 +154,3 @@
             var attrName = prefix + resolveNameSpace( matches[i][1],ignoreNS);
-            attrs[attrName] = matches[i][3];
+            attrs[attrName] = parseValue(matches[i][3],conversion);
         }
@@ -154,0 +157,0 @@ return attrs;

package.json

 {
   "name": "fast-xml-parser",
-  "version": "2.5.1",
+  "version": "2.6.0",
   "description": "Validate XML or Parse XML to JS/JSON very fast without C/C++ based libraries",
@@ -5,0 +5,0 @@ "main": "./bin/parser.js",

README.md

@@ -35,3 +35,5 @@ # [fast-xml-parser](https://www.npmjs.com/package/fast-xml-parser)
     ignoreNameSpace : true,
-    textNodeConversion : true
+    ignoreRootElement : false,
+    textNodeConversion : true,
+    textAttrConversion : false
 };
@@ -38,0 +40,0 @@ if(fastXmlParser.validate(xmlData)=== true){//optional

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

185616

increased by0.26%

Lines of code

569

increased by1.07%

Number of lines in readme file

103

increased by1.98%

No dependency changes