Skip to content

feat(xml-parser): Adds index and childCount (appendIndexInNodes optio… #172

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

Closed
wants to merge 7 commits into from
Closed

feat(xml-parser): Adds index and childCount (appendIndexInNodes optio… #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b4d9dea
feat(xml-parser): Adds index and childCount (appendIndexInNodes optio…
gvillo Jul 22, 2019
c54283b
fix(xml-parser): Extracts appendIndexInNodes into func to re use when…
gvillo Jul 25, 2019
8c38e76
fix(xml-parser): Changes default value for indexInNodesName from #ind…
gvillo Aug 1, 2019
48848e8
Merge branch 'master-upstream'
gvillo Apr 16, 2020
6b288cd
Merge branch 'master' into add-index-childCount-xml-parser
gvillo Apr 16, 2020
39de9df
Merge branch 'master-upstream'
gvillo Apr 17, 2020
bd71e08
Merge branch 'master' into add-index-childCount-xml-parser
gvillo Apr 17, 2020
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
163 changes: 162 additions & 1 deletion spec/xmlParser_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,7 @@ describe("XMLParser", function() {
expect(result).toEqual(expected);
});

it("should validate before parsing", function() {
it("should validate before parsing", function() {
const xmlData = "<?xml version='1.0'?>"
+ "<tag>"
+ " <subtag2>subtag text</subtag2>"
Expand Down Expand Up @@ -825,4 +825,165 @@ describe("XMLParser", function() {
//console.log(JSON.stringify(result,null,4));
expect(result).toEqual(expected);
});

it("should add index and childCount to single node", function() {
const xmlData = `<rootNode><tag int='045' float='65.34'>value</tag></rootNode>`;
const expected = {
"childCount": 1,
"rootNode": {
"indexPos": 0,
"childCount": 1,
"tag": {
"indexPos": 0,
"#text": "value",
"@_int": 45,
"@_float": 65.34
}
}
};

const result = parser.parse(xmlData, {
ignoreAttributes: false,
parseAttributeValue: true,
appendIndexInNodes: true
});

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

it("should add index and childCount to array", function() {
const xmlData = `<rootNode>
<tag>value</tag>
<tag>45</tag>
<tag>65.34</tag>
</rootNode>`;

const expected = {
"childCount": 1,
"rootNode": {
"indexPos": 0,
"childCount": 3,
"tag": [
{
"#text": "value",
"indexPos": 0
},
{
"#text": 45,
"indexPos": 1
},
{
"#text": 65.34,
"indexPos": 2
}
]
}
};
const result = parser.parse(xmlData,{ appendIndexInNodes: true });
// console.log(result);
// console.log(JSON.stringify(result,null,4));
expect(result).toEqual(expected);
});

it("should add index and childCount to array and keep attributes", function() {
const xmlData = `<rootNode>
<tag name="Gabriel">value</tag>
<tag country="Argentina">45</tag>
<tag some="thing">65.34</tag>
</rootNode>`;

const expected = {
"childCount": 1,
"rootNode": {
"indexPos": 0,
"childCount": 3,
"tag": [
{
"#text": "value",
"@_name": "Gabriel",
"indexPos": 0
},
{
"#text": 45,
"@_country": "Argentina",
"indexPos": 1
},
{
"#text": 65.34,
"@_some": "thing",
"indexPos": 2
}
]
}
};
const result = parser.parse(xmlData,{ ignoreAttributes: false, appendIndexInNodes: true });
// console.log(JSON.stringify(result,null,4));
expect(result).toEqual(expected);
});

it("should add index and childCount to array and ignore attributes", function() {
const xmlData = `<rootNode>
<tag name="Gabriel">value</tag>
<tag country="Argentina">45</tag>
<tag some="thing">65.34</tag>
</rootNode>`;

const expected = {
"childCount": 1,
"rootNode": {
"indexPos": 0,
"childCount": 3,
"tag": [
{
"#text": "value",
"indexPos": 0
},
{
"#text": 45,
"indexPos": 1
},
{
"#text": 65.34,
"indexPos": 2
}
]
}
};
const result = parser.parse(xmlData,{ ignoreAttributes: true, appendIndexInNodes: true });
// console.log(JSON.stringify(result,null,4));
expect(result).toEqual(expected);
});

it("should add index and childCount to array in right order", function() {
const xmlData = `<rootNode>
<tag>value</tag>
<label>45</label>
<tag>65.34</tag>
</rootNode>`;

const expected = {
"childCount": 1,
"rootNode": {
"indexPos": 0,
"childCount": 3,
"tag": [
{
"#text": "value",
"indexPos": 0
},
{
"#text": 65.34,
"indexPos": 2
}
],
"label": {
"#text": 45,
"indexPos": 1
},
}
};
const result = parser.parse(xmlData,{ ignoreAttributes: false, appendIndexInNodes: true });
// console.log(JSON.stringify(result,null,4));
expect(result).toEqual(expected);
});
});
25 changes: 24 additions & 1 deletion src/xmlstr2xmlnode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ const util = require('./util');
const buildOptions = require('./util').buildOptions;
const xmlNode = require('./xmlNode');
const TagType = {OPENING: 1, CLOSING: 2, SELF: 3, CDATA: 4};
const attrstr_regex = '((\\s*[\\w\\-._:]+(=((\'([^\']*)\')|("([^"]*)")))?)*)\\s*';
const regx =
'<((!\\[CDATA\\[([\\s\\S]*?)(]]>))|((NAME:)?(NAME))([^>]*)>|((\\/)(NAME)\\s*>))([^<]*)'
.replace(/NAME/g, util.nameRegexp);

//const tagsRegx = new RegExp("<(\\/?[\\w:\\-\._]+)([^>]*)>(\\s*"+cdataRegx+")*([^<]+)?","g");
//const tagsRegx = new RegExp("<(\\/?)((\\w*:)?([\\w:\\-\._]+))([^>]*)>([^<]*)("+cdataRegx+"([^<]*))*([^<]+)?","g");

Expand All @@ -23,6 +24,8 @@ const defaultOptions = {
attributeNamePrefix: '@_',
attrNodeName: false,
textNodeName: '#text',
appendIndexInNodes: false,
indexInNodesName: 'indexPos',
ignoreAttributes: true,
ignoreNameSpace: false,
allowBooleanAttributes: false, //a tag can have attributes without any value
Expand All @@ -49,6 +52,8 @@ const props = [
'attributeNamePrefix',
'attrNodeName',
'textNodeName',
'appendIndexInNodes',
'indexInNodesName',
'ignoreAttributes',
'ignoreNameSpace',
'allowBooleanAttributes',
Expand Down Expand Up @@ -115,6 +120,7 @@ const getTraversalObj = function(xmlData, options) {
tag[8] = tag[8].substr(0, tag[8].length - 1);
}
childNode.attrsMap = buildAttributesMap(tag[8], options);
processAppendIndexInNodes(currentNode, childNode, options);
currentNode.addChild(childNode);
} else {
//TagType.OPENING
Expand All @@ -127,6 +133,7 @@ const getTraversalObj = function(xmlData, options) {
childNode.startIndex=tag.index + tag[1].length
}
childNode.attrsMap = buildAttributesMap(tag[8], options);
processAppendIndexInNodes(currentNode, childNode, options);
currentNode.addChild(childNode);
currentNode = childNode;
}
Expand All @@ -138,6 +145,22 @@ const getTraversalObj = function(xmlData, options) {
return xmlObj;
};


function processAppendIndexInNodes(currentNode, childNode, options) {
if (options.appendIndexInNodes) {
if (currentNode.attrsMap === undefined) { currentNode.attrsMap = {}}
if (childNode.attrsMap === undefined) { childNode.attrsMap = {}}
const childCount = currentNode.attrsMap.childCount;
if (childCount !== undefined) {
childNode.attrsMap[options.indexInNodesName] = childCount;
} else {
childNode.attrsMap[options.indexInNodesName] = 0;
currentNode.attrsMap.childCount = 0;
}
currentNode.attrsMap.childCount++;
}
}

function processTagValue(parsedTags, options, parentTagName) {
const tagName = parsedTags[7] || parentTagName;
let val = parsedTags[12];
Expand Down