fast-xml-parser 4.0.0-beta.6 → 4.0.1

package/CHANGELOG.md

@@ -1,19 +1,37 @@
 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.0-beta.6 / 2021-12-05**
+**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.
+
+**4.0.0-beta.8 / 2021-12-13**
+* call tagValueProcessor for stop nodes
+
+**4.0.0-beta.7 / 2021-12-09**
+* fix Validator bug when an attribute has no value but '=' only
+* XML Builder should suppress unpaired tags by default.
+* documents update for missing features
+* refactoring to use Object.assign
+* refactoring to remove repeated code
+
+**4.0.0-beta.6 / 2021-12-05**
 * Support PI Tags processing
 * Support `suppressBooleanAttributes` by XML Builder for attributes with value `true`.
 
-** 4.0.0-beta.5 / 2021-12-04**
+**4.0.0-beta.5 / 2021-12-04**
 * fix: when a tag with name "attributes"
 
-** 4.0.0-beta.4 / 2021-12-02**
+**4.0.0-beta.4 / 2021-12-02**
 * Support HTML document parsing
 * skip stop nodes parsing when building the XML from JS object
 * Support external entites without DOCTYPE
 * update dev dependency: strnum v1.0.5 to fix long number issue
 
-** 4.0.0-beta.3 / 2021-11-30**
+**4.0.0-beta.3 / 2021-11-30**
 * support global stopNodes expression like "*.stop"
 * support self-closing and paired unpaired tags
 * fix: CDATA should not be parsed.

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)
@@ -90,7 +89,7 @@ const xmlContent = builder.build(jObj);
 
 In a HTML page
 ```html
-<script src="path/to/fxparser.js"></script>
+<script src="path/to/fxp.min.js"></script>
 :
 <script>
   const parser = new fxparser.XMLParser();
@@ -98,6 +97,16 @@ In a HTML page
 </script>
 ```
 
+Check lib folder for different browser bundles
+
+| Bundle Name | Size |
+| -- | -- |
+| fxbuilder.min.js | 5.2K |
+| fxparser.js |  50K |
+| fxparser.min.js |  17K |
+| fxp.min.js |  22K |
+| fxvalidator.min.js | 5.7K |
+
 ### Documents
 **v3**
 * [documents](./docs/v3/docs.md)
@@ -107,9 +116,9 @@ In a HTML page
 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
@@ -135,6 +144,7 @@ In a HTML page
   * Run tests for a route or from a route
   * Customizable reporting
   * Central dashboard for better monitoring
+  * Options to integrate E2E tests with Jira, Github etc using Central dashboard `Tian`.
 * **[Stubmatic](https://github.com/NaturalIntelligence/Stubmatic)** : Create fake webservices, DynamoDB or S3 servers, Manage fake/mock stub data, Or fake any HTTP(s) call.
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fast-xml-parser",
-  "version": "4.0.0-beta.6",
+  "version": "4.0.1",
   "description": "Validate XML, Parse XML, Build XML without C/C++ based libraries",
   "main": "./src/fxp.js",
   "scripts": {
@@ -9,7 +9,7 @@
     "coverage": "nyc report --reporter html --reporter text -t .nyc_output --report-dir .nyc_output/summary",
     "perf": "node ./benchmark/perfTest3.js",
     "lint": "eslint src/*.js spec/*.js",
-    "bundle": "webpack && webpack --config webpack-prod.config.js",
+    "bundle": "webpack --config webpack-prod.config.js",
     "prettier": "prettier --write src/**/*.js",
     "publish-please": "publish-please",
     "checkReadiness": "publish-please --dry-run"
@@ -47,6 +47,7 @@
     "@babel/preset-env": "^7.13.10",
     "@babel/register": "^7.13.8",
     "babel-loader": "^8.2.2",
+    "cytorus": "^0.2.9",
     "eslint": "^8.3.0",
     "he": "^1.2.0",
     "jasmine": "^3.6.4",

package/src/fxp_cjs

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

package/src/util.js

@@ -67,23 +67,6 @@ exports.getValue = function(v) {
 // const fakeCall = function(a) {return a;};
 // const fakeCallNoReturn = function() {};
 
-const buildOptions = function(options, defaultOptions, props) {
-  let newOptions = {};
-  if (!options) {
-    return defaultOptions; //if there are not options
-  }
-
-  for (let i = 0; i < props.length; i++) {
-    if (options[props[i]] !== undefined) {
-      newOptions[props[i]] = options[props[i]];
-    } else {
-      newOptions[props[i]] = defaultOptions[props[i]];
-    }
-  }
-  return newOptions;
-};
-
-exports.buildOptions = buildOptions;
 exports.isName = isName;
 exports.getAllMatches = getAllMatches;
 exports.nameRegexp = nameRegexp;

package/src/validator.js

@@ -7,14 +7,9 @@ const defaultOptions = {
   unpairedTags: []
 };
 
-const props = [
-  'allowBooleanAttributes',
-  'unpairedTags'
-];
-
 //const tagsPattern = new RegExp("<\\/?([\\w:\\-_\.]+)\\s*\/?>","g");
 exports.validate = function (xmlData, options) {
-  options = util.buildOptions(options, defaultOptions, props);
+  options = Object.assign({}, defaultOptions, options);
 
   //xmlData = xmlData.replace(/(\r\n|\n|\r)/gm,"");//make it single line
   //xmlData = xmlData.replace(/(^\s*<\?xml.*?\?>)/g,"");//Remove XML starting tag
@@ -331,6 +326,8 @@ function validateAttributeString(attrStr, options) {
     if (matches[i][1].length === 0) {
       //nospace before attribute name: a="sd"b="saf"
       return getErrorObject('InvalidAttr', "Attribute '"+matches[i][2]+"' has no space in starting.", getPositionFromMatch(matches[i]))
+    } else if (matches[i][3] !== undefined && matches[i][4] === undefined) {
+      return getErrorObject('InvalidAttr', "Attribute '"+matches[i][2]+"' is without value.", getPositionFromMatch(matches[i]));
     } else if (matches[i][3] === undefined && !options.allowBooleanAttributes) {
       //independent attribute: ab
       return getErrorObject('InvalidAttr', "boolean attribute '"+matches[i][2]+"' is not allowed.", getPositionFromMatch(matches[i]));

package/src/xmlbuilder/json2xml.js

@@ -1,6 +1,5 @@
 'use strict';
 //parse Empty Node as self closing node
-const buildOptions = require('../util').buildOptions;
 const buildFromOrderedJs = require('./orderedJs2Xml');
 
 const defaultOptions = {
@@ -32,30 +31,8 @@ const defaultOptions = {
   stopNodes: []
 };
 
-const props = [
-  'attributeNamePrefix',
-  'attributesGroupName',
-  'textNodeName',
-  'ignoreAttributes',
-  'cdataPropName',
-  'format',
-  'indentBy',
-  'suppressEmptyNode',
-  'suppressBooleanAttributes',
-  'tagValueProcessor',
-  'attributeValueProcessor',
-  'arrayNodeName', //when array as root
-  'preserveOrder',
-  "commentPropName",
-  "unpairedTags",
-  "entities",
-  "processEntities",
-  "stopNodes",
-  // 'rootNodeName', //when jsObject have multiple properties on root level
-];
-
 function Builder(options) {
-  this.options = buildOptions(options, defaultOptions, props);
+  this.options = Object.assign({}, defaultOptions, options);
   if (this.options.ignoreAttributes || this.options.attributesGroupName) {
     this.isAttribute = function(/*a*/) {
       return false;
@@ -91,6 +68,7 @@ function Builder(options) {
   this.buildObjectNode = buildObjectNode;
 
   this.replaceEntitiesValue = replaceEntitiesValue;
+  this.buildAttrPairStr = buildAttrPairStr;
 }
 
 Builder.prototype.build = function(jObj) {
@@ -113,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) {
@@ -140,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 {
@@ -153,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)
@@ -165,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) {
@@ -175,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    );
   }
 }
 
@@ -210,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;
   }
 }
 
@@ -220,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){
@@ -248,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;
   }
 }
 

package/src/xmlbuilder/orderedJs2Xml.js

@@ -1,4 +1,4 @@
-const {EOL} = require('os');
+const EOL = "\n";
 
 /**
  * 
@@ -47,12 +47,10 @@ function arrToStr(arr, options, jPath, level){
         const attStr = attr_to_str(tagObj[":@"], options);
         let tagStart =  indentation + `<${tagName}${attStr}`;
         let tagValue = arrToStr(tagObj[tagName], options, newJPath, level + 1);
-        if( (!tagValue || tagValue.length === 0) && options.suppressEmptyNode){ 
-            if(options.unpairedTags.indexOf(tagName) !== -1){
-                xmlStr += tagStart + ">"; 
-            }else{
-                xmlStr += tagStart + "/>"; 
-            }
+        if(options.unpairedTags.indexOf(tagName) !== -1){
+            xmlStr += tagStart + ">"; 
+        }else if( (!tagValue || tagValue.length === 0) && options.suppressEmptyNode){ 
+            xmlStr += tagStart + "/>"; 
         }else{ 
             //TODO: node with only text value should not parse the text value in next line
             xmlStr += tagStart + `>${tagValue}${indentation}</${tagName}>` ;

package/src/xmlparser/OptionsBuilder.js

@@ -31,36 +31,9 @@ const defaultOptions = {
     htmlEntities: false,
 };
    
-const props = [
-    'preserveOrder',
-    'attributeNamePrefix',
-    'attributesGroupName',
-    'textNodeName',
-    'ignoreAttributes',
-    'removeNSPrefix',
-    'allowBooleanAttributes',
-    'parseTagValue',
-    'parseAttributeValue',
-    'trimValues',
-    'cdataPropName',
-    'tagValueProcessor',
-    'attributeValueProcessor',
-    'numberParseOptions',
-    'stopNodes',
-    'alwaysCreateTextNode',
-    'isArray',
-    'commentPropName',
-    'unpairedTags',
-    'processEntities',
-    'htmlEntities'
-];
-  
-const util = require('../util');
-
 const buildOptions = function(options) {
-    return util.buildOptions(options, defaultOptions, props);
+    return Object.assign({}, defaultOptions, options);
 };
 
 exports.buildOptions = buildOptions;
-exports.defaultOptions = defaultOptions;
-exports.props = props;
+exports.defaultOptions = defaultOptions;

package/src/xmlparser/OrderedObjParser.js

@@ -49,6 +49,7 @@ class OrderedObjParser{
     this.isItStopNode = isItStopNode;
     this.replaceEntitiesValue = replaceEntitiesValue;
     this.readStopNodeData = readStopNodeData;
+    this.saveTextToParentTag = saveTextToParentTag;
   }
 
 }
@@ -71,14 +72,15 @@ function addExternalEntities(externalEntities){
  * @param {boolean} dontTrim
  * @param {boolean} hasAttributes
  * @param {boolean} isLeafNode
+ * @param {boolean} escapeEntities
  */
-function parseTextData(val, tagName, jPath, dontTrim, hasAttributes, isLeafNode) {
+function parseTextData(val, tagName, jPath, dontTrim, hasAttributes, isLeafNode, escapeEntities) {
   if (val !== undefined) {
     if (this.options.trimValues && !dontTrim) {
       val = val.trim();
     }
     if(val.length > 0){
-      val = this.replaceEntitiesValue(val);
+      if(!escapeEntities) val = this.replaceEntitiesValue(val);
       
       const newval = this.options.tagValueProcessor(tagName, val, jPath, hasAttributes, isLeafNode);
       if(newval === null || newval === undefined){
@@ -192,14 +194,7 @@ const parseXml = function(xmlData) {
         }
 
         if(currentNode){
-          textData = this.parseTextData(textData
-            , currentNode.tagname
-            , jPath
-            ,false
-            , currentNode[":@"] ? Object.keys(currentNode[":@"]).length !== 0 : false
-            , Object.keys(currentNode.child).length === 0);
-          if(textData !== undefined &&  textData !== "") currentNode.add(this.options.textNodeName, textData);
-          textData = "";
+          textData = this.saveTextToParentTag(textData, currentNode, jPath);
         }
 
         jPath = jPath.substr(0, jPath.lastIndexOf("."));
@@ -208,53 +203,26 @@ const parseXml = function(xmlData) {
         textData = "";
         i = closeIndex;
       } else if( xmlData[i+1] === '?') {
-        let result = readTagExp(xmlData,i, false, "?>");
-        if(!result) throw new Error("Pi Tag is not closed.");
-        
-        let tagName= result.tagName;
-        let tagExp = result.tagExp;
-        let attrExpPresent = result.attrExpPresent;
-        let closeIndex = result.closeIndex;
+        let tagData = readTagExp(xmlData,i, false, "?>");
+        if(!tagData) throw new Error("Pi Tag is not closed.");
+        textData = this.saveTextToParentTag(textData, currentNode, jPath);
 
-          //TODO: remove repeated code
-          if(textData){ //store previously collected data as textNode
-            textData = this.parseTextData(textData
-              , currentNode.tagname
-              , jPath
-              ,false
-              , currentNode[":@"] ? Object.keys(currentNode[":@"]).length !== 0 : false
-              , Object.keys(currentNode.child).length === 0);
-
-            if(textData !== undefined &&  textData !== "") currentNode.add(this.options.textNodeName, textData);
-            textData = "";
-          }
-
-          const childNode = new xmlNode(tagName);
-          childNode.add(this.options.textNodeName, "");
-          
-          if(tagName !== tagExp && attrExpPresent){
-            childNode[":@"] = this.buildAttributesMap(tagExp, jPath);
-          }
-          currentNode.addChild(childNode);
+        const childNode = new xmlNode(tagData.tagName);
+        childNode.add(this.options.textNodeName, "");
+        
+        if(tagData.tagName !== tagData.tagExp && tagData.attrExpPresent){
+          childNode[":@"] = this.buildAttributesMap(tagData.tagExp, jPath);
+        }
+        currentNode.addChild(childNode);
 
-        i = closeIndex + 1;
+        i = tagData.closeIndex + 1;
       } else if(xmlData.substr(i + 1, 3) === '!--') {
         const endIndex = findClosingIndex(xmlData, "-->", i, "Comment is not closed.")
         if(this.options.commentPropName){
           const comment = xmlData.substring(i + 4, endIndex - 2);
 
-          //TODO: remove repeated code
-          if(textData){ //store previously collected data as textNode
-            textData = this.parseTextData(textData
-              , currentNode.tagname
-              , jPath
-              ,false
-              , currentNode[":@"] ? Object.keys(currentNode[":@"]).length !== 0 : false
-              , Object.keys(currentNode.child).length === 0);
-  
-            if(textData !== undefined &&  textData !== "") currentNode.add(this.options.textNodeName, textData);
-            textData = "";
-          }
+          textData = this.saveTextToParentTag(textData, currentNode, jPath);
+
           currentNode.add(this.options.commentPropName, [ { [this.options.textNodeName] : comment } ]);
         }
         i = endIndex;
@@ -266,17 +234,7 @@ const parseXml = function(xmlData) {
         const closeIndex = findClosingIndex(xmlData, "]]>", i, "CDATA is not closed.") - 2;
         const tagExp = xmlData.substring(i + 9,closeIndex);
 
-        if(textData){ //store previously collected data as textNode
-          textData = this.parseTextData(textData
-            , currentNode.tagname
-            , jPath
-            ,false
-            , currentNode[":@"] ? Object.keys(currentNode[":@"]).length !== 0 : false
-            , Object.keys(currentNode.child).length === 0);
-
-          if(textData !== undefined &&  textData !== "") currentNode.add(this.options.textNodeName, textData);
-          textData = "";
-        }
+        textData = this.saveTextToParentTag(textData, currentNode, jPath);
 
         //cdata should be set even if it is 0 length string
         if(this.options.cdataPropName){
@@ -302,14 +260,7 @@ const parseXml = function(xmlData) {
         if (currentNode && textData) {
           if(currentNode.tagname !== '!xml'){
             //when nested tag is found
-            textData = this.parseTextData(textData
-              , currentNode.tagname
-              , jPath
-              , false
-              , currentNode[":@"] ? Object.keys(currentNode[":@"]).length !== 0 : false
-              , false);
-            if(textData !== undefined &&  textData !== "") currentNode.add(this.options.textNodeName, textData);
-            textData = "";
+            textData = this.saveTextToParentTag(textData, currentNode, jPath, false);
           }
         }
 
@@ -342,6 +293,10 @@ const parseXml = function(xmlData) {
           if(tagName !== tagExp && attrExpPresent){
             childNode[":@"] = this.buildAttributesMap(tagExp, jPath);
           }
+          if(tagContent) {
+            tagContent = this.parseTextData(tagContent, tagName, jPath, true, attrExpPresent, true, true);
+          }
+          
           jPath = jPath.substr(0, jPath.lastIndexOf("."));
           childNode.add(this.options.textNodeName, tagContent);
           
@@ -405,6 +360,24 @@ const replaceEntitiesValue = function(val){
   }
   return val;
 }
+function saveTextToParentTag(textData, currentNode, jPath, isLeafNode) {
+  if (textData) { //store previously collected data as textNode
+    if(isLeafNode === undefined) isLeafNode = Object.keys(currentNode.child).length === 0
+    
+    textData = this.parseTextData(textData,
+      currentNode.tagname,
+      jPath,
+      false,
+      currentNode[":@"] ? Object.keys(currentNode[":@"]).length !== 0 : false,
+      isLeafNode);
+
+    if (textData !== undefined && textData !== "")
+      currentNode.add(this.options.textNodeName, textData);
+    textData = "";
+  }
+  return textData;
+}
+
 //TODO: use jPath to simplify the logic
 /**
  *