happy-dom 10.11.1 → 11.0.0

package/src/css/CSSParser.ts

@@ -6,6 +6,7 @@ import CSSKeyframesRule from './rules/CSSKeyframesRule.js';
 import CSSMediaRule from './rules/CSSMediaRule.js';
 import CSSContainerRule from './rules/CSSContainerRule.js';
 import CSSSupportsRule from './rules/CSSSupportsRule.js';
+import SelectorParser from '../query-selector/SelectorParser.js';
 
 const COMMENT_REGEXP = /\/\*[\s\S]*?\*\//gm;
 
@@ -96,23 +97,27 @@ export default class CSSParser {
 						parentRule.type === CSSRule.CONTAINER_RULE ||
 						parentRule.type === CSSRule.SUPPORTS_RULE)
 				) {
-					const newRule = new CSSStyleRule();
-					(<string>newRule.selectorText) = selectorText;
-					newRule.parentStyleSheet = parentStyleSheet;
-					newRule.parentRule = parentRule;
-					(<CSSMediaRule>parentRule).cssRules.push(newRule);
-					parentRule = newRule;
+					if (this.validateSelectorText(selectorText)) {
+						const newRule = new CSSStyleRule();
+						(<string>newRule.selectorText) = selectorText;
+						newRule.parentStyleSheet = parentStyleSheet;
+						newRule.parentRule = parentRule;
+						(<CSSMediaRule>parentRule).cssRules.push(newRule);
+						parentRule = newRule;
+					}
 				} else {
-					const newRule = new CSSStyleRule();
-					(<string>newRule.selectorText) = selectorText;
-					newRule.parentStyleSheet = parentStyleSheet;
-					newRule.parentRule = parentRule;
+					if (this.validateSelectorText(selectorText)) {
+						const newRule = new CSSStyleRule();
+						(<string>newRule.selectorText) = selectorText;
+						newRule.parentStyleSheet = parentStyleSheet;
+						newRule.parentRule = parentRule;
 
-					if (!parentRule) {
-						cssRules.push(newRule);
-					}
+						if (!parentRule) {
+							cssRules.push(newRule);
+						}
 
-					parentRule = newRule;
+						parentRule = newRule;
+					}
 				}
 
 				stack.push(parentRule);
@@ -140,4 +145,20 @@ export default class CSSParser {
 
 		return cssRules;
 	}
+
+	/**
+	 * Validates a selector text.
+	 *
+	 * @see https://www.w3.org/TR/CSS21/syndata.html#rule-sets
+	 * @param selectorText Selector text.
+	 * @returns True if valid, false otherwise.
+	 */
+	private static validateSelectorText(selectorText: string): boolean {
+		try {
+			SelectorParser.getSelectorGroups(selectorText);
+		} catch (e) {
+			return false;
+		}
+		return true;
+	}
 }

package/src/event/EventTarget.ts

@@ -6,6 +6,7 @@ import EventPhaseEnum from './EventPhaseEnum.js';
 import INode from '../nodes/node/INode.js';
 import IDocument from '../nodes/document/IDocument.js';
 import IWindow from '../window/IWindow.js';
+import WindowErrorUtility from '../window/WindowErrorUtility.js';
 
 /**
  * Handles events.
@@ -88,11 +89,12 @@ export default abstract class EventTarget implements IEventTarget {
 	 * @returns The return value is false if event is cancelable and at least one of the event handlers which handled this event called Event.preventDefault().
 	 */
 	public dispatchEvent(event: Event): boolean {
+		const window = this._getWindow();
+
 		if (event.eventPhase === EventPhaseEnum.none) {
 			event._target = this;
 
 			const composedPath = event.composedPath();
-			const window = this._getWindow();
 
 			// Capturing phase
 
@@ -137,7 +139,12 @@ export default abstract class EventTarget implements IEventTarget {
 			const onEventName = 'on' + event.type.toLowerCase();
 
 			if (typeof this[onEventName] === 'function') {
-				this[onEventName].call(this, event);
+				// We can end up in a never ending loop if the listener for the error event on Window also throws an error.
+				if (window && (this !== <IEventTarget>window || event.type !== 'error')) {
+					WindowErrorUtility.captureErrorSync(window, this[onEventName].bind(this, event));
+				} else {
+					this[onEventName].call(this, event);
+				}
 			}
 		}
 
@@ -161,10 +168,25 @@ export default abstract class EventTarget implements IEventTarget {
 					event._isInPassiveEventListener = true;
 				}
 
-				if ((<IEventListener>listener).handleEvent) {
-					(<IEventListener>listener).handleEvent(event);
+				// We can end up in a never ending loop if the listener for the error event on Window also throws an error.
+				if (window && (this !== <IEventTarget>window || event.type !== 'error')) {
+					if ((<IEventListener>listener).handleEvent) {
+						WindowErrorUtility.captureErrorSync(
+							window,
+							(<IEventListener>listener).handleEvent.bind(this, event)
+						);
+					} else {
+						WindowErrorUtility.captureErrorSync(
+							window,
+							(<(event: Event) => void>listener).bind(this, event)
+						);
+					}
 				} else {
-					(<(event: Event) => void>listener).call(this, event);
+					if ((<IEventListener>listener).handleEvent) {
+						(<IEventListener>listener).handleEvent(event);
+					} else {
+						(<(event: Event) => void>listener).call(this, event);
+					}
 				}
 
 				event._isInPassiveEventListener = false;

package/src/nodes/element/Element.ts

@@ -42,7 +42,7 @@ export default class Element extends Node implements IElement {
 	public static observedAttributes: string[];
 	public tagName: string = null;
 	public nodeType = Node.ELEMENT_NODE;
-	public shadowRoot: IShadowRoot = null;
+	public shadowRoot: IShadowRoot | null = null;
 	public prefix: string = null;
 
 	public scrollHeight = 0;

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

@@ -1,11 +1,11 @@
 import Document from '../document/Document.js';
 import Event from '../../event/Event.js';
-import ErrorEvent from '../../event/events/ErrorEvent.js';
 import ResourceFetch from '../../fetch/ResourceFetch.js';
 import HTMLLinkElement from './HTMLLinkElement.js';
 import CSSStyleSheet from '../../css/CSSStyleSheet.js';
 import DOMException from '../../exception/DOMException.js';
 import DOMExceptionNameEnum from '../../exception/DOMExceptionNameEnum.js';
+import WindowErrorUtility from '../../window/WindowErrorUtility.js';
 
 /**
  * Helper class for getting the URL relative to a Location object.
@@ -24,54 +24,32 @@ export default class HTMLLinkElementUtility {
 
 		if (href !== null && rel && rel.toLowerCase() === 'stylesheet' && element.isConnected) {
 			if (element.ownerDocument.defaultView.happyDOM.settings.disableCSSFileLoading) {
-				this.onError(
+				WindowErrorUtility.dispatchError(
 					element,
 					new DOMException(
 						`Failed to load external stylesheet "${href}". CSS file loading is disabled.`,
 						DOMExceptionNameEnum.notSupportedError
 					)
 				);
+
 				return;
 			}
 
 			(<Document>element.ownerDocument)._readyStateManager.startTask();
 
-			let code: string;
-			try {
-				code = await ResourceFetch.fetch(element.ownerDocument, href);
-			} catch (error) {
-				this.onError(element, error);
-				return;
+			const code: string | null = await WindowErrorUtility.captureErrorAsync<string>(
+				element,
+				async () => await ResourceFetch.fetch(element.ownerDocument, href)
+			);
+
+			if (code) {
+				const styleSheet = new CSSStyleSheet();
+				styleSheet.replaceSync(code);
+				(<CSSStyleSheet>element.sheet) = styleSheet;
+				element.dispatchEvent(new Event('load'));
 			}
 
-			const styleSheet = new CSSStyleSheet();
-			styleSheet.replaceSync(code);
-			(<CSSStyleSheet>element.sheet) = styleSheet;
-			element.dispatchEvent(new Event('load'));
 			(<Document>element.ownerDocument)._readyStateManager.endTask();
 		}
 	}
-
-	/**
-	 * Triggered when an error occurs.
-	 *
-	 * @param element Element.
-	 * @param error Error.
-	 */
-	private static onError(element: HTMLLinkElement, error: Error): void {
-		element.dispatchEvent(
-			new ErrorEvent('error', {
-				message: error.message,
-				error
-			})
-		);
-		element.ownerDocument.defaultView.dispatchEvent(
-			new ErrorEvent('error', {
-				message: error.message,
-				error
-			})
-		);
-		(<Document>element.ownerDocument)._readyStateManager.endTask();
-		element.ownerDocument.defaultView.console.error(error);
-	}
 }

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

@@ -6,6 +6,7 @@ import ErrorEvent from '../../event/events/ErrorEvent.js';
 import INode from '../../nodes/node/INode.js';
 import INamedNodeMap from '../../named-node-map/INamedNodeMap.js';
 import HTMLScriptElementNamedNodeMap from './HTMLScriptElementNamedNodeMap.js';
+import WindowErrorUtility from '../../window/WindowErrorUtility.js';
 
 /**
  * HTML Script Element.
@@ -188,7 +189,9 @@ export default class HTMLScriptElement extends HTMLElement implements IHTMLScrip
 						type === 'application/x-javascript' ||
 						type.startsWith('text/javascript'))
 				) {
-					HTMLScriptElementUtility.eval(this, textContent);
+					WindowErrorUtility.captureErrorSync(this.ownerDocument.defaultView, () =>
+						this.ownerDocument.defaultView.eval(textContent)
+					);
 				}
 			}
 		}

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

@@ -1,10 +1,10 @@
 import Document from '../document/Document.js';
 import Event from '../../event/Event.js';
-import ErrorEvent from '../../event/events/ErrorEvent.js';
 import DOMException from '../../exception/DOMException.js';
 import DOMExceptionNameEnum from '../../exception/DOMExceptionNameEnum.js';
 import ResourceFetch from '../../fetch/ResourceFetch.js';
 import HTMLScriptElement from './HTMLScriptElement.js';
+import WindowErrorUtility from '../../window/WindowErrorUtility.js';
 
 /**
  * Helper class for getting the URL relative to a Location object.
@@ -25,7 +25,7 @@ export default class HTMLScriptElementUtility {
 			element.ownerDocument.defaultView.happyDOM.settings.disableJavaScriptFileLoading ||
 			element.ownerDocument.defaultView.happyDOM.settings.disableJavaScriptEvaluation
 		) {
-			this.onError(
+			WindowErrorUtility.dispatchError(
 				element,
 				new DOMException(
 					`Failed to load external script "${src}". JavaScript file loading is disabled.`,
@@ -38,72 +38,29 @@ export default class HTMLScriptElementUtility {
 		if (async) {
 			(<Document>element.ownerDocument)._readyStateManager.startTask();
 
-			let code = null;
+			const code = await WindowErrorUtility.captureErrorAsync<string>(
+				element,
+				async () => await ResourceFetch.fetch(element.ownerDocument, src)
+			);
 
-			try {
-				code = await ResourceFetch.fetch(element.ownerDocument, src);
-			} catch (error) {
-				this.onError(element, error);
-				return;
+			if (code) {
+				WindowErrorUtility.captureErrorSync(element.ownerDocument.defaultView, () =>
+					element.ownerDocument.defaultView.eval(code)
+				);
+				element.dispatchEvent(new Event('load'));
 			}
-
-			this.eval(element, code);
-			element.dispatchEvent(new Event('load'));
 			(<Document>element.ownerDocument)._readyStateManager.endTask();
 		} else {
-			let code = null;
+			const code = WindowErrorUtility.captureErrorSync<string>(element, () =>
+				ResourceFetch.fetchSync(element.ownerDocument, src)
+			);
 
-			try {
-				code = ResourceFetch.fetchSync(element.ownerDocument, src);
-			} catch (error) {
-				this.onError(element, error);
-				return;
+			if (code) {
+				WindowErrorUtility.captureErrorSync(element.ownerDocument.defaultView, () =>
+					element.ownerDocument.defaultView.eval(code)
+				);
+				element.dispatchEvent(new Event('load'));
 			}
-
-			this.eval(element, code);
-			element.dispatchEvent(new Event('load'));
 		}
 	}
-
-	/**
-	 * Evaluates a script code.
-	 *
-	 * @param element Element.
-	 * @param code Code.
-	 */
-	public static eval(element: HTMLScriptElement, code: string): void {
-		try {
-			element.ownerDocument.defaultView.eval(code);
-		} catch (error) {
-			element.ownerDocument.defaultView.console.error(error);
-			element.ownerDocument.defaultView.dispatchEvent(
-				new ErrorEvent('error', {
-					message: error.message,
-					error: error
-				})
-			);
-		}
-	}
-
-	/**
-	 * Triggered when an error occurs.
-	 *
-	 * @param element Element.
-	 * @param error Error.
-	 */
-	private static onError(element: HTMLScriptElement, error: Error): void {
-		element.dispatchEvent(
-			new ErrorEvent('error', {
-				message: error.message,
-				error
-			})
-		);
-		element.ownerDocument.defaultView.dispatchEvent(
-			new ErrorEvent('error', {
-				message: error.message,
-				error
-			})
-		);
-		element.ownerDocument.defaultView.console.error(error);
-	}
 }

package/src/window/GlobalWindow.ts

@@ -52,6 +52,7 @@ export default class GlobalWindow extends Window implements IWindow {
 	public decodeURIComponent: typeof decodeURIComponent = globalThis.decodeURIComponent;
 	public encodeURI: typeof encodeURI = globalThis.encodeURI;
 	public encodeURIComponent: typeof encodeURIComponent = globalThis.encodeURIComponent;
+	public eval: typeof eval = globalThis.eval;
 	/**
 	 * @deprecated
 	 */
@@ -69,16 +70,6 @@ export default class GlobalWindow extends Window implements IWindow {
 	public gc: () => void = globalThis.gc;
 	public v8debug?: unknown = globalThis.v8debug;
 
-	/**
-	 * Evaluates code.
-	 *
-	 * @param code Code.
-	 * @returns Result.
-	 */
-	public override eval(code: string): unknown {
-		return eval(code);
-	}
-
 	/**
 	 * Setup of VM context.
 	 */

package/src/window/IHappyDOMOptions.ts

@@ -5,6 +5,7 @@ export default interface IHappyDOMOptions {
 	width?: number;
 	height?: number;
 	url?: string;
+	console?: Console;
 	settings?: {
 		disableJavaScriptEvaluation?: boolean;
 		disableJavaScriptFileLoading?: boolean;

package/src/window/IWindow.ts

@@ -123,6 +123,7 @@ import IHeadersInit from '../fetch/types/IHeadersInit.js';
 import RadioNodeList from '../nodes/html-form-element/RadioNodeList.js';
 import ValidityState from '../validity-state/ValidityState.js';
 import INodeJSGlobal from './INodeJSGlobal.js';
+import VirtualConsolePrinter from '../console/VirtualConsolePrinter.js';
 
 /**
  * Window without dependencies to server side specific packages.
@@ -135,6 +136,7 @@ export default interface IWindow extends IEventTarget, INodeJSGlobal {
 		asyncTaskManager: AsyncTaskManager;
 		setWindowSize: (options: { width?: number; height?: number }) => void;
 		setURL: (url: string) => void;
+		virtualConsolePrinter: VirtualConsolePrinter | null;
 		settings: IHappyDOMSettings;
 
 		/**
@@ -294,14 +296,6 @@ export default interface IWindow extends IEventTarget, INodeJSGlobal {
 	readonly scrollX: number;
 	readonly scrollY: number;
 
-	/**
-	 * Evaluates code.
-	 *
-	 * @param code Code.
-	 * @returns Result.
-	 */
-	eval(code: string): unknown;
-
 	/**
 	 * Returns an object containing the values of all CSS properties of an element.
 	 *

package/src/window/VMGlobalPropertyScript.ts

@@ -39,6 +39,7 @@ this.decodeURI = globalThis.decodeURI;
 this.decodeURIComponent = globalThis.decodeURIComponent;
 this.encodeURI = globalThis.encodeURI;
 this.encodeURIComponent = globalThis.encodeURIComponent;
+this.eval = globalThis.eval;
 this.escape = globalThis.escape;
 this.global = globalThis.global;
 this.isFinite = globalThis.isFinite;

package/src/window/Window.ts

@@ -135,6 +135,10 @@ import DOMExceptionNameEnum from '../exception/DOMExceptionNameEnum.js';
 import IHappyDOMOptions from './IHappyDOMOptions.js';
 import RadioNodeList from '../nodes/html-form-element/RadioNodeList.js';
 import ValidityState from '../validity-state/ValidityState.js';
+import WindowErrorUtility from './WindowErrorUtility.js';
+import VirtualConsole from '../console/VirtualConsole.js';
+import VirtualConsolePrinter from '../console/VirtualConsolePrinter.js';
+import IHappyDOMSettings from './IHappyDOMSettings.js';
 
 const ORIGINAL_SET_TIMEOUT = setTimeout;
 const ORIGINAL_CLEAR_TIMEOUT = clearTimeout;
@@ -150,7 +154,25 @@ const ORIGINAL_QUEUE_MICROTASK = queueMicrotask;
  */
 export default class Window extends EventTarget implements IWindow {
 	// The Happy DOM property
-	public readonly happyDOM = {
+	public readonly happyDOM: {
+		whenAsyncComplete: () => Promise<void>;
+		cancelAsync: () => void;
+		asyncTaskManager: AsyncTaskManager;
+		setWindowSize: (options: { width?: number; height?: number }) => void;
+		setURL: (url: string) => void;
+		virtualConsolePrinter: VirtualConsolePrinter | null;
+		settings: IHappyDOMSettings;
+
+		/**
+		 * @deprecated
+		 */
+		setInnerWidth: (width: number) => void;
+
+		/**
+		 * @deprecated
+		 */
+		setInnerHeight: (height: number) => void;
+	} = {
 		whenAsyncComplete: async (): Promise<void> => {
 			return await this.happyDOM.asyncTaskManager.whenComplete();
 		},
@@ -158,9 +180,6 @@ export default class Window extends EventTarget implements IWindow {
 			this.happyDOM.asyncTaskManager.cancelAll();
 		},
 		asyncTaskManager: new AsyncTaskManager(),
-		setURL: (url: string) => {
-			this.location.href = url;
-		},
 		setWindowSize: (options: { width?: number; height?: number }): void => {
 			if (
 				(options.width !== undefined && this.innerWidth !== options.width) ||
@@ -179,6 +198,10 @@ export default class Window extends EventTarget implements IWindow {
 				this.dispatchEvent(new Event('resize'));
 			}
 		},
+		virtualConsolePrinter: null,
+		setURL: (url: string) => {
+			this.location.href = url;
+		},
 		settings: {
 			disableJavaScriptEvaluation: false,
 			disableJavaScriptFileLoading: false,
@@ -191,17 +214,7 @@ export default class Window extends EventTarget implements IWindow {
 				mediaType: 'screen'
 			}
 		},
-
-		/**
-		 * @param width The width of the viewport.
-		 * @deprecated
-		 */
 		setInnerWidth: (width: number): void => this.happyDOM.setWindowSize({ width }),
-
-		/**
-		 * @param height The height of the viewport.
-		 * @deprecated
-		 */
 		setInnerHeight: (height: number): void => this.happyDOM.setWindowSize({ height })
 	};
 
@@ -336,7 +349,7 @@ export default class Window extends EventTarget implements IWindow {
 	public readonly location: Location;
 	public readonly history: History;
 	public readonly navigator: Navigator;
-	public readonly console = console;
+	public readonly console: Console;
 	public readonly self = this;
 	public readonly top = this;
 	public readonly parent = this;
@@ -347,10 +360,10 @@ export default class Window extends EventTarget implements IWindow {
 	public readonly sessionStorage: Storage;
 	public readonly localStorage: Storage;
 	public readonly performance = PerfHooks.performance;
-	public readonly innerWidth: number;
-	public readonly innerHeight: number;
-	public readonly outerWidth: number;
-	public readonly outerHeight: number;
+	public readonly innerWidth: number = 1024;
+	public readonly innerHeight: number = 768;
+	public readonly outerWidth: number = 1024;
+	public readonly outerHeight: number = 768;
 
 	// Node.js Globals
 	public Array: typeof Array;
@@ -395,6 +408,7 @@ export default class Window extends EventTarget implements IWindow {
 	public decodeURIComponent: typeof decodeURIComponent;
 	public encodeURI: typeof encodeURI;
 	public encodeURIComponent: typeof encodeURIComponent;
+	public eval: typeof eval;
 	/**
 	 * @deprecated
 	 */
@@ -447,41 +461,44 @@ export default class Window extends EventTarget implements IWindow {
 		this.sessionStorage = new Storage();
 		this.localStorage = new Storage();
 
-		if (options && options.width !== undefined) {
-			this.innerWidth = options.width;
-			this.outerWidth = options.width;
-		} else if (options && options.innerWidth !== undefined) {
-			this.innerWidth = options.innerWidth;
-			this.outerWidth = options.innerWidth;
-		} else {
-			this.innerWidth = 1024;
-			this.outerWidth = 1024;
-		}
+		if (options) {
+			if (options.width !== undefined) {
+				this.innerWidth = options.width;
+				this.outerWidth = options.width;
+			} else if (options.innerWidth !== undefined) {
+				this.innerWidth = options.innerWidth;
+				this.outerWidth = options.innerWidth;
+			}
 
-		if (options && options.height !== undefined) {
-			this.innerHeight = options.height;
-			this.outerHeight = options.height;
-		} else if (options && options.innerHeight !== undefined) {
-			this.innerHeight = options.innerHeight;
-			this.outerHeight = options.innerHeight;
-		} else {
-			this.innerHeight = 768;
-			this.outerHeight = 768;
-		}
+			if (options.height !== undefined) {
+				this.innerHeight = options.height;
+				this.outerHeight = options.height;
+			} else if (options.innerHeight !== undefined) {
+				this.innerHeight = options.innerHeight;
+				this.outerHeight = options.innerHeight;
+			}
 
-		if (options && options.url !== undefined) {
-			this.location.href = options.url;
+			if (options.url !== undefined) {
+				this.location.href = options.url;
+			}
+
+			if (options.settings) {
+				this.happyDOM.settings = {
+					...this.happyDOM.settings,
+					...options.settings,
+					device: {
+						...this.happyDOM.settings.device,
+						...options.settings.device
+					}
+				};
+			}
 		}
 
-		if (options && options.settings) {
-			this.happyDOM.settings = {
-				...this.happyDOM.settings,
-				...options.settings,
-				device: {
-					...this.happyDOM.settings.device,
-					...options.settings.device
-				}
-			};
+		if (options && options.console) {
+			this.console = options.console;
+		} else {
+			this.happyDOM.virtualConsolePrinter = new VirtualConsolePrinter();
+			this.console = new VirtualConsole(this.happyDOM.virtualConsolePrinter);
 		}
 
 		this._setTimeout = ORIGINAL_SET_TIMEOUT;
@@ -622,20 +639,6 @@ export default class Window extends EventTarget implements IWindow {
 		return new CSS();
 	}
 
-	/**
-	 * Evaluates code.
-	 *
-	 * @override
-	 * @param code Code.
-	 * @returns Result.
-	 */
-	public eval(code: string): unknown {
-		if (VM.isContext(this)) {
-			return VM.runInContext(code, this);
-		}
-		return eval(code);
-	}
-
 	/**
 	 * Returns an object containing the values of all CSS properties of an element.
 	 *
@@ -721,7 +724,7 @@ export default class Window extends EventTarget implements IWindow {
 	public setTimeout(callback: Function, delay = 0, ...args: unknown[]): NodeJS.Timeout {
 		const id = this._setTimeout(() => {
 			this.happyDOM.asyncTaskManager.endTimer(id);
-			callback(...args);
+			WindowErrorUtility.captureErrorSync(this, () => callback(...args));
 		}, delay);
 		this.happyDOM.asyncTaskManager.startTimer(id);
 		return id;
@@ -746,7 +749,13 @@ export default class Window extends EventTarget implements IWindow {
 	 * @returns Interval ID.
 	 */
 	public setInterval(callback: Function, delay = 0, ...args: unknown[]): NodeJS.Timeout {
-		const id = this._setInterval(callback, delay, ...args);
+		const id = this._setInterval(() => {
+			WindowErrorUtility.captureErrorSync(
+				this,
+				() => callback(...args),
+				() => this.clearInterval(id)
+			);
+		}, delay);
 		this.happyDOM.asyncTaskManager.startTimer(id);
 		return id;
 	}
@@ -768,9 +777,7 @@ export default class Window extends EventTarget implements IWindow {
 	 * @returns Timeout ID.
 	 */
 	public requestAnimationFrame(callback: (timestamp: number) => void): NodeJS.Timeout {
-		return this.setTimeout(() => {
-			callback(this.performance.now());
-		});
+		return this.setTimeout(() => callback(this.performance.now()));
 	}
 
 	/**
@@ -792,8 +799,8 @@ export default class Window extends EventTarget implements IWindow {
 		const taskId = this.happyDOM.asyncTaskManager.startTask(() => (isAborted = true));
 		this._queueMicrotask(() => {
 			if (!isAborted) {
+				WindowErrorUtility.captureErrorSync(this, <() => unknown>callback);
 				this.happyDOM.asyncTaskManager.endTask(taskId);
-				callback();
 			}
 		});
 	}