Adding parent to attribute nodes.

Author: leonelsanchesdasilva

src/dom/functions.ts

@@ -85,28 +85,28 @@ export function domCreateDTDSection(doc: XDocument, data: any) {
  * @author Steffen Meschkat <mesch@google.com>
  */
 export function xmlParse(xml: string): XDocument {
-    const regex_empty = /\/$/;
+    const regexEmpty = /\/$/;
 
-    let regex_tagname;
-    let regex_attribute;
+    let regexTagname;
+    let regexAttribute;
     if (xml.match(/^<\?xml/)) {
         // When an XML document begins with an XML declaration
         // VersionInfo must appear.
         if (xml.search(new RegExp(XML10_VERSION_INFO)) == 5) {
-            regex_tagname = XML10_TAGNAME_REGEXP;
-            regex_attribute = XML10_ATTRIBUTE_REGEXP;
+            regexTagname = XML10_TAGNAME_REGEXP;
+            regexAttribute = XML10_ATTRIBUTE_REGEXP;
         } else if (xml.search(new RegExp(XML11_VERSION_INFO)) == 5) {
-            regex_tagname = XML11_TAGNAME_REGEXP;
-            regex_attribute = XML11_ATTRIBUTE_REGEXP;
+            regexTagname = XML11_TAGNAME_REGEXP;
+            regexAttribute = XML11_ATTRIBUTE_REGEXP;
         } else {
             // VersionInfo is missing, or unknown version number.
             // TODO : Fallback to XML 1.0 or XML 1.1, or just return null?
             throw new Error('VersionInfo is missing, or unknown version number.');
         }
     } else {
         // When an XML declaration is missing it's an XML 1.0 document.
-        regex_tagname = XML10_TAGNAME_REGEXP;
-        regex_attribute = XML10_ATTRIBUTE_REGEXP;
+        regexTagname = XML10_TAGNAME_REGEXP;
+        regexAttribute = XML10_ATTRIBUTE_REGEXP;
     }
 
     const xmldoc = new XDocument();
@@ -137,14 +137,14 @@ export function xmlParse(xml: string): XDocument {
                 // Ignore comments
                 // console.log(`Ignored ${text}`);
             } else {
-                const empty = text.match(regex_empty);
-                const tagname = regex_tagname.exec(text)[1];
+                const empty = text.match(regexEmpty);
+                const tagname = regexTagname.exec(text)[1];
                 let node = domCreateElement(xmldoc, tagname);
 
-                let att;
-                while ((att = regex_attribute.exec(text))) {
-                    const val = he.decode(att[5] || att[7] || '');
-                    domSetAttribute(node, att[1], val);
+                let attribute;
+                while ((attribute = regexAttribute.exec(text))) {
+                    const val = he.decode(attribute[5] || attribute[7] || '');
+                    domSetAttribute(node, attribute[1], val);
                 }
 
                 node.siblingPosition = parent.childNodes.length;

src/dom/xnode.ts

@@ -46,7 +46,7 @@ export class XNode {
 
     static _unusedXNodes: any[] = [];
 
-    constructor(type: any, name: any, opt_value: any, opt_owner: any, opt_namespace?: any) {
+    constructor(type: any, name: string, opt_value: any, opt_owner: any, opt_namespace?: any) {
         this.id = Math.random() * (Number.MAX_SAFE_INTEGER - 1) + 1;
         this.attributes = [];
         this.childNodes = [];
@@ -151,7 +151,7 @@ export class XNode {
         node.init.call(0, '', '', null);
     }
 
-    static create(type: any, name: any, value: any, owner: any, namespace?: any): XNode {
+    static create(type: any, name: string, value: any, owner: any, namespace?: any): XNode {
         if (this._unusedXNodes.length > 0) {
             const node = this._unusedXNodes.pop();
             node.init(type, name, value, owner, namespace);
@@ -333,15 +333,17 @@ export class XNode {
         return this.attributes.length > 0;
     }
 
-    setAttribute(name: any, value: any) {
+    setAttribute(name: string, value: any) {
         for (let i = 0; i < this.attributes.length; ++i) {
             if (this.attributes[i].nodeName == name) {
                 this.attributes[i].nodeValue = `${value}`;
                 return;
             }
         }
 
-        this.attributes.push(XNode.create(DOM_ATTRIBUTE_NODE, name, value, this));
+        const newAttribute = XNode.create(DOM_ATTRIBUTE_NODE, name, value, this);
+        newAttribute.parentNode = this;
+        this.attributes.push(newAttribute);
     }
 
     setTransformedAttribute(name: string, value: any) {
@@ -356,6 +358,7 @@ export class XNode {
         const newAttribute = XNode.create(DOM_ATTRIBUTE_NODE, name, value, this);
         newAttribute.transformedNodeName = name;
         newAttribute.transformedNodeValue = value;
+        newAttribute.parentNode = this;
         this.transformedAttributes.push(newAttribute);
     }