Skip to content

Commit b9b64d1

Browse files
leonelsanchesdasilvaleonelsanchesdasilva
authored
Unifying attributes with other child nodes. (#84)
* Unifying attributes with the rest of child nodes. * Refactoring `Xslt` class. * Refactoring `xml-functions` and `xml-parser` to use child nodes as attributes. * `xmlValue` should not consider attributes. * Fixing unit tests that were using `attributes` property to assert results. * Getting rid of `transformedAttributes`. * The XML output should *not* consider attributes for determine whether tags should be self-closed or not. * - Improving types among different sources; - Fixing xPath expressions to not consider attributes for most of cases. * - Even more types; - Changing `xsltVariable` to not consider attributes while deciding how to set the `NodeValue` object. * Fixing typing for `PredicateExpr`.
1 parent 4b4afc5 commit b9b64d1

19 files changed

+291
-188
lines changed

‎src/dom/functions.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { XDocument } from "./xdocument";
77
import { XNode } from './xnode';
88

99
// Wrapper around DOM methods so we can condense their invocations.
10-
export function domGetAttributeValue(node: any, name: string) {
10+
export function domGetAttributeValue(node: XNode, name: string) {
1111
return node.getAttributeValue(name);
1212
}
1313

‎src/dom/xdocument.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ export class XDocument extends XNode {
2020
this.documentElement = null;
2121
}
2222

23-
clear() {
23+
// TODO: Do we still need this?
24+
/* clear() {
2425
XNode.recycle(this.documentElement);
2526
this.documentElement = null;
26-
}
27+
} */
2728

2829
appendChild(node: any) {
2930
super.appendChild(node);

‎src/dom/xml-functions.ts‎

Lines changed: 30 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import { XmlOutputOptions } from './xml-output-options';
2525
* @param disallowBrowserSpecificOptimization A boolean, to avoid browser optimization.
2626
* @returns The XML value as a string.
2727
*/
28-
export function xmlValue(node: any, disallowBrowserSpecificOptimization: boolean = false): string {
28+
export function xmlValue(node: XNode | any, disallowBrowserSpecificOptimization: boolean = false): string {
2929
if (!node) {
3030
return '';
3131
}
@@ -42,25 +42,28 @@ export function xmlValue(node: any, disallowBrowserSpecificOptimization: boolean
4242
case DOM_DOCUMENT_NODE:
4343
case DOM_DOCUMENT_FRAGMENT_NODE:
4444
if (!disallowBrowserSpecificOptimization) {
45-
// IE, Safari, Opera, and friends
45+
// Only returns something if node has either `innerText` or `textContent` (not an XNode).
46+
// IE, Safari, Opera, and friends (`innerText`)
4647
const innerText = node.innerText;
4748
if (innerText != undefined) {
4849
return innerText;
4950
}
50-
// Firefox
51+
// Firefox (`textContent`)
5152
const textContent = node.textContent;
5253
if (textContent != undefined) {
5354
return textContent;
5455
}
5556
}
5657

5758
if (node.transformedChildNodes.length > 0) {
58-
for (let i = 0; i < node.transformedChildNodes.length; ++i) {
59-
ret += xmlValue(node.transformedChildNodes[i]);
59+
const transformedTextNodes = node.transformedChildNodes.filter((n: XNode) => n.nodeType !== DOM_ATTRIBUTE_NODE);
60+
for (let i = 0; i < transformedTextNodes.length; ++i) {
61+
ret += xmlValue(transformedTextNodes[i]);
6062
}
6163
} else {
62-
for (let i = 0; i < node.childNodes.length; ++i) {
63-
ret += xmlValue(node.childNodes[i]);
64+
const textNodes = node.childNodes.filter((n: XNode) => n.nodeType !== DOM_ATTRIBUTE_NODE);
65+
for (let i = 0; i < textNodes.length; ++i) {
66+
ret += xmlValue(textNodes[i]);
6467
}
6568
}
6669

@@ -96,7 +99,7 @@ export function xmlValue2(node: any, disallowBrowserSpecificOptimization: boolea
9699
return textContent;
97100
}
98101
}
99-
// pobrecito!
102+
100103
const len = node.transformedChildNodes.length;
101104
for (let i = 0; i < len; ++i) {
102105
ret += xmlValue(node.transformedChildNodes[i]);
@@ -137,10 +140,15 @@ function xmlTextRecursive(node: XNode, buffer: string[], options: XmlOutputOptio
137140
buffer.push(`<!--${node.nodeValue}-->`);
138141
} else if (node.nodeType == DOM_ELEMENT_NODE) {
139142
buffer.push(`<${xmlFullNodeName(node)}`);
140-
for (let i = 0; i < node.attributes.length; ++i) {
141-
const a = node.attributes[i];
142-
if (a && a.nodeName && a.nodeValue) {
143-
buffer.push(` ${xmlFullNodeName(a)}="${xmlEscapeAttr(a.nodeValue)}"`);
143+
144+
for (let i = 0; i < node.childNodes.length; ++i) {
145+
const childNode = node.childNodes[i];
146+
if (!childNode || childNode.nodeType !== DOM_ATTRIBUTE_NODE) {
147+
continue;
148+
}
149+
150+
if (childNode.nodeName && childNode.nodeValue) {
151+
buffer.push(` ${xmlFullNodeName(childNode)}="${xmlEscapeAttr(childNode.nodeValue)}"`);
144152
}
145153
}
146154

@@ -233,7 +241,11 @@ function xmlTransformedTextRecursive(node: XNode, buffer: any[], options: XmlOut
233241
function xmlElementLogicTrivial(node: XNode, buffer: string[], options: XmlOutputOptions) {
234242
buffer.push(`<${xmlFullNodeName(node)}`);
235243

236-
const attributes = node.transformedAttributes || node.attributes;
244+
let attributes = node.transformedChildNodes.filter(n => n.nodeType === DOM_ATTRIBUTE_NODE);
245+
if (attributes.length === 0) {
246+
attributes = node.childNodes.filter(n => n.nodeType === DOM_ATTRIBUTE_NODE);
247+
}
248+
237249
for (let i = 0; i < attributes.length; ++i) {
238250
const attribute = attributes[i];
239251
if (!attribute) {
@@ -245,7 +257,11 @@ function xmlElementLogicTrivial(node: XNode, buffer: string[], options: XmlOutpu
245257
}
246258
}
247259

248-
let childNodes = node.transformedChildNodes.length > 0 ? node.transformedChildNodes : node.childNodes;
260+
let childNodes = node.transformedChildNodes.filter(n => n.nodeType !== DOM_ATTRIBUTE_NODE);
261+
if (childNodes.length === 0) {
262+
childNodes = node.childNodes.filter(n => n.nodeType !== DOM_ATTRIBUTE_NODE);
263+
}
264+
249265
childNodes = childNodes.sort((a, b) => a.siblingPosition - b.siblingPosition);
250266
if (childNodes.length === 0) {
251267
if (options.outputMethod === 'html' && ['hr', 'link', 'meta'].includes(node.nodeName)) {

‎src/dom/xml-parser.ts‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import {
1919
XML11_VERSION_INFO
2020
} from './xmltoken';
2121
import { XNode } from './xnode';
22+
import { DOM_ATTRIBUTE_NODE } from '../constants';
2223

2324
/**
2425
* Original author: Steffen Meschkat <mesch@google.com> (the `xmlParse` function,
@@ -67,12 +68,17 @@ export class XmlParser {
6768
};
6869
let n = node;
6970
while (n !== null) {
70-
for (let i = 0; i < n.attributes.length; i++) {
71-
if (n.attributes[i].nodeName.startsWith('xmlns:')) {
72-
const prefix = n.attributes[i].nodeName.split(':')[1];
73-
if (!(prefix in map)) map[prefix] = n.attributes[i].nodeValue;
74-
} else if (n.attributes[i].nodeName == 'xmlns') {
75-
if (!('' in map)) map[''] = n.attributes[i].nodeValue || null;
71+
for (let i = 0; i < n.childNodes.length; i++) {
72+
const childNode = n.childNodes[i];
73+
if (childNode.nodeType !== DOM_ATTRIBUTE_NODE) {
74+
continue;
75+
}
76+
77+
if (childNode.nodeName.startsWith('xmlns:')) {
78+
const prefix = childNode.nodeName.split(':')[1];
79+
if (!(prefix in map)) map[prefix] = childNode.nodeValue;
80+
} else if (childNode.nodeName == 'xmlns') {
81+
if (!('' in map)) map[''] = childNode.nodeValue || null;
7682
}
7783
}
7884
n = n.parentNode;
@@ -258,11 +264,15 @@ export class XmlParser {
258264
} else {
259265
if ('' in namespaceMap) node.namespaceUri = namespaceMap[''];
260266
}
261-
for (let i = 0; i < node.attributes.length; ++i) {
262-
if (node.attributes[i].prefix !== null) {
263-
if (node.attributes[i].prefix in namespaceMap) {
264-
node.attributes[i].namespaceUri = namespaceMap[node.attributes[i].prefix];
265-
}
267+
268+
for (let i = 0; i < node.childNodes.length; ++i) {
269+
const childNode = node.childNodes[i];
270+
if (childNode.nodeType !== DOM_ATTRIBUTE_NODE) {
271+
continue;
272+
}
273+
274+
if (childNode.prefix !== null && childNode.prefix in namespaceMap) {
275+
childNode.namespaceUri = namespaceMap[childNode.prefix];
266276
// else, prefix undefined.
267277
}
268278
// elements with no prefix always have no namespace, so do nothing here.

0 commit comments

Comments
 (0)