happy-dom 17.1.3 → 17.1.5

package/lib/tree-walker/TreeWalker.d.ts

@@ -3,8 +3,12 @@ import * as PropertySymbol from '../PropertySymbol.js';
 import INodeFilter from './INodeFilter.js';
 /**
  * The TreeWalker object represents the nodes of a document subtree and a position within them.
+ *
+ * @see https://developer.mozilla.org/en-US/docs/Web/API/TreeWalker
+ * @see https://dom.spec.whatwg.org/#interface-treewalker
  */
 export default class TreeWalker {
+    #private;
     root: Node;
     whatToShow: number;
     filter: INodeFilter;
@@ -17,18 +21,6 @@ export default class TreeWalker {
      * @param [filter] Filter.
      */
     constructor(root: Node, whatToShow?: number, filter?: INodeFilter);
-    /**
-     * Moves the current Node to the next visible node in the document order.
-     *
-     * @returns Current node.
-     */
-    nextNode(): Node;
-    /**
-     * Moves the current Node to the previous visible node in the document order, and returns the found node. It also moves the current node to this one. If no such node exists, or if it is before that the root node defined at the object construction, returns null and the current node is not changed.
-     *
-     * @returns Current node.
-     */
-    previousNode(): Node;
     /**
      * Moves the current Node to the first visible ancestor node in the document order, and returns the found node. It also moves the current node to this one. If no such node exists, or if it is before that the root node defined at the object construction, returns null and the current node is not changed.
      *
@@ -47,6 +39,12 @@ export default class TreeWalker {
      * @returns Current node.
      */
     lastChild(): Node;
+    /**
+     * Moves the current Node to its next sibling, if any, and returns the found sibling. If there is no such node, null is returned and the current node is not changed.
+     *
+     * @returns Current node.
+     */
+    nextSibling(): Node;
     /**
      * Moves the current Node to its previous sibling, if any, and returns the found sibling. If there is no such node, return null and the current node is not changed.
      *
@@ -54,11 +52,17 @@ export default class TreeWalker {
      */
     previousSibling(): Node;
     /**
-     * Moves the current Node to its next sibling, if any, and returns the found sibling. If there is no such node, null is returned and the current node is not changed.
+     * Moves the current Node to the previous visible node in the document order, and returns the found node. It also moves the current node to this one. If no such node exists, or if it is before that the root node defined at the object construction, returns null and the current node is not changed.
      *
      * @returns Current node.
      */
-    nextSibling(): Node;
+    previousNode(): Node;
+    /**
+     * Moves the current Node to the next visible node in the document order.
+     *
+     * @returns Current node.
+     */
+    nextNode(): Node | null;
     /**
      * Filters a node.
      *

package/lib/tree-walker/TreeWalker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TreeWalker.d.ts","sourceRoot":"","sources":["../../src/tree-walker/TreeWalker.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,uBAAuB,CAAC;AACzC,OAAO,KAAK,cAAc,MAAM,sBAAsB,CAAC;AACvD,OAAO,WAAW,MAAM,kBAAkB,CAAC;AAK3C;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,UAAU;IACvB,IAAI,EAAE,IAAI,CAAQ;IAClB,UAAU,SAAM;IAChB,MAAM,EAAE,WAAW,CAAQ;IAC3B,WAAW,EAAE,IAAI,CAAQ;IAEhC;;;;;;OAMG;gBACS,IAAI,EAAE,IAAI,EAAE,UAAU,SAAK,EAAE,MAAM,GAAE,WAAkB;IAWnE;;;;OAIG;IACI,QAAQ,IAAI,IAAI;IAQvB;;;;OAIG;IACI,YAAY,IAAI,IAAI;IAM3B;;;;OAIG;IACI,UAAU,IAAI,IAAI;IAoBzB;;;;OAIG;IACI,UAAU,IAAI,IAAI;IAgBzB;;;;OAIG;IACI,SAAS,IAAI,IAAI;IAgBxB;;;;OAIG;IACI,eAAe,IAAI,IAAI;IAyB9B;;;;OAIG;IACI,WAAW,IAAI,IAAI;IAyB1B;;;;;;;;OAQG;IACI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM;CAetD"}
+{"version":3,"file":"TreeWalker.d.ts","sourceRoot":"","sources":["../../src/tree-walker/TreeWalker.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,uBAAuB,CAAC;AACzC,OAAO,KAAK,cAAc,MAAM,sBAAsB,CAAC;AACvD,OAAO,WAAW,MAAM,kBAAkB,CAAC;AAe3C;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,UAAU;;IACvB,IAAI,EAAE,IAAI,CAAQ;IAClB,UAAU,SAAM;IAChB,MAAM,EAAE,WAAW,CAAQ;IAC3B,WAAW,EAAE,IAAI,CAAQ;IAEhC;;;;;;OAMG;gBACS,IAAI,EAAE,IAAI,EAAE,UAAU,SAAK,EAAE,MAAM,GAAE,WAAkB;IAWnE;;;;OAIG;IACI,UAAU,IAAI,IAAI;IAYzB;;;;OAIG;IACI,UAAU,IAAI,IAAI;IAIzB;;;;OAIG;IACI,SAAS,IAAI,IAAI;IAIxB;;;;OAIG;IACI,WAAW,IAAI,IAAI;IAI1B;;;;OAIG;IACI,eAAe,IAAI,IAAI;IAI9B;;;;OAIG;IACI,YAAY,IAAI,IAAI;IAsC3B;;;;OAIG;IACI,QAAQ,IAAI,IAAI,GAAG,IAAI;IA2C9B;;;;;;;;OAQG;IACI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM;CA0GtD"}

package/lib/tree-walker/TreeWalker.js

@@ -3,8 +3,21 @@ import * as PropertySymbol from '../PropertySymbol.js';
 import NodeFilterMask from './NodeFilterMask.js';
 import DOMException from '../exception/DOMException.js';
 import NodeFilter from './NodeFilter.js';
+var TraverseChildrenTypeEnum;
+(function (TraverseChildrenTypeEnum) {
+    TraverseChildrenTypeEnum["first"] = "first";
+    TraverseChildrenTypeEnum["last"] = "last";
+})(TraverseChildrenTypeEnum || (TraverseChildrenTypeEnum = {}));
+var TraverseSiblingsTypeEnum;
+(function (TraverseSiblingsTypeEnum) {
+    TraverseSiblingsTypeEnum["next"] = "next";
+    TraverseSiblingsTypeEnum["previous"] = "previous";
+})(TraverseSiblingsTypeEnum || (TraverseSiblingsTypeEnum = {}));
 /**
  * The TreeWalker object represents the nodes of a document subtree and a position within them.
+ *
+ * @see https://developer.mozilla.org/en-US/docs/Web/API/TreeWalker
+ * @see https://dom.spec.whatwg.org/#interface-treewalker
  */
 export default class TreeWalker {
     root = null;
@@ -27,44 +40,20 @@ export default class TreeWalker {
         this.filter = filter;
         this.currentNode = root;
     }
-    /**
-     * Moves the current Node to the next visible node in the document order.
-     *
-     * @returns Current node.
-     */
-    nextNode() {
-        if (!this.firstChild()) {
-            while (!this.nextSibling() && this.parentNode()) { }
-            this.currentNode = this.currentNode === this.root ? null : this.currentNode || null;
-        }
-        return this.currentNode;
-    }
-    /**
-     * Moves the current Node to the previous visible node in the document order, and returns the found node. It also moves the current node to this one. If no such node exists, or if it is before that the root node defined at the object construction, returns null and the current node is not changed.
-     *
-     * @returns Current node.
-     */
-    previousNode() {
-        while (!this.previousSibling() && this.parentNode()) { }
-        this.currentNode = this.currentNode === this.root ? null : this.currentNode || null;
-        return this.currentNode;
-    }
     /**
      * Moves the current Node to the first visible ancestor node in the document order, and returns the found node. It also moves the current node to this one. If no such node exists, or if it is before that the root node defined at the object construction, returns null and the current node is not changed.
      *
      * @returns Current node.
      */
     parentNode() {
-        if (this.currentNode !== this.root &&
-            this.currentNode &&
-            this.currentNode[PropertySymbol.parentNode]) {
-            this.currentNode = this.currentNode[PropertySymbol.parentNode];
-            if (this[PropertySymbol.filterNode](this.currentNode) === NodeFilter.FILTER_ACCEPT) {
+        let node = this.currentNode;
+        while (node !== null && node !== this.root) {
+            node = node.parentNode;
+            if (node !== null && this[PropertySymbol.filterNode](node) === NodeFilter.FILTER_ACCEPT) {
+                this.currentNode = node;
                 return this.currentNode;
             }
-            this.parentNode();
         }
-        this.currentNode = null;
         return null;
     }
     /**
@@ -73,15 +62,7 @@ export default class TreeWalker {
      * @returns Current node.
      */
     firstChild() {
-        const childNodes = this.currentNode ? this.currentNode[PropertySymbol.nodeArray] : [];
-        if (childNodes.length > 0) {
-            this.currentNode = childNodes[0];
-            if (this[PropertySymbol.filterNode](this.currentNode) === NodeFilter.FILTER_ACCEPT) {
-                return this.currentNode;
-            }
-            return this.nextSibling();
-        }
-        return null;
+        return this.#traverseChildren(TraverseChildrenTypeEnum.first);
     }
     /**
      * Moves the current Node to the last visible child of the current node, and returns the found child. It also moves the current node to this child. If no such child exists, null is returned and the current node is not changed.
@@ -89,15 +70,15 @@ export default class TreeWalker {
      * @returns Current node.
      */
     lastChild() {
-        const childNodes = this.currentNode ? this.currentNode[PropertySymbol.nodeArray] : [];
-        if (childNodes.length > 0) {
-            this.currentNode = childNodes[childNodes.length - 1];
-            if (this[PropertySymbol.filterNode](this.currentNode) === NodeFilter.FILTER_ACCEPT) {
-                return this.currentNode;
-            }
-            return this.previousSibling();
-        }
-        return null;
+        return this.#traverseChildren(TraverseChildrenTypeEnum.last);
+    }
+    /**
+     * Moves the current Node to its next sibling, if any, and returns the found sibling. If there is no such node, null is returned and the current node is not changed.
+     *
+     * @returns Current node.
+     */
+    nextSibling() {
+        return this.#traverseSiblings(TraverseSiblingsTypeEnum.next);
     }
     /**
      * Moves the current Node to its previous sibling, if any, and returns the found sibling. If there is no such node, return null and the current node is not changed.
@@ -105,41 +86,78 @@ export default class TreeWalker {
      * @returns Current node.
      */
     previousSibling() {
-        if (this.currentNode !== this.root &&
-            this.currentNode &&
-            this.currentNode[PropertySymbol.parentNode]) {
-            const siblings = this.currentNode[PropertySymbol.parentNode][PropertySymbol.nodeArray];
-            const index = siblings.indexOf(this.currentNode);
-            if (index > 0) {
-                this.currentNode = siblings[index - 1];
-                if (this[PropertySymbol.filterNode](this.currentNode) === NodeFilter.FILTER_ACCEPT) {
-                    return this.currentNode;
+        return this.#traverseSiblings(TraverseSiblingsTypeEnum.previous);
+    }
+    /**
+     * Moves the current Node to the previous visible node in the document order, and returns the found node. It also moves the current node to this one. If no such node exists, or if it is before that the root node defined at the object construction, returns null and the current node is not changed.
+     *
+     * @returns Current node.
+     */
+    previousNode() {
+        let node = this.currentNode;
+        while (node !== this.root) {
+            let sibling = node.previousSibling;
+            while (sibling !== null) {
+                let node = sibling;
+                let result = this[PropertySymbol.filterNode](node);
+                while (result !== NodeFilter.FILTER_REJECT && node[PropertySymbol.nodeArray].length) {
+                    node = node.lastChild;
+                    result = this[PropertySymbol.filterNode](node);
                 }
-                return this.previousSibling();
+                if (result === NodeFilter.FILTER_ACCEPT) {
+                    this.currentNode = node;
+                    return node;
+                }
+                sibling = node.previousSibling;
+            }
+            if (node === this.root || node.parentNode === null) {
+                return null;
+            }
+            node = node.parentNode;
+            if (this[PropertySymbol.filterNode](node) === NodeFilter.FILTER_ACCEPT) {
+                this.currentNode = node;
+                return node;
             }
         }
         return null;
     }
     /**
-     * Moves the current Node to its next sibling, if any, and returns the found sibling. If there is no such node, null is returned and the current node is not changed.
+     * Moves the current Node to the next visible node in the document order.
      *
      * @returns Current node.
      */
-    nextSibling() {
-        if (this.currentNode !== this.root &&
-            this.currentNode &&
-            this.currentNode[PropertySymbol.parentNode]) {
-            const siblings = this.currentNode[PropertySymbol.parentNode][PropertySymbol.nodeArray];
-            const index = siblings.indexOf(this.currentNode);
-            if (index + 1 < siblings.length) {
-                this.currentNode = siblings[index + 1];
-                if (this[PropertySymbol.filterNode](this.currentNode) === NodeFilter.FILTER_ACCEPT) {
-                    return this.currentNode;
+    nextNode() {
+        let node = this.currentNode;
+        let result = NodeFilter.FILTER_ACCEPT;
+        while (true) {
+            while (result !== NodeFilter.FILTER_REJECT && node[PropertySymbol.nodeArray].length) {
+                node = node.firstChild;
+                result = this[PropertySymbol.filterNode](node);
+                if (result === NodeFilter.FILTER_ACCEPT) {
+                    this.currentNode = node;
+                    return node;
+                }
+            }
+            while (node !== null) {
+                if (node === this.root) {
+                    return null;
                 }
-                return this.nextSibling();
+                const sibling = node.nextSibling;
+                if (sibling !== null) {
+                    node = sibling;
+                    break;
+                }
+                node = node.parentNode;
+            }
+            if (node === null) {
+                return null;
+            }
+            result = this[PropertySymbol.filterNode](node);
+            if (result === NodeFilter.FILTER_ACCEPT) {
+                this.currentNode = node;
+                return node;
             }
         }
-        return null;
     }
     /**
      * Filters a node.
@@ -163,5 +181,77 @@ export default class TreeWalker {
         }
         return NodeFilter.FILTER_ACCEPT;
     }
+    /**
+     * Traverses children.
+     *
+     * @param type Type.
+     * @returns Node.
+     */
+    #traverseChildren(type) {
+        let node = this.currentNode;
+        node = type === TraverseChildrenTypeEnum.first ? node.firstChild : node.lastChild;
+        while (node !== null) {
+            const result = this[PropertySymbol.filterNode](node);
+            if (result === NodeFilter.FILTER_ACCEPT) {
+                this.currentNode = node;
+                return node;
+            }
+            if (result === NodeFilter.FILTER_SKIP) {
+                const child = type === TraverseChildrenTypeEnum.first ? node.firstChild : node.lastChild;
+                if (child !== null) {
+                    node = child;
+                    continue;
+                }
+            }
+            while (node !== null) {
+                const sibling = type === TraverseChildrenTypeEnum.first ? node.nextSibling : node.previousSibling;
+                if (sibling !== null) {
+                    node = sibling;
+                    break;
+                }
+                const parent = node.parentNode;
+                if (parent === null || parent === this.root || parent === this.currentNode) {
+                    return null;
+                }
+                node = parent;
+            }
+        }
+        return null;
+    }
+    /**
+     * Traverses siblings.
+     *
+     * @param type Type.
+     * @returns Node.
+     */
+    #traverseSiblings(type) {
+        let node = this.currentNode;
+        if (node === this.root) {
+            return null;
+        }
+        while (true) {
+            let sibling = type === TraverseSiblingsTypeEnum.next ? node.nextSibling : node.previousSibling;
+            while (sibling !== null) {
+                const node = sibling;
+                const result = this[PropertySymbol.filterNode](node);
+                if (result === NodeFilter.FILTER_ACCEPT) {
+                    this.currentNode = node;
+                    return node;
+                }
+                sibling = type === TraverseSiblingsTypeEnum.next ? node.firstChild : node.lastChild;
+                if (result === NodeFilter.FILTER_REJECT || sibling === null) {
+                    sibling =
+                        type === TraverseSiblingsTypeEnum.next ? node.nextSibling : node.previousSibling;
+                }
+            }
+            node = node.parentNode;
+            if (node === null || node === this.root) {
+                return null;
+            }
+            if (this[PropertySymbol.filterNode](node) === NodeFilter.FILTER_ACCEPT) {
+                return null;
+            }
+        }
+    }
 }
 //# sourceMappingURL=TreeWalker.js.map

package/lib/tree-walker/TreeWalker.js.map

@@ -1 +1 @@
-{"version":3,"file":"TreeWalker.js","sourceRoot":"","sources":["../../src/tree-walker/TreeWalker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TreeWalker.js","sourceRoot":"","sources":["../../src/tree-walker/TreeWalker.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "happy-dom",
-  "version": "17.1.3",
+  "version": "17.1.5",
   "license": "MIT",
   "homepage": "https://github.com/capricorn86/happy-dom",
   "repository": "https://github.com/capricorn86/happy-dom",

package/src/dom/DOMStringMap.ts

@@ -25,11 +25,11 @@ export default class DOMStringMap {
 		// Documentation for Proxy:
 		// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Proxy
 		return new Proxy(this, {
-			get(_target, property: string): string {
+			get(_target, property: string): string | void {
 				const attribute = element.getAttribute(
 					'data-' + DOMStringMapUtility.camelCaseToKebab(property)
 				);
-				if (attribute) {
+				if (attribute !== null) {
 					return attribute;
 				}
 			},

package/src/nodes/element/Element.ts

@@ -741,7 +741,7 @@ export default class Element
 	 *
 	 * @param name Name.
 	 */
-	public getAttribute(name: string): string {
+	public getAttribute(name: string): string | null {
 		const attribute = this[PropertySymbol.attributes].getNamedItem(name);
 		if (attribute) {
 			return attribute[PropertySymbol.value];