happy-dom 14.1.0 → 14.1.2

package/src/window/BrowserWindow.ts

@@ -408,18 +408,11 @@ export default class BrowserWindow extends EventTarget implements INodeJSGlobal
 	// Public properties.
 	public readonly document: DocumentImplementation;
 	public readonly customElements: CustomElementRegistry;
-	public readonly location: Location;
-	public readonly history: History;
-	public readonly navigator: Navigator;
-	public readonly console: Console;
 	public readonly self: BrowserWindow = this;
 	public readonly top: BrowserWindow = this;
 	public readonly parent: BrowserWindow = this;
 	public readonly window: BrowserWindow = this;
 	public readonly globalThis: BrowserWindow = this;
-	public readonly screen: Screen;
-	public readonly sessionStorage: Storage;
-	public readonly localStorage: Storage;
 	public readonly performance: typeof performance = performance;
 	public readonly screenLeft: number = 0;
 	public readonly screenTop: number = 0;
@@ -427,6 +420,7 @@ export default class BrowserWindow extends EventTarget implements INodeJSGlobal
 	public readonly screenY: number = 0;
 	public readonly crypto: typeof webcrypto = webcrypto;
 	public readonly closed = false;
+	public console: Console;
 	public name = '';
 
 	// Node.js Globals
@@ -497,6 +491,12 @@ export default class BrowserWindow extends EventTarget implements INodeJSGlobal
 	public [PropertySymbol.captureEventListenerCount]: { [eventType: string]: number } = {};
 	public readonly [PropertySymbol.mutationObservers]: MutationObserver[] = [];
 	public readonly [PropertySymbol.readyStateManager] = new DocumentReadyStateManager(this);
+	public [PropertySymbol.location]: Location;
+	public [PropertySymbol.history]: History;
+	public [PropertySymbol.navigator]: Navigator;
+	public [PropertySymbol.screen]: Screen;
+	public [PropertySymbol.sessionStorage]: Storage;
+	public [PropertySymbol.localStorage]: Storage;
 
 	// Private properties
 	#browserFrame: IBrowserFrame;
@@ -519,12 +519,13 @@ export default class BrowserWindow extends EventTarget implements INodeJSGlobal
 		this.#browserFrame = browserFrame;
 
 		this.customElements = new CustomElementRegistry(this);
-		this.navigator = new Navigator(this);
-		this.history = new History();
-		this.screen = new Screen();
-		this.sessionStorage = new Storage();
-		this.localStorage = new Storage();
-		this.location = new Location(this.#browserFrame, options?.url ?? 'about:blank');
+		this[PropertySymbol.navigator] = new Navigator(this);
+		this[PropertySymbol.history] = new History();
+		this[PropertySymbol.screen] = new Screen();
+		this[PropertySymbol.sessionStorage] = new Storage();
+		this[PropertySymbol.localStorage] = new Storage();
+		this[PropertySymbol.location] = new Location(this.#browserFrame, options?.url ?? 'about:blank');
+
 		this.console = browserFrame.page.console;
 
 		WindowBrowserSettingsReader.setSettings(this, this.#browserFrame.page.context.browser.settings);
@@ -673,6 +674,57 @@ export default class BrowserWindow extends EventTarget implements INodeJSGlobal
 		});
 	}
 
+	/**
+	 * Returns location.
+	 */
+	public get location(): Location {
+		return this[PropertySymbol.location];
+	}
+
+	/**
+	 * Returns location.
+	 *
+	 * @param href Href.
+	 */
+	public set location(href: string) {
+		this[PropertySymbol.location].href = href;
+	}
+
+	/**
+	 * Returns history.
+	 */
+	public get history(): History {
+		return this[PropertySymbol.history];
+	}
+
+	/**
+	 * Returns navigator.
+	 */
+	public get navigator(): Navigator {
+		return this[PropertySymbol.navigator];
+	}
+
+	/**
+	 * Returns screen.
+	 */
+	public get screen(): Screen {
+		return this[PropertySymbol.screen];
+	}
+
+	/**
+	 * Returns session storage.
+	 */
+	public get sessionStorage(): Storage {
+		return this[PropertySymbol.sessionStorage];
+	}
+
+	/**
+	 * Returns local storage.
+	 */
+	public get localStorage(): Storage {
+		return this[PropertySymbol.localStorage];
+	}
+
 	/**
 	 * Returns opener.
 	 *

package/src/window/GlobalWindow.ts

@@ -1,4 +1,6 @@
 import * as PropertySymbol from '../PropertySymbol.js';
+import { IOptionalBrowserSettings } from '../index.js';
+import BrowserWindow from './BrowserWindow.js';
 import Window from './Window.js';
 import { Buffer } from 'buffer';
 
@@ -70,6 +72,61 @@ export default class GlobalWindow extends Window {
 	public gc: () => void = globalThis.gc;
 	public v8debug?: unknown = globalThis.v8debug;
 
+	/**
+	 * Constructor.
+	 *
+	 * @param [options] Options.
+	 * @param [options.width] Window width. Defaults to "1024".
+	 * @param [options.height] Window height. Defaults to "768".
+	 * @param [options.innerWidth] Inner width. Deprecated. Defaults to "1024".
+	 * @param [options.innerHeight] Inner height. Deprecated. Defaults to "768".
+	 * @param [options.url] URL.
+	 * @param [options.console] Console.
+	 * @param [options.settings] Settings.
+	 */
+	constructor(options?: {
+		width?: number;
+		height?: number;
+		/** @deprecated Replaced by the "width" property. */
+		innerWidth?: number;
+		/** @deprecated Replaced by the "height" property. */
+		innerHeight?: number;
+		url?: string;
+		console?: Console;
+		settings?: IOptionalBrowserSettings;
+	}) {
+		super(options);
+
+		/**
+		 * Binds getts and setters, so that they will appear as an "own" property when using Object.getOwnPropertyNames().
+		 *
+		 * This is needed for Vitest to work as it relies on Object.getOwnPropertyNames() to get the list of properties.
+		 *
+		 * @see https://github.com/capricorn86/happy-dom/issues/1339
+		 */
+		for (const windowClass of [GlobalWindow, Window, BrowserWindow]) {
+			const propertyDescriptors = Object.getOwnPropertyDescriptors(
+				Reflect.getPrototypeOf(windowClass.prototype)
+			);
+
+			for (const key of Object.keys(propertyDescriptors)) {
+				const windowPropertyDescriptor = propertyDescriptors[key];
+				if (windowPropertyDescriptor.get || windowPropertyDescriptor.set) {
+					const ownPropertyDescriptor = Object.getOwnPropertyDescriptor(this, key);
+
+					if (!ownPropertyDescriptor) {
+						Object.defineProperty(this, key, {
+							configurable: true,
+							enumerable: windowPropertyDescriptor.enumerable,
+							get: windowPropertyDescriptor.get?.bind(this),
+							set: windowPropertyDescriptor.set?.bind(this)
+						});
+					}
+				}
+			}
+		}
+	}
+
 	/**
 	 * Setup of VM context.
 	 */