happy-dom 2.43.0 → 2.45.1

package/src/query-selector/SelectorItem.ts

@@ -8,7 +8,7 @@ const CLASS_REGEXP = /\.([a-zA-Z0-9-_$]+)/g;
 const TAG_NAME_REGEXP = /^[a-zA-Z0-9-]+/;
 
 /**
- *
+ * Selector item.
  */
 export default class SelectorItem {
 	public isAll: boolean;
@@ -29,8 +29,7 @@ export default class SelectorItem {
 	constructor(selector: string) {
 		this.isAll = selector === '*';
 		this.isID = !this.isAll ? selector.startsWith('#') : false;
-		this.isAttribute =
-			!this.isAll && !this.isID && selector.includes('[') && !selector.includes(':not(');
+		this.isAttribute = !this.isAll && !this.isID && selector.includes('[');
 		this.isPseudo = !this.isAll && !this.isID && selector.includes(':');
 		this.isClass = !this.isAll && !this.isID && new RegExp(CLASS_REGEXP, 'g').test(selector);
 		this.tagName = !this.isAll && !this.isID ? selector.match(TAG_NAME_REGEXP) : null;
@@ -48,7 +47,6 @@ export default class SelectorItem {
 	 */
 	public match(element: Element): boolean {
 		const selector = this.selector;
-		let match;
 
 		// Is all (*)
 		if (this.isAll) {
@@ -68,29 +66,13 @@ export default class SelectorItem {
 		}
 
 		// Class match
-		if (this.isClass) {
-			const regexp = new RegExp(CLASS_REGEXP, 'g');
-
-			while ((match = regexp.exec(selector))) {
-				if (!element.classList.contains(match[1])) {
-					return false;
-				}
-			}
+		if (this.isClass && !this.matchesClass(element, selector)) {
+			return false;
 		}
 
 		// Pseudo match
-		if (this.isPseudo) {
-			const regexp = new RegExp(PSUEDO_REGEXP, 'g');
-
-			while ((match = regexp.exec(selector))) {
-				if (match[1] && !this.matchesNthChild(element, match[1], match[2])) {
-					return false;
-				} else if (match[3] && this.matchesAttribute(element, match[3])) {
-					return false;
-				} else if (match[4] && !this.matchesPsuedo(element, match[4])) {
-					return false;
-				}
-			}
+		if (this.isPseudo && !this.matchesPsuedo(element, selector)) {
+			return false;
 		}
 
 		// Attribute match
@@ -101,6 +83,35 @@ export default class SelectorItem {
 		return true;
 	}
 
+	/**
+	 * Matches a psuedo selector.
+	 *
+	 * @param element Element.
+	 * @param selector Selector.
+	 * @returns True if it is a match.
+	 */
+	private matchesPsuedo(element: Element, selector: string): boolean {
+		const regexp = new RegExp(PSUEDO_REGEXP, 'g');
+		let match: RegExpMatchArray;
+
+		while ((match = regexp.exec(selector))) {
+			const isNotClass = match[3] && match[3].trim()[0] === '.';
+			if (match[1] && !this.matchesNthChild(element, match[1], match[2])) {
+				return false;
+			} else if (
+				match[3] &&
+				((isNotClass && this.matchesClass(element, match[3])) ||
+					(!isNotClass && this.matchesAttribute(element, match[3])))
+			) {
+				return false;
+			} else if (match[4] && !this.matchesPsuedoExpression(element, match[4])) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
 	/**
 	 * Matches a nth-child selector.
 	 *
@@ -158,13 +169,13 @@ export default class SelectorItem {
 	}
 
 	/**
-	 * Matches a psuedo selector.
+	 * Matches a psuedo selector expression.
 	 *
 	 * @param element Element.
 	 * @param psuedo Psuedo name.
 	 * @returns True if it is a match.
 	 */
-	private matchesPsuedo(element: Element, psuedo: string): boolean {
+	private matchesPsuedoExpression(element: Element, psuedo: string): boolean {
 		const parent = <Element>element.parentNode;
 
 		if (!parent) {
@@ -220,10 +231,10 @@ export default class SelectorItem {
 	 */
 	private matchesAttribute(element: Element, selector: string): boolean {
 		const regexp = new RegExp(ATTRIBUTE_REGEXP, 'g');
-		let match;
+		let match: RegExpMatchArray;
 
 		while ((match = regexp.exec(selector))) {
-			const isPsuedo = match.index > 0 && selector[match.index] === '(';
+			const isPsuedo = match.index > 0 && selector[match.index - 1] === '(';
 			if (
 				!isPsuedo &&
 				((match[1] && !this.matchesAttributeName(element, match[1])) ||
@@ -236,6 +247,29 @@ export default class SelectorItem {
 		return true;
 	}
 
+	/**
+	 * Matches class.
+	 *
+	 * @param element Element.
+	 * @param selector Selector.
+	 * @returns True if it is a match.
+	 */
+	private matchesClass(element: Element, selector: string): boolean {
+		const regexp = new RegExp(CLASS_REGEXP, 'g');
+		const classList = element.className.split(' ');
+		let previousIndex = 0;
+		let match: RegExpMatchArray;
+
+		while ((match = regexp.exec(selector)) && match.index === previousIndex) {
+			if (!classList.includes(match[1])) {
+				return false;
+			}
+			previousIndex = match.index + match[0].length - 1;
+		}
+
+		return true;
+	}
+
 	/**
 	 * Matches attribute name only.
 	 *

package/src/window/IWindow.ts

@@ -70,6 +70,11 @@ import HTMLCollection from '../nodes/element/HTMLCollection';
 import NodeList from '../nodes/node/NodeList';
 import Selection from '../selection/Selection';
 import IEventTarget from '../event/IEventTarget';
+import Navigator from '../navigator/Navigator';
+import MimeType from '../navigator/MimeType';
+import MimeTypeArray from '../navigator/MimeTypeArray';
+import Plugin from '../navigator/Plugin';
+import PluginArray from '../navigator/PluginArray';
 
 /**
  * Window.
@@ -151,6 +156,11 @@ export default interface IWindow extends IEventTarget {
 	readonly CSSUnitValue: typeof CSSUnitValue;
 	readonly CSS: CSS;
 	readonly Selection: typeof Selection;
+	readonly Navigator: typeof Navigator;
+	readonly MimeType: typeof MimeType;
+	readonly MimeTypeArray: typeof MimeTypeArray;
+	readonly Plugin: typeof Plugin;
+	readonly PluginArray: typeof PluginArray;
 
 	// Events
 	onload: (event: Event) => void;
@@ -161,7 +171,7 @@ export default interface IWindow extends IEventTarget {
 	readonly customElements: CustomElementRegistry;
 	readonly location: Location;
 	readonly history: History;
-	readonly navigator: { userAgent: string };
+	readonly navigator: Navigator;
 	readonly console: Console;
 	readonly self: IWindow;
 	readonly top: IWindow;

package/src/window/Window.ts

@@ -75,6 +75,11 @@ import NodeList from '../nodes/node/NodeList';
 import MediaQueryList from '../match-media/MediaQueryList';
 import Selection from '../selection/Selection';
 import * as PerfHooks from 'perf_hooks';
+import Navigator from '../navigator/Navigator';
+import MimeType from '../navigator/MimeType';
+import MimeTypeArray from '../navigator/MimeTypeArray';
+import Plugin from '../navigator/Plugin';
+import PluginArray from '../navigator/PluginArray';
 
 const FETCH_RESPONSE_TYPE_METHODS = ['blob', 'json', 'text'];
 
@@ -162,6 +167,11 @@ export default class Window extends EventTarget implements IWindow, NodeJS.Globa
 	public readonly MediaQueryList = MediaQueryList;
 	public readonly CSSUnitValue = CSSUnitValue;
 	public readonly Selection = Selection;
+	public readonly Navigator = Navigator;
+	public readonly MimeType = MimeType;
+	public readonly MimeTypeArray = MimeTypeArray;
+	public readonly Plugin = Plugin;
+	public readonly PluginArray = PluginArray;
 
 	// Events
 	public onload: (event: Event) => void = null;
@@ -172,7 +182,7 @@ export default class Window extends EventTarget implements IWindow, NodeJS.Globa
 	public readonly customElements: CustomElementRegistry = new CustomElementRegistry();
 	public readonly location = new Location();
 	public readonly history = new History();
-	public readonly navigator = { userAgent: 'happy-dom' };
+	public readonly navigator = new Navigator();
 	public readonly console = global ? global.console : null;
 	public readonly self = this;
 	public readonly top = this;