Skip to content

Allow wrap attributes with subobject to compatible with other parsers output #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 22, 2017
Merged

Allow wrap attributes with subobject to compatible with other parsers output #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions bin/parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ var tagsRegx = new RegExp("<(\\/?[\\w:\\-\._]+)([^>]*)>("+cdataRegx+")*([^<]+)?"

var defaultOptions = {
attrPrefix : "@_",
attrNodeName: false,
textNodeName : "#text",
ignoreNonTextNodeAttr : true,
ignoreTextNodeAttr : true,
Expand All @@ -30,7 +31,7 @@ var defaultOptions = {

var buildOptions = function (options){
if(!options) options = {};
var props = ["attrPrefix","ignoreNonTextNodeAttr","ignoreTextNodeAttr","ignoreNameSpace","ignoreRootElement","textNodeName","textNodeConversion","textAttrConversion","arrayMode"];
var props = ["attrPrefix","attrNodeName","ignoreNonTextNodeAttr","ignoreTextNodeAttr","ignoreNameSpace","ignoreRootElement","textNodeName","textNodeConversion","textAttrConversion","arrayMode"];
for (var i = 0; i < props.length; i++) {
if(options[props[i]] === undefined){
options[props[i]] = defaultOptions[props[i]];
Expand Down Expand Up @@ -60,11 +61,11 @@ var getTraversalObj =function (xmlData,options){
var childNode = new xmlNode(tag,currentNode);

if(selfClosingTag){
attrs = buildAttributesArr(attrsStr,options.ignoreTextNodeAttr,options.attrPrefix,options.ignoreNameSpace,options.textAttrConversion);
attrs = buildAttributesArr(attrsStr,options.ignoreTextNodeAttr,options.attrPrefix,options.attrNodeName,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,options.textAttrConversion);
attrs = buildAttributesArr(attrsStr,options.ignoreTextNodeAttr,options.attrPrefix,options.attrNodeName,options.ignoreNameSpace,options.textAttrConversion);
val = parseValue(val,options.textNodeConversion);
if(attrs){
attrs[options.textNodeName] = val;
Expand All @@ -79,7 +80,7 @@ var getTraversalObj =function (xmlData,options){
currentNode.addChild(childNode);
i++;
}else{//starting tag
attrs = buildAttributesArr(attrsStr,options.ignoreNonTextNodeAttr,options.attrPrefix,options.ignoreNameSpace,options.textAttrConversion);
attrs = buildAttributesArr(attrsStr,options.ignoreNonTextNodeAttr,options.attrPrefix,options.attrNodeName,options.ignoreNameSpace,options.textAttrConversion);
if(attrs){
for (var prop in attrs) {
if(attrs.hasOwnProperty(prop)){
Expand Down Expand Up @@ -140,16 +141,20 @@ function parseValue(val,conversion){
//var attrsRegx = new RegExp("(\\S+)=\\s*[\"']?((?:.(?![\"']?\\s+(?:\\S+)=|[>\"']))+.)[\"']?","g");
//var attrsRegx = new RegExp("(\\S+)=\\s*(['\"])((?:.(?!\\2))*.)","g");
var attrsRegx = new RegExp("(\\S+)\\s*=\\s*(['\"])(.*?)\\2","g");
function buildAttributesArr(attrStr,ignore,prefix,ignoreNS,conversion){
function buildAttributesArr(attrStr,ignore,prefix,attrNodeName,ignoreNS,conversion){
attrStr = attrStr || attrStr.trim();

if(!ignore && attrStr.length > 3){

var matches = getAllMatches(attrStr,attrsRegx);
var attrs = {};
var attrsCollection = attrs;
if(attrNodeName && matches.length){
attrsCollection = attrs[attrNodeName] = {};
}
for (var i = 0; i < matches.length; i++) {
var attrName = prefix + resolveNameSpace( matches[i][1],ignoreNS);
attrs[attrName] = parseValue(matches[i][3],conversion);
attrsCollection[attrName] = parseValue(matches[i][3],conversion);
}
return attrs;
}
Expand Down
19 changes: 12 additions & 7 deletions lib/parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ var tagsRegx = new RegExp("<(\\/?[\\w:\\-\._]+)([^>]*)>("+cdataRegx+")*([^<]+)?"

var defaultOptions = {
attrPrefix : "@_",
attrNodeName: false,
textNodeName : "#text",
ignoreNonTextNodeAttr : true,
ignoreTextNodeAttr : true,
Expand All @@ -31,7 +32,7 @@ var defaultOptions = {

var buildOptions = function (options){
if(!options) options = {};
var props = ["attrPrefix","ignoreNonTextNodeAttr","ignoreTextNodeAttr","ignoreNameSpace","ignoreRootElement","textNodeName","textNodeConversion","textAttrConversion","arrayMode"];
var props = ["attrPrefix","attrNodeName","ignoreNonTextNodeAttr","ignoreTextNodeAttr","ignoreNameSpace","ignoreRootElement","textNodeName","textNodeConversion","textAttrConversion","arrayMode"];
for (var i = 0; i < props.length; i++) {
if(options[props[i]] === undefined){
options[props[i]] = defaultOptions[props[i]];
Expand Down Expand Up @@ -61,11 +62,11 @@ var getTraversalObj =function (xmlData,options){
var childNode = new xmlNode(tag,currentNode);

if(selfClosingTag){
attrs = buildAttributesArr(attrsStr,options.ignoreTextNodeAttr,options.attrPrefix,options.ignoreNameSpace,options.textAttrConversion);
attrs = buildAttributesArr(attrsStr,options.ignoreTextNodeAttr,options.attrPrefix,options.attrNodeName,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,options.textAttrConversion);
attrs = buildAttributesArr(attrsStr,options.ignoreTextNodeAttr,options.attrPrefix,options.attrNodeName,options.ignoreNameSpace,options.textAttrConversion);
val = parseValue(val,options.textNodeConversion);
if(attrs){
attrs[options.textNodeName] = val;
Expand All @@ -80,7 +81,7 @@ var getTraversalObj =function (xmlData,options){
currentNode.addChild(childNode);
i++;
}else{//starting tag
attrs = buildAttributesArr(attrsStr,options.ignoreNonTextNodeAttr,options.attrPrefix,options.ignoreNameSpace,options.textAttrConversion);
attrs = buildAttributesArr(attrsStr,options.ignoreNonTextNodeAttr,options.attrPrefix,options.attrNodeName,options.ignoreNameSpace,options.textAttrConversion);
if(attrs){
for (var prop in attrs) {
if(attrs.hasOwnProperty(prop)){
Expand Down Expand Up @@ -141,16 +142,20 @@ function parseValue(val,conversion){
//var attrsRegx = new RegExp("(\\S+)=\\s*[\"']?((?:.(?![\"']?\\s+(?:\\S+)=|[>\"']))+.)[\"']?","g");
//var attrsRegx = new RegExp("(\\S+)=\\s*(['\"])((?:.(?!\\2))*.)","g");
var attrsRegx = new RegExp("(\\S+)\\s*=\\s*(['\"])(.*?)\\2","g");
function buildAttributesArr(attrStr,ignore,prefix,ignoreNS,conversion){
function buildAttributesArr(attrStr,ignore,prefix,attrNodeName,ignoreNS,conversion){
attrStr = attrStr || attrStr.trim();

if(!ignore && attrStr.length > 3){

var matches = getAllMatches(attrStr,attrsRegx);
var attrs = {};
var attrsCollection = attrs;
if(attrNodeName && matches.length){
attrsCollection = attrs[attrNodeName] = {};
}
for (var i = 0; i < matches.length; i++) {
var attrName = prefix + resolveNameSpace( matches[i][1],ignoreNS);
attrs[attrName] = parseValue(matches[i][3],conversion);
var attrName = (attrNodeName ? "" : prefix) + resolveNameSpace( matches[i][1],ignoreNS);
attrsCollection[attrName] = parseValue(matches[i][3],conversion);
}
return attrs;
}
Expand Down
43 changes: 43 additions & 0 deletions spec/xmlParser_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,49 @@ describe("XMLParser", function () {
expect(result).toEqual(expected);
});

it("should parse nested elements with attributes wrapped in array", function () {
var xmlData = '<root>'
+'<Meet date="2017-05-03" type="A" name="Meeting \'A\'">'
+ '<Event time="00:05:00" ID="574" Name="Some Event Name">'
+ '<User ID="1">Bob</User>'
+ '</Event>'
+ '</Meet>'
+'</root>';
var expected = {
"root": {
"Meet": {
"$": {
"date": "2017-05-03",
"type": "A",
"name": "Meeting 'A'"
},
"Event": {
"$": {
"time": "00:05:00",
"ID": "574",
"Name": "Some Event Name"
},
"User": {
"$": {
"ID": "1"
},
"#text": "Bob"
}
}
}
}
};

var result = parser.parse(xmlData, {
attrPrefix:"",
attrNodeName:"$",
ignoreTextNodeAttr: false,
ignoreNonTextNodeAttr: false
});

expect(result).toEqual(expected);
});

it("should parse all type of nodes", function () {
var fs = require("fs");
var path = require("path");
Expand Down