@depup/msw 3.0.2-depup.0 → 3.0.3-depup.0

package/lib/iife/index.js

@@ -35,8 +35,9 @@ var MockServiceWorker = (function(exports) {
 		/**
 		* Release the resources held by this handler.
 		*
-		* @note This method is invoked automatically when the network is
-		* disabled (e.g. `server.close()`). Override it in the handlers that
+		* @note This method is invoked automatically when the handler leaves
+		* the network: when the network is disabled (e.g. `server.close()`)
+		* or when a reset removes it (e.g. `server.resetHandlers()`). Override it in the handlers that
 		* hold onto anything beyond a single frame, like timers, connections,
 		* or event listeners. Returning a promise makes the network await
 		* this handler's disposal before it tears itself down.
@@ -30069,16 +30070,26 @@ accept: "msw/passthrough" },
 		}
 		reset(nextHandlers) {
 			invariant$1(nextHandlers.length > 0 ? this.#validateHandlers(nextHandlers) : true, devUtils.formatMessage("Failed to replace initial handlers during reset: invalid handlers. Did you forget to spread the handlers array?"));
-			for (const handler of this.currentHandlers()) handler.reset();
 			const { initialHandlers } = this.getState();
+			const nextInitialHandlers = nextHandlers.length > 0 ? groupHandlersByKind(nextHandlers) : initialHandlers;
+			const currentHandlers = new Set(this.currentHandlers());
+			const nextHandlersSet = new Set(Object.values(nextInitialHandlers).flat().filter(Boolean));
+			for (const handler of currentHandlers.intersection(nextHandlersSet)) handler.reset();
+			for (const handler of currentHandlers.difference(nextHandlersSet)) try {
+				const disposal = handler.dispose();
+				if (disposal instanceof Promise) disposal.catch((error) => {
+					this.#printDisposalError(handler, error);
+				});
+			} catch (error) {
+				this.#printDisposalError(handler, error);
+			}
 			if (nextHandlers.length === 0) {
 				this.setState({ handlers: { ...initialHandlers } });
 				return;
 			}
-			const normalizedNextHandlers = groupHandlersByKind(nextHandlers);
 			this.setState({
-				initialHandlers: normalizedNextHandlers,
-				handlers: { ...normalizedNextHandlers }
+				initialHandlers: nextInitialHandlers,
+				handlers: { ...nextInitialHandlers }
 			});
 		}
 		restore() {
@@ -30095,6 +30106,9 @@ accept: "msw/passthrough" },
 		#validateHandlers(handlers) {
 			return handlers.every((handler) => !Array.isArray(handler));
 		}
+		#printDisposalError(handler, error) {
+			devUtils.error("Failed to dispose of \"%s\" handler removed during reset. Please see the original error below.\n%s", handler.kind, error);
+		}
 	};
 	var InMemoryHandlersController = class extends HandlersController {
 		#handlers;
@@ -30221,7 +30235,7 @@ accept: "msw/passthrough" },
 						const handlers = frame.getHandlers(handlersController);
 						await frame.resolve(handlers, resolvedOptions.onUnhandledFrame || "warn", resolvedOptions.context);
 					});
-					return source.enable();
+					return source.enable(resolvedOptions.context);
 				}));
 			},
 			disable() {
@@ -30954,6 +30968,10 @@ Learn more about creating the Service Worker script: https://mswjs.io/docs/cli/i
 		}
 		#options;
 		/**
+		* The resolved context of the network this source was last enabled with.
+		*/
+		#context;
+		/**
 		* @note We cannot use `WeakMap` here as request/response
 		* identity cannot be preserved through the client-worker channel.
 		*/
@@ -30975,7 +30993,8 @@ Learn more about creating the Service Worker script: https://mswjs.io/docs/cli/i
 			this.#workerState = "pending";
 			this.#channel = new WorkerChannel({ getWorker: () => this.workerPromise.then(([worker]) => worker) });
 		}
-		async enable() {
+		async enable(context) {
+			this.#context = context;
 			this.#channel.removeAllListeners();
 			this.#frames.clear();
 			this.#listenerController = new AbortController();
@@ -30996,7 +31015,7 @@ Learn more about creating the Service Worker script: https://mswjs.io/docs/cli/i
 				clientConfirmationPromise.resolve(event.data.client);
 			});
 			await clientConfirmationPromise.promise;
-			if (!this.#options.quiet) this.#printStartMessage();
+			if (!this.#context?.quiet) this.#printStartMessage();
 			return registration;
 		}
 		async disable() {
@@ -31018,7 +31037,7 @@ Learn more about creating the Service Worker script: https://mswjs.io/docs/cli/i
 			* worker forwards after `stop()` can be answered with `PASSTHROUGH` by
 			* `#handleRequest`. `#startWorker` swaps in a fresh deferred on re-enable.
 			*/
-			if (!this.#options.quiet) this.#printStopMessage();
+			if (!this.#context?.quiet) this.#printStopMessage();
 		}
 		/**
 		* Terminal teardown. Unregisters the Service Worker, tears down the channel,
@@ -31085,7 +31104,7 @@ Please consider using a custom "serviceWorker.url" option to point to the actual
 			this.#keepAliveInterval = window.setInterval(() => {
 				this.#channel.postMessage("KEEPALIVE_REQUEST");
 			}, 5e3);
-			if (!this.#options.quiet) validateWorkerScope(registration);
+			if (!this.#context?.quiet) validateWorkerScope(registration);
 			return [worker, registration];
 		}
 		async #handleRequest(event) {
@@ -32523,18 +32542,21 @@ You can also automate this process and make the worker script update automatical
 	//#endregion
 	//#region src/browser/sources/fallback-http-source.ts
 	var FallbackHttpSource = class extends InterceptorSource {
-		options;
-		constructor(options) {
+		/**
+		* The resolved context of the network this source was last enabled with.
+		*/
+		#context;
+		constructor() {
 			super({ interceptors: [new XMLHttpRequestInterceptor(), new FetchInterceptor()] });
-			this.options = options;
 		}
-		enable() {
+		enable(context) {
+			this.#context = context;
 			super.enable();
-			if (!this.options.quiet) this.#printStartMessage();
+			if (!this.#context?.quiet) this.#printStartMessage();
 		}
 		disable() {
 			super.disable();
-			if (!this.options.quiet) this.#printStopMessage();
+			if (!this.#context?.quiet) this.#printStopMessage();
 		}
 		#printStartMessage() {
 			console.groupCollapsed(`%c${devUtils.formatMessage("Mocking enabled (fallback mode).")}`, "color:orangered;font-weight:bold;");
@@ -32572,9 +32594,8 @@ You can also automate this process and make the worker script update automatical
 						url: options?.serviceWorker?.url?.toString() || DEFAULT_WORKER_URL,
 						options: options?.serviceWorker?.options
 					},
-					findWorker: options?.findWorker,
-					quiet: options?.quiet
-				}) : new FallbackHttpSource({ quiet: options?.quiet });
+					findWorker: options?.findWorker
+				}) : new FallbackHttpSource();
 				network.configure({
 					sources: [httpSource, new InterceptorSource({ interceptors: [new WebSocketInterceptor()] })],
 					onUnhandledFrame: options?.onUnhandledFrame ?? "warn",
@@ -32601,7 +32622,7 @@ You can also automate this process and make the worker script update automatical
 	//#region src/browser/default-network-options.ts
 	function createDefaultNetworkOptions(workerUrl = "/mockServiceWorker.js") {
 		return {
-			sources: [supportsServiceWorker() ? new ServiceWorkerSource({ serviceWorker: { url: workerUrl } }) : new FallbackHttpSource({}), new InterceptorSource({ interceptors: [new WebSocketInterceptor()] })],
+			sources: [supportsServiceWorker() ? new ServiceWorkerSource({ serviceWorker: { url: workerUrl } }) : new FallbackHttpSource(), new InterceptorSource({ interceptors: [new WebSocketInterceptor()] })],
 			onUnhandledFrame: "warn"
 		};
 	}
@@ -35301,23 +35322,26 @@ Consider naming this operation or using the "operation()" request handler of "gr
 			this.#endSubscription(connection, args.subscriptionId);
 		}
 		/**
-		* Drop this transport's subscribers and active subscriptions from the
-		* sessions it participates in. The sessions themselves are left intact:
-		* they are shared with the other transports of the same connection and
-		* own the protocol listeners for as long as the client stays connected.
+		* Remove the given handler from the subscribers of every session
+		* this transport participates in. The handler no longer matches
+		* subscriptions on the connections opened while it was registered.
+		*/
+		unsubscribe(handler) {
+			for (const connection of connections.values()) connection.subscribers.delete(handler);
+		}
+		/**
+		* End the active subscriptions of the sessions this transport
+		* participates in. The sessions and their subscribers are left intact:
+		* the handlers that survive the reset keep serving the connections
+		* opened before it, while the removed handlers unsubscribe themselves
+		* on disposal. The sessions own the protocol listeners for as long as
+		* the client stays connected.
 		*
 		* @note This method is invoked automatically when the handlers
 		* controller resets the handlers (e.g. `server.resetHandlers()`).
 		*/
 		reset() {
-			for (const connection of connections.values()) {
-				let ownsConnection = false;
-				for (const [handler, entry] of connection.subscribers) if (entry.transport === this) {
-					connection.subscribers.delete(handler);
-					ownsConnection = true;
-				}
-				if (ownsConnection) this.#endAllSubscriptions(connection);
-			}
+			for (const connection of connections.values()) if (Array.from(connection.subscribers.values()).some((entry) => entry.transport === this)) this.#endAllSubscriptions(connection);
 		}
 		/**
 		* Forget the sessions of this transport, ending their subscriptions.
@@ -35463,6 +35487,15 @@ Consider naming this operation or using the "operation()" request handler of "gr
 			this.isUsed = false;
 		}
 		/**
+		* Stop serving the connections this handler was bound to.
+		* @note This method is invoked automatically when the handler
+		* is removed from the network, either by resetting the handlers
+		* (e.g. `server.resetHandlers()`) or by disabling the network.
+		*/
+		dispose() {
+			this.#transport.unsubscribe(this);
+		}
+		/**
 		* @note Individual subscription handlers stay silent. The subscription
 		* transport owns the GraphQL-aware logging for the entire connection
 		* (a logger is attached once per matching handler otherwise).