Getting rid of the moronic ExprContext.node.

Author: leonelsanchesdasilva

src/dom/functions.ts

@@ -32,8 +32,8 @@ const XML11_TAGNAME_REGEXP = new RegExp(`^(${XML11_NAME})`);
 const XML11_ATTRIBUTE_REGEXP = new RegExp(XML11_ATTRIBUTE, 'g');
 
 // Wrapper around DOM methods so we can condense their invocations.
-export function domGetAttribute(node: any, name: any) {
-    return node.getAttribute(name);
+export function domGetAttributeValue(node: any, name: any) {
+    return node.getAttributeValue(name);
 }
 
 export function domSetAttribute(node: any, name: any, value: any) {

src/dom/xml-functions.ts

@@ -9,7 +9,7 @@ import {
     DOM_ELEMENT_NODE,
     DOM_TEXT_NODE
 } from '../constants';
-import { domGetAttribute } from './functions';
+import { domGetAttributeValue } from './functions';
 import { XNode } from './xnode';
 
 // Returns the text value of a node; for nodes without children this
@@ -144,7 +144,7 @@ export function xmlGetAttribute(node: XNode, name: string) {
     // TODO(mesch): This should not be necessary if the DOM is working
     // correctly. The DOM is responsible for resolving entities, not the
     // application.
-    const value = domGetAttribute(node, name);
+    const value = domGetAttributeValue(node, name);
     if (value) {
         return he.decode(value);
     }

src/dom/xnode.ts

@@ -13,10 +13,10 @@ export class XNode {
     childNodes: XNode[];
     nodeType: any;
     nodeName: string;
-    nodeValue: string;
+    nodeValue: any;
     transformedNodeType: any;
     transformedNodeName: string;
-    transformedNodeValue: string;
+    transformedNodeValue: any;
     ownerDocument: any;
     namespaceURI: any;
     prefix: any;
@@ -278,7 +278,7 @@ export class XNode {
         this.attributes.push(XNode.create(DOM_ATTRIBUTE_NODE, name, value, this, namespace));
     }
 
-    getAttribute(name: any) {
+    getAttributeValue(name: any): any {
         for (let i = 0; i < this.attributes.length; ++i) {
             if (this.attributes[i].nodeName == name) {
                 return this.attributes[i].nodeValue;
@@ -414,7 +414,7 @@ export class XNode {
         domTraverseElements(
             this,
             (node: any) => {
-                if (node.getAttribute('id') == id) {
+                if (node.getAttributeValue('id') == id) {
                     ret = node;
                     return false;
                 }

src/xpath/expr-context.ts

@@ -58,9 +58,8 @@ import { TOK_NUMBER } from "./tokens";
 import { XNode } from "../dom";
 
 export class ExprContext {
-    node: XNode;
-    position: any;
-    nodelist: any;
+    position: number;
+    nodelist: XNode[];
     variables: any;
     parent: any;
     caseInsensitive: any;
@@ -70,18 +69,16 @@ export class ExprContext {
     root: any;
 
     constructor(
-        node: any,
-        opt_position?: any,
-        opt_nodelist?: any,
+        nodelist: any[],
+        opt_position?: number,
         opt_parent?: any,
         opt_caseInsensitive?: any,
         opt_ignoreAttributesWithoutValue?: any,
         opt_returnOnFirstMatch?: any,
         opt_ignoreNonElementNodesForNTA?: any
     ) {
-        this.node = node;
+        this.nodelist = nodelist;
         this.position = opt_position || 0;
-        this.nodelist = opt_nodelist || [node];
         this.variables = {};
         this.parent = opt_parent || null;
         this.caseInsensitive = opt_caseInsensitive || false;
@@ -90,22 +87,21 @@ export class ExprContext {
         this.ignoreNonElementNodesForNTA = opt_ignoreNonElementNodesForNTA || false;
         if (opt_parent) {
             this.root = opt_parent.root;
-        } else if (this.node.nodeType == DOM_DOCUMENT_NODE) {
+        } else if (this.nodelist[this.position].nodeType == DOM_DOCUMENT_NODE) {
             // NOTE(mesch): DOM Spec stipulates that the ownerDocument of a
             // document is null. Our root, however is the document that we are
             // processing, so the initial context is created from its document
             // node, which case we must handle here explcitly.
-            this.root = node;
+            this.root = this.nodelist[this.position];
         } else {
-            this.root = node.ownerDocument;
+            this.root = this.nodelist[this.position].ownerDocument;
         }
     }
 
-    clone(opt_node?: any, opt_position?: any, opt_nodelist?: any[]) {
+    clone(opt_nodelist?: any[], opt_position?: any) {
         return new ExprContext(
-            opt_node || this.node,
-            typeof opt_position != 'undefined' ? opt_position : this.position,
             opt_nodelist || this.nodelist,
+            typeof opt_position != 'undefined' ? opt_position : this.position,
             this,
             this.caseInsensitive,
             this.ignoreAttributesWithoutValue,
@@ -146,8 +142,7 @@ export class ExprContext {
         }
     }
 
-    setNode(position) {
-        this.node = this.nodelist[position];
+    setNode(position: number) {
         this.position = position;
     }