happy-dom 13.8.4 → 13.8.6

package/package.json

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

package/src/config/HTMLElementConfig.ts

@@ -219,7 +219,7 @@ export default <{ [key: string]: IHTMLElementConfigEntity }>{
 		className: 'HTMLElement',
 		localName: 'dd',
 		tagName: 'DD',
-		contentModel: HTMLElementConfigContentModelEnum.noFirsLevelSelfDescendants
+		contentModel: HTMLElementConfigContentModelEnum.noFirstLevelSelfDescendants
 	},
 	del: {
 		className: 'HTMLElement',
@@ -261,7 +261,7 @@ export default <{ [key: string]: IHTMLElementConfigEntity }>{
 		className: 'HTMLElement',
 		localName: 'dt',
 		tagName: 'DT',
-		contentModel: HTMLElementConfigContentModelEnum.noFirsLevelSelfDescendants
+		contentModel: HTMLElementConfigContentModelEnum.noFirstLevelSelfDescendants
 	},
 	em: {
 		className: 'HTMLElement',
@@ -303,37 +303,37 @@ export default <{ [key: string]: IHTMLElementConfigEntity }>{
 		className: 'HTMLElement',
 		localName: 'h1',
 		tagName: 'H1',
-		contentModel: HTMLElementConfigContentModelEnum.noFirsLevelSelfDescendants
+		contentModel: HTMLElementConfigContentModelEnum.noFirstLevelSelfDescendants
 	},
 	h2: {
 		className: 'HTMLElement',
 		localName: 'h2',
 		tagName: 'H2',
-		contentModel: HTMLElementConfigContentModelEnum.noFirsLevelSelfDescendants
+		contentModel: HTMLElementConfigContentModelEnum.noFirstLevelSelfDescendants
 	},
 	h3: {
 		className: 'HTMLElement',
 		localName: 'h3',
 		tagName: 'H3',
-		contentModel: HTMLElementConfigContentModelEnum.noFirsLevelSelfDescendants
+		contentModel: HTMLElementConfigContentModelEnum.noFirstLevelSelfDescendants
 	},
 	h4: {
 		className: 'HTMLElement',
 		localName: 'h4',
 		tagName: 'H4',
-		contentModel: HTMLElementConfigContentModelEnum.noFirsLevelSelfDescendants
+		contentModel: HTMLElementConfigContentModelEnum.noFirstLevelSelfDescendants
 	},
 	h5: {
 		className: 'HTMLElement',
 		localName: 'h5',
 		tagName: 'H5',
-		contentModel: HTMLElementConfigContentModelEnum.noFirsLevelSelfDescendants
+		contentModel: HTMLElementConfigContentModelEnum.noFirstLevelSelfDescendants
 	},
 	h6: {
 		className: 'HTMLElement',
 		localName: 'h6',
 		tagName: 'H6',
-		contentModel: HTMLElementConfigContentModelEnum.noFirsLevelSelfDescendants
+		contentModel: HTMLElementConfigContentModelEnum.noFirstLevelSelfDescendants
 	},
 	head: {
 		className: 'HTMLElement',
@@ -399,7 +399,7 @@ export default <{ [key: string]: IHTMLElementConfigEntity }>{
 		className: 'HTMLElement',
 		localName: 'li',
 		tagName: 'LI',
-		contentModel: HTMLElementConfigContentModelEnum.noFirsLevelSelfDescendants
+		contentModel: HTMLElementConfigContentModelEnum.noFirstLevelSelfDescendants
 	},
 	main: {
 		className: 'HTMLElement',
@@ -477,7 +477,7 @@ export default <{ [key: string]: IHTMLElementConfigEntity }>{
 		className: 'HTMLOptionElement',
 		localName: 'option',
 		tagName: 'OPTION',
-		contentModel: HTMLElementConfigContentModelEnum.noFirsLevelSelfDescendants
+		contentModel: HTMLElementConfigContentModelEnum.noFirstLevelSelfDescendants
 	},
 	output: {
 		className: 'HTMLElement',
@@ -621,7 +621,7 @@ export default <{ [key: string]: IHTMLElementConfigEntity }>{
 		className: 'HTMLElement',
 		localName: 'table',
 		tagName: 'TABLE',
-		contentModel: HTMLElementConfigContentModelEnum.noFirsLevelSelfDescendants
+		contentModel: HTMLElementConfigContentModelEnum.noFirstLevelSelfDescendants
 	},
 	tbody: {
 		className: 'HTMLElement',

package/src/config/HTMLElementConfigContentModelEnum.ts

@@ -1,7 +1,7 @@
 enum HTMLElementConfigContentModelEnum {
 	rawText = 'rawText',
 	noSelfDescendants = 'noSelfDescendants',
-	noFirsLevelSelfDescendants = 'noFirsLevelSelfDescendants',
+	noFirstLevelSelfDescendants = 'noFirstLevelSelfDescendants',
 	noDescendants = 'noDescendants',
 	anyDescendants = 'anyDescendants'
 }

package/src/css/declaration/element-style/CSSStyleDeclarationElementStyle.ts

@@ -19,7 +19,7 @@ import CSSMeasurementConverter from '../measurement-converter/CSSMeasurementConv
 import MediaQueryList from '../../../match-media/MediaQueryList.js';
 import WindowBrowserSettingsReader from '../../../window/WindowBrowserSettingsReader.js';
 
-const CSS_VARIABLE_REGEXP = /var\( *(--[^), ]+)\)|var\( *(--[^), ]+), *([^), ]+)\)/g;
+const CSS_VARIABLE_REGEXP = /var\( *(--[^), ]+)\)|var\( *(--[^), ]+), *([^), ]+)\)/;
 const CSS_MEASUREMENT_REGEXP = /[0-9.]+(px|rem|em|vw|vh|%|vmin|vmax|cm|mm|in|pt|pc|Q)/g;
 
 type IStyleAndElement = {
@@ -364,11 +364,10 @@ export default class CSSStyleDeclarationElementStyle {
 	 * @returns CSS value.
 	 */
 	private parseCSSVariablesInValue(value: string, cssVariables: { [k: string]: string }): string {
-		const regexp = new RegExp(CSS_VARIABLE_REGEXP);
 		let newValue = value;
 		let match;
 
-		while ((match = regexp.exec(value)) !== null) {
+		while ((match = newValue.match(CSS_VARIABLE_REGEXP)) !== null) {
 			// Fallback value - E.g. var(--my-var, #FFFFFF)
 			if (match[2] !== undefined) {
 				newValue = newValue.replace(match[0], cssVariables[match[2]] || match[3]);

package/src/query-selector/SelectorItem.ts

@@ -106,7 +106,7 @@ export default class SelectorItem {
 	}
 
 	/**
-	 * Matches a psuedo selector.
+	 * Matches a pseudo selector.
 	 *
 	 * @param element Element.
 	 * @returns Result.
@@ -121,15 +121,15 @@ export default class SelectorItem {
 			return true;
 		}
 
-		for (const psuedo of this.pseudos) {
+		for (const pseudo of this.pseudos) {
 			// Validation
-			switch (psuedo.name) {
+			switch (pseudo.name) {
 				case 'not':
 				case 'nth-child':
 				case 'nth-of-type':
 				case 'nth-last-child':
 				case 'nth-last-of-type':
-					if (!psuedo.arguments) {
+					if (!pseudo.arguments) {
 						throw new DOMException(`The selector "${this.getSelectorString()}" is not valid.`);
 					}
 					break;
@@ -137,7 +137,7 @@ export default class SelectorItem {
 
 			// Check if parent exists
 			if (!parent) {
-				switch (psuedo.name) {
+				switch (pseudo.name) {
 					case 'first-child':
 					case 'last-child':
 					case 'only-child':
@@ -152,86 +152,103 @@ export default class SelectorItem {
 				}
 			}
 
-			switch (psuedo.name) {
-				case 'first-child':
-					return parentChildren[0] === element;
-				case 'last-child':
-					return parentChildren.length && parentChildren[parentChildren.length - 1] === element;
-				case 'only-child':
-					return parentChildren.length === 1 && parentChildren[0] === element;
-				case 'first-of-type':
-					for (const child of parentChildren) {
-						if (child[PropertySymbol.tagName] === element[PropertySymbol.tagName]) {
-							return child === element;
-						}
+			if (!this.matchPseudoItem(element, parentChildren, pseudo)) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Matches a pseudo selector.
+	 *
+	 * @param element Element.
+	 * @param parentChildren Parent children.
+	 * @param pseudo Pseudo.
+	 */
+	private matchPseudoItem(
+		element: IElement,
+		parentChildren: IElement[],
+		pseudo: ISelectorPseudo
+	): boolean {
+		switch (pseudo.name) {
+			case 'first-child':
+				return parentChildren[0] === element;
+			case 'last-child':
+				return parentChildren.length && parentChildren[parentChildren.length - 1] === element;
+			case 'only-child':
+				return parentChildren.length === 1 && parentChildren[0] === element;
+			case 'first-of-type':
+				for (const child of parentChildren) {
+					if (child[PropertySymbol.tagName] === element[PropertySymbol.tagName]) {
+						return child === element;
 					}
-					return false;
-				case 'last-of-type':
-					for (let i = parentChildren.length - 1; i >= 0; i--) {
-						const child = parentChildren[i];
-						if (child[PropertySymbol.tagName] === element[PropertySymbol.tagName]) {
-							return child === element;
-						}
+				}
+				return false;
+			case 'last-of-type':
+				for (let i = parentChildren.length - 1; i >= 0; i--) {
+					const child = parentChildren[i];
+					if (child[PropertySymbol.tagName] === element[PropertySymbol.tagName]) {
+						return child === element;
 					}
-					return false;
-				case 'only-of-type':
-					let isFound = false;
-					for (const child of parentChildren) {
-						if (child[PropertySymbol.tagName] === element[PropertySymbol.tagName]) {
-							if (isFound || child !== element) {
-								return false;
-							}
-							isFound = true;
+				}
+				return false;
+			case 'only-of-type':
+				let isFound = false;
+				for (const child of parentChildren) {
+					if (child[PropertySymbol.tagName] === element[PropertySymbol.tagName]) {
+						if (isFound || child !== element) {
+							return false;
 						}
+						isFound = true;
 					}
-					return isFound;
-				case 'checked':
-					return (
-						element[PropertySymbol.tagName] === 'INPUT' && (<IHTMLInputElement>element).checked
-					);
-				case 'empty':
-					return !(<Element>element)[PropertySymbol.children].length;
-				case 'root':
-					return element[PropertySymbol.tagName] === 'HTML';
-				case 'not':
-					return !psuedo.selectorItem.match(element);
-				case 'nth-child':
-					const nthChildIndex = psuedo.selectorItem
-						? parentChildren.filter((child) => psuedo.selectorItem.match(child)).indexOf(element)
-						: parentChildren.indexOf(element);
-					return nthChildIndex !== -1 && psuedo.nthFunction(nthChildIndex + 1);
-				case 'nth-of-type':
-					if (!element[PropertySymbol.parentNode]) {
-						return false;
-					}
-					const nthOfTypeIndex = parentChildren
-						.filter((child) => child[PropertySymbol.tagName] === element[PropertySymbol.tagName])
-						.indexOf(element);
-					return nthOfTypeIndex !== -1 && psuedo.nthFunction(nthOfTypeIndex + 1);
-				case 'nth-last-child':
-					const nthLastChildIndex = psuedo.selectorItem
-						? parentChildren
-								.filter((child) => psuedo.selectorItem.match(child))
-								.reverse()
-								.indexOf(element)
-						: parentChildren.reverse().indexOf(element);
-					return nthLastChildIndex !== -1 && psuedo.nthFunction(nthLastChildIndex + 1);
-				case 'nth-last-of-type':
-					const nthLastOfTypeIndex = parentChildren
-						.filter((child) => child[PropertySymbol.tagName] === element[PropertySymbol.tagName])
-						.reverse()
-						.indexOf(element);
-					return nthLastOfTypeIndex !== -1 && psuedo.nthFunction(nthLastOfTypeIndex + 1);
-				case 'target':
-					const hash = element[PropertySymbol.ownerDocument].location.hash;
-					if (!hash) {
-						return false;
-					}
-					return element.isConnected && element.id === hash.slice(1);
-			}
+				}
+				return isFound;
+			case 'checked':
+				return element[PropertySymbol.tagName] === 'INPUT' && (<IHTMLInputElement>element).checked;
+			case 'empty':
+				return !(<Element>element)[PropertySymbol.children].length;
+			case 'root':
+				return element[PropertySymbol.tagName] === 'HTML';
+			case 'not':
+				return !pseudo.selectorItem.match(element);
+			case 'nth-child':
+				const nthChildIndex = pseudo.selectorItem
+					? parentChildren.filter((child) => pseudo.selectorItem.match(child)).indexOf(element)
+					: parentChildren.indexOf(element);
+				return nthChildIndex !== -1 && pseudo.nthFunction(nthChildIndex + 1);
+			case 'nth-of-type':
+				if (!element[PropertySymbol.parentNode]) {
+					return false;
+				}
+				const nthOfTypeIndex = parentChildren
+					.filter((child) => child[PropertySymbol.tagName] === element[PropertySymbol.tagName])
+					.indexOf(element);
+				return nthOfTypeIndex !== -1 && pseudo.nthFunction(nthOfTypeIndex + 1);
+			case 'nth-last-child':
+				const nthLastChildIndex = pseudo.selectorItem
+					? parentChildren
+							.filter((child) => pseudo.selectorItem.match(child))
+							.reverse()
+							.indexOf(element)
+					: parentChildren.reverse().indexOf(element);
+				return nthLastChildIndex !== -1 && pseudo.nthFunction(nthLastChildIndex + 1);
+			case 'nth-last-of-type':
+				const nthLastOfTypeIndex = parentChildren
+					.filter((child) => child[PropertySymbol.tagName] === element[PropertySymbol.tagName])
+					.reverse()
+					.indexOf(element);
+				return nthLastOfTypeIndex !== -1 && pseudo.nthFunction(nthLastOfTypeIndex + 1);
+			case 'target':
+				const hash = element[PropertySymbol.ownerDocument].location.hash;
+				if (!hash) {
+					return false;
+				}
+				return element.isConnected && element.id === hash.slice(1);
+			default:
+				return false;
 		}
-
-		return true;
 	}
 
 	/**

package/src/xml-parser/XMLParser.ts

@@ -114,7 +114,7 @@ export default class XMLParser {
 							// Therefore we need to auto-close the tag, so that it become valid (e.g. "<a></a><a></a>").
 							if (
 								config?.contentModel ===
-									HTMLElementConfigContentModelEnum.noFirsLevelSelfDescendants &&
+									HTMLElementConfigContentModelEnum.noFirstLevelSelfDescendants &&
 								stackTagNames[stackTagNames.length - 1] === tagName
 							) {
 								stack.pop();