happy-dom 16.2.9 → 16.4.0

package/src/fetch/SyncFetch.ts

@@ -20,6 +20,7 @@ import Zlib from 'zlib';
 import FetchResponseRedirectUtility from './utilities/FetchResponseRedirectUtility.js';
 import FetchCORSUtility from './utilities/FetchCORSUtility.js';
 import Fetch from './Fetch.js';
+import IFetchInterceptor from './types/IFetchInterceptor.js';
 
 interface ISyncHTTPResponse {
 	error: string;
@@ -39,6 +40,7 @@ export default class SyncFetch {
 	private redirectCount = 0;
 	private disableCache: boolean;
 	private disableSameOriginPolicy: boolean;
+	private interceptor?: IFetchInterceptor;
 	#browserFrame: IBrowserFrame;
 	#window: BrowserWindow;
 	#unfilteredHeaders: Headers | null = null;
@@ -84,6 +86,7 @@ export default class SyncFetch {
 			options.disableSameOriginPolicy ??
 			this.#browserFrame.page.context.browser.settings.fetch.disableSameOriginPolicy ??
 			false;
+		this.interceptor = this.#browserFrame.page.context.browser.settings.fetch.interceptor;
 	}
 
 	/**
@@ -93,6 +96,15 @@ export default class SyncFetch {
 	 */
 	public send(): ISyncResponse {
 		FetchRequestReferrerUtility.prepareRequest(new URL(this.#window.location.href), this.request);
+		const beforeRequestResponse = this.interceptor?.beforeSyncRequest
+			? this.interceptor.beforeSyncRequest({
+					request: this.request,
+					window: this.#window
+				})
+			: undefined;
+		if (typeof beforeRequestResponse === 'object') {
+			return beforeRequestResponse;
+		}
 		FetchRequestValidationUtility.validateSchema(this.request);
 
 		if (this.request.signal.aborted) {
@@ -104,7 +116,7 @@ export default class SyncFetch {
 
 		if (this.request[PropertySymbol.url].protocol === 'data:') {
 			const result = DataURIParser.parse(this.request.url);
-			return {
+			const response = {
 				status: 200,
 				statusText: 'OK',
 				ok: true,
@@ -113,6 +125,14 @@ export default class SyncFetch {
 				headers: new Headers({ 'Content-Type': result.type }),
 				body: result.buffer
 			};
+			const interceptedResponse = this.interceptor?.afterSyncResponse
+				? this.interceptor.afterSyncResponse({
+						window: this.#window,
+						response,
+						request: this.request
+					})
+				: undefined;
+			return typeof interceptedResponse === 'object' ? interceptedResponse : response;
 		}
 
 		// Security check for "https" to "http" requests.
@@ -416,7 +436,14 @@ export default class SyncFetch {
 			});
 		}
 
-		return redirectedResponse;
+		const interceptedResponse = this.interceptor?.afterSyncResponse
+			? this.interceptor.afterSyncResponse({
+					window: this.#window,
+					response: redirectedResponse,
+					request: this.request
+				})
+			: undefined;
+		return typeof interceptedResponse === 'object' ? interceptedResponse : redirectedResponse;
 	}
 
 	/**

package/src/fetch/types/IFetchInterceptor.ts

@@ -0,0 +1,60 @@
+import Request from '../Request.js';
+import BrowserWindow from '../../window/BrowserWindow.js';
+import Response from '../Response.js';
+import ISyncResponse from './ISyncResponse.js';
+
+export default interface IFetchInterceptor {
+	/**
+	 * Hook dispatched before making an async request.
+	 * It can be used for modifying the request, providing a response without making a request or for logging.
+	 *
+	 * @param context Contains the request and the window from where the request was made.
+	 *
+	 * @returns Promise that can resolve to a response to be used instead of sending out the response.
+	 */
+	beforeAsyncRequest?: (context: {
+		request: Request;
+		window: BrowserWindow;
+	}) => Promise<Response | void>;
+
+	/**
+	 * Hook dispatched before making an sync request.
+	 * It can be used for modifying the request, providing a response without making a request or for logging.
+	 *
+	 * @param context Contains the request and the window from where the request was made.
+	 *
+	 * @returns Promise that can resolve to a response to be used instead of sending out the response.
+	 */
+	beforeSyncRequest?: (context: {
+		request: Request;
+		window: BrowserWindow;
+	}) => ISyncResponse | void;
+
+	/**
+	 * Hook dispatched after receiving an async response.
+	 * It can be used for modifying or replacing the response and logging.
+	 *
+	 * @param context Contains the request, response and the window from where the request was made.
+	 *
+	 * @returns Promise that can resolve to a response to be used instead of sending out the response.
+	 */
+	afterAsyncResponse?: (context: {
+		request: Request;
+		response: Response;
+		window: BrowserWindow;
+	}) => Promise<Response | void>;
+
+	/**
+	 * Hook dispatched after receiving a sync response.
+	 * It can be used for modifying or replacing the response and logging
+	 *
+	 * @param context Contains the request, response and the window from where the request was made.
+	 *
+	 * @returns Promise that can resolve to a response to be used instead of sending out the response.
+	 */
+	afterSyncResponse?: (context: {
+		request: Request;
+		response: ISyncResponse;
+		window: BrowserWindow;
+	}) => ISyncResponse | void;
+}

package/src/index.ts

@@ -57,6 +57,8 @@ import AbortSignal from './fetch/AbortSignal.js';
 import Headers from './fetch/Headers.js';
 import Request from './fetch/Request.js';
 import Response from './fetch/Response.js';
+import IFetchInterceptor from './fetch/types/IFetchInterceptor.js';
+import ISyncResponse from './fetch/types/ISyncResponse.js';
 import Blob from './file/Blob.js';
 import File from './file/File.js';
 import FileReader from './file/FileReader.js';
@@ -206,6 +208,8 @@ import type ITouchEventInit from './event/events/ITouchEventInit.js';
 import type IWheelEventInit from './event/events/IWheelEventInit.js';
 
 export type {
+	IFetchInterceptor,
+	ISyncResponse,
 	IAnimationEventInit,
 	IBrowser,
 	IBrowserContext,

package/src/query-selector/SelectorItem.ts

@@ -340,6 +340,16 @@ export default class SelectorItem {
 							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);

package/src/query-selector/SelectorParser.ts

@@ -277,6 +277,10 @@ export default class SelectorParser {
 	): ISelectorPseudo {
 		const lowerName = name.toLowerCase();
 
+		if (args) {
+			args = args.trim();
+		}
+
 		if (!args) {
 			return { name: lowerName, arguments: null, selectorItems: null, nthFunction: null };
 		}
@@ -328,10 +332,13 @@ export default class SelectorParser {
 
 				// The ":has()" pseudo selector doesn't allow for it to be nested inside another ":has()" pseudo selector, as it can lead to cyclic querying.
 				if (!args.includes(':has(')) {
-					for (const group of this.getSelectorGroups(
-						args[0] === '+' ? args.replace('+', '') : args,
-						options
-					)) {
+					let newArgs = args;
+					if (args[0] === '+') {
+						newArgs = args.replace('+', '');
+					} else if (args[0] === '>') {
+						newArgs = args.replace('>', '');
+					}
+					for (const group of this.getSelectorGroups(newArgs, options)) {
 						hasSelectorItems.push(group[0]);
 					}
 				}