happy-dom 16.8.0 → 17.0.0

package/src/window/BrowserWindow.ts

@@ -196,7 +196,6 @@ import XMLSerializer from '../xml-serializer/XMLSerializer.js';
 import CrossOriginBrowserWindow from './CrossOriginBrowserWindow.js';
 import INodeJSGlobal from './INodeJSGlobal.js';
 import VMGlobalPropertyScript from './VMGlobalPropertyScript.js';
-import WindowErrorUtility from './WindowErrorUtility.js';
 import WindowPageOpenUtility from './WindowPageOpenUtility.js';
 import {
 	PerformanceObserver,
@@ -307,6 +306,8 @@ import DOMPoint from '../dom/DOMPoint.js';
 import SVGAnimatedLengthList from '../svg/SVGAnimatedLengthList.js';
 import CustomElementReactionStack from '../custom-element/CustomElementReactionStack.js';
 import IScrollToOptions from './IScrollToOptions.js';
+import IModule from '../module/IModule.js';
+import IModuleImportMap from '../module/IModuleImportMap.js';
 
 const TIMER = {
 	setTimeout: globalThis.setTimeout.bind(globalThis),
@@ -795,6 +796,16 @@ export default class BrowserWindow extends EventTarget implements INodeJSGlobal
 	public [PropertySymbol.window]: BrowserWindow = this;
 	public [PropertySymbol.internalId]: number = -1;
 	public [PropertySymbol.customElementReactionStack] = new CustomElementReactionStack(this);
+	public [PropertySymbol.modules]: {
+		json: Map<string, IModule>;
+		css: Map<string, IModule>;
+		esm: Map<string, IModule>;
+	} = {
+		json: new Map(),
+		css: new Map(),
+		esm: new Map()
+	};
+	public [PropertySymbol.moduleImportMap]: IModuleImportMap | null = null;
 
 	// Private properties
 	#browserFrame: IBrowserFrame;
@@ -1311,7 +1322,15 @@ export default class BrowserWindow extends EventTarget implements INodeJSGlobal
 					zeroDelayTimeout.timeouts = null;
 					for (const timeout of timeouts) {
 						if (useTryCatch) {
-							WindowErrorUtility.captureError(this, () => timeout.callback());
+							let result: any;
+							try {
+								result = timeout.callback();
+							} catch (error) {
+								this[PropertySymbol.dispatchError](error);
+							}
+							if (result instanceof Promise) {
+								result.catch((error: Error) => this[PropertySymbol.dispatchError](error));
+							}
 						} else {
 							timeout.callback();
 						}
@@ -1339,7 +1358,15 @@ export default class BrowserWindow extends EventTarget implements INodeJSGlobal
 				// We need to call endTimer() before the callback as the callback might throw an error.
 				this.#browserFrame[PropertySymbol.asyncTaskManager].endTimer(id);
 				if (useTryCatch) {
-					WindowErrorUtility.captureError(this, () => callback(...args));
+					let result: any;
+					try {
+						result = callback(...args);
+					} catch (error) {
+						this[PropertySymbol.dispatchError](error);
+					}
+					if (result instanceof Promise) {
+						result.catch((error: Error) => this[PropertySymbol.dispatchError](error));
+					}
 				} else {
 					callback(...args);
 				}
@@ -1399,11 +1426,19 @@ export default class BrowserWindow extends EventTarget implements INodeJSGlobal
 		const id = TIMER.setInterval(
 			() => {
 				if (useTryCatch) {
-					WindowErrorUtility.captureError(
-						this,
-						() => callback(...args),
-						() => this.clearInterval(id)
-					);
+					let result: any;
+					try {
+						result = callback(...args);
+					} catch (error) {
+						this.clearInterval(id);
+						this[PropertySymbol.dispatchError](error);
+					}
+					if (result instanceof Promise) {
+						result.catch((error: Error) => {
+							this.clearInterval(id);
+							this[PropertySymbol.dispatchError](error);
+						});
+					}
 				} else {
 					callback(...args);
 				}
@@ -1466,7 +1501,15 @@ export default class BrowserWindow extends EventTarget implements INodeJSGlobal
 			// We need to call endImmediate() before the callback as the callback might throw an error.
 			this.#browserFrame[PropertySymbol.asyncTaskManager].endImmediate(id);
 			if (useTryCatch) {
-				WindowErrorUtility.captureError(this, () => callback(this.performance.now()));
+				let result: any;
+				try {
+					result = callback(this.performance.now());
+				} catch (error) {
+					this[PropertySymbol.dispatchError](error);
+				}
+				if (result instanceof Promise) {
+					result.catch((error: Error) => this[PropertySymbol.dispatchError](error));
+				}
 			} else {
 				callback(this.performance.now());
 			}
@@ -1513,7 +1556,15 @@ export default class BrowserWindow extends EventTarget implements INodeJSGlobal
 				// We need to call endTask() before the callback as the callback might throw an error.
 				this.#browserFrame[PropertySymbol.asyncTaskManager].endTask(taskId);
 				if (useTryCatch) {
-					WindowErrorUtility.captureError(this, <() => unknown>callback);
+					let result: any;
+					try {
+						result = callback();
+					} catch (error) {
+						this[PropertySymbol.dispatchError](error);
+					}
+					if (result instanceof Promise) {
+						result.catch((error: Error) => this[PropertySymbol.dispatchError](error));
+					}
 				} else {
 					callback();
 				}
@@ -1665,6 +1716,16 @@ export default class BrowserWindow extends EventTarget implements INodeJSGlobal
 		}
 	}
 
+	/**
+	 * Dispatches an error event and outputs the error to the console.
+	 *
+	 * @param error Error.
+	 */
+	public [PropertySymbol.dispatchError](error: Error): void {
+		this.#browserFrame?.page?.console.error(error);
+		this.dispatchEvent(new ErrorEvent('error', { message: error.message, error }));
+	}
+
 	/**
 	 * Setup of VM context.
 	 */
@@ -1731,6 +1792,12 @@ export default class BrowserWindow extends EventTarget implements INodeJSGlobal
 			this.history[PropertySymbol.destroy]();
 		}
 
+		this[PropertySymbol.modules].json.clear();
+		this[PropertySymbol.modules].css.clear();
+		this[PropertySymbol.modules].esm.clear();
+
+		this.document[PropertySymbol.preloads].clear();
+
 		this.document[PropertySymbol.activeElement] = null;
 		this.document[PropertySymbol.nextActiveElement] = null;
 		this.document[PropertySymbol.currentScript] = null;

package/cjs/window/WindowErrorUtility.cjs

@@ -1,85 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const PropertySymbol = __importStar(require("../PropertySymbol.cjs"));
-const ErrorEvent_js_1 = __importDefault(require("../event/events/ErrorEvent.cjs"));
-/**
- * Error utility.
- */
-class WindowErrorUtility {
-    /**
-     * Calls a function synchronously wrapped in a try/catch block to capture errors and dispatch error events.
-     * If the callback returns a Promise, it will catch errors from the promise.
-     *
-     * It will also output the errors to the console.
-     *
-     * @param elementOrWindow Element or Window.
-     * @param callback Callback.
-     * @param [cleanup] Cleanup callback on error.
-     * @returns Result.
-     */
-    static captureError(elementOrWindow, callback, cleanup) {
-        let result = null;
-        try {
-            result = callback();
-        }
-        catch (error) {
-            this.dispatchError(elementOrWindow, error);
-            if (cleanup) {
-                cleanup();
-            }
-        }
-        if (result && result instanceof Promise) {
-            result.catch((error) => {
-                this.dispatchError(elementOrWindow, error);
-                if (cleanup) {
-                    cleanup();
-                }
-            });
-        }
-        return result;
-    }
-    /**
-     * Dispatches an error event and outputs it to the console.
-     *
-     * @param elementOrWindow Element or Window.
-     * @param error Error.
-     */
-    static dispatchError(elementOrWindow, error) {
-        if (elementOrWindow.console) {
-            elementOrWindow.console.error(error);
-            elementOrWindow.dispatchEvent(new ErrorEvent_js_1.default('error', { message: error.message, error }));
-        }
-        else {
-            elementOrWindow[PropertySymbol.ownerDocument][PropertySymbol.defaultView]?.console.error(error);
-            elementOrWindow.dispatchEvent(new ErrorEvent_js_1.default('error', { message: error.message, error }));
-        }
-    }
-}
-exports.default = WindowErrorUtility;
-//# sourceMappingURL=WindowErrorUtility.cjs.map

package/cjs/window/WindowErrorUtility.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"WindowErrorUtility.cjs","sourceRoot":"","sources":["../../src/window/WindowErrorUtility.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,qEAAuD;AACvD,kFAAuD;AAGvD;;GAEG;AACH,MAAqB,kBAAkB;IACtC;;;;;;;;;;OAUG;IACI,MAAM,CAAC,YAAY,CACzB,eAAwC,EACxC,QAAiB,EACjB,OAAoB;QAEpB,IAAI,MAAM,GAAG,IAAI,CAAC;QAElB,IAAI,CAAC;YACJ,MAAM,GAAG,QAAQ,EAAE,CAAC;QACrB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,aAAa,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;YAC3C,IAAI,OAAO,EAAE,CAAC;gBACb,OAAO,EAAE,CAAC;YACX,CAAC;QACF,CAAC;QAED,IAAI,MAAM,IAAI,MAAM,YAAY,OAAO,EAAE,CAAC;YACzC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBACtB,IAAI,CAAC,aAAa,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;gBAC3C,IAAI,OAAO,EAAE,CAAC;oBACb,OAAO,EAAE,CAAC;gBACX,CAAC;YACF,CAAC,CAAC,CAAC;QACJ,CAAC;QAED,OAAO,MAAM,CAAC;IACf,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,aAAa,CAAC,eAAwC,EAAE,KAAY;QACjF,IAAoB,eAAgB,CAAC,OAAO,EAAE,CAAC;YAC9B,eAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACtD,eAAe,CAAC,aAAa,CAAC,IAAI,uBAAU,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;QAC3F,CAAC;aAAM,CAAC;YACG,eAAgB,CAAC,cAAc,CAAC,aAAa,CAAC,CACvD,cAAc,CAAC,WAAW,CAC1B,EAAE,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACd,eAAgB,CAAC,aAAa,CACvC,IAAI,uBAAU,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,CAC1D,CAAC;QACH,CAAC;IACF,CAAC;CACD;AA3DD,qCA2DC"}

package/cjs/window/WindowErrorUtility.d.ts

@@ -1,27 +0,0 @@
-import BrowserWindow from './BrowserWindow.cjs';
-import Element from '../nodes/element/Element.cjs';
-/**
- * Error utility.
- */
-export default class WindowErrorUtility {
-    /**
-     * Calls a function synchronously wrapped in a try/catch block to capture errors and dispatch error events.
-     * If the callback returns a Promise, it will catch errors from the promise.
-     *
-     * It will also output the errors to the console.
-     *
-     * @param elementOrWindow Element or Window.
-     * @param callback Callback.
-     * @param [cleanup] Cleanup callback on error.
-     * @returns Result.
-     */
-    static captureError<T>(elementOrWindow: BrowserWindow | Element, callback: () => T, cleanup?: () => void): T | null;
-    /**
-     * Dispatches an error event and outputs it to the console.
-     *
-     * @param elementOrWindow Element or Window.
-     * @param error Error.
-     */
-    static dispatchError(elementOrWindow: BrowserWindow | Element, error: Error): void;
-}
-//# sourceMappingURL=WindowErrorUtility.d.ts.map

package/cjs/window/WindowErrorUtility.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"WindowErrorUtility.d.ts","sourceRoot":"","sources":["../../src/window/WindowErrorUtility.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAG/C,OAAO,OAAO,MAAM,6BAA6B,CAAC;AAElD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,kBAAkB;IACtC;;;;;;;;;;OAUG;WACW,YAAY,CAAC,CAAC,EAC3B,eAAe,EAAE,aAAa,GAAG,OAAO,EACxC,QAAQ,EAAE,MAAM,CAAC,EACjB,OAAO,CAAC,EAAE,MAAM,IAAI,GAClB,CAAC,GAAG,IAAI;IAwBX;;;;;OAKG;WACW,aAAa,CAAC,eAAe,EAAE,aAAa,GAAG,OAAO,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI;CAazF"}

package/lib/window/WindowErrorUtility.d.ts

@@ -1,27 +0,0 @@
-import BrowserWindow from './BrowserWindow.js';
-import Element from '../nodes/element/Element.js';
-/**
- * Error utility.
- */
-export default class WindowErrorUtility {
-    /**
-     * Calls a function synchronously wrapped in a try/catch block to capture errors and dispatch error events.
-     * If the callback returns a Promise, it will catch errors from the promise.
-     *
-     * It will also output the errors to the console.
-     *
-     * @param elementOrWindow Element or Window.
-     * @param callback Callback.
-     * @param [cleanup] Cleanup callback on error.
-     * @returns Result.
-     */
-    static captureError<T>(elementOrWindow: BrowserWindow | Element, callback: () => T, cleanup?: () => void): T | null;
-    /**
-     * Dispatches an error event and outputs it to the console.
-     *
-     * @param elementOrWindow Element or Window.
-     * @param error Error.
-     */
-    static dispatchError(elementOrWindow: BrowserWindow | Element, error: Error): void;
-}
-//# sourceMappingURL=WindowErrorUtility.d.ts.map

package/lib/window/WindowErrorUtility.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"WindowErrorUtility.d.ts","sourceRoot":"","sources":["../../src/window/WindowErrorUtility.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAG/C,OAAO,OAAO,MAAM,6BAA6B,CAAC;AAElD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,kBAAkB;IACtC;;;;;;;;;;OAUG;WACW,YAAY,CAAC,CAAC,EAC3B,eAAe,EAAE,aAAa,GAAG,OAAO,EACxC,QAAQ,EAAE,MAAM,CAAC,EACjB,OAAO,CAAC,EAAE,MAAM,IAAI,GAClB,CAAC,GAAG,IAAI;IAwBX;;;;;OAKG;WACW,aAAa,CAAC,eAAe,EAAE,aAAa,GAAG,OAAO,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI;CAazF"}

package/lib/window/WindowErrorUtility.js

@@ -1,56 +0,0 @@
-import * as PropertySymbol from '../PropertySymbol.js';
-import ErrorEvent from '../event/events/ErrorEvent.js';
-/**
- * Error utility.
- */
-export default class WindowErrorUtility {
-    /**
-     * Calls a function synchronously wrapped in a try/catch block to capture errors and dispatch error events.
-     * If the callback returns a Promise, it will catch errors from the promise.
-     *
-     * It will also output the errors to the console.
-     *
-     * @param elementOrWindow Element or Window.
-     * @param callback Callback.
-     * @param [cleanup] Cleanup callback on error.
-     * @returns Result.
-     */
-    static captureError(elementOrWindow, callback, cleanup) {
-        let result = null;
-        try {
-            result = callback();
-        }
-        catch (error) {
-            this.dispatchError(elementOrWindow, error);
-            if (cleanup) {
-                cleanup();
-            }
-        }
-        if (result && result instanceof Promise) {
-            result.catch((error) => {
-                this.dispatchError(elementOrWindow, error);
-                if (cleanup) {
-                    cleanup();
-                }
-            });
-        }
-        return result;
-    }
-    /**
-     * Dispatches an error event and outputs it to the console.
-     *
-     * @param elementOrWindow Element or Window.
-     * @param error Error.
-     */
-    static dispatchError(elementOrWindow, error) {
-        if (elementOrWindow.console) {
-            elementOrWindow.console.error(error);
-            elementOrWindow.dispatchEvent(new ErrorEvent('error', { message: error.message, error }));
-        }
-        else {
-            elementOrWindow[PropertySymbol.ownerDocument][PropertySymbol.defaultView]?.console.error(error);
-            elementOrWindow.dispatchEvent(new ErrorEvent('error', { message: error.message, error }));
-        }
-    }
-}
-//# sourceMappingURL=WindowErrorUtility.js.map

package/lib/window/WindowErrorUtility.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"WindowErrorUtility.js","sourceRoot":"","sources":["../../src/window/WindowErrorUtility.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,cAAc,MAAM,sBAAsB,CAAC;AACvD,OAAO,UAAU,MAAM,+BAA+B,CAAC;AAGvD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,kBAAkB;IACtC;;;;;;;;;;OAUG;IACI,MAAM,CAAC,YAAY,CACzB,eAAwC,EACxC,QAAiB,EACjB,OAAoB;QAEpB,IAAI,MAAM,GAAG,IAAI,CAAC;QAElB,IAAI,CAAC;YACJ,MAAM,GAAG,QAAQ,EAAE,CAAC;QACrB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,aAAa,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;YAC3C,IAAI,OAAO,EAAE,CAAC;gBACb,OAAO,EAAE,CAAC;YACX,CAAC;QACF,CAAC;QAED,IAAI,MAAM,IAAI,MAAM,YAAY,OAAO,EAAE,CAAC;YACzC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBACtB,IAAI,CAAC,aAAa,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;gBAC3C,IAAI,OAAO,EAAE,CAAC;oBACb,OAAO,EAAE,CAAC;gBACX,CAAC;YACF,CAAC,CAAC,CAAC;QACJ,CAAC;QAED,OAAO,MAAM,CAAC;IACf,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,aAAa,CAAC,eAAwC,EAAE,KAAY;QACjF,IAAoB,eAAgB,CAAC,OAAO,EAAE,CAAC;YAC9B,eAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACtD,eAAe,CAAC,aAAa,CAAC,IAAI,UAAU,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;QAC3F,CAAC;aAAM,CAAC;YACG,eAAgB,CAAC,cAAc,CAAC,aAAa,CAAC,CACvD,cAAc,CAAC,WAAW,CAC1B,EAAE,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACd,eAAgB,CAAC,aAAa,CACvC,IAAI,UAAU,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,CAC1D,CAAC;QACH,CAAC;IACF,CAAC;CACD"}

package/src/window/WindowErrorUtility.ts

@@ -1,68 +0,0 @@
-import BrowserWindow from './BrowserWindow.js';
-import * as PropertySymbol from '../PropertySymbol.js';
-import ErrorEvent from '../event/events/ErrorEvent.js';
-import Element from '../nodes/element/Element.js';
-
-/**
- * Error utility.
- */
-export default class WindowErrorUtility {
-	/**
-	 * Calls a function synchronously wrapped in a try/catch block to capture errors and dispatch error events.
-	 * If the callback returns a Promise, it will catch errors from the promise.
-	 *
-	 * It will also output the errors to the console.
-	 *
-	 * @param elementOrWindow Element or Window.
-	 * @param callback Callback.
-	 * @param [cleanup] Cleanup callback on error.
-	 * @returns Result.
-	 */
-	public static captureError<T>(
-		elementOrWindow: BrowserWindow | Element,
-		callback: () => T,
-		cleanup?: () => void
-	): T | null {
-		let result = null;
-
-		try {
-			result = callback();
-		} catch (error) {
-			this.dispatchError(elementOrWindow, error);
-			if (cleanup) {
-				cleanup();
-			}
-		}
-
-		if (result && result instanceof Promise) {
-			result.catch((error) => {
-				this.dispatchError(elementOrWindow, error);
-				if (cleanup) {
-					cleanup();
-				}
-			});
-		}
-
-		return result;
-	}
-
-	/**
-	 * Dispatches an error event and outputs it to the console.
-	 *
-	 * @param elementOrWindow Element or Window.
-	 * @param error Error.
-	 */
-	public static dispatchError(elementOrWindow: BrowserWindow | Element, error: Error): void {
-		if ((<BrowserWindow>elementOrWindow).console) {
-			(<BrowserWindow>elementOrWindow).console.error(error);
-			elementOrWindow.dispatchEvent(new ErrorEvent('error', { message: error.message, error }));
-		} else {
-			(<Element>elementOrWindow)[PropertySymbol.ownerDocument][
-				PropertySymbol.defaultView
-			]?.console.error(error);
-			(<Element>elementOrWindow).dispatchEvent(
-				new ErrorEvent('error', { message: error.message, error })
-			);
-		}
-	}
-}