happy-dom 18.0.1 → 19.0.1

package/src/module/IECMAScriptModuleCompiledResult.ts

@@ -8,7 +8,11 @@ export default interface IECMAScriptModuleCompiledResult {
 			url: string,
 			options?: { with?: { type?: string } }
 		) => Promise<{ [key: string]: any }>;
+		importMeta: {
+			url: string;
+			resolve: (url: string) => string;
+		};
 		imports: Map<string, { [key: string]: any }>;
 		exports: { [key: string]: any };
-	}) => void;
+	}) => Promise<void>;
 }

package/src/module/ModuleFactory.ts

@@ -9,6 +9,7 @@ import ResourceFetch from '../fetch/ResourceFetch.js';
 import ECMAScriptModule from './ECMAScriptModule.js';
 import BrowserWindow from '../window/BrowserWindow.js';
 import Location from '../location/Location.js';
+import IResourceFetchResponse from '../fetch/types/IResourceFetchResponse.js';
 
 /**
  * Module factory.
@@ -60,28 +61,40 @@ export default class ModuleFactory {
 		}
 
 		const unresolvedModule = new UnresolvedModule(window, absoluteURL);
+		const readyStateManager = window[PropertySymbol.readyStateManager];
+
+		const taskID = readyStateManager.startTask();
 
 		window[PropertySymbol.modules][type].set(absoluteURLString, unresolvedModule);
 
 		const resourceFetch = new ResourceFetch(window);
-		let source: string;
+		let response: IResourceFetchResponse;
 		try {
-			source = await resourceFetch.fetch(absoluteURL, 'module');
+			response = await resourceFetch.fetch(absoluteURL, 'module');
 		} catch (error) {
+			readyStateManager.endTask(taskID);
 			unresolvedModule.resolve(<Error>error);
 			throw error;
 		}
+
+		readyStateManager.endTask(taskID);
+
 		let module: IModule;
 
 		switch (type) {
 			case 'json':
-				module = new JSONModule(window, absoluteURL, source);
+				module = new JSONModule(window, absoluteURL, response.content);
 				break;
 			case 'css':
-				module = new CSSModule(window, absoluteURL, source);
+				module = new CSSModule(window, absoluteURL, response.content);
 				break;
 			case 'esm':
-				module = new ECMAScriptModule(window, absoluteURL, source);
+				module = new ECMAScriptModule(
+					window,
+					absoluteURL,
+					response.content,
+					response.virtualServerFile
+				);
 				break;
 		}
 

package/src/nodes/document/DocumentReadyStateManager.ts

@@ -1,22 +1,19 @@
-import BrowserWindow from '../../window/BrowserWindow.js';
+import AsyncTaskManager from '../../async-task-manager/AsyncTaskManager.js';
+import IBrowserFrame from '../../browser/types/IBrowserFrame.js';
 
 /**
  * Document ready state manager.
  */
 export default class DocumentReadyStateManager {
-	private totalTasks = 0;
-	private readyStateCallbacks: (() => void)[] = [];
-	private window: BrowserWindow;
-	private immediate: NodeJS.Immediate | null = null;
-	private isComplete = false;
+	#asyncTaskManager: AsyncTaskManager;
 
 	/**
 	 * Constructor.
 	 *
-	 * @param window
+	 * @param browserFrame Browser frame.
 	 */
-	constructor(window: BrowserWindow) {
-		this.window = window;
+	constructor(browserFrame: IBrowserFrame) {
+		this.#asyncTaskManager = new AsyncTaskManager(browserFrame);
 	}
 
 	/**
@@ -25,61 +22,31 @@ export default class DocumentReadyStateManager {
 	 * @returns Promise.
 	 */
 	public waitUntilComplete(): Promise<void> {
-		return new Promise((resolve) => {
-			if (this.isComplete) {
-				resolve();
-			} else {
-				this.readyStateCallbacks.push(resolve);
-				this.startTask();
-				this.endTask();
-			}
-		});
+		return this.#asyncTaskManager.waitUntilComplete();
 	}
 
 	/**
 	 * Starts a task.
+	 *
+	 * @returns Task ID.
 	 */
-	public startTask(): void {
-		if (this.isComplete) {
-			return;
-		}
-
-		if (this.immediate) {
-			this.window.cancelAnimationFrame(this.immediate);
-			this.immediate = null;
-		}
-
-		this.totalTasks++;
+	public startTask(): number {
+		return this.#asyncTaskManager.startTask();
 	}
 
 	/**
 	 * Ends a task.
+	 *
+	 * @param taskID Task ID.
 	 */
-	public endTask(): void {
-		if (this.isComplete) {
-			return;
-		}
-
-		if (this.immediate) {
-			this.window.cancelAnimationFrame(this.immediate);
-			this.immediate = null;
-		}
-
-		this.totalTasks--;
-
-		this.immediate = this.window.requestAnimationFrame(() => {
-			this.immediate = null;
-
-			if (this.totalTasks <= 0) {
-				const callbacks = this.readyStateCallbacks;
-
-				this.readyStateCallbacks = [];
-				this.isComplete = true;
+	public endTask(taskID: number): void {
+		this.#asyncTaskManager.endTask(taskID);
+	}
 
-				for (const callback of callbacks) {
-					callback();
-				}
-			}
-		});
+	/**
+	 * Destroys the manager.
+	 */
+	public destroy(): Promise<void> {
+		return this.#asyncTaskManager.destroy();
 	}
 }

package/src/nodes/element/ElementEventAttributeUtility.ts

@@ -42,7 +42,7 @@ export default class ElementEventAttributeUtility {
 			return null;
 		}
 
-		let newCode = `(function anonymous($happy_dom, event) {\n//# sourceURL=${window.location.href}\n`;
+		let newCode = `(function anonymous($happy_dom, event) {`;
 
 		if (
 			browserSettings &&
@@ -59,10 +59,11 @@ export default class ElementEventAttributeUtility {
 			!browserSettings.disableErrorCapturing &&
 			browserSettings.errorCapture === BrowserErrorCaptureEnum.tryAndCatch
 		) {
-			newCode += '\n} catch(e) { $happy_dom.dispatchError(e); }\n';
+			newCode += '} catch(e) { $happy_dom.dispatchError(e); }';
 		}
 
 		newCode += '})';
+		newCode += `\n//# sourceURL=${window.location.href}`;
 
 		let listener: ((event: Event) => void) | null = null;
 

package/src/nodes/element/NamedNodeMap.ts

@@ -1,6 +1,5 @@
 import * as PropertySymbol from '../../PropertySymbol.js';
 import Attr from '../attr/Attr.js';
-import DOMException from '../../exception/DOMException.js';
 import DOMExceptionNameEnum from '../../exception/DOMExceptionNameEnum.js';
 import Element from './Element.js';
 import NamespaceURI from '../../config/NamespaceURI.js';
@@ -152,7 +151,7 @@ export default class NamedNodeMap {
 		const item = this.getNamedItem(name);
 
 		if (!item) {
-			throw new DOMException(
+			throw new this[PropertySymbol.ownerElement][PropertySymbol.window].DOMException(
 				`Failed to execute 'removeNamedItem' on 'NamedNodeMap': No item with name '${name}' was found.`,
 				DOMExceptionNameEnum.notFoundError
 			);
@@ -174,7 +173,7 @@ export default class NamedNodeMap {
 		const item = this.getNamedItemNS(namespace, localName);
 
 		if (!item) {
-			throw new DOMException(
+			throw new this[PropertySymbol.ownerElement][PropertySymbol.window].DOMException(
 				`Failed to execute 'removeNamedItemNS' on 'NamedNodeMap': No item with name '${localName}' in namespace '${namespace}' was found.`,
 				DOMExceptionNameEnum.notFoundError
 			);

package/src/nodes/html-canvas-element/HTMLCanvasElement.ts

@@ -138,7 +138,7 @@ export default class HTMLCanvasElement extends HTMLElement {
 	public getContext(
 		_contextType: '2d' | 'webgl' | 'webgl2' | 'webgpu' | 'bitmaprenderer',
 		_contextAttributes?: { [key: string]: any }
-	): null {
+	): any {
 		return null;
 	}
 

package/src/nodes/html-link-element/HTMLLinkElement.ts

@@ -13,6 +13,7 @@ import ModuleFactory from '../../module/ModuleFactory.js';
 import PreloadUtility from '../../fetch/preload/PreloadUtility.js';
 import PreloadEntry from '../../fetch/preload/PreloadEntry.js';
 import ElementEventAttributeUtility from '../element/ElementEventAttributeUtility.js';
+import IResourceFetchResponse from '../../fetch/types/IResourceFetchResponse.js';
 
 /**
  * HTML Link Element.
@@ -456,20 +457,20 @@ export default class HTMLLinkElement extends HTMLElement {
 
 		this.#loadedStyleSheetURL = absoluteURL;
 
-		readyStateManager.startTask();
+		const taskID = readyStateManager.startTask();
 
-		let code: string | null = null;
+		let response: IResourceFetchResponse | null = null;
 		let error: Error | null = null;
 
 		try {
-			code = await resourceFetch.fetch(absoluteURL, 'style', {
+			response = await resourceFetch.fetch(absoluteURL, 'style', {
 				credentials: this.crossOrigin === 'use-credentials' ? 'include' : 'same-origin'
 			});
 		} catch (e) {
 			error = <Error>e;
 		}
 
-		readyStateManager.endTask();
+		readyStateManager.endTask(taskID);
 
 		if (error) {
 			browserFrame.page.console.error(error);
@@ -478,7 +479,7 @@ export default class HTMLLinkElement extends HTMLElement {
 			const styleSheet = new this[PropertySymbol.ownerDocument][
 				PropertySymbol.window
 			].CSSStyleSheet();
-			styleSheet.replaceSync(code!);
+			styleSheet.replaceSync(response!.content);
 			this[PropertySymbol.sheet] = styleSheet;
 
 			// Computed style cache is affected by all mutations.

package/src/nodes/html-script-element/HTMLScriptElement.ts

@@ -12,6 +12,7 @@ import DOMTokenList from '../../dom/DOMTokenList.js';
 import IModuleImportMap from '../../module/IModuleImportMap.js';
 import IRequestReferrerPolicy from '../../fetch/types/IRequestReferrerPolicy.js';
 import ElementEventAttributeUtility from '../element/ElementEventAttributeUtility.js';
+import IResourceFetchResponse from '../../fetch/types/IResourceFetchResponse.js';
 
 /**
  * HTML Script Element.
@@ -417,9 +418,6 @@ export default class HTMLScriptElement extends HTMLElement {
 		}
 
 		const module = new ECMAScriptModule(window, url, source);
-		const readyStateManager = window[PropertySymbol.readyStateManager];
-
-		readyStateManager.startTask();
 
 		if (
 			browserSettings.disableErrorCapturing ||
@@ -435,8 +433,6 @@ export default class HTMLScriptElement extends HTMLElement {
 			}
 		}
 
-		readyStateManager.endTask();
-
 		this.dispatchEvent(new Event('load'));
 	}
 
@@ -526,7 +522,7 @@ export default class HTMLScriptElement extends HTMLElement {
 
 		this[PropertySymbol.ownerDocument][PropertySymbol.currentScript] = this;
 
-		const code = `//# sourceURL=${this[PropertySymbol.ownerDocument].location.href}\n` + source;
+		const code = `${source}\n//# sourceURL=${this[PropertySymbol.ownerDocument].location.href}`;
 
 		if (
 			browserSettings.disableErrorCapturing ||
@@ -579,10 +575,6 @@ export default class HTMLScriptElement extends HTMLElement {
 			return;
 		}
 
-		const readyStateManager = window[PropertySymbol.readyStateManager];
-
-		readyStateManager.startTask();
-
 		// TODO: What to do with "referrerPolicy" and "crossOrigin" for modules?
 		// @see https://github.com/w3c/webappsec-referrer-policy/issues/111
 
@@ -599,12 +591,10 @@ export default class HTMLScriptElement extends HTMLElement {
 			} catch (error) {
 				browserFrame.page.console.error(error);
 				this.dispatchEvent(new Event('error'));
-				readyStateManager.endTask();
 				return;
 			}
 		}
 
-		readyStateManager.endTask();
 		this.dispatchEvent(new Event('load'));
 	}
 
@@ -668,28 +658,29 @@ export default class HTMLScriptElement extends HTMLElement {
 
 		const resourceFetch = new ResourceFetch(window);
 		const async = this.getAttribute('async') !== null || this.getAttribute('defer') !== null;
-		let code: string | null = null;
+		let response: IResourceFetchResponse | null = null;
 
 		if (async) {
 			const readyStateManager = window[PropertySymbol.readyStateManager];
 
-			readyStateManager.startTask();
+			const taskID = readyStateManager.startTask();
 
 			try {
-				code = await resourceFetch.fetch(absoluteURLString, 'script', {
+				response = await resourceFetch.fetch(absoluteURLString, 'script', {
 					credentials: this.crossOrigin === 'use-credentials' ? 'include' : 'same-origin',
 					referrerPolicy: this.referrerPolicy
 				});
 			} catch (error) {
 				browserFrame.page.console.error(error);
 				this.dispatchEvent(new Event('error'));
+				readyStateManager.endTask(taskID);
 				return;
 			}
 
-			readyStateManager.endTask();
+			readyStateManager.endTask(taskID);
 		} else {
 			try {
-				code = resourceFetch.fetchSync(absoluteURLString, 'script', {
+				response = resourceFetch.fetchSync(absoluteURLString, 'script', {
 					credentials: this.crossOrigin === 'use-credentials' ? 'include' : 'same-origin',
 					referrerPolicy: this.referrerPolicy
 				});
@@ -702,7 +693,9 @@ export default class HTMLScriptElement extends HTMLElement {
 
 		this[PropertySymbol.ownerDocument][PropertySymbol.currentScript] = this;
 
-		code = '//# sourceURL=' + absoluteURL + '\n' + code;
+		const code = `${response.content}\n//# sourceURL=${
+			response.virtualServerFile || absoluteURLString
+		}`;
 
 		if (
 			browserSettings.disableErrorCapturing ||

package/src/query-selector/QuerySelector.ts

@@ -115,7 +115,7 @@ export default class QuerySelector {
 			}
 		}
 
-		const groups = SelectorParser.getSelectorGroups(selector);
+		const groups = SelectorParser.getSelectorGroups(selector, { scope: node });
 		const items: Element[] = [];
 		const nodeList = new NodeList<Element>(PropertySymbol.illegalConstructor, items);
 		const matchesMap: Map<string, Element> = new Map();
@@ -251,7 +251,7 @@ export default class QuerySelector {
 
 		const matchesMap: Map<string, Element> = new Map();
 		const matchedPositions: string[] = [];
-		for (const items of SelectorParser.getSelectorGroups(selector)) {
+		for (const items of SelectorParser.getSelectorGroups(selector, { scope: node })) {
 			const match =
 				node[PropertySymbol.nodeType] === NodeTypeEnum.elementNode
 					? this.findFirst(<Element>node, [<Element>node], items, cachedItem)
@@ -277,13 +277,14 @@ export default class QuerySelector {
 	 * @param element Element to match.
 	 * @param selector Selector to match with.
 	 * @param [options] Options.
+	 * @param [options.scope] Scope.
 	 * @param [options.ignoreErrors] Ignores errors.
 	 * @returns Result.
 	 */
 	public static matches(
 		element: Element,
 		selector: string,
-		options?: { ignoreErrors?: boolean }
+		options?: { scope?: Element | Document | DocumentFragment | null; ignoreErrors?: boolean }
 	): ISelectorMatch | null {
 		const ignoreErrors = options?.ignoreErrors;
 		const window = element[PropertySymbol.window];
@@ -349,7 +350,10 @@ export default class QuerySelector {
 			);
 		}
 
-		for (const items of SelectorParser.getSelectorGroups(selector, options)) {
+		for (const items of SelectorParser.getSelectorGroups(selector, {
+			...options,
+			scope: options?.scope || element
+		})) {
 			const result = this.matchSelector(element, items.reverse(), cachedItem);
 
 			if (result) {

package/src/query-selector/SelectorItem.ts

@@ -1,4 +1,3 @@
-import DOMException from '../exception/DOMException.js';
 import * as PropertySymbol from '../PropertySymbol.js';
 import Element from '../nodes/element/Element.js';
 import HTMLInputElement from '../nodes/html-input-element/HTMLInputElement.js';
@@ -6,6 +5,8 @@ import SelectorCombinatorEnum from './SelectorCombinatorEnum.js';
 import ISelectorAttribute from './ISelectorAttribute.js';
 import ISelectorMatch from './ISelectorMatch.js';
 import ISelectorPseudo from './ISelectorPseudo.js';
+import Document from '../nodes/document/Document.js';
+import DocumentFragment from '../nodes/document-fragment/DocumentFragment.js';
 
 const SPACE_REGEXP = /\s+/;
 
@@ -13,6 +14,7 @@ const SPACE_REGEXP = /\s+/;
  * Selector item.
  */
 export default class SelectorItem {
+	public scope: Element | Document | DocumentFragment | null;
 	public tagName: string | null;
 	public id: string | null;
 	public classNames: string[] | null;
@@ -26,6 +28,7 @@ export default class SelectorItem {
 	 * Constructor.
 	 *
 	 * @param [options] Options.
+	 * @param [options.scope] Scope.
 	 * @param [options.combinator] Combinator.
 	 * @param [options.tagName] Tag name.
 	 * @param [options.id] ID.
@@ -36,6 +39,7 @@ export default class SelectorItem {
 	 * @param [options.ignoreErrors] Ignore errors.
 	 */
 	constructor(options?: {
+		scope?: Element | Document | DocumentFragment;
 		tagName?: string;
 		id?: string;
 		classNames?: string[];
@@ -45,6 +49,7 @@ export default class SelectorItem {
 		combinator?: SelectorCombinatorEnum;
 		ignoreErrors?: boolean;
 	}) {
+		this.scope = options?.scope || null;
 		this.tagName = options?.tagName || null;
 		this.id = options?.id || null;
 		this.classNames = options?.classNames || null;
@@ -146,7 +151,7 @@ export default class SelectorItem {
 						if (this.ignoreErrors) {
 							return null;
 						}
-						throw new DOMException(
+						throw new element[PropertySymbol.window].DOMException(
 							`Failed to execute 'matches' on '${
 								element.constructor.name
 							}': '${this.getSelectorString()}' is not a valid selector.`
@@ -342,32 +347,34 @@ export default class SelectorItem {
 				return null;
 			case 'has':
 				let priorityWeightForHas = 0;
-				if (pseudo.arguments![0] === '+') {
-					const nextSibling = element.nextElementSibling;
-					if (!nextSibling) {
-						return null;
-					}
-					for (const selectorItem of pseudo.selectorItems!) {
-						const match = selectorItem.match(nextSibling);
-						if (match && priorityWeightForHas < match.priorityWeight) {
-							priorityWeightForHas = match.priorityWeight;
+				if (pseudo.arguments && pseudo.selectorItems) {
+					if (pseudo.arguments[0] === '+') {
+						const nextSibling = element.nextElementSibling;
+						if (!nextSibling) {
+							return null;
 						}
-					}
-				} else if (pseudo.arguments![0] === '>') {
-					for (const selectorItem of pseudo.selectorItems!) {
-						for (const child of element[PropertySymbol.elementArray]) {
-							const match = selectorItem.match(child);
+						for (const selectorItem of pseudo.selectorItems) {
+							const match = selectorItem.match(nextSibling);
 							if (match && priorityWeightForHas < match.priorityWeight) {
 								priorityWeightForHas = match.priorityWeight;
-								break;
 							}
 						}
-					}
-				} else {
-					for (const selectorItem of pseudo.selectorItems!) {
-						const match = this.matchChildOfElement(selectorItem, element);
-						if (match && priorityWeightForHas < match.priorityWeight) {
-							priorityWeightForHas = match.priorityWeight;
+					} else if (pseudo.arguments[0] === '>') {
+						for (const selectorItem of pseudo.selectorItems) {
+							for (const child of element[PropertySymbol.elementArray]) {
+								const match = selectorItem.match(child);
+								if (match && priorityWeightForHas < match.priorityWeight) {
+									priorityWeightForHas = match.priorityWeight;
+									break;
+								}
+							}
+						}
+					} else {
+						for (const selectorItem of pseudo.selectorItems) {
+							const match = this.matchChildOfElement(selectorItem, element);
+							if (match && priorityWeightForHas < match.priorityWeight) {
+								priorityWeightForHas = match.priorityWeight;
+							}
 						}
 					}
 				}
@@ -377,6 +384,8 @@ export default class SelectorItem {
 				return element[PropertySymbol.ownerDocument].activeElement === element
 					? { priorityWeight: 10 }
 					: null;
+			case 'scope':
+				return this.scope === element ? { priorityWeight: 10 } : null;
 			default:
 				return null;
 		}