msw 2.13.4 → 2.13.6

package/lib/mockServiceWorker.js

@@ -7,7 +7,7 @@
  * - Please do NOT modify this file.
  */
 
-const PACKAGE_VERSION = '2.13.4'
+const PACKAGE_VERSION = '2.13.6'
 const INTEGRITY_CHECKSUM = '4db4a41e972cec1b64cc569c66952d82'
 const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
 const activeClientIds = new Set()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "msw",
-  "version": "2.13.4",
+  "version": "2.13.6",
   "description": "Seamless REST/GraphQL API mocking library for browser and Node.js.",
   "type": "commonjs",
   "main": "./lib/core/index.js",
@@ -286,7 +286,7 @@
     "vitest-environment-miniflare": "^2.14.4",
     "webpack": "^5.106.2",
     "webpack-http-server": "^0.5.0",
-    "msw": "^2.13.4"
+    "msw": "^2.13.6"
   },
   "peerDependencies": {
     "typescript": ">= 4.8.x"

package/src/browser/utils/deserializeRequest.ts

@@ -1,11 +1,12 @@
 import { pruneGetRequestBody } from './pruneGetRequestBody'
+import type { IncomingWorkerRequest } from './workerChannel'
 
 /**
  * Converts a given request received from the Service Worker
  * into a Fetch `Request` instance.
  */
 export function deserializeRequest(
-  serializedRequest: ServiceWorkerIncomingRequest,
+  serializedRequest: IncomingWorkerRequest,
 ): Request {
   return new Request(serializedRequest.url, {
     ...serializedRequest,

package/src/browser/utils/pruneGetRequestBody.ts

@@ -1,13 +1,13 @@
-import type { ServiceWorkerIncomingRequest } from '../glossary'
+import type { IncomingWorkerRequest } from './workerChannel'
 
-type Input = Pick<ServiceWorkerIncomingRequest, 'method' | 'body'>
+type Input = Pick<IncomingWorkerRequest, 'method' | 'body'>
 
 /**
  * Ensures that an empty GET request body is always represented as `undefined`.
  */
 export function pruneGetRequestBody(
   request: Input,
-): ServiceWorkerIncomingRequest['body'] {
+): IncomingWorkerRequest['body'] | undefined {
   // Force HEAD/GET request body to always be empty.
   // The worker reads any request's body as ArrayBuffer,
   // and you cannot re-construct a GET/HEAD Request

package/src/core/experimental/define-network.ts

@@ -47,8 +47,9 @@ export interface DefineNetworkOptions<
   onUnhandledFrame?: UnhandledFrameHandle
 }
 
-export interface NetworkApi<Sources extends Array<NetworkSource<any>>>
-  extends NetworkHandlersApi {
+export interface NetworkApi<
+  Sources extends Array<NetworkSource<any>>,
+> extends NetworkHandlersApi {
   readyState: NetworkReadyState
   /**
    * Enable the network interception and handling.
@@ -210,11 +211,7 @@ export function defineNetwork<Sources extends Array<NetworkSource<any>>>(
       handlersController.reset(handlers)
     },
     restoreHandlers() {
-      for (const handler of handlersController.currentHandlers()) {
-        if ('isUsed' in handler) {
-          handler.isUsed = false
-        }
-      }
+      handlersController.restore()
     },
     listHandlers() {
       return toReadonlyArray(handlersController.currentHandlers())

package/src/core/experimental/handlers-controller.ts

@@ -90,6 +90,12 @@ export abstract class HandlersController {
       ),
     )
 
+    for (const handler of this.currentHandlers()) {
+      if ('reset' in handler) {
+        handler['reset']()
+      }
+    }
+
     const { initialHandlers } = this.getState()
 
     if (nextHandlers.length === 0) {
@@ -108,6 +114,14 @@ export abstract class HandlersController {
     })
   }
 
+  public restore(): void {
+    for (const handler of this.currentHandlers()) {
+      if ('restore' in handler) {
+        handler['restore']()
+      }
+    }
+  }
+
   #validateHandlers(handlers: Array<AnyHandler>): boolean {
     return handlers.every((handler) => !Array.isArray(handler))
   }

package/src/core/experimental/setup-api.ts

@@ -42,11 +42,7 @@ export abstract class SetupApi<
   }
 
   public restoreHandlers(): void {
-    this.handlersController.currentHandlers().forEach((handler) => {
-      if ('isUsed' in handler) {
-        handler.isUsed = false
-      }
-    })
+    this.handlersController.restore()
   }
 
   public resetHandlers(...nextHandlers: Array<AnyHandler>): void {

package/src/core/handlers/RequestHandler.ts

@@ -171,6 +171,34 @@ export abstract class RequestHandler<
     this.isUsed = false
   }
 
+  /**
+   * Reset the runtime state accumulated during response resolution,
+   * such as generator iterator progress. Called when this handler is
+   * removed from the active handlers list so re-adding it later starts
+   * from a clean state.
+   */
+  protected reset(): void {
+    const iterator = this.resolverIterator
+    this.resolverIterator = undefined
+    this.resolverIteratorResult = undefined
+
+    if (typeof iterator?.return === 'function') {
+      void Promise.resolve(iterator.return())
+    }
+  }
+
+  /**
+   * Restore this handler so it can match requests again after being
+   * exhausted (e.g. via `{ once: true }`). Also clears any accumulated
+   * resolution state.
+   */
+  protected restore(): void {
+    if (this.options?.once) {
+      this.reset()
+      this.isUsed = false
+    }
+  }
+
   /**
    * Determine if the intercepted request should be mocked.
    */

package/src/core/handlers/WebSocketHandler.test.ts

@@ -125,3 +125,61 @@ describe('parse', () => {
     })
   })
 })
+
+describe('test', () => {
+  it('returns true for a matching string', () => {
+    expect(
+      new WebSocketHandler('ws://localhost/ws').test('ws://localhost/ws'),
+    ).toBe(true)
+  })
+
+  it('returns false for a non-matching string', () => {
+    expect(
+      new WebSocketHandler('ws://localhost/ws').test('ws://localhost/other'),
+    ).toBe(false)
+  })
+
+  it('returns true for a relative matching string', () => {
+    expect(
+      new WebSocketHandler('ws://localhost/ws').test('/ws', {
+        baseUrl: 'ws://localhost',
+      }),
+    ).toBe(true)
+  })
+
+  it('returns false for a relative non-matching string', () => {
+    expect(
+      new WebSocketHandler('ws://localhost/ws').test('/other', {
+        baseUrl: 'ws://localhost',
+      }),
+    ).toBe(false)
+  })
+
+  it('returns true for a matching URL', () => {
+    expect(
+      new WebSocketHandler('ws://localhost/ws').test(
+        new URL('ws://localhost/ws'),
+      ),
+    ).toBe(true)
+  })
+
+  it('returns false for a non-matching URL', () => {
+    expect(
+      new WebSocketHandler('ws://localhost/ws').test(
+        new URL('ws://localhost/other'),
+      ),
+    ).toBe(false)
+  })
+
+  it('returns true for a matching HTTP url string', () => {
+    expect(
+      new WebSocketHandler('ws://localhost/ws').test('http://localhost/ws'),
+    ).toBe(true)
+  })
+
+  it('returns false for a non-matching HTTP url string', () => {
+    expect(
+      new WebSocketHandler('ws://localhost/ws').test('http://localhost/other'),
+    ).toBe(false)
+  })
+})

package/src/core/handlers/WebSocketHandler.ts

@@ -57,7 +57,7 @@ export class WebSocketHandler {
   }
 
   public parse(args: {
-    url: URL
+    url: string | URL
     resolutionContext?: WebSocketResolutionContext
   }): WebSocketHandlerParsedResult {
     const clientUrl = new URL(args.url)
@@ -90,22 +90,26 @@ export class WebSocketHandler {
   }
 
   public predicate(args: {
-    url: URL
+    url: string | URL
     parsedResult: WebSocketHandlerParsedResult
   }): boolean {
     return args.parsedResult.match.matches
   }
 
+  public test(
+    url: string | URL,
+    resolutionContext?: WebSocketResolutionContext & { strict?: boolean },
+  ): boolean {
+    return this.#match(url, resolutionContext) != null
+  }
+
   public async run(
     connection: WebSocketConnectionData,
     resolutionContext?: WebSocketResolutionContext,
   ): Promise<WebSocketHandlerConnection | null> {
-    const parsedResult = this.parse({
-      url: connection.client.url,
-      resolutionContext,
-    })
+    const parsedResult = this.#match(connection.client.url, resolutionContext)
 
-    if (!this.predicate({ url: connection.client.url, parsedResult })) {
+    if (parsedResult == null) {
       return null
     }
 
@@ -125,6 +129,31 @@ export class WebSocketHandler {
     return resolvedConnection
   }
 
+  #match(
+    url: string | URL,
+    resolutionContext?: WebSocketResolutionContext & { strict?: boolean },
+  ): WebSocketHandlerParsedResult | null {
+    const resolvedUrl = this.#resolveWebSocketUrl(
+      url.toString(),
+      resolutionContext?.baseUrl,
+    )
+    const parsedResult = this.parse({
+      url: resolvedUrl,
+      resolutionContext,
+    })
+
+    if (
+      this.predicate({
+        url,
+        parsedResult,
+      })
+    ) {
+      return parsedResult
+    }
+
+    return null
+  }
+
   protected [kConnect](connection: WebSocketHandlerConnection): boolean {
     // Support `event.stopPropagation()` for various client/server events.
     connection.client.addEventListener(

package/lib/core/utils/internal/requestHandlerUtils.d.mts

@@ -1,12 +0,0 @@
-import { R as RequestHandler, s as RequestHandlerDefaultInfo, c as RequestHandlerOptions } from '../../HttpResponse-BF4NGRsf.mjs';
-import '@mswjs/interceptors';
-import './isIterable.mjs';
-import '../../typeUtils.mjs';
-import 'graphql';
-import '../matching/matchRequestUrl.mjs';
-
-declare function use(currentHandlers: Array<RequestHandler>, ...handlers: Array<RequestHandler>): void;
-declare function restoreHandlers(handlers: Array<RequestHandler>): void;
-declare function resetHandlers(initialHandlers: Array<RequestHandler>, ...nextHandlers: Array<RequestHandler>): RequestHandler<RequestHandlerDefaultInfo, any, any, RequestHandlerOptions>[];
-
-export { resetHandlers, restoreHandlers, use };

package/lib/core/utils/internal/requestHandlerUtils.d.ts

@@ -1,12 +0,0 @@
-import { R as RequestHandler, s as RequestHandlerDefaultInfo, c as RequestHandlerOptions } from '../../HttpResponse-yukpQS4a.js';
-import '@mswjs/interceptors';
-import './isIterable.js';
-import '../../typeUtils.js';
-import 'graphql';
-import '../matching/matchRequestUrl.js';
-
-declare function use(currentHandlers: Array<RequestHandler>, ...handlers: Array<RequestHandler>): void;
-declare function restoreHandlers(handlers: Array<RequestHandler>): void;
-declare function resetHandlers(initialHandlers: Array<RequestHandler>, ...nextHandlers: Array<RequestHandler>): RequestHandler<RequestHandlerDefaultInfo, any, any, RequestHandlerOptions>[];
-
-export { resetHandlers, restoreHandlers, use };

package/lib/core/utils/internal/requestHandlerUtils.js

@@ -1,37 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var requestHandlerUtils_exports = {};
-__export(requestHandlerUtils_exports, {
-  resetHandlers: () => resetHandlers,
-  restoreHandlers: () => restoreHandlers,
-  use: () => use
-});
-module.exports = __toCommonJS(requestHandlerUtils_exports);
-function use(currentHandlers, ...handlers) {
-  currentHandlers.unshift(...handlers);
-}
-function restoreHandlers(handlers) {
-  handlers.forEach((handler) => {
-    handler.isUsed = false;
-  });
-}
-function resetHandlers(initialHandlers, ...nextHandlers) {
-  return nextHandlers.length > 0 ? [...nextHandlers] : [...initialHandlers];
-}
-//# sourceMappingURL=requestHandlerUtils.js.map

package/lib/core/utils/internal/requestHandlerUtils.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../../src/core/utils/internal/requestHandlerUtils.ts"],"sourcesContent":["import type { RequestHandler } from '../../handlers/RequestHandler'\n\nexport function use(\n  currentHandlers: Array<RequestHandler>,\n  ...handlers: Array<RequestHandler>\n): void {\n  currentHandlers.unshift(...handlers)\n}\n\nexport function restoreHandlers(handlers: Array<RequestHandler>): void {\n  handlers.forEach((handler) => {\n    handler.isUsed = false\n  })\n}\n\nexport function resetHandlers(\n  initialHandlers: Array<RequestHandler>,\n  ...nextHandlers: Array<RequestHandler>\n) {\n  return nextHandlers.length > 0 ? [...nextHandlers] : [...initialHandlers]\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEO,SAAS,IACd,oBACG,UACG;AACN,kBAAgB,QAAQ,GAAG,QAAQ;AACrC;AAEO,SAAS,gBAAgB,UAAuC;AACrE,WAAS,QAAQ,CAAC,YAAY;AAC5B,YAAQ,SAAS;AAAA,EACnB,CAAC;AACH;AAEO,SAAS,cACd,oBACG,cACH;AACA,SAAO,aAAa,SAAS,IAAI,CAAC,GAAG,YAAY,IAAI,CAAC,GAAG,eAAe;AAC1E;","names":[]}

package/lib/core/utils/internal/requestHandlerUtils.mjs

@@ -1,17 +0,0 @@
-function use(currentHandlers, ...handlers) {
-  currentHandlers.unshift(...handlers);
-}
-function restoreHandlers(handlers) {
-  handlers.forEach((handler) => {
-    handler.isUsed = false;
-  });
-}
-function resetHandlers(initialHandlers, ...nextHandlers) {
-  return nextHandlers.length > 0 ? [...nextHandlers] : [...initialHandlers];
-}
-export {
-  resetHandlers,
-  restoreHandlers,
-  use
-};
-//# sourceMappingURL=requestHandlerUtils.mjs.map

package/lib/core/utils/internal/requestHandlerUtils.mjs.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../../src/core/utils/internal/requestHandlerUtils.ts"],"sourcesContent":["import type { RequestHandler } from '../../handlers/RequestHandler'\n\nexport function use(\n  currentHandlers: Array<RequestHandler>,\n  ...handlers: Array<RequestHandler>\n): void {\n  currentHandlers.unshift(...handlers)\n}\n\nexport function restoreHandlers(handlers: Array<RequestHandler>): void {\n  handlers.forEach((handler) => {\n    handler.isUsed = false\n  })\n}\n\nexport function resetHandlers(\n  initialHandlers: Array<RequestHandler>,\n  ...nextHandlers: Array<RequestHandler>\n) {\n  return nextHandlers.length > 0 ? [...nextHandlers] : [...initialHandlers]\n}\n"],"mappings":"AAEO,SAAS,IACd,oBACG,UACG;AACN,kBAAgB,QAAQ,GAAG,QAAQ;AACrC;AAEO,SAAS,gBAAgB,UAAuC;AACrE,WAAS,QAAQ,CAAC,YAAY;AAC5B,YAAQ,SAAS;AAAA,EACnB,CAAC;AACH;AAEO,SAAS,cACd,oBACG,cACH;AACA,SAAO,aAAa,SAAS,IAAI,CAAC,GAAG,YAAY,IAAI,CAAC,GAAG,eAAe;AAC1E;","names":[]}

package/src/core/utils/internal/requestHandlerUtils.ts

@@ -1,21 +0,0 @@
-import type { RequestHandler } from '../../handlers/RequestHandler'
-
-export function use(
-  currentHandlers: Array<RequestHandler>,
-  ...handlers: Array<RequestHandler>
-): void {
-  currentHandlers.unshift(...handlers)
-}
-
-export function restoreHandlers(handlers: Array<RequestHandler>): void {
-  handlers.forEach((handler) => {
-    handler.isUsed = false
-  })
-}
-
-export function resetHandlers(
-  initialHandlers: Array<RequestHandler>,
-  ...nextHandlers: Array<RequestHandler>
-) {
-  return nextHandlers.length > 0 ? [...nextHandlers] : [...initialHandlers]
-}