happy-dom 9.8.2 → 9.8.3

package/src/nodes/document-fragment/DocumentFragment.ts

@@ -154,24 +154,24 @@ export default class DocumentFragment extends Node implements IDocumentFragment
 	/**
 	 * @override
 	 */
-	public appendChild(node: INode): INode {
-		ElementUtility.appendChild(this, node);
-		return super.appendChild(<INode>node);
+	public override appendChild(node: INode): INode {
+		// We do not call super here as this will be handled by ElementUtility to improve performance by avoiding validation and other checks.
+		return ElementUtility.appendChild(this, node);
 	}
 
 	/**
 	 * @override
 	 */
-	public removeChild(node: INode): INode {
-		ElementUtility.removeChild(this, node);
-		return super.removeChild(<Node>node);
+	public override removeChild(node: INode): INode {
+		// We do not call super here as this will be handled by ElementUtility to improve performance by avoiding validation and other checks.
+		return ElementUtility.removeChild(this, node);
 	}
 
 	/**
 	 * @override
 	 */
-	public insertBefore(newNode: INode, referenceNode?: INode): INode {
-		ElementUtility.insertBefore(this, newNode, referenceNode);
-		return super.insertBefore(newNode, referenceNode);
+	public override insertBefore(newNode: INode, referenceNode: INode | null): INode {
+		// We do not call super here as this will be handled by ElementUtility to improve performance by avoiding validation and other checks.
+		return ElementUtility.insertBefore(this, newNode, referenceNode);
 	}
 }

package/src/nodes/element/Element.ts

@@ -370,24 +370,24 @@ export default class Element extends Node implements IElement {
 	 * @override
 	 */
 	public override appendChild(node: INode): INode {
-		ElementUtility.appendChild(this, node);
-		return super.appendChild(node);
+		// We do not call super here as this will be handled by ElementUtility to improve performance by avoiding validation and other checks.
+		return ElementUtility.appendChild(this, node);
 	}
 
 	/**
 	 * @override
 	 */
 	public override removeChild(node: INode): INode {
-		ElementUtility.removeChild(this, node);
-		return super.removeChild(node);
+		// We do not call super here as this will be handled by ElementUtility to improve performance by avoiding validation and other checks.
+		return ElementUtility.removeChild(this, node);
 	}
 
 	/**
 	 * @override
 	 */
 	public override insertBefore(newNode: INode, referenceNode: INode | null): INode {
-		ElementUtility.insertBefore(this, newNode, referenceNode);
-		return super.insertBefore(newNode, referenceNode);
+		// We do not call super here as this will be handled by ElementUtility to improve performance by avoiding validation and other checks.
+		return ElementUtility.insertBefore(this, newNode, referenceNode);
 	}
 
 	/**

package/src/nodes/element/ElementUtility.ts

@@ -6,6 +6,9 @@ import IDocument from '../document/IDocument';
 import IDocumentFragment from '../document-fragment/IDocumentFragment';
 import IHTMLElement from '../html-element/IHTMLElement';
 import Element from './Element';
+import NodeUtility from '../node/NodeUtility';
+import DOMException from '../../exception/DOMException';
+import DOMExceptionNameEnum from '../../exception/DOMExceptionNameEnum';
 
 const NAMED_ITEM_ATTRIBUTES = ['id', 'name'];
 
@@ -16,14 +19,28 @@ export default class ElementUtility {
 	/**
 	 * Handles appending a child element to the "children" property.
 	 *
-	 * @param parentElement Parent element.
-	 * @param node Node.
+	 * @param ancestorNode Ancestor node.
+	 * @param node Node to append.
+	 * @param [options] Options.
+	 * @param [options.disableAncestorValidation] Disables validation for checking if the node is an ancestor of the ancestorNode.
+	 * @returns Appended node.
 	 */
 	public static appendChild(
-		parentElement: IElement | IDocument | IDocumentFragment,
-		node: INode
-	): void {
-		if (node.nodeType === NodeTypeEnum.elementNode && node !== parentElement) {
+		ancestorNode: IElement | IDocument | IDocumentFragment,
+		node: INode,
+		options?: { disableAncestorValidation?: boolean }
+	): INode {
+		if (node.nodeType === NodeTypeEnum.elementNode && node !== ancestorNode) {
+			if (
+				!options?.disableAncestorValidation &&
+				NodeUtility.isInclusiveAncestor(node, ancestorNode)
+			) {
+				throw new DOMException(
+					"Failed to execute 'appendChild' on 'Node': The new node is a parent of the node to insert to.",
+					DOMExceptionNameEnum.domException
+				);
+			}
+
 			if (node.parentNode && (<IHTMLElement>node.parentNode).children) {
 				const index = (<IHTMLElement>node.parentNode).children.indexOf(<IHTMLElement>node);
 				if (index !== -1) {
@@ -41,57 +58,82 @@ export default class ElementUtility {
 
 			for (const attribute of NAMED_ITEM_ATTRIBUTES) {
 				if ((<Element>node)._attributes[attribute]) {
-					(<HTMLCollection<IHTMLElement>>parentElement.children)._appendNamedItem(
+					(<HTMLCollection<IHTMLElement>>ancestorNode.children)._appendNamedItem(
 						<IHTMLElement>node,
 						(<Element>node)._attributes[attribute].value
 					);
 				}
 			}
 
-			parentElement.children.push(<IElement>node);
+			ancestorNode.children.push(<IElement>node);
+
+			NodeUtility.appendChild(ancestorNode, node, { disableAncestorValidation: true });
+		} else {
+			NodeUtility.appendChild(ancestorNode, node, options);
 		}
+
+		return node;
 	}
 
 	/**
 	 * Handles removing a child element from the "children" property.
 	 *
-	 * @param parentElement Parent element.
+	 * @param ancestorNode Ancestor node.
 	 * @param node Node.
+	 * @returns Removed node.
 	 */
 	public static removeChild(
-		parentElement: IElement | IDocument | IDocumentFragment,
+		ancestorNode: IElement | IDocument | IDocumentFragment,
 		node: INode
-	): void {
+	): INode {
 		if (node.nodeType === NodeTypeEnum.elementNode) {
-			const index = parentElement.children.indexOf(<IElement>node);
+			const index = ancestorNode.children.indexOf(<IElement>node);
 			if (index !== -1) {
 				for (const attribute of NAMED_ITEM_ATTRIBUTES) {
 					if ((<Element>node)._attributes[attribute]) {
-						(<HTMLCollection<IHTMLElement>>parentElement.children)._removeNamedItem(
+						(<HTMLCollection<IHTMLElement>>ancestorNode.children)._removeNamedItem(
 							<IHTMLElement>node,
 							(<Element>node)._attributes[attribute].value
 						);
 					}
 				}
-				parentElement.children.splice(index, 1);
+				ancestorNode.children.splice(index, 1);
 			}
 		}
+
+		NodeUtility.removeChild(ancestorNode, node);
+
+		return node;
 	}
 
 	/**
 	 *
 	 * Handles inserting a child element to the "children" property.
 	 *
-	 * @param parentElement Parent element.
-	 * @param newNode
-	 * @param referenceNode
+	 * @param ancestorNode Ancestor node.
+	 * @param newNode Node to insert.
+	 * @param referenceNode Node to insert before.
+	 * @param [options] Options.
+	 * @param [options.disableAncestorValidation] Disables validation for checking if the node is an ancestor of the ancestorNode.
+	 * @returns Inserted node.
 	 */
 	public static insertBefore(
-		parentElement: IElement | IDocument | IDocumentFragment,
+		ancestorNode: IElement | IDocument | IDocumentFragment,
 		newNode: INode,
-		referenceNode: INode | null
-	): void {
+		referenceNode: INode | null,
+		options?: { disableAncestorValidation?: boolean }
+	): INode {
 		if (newNode.nodeType === NodeTypeEnum.elementNode) {
+			if (
+				!options?.disableAncestorValidation &&
+				NodeUtility.isInclusiveAncestor(newNode, ancestorNode)
+			) {
+				throw new DOMException(
+					"Failed to execute 'insertBefore' on 'Node': The new node is a parent of the node to insert to.",
+					DOMExceptionNameEnum.domException
+				);
+			}
+
 			if (newNode.parentNode && (<IHTMLElement>newNode.parentNode).children) {
 				const index = (<IHTMLElement>newNode.parentNode).children.indexOf(<IHTMLElement>newNode);
 				if (index !== -1) {
@@ -114,19 +156,19 @@ export default class ElementUtility {
 
 			if (referenceNode) {
 				if (referenceNode.nodeType === NodeTypeEnum.elementNode) {
-					const index = parentElement.children.indexOf(<IElement>referenceNode);
+					const index = ancestorNode.children.indexOf(<IElement>referenceNode);
 					if (index !== -1) {
-						parentElement.children.splice(index, 0, <IElement>newNode);
+						ancestorNode.children.splice(index, 0, <IElement>newNode);
 					}
 				} else {
-					parentElement.children.length = 0;
+					ancestorNode.children.length = 0;
 
-					for (const node of parentElement.childNodes) {
+					for (const node of ancestorNode.childNodes) {
 						if (node === referenceNode) {
-							parentElement.children.push(<IElement>newNode);
+							ancestorNode.children.push(<IElement>newNode);
 						}
 						if (node.nodeType === NodeTypeEnum.elementNode) {
-							parentElement.children.push(<IElement>node);
+							ancestorNode.children.push(<IElement>node);
 						}
 					}
 				}
@@ -135,13 +177,21 @@ export default class ElementUtility {
 			if (referenceNode || referenceNode === null) {
 				for (const attribute of NAMED_ITEM_ATTRIBUTES) {
 					if ((<Element>newNode)._attributes[attribute]) {
-						(<HTMLCollection<IHTMLElement>>parentElement.children)._appendNamedItem(
+						(<HTMLCollection<IHTMLElement>>ancestorNode.children)._appendNamedItem(
 							<IHTMLElement>newNode,
 							(<Element>newNode)._attributes[attribute].value
 						);
 					}
 				}
 			}
+
+			NodeUtility.insertBefore(ancestorNode, newNode, referenceNode, {
+				disableAncestorValidation: true
+			});
+		} else {
+			NodeUtility.insertBefore(ancestorNode, newNode, referenceNode, options);
 		}
+
+		return newNode;
 	}
 }

package/src/nodes/html-select-element/HTMLOptionsCollection.ts

@@ -65,7 +65,7 @@ export default class HTMLOptionsCollection
 		}
 
 		if (!Number.isNaN(Number(before))) {
-			if (before < 0) {
+			if (<number>before < 0) {
 				return;
 			}
 

package/src/nodes/node/Node.ts

@@ -1,9 +1,6 @@
 import EventTarget from '../../event/EventTarget';
-import MutationRecord from '../../mutation-observer/MutationRecord';
-import MutationTypeEnum from '../../mutation-observer/MutationTypeEnum';
 import MutationListener from '../../mutation-observer/MutationListener';
 import INode from './INode';
-import DOMException from '../../exception/DOMException';
 import IDocument from '../document/IDocument';
 import IElement from '../element/IElement';
 import IHTMLBaseElement from '../html-base-element/IHTMLBaseElement';
@@ -245,8 +242,8 @@ export default class Node extends EventTarget implements INode {
 	 * @param otherNode Node to test with.
 	 * @returns "true" if this node contains the other node.
 	 */
-	public contains(otherNode: INode | null): boolean {
-		return NodeUtility.contains(this, otherNode);
+	public contains(otherNode: INode): boolean {
+		return NodeUtility.isInclusiveAncestor(this, otherNode);
 	}
 
 	/**
@@ -304,53 +301,7 @@ export default class Node extends EventTarget implements INode {
 	 * @returns Appended node.
 	 */
 	public appendChild(node: INode): INode {
-		if (node === this) {
-			throw new DOMException('Not possible to append a node as a child of itself.');
-		}
-
-		// If the type is DocumentFragment, then the child nodes of if it should be moved instead of the actual node.
-		// See: https://developer.mozilla.org/en-US/docs/Web/API/DocumentFragment
-		if (node.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
-			for (const child of node.childNodes.slice()) {
-				this.appendChild(child);
-			}
-			return node;
-		}
-
-		// Remove the node from its previous parent if it has any.
-		if (node.parentNode) {
-			const index = node.parentNode.childNodes.indexOf(node);
-			if (index !== -1) {
-				node.parentNode.childNodes.splice(index, 1);
-			}
-		}
-
-		if (this.isConnected) {
-			(this.ownerDocument || this)['_cacheID']++;
-		}
-
-		this.childNodes.push(node);
-
-		(<Node>node)._connectToNode(this);
-
-		// MutationObserver
-		if (this._observers.length > 0) {
-			const record = new MutationRecord();
-			record.target = this;
-			record.type = MutationTypeEnum.childList;
-			record.addedNodes = [node];
-
-			for (const observer of this._observers) {
-				if (observer.options.subtree) {
-					(<Node>node)._observe(observer);
-				}
-				if (observer.options.childList) {
-					observer.callback([record]);
-				}
-			}
-		}
-
-		return node;
+		return NodeUtility.appendChild(this, node);
 	}
 
 	/**
@@ -360,36 +311,7 @@ export default class Node extends EventTarget implements INode {
 	 * @returns Removed node.
 	 */
 	public removeChild(node: INode): INode {
-		const index = this.childNodes.indexOf(node);
-
-		if (index === -1) {
-			throw new DOMException('Failed to remove node. Node is not child of parent.');
-		}
-
-		if (this.isConnected) {
-			(this.ownerDocument || this)['_cacheID']++;
-		}
-
-		this.childNodes.splice(index, 1);
-
-		(<Node>node)._connectToNode(null);
-
-		// MutationObserver
-		if (this._observers.length > 0) {
-			const record = new MutationRecord();
-			record.target = this;
-			record.type = MutationTypeEnum.childList;
-			record.removedNodes = [node];
-
-			for (const observer of this._observers) {
-				(<Node>node)._unobserve(observer);
-				if (observer.options.childList) {
-					observer.callback([record]);
-				}
-			}
-		}
-
-		return node;
+		return NodeUtility.removeChild(this, node);
 	}
 
 	/**
@@ -400,66 +322,7 @@ export default class Node extends EventTarget implements INode {
 	 * @returns Inserted node.
 	 */
 	public insertBefore(newNode: INode, referenceNode: INode | null): INode {
-		// If the type is DocumentFragment, then the child nodes of if it should be moved instead of the actual node.
-		// See: https://developer.mozilla.org/en-US/docs/Web/API/DocumentFragment
-		if (newNode.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
-			for (const child of newNode.childNodes.slice()) {
-				this.insertBefore(child, referenceNode);
-			}
-			return newNode;
-		}
-
-		if (referenceNode === null) {
-			this.appendChild(newNode);
-			return newNode;
-		}
-
-		if (!referenceNode) {
-			throw new DOMException(
-				"Failed to execute 'insertBefore' on 'Node': 2 arguments required, but only 1 present.",
-				'TypeError'
-			);
-		}
-
-		if (this.childNodes.indexOf(referenceNode) === -1) {
-			throw new DOMException(
-				"Failed to execute 'insertBefore' on 'Node': The node before which the new node is to be inserted is not a child of this node."
-			);
-		}
-
-		if (this.isConnected) {
-			(this.ownerDocument || this)['_cacheID']++;
-		}
-
-		if (newNode.parentNode) {
-			const index = newNode.parentNode.childNodes.indexOf(newNode);
-			if (index !== -1) {
-				newNode.parentNode.childNodes.splice(index, 1);
-			}
-		}
-
-		this.childNodes.splice(this.childNodes.indexOf(referenceNode), 0, newNode);
-
-		(<Node>newNode)._connectToNode(this);
-
-		// MutationObserver
-		if (this._observers.length > 0) {
-			const record = new MutationRecord();
-			record.target = this;
-			record.type = MutationTypeEnum.childList;
-			record.addedNodes = [newNode];
-
-			for (const observer of this._observers) {
-				if (observer.options.subtree) {
-					(<Node>newNode)._observe(observer);
-				}
-				if (observer.options.childList) {
-					observer.callback([record]);
-				}
-			}
-		}
-
-		return newNode;
+		return NodeUtility.insertBefore(this, newNode, referenceNode);
 	}
 
 	/**