msw 3.0.4 → 3.0.5

package/lib/iife/index.js

@@ -673,7 +673,7 @@ var MockServiceWorker = (function(exports) {
 		}
 	};
 	//#endregion
-	//#region node_modules/.pnpm/@mswjs+interceptors@0.45.6_supports-color@8.1.1/node_modules/@mswjs/interceptors/lib/browser/create-request-id-YobUnJNO.js
+	//#region node_modules/.pnpm/@mswjs+interceptors@0.45.11_supports-color@8.1.1/node_modules/@mswjs/interceptors/lib/browser/create-request-id-YobUnJNO.js
 	var __create = Object.create;
 	var __defProp = Object.defineProperty;
 	var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -1379,7 +1379,7 @@ var MockServiceWorker = (function(exports) {
 		return Math.random().toString(16).slice(2);
 	}
 	//#endregion
-	//#region node_modules/.pnpm/@mswjs+interceptors@0.45.6_supports-color@8.1.1/node_modules/@mswjs/interceptors/lib/browser/fetch-utils-C6P6gLLo.js
+	//#region node_modules/.pnpm/@mswjs+interceptors@0.45.11_supports-color@8.1.1/node_modules/@mswjs/interceptors/lib/browser/fetch-utils-C6P6gLLo.js
 	var InterceptorError = class InterceptorError extends Error {
 		constructor(message) {
 			super(message);
@@ -1786,7 +1786,7 @@ var MockServiceWorker = (function(exports) {
 		}
 	};
 	//#endregion
-	//#region node_modules/.pnpm/@mswjs+interceptors@0.45.6_supports-color@8.1.1/node_modules/@mswjs/interceptors/lib/browser/buffer-utils-DJj7YzLG.js
+	//#region node_modules/.pnpm/@mswjs+interceptors@0.45.11_supports-color@8.1.1/node_modules/@mswjs/interceptors/lib/browser/buffer-utils-DJj7YzLG.js
 	const encoder = new TextEncoder();
 	function encodeBuffer(text) {
 		return encoder.encode(text);
@@ -1803,7 +1803,7 @@ var MockServiceWorker = (function(exports) {
 		return array.buffer.slice(array.byteOffset, array.byteOffset + array.byteLength);
 	}
 	//#endregion
-	//#region node_modules/.pnpm/@mswjs+interceptors@0.45.6_supports-color@8.1.1/node_modules/@mswjs/interceptors/lib/browser/resolve-web-socket-url-CSvNPLGi.js
+	//#region node_modules/.pnpm/@mswjs+interceptors@0.45.11_supports-color@8.1.1/node_modules/@mswjs/interceptors/lib/browser/resolve-web-socket-url-CSvNPLGi.js
 	/**
 	* Resolve potentially relative WebSocket URLs the same way
 	* the browser does (replace the protocol, use the origin, etc).
@@ -1825,7 +1825,7 @@ var MockServiceWorker = (function(exports) {
 		return url.href;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/@mswjs+interceptors@0.45.6_supports-color@8.1.1/node_modules/@mswjs/interceptors/lib/browser/index.js
+	//#region node_modules/.pnpm/@mswjs+interceptors@0.45.11_supports-color@8.1.1/node_modules/@mswjs/interceptors/lib/browser/index.js
 	function addEventBridge(interceptor, type, listener) {
 		interceptor.on(type, listener);
 	}
@@ -27473,7 +27473,7 @@ var MockServiceWorker = (function(exports) {
 		options: createHttpHandler("OPTIONS")
 	};
 	//#endregion
-	//#region node_modules/.pnpm/@mswjs+interceptors@0.45.6_supports-color@8.1.1/node_modules/@mswjs/interceptors/lib/browser/has-configurable-global-Cew-dYqk.js
+	//#region node_modules/.pnpm/@mswjs+interceptors@0.45.11_supports-color@8.1.1/node_modules/@mswjs/interceptors/lib/browser/has-configurable-global-Cew-dYqk.js
 	var PatchesRegistry = class {
 		#replacements = /* @__PURE__ */ new Map();
 		applyPatch(owner, key, getNextValue) {
@@ -27561,7 +27561,7 @@ var MockServiceWorker = (function(exports) {
 		return true;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/@mswjs+interceptors@0.45.6_supports-color@8.1.1/node_modules/@mswjs/interceptors/lib/browser/interceptors/WebSocket/index.js
+	//#region node_modules/.pnpm/@mswjs+interceptors@0.45.11_supports-color@8.1.1/node_modules/@mswjs/interceptors/lib/browser/interceptors/WebSocket/index.js
 	var WebSocketConnectionEvent$2 = class extends TypedEvent {
 		constructor(data) {
 			super("connection", { data });
@@ -30386,6 +30386,17 @@ accept: "msw/passthrough" },
 			this.request = data.request;
 		}
 	};
+	var RequestMatchEvent = class extends TypedEvent {
+		requestId;
+		request;
+		handler;
+		constructor(type, data) {
+			super(...[type, {}]);
+			this.requestId = data.requestId;
+			this.request = data.request;
+			this.handler = data.handler;
+		}
+	};
 	var ResponseEvent = class extends TypedEvent {
 		requestId;
 		request;
@@ -30495,9 +30506,10 @@ accept: "msw/passthrough" },
 				return false;
 			}
 			const { response, handler, parsedResult } = lookupResult;
-			this.events.emit(new RequestEvent("request:match", {
+			this.events.emit(new RequestMatchEvent("request:match", {
 				requestId,
-				request
+				request,
+				handler
 			}));
 			if (response == null) {
 				this.events.emit(new RequestEvent("request:end", {
@@ -31279,7 +31291,7 @@ You can also automate this process and make the worker script update automatical
 		}
 	}
 	//#endregion
-	//#region node_modules/.pnpm/@mswjs+interceptors@0.45.6_supports-color@8.1.1/node_modules/@mswjs/interceptors/lib/browser/handle-request-y7ajyve5.js
+	//#region node_modules/.pnpm/@mswjs+interceptors@0.45.11_supports-color@8.1.1/node_modules/@mswjs/interceptors/lib/browser/handle-request-0FGy-JT2.js
 	var HttpRequestEvent = class extends TypedEvent {
 		constructor(data) {
 			super(...["request", {}]);
@@ -31392,7 +31404,12 @@ You can also automate this process and make the worker script update automatical
 		});
 		options.request.signal?.removeEventListener("abort", onAbort);
 		if (isRequestAborted) {
-			await options.controller.errorWith(requestAbortReason);
+			/**
+			* @note The abort can land after a listener has already handled the
+			* request (e.g. responded to it) but before that is observed here.
+			* The controller state is final by then, so the abort is a no-op.
+			*/
+			if (options.controller.readyState === RequestController.PENDING) options.controller.errorWith(requestAbortReason);
 			return;
 		}
 		if (resultError) {
@@ -31435,7 +31452,7 @@ You can also automate this process and make the worker script update automatical
 		return options.controller.handled;
 	}
 	//#endregion
-	//#region node_modules/.pnpm/@mswjs+interceptors@0.45.6_supports-color@8.1.1/node_modules/@mswjs/interceptors/lib/browser/web-CCLERSZF.js
+	//#region node_modules/.pnpm/@mswjs+interceptors@0.45.11_supports-color@8.1.1/node_modules/@mswjs/interceptors/lib/browser/web-Br-3dIB5.js
 	function createNetworkError(cause) {
 		return Object.assign(/* @__PURE__ */ new TypeError("Failed to fetch"), { cause });
 	}
@@ -31748,7 +31765,7 @@ You can also automate this process and make the worker script update automatical
 		}
 	};
 	//#endregion
-	//#region node_modules/.pnpm/@mswjs+interceptors@0.45.6_supports-color@8.1.1/node_modules/@mswjs/interceptors/lib/browser/web-BRBQ3YPp.js
+	//#region node_modules/.pnpm/@mswjs+interceptors@0.45.11_supports-color@8.1.1/node_modules/@mswjs/interceptors/lib/browser/web-CL5gOWPS.js
 	/**
 	* Concatenate two `Uint8Array` buffers.
 	*/
@@ -31959,6 +31976,7 @@ You can also automate this process and make the worker script update automatical
 			this.requestId = createRequestId();
 			this.requestHeaders = new Headers();
 			this.responseBuffer = /* @__PURE__ */ new Uint8Array();
+			this.requestAbortController = new AbortController();
 			this.request = createProxy(initialRequest, { methodCall: ([methodName, args], invoke) => {
 				switch (methodName) {
 					case "open": {
@@ -32012,7 +32030,13 @@ You can also automate this process and make the worker script update automatical
 							}
 						});
 						const requestBody = typeof body === "string" ? encodeBuffer(body) : body;
-						const fetchRequest = this.toFetchApiRequest(requestBody);
+						/**
+						* @note Create a new abort controller per request so that
+						* calling `.abort()` aborts the pending request handling
+						* and the mocked response delivery of this request only.
+						*/
+						this.requestAbortController = new AbortController();
+						const fetchRequest = this.toFetchApiRequest(requestBody, this.requestAbortController.signal);
 						this[kFetchRequest] = fetchRequest.clone();
 						/**
 						* @note Start request handling on the next tick so that the user
@@ -32031,6 +32055,10 @@ You can also automate this process and make the worker script update automatical
 						});
 						break;
 					}
+					case "abort":
+						this.logger.verbose("abort");
+						this.requestAbortController.abort();
+						return invoke();
 					default: return invoke();
 				}
 			} });
@@ -32042,7 +32070,7 @@ You can also automate this process and make the worker script update automatical
 					switch (propertyName) {
 						case "onloadstart":
 						case "onprogress":
-						case "onaboart":
+						case "onabort":
 						case "onerror":
 						case "onload":
 						case "ontimeout":
@@ -32155,39 +32183,27 @@ You can also automate this process and make the worker script update automatical
 				} else processRequestEndOfBody();
 			}
 			let timedOut = false;
-			const responseReadController = new AbortController();
-			const requestErrorSteps = (event) => {
-				this.setReadyState(this.request.DONE);
-				if (!uploadComplete) {
-					this.trigger(event, this.request.upload, {
-						loaded: 0,
-						total: 0
-					});
-					this.trigger("loadend", this.request.upload, {
-						loaded: 0,
-						total: 0
-					});
-				}
-				this.trigger(event, this.request, {
-					loaded: 0,
-					total: 0
-				});
-				this.trigger("loadend", this.request, {
-					loaded: 0,
-					total: 0
-				});
-			};
+			const abortSignal = this.requestAbortController.signal;
 			const processResponse = async (response) => {
 				const handleErrors = () => {
-					if (timedOut) requestErrorSteps("timeout");
-					else if (responseReadController.signal.aborted) requestErrorSteps("abort");
-					else if (isResponseError(response)) requestErrorSteps("error");
+					if (timedOut) {
+						this.requestErrorSteps("timeout", uploadComplete);
+						return true;
+					}
+					if (abortSignal.aborted) {
+						this.requestErrorSteps("abort", uploadComplete);
+						return true;
+					}
+					if (isResponseError(response)) {
+						this.requestErrorSteps("error", uploadComplete);
+						return true;
+					}
+					return false;
 				};
-				handleErrors();
+				if (handleErrors()) return;
 				define(this.request, "status", response.status);
 				define(this.request, "statusText", response.statusText);
 				if (!this.request.responseURL) define(this.request, "responseURL", response.url);
-				if (isResponseError(response)) return;
 				/**
 				* @note The response body length is derived ONLY from the "content-length" header.
 				* If that response header is not set, the "total" in all progress events must be 0.
@@ -32210,11 +32226,10 @@ You can also automate this process and make the worker script update automatical
 					});
 				};
 				const processResponseBodyError = () => {
-					requestErrorSteps("error");
+					this.requestErrorSteps("error", uploadComplete);
 				};
 				const processResponseEndOfBody = async () => {
-					handleErrors();
-					if (isResponseError(response)) return;
+					if (handleErrors()) return;
 					let transmitted = receivedBytes;
 					this.setReadyState(this.request.DONE);
 					this.trigger("load", this.request, {
@@ -32230,7 +32245,10 @@ You can also automate this process and make the worker script update automatical
 				else {
 					const reader = response.body.getReader();
 					while (true) {
-						if (responseReadController.signal.aborted) break;
+						if (abortSignal.aborted) {
+							processResponseEndOfBody();
+							return;
+						}
 						try {
 							const { value, done } = await reader.read();
 							if (done) {
@@ -32253,7 +32271,7 @@ You can also automate this process and make the worker script update automatical
 			if (this.request.timeout) setTimeout(() => {
 				if (this.request.readyState !== this.request.DONE) {
 					timedOut = true;
-					responseReadController.abort();
+					this.requestAbortController.abort();
 				}
 			}, this.request.timeout);
 			this.request.getResponseHeader = new Proxy(this.request.getResponseHeader, { apply: (_, __, args) => {
@@ -32361,12 +32379,48 @@ You can also automate this process and make the worker script update automatical
 			* This prevents the controller from trying to perform this request as-is.
 			*/
 			this[kIsRequestHandled] = true;
+			if (this.requestAbortController.signal.aborted) {
+				this.logger.verbose("aborting the request");
+				this.requestErrorSteps("abort", false);
+				return;
+			}
 			this.logger.verbose("responding with an error");
 			this.setReadyState(this.request.DONE);
 			this.trigger("error", this.request);
 			this.trigger("loadend", this.request);
 		}
 		/**
+		* Run the request error steps for the given event.
+		* @see https://xhr.spec.whatwg.org/#request-error-steps
+		*/
+		requestErrorSteps(event, uploadComplete) {
+			this.setReadyState(this.request.DONE);
+			if (!uploadComplete) {
+				this.trigger(event, this.request.upload, {
+					loaded: 0,
+					total: 0
+				});
+				this.trigger("loadend", this.request.upload, {
+					loaded: 0,
+					total: 0
+				});
+			}
+			this.trigger(event, this.request, {
+				loaded: 0,
+				total: 0
+			});
+			this.trigger("loadend", this.request, {
+				loaded: 0,
+				total: 0
+			});
+			/**
+			* @note An aborted request ends up in the "UNSENT" state
+			* without dispatching another "readystatechange" event.
+			* @see https://xhr.spec.whatwg.org/#the-abort()-method
+			*/
+			if (event === "abort") this.setReadyState(this.request.UNSENT, false);
+		}
+		/**
 		* Transitions this request's `readyState` to the given one.
 		*/
 		setReadyState(nextReadyState, triggerReadyStateChangeEvent = true) {
@@ -32403,7 +32457,7 @@ You can also automate this process and make the worker script update automatical
 		/**
 		* Converts this `XMLHttpRequest` instance into a Fetch API `Request` instance.
 		*/
-		toFetchApiRequest(body) {
+		toFetchApiRequest(body, signal) {
 			this.logger.verbose("converting request to a Fetch API Request...");
 			const resolvedBody = body instanceof Document ? body.documentElement.innerText : body;
 			const fetchRequest = new FetchRequest(this.url.href, {
@@ -32413,7 +32467,8 @@ You can also automate this process and make the worker script update automatical
 				* @see https://xhr.spec.whatwg.org/#cross-origin-credentials
 				*/
 				credentials: this.request.withCredentials ? "include" : "same-origin",
-				body: resolvedBody
+				body: resolvedBody,
+				signal
 			});
 			const headers = fetchRequest.headers;
 			define(fetchRequest, "headers", createProxy(headers, { methodCall: ([methodName, args], invoke) => {