happy-dom 13.10.1 → 14.0.0

package/src/fetch/Fetch.ts

@@ -1,6 +1,5 @@
 import IRequestInit from './types/IRequestInit.js';
 import * as PropertySymbol from '../PropertySymbol.js';
-import IResponse from './types/IResponse.js';
 import IRequestInfo from './types/IRequestInfo.js';
 import Headers from './Headers.js';
 import FetchRequestReferrerUtility from './utilities/FetchRequestReferrerUtility.js';
@@ -19,7 +18,7 @@ import Response from './Response.js';
 import Event from '../event/Event.js';
 import AbortSignal from './AbortSignal.js';
 import IBrowserFrame from '../browser/types/IBrowserFrame.js';
-import IBrowserWindow from '../window/IBrowserWindow.js';
+import BrowserWindow from '../window/BrowserWindow.js';
 import CachedResponseStateEnum from './cache/response/CachedResponseStateEnum.js';
 import FetchRequestHeaderUtility from './utilities/FetchRequestHeaderUtility.js';
 import FetchRequestValidationUtility from './utilities/FetchRequestValidationUtility.js';
@@ -41,7 +40,7 @@ const LAST_CHUNK = Buffer.from('0\r\n\r\n');
  */
 export default class Fetch {
 	private reject: (reason: Error) => void | null = null;
-	private resolve: (value: IResponse | Promise<IResponse>) => void | null = null;
+	private resolve: (value: Response | Promise<Response>) => void | null = null;
 	private listeners = {
 		onSignalAbort: this.onSignalAbort.bind(this)
 	};
@@ -57,7 +56,7 @@ export default class Fetch {
 	private disableCache: boolean;
 	private disableCrossOriginPolicy: boolean;
 	#browserFrame: IBrowserFrame;
-	#window: IBrowserWindow;
+	#window: BrowserWindow;
 
 	/**
 	 * Constructor.
@@ -74,7 +73,7 @@ export default class Fetch {
 	 */
 	constructor(options: {
 		browserFrame: IBrowserFrame;
-		window: IBrowserWindow;
+		window: BrowserWindow;
 		url: IRequestInfo;
 		init?: IRequestInit;
 		redirectCount?: number;
@@ -101,7 +100,7 @@ export default class Fetch {
 	 *
 	 * @returns Response.
 	 */
-	public async send(): Promise<IResponse> {
+	public async send(): Promise<Response> {
 		FetchRequestReferrerUtility.prepareRequest(new URL(this.#window.location.href), this.request);
 		FetchRequestValidationUtility.validateSchema(this.request);
 
@@ -158,7 +157,7 @@ export default class Fetch {
 	 *
 	 * @returns Response.
 	 */
-	private async getCachedResponse(): Promise<IResponse | null> {
+	private async getCachedResponse(): Promise<Response | null> {
 		if (this.disableCache) {
 			return null;
 		}
@@ -336,7 +335,7 @@ export default class Fetch {
 	 *
 	 * @returns Response.
 	 */
-	private sendRequest(): Promise<IResponse> {
+	private sendRequest(): Promise<Response> {
 		return new Promise((resolve, reject) => {
 			const taskID = this.#browserFrame[PropertySymbol.asyncTaskManager].startTask(() =>
 				this.onAsyncTaskManagerAbort()
@@ -346,7 +345,7 @@ export default class Fetch {
 				throw new Error('Fetch already sent.');
 			}
 
-			this.resolve = (response: IResponse | Promise<IResponse>): void => {
+			this.resolve = (response: Response | Promise<Response>): void => {
 				// We can end up here when closing down the browser frame and there is an ongoing request.
 				// Therefore we need to check if browserFrame.page.context is still available.
 				if (
@@ -779,7 +778,7 @@ export default class Fetch {
 				this.finalizeRequest();
 				this.reject(
 					new DOMException(
-						`Redirect option '${this.request.redirect}' is not a valid value of RequestRedirect`
+						`Redirect option '${this.request.redirect}' is not a valid value of IRequestRedirect`
 					)
 				);
 				return true;

package/src/fetch/Headers.ts

@@ -1,7 +1,6 @@
 import DOMException from '../exception/DOMException.js';
 import * as PropertySymbol from '../PropertySymbol.js';
 import DOMExceptionNameEnum from '../exception/DOMExceptionNameEnum.js';
-import IHeaders from './types/IHeaders.js';
 import IHeadersInit from './types/IHeadersInit.js';
 
 /**
@@ -9,7 +8,7 @@ import IHeadersInit from './types/IHeadersInit.js';
  *
  * @see https://developer.mozilla.org/en-US/docs/Web/API/Headers
  */
-export default class Headers implements IHeaders {
+export default class Headers {
 	public [PropertySymbol.entries]: { [k: string]: { name: string; value: string[] } } = {};
 
 	/**
@@ -117,7 +116,7 @@ export default class Headers implements IHeaders {
 	 *
 	 * @param callback Callback.
 	 */
-	public forEach(callback: (name: string, value: string, thisArg: IHeaders) => void): void {
+	public forEach(callback: (name: string, value: string, thisArg: Headers) => void): void {
 		for (const header of Object.values(this[PropertySymbol.entries])) {
 			callback(header.value.join(', '), header.name, this);
 		}

package/src/fetch/Request.ts

@@ -1,12 +1,10 @@
-import IBlob from '../file/IBlob.js';
 import * as PropertySymbol from '../PropertySymbol.js';
-import IDocument from '../nodes/document/IDocument.js';
+import Document from '../nodes/document/Document.js';
 import IRequestInit from './types/IRequestInit.js';
 import URL from '../url/URL.js';
 import DOMException from '../exception/DOMException.js';
 import DOMExceptionNameEnum from '../exception/DOMExceptionNameEnum.js';
 import IRequestInfo from './types/IRequestInfo.js';
-import IRequest from './types/IRequest.js';
 import Headers from './Headers.js';
 import FetchBodyUtility from './utilities/FetchBodyUtility.js';
 import AbortSignal from './AbortSignal.js';
@@ -21,7 +19,7 @@ import IRequestCredentials from './types/IRequestCredentials.js';
 import FormData from '../form-data/FormData.js';
 import MultipartFormDataParser from './multipart/MultipartFormDataParser.js';
 import AsyncTaskManager from '../async-task-manager/AsyncTaskManager.js';
-import IBrowserWindow from '../window/IBrowserWindow.js';
+import BrowserWindow from '../window/BrowserWindow.js';
 
 /**
  * Fetch request.
@@ -31,7 +29,7 @@ import IBrowserWindow from '../window/IBrowserWindow.js';
  *
  * @see https://fetch.spec.whatwg.org/#request-class
  */
-export default class Request implements IRequest {
+export default class Request implements Request {
 	// Public properties
 	public readonly method: string;
 	public readonly body: ReadableStream | null;
@@ -50,7 +48,7 @@ export default class Request implements IRequest {
 	public [PropertySymbol.bodyBuffer]: Buffer | null;
 
 	// Private properties
-	readonly #window: IBrowserWindow;
+	readonly #window: BrowserWindow;
 	readonly #asyncTaskManager: AsyncTaskManager;
 
 	/**
@@ -63,7 +61,7 @@ export default class Request implements IRequest {
 	 * @param [init] Init.
 	 */
 	constructor(
-		injected: { window: IBrowserWindow; asyncTaskManager: AsyncTaskManager },
+		injected: { window: BrowserWindow; asyncTaskManager: AsyncTaskManager },
 		input: IRequestInfo,
 		init?: IRequestInit
 	) {
@@ -149,7 +147,7 @@ export default class Request implements IRequest {
 	/**
 	 * Returns owner document.
 	 */
-	protected get [PropertySymbol.ownerDocument](): IDocument {
+	protected get [PropertySymbol.ownerDocument](): Document {
 		throw new Error('[PropertySymbol.ownerDocument] getter needs to be implemented by sub-class.');
 	}
 
@@ -223,7 +221,7 @@ export default class Request implements IRequest {
 	 *
 	 * @returns Blob.
 	 */
-	public async blob(): Promise<IBlob> {
+	public async blob(): Promise<Blob> {
 		const type = this.headers.get('Content-Type') || '';
 		const buffer = await this.arrayBuffer();
 

package/src/fetch/ResourceFetch.ts

@@ -1,5 +1,5 @@
 import DOMException from '../exception/DOMException.js';
-import IBrowserWindow from '../window/IBrowserWindow.js';
+import BrowserWindow from '../window/BrowserWindow.js';
 import URL from '../url/URL.js';
 import IBrowserFrame from '../browser/types/IBrowserFrame.js';
 import Fetch from './Fetch.js';
@@ -9,7 +9,7 @@ import SyncFetch from './SyncFetch.js';
  * Helper class for performing fetch of resources.
  */
 export default class ResourceFetch {
-	private window: IBrowserWindow;
+	private window: BrowserWindow;
 	#browserFrame: IBrowserFrame;
 
 	/**
@@ -19,7 +19,7 @@ export default class ResourceFetch {
 	 * @param options.browserFrame Browser frame.
 	 * @param options.window Window.
 	 */
-	constructor(options: { browserFrame: IBrowserFrame; window: IBrowserWindow }) {
+	constructor(options: { browserFrame: IBrowserFrame; window: BrowserWindow }) {
 		this.#browserFrame = options.browserFrame;
 		this.window = options.window;
 	}

package/src/fetch/Response.ts

@@ -1,20 +1,17 @@
-import IResponse from './types/IResponse.js';
 import * as PropertySymbol from '../PropertySymbol.js';
-import IBlob from '../file/IBlob.js';
+import Blob from '../file/Blob.js';
 import IResponseInit from './types/IResponseInit.js';
 import IResponseBody from './types/IResponseBody.js';
 import Headers from './Headers.js';
-import IHeaders from './types/IHeaders.js';
 import { URLSearchParams } from 'url';
 import URL from '../url/URL.js';
-import Blob from '../file/Blob.js';
 import { ReadableStream } from 'stream/web';
 import FormData from '../form-data/FormData.js';
 import FetchBodyUtility from './utilities/FetchBodyUtility.js';
 import DOMException from '../exception/DOMException.js';
 import DOMExceptionNameEnum from '../exception/DOMExceptionNameEnum.js';
 import MultipartFormDataParser from './multipart/MultipartFormDataParser.js';
-import IBrowserWindow from '../window/IBrowserWindow.js';
+import BrowserWindow from '../window/BrowserWindow.js';
 import IBrowserFrame from '../browser/types/IBrowserFrame.js';
 import ICachedResponse from './cache/response/ICachedResponse.js';
 import { Buffer } from 'buffer';
@@ -29,9 +26,9 @@ const REDIRECT_STATUS_CODES = [301, 302, 303, 307, 308];
  *
  * @see https://developer.mozilla.org/en-US/docs/Web/API/Response/Response
  */
-export default class Response implements IResponse {
+export default class Response implements Response {
 	// Needs to be injected by sub-class.
-	protected static [PropertySymbol.window]: IBrowserWindow;
+	protected static [PropertySymbol.window]: BrowserWindow;
 
 	// Public properties
 	public readonly body: ReadableStream | null = null;
@@ -43,10 +40,10 @@ export default class Response implements IResponse {
 	public readonly status: number;
 	public readonly statusText: string;
 	public readonly ok: boolean;
-	public readonly headers: IHeaders;
+	public readonly headers: Headers;
 	public [PropertySymbol.cachedResponse]: ICachedResponse | null = null;
 	public [PropertySymbol.buffer]: Buffer | null = null;
-	readonly #window: IBrowserWindow;
+	readonly #window: BrowserWindow;
 	readonly #browserFrame: IBrowserFrame;
 
 	/**
@@ -60,7 +57,7 @@ export default class Response implements IResponse {
 	 * @param [init] Init.
 	 */
 	constructor(
-		injected: { window: IBrowserWindow; browserFrame: IBrowserFrame },
+		injected: { window: BrowserWindow; browserFrame: IBrowserFrame },
 		body?: IResponseBody,
 		init?: IResponseInit
 	) {
@@ -138,7 +135,7 @@ export default class Response implements IResponse {
 	 *
 	 * @returns Blob.
 	 */
-	public async blob(): Promise<IBlob> {
+	public async blob(): Promise<Blob> {
 		const type = this.headers.get('Content-Type') || '';
 		const buffer = await this.arrayBuffer();
 

package/src/fetch/SyncFetch.ts

@@ -6,7 +6,7 @@ import DOMExceptionNameEnum from '../exception/DOMExceptionNameEnum.js';
 import URL from '../url/URL.js';
 import Request from './Request.js';
 import IBrowserFrame from '../browser/types/IBrowserFrame.js';
-import IBrowserWindow from '../window/IBrowserWindow.js';
+import BrowserWindow from '../window/BrowserWindow.js';
 import ChildProcess from 'child_process';
 import ISyncResponse from './types/ISyncResponse.js';
 import Headers from './Headers.js';
@@ -41,7 +41,7 @@ export default class SyncFetch {
 	private disableCache: boolean;
 	private disableCrossOriginPolicy: boolean;
 	#browserFrame: IBrowserFrame;
-	#window: IBrowserWindow;
+	#window: BrowserWindow;
 
 	/**
 	 * Constructor.
@@ -58,7 +58,7 @@ export default class SyncFetch {
 	 */
 	constructor(options: {
 		browserFrame: IBrowserFrame;
-		window: IBrowserWindow;
+		window: BrowserWindow;
 		url: IRequestInfo;
 		init?: IRequestInit;
 		redirectCount?: number;
@@ -375,7 +375,7 @@ export default class SyncFetch {
 			url: this.request.url,
 			redirected: this.redirectCount > 0,
 			headers,
-			body: this.parseResponseBody({
+			body: this.parseIResponseBody({
 				headers,
 				status: incomingMessage.statusCode,
 				body: Buffer.from(incomingMessage.data, 'base64')
@@ -407,7 +407,7 @@ export default class SyncFetch {
 	 * @param options.body Body.
 	 * @returns Parsed body.
 	 */
-	private parseResponseBody(options: { headers: Headers; status: number; body: Buffer }): Buffer {
+	private parseIResponseBody(options: { headers: Headers; status: number; body: Buffer }): Buffer {
 		const contentEncodingHeader = options.headers.get('Content-Encoding');
 
 		if (
@@ -547,7 +547,7 @@ export default class SyncFetch {
 				return fetch.send();
 			default:
 				throw new DOMException(
-					`Redirect option '${this.request.redirect}' is not a valid value of RequestRedirect`
+					`Redirect option '${this.request.redirect}' is not a valid value of IRequestRedirect`
 				);
 		}
 	}

package/src/fetch/cache/preflight/ICachablePreflightRequest.ts

@@ -1,7 +1,7 @@
-import IHeaders from '../../types/IHeaders.js';
+import Headers from '../../Headers.js';
 
 export default interface ICachablePreflightRequest {
 	url: string;
 	method: string;
-	headers: IHeaders;
+	headers: Headers;
 }

package/src/fetch/cache/preflight/ICachablePreflightResponse.ts

@@ -1,7 +1,7 @@
-import IHeaders from '../../types/IHeaders.js';
+import Headers from '../../Headers.js';
 
 export default interface ICachablePreflightResponse {
 	status: number;
 	url: string;
-	headers: IHeaders;
+	headers: Headers;
 }

package/src/fetch/cache/response/ICachableRequest.ts

@@ -1,7 +1,7 @@
-import IHeaders from '../../types/IHeaders.js';
+import Headers from '../../Headers.js';
 
 export default interface ICachableRequest {
 	url: string;
 	method: string;
-	headers: IHeaders;
+	headers: Headers;
 }

package/src/fetch/cache/response/ICachableResponse.ts

@@ -1,10 +1,10 @@
-import IHeaders from '../../types/IHeaders.js';
+import Headers from '../../Headers.js';
 
 export default interface ICachableResponse {
 	status: number;
 	statusText: string;
 	url: string;
-	headers: IHeaders;
+	headers: Headers;
 	body: Buffer | null;
 	waitingForBody: boolean;
 }

package/src/fetch/cache/response/ICachedResponse.ts

@@ -1,5 +1,5 @@
 import CachedResponseStateEnum from './CachedResponseStateEnum.js';
-import IHeaders from '../../types/IHeaders.js';
+import Headers from '../../Headers.js';
 
 export default interface ICachedResponse {
 	/** Response. */
@@ -7,14 +7,14 @@ export default interface ICachedResponse {
 		status: number;
 		statusText: string;
 		url: string;
-		headers: IHeaders;
+		headers: Headers;
 		// We need to wait for the body to be populated if set to "true".
 		waitingForBody: boolean;
 		body: Buffer | null;
 	};
 	/** Request. */
 	request: {
-		headers: IHeaders;
+		headers: Headers;
 		method: string;
 	};
 	/** Cache update time in milliseconds. */

package/src/fetch/types/IHeadersInit.ts

@@ -1,5 +1,5 @@
-import IHeaders from './IHeaders.js';
+import Headers from '../Headers.js';
 
-type IHeadersInit = string[][] | { [key: string]: string } | IHeaders;
+type IHeadersInit = string[][] | { [key: string]: string } | Headers;
 
 export default IHeadersInit;

package/src/fetch/types/IRequestInfo.ts

@@ -1,6 +1,6 @@
 import URL from '../../url/URL.js';
-import IRequest from './IRequest.js';
+import Request from '../Request.js';
 
-type IRequestInfo = IRequest | string | URL;
+type IRequestInfo = Request | string | URL;
 
 export default IRequestInfo;

package/src/fetch/types/ISyncResponse.ts

@@ -1,4 +1,4 @@
-import IHeaders from './IHeaders.js';
+import Headers from '../Headers.js';
 
 /**
  * Fetch response.
@@ -11,6 +11,6 @@ export default interface ISyncResponse {
 	ok: boolean;
 	url: string;
 	redirected: boolean;
-	headers: IHeaders;
+	headers: Headers;
 	body: Buffer;
 }

package/src/fetch/utilities/FetchRequestHeaderUtility.ts

@@ -1,10 +1,9 @@
 import IBrowserFrame from '../../browser/types/IBrowserFrame.js';
 import * as PropertySymbol from '../../PropertySymbol.js';
-import IBrowserWindow from '../../window/IBrowserWindow.js';
+import BrowserWindow from '../../window/BrowserWindow.js';
 import CookieStringUtility from '../../cookie/urilities/CookieStringUtility.js';
 import Headers from '../Headers.js';
 import Request from '../Request.js';
-import IHeaders from '../types/IHeaders.js';
 import FetchCORSUtility from './FetchCORSUtility.js';
 import { URL } from 'url';
 
@@ -41,7 +40,7 @@ export default class FetchRequestHeaderUtility {
 	 *
 	 * @param headers Headers.
 	 */
-	public static removeForbiddenHeaders(headers: IHeaders): void {
+	public static removeForbiddenHeaders(headers: Headers): void {
 		for (const key of Object.keys((<Headers>headers)[PropertySymbol.entries])) {
 			if (
 				FORBIDDEN_HEADER_NAMES.includes(key) ||
@@ -74,7 +73,7 @@ export default class FetchRequestHeaderUtility {
 	 */
 	public static getRequestHeaders(options: {
 		browserFrame: IBrowserFrame;
-		window: IBrowserWindow;
+		window: BrowserWindow;
 		request: Request;
 	}): { [key: string]: string } {
 		const headers = new Headers(options.request.headers);

package/src/fetch/utilities/FetchRequestReferrerUtility.ts

@@ -1,6 +1,6 @@
 import URL from '../../url/URL.js';
 import * as PropertySymbol from '../../PropertySymbol.js';
-import IBrowserWindow from '../../window/IBrowserWindow.js';
+import BrowserWindow from '../../window/BrowserWindow.js';
 import { isIP } from 'net';
 import Headers from '../Headers.js';
 import IRequestReferrerPolicy from '../types/IRequestReferrerPolicy.js';
@@ -49,7 +49,7 @@ export default class FetchRequestReferrerUtility {
 	 * @returns Initial referrer.
 	 */
 	public static getInitialReferrer(
-		window: IBrowserWindow,
+		window: BrowserWindow,
 		referrer: '' | 'no-referrer' | 'client' | string | URL
 	): '' | 'no-referrer' | 'client' | URL {
 		if (referrer === '' || referrer === 'no-referrer' || referrer === 'client') {

package/src/file/Blob.ts

@@ -1,4 +1,3 @@
-import IBlob from './IBlob.js';
 import { Buffer } from 'buffer';
 import * as PropertySymbol from '../PropertySymbol.js';
 
@@ -9,7 +8,7 @@ import * as PropertySymbol from '../PropertySymbol.js';
  * Based on:
  * https://github.com/jsdom/jsdom/blob/master/lib/jsdom/living/file-api/Blob-impl.js (MIT licensed).
  */
-export default class Blob implements IBlob {
+export default class Blob {
 	public readonly type: string = '';
 	public [PropertySymbol.buffer]: Buffer = null;
 

package/src/file/FileReader.ts

@@ -1,6 +1,6 @@
 import WhatwgMIMEType from 'whatwg-mimetype';
 import * as PropertySymbol from '../PropertySymbol.js';
-import IBrowserWindow from '../window/IBrowserWindow.js';
+import BrowserWindow from '../window/BrowserWindow.js';
 import ProgressEvent from '../event/events/ProgressEvent.js';
 import DOMException from '../exception/DOMException.js';
 import DOMExceptionNameEnum from '../exception/DOMExceptionNameEnum.js';
@@ -31,14 +31,14 @@ export default class FileReader extends EventTarget {
 	#isTerminated = false;
 	#loadTimeout: NodeJS.Timeout | null = null;
 	#parseTimeout: NodeJS.Timeout | null = null;
-	readonly #window: IBrowserWindow;
+	readonly #window: BrowserWindow;
 
 	/**
 	 * Constructor.
 	 *
 	 * @param window Window.
 	 */
-	constructor(window: IBrowserWindow) {
+	constructor(window: BrowserWindow) {
 		super();
 		this.#window = window;
 	}

package/src/form-data/FormData.ts

@@ -1,8 +1,8 @@
 import Blob from '../file/Blob.js';
 import * as PropertySymbol from '../PropertySymbol.js';
 import File from '../file/File.js';
-import IHTMLInputElement from '../nodes/html-input-element/IHTMLInputElement.js';
-import IHTMLFormElement from '../nodes/html-form-element/IHTMLFormElement.js';
+import HTMLInputElement from '../nodes/html-input-element/HTMLInputElement.js';
+import HTMLFormElement from '../nodes/html-form-element/HTMLFormElement.js';
 import HTMLFormControlsCollection from '../nodes/html-form-element/HTMLFormControlsCollection.js';
 import RadioNodeList from '../nodes/html-form-element/RadioNodeList.js';
 
@@ -26,7 +26,7 @@ export default class FormData implements Iterable<[string, string | File]> {
 	 *
 	 * @param [form] Form.
 	 */
-	constructor(form?: IHTMLFormElement) {
+	constructor(form?: HTMLFormElement) {
 		if (form) {
 			for (const name of Object.keys(
 				(<HTMLFormControlsCollection>form[PropertySymbol.elements])[PropertySymbol.namedItems]
@@ -41,7 +41,7 @@ export default class FormData implements Iterable<[string, string | File]> {
 				) {
 					const newRadioNodeList = new RadioNodeList();
 					for (const node of radioNodeList) {
-						if (node.checked) {
+						if ((<HTMLInputElement>node).checked) {
 							newRadioNodeList.push(node);
 							break;
 						}
@@ -52,10 +52,10 @@ export default class FormData implements Iterable<[string, string | File]> {
 				for (const node of radioNodeList) {
 					if (node.name && SUBMITTABLE_ELEMENTS.includes(node[PropertySymbol.tagName])) {
 						if (node[PropertySymbol.tagName] === 'INPUT' && node.type === 'file') {
-							if ((<IHTMLInputElement>node)[PropertySymbol.files].length === 0) {
+							if ((<HTMLInputElement>node)[PropertySymbol.files].length === 0) {
 								this.append(node.name, new File([], '', { type: 'application/octet-stream' }));
 							} else {
-								for (const file of (<IHTMLInputElement>node)[PropertySymbol.files]) {
+								for (const file of (<HTMLInputElement>node)[PropertySymbol.files]) {
 									this.append(node.name, file);
 								}
 							}