happy-dom 9.10.9 → 9.12.0

package/lib/xml-serializer/XMLSerializer.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Node_1 = __importDefault(require("../nodes/node/Node"));
 const VoidElements_1 = __importDefault(require("../config/VoidElements"));
 const he_1 = require("he");
+const NodeTypeEnum_1 = __importDefault(require("../nodes/node/NodeTypeEnum"));
 /**
  * Utility for converting an element to string.
  */
@@ -20,13 +21,13 @@ class XMLSerializer {
      */
     serializeToString(root, options) {
         switch (root.nodeType) {
-            case Node_1.default.ELEMENT_NODE:
+            case NodeTypeEnum_1.default.elementNode:
                 const element = root;
                 const tagName = element.tagName.toLowerCase();
-                if (VoidElements_1.default.includes(tagName)) {
+                if (VoidElements_1.default[element.tagName]) {
                     return `<${tagName}${this._getAttributes(element)}>`;
                 }
-                const childNodes = element.tagName === 'TEMPLATE'
+                const childNodes = tagName === 'template'
                     ? root.content.childNodes
                     : root.childNodes;
                 let innerHTML = '';
@@ -48,11 +49,14 @@ class XMLSerializer {
                     html += this.serializeToString(node, options);
                 }
                 return html;
-            case Node_1.default.COMMENT_NODE:
+            case NodeTypeEnum_1.default.commentNode:
                 return `<!--${root.textContent}-->`;
-            case Node_1.default.TEXT_NODE:
-                return root['textContent'];
-            case Node_1.default.DOCUMENT_TYPE_NODE:
+            case NodeTypeEnum_1.default.processingInstructionNode:
+                // TODO: Add support for processing instructions.
+                return `<!--?${root.target} ${root.textContent}?-->`;
+            case NodeTypeEnum_1.default.textNode:
+                return root.textContent;
+            case NodeTypeEnum_1.default.documentTypeNode:
                 const doctype = root;
                 const identifier = doctype.publicId ? ' PUBLIC' : doctype.systemId ? ' SYSTEM' : '';
                 const publicId = doctype.publicId ? ` "${doctype.publicId}"` : '';

package/lib/xml-serializer/XMLSerializer.js.map

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

package/package.json

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

package/src/config/PlainTextElements.ts

@@ -1 +1,4 @@
-export default ['style', 'script'];
+export default {
+	STYLE: true,
+	SCRIPT: true
+};

package/src/config/UnnestableElements.ts

@@ -1,18 +1,18 @@
-export default [
-	'a',
-	'button',
-	'dd',
-	'dt',
-	'form',
-	'h1',
-	'h2',
-	'h3',
-	'h4',
-	'h5',
-	'h6',
-	'li',
-	'option',
-	'p',
-	'select',
-	'table'
-];
+export default {
+	A: true,
+	BUTTON: true,
+	DD: true,
+	DT: true,
+	FORM: true,
+	H1: true,
+	H2: true,
+	H3: true,
+	H4: true,
+	H5: true,
+	H6: true,
+	LI: true,
+	OPTION: true,
+	P: true,
+	SELECT: true,
+	TABLE: true
+};

package/src/config/VoidElements.ts

@@ -1,17 +1,16 @@
-export default [
-	'area',
-	'base',
-	'br',
-	'col',
-	'embed',
-	'hr',
-	'img',
-	'input',
-	'link',
-	'meta',
-	'param',
-	'source',
-	'track',
-	'wbr',
-	'meta'
-];
+export default {
+	AREA: true,
+	BASE: true,
+	BR: true,
+	COL: true,
+	EMBED: true,
+	HR: true,
+	IMG: true,
+	INPUT: true,
+	LINK: true,
+	META: true,
+	PARAM: true,
+	SOURCE: true,
+	TRACK: true,
+	WBR: true
+};

package/src/dom-parser/DOMParser.ts

@@ -44,7 +44,7 @@ export default class DOMParser {
 		newDocument.childNodes.length = 0;
 		newDocument.children.length = 0;
 
-		const root = XMLParser.parse(newDocument, string, true);
+		const root = XMLParser.parse(newDocument, string, { evaluateScripts: true });
 		let documentElement = null;
 		let documentTypeNode = null;
 
@@ -65,7 +65,7 @@ export default class DOMParser {
 				newDocument.appendChild(documentTypeNode);
 			}
 			newDocument.appendChild(documentElement);
-			const body = newDocument.querySelector('body');
+			const body = newDocument.body;
 			if (body) {
 				for (const child of root.childNodes.slice()) {
 					body.appendChild(child);

package/src/nodes/document/Document.ts

@@ -236,9 +236,9 @@ export default class Document extends Node implements IDocument {
 	 * @returns Title.
 	 */
 	public get title(): string {
-		const el = this.querySelector('title');
-		if (el) {
-			return el.textContent;
+		const element = ParentNodeUtility.getElementByTagName(this, 'title');
+		if (element) {
+			return element.textContent;
 		}
 		return '';
 	}
@@ -248,13 +248,13 @@ export default class Document extends Node implements IDocument {
 	 *
 	 */
 	public set title(title: string) {
-		const el = this.querySelector('title');
-		if (el) {
-			el.textContent = title;
+		const element = ParentNodeUtility.getElementByTagName(this, 'title');
+		if (element) {
+			element.textContent = title;
 		} else {
-			const titleEl = this.createElement('title');
-			titleEl.textContent = title;
-			this.head.appendChild(titleEl);
+			const newElement = this.createElement('title');
+			newElement.textContent = title;
+			this.head.appendChild(newElement);
 		}
 	}
 
@@ -430,9 +430,9 @@ export default class Document extends Node implements IDocument {
 	 * @returns Base URI.
 	 */
 	public get baseURI(): string {
-		const base = <IHTMLBaseElement>this.querySelector('base');
-		if (base) {
-			return base.href;
+		const element = <IHTMLBaseElement | null>ParentNodeUtility.getElementByTagName(this, 'base');
+		if (element) {
+			return element.href;
 		}
 		return this.defaultView.location.href;
 	}
@@ -653,7 +653,7 @@ export default class Document extends Node implements IDocument {
 	 * @param html HTML.
 	 */
 	public write(html: string): void {
-		const root = XMLParser.parse(this, html, true);
+		const root = XMLParser.parse(this, html, { evaluateScripts: true });
 
 		if (this._isFirstWrite || this._isFirstWriteAfterOpen) {
 			if (this._isFirstWrite) {
@@ -688,8 +688,8 @@ export default class Document extends Node implements IDocument {
 
 					this.appendChild(documentElement);
 				} else {
-					const rootBody = root.querySelector('body');
-					const body = this.querySelector('body');
+					const rootBody = ParentNodeUtility.getElementByTagName(root, 'body');
+					const body = ParentNodeUtility.getElementByTagName(this, 'body');
 					if (rootBody && body) {
 						for (const child of rootBody.childNodes.slice()) {
 							body.appendChild(child);
@@ -697,7 +697,7 @@ export default class Document extends Node implements IDocument {
 					}
 				}
 
-				const body = this.querySelector('body');
+				const body = ParentNodeUtility.getElementByTagName(this, 'body');
 				if (body) {
 					for (const child of root.childNodes.slice()) {
 						if (child['tagName'] !== 'HTML' && child.nodeType !== Node.DOCUMENT_TYPE_NODE) {
@@ -720,9 +720,10 @@ export default class Document extends Node implements IDocument {
 				this.appendChild(documentElement);
 			}
 		} else {
-			const bodyNode = root.querySelector('body');
+			const bodyNode = ParentNodeUtility.getElementByTagName(root, 'body');
+			const body = ParentNodeUtility.getElementByTagName(this, 'body');
 			for (const child of (bodyNode || root).childNodes.slice()) {
-				this.body.appendChild(child);
+				body.appendChild(child);
 			}
 		}
 	}

package/src/nodes/element/Element.ts

@@ -244,9 +244,7 @@ export default class Element extends Node implements IElement {
 			this.removeChild(child);
 		}
 
-		for (const node of XMLParser.parse(this.ownerDocument, html).childNodes.slice()) {
-			this.appendChild(node);
-		}
+		XMLParser.parse(this.ownerDocument, html, { rootNode: this });
 	}
 
 	/**

package/src/nodes/html-template-element/HTMLTemplateElement.ts

@@ -2,8 +2,8 @@ import HTMLElement from '../html-element/HTMLElement';
 import IDocumentFragment from '../document-fragment/IDocumentFragment';
 import INode from '../node/INode';
 import IHTMLTemplateElement from './IHTMLTemplateElement';
-import XMLParser from '../../xml-parser/XMLParser';
 import XMLSerializer from '../../xml-serializer/XMLSerializer';
+import XMLParser from '../../xml-parser/XMLParser';
 
 /**
  * HTML Template Element.
@@ -29,9 +29,7 @@ export default class HTMLTemplateElement extends HTMLElement implements IHTMLTem
 			this.content.removeChild(child);
 		}
 
-		for (const node of XMLParser.parse(this.ownerDocument, html).childNodes.slice()) {
-			this.content.appendChild(node);
-		}
+		XMLParser.parse(this.ownerDocument, html, { rootNode: this.content });
 	}
 
 	/**

package/src/nodes/parent-node/ParentNodeUtility.ts

@@ -16,16 +16,13 @@ export default class ParentNodeUtility {
 	 * @param parentNode Parent node.
 	 * @param nodes List of Node or DOMString.
 	 */
-	public static append(parentNode: INode, ...nodes: (INode | string)[]): void {
+	public static append(
+		parentNode: IElement | IDocument | IDocumentFragment,
+		...nodes: (INode | string)[]
+	): void {
 		for (const node of nodes) {
 			if (typeof node === 'string') {
-				const newChildNodes = XMLParser.parse(
-					<IDocument>parentNode.ownerDocument,
-					node
-				).childNodes.slice();
-				for (const newChildNode of newChildNodes) {
-					parentNode.appendChild(newChildNode);
-				}
+				XMLParser.parse(<IDocument>parentNode.ownerDocument, node, { rootNode: parentNode });
 			} else {
 				parentNode.appendChild(node);
 			}
@@ -38,9 +35,11 @@ export default class ParentNodeUtility {
 	 * @param parentNode Parent node.
 	 * @param nodes List of Node or DOMString.
 	 */
-	public static prepend(parentNode: INode, ...nodes: (string | INode)[]): void {
+	public static prepend(
+		parentNode: IElement | IDocument | IDocumentFragment,
+		...nodes: (string | INode)[]
+	): void {
 		const firstChild = parentNode.firstChild;
-
 		for (const node of nodes) {
 			if (typeof node === 'string') {
 				const newChildNodes = XMLParser.parse(
@@ -62,7 +61,10 @@ export default class ParentNodeUtility {
 	 * @param parentNode Parent node.
 	 * @param nodes List of Node or DOMString.
 	 */
-	public static replaceChildren(parentNode: INode, ...nodes: (string | INode)[]): void {
+	public static replaceChildren(
+		parentNode: IElement | IDocument | IDocumentFragment,
+		...nodes: (string | INode)[]
+	): void {
 		for (const node of parentNode.childNodes.slice()) {
 			parentNode.removeChild(node);
 		}

package/src/nodes/shadow-root/ShadowRoot.ts

@@ -42,9 +42,7 @@ export default class ShadowRoot extends DocumentFragment implements IShadowRoot
 			this.removeChild(child);
 		}
 
-		for (const node of XMLParser.parse(this.ownerDocument, html).childNodes.slice()) {
-			this.appendChild(node);
-		}
+		XMLParser.parse(this.ownerDocument, html, { rootNode: this });
 	}
 
 	/**

package/src/query-selector/ISelectorPseudo.ts

@@ -1,4 +1,8 @@
+import SelectorItem from './SelectorItem';
+
 export default interface ISelectorPseudo {
 	name: string;
 	arguments: string | null;
+	selectorItem: SelectorItem | null;
+	nthFunction: ((n: number) => boolean) | null;
 }

package/src/query-selector/SelectorItem.ts

@@ -4,7 +4,6 @@ import Element from '../nodes/element/Element';
 import IHTMLInputElement from '../nodes/html-input-element/IHTMLInputElement';
 import SelectorCombinatorEnum from './SelectorCombinatorEnum';
 import ISelectorAttribute from './ISelectorAttribute';
-import SelectorParser from './SelectorParser';
 import ISelectorMatch from './ISelectorMatch';
 import ISelectorPseudo from './ISelectorPseudo';
 
@@ -181,74 +180,40 @@ export default class SelectorItem {
 				case 'root':
 					return element.tagName === 'HTML';
 				case 'not':
-					return !SelectorParser.getSelectorItem(psuedo.arguments).match(element);
+					return !psuedo.selectorItem.match(element);
 				case 'nth-child':
-					return this.matchNthChild(element, parent.children, psuedo.arguments);
+					const nthChildIndex = psuedo.selectorItem
+						? parent.children.filter((child) => psuedo.selectorItem.match(child)).indexOf(element)
+						: parent.children.indexOf(element);
+					return nthChildIndex !== -1 && psuedo.nthFunction(nthChildIndex + 1);
 				case 'nth-of-type':
 					if (!element.parentNode) {
 						return false;
 					}
-					return this.matchNthChild(
-						element,
-						parent.children.filter((child) => child.tagName === element.tagName),
-						psuedo.arguments
-					);
+					const nthOfTypeIndex = parent.children
+						.filter((child) => child.tagName === element.tagName)
+						.indexOf(element);
+					return nthOfTypeIndex !== -1 && psuedo.nthFunction(nthOfTypeIndex + 1);
 				case 'nth-last-child':
-					return this.matchNthChild(element, parent.children.reverse(), psuedo.arguments);
+					const nthLastChildIndex = psuedo.selectorItem
+						? parent.children
+								.filter((child) => psuedo.selectorItem.match(child))
+								.reverse()
+								.indexOf(element)
+						: parent.children.reverse().indexOf(element);
+					return nthLastChildIndex !== -1 && psuedo.nthFunction(nthLastChildIndex + 1);
 				case 'nth-last-of-type':
-					return this.matchNthChild(
-						element,
-						parent.children.filter((child) => child.tagName === element.tagName).reverse(),
-						psuedo.arguments
-					);
+					const nthLastOfTypeIndex = parent.children
+						.filter((child) => child.tagName === element.tagName)
+						.reverse()
+						.indexOf(element);
+					return nthLastOfTypeIndex !== -1 && psuedo.nthFunction(nthLastOfTypeIndex + 1);
 			}
 		}
 
 		return true;
 	}
 
-	/**
-	 * Matches a nth-child selector.
-	 *
-	 * @param element Element.
-	 * @param parentChildren Parent children.
-	 * @param placement Placement.
-	 * @returns True if it is a match.
-	 */
-	private matchNthChild(element: IElement, parentChildren: IElement[], placement: string): boolean {
-		if (placement === 'odd') {
-			const index = parentChildren.indexOf(element);
-			return index !== -1 && (index + 1) % 2 !== 0;
-		} else if (placement === 'even') {
-			const index = parentChildren.indexOf(element);
-			return index !== -1 && (index + 1) % 2 === 0;
-		} else if (placement.includes('n')) {
-			const [a, b] = placement.replace(/ /g, '').split('n');
-			const childIndex = parentChildren.indexOf(element);
-			const aNumber = a !== '' ? Number(a) : 1;
-			const bNumber = b !== undefined ? Number(b) : 0;
-			if (isNaN(aNumber) || isNaN(bNumber)) {
-				throw new DOMException(`The selector "${this.getSelectorString()}" is not valid.`);
-			}
-
-			for (let i = 0, max = parentChildren.length; i <= max; i += aNumber) {
-				if (childIndex === i + bNumber - 1) {
-					return true;
-				}
-			}
-
-			return false;
-		}
-
-		const number = Number(placement);
-
-		if (isNaN(number)) {
-			throw new DOMException(`The selector "${this.getSelectorString()}" is not valid.`);
-		}
-
-		return parentChildren[number - 1] === element;
-	}
-
 	/**
 	 * Matches attribute.
 	 *

package/src/query-selector/SelectorParser.ts

@@ -1,6 +1,7 @@
 import SelectorItem from './SelectorItem';
 import SelectorCombinatorEnum from './SelectorCombinatorEnum';
 import DOMException from '../exception/DOMException';
+import ISelectorPseudo from './ISelectorPseudo';
 
 /**
  * Selector RegExp.
@@ -29,6 +30,20 @@ const SELECTOR_REGEXP =
  */
 const CLASS_ESCAPED_CHARACTER_REGEXP = /\\/g;
 
+/**
+ * Nth Function.
+ */
+const NTH_FUNCTION = {
+	odd: (n: number) => (n + 1) % 2 === 0,
+	even: (n: number) => (n + 1) % 2 !== 0,
+	alwaysFalse: () => false
+};
+
+/**
+ * Space RegExp.
+ */
+const SPACE_REGEXP = / /g;
+
 /**
  * Simple Selector RegExp.
  *
@@ -120,16 +135,10 @@ export default class SelectorParser {
 					});
 				} else if (match[12] && match[13]) {
 					currentSelectorItem.pseudos = currentSelectorItem.pseudos || [];
-					currentSelectorItem.pseudos.push({
-						name: match[12].toLowerCase(),
-						arguments: match[13]
-					});
+					currentSelectorItem.pseudos.push(this.getPseudo(match[12], match[13]));
 				} else if (match[14]) {
 					currentSelectorItem.pseudos = currentSelectorItem.pseudos || [];
-					currentSelectorItem.pseudos.push({
-						name: match[14].toLowerCase(),
-						arguments: null
-					});
+					currentSelectorItem.pseudos.push(this.getPseudo(match[14]));
 				} else if (match[15]) {
 					switch (match[15].trim()) {
 						case ',':
@@ -168,4 +177,105 @@ export default class SelectorParser {
 
 		return groups;
 	}
+
+	/**
+	 * Returns pseudo.
+	 *
+	 * @param name Pseudo name.
+	 * @param args Pseudo arguments.
+	 * @returns Pseudo.
+	 */
+	private static getPseudo(name: string, args?: string): ISelectorPseudo {
+		const lowerName = name.toLowerCase();
+
+		if (!args) {
+			return { name: lowerName, arguments: null, selectorItem: null, nthFunction: null };
+		}
+
+		switch (lowerName) {
+			case 'nth-last-child':
+			case 'nth-child':
+				const nthOfIndex = args.indexOf(' of ');
+				const nthFunction = nthOfIndex !== -1 ? args.substring(0, nthOfIndex) : args;
+				const selectorItem =
+					nthOfIndex !== -1 ? this.getSelectorItem(args.substring(nthOfIndex + 4).trim()) : null;
+				return {
+					name: lowerName,
+					arguments: args,
+					selectorItem,
+					nthFunction: this.getPseudoNthFunction(nthFunction)
+				};
+			case 'nth-of-type':
+			case 'nth-last-of-type':
+				return {
+					name: lowerName,
+					arguments: args,
+					selectorItem: null,
+					nthFunction: this.getPseudoNthFunction(args)
+				};
+			case 'not':
+				return {
+					name: lowerName,
+					arguments: args,
+					selectorItem: this.getSelectorItem(args),
+					nthFunction: null
+				};
+			default:
+				return { name: lowerName, arguments: args, selectorItem: null, nthFunction: null };
+		}
+	}
+
+	/**
+	 * Returns pseudo nth function.
+	 *
+	 * Based on:
+	 * https://github.com/dperini/nwsapi/blob/master/src/nwsapi.js
+	 *
+	 * @param args Pseudo arguments.
+	 * @returns Pseudo nth function.
+	 */
+	private static getPseudoNthFunction(args?: string): ((n: number) => boolean) | null {
+		if (args === 'odd') {
+			return NTH_FUNCTION.odd;
+		} else if (args === 'even') {
+			return NTH_FUNCTION.even;
+		}
+
+		const parts = args.replace(SPACE_REGEXP, '').split('n');
+		let partA = parseInt(parts[0], 10) || 0;
+
+		if (parts[0] == '-') {
+			partA = -1;
+		}
+
+		if (parts.length === 1) {
+			return (n) => n == partA;
+		}
+
+		let partB = parseInt(parts[1], 10) || 0;
+
+		if (parts[0] == '+') {
+			partB = 1;
+		}
+
+		if (partA >= 1 || partA <= -1) {
+			const innerExpression =
+				(partB ? '(n' + (partB > 0 ? '-' : '+') + Math.abs(partB) + ')' : 'n') +
+				'%' +
+				partA +
+				'==0';
+			if (partA >= 1) {
+				return eval(
+					'(n) => n>' + (partB - 1) + (Math.abs(partA) != 1 ? '&&' + innerExpression : '')
+				);
+			}
+			return eval('(n) => n<' + (partB + 1) + (Math.abs(partA) != 1 ? '&&' + innerExpression : ''));
+		}
+
+		if (parts[0]) {
+			return (n) => n === partB;
+		}
+
+		return (n) => n > partB - 1;
+	}
 }

package/src/range/Range.ts

@@ -406,7 +406,7 @@ export default class Range {
 	 */
 	public createContextualFragment(tagString: string): IDocumentFragment {
 		// TODO: We only have support for HTML in the parser currently, so it is not necessary to check which context it is
-		return XMLParser.parse(this._ownerDocument, tagString);
+		return <IDocumentFragment>XMLParser.parse(this._ownerDocument, tagString);
 	}
 
 	/**