msw 2.0.8 → 2.0.9

package/lib/browser/index.js

@@ -209,14 +209,7 @@ var WorkerChannel = class {
   }
   postMessage(event, ...rest) {
     const [data, transfer] = rest;
-    this.port.postMessage(
-      { type: event, data },
-      {
-        // @ts-ignore ReadableStream can be transferred
-        // but TypeScript doesn't acknowledge that.
-        transfer
-      }
-    );
+    this.port.postMessage({ type: event, data }, { transfer });
   }
 };
 

package/lib/browser/index.mjs

@@ -185,14 +185,7 @@ var WorkerChannel = class {
   }
   postMessage(event, ...rest) {
     const [data, transfer] = rest;
-    this.port.postMessage(
-      { type: event, data },
-      {
-        // @ts-ignore ReadableStream can be transferred
-        // but TypeScript doesn't acknowledge that.
-        transfer
-      }
-    );
+    this.port.postMessage({ type: event, data }, { transfer });
   }
 };
 

package/lib/core/{GraphQLHandler-d4787f91.d.ts → GraphQLHandler-efb5b362.d.ts}

@@ -1,6 +1,6 @@
 import { OperationTypeNode, DocumentNode, GraphQLError } from 'graphql';
 import { g as RequestHandlerDefaultInfo, D as DefaultBodyType, R as RequestHandler, a as ResponseResolver, c as RequestHandlerOptions } from './RequestHandler-bb5cbb8f.js';
-import { Path } from './utils/matching/matchRequestUrl.js';
+import { Match, Path } from './utils/matching/matchRequestUrl.js';
 
 interface ParsedGraphQLQuery {
     operationType: OperationTypeNode;
@@ -31,6 +31,20 @@ interface GraphQLHandlerInfo extends RequestHandlerDefaultInfo {
     operationType: ExpectedOperationTypeNode;
     operationName: GraphQLHandlerNameSelector;
 }
+type GraphQLRequestParsedResult = {
+    match: Match;
+} & (ParsedGraphQLRequest<GraphQLVariables>
+/**
+ * An empty version of the ParsedGraphQLRequest
+ * which simplifies the return type of the resolver
+ * when the request is to a non-matching endpoint
+ */
+ | {
+    operationType?: undefined;
+    operationName?: undefined;
+    query?: undefined;
+    variables?: undefined;
+});
 type GraphQLResolverExtras<Variables extends GraphQLVariables> = {
     query: string;
     operationName: string;
@@ -47,19 +61,19 @@ interface GraphQLResponseBody<BodyType extends DefaultBodyType> {
     errors?: readonly Partial<GraphQLError>[] | null;
 }
 declare function isDocumentNode(value: DocumentNode | any): value is DocumentNode;
-declare class GraphQLHandler extends RequestHandler<GraphQLHandlerInfo, ParsedGraphQLRequest, GraphQLResolverExtras<any>> {
+declare class GraphQLHandler extends RequestHandler<GraphQLHandlerInfo, GraphQLRequestParsedResult, GraphQLResolverExtras<any>> {
     private endpoint;
     constructor(operationType: ExpectedOperationTypeNode, operationName: GraphQLHandlerNameSelector, endpoint: Path, resolver: ResponseResolver<GraphQLResolverExtras<any>, any, any>, options?: RequestHandlerOptions);
     parse(args: {
         request: Request;
-    }): Promise<ParsedGraphQLRequest<GraphQLVariables>>;
+    }): Promise<GraphQLRequestParsedResult>;
     predicate(args: {
         request: Request;
-        parsedResult: ParsedGraphQLRequest<GraphQLVariables>;
+        parsedResult: GraphQLRequestParsedResult;
     }): boolean;
     protected extendResolverArgs(args: {
         request: Request;
-        parsedResult: ParsedGraphQLRequest<GraphQLVariables>;
+        parsedResult: GraphQLRequestParsedResult;
     }): {
         query: string;
         operationName: string;
@@ -69,8 +83,8 @@ declare class GraphQLHandler extends RequestHandler<GraphQLHandlerInfo, ParsedGr
     log(args: {
         request: Request;
         response: Response;
-        parsedResult: ParsedGraphQLRequest;
+        parsedResult: GraphQLRequestParsedResult;
     }): Promise<void>;
 }
 
-export { ExpectedOperationTypeNode as E, GraphQLHandler as G, ParsedGraphQLRequest as P, GraphQLVariables as a, GraphQLRequestBody as b, GraphQLJsonRequestBody as c, GraphQLHandlerNameSelector as d, GraphQLResolverExtras as e, GraphQLResponseBody as f, ParsedGraphQLQuery as g, GraphQLParsedOperationsMap as h, GraphQLMultipartRequestBody as i, parseGraphQLRequest as j, GraphQLHandlerInfo as k, isDocumentNode as l, parseDocumentNode as p };
+export { ExpectedOperationTypeNode as E, GraphQLHandler as G, ParsedGraphQLRequest as P, GraphQLVariables as a, GraphQLRequestBody as b, GraphQLJsonRequestBody as c, GraphQLHandlerNameSelector as d, GraphQLResolverExtras as e, GraphQLResponseBody as f, ParsedGraphQLQuery as g, GraphQLParsedOperationsMap as h, GraphQLMultipartRequestBody as i, parseGraphQLRequest as j, GraphQLHandlerInfo as k, GraphQLRequestParsedResult as l, isDocumentNode as m, parseDocumentNode as p };

package/lib/core/SetupApi.js

@@ -30,7 +30,12 @@ var import_Disposable = require("./utils/internal/Disposable.js");
 class SetupApi extends import_Disposable.Disposable {
   constructor(...initialHandlers) {
     super();
-    this.validateHandlers(...initialHandlers);
+    (0, import_outvariant.invariant)(
+      this.validateHandlers(initialHandlers),
+      import_devUtils.devUtils.formatMessage(
+        `Failed to apply given request handlers: invalid input. Did you forget to spread the request handlers Array?`
+      )
+    );
     this.initialHandlers = (0, import_toReadonlyArray.toReadonlyArray)(initialHandlers);
     this.currentHandlers = [...initialHandlers];
     this.emitter = new import_strict_event_emitter.Emitter();
@@ -42,18 +47,16 @@ class SetupApi extends import_Disposable.Disposable {
       this.publicEmitter.removeAllListeners();
     });
   }
-  validateHandlers(...handlers) {
-    for (const handler of handlers) {
-      (0, import_outvariant.invariant)(
-        !Array.isArray(handler),
-        import_devUtils.devUtils.formatMessage(
-          'Failed to construct "%s" given an Array of request handlers. Make sure you spread the request handlers when calling the respective setup function.'
-        ),
-        this.constructor.name
-      );
-    }
+  validateHandlers(handlers) {
+    return handlers.every((handler) => !Array.isArray(handler));
   }
   use(...runtimeHandlers) {
+    (0, import_outvariant.invariant)(
+      this.validateHandlers(runtimeHandlers),
+      import_devUtils.devUtils.formatMessage(
+        `Failed to call "use()" with the given request handlers: invalid input. Did you forget to spread the array of request handlers?`
+      )
+    );
     this.currentHandlers.unshift(...runtimeHandlers);
   }
   restoreHandlers() {

package/lib/core/SetupApi.mjs

@@ -7,7 +7,12 @@ import { Disposable } from './utils/internal/Disposable.mjs';
 class SetupApi extends Disposable {
   constructor(...initialHandlers) {
     super();
-    this.validateHandlers(...initialHandlers);
+    invariant(
+      this.validateHandlers(initialHandlers),
+      devUtils.formatMessage(
+        `Failed to apply given request handlers: invalid input. Did you forget to spread the request handlers Array?`
+      )
+    );
     this.initialHandlers = toReadonlyArray(initialHandlers);
     this.currentHandlers = [...initialHandlers];
     this.emitter = new Emitter();
@@ -19,18 +24,16 @@ class SetupApi extends Disposable {
       this.publicEmitter.removeAllListeners();
     });
   }
-  validateHandlers(...handlers) {
-    for (const handler of handlers) {
-      invariant(
-        !Array.isArray(handler),
-        devUtils.formatMessage(
-          'Failed to construct "%s" given an Array of request handlers. Make sure you spread the request handlers when calling the respective setup function.'
-        ),
-        this.constructor.name
-      );
-    }
+  validateHandlers(handlers) {
+    return handlers.every((handler) => !Array.isArray(handler));
   }
   use(...runtimeHandlers) {
+    invariant(
+      this.validateHandlers(runtimeHandlers),
+      devUtils.formatMessage(
+        `Failed to call "use()" with the given request handlers: invalid input. Did you forget to spread the array of request handlers?`
+      )
+    );
     this.currentHandlers.unshift(...runtimeHandlers);
   }
   restoreHandlers() {

package/lib/core/graphql.d.ts

@@ -1,6 +1,6 @@
 import { DocumentNode } from 'graphql';
 import { a as ResponseResolver, c as RequestHandlerOptions } from './RequestHandler-bb5cbb8f.js';
-import { a as GraphQLVariables, d as GraphQLHandlerNameSelector, e as GraphQLResolverExtras, f as GraphQLResponseBody, G as GraphQLHandler } from './GraphQLHandler-d4787f91.js';
+import { a as GraphQLVariables, d as GraphQLHandlerNameSelector, e as GraphQLResolverExtras, f as GraphQLResponseBody, G as GraphQLHandler } from './GraphQLHandler-efb5b362.js';
 import { Path } from './utils/matching/matchRequestUrl.js';
 import './typeUtils.js';
 

package/lib/core/handlers/GraphQLHandler.d.ts

@@ -1,5 +1,5 @@
 import 'graphql';
 import '../RequestHandler-bb5cbb8f.js';
 import '../utils/matching/matchRequestUrl.js';
-export { E as ExpectedOperationTypeNode, G as GraphQLHandler, k as GraphQLHandlerInfo, d as GraphQLHandlerNameSelector, c as GraphQLJsonRequestBody, b as GraphQLRequestBody, e as GraphQLResolverExtras, f as GraphQLResponseBody, a as GraphQLVariables, l as isDocumentNode } from '../GraphQLHandler-d4787f91.js';
+export { E as ExpectedOperationTypeNode, G as GraphQLHandler, k as GraphQLHandlerInfo, d as GraphQLHandlerNameSelector, c as GraphQLJsonRequestBody, b as GraphQLRequestBody, l as GraphQLRequestParsedResult, e as GraphQLResolverExtras, f as GraphQLResponseBody, a as GraphQLVariables, m as isDocumentNode } from '../GraphQLHandler-efb5b362.js';
 import '../typeUtils.js';

package/lib/core/handlers/GraphQLHandler.js

@@ -89,6 +89,9 @@ class GraphQLHandler extends import_RequestHandler.RequestHandler {
   }
   parse(args) {
     return __async(this, null, function* () {
+      const match = (0, import_matchRequestUrl.matchRequestUrl)(new URL(args.request.url), this.endpoint);
+      if (!match.matches)
+        return { match };
       const parsedResult = yield (0, import_parseGraphQLRequest.parseGraphQLRequest)(args.request).catch(
         (error) => {
           console.error(error);
@@ -96,9 +99,10 @@ class GraphQLHandler extends import_RequestHandler.RequestHandler {
         }
       );
       if (typeof parsedResult === "undefined") {
-        return void 0;
+        return { match };
       }
       return {
+        match,
         query: parsedResult.query,
         operationType: parsedResult.operationType,
         operationName: parsedResult.operationName,
@@ -107,7 +111,7 @@ class GraphQLHandler extends import_RequestHandler.RequestHandler {
     });
   }
   predicate(args) {
-    if (!args.parsedResult) {
+    if (args.parsedResult.operationType === void 0) {
       return false;
     }
     if (!args.parsedResult.operationName && this.info.operationType !== "all") {
@@ -117,31 +121,25 @@ class GraphQLHandler extends import_RequestHandler.RequestHandler {
 Consider naming this operation or using "graphql.operation()" request handler to intercept GraphQL requests regardless of their operation name/type. Read more: https://mswjs.io/docs/api/graphql/#graphqloperationresolver`);
       return false;
     }
-    const hasMatchingUrl = (0, import_matchRequestUrl.matchRequestUrl)(
-      new URL(args.request.url),
-      this.endpoint
-    );
     const hasMatchingOperationType = this.info.operationType === "all" || args.parsedResult.operationType === this.info.operationType;
     const hasMatchingOperationName = this.info.operationName instanceof RegExp ? this.info.operationName.test(args.parsedResult.operationName || "") : args.parsedResult.operationName === this.info.operationName;
-    return hasMatchingUrl.matches && hasMatchingOperationType && hasMatchingOperationName;
+    return args.parsedResult.match.matches && hasMatchingOperationType && hasMatchingOperationName;
   }
   extendResolverArgs(args) {
-    var _a, _b, _c;
     const cookies = (0, import_getRequestCookies.getAllRequestCookies)(args.request);
     return {
-      query: ((_a = args.parsedResult) == null ? void 0 : _a.query) || "",
-      operationName: ((_b = args.parsedResult) == null ? void 0 : _b.operationName) || "",
-      variables: ((_c = args.parsedResult) == null ? void 0 : _c.variables) || {},
+      query: args.parsedResult.query || "",
+      operationName: args.parsedResult.operationName || "",
+      variables: args.parsedResult.variables || {},
       cookies
     };
   }
   log(args) {
     return __async(this, null, function* () {
-      var _a, _b, _c, _d;
       const loggedRequest = yield (0, import_serializeRequest.serializeRequest)(args.request);
       const loggedResponse = yield (0, import_serializeResponse.serializeResponse)(args.response);
       const statusColor = (0, import_getStatusCodeColor.getStatusCodeColor)(loggedResponse.status);
-      const requestInfo = ((_a = args.parsedResult) == null ? void 0 : _a.operationName) ? `${(_b = args.parsedResult) == null ? void 0 : _b.operationType} ${(_c = args.parsedResult) == null ? void 0 : _c.operationName}` : `anonymous ${(_d = args.parsedResult) == null ? void 0 : _d.operationType}`;
+      const requestInfo = args.parsedResult.operationName ? `${args.parsedResult.operationType} ${args.parsedResult.operationName}` : `anonymous ${args.parsedResult.operationType}`;
       console.groupCollapsed(
         import_devUtils.devUtils.formatMessage(
           `${(0, import_getTimestamp.getTimestamp)()} ${requestInfo} (%c${loggedResponse.status} ${loggedResponse.statusText}%c)`

package/lib/core/handlers/GraphQLHandler.mjs

@@ -70,6 +70,9 @@ class GraphQLHandler extends RequestHandler {
   }
   parse(args) {
     return __async(this, null, function* () {
+      const match = matchRequestUrl(new URL(args.request.url), this.endpoint);
+      if (!match.matches)
+        return { match };
       const parsedResult = yield parseGraphQLRequest(args.request).catch(
         (error) => {
           console.error(error);
@@ -77,9 +80,10 @@ class GraphQLHandler extends RequestHandler {
         }
       );
       if (typeof parsedResult === "undefined") {
-        return void 0;
+        return { match };
       }
       return {
+        match,
         query: parsedResult.query,
         operationType: parsedResult.operationType,
         operationName: parsedResult.operationName,
@@ -88,7 +92,7 @@ class GraphQLHandler extends RequestHandler {
     });
   }
   predicate(args) {
-    if (!args.parsedResult) {
+    if (args.parsedResult.operationType === void 0) {
       return false;
     }
     if (!args.parsedResult.operationName && this.info.operationType !== "all") {
@@ -98,31 +102,25 @@ class GraphQLHandler extends RequestHandler {
 Consider naming this operation or using "graphql.operation()" request handler to intercept GraphQL requests regardless of their operation name/type. Read more: https://mswjs.io/docs/api/graphql/#graphqloperationresolver`);
       return false;
     }
-    const hasMatchingUrl = matchRequestUrl(
-      new URL(args.request.url),
-      this.endpoint
-    );
     const hasMatchingOperationType = this.info.operationType === "all" || args.parsedResult.operationType === this.info.operationType;
     const hasMatchingOperationName = this.info.operationName instanceof RegExp ? this.info.operationName.test(args.parsedResult.operationName || "") : args.parsedResult.operationName === this.info.operationName;
-    return hasMatchingUrl.matches && hasMatchingOperationType && hasMatchingOperationName;
+    return args.parsedResult.match.matches && hasMatchingOperationType && hasMatchingOperationName;
   }
   extendResolverArgs(args) {
-    var _a, _b, _c;
     const cookies = getAllRequestCookies(args.request);
     return {
-      query: ((_a = args.parsedResult) == null ? void 0 : _a.query) || "",
-      operationName: ((_b = args.parsedResult) == null ? void 0 : _b.operationName) || "",
-      variables: ((_c = args.parsedResult) == null ? void 0 : _c.variables) || {},
+      query: args.parsedResult.query || "",
+      operationName: args.parsedResult.operationName || "",
+      variables: args.parsedResult.variables || {},
       cookies
     };
   }
   log(args) {
     return __async(this, null, function* () {
-      var _a, _b, _c, _d;
       const loggedRequest = yield serializeRequest(args.request);
       const loggedResponse = yield serializeResponse(args.response);
       const statusColor = getStatusCodeColor(loggedResponse.status);
-      const requestInfo = ((_a = args.parsedResult) == null ? void 0 : _a.operationName) ? `${(_b = args.parsedResult) == null ? void 0 : _b.operationType} ${(_c = args.parsedResult) == null ? void 0 : _c.operationName}` : `anonymous ${(_d = args.parsedResult) == null ? void 0 : _d.operationType}`;
+      const requestInfo = args.parsedResult.operationName ? `${args.parsedResult.operationType} ${args.parsedResult.operationName}` : `anonymous ${args.parsedResult.operationType}`;
       console.groupCollapsed(
         devUtils.formatMessage(
           `${getTimestamp()} ${requestInfo} (%c${loggedResponse.status} ${loggedResponse.statusText}%c)`

package/lib/core/index.d.ts

@@ -3,7 +3,7 @@ export { A as AsyncResponseResolverReturnType, D as DefaultBodyType, d as Defaul
 export { http } from './http.js';
 export { HttpHandler, HttpMethods, HttpRequestParsedResult, RequestQuery } from './handlers/HttpHandler.js';
 export { graphql } from './graphql.js';
-export { G as GraphQLHandler, c as GraphQLJsonRequestBody, b as GraphQLRequestBody, a as GraphQLVariables, P as ParsedGraphQLRequest } from './GraphQLHandler-d4787f91.js';
+export { G as GraphQLHandler, c as GraphQLJsonRequestBody, b as GraphQLRequestBody, a as GraphQLVariables, P as ParsedGraphQLRequest } from './GraphQLHandler-efb5b362.js';
 export { Match, Path, PathParams, matchRequestUrl } from './utils/matching/matchRequestUrl.js';
 export { HandleRequestOptions, handleRequest } from './utils/handleRequest.js';
 export { cleanUrl } from './utils/url/cleanUrl.js';

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

@@ -1,5 +1,5 @@
 import 'graphql';
-export { i as GraphQLMultipartRequestBody, h as GraphQLParsedOperationsMap, g as ParsedGraphQLQuery, P as ParsedGraphQLRequest, p as parseDocumentNode, j as parseGraphQLRequest } from '../../GraphQLHandler-d4787f91.js';
+export { i as GraphQLMultipartRequestBody, h as GraphQLParsedOperationsMap, g as ParsedGraphQLQuery, P as ParsedGraphQLRequest, p as parseDocumentNode, j as parseGraphQLRequest } from '../../GraphQLHandler-efb5b362.js';
 import '../../RequestHandler-bb5cbb8f.js';
 import '../../typeUtils.js';
 import '../matching/matchRequestUrl.js';

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

@@ -26,9 +26,10 @@ function pipeEvents(source, destination) {
   if (rawEmit._isPiped) {
     return;
   }
-  source.emit = function(event, ...data) {
+  const sourceEmit = function sourceEmit2(event, ...data) {
     destination.emit(event, ...data);
     return rawEmit.call(this, event, ...data);
   };
-  source.emit._isPiped = true;
+  sourceEmit._isPiped = true;
+  source.emit = sourceEmit;
 }

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

@@ -3,11 +3,12 @@ function pipeEvents(source, destination) {
   if (rawEmit._isPiped) {
     return;
   }
-  source.emit = function(event, ...data) {
+  const sourceEmit = function sourceEmit2(event, ...data) {
     destination.emit(event, ...data);
     return rawEmit.call(this, event, ...data);
   };
-  source.emit._isPiped = true;
+  sourceEmit._isPiped = true;
+  source.emit = sourceEmit;
 }
 export {
   pipeEvents

package/lib/iife/index.js

@@ -393,11 +393,12 @@ var MockServiceWorker = (() => {
     if (rawEmit._isPiped) {
       return;
     }
-    source.emit = function(event, ...data) {
+    const sourceEmit = function sourceEmit2(event, ...data) {
       destination.emit(event, ...data);
       return rawEmit.call(this, event, ...data);
     };
-    source.emit._isPiped = true;
+    sourceEmit._isPiped = true;
+    source.emit = sourceEmit;
   }
 
   // src/core/utils/internal/toReadonlyArray.ts
@@ -423,7 +424,12 @@ var MockServiceWorker = (() => {
   var SetupApi = class extends Disposable {
     constructor(...initialHandlers) {
       super();
-      this.validateHandlers(...initialHandlers);
+      invariant(
+        this.validateHandlers(initialHandlers),
+        devUtils.formatMessage(
+          `Failed to apply given request handlers: invalid input. Did you forget to spread the request handlers Array?`
+        )
+      );
       this.initialHandlers = toReadonlyArray(initialHandlers);
       this.currentHandlers = [...initialHandlers];
       this.emitter = new Emitter();
@@ -435,18 +441,16 @@ var MockServiceWorker = (() => {
         this.publicEmitter.removeAllListeners();
       });
     }
-    validateHandlers(...handlers) {
-      for (const handler of handlers) {
-        invariant(
-          !Array.isArray(handler),
-          devUtils.formatMessage(
-            'Failed to construct "%s" given an Array of request handlers. Make sure you spread the request handlers when calling the respective setup function.'
-          ),
-          this.constructor.name
-        );
-      }
+    validateHandlers(handlers) {
+      return handlers.every((handler) => !Array.isArray(handler));
     }
     use(...runtimeHandlers) {
+      invariant(
+        this.validateHandlers(runtimeHandlers),
+        devUtils.formatMessage(
+          `Failed to call "use()" with the given request handlers: invalid input. Did you forget to spread the array of request handlers?`
+        )
+      );
       this.currentHandlers.unshift(...runtimeHandlers);
     }
     restoreHandlers() {
@@ -5636,6 +5640,9 @@ spurious results.`);
     }
     parse(args) {
       return __async(this, null, function* () {
+        const match2 = matchRequestUrl(new URL(args.request.url), this.endpoint);
+        if (!match2.matches)
+          return { match: match2 };
         const parsedResult = yield parseGraphQLRequest(args.request).catch(
           (error3) => {
             console.error(error3);
@@ -5643,9 +5650,10 @@ spurious results.`);
           }
         );
         if (typeof parsedResult === "undefined") {
-          return void 0;
+          return { match: match2 };
         }
         return {
+          match: match2,
           query: parsedResult.query,
           operationType: parsedResult.operationType,
           operationName: parsedResult.operationName,
@@ -5654,7 +5662,7 @@ spurious results.`);
       });
     }
     predicate(args) {
-      if (!args.parsedResult) {
+      if (args.parsedResult.operationType === void 0) {
         return false;
       }
       if (!args.parsedResult.operationName && this.info.operationType !== "all") {
@@ -5664,31 +5672,25 @@ spurious results.`);
 Consider naming this operation or using "graphql.operation()" request handler to intercept GraphQL requests regardless of their operation name/type. Read more: https://mswjs.io/docs/api/graphql/#graphqloperationresolver`);
         return false;
       }
-      const hasMatchingUrl = matchRequestUrl(
-        new URL(args.request.url),
-        this.endpoint
-      );
       const hasMatchingOperationType = this.info.operationType === "all" || args.parsedResult.operationType === this.info.operationType;
       const hasMatchingOperationName = this.info.operationName instanceof RegExp ? this.info.operationName.test(args.parsedResult.operationName || "") : args.parsedResult.operationName === this.info.operationName;
-      return hasMatchingUrl.matches && hasMatchingOperationType && hasMatchingOperationName;
+      return args.parsedResult.match.matches && hasMatchingOperationType && hasMatchingOperationName;
     }
     extendResolverArgs(args) {
-      var _a3, _b2, _c;
       const cookies = getAllRequestCookies(args.request);
       return {
-        query: ((_a3 = args.parsedResult) == null ? void 0 : _a3.query) || "",
-        operationName: ((_b2 = args.parsedResult) == null ? void 0 : _b2.operationName) || "",
-        variables: ((_c = args.parsedResult) == null ? void 0 : _c.variables) || {},
+        query: args.parsedResult.query || "",
+        operationName: args.parsedResult.operationName || "",
+        variables: args.parsedResult.variables || {},
         cookies
       };
     }
     log(args) {
       return __async(this, null, function* () {
-        var _a3, _b2, _c, _d;
         const loggedRequest = yield serializeRequest(args.request);
         const loggedResponse = yield serializeResponse(args.response);
         const statusColor = getStatusCodeColor(loggedResponse.status);
-        const requestInfo = ((_a3 = args.parsedResult) == null ? void 0 : _a3.operationName) ? `${(_b2 = args.parsedResult) == null ? void 0 : _b2.operationType} ${(_c = args.parsedResult) == null ? void 0 : _c.operationName}` : `anonymous ${(_d = args.parsedResult) == null ? void 0 : _d.operationType}`;
+        const requestInfo = args.parsedResult.operationName ? `${args.parsedResult.operationType} ${args.parsedResult.operationName}` : `anonymous ${args.parsedResult.operationType}`;
         console.groupCollapsed(
           devUtils.formatMessage(
             `${getTimestamp()} ${requestInfo} (%c${loggedResponse.status} ${loggedResponse.statusText}%c)`
@@ -6437,14 +6439,7 @@ Learn more about creating the Service Worker script: https://mswjs.io/docs/cli/i
     }
     postMessage(event, ...rest) {
       const [data, transfer] = rest;
-      this.port.postMessage(
-        { type: event, data },
-        {
-          // @ts-ignore ReadableStream can be transferred
-          // but TypeScript doesn't acknowledge that.
-          transfer
-        }
-      );
+      this.port.postMessage({ type: event, data }, { transfer });
     }
   };
 

package/lib/mockServiceWorker.js

@@ -2,7 +2,7 @@
 /* tslint:disable */
 
 /**
- * Mock Service Worker (2.0.8).
+ * Mock Service Worker (2.0.9).
  * @see https://github.com/mswjs/msw
  * - Please do NOT modify this file.
  * - Please do NOT serve this file on production.

package/lib/native/index.d.ts

@@ -51,29 +51,18 @@ interface SetupServer {
 }
 
 declare class SetupServerApi extends SetupApi<LifeCycleEventsMap> implements SetupServer {
-    private context;
     protected readonly interceptor: BatchInterceptor<Array<Interceptor<HttpRequestEventMap>>, HttpRequestEventMap>;
     private resolvedOptions;
     constructor(interceptors: Array<{
         new (): Interceptor<HttpRequestEventMap>;
     }>, ...handlers: Array<RequestHandler>);
-    private createContext;
     /**
      * Subscribe to all requests that are using the interceptor object
      */
     private init;
     listen(options?: Partial<SharedOptions>): void;
     close(): void;
-    /**
-     * Bump the maximum number of event listeners on the
-     * request's "AbortSignal". This prepares the request
-     * for each request handler cloning it at least once.
-     * Note that cloning a request automatically appends a
-     * new "abort" event listener to the parent request's
-     * "AbortController" so if the parent aborts, all the
-     * clones are automatically aborted.
-     */
-    private setRequestAbortSignalMaxListeners;
+    protected onRequest(request: Request): void;
 }
 
 /**

package/lib/native/index.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
@@ -56,26 +46,18 @@ module.exports = __toCommonJS(native_exports);
 var import_XMLHttpRequest = require("@mswjs/interceptors/XMLHttpRequest");
 
 // src/node/SetupServerApi.ts
-var import_outvariant = require("outvariant");
 var import_interceptors = require("@mswjs/interceptors");
+var import_outvariant = require("outvariant");
 var import_SetupApi = require("../core/SetupApi.js");
-var import_mergeRight = require("../core/utils/internal/mergeRight.js");
 var import_handleRequest = require("../core/utils/handleRequest.js");
 var import_devUtils = require("../core/utils/internal/devUtils.js");
-
-// src/node/utils/isNodeExceptionLike.ts
-function isNodeExceptionLike(error) {
-  return !!error && typeof error === "object" && "code" in error;
-}
-
-// src/node/SetupServerApi.ts
+var import_mergeRight = require("../core/utils/internal/mergeRight.js");
 var DEFAULT_LISTEN_OPTIONS = {
   onUnhandledRequest: "warn"
 };
 var SetupServerApi = class extends import_SetupApi.SetupApi {
   constructor(interceptors, ...handlers) {
     super(...handlers);
-    this.context = this.createContext();
     this.interceptor = new import_interceptors.BatchInterceptor({
       name: "setup-server",
       interceptors: interceptors.map((Interceptor2) => new Interceptor2())
@@ -83,19 +65,12 @@ var SetupServerApi = class extends import_SetupApi.SetupApi {
     this.resolvedOptions = {};
     this.init();
   }
-  createContext() {
-    return {
-      get nodeEvents() {
-        return import("events").then((events) => events).catch(() => void 0);
-      }
-    };
-  }
   /**
    * Subscribe to all requests that are using the interceptor object
    */
   init() {
     this.interceptor.on("request", (_0) => __async(this, [_0], function* ({ request, requestId }) {
-      yield this.setRequestAbortSignalMaxListeners(request);
+      this.onRequest(request);
       const response = yield (0, import_handleRequest.handleRequest)(
         request,
         requestId,
@@ -144,36 +119,7 @@ var SetupServerApi = class extends import_SetupApi.SetupApi {
   close() {
     this.dispose();
   }
-  /**
-   * Bump the maximum number of event listeners on the
-   * request's "AbortSignal". This prepares the request
-   * for each request handler cloning it at least once.
-   * Note that cloning a request automatically appends a
-   * new "abort" event listener to the parent request's
-   * "AbortController" so if the parent aborts, all the
-   * clones are automatically aborted.
-   */
-  setRequestAbortSignalMaxListeners(request) {
-    return __async(this, null, function* () {
-      const events = yield this.context.nodeEvents;
-      if (typeof events === "undefined") {
-        return;
-      }
-      const { setMaxListeners, defaultMaxListeners } = events;
-      if (typeof setMaxListeners !== "function") {
-        return;
-      }
-      try {
-        setMaxListeners(
-          Math.max(defaultMaxListeners, this.currentHandlers.length),
-          request.signal
-        );
-      } catch (error) {
-        if (!(isNodeExceptionLike(error) && error.code === "ERR_INVALID_ARG_TYPE")) {
-          throw error;
-        }
-      }
-    });
+  onRequest(request) {
   }
 };
 

package/lib/native/index.mjs

@@ -23,29 +23,21 @@ var __async = (__this, __arguments, generator) => {
 import { XMLHttpRequestInterceptor } from "@mswjs/interceptors/XMLHttpRequest";
 
 // src/node/SetupServerApi.ts
-import { invariant } from "outvariant";
 import {
   BatchInterceptor,
   InterceptorReadyState
 } from "@mswjs/interceptors";
+import { invariant } from "outvariant";
 import { SetupApi } from '../core/SetupApi.mjs';
-import { mergeRight } from '../core/utils/internal/mergeRight.mjs';
 import { handleRequest } from '../core/utils/handleRequest.mjs';
 import { devUtils } from '../core/utils/internal/devUtils.mjs';
-
-// src/node/utils/isNodeExceptionLike.ts
-function isNodeExceptionLike(error) {
-  return !!error && typeof error === "object" && "code" in error;
-}
-
-// src/node/SetupServerApi.ts
+import { mergeRight } from '../core/utils/internal/mergeRight.mjs';
 var DEFAULT_LISTEN_OPTIONS = {
   onUnhandledRequest: "warn"
 };
 var SetupServerApi = class extends SetupApi {
   constructor(interceptors, ...handlers) {
     super(...handlers);
-    this.context = this.createContext();
     this.interceptor = new BatchInterceptor({
       name: "setup-server",
       interceptors: interceptors.map((Interceptor2) => new Interceptor2())
@@ -53,19 +45,12 @@ var SetupServerApi = class extends SetupApi {
     this.resolvedOptions = {};
     this.init();
   }
-  createContext() {
-    return {
-      get nodeEvents() {
-        return import("events").then((events) => events).catch(() => void 0);
-      }
-    };
-  }
   /**
    * Subscribe to all requests that are using the interceptor object
    */
   init() {
     this.interceptor.on("request", (_0) => __async(this, [_0], function* ({ request, requestId }) {
-      yield this.setRequestAbortSignalMaxListeners(request);
+      this.onRequest(request);
       const response = yield handleRequest(
         request,
         requestId,
@@ -114,36 +99,7 @@ var SetupServerApi = class extends SetupApi {
   close() {
     this.dispose();
   }
-  /**
-   * Bump the maximum number of event listeners on the
-   * request's "AbortSignal". This prepares the request
-   * for each request handler cloning it at least once.
-   * Note that cloning a request automatically appends a
-   * new "abort" event listener to the parent request's
-   * "AbortController" so if the parent aborts, all the
-   * clones are automatically aborted.
-   */
-  setRequestAbortSignalMaxListeners(request) {
-    return __async(this, null, function* () {
-      const events = yield this.context.nodeEvents;
-      if (typeof events === "undefined") {
-        return;
-      }
-      const { setMaxListeners, defaultMaxListeners } = events;
-      if (typeof setMaxListeners !== "function") {
-        return;
-      }
-      try {
-        setMaxListeners(
-          Math.max(defaultMaxListeners, this.currentHandlers.length),
-          request.signal
-        );
-      } catch (error) {
-        if (!(isNodeExceptionLike(error) && error.code === "ERR_INVALID_ARG_TYPE")) {
-          throw error;
-        }
-      }
-    });
+  onRequest(request) {
   }
 };
 

package/lib/node/index.d.ts

@@ -51,29 +51,18 @@ interface SetupServer {
 }
 
 declare class SetupServerApi extends SetupApi<LifeCycleEventsMap> implements SetupServer {
-    private context;
     protected readonly interceptor: BatchInterceptor<Array<Interceptor<HttpRequestEventMap>>, HttpRequestEventMap>;
     private resolvedOptions;
     constructor(interceptors: Array<{
         new (): Interceptor<HttpRequestEventMap>;
     }>, ...handlers: Array<RequestHandler>);
-    private createContext;
     /**
      * Subscribe to all requests that are using the interceptor object
      */
     private init;
     listen(options?: Partial<SharedOptions>): void;
     close(): void;
-    /**
-     * Bump the maximum number of event listeners on the
-     * request's "AbortSignal". This prepares the request
-     * for each request handler cloning it at least once.
-     * Note that cloning a request automatically appends a
-     * new "abort" event listener to the parent request's
-     * "AbortController" so if the parent aborts, all the
-     * clones are automatically aborted.
-     */
-    private setRequestAbortSignalMaxListeners;
+    protected onRequest(request: Request): void;
 }
 
 /**

package/lib/node/index.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
@@ -56,26 +46,18 @@ __export(node_exports, {
 module.exports = __toCommonJS(node_exports);
 
 // src/node/SetupServerApi.ts
-var import_outvariant = require("outvariant");
 var import_interceptors = require("@mswjs/interceptors");
+var import_outvariant = require("outvariant");
 var import_SetupApi = require("../core/SetupApi.js");
-var import_mergeRight = require("../core/utils/internal/mergeRight.js");
 var import_handleRequest = require("../core/utils/handleRequest.js");
 var import_devUtils = require("../core/utils/internal/devUtils.js");
-
-// src/node/utils/isNodeExceptionLike.ts
-function isNodeExceptionLike(error) {
-  return !!error && typeof error === "object" && "code" in error;
-}
-
-// src/node/SetupServerApi.ts
+var import_mergeRight = require("../core/utils/internal/mergeRight.js");
 var DEFAULT_LISTEN_OPTIONS = {
   onUnhandledRequest: "warn"
 };
 var SetupServerApi = class extends import_SetupApi.SetupApi {
   constructor(interceptors, ...handlers) {
     super(...handlers);
-    this.context = this.createContext();
     this.interceptor = new import_interceptors.BatchInterceptor({
       name: "setup-server",
       interceptors: interceptors.map((Interceptor2) => new Interceptor2())
@@ -83,19 +65,12 @@ var SetupServerApi = class extends import_SetupApi.SetupApi {
     this.resolvedOptions = {};
     this.init();
   }
-  createContext() {
-    return {
-      get nodeEvents() {
-        return import("events").then((events) => events).catch(() => void 0);
-      }
-    };
-  }
   /**
    * Subscribe to all requests that are using the interceptor object
    */
   init() {
     this.interceptor.on("request", (_0) => __async(this, [_0], function* ({ request, requestId }) {
-      yield this.setRequestAbortSignalMaxListeners(request);
+      this.onRequest(request);
       const response = yield (0, import_handleRequest.handleRequest)(
         request,
         requestId,
@@ -144,6 +119,23 @@ var SetupServerApi = class extends import_SetupApi.SetupApi {
   close() {
     this.dispose();
   }
+  onRequest(request) {
+  }
+};
+
+// src/node/setupServer.ts
+var import_ClientRequest = require("@mswjs/interceptors/ClientRequest");
+var import_XMLHttpRequest = require("@mswjs/interceptors/XMLHttpRequest");
+var import_fetch = require("@mswjs/interceptors/fetch");
+var import_node_events = require("events");
+
+// src/node/utils/isNodeExceptionLike.ts
+function isNodeExceptionLike(error) {
+  return !!error && typeof error === "object" && "code" in error;
+}
+
+// src/node/setupServer.ts
+var SetupServerApi2 = class extends SetupServerApi {
   /**
    * Bump the maximum number of event listeners on the
    * request's "AbortSignal". This prepares the request
@@ -153,36 +145,21 @@ var SetupServerApi = class extends import_SetupApi.SetupApi {
    * "AbortController" so if the parent aborts, all the
    * clones are automatically aborted.
    */
-  setRequestAbortSignalMaxListeners(request) {
-    return __async(this, null, function* () {
-      const events = yield this.context.nodeEvents;
-      if (typeof events === "undefined") {
-        return;
-      }
-      const { setMaxListeners, defaultMaxListeners } = events;
-      if (typeof setMaxListeners !== "function") {
-        return;
-      }
-      try {
-        setMaxListeners(
-          Math.max(defaultMaxListeners, this.currentHandlers.length),
-          request.signal
-        );
-      } catch (error) {
-        if (!(isNodeExceptionLike(error) && error.code === "ERR_INVALID_ARG_TYPE")) {
-          throw error;
-        }
+  onRequest(request) {
+    try {
+      (0, import_node_events.setMaxListeners)(
+        Math.max(import_node_events.defaultMaxListeners, this.currentHandlers.length),
+        request.signal
+      );
+    } catch (error) {
+      if (!(isNodeExceptionLike(error) && error.code === "ERR_INVALID_ARG_TYPE")) {
+        throw error;
       }
-    });
+    }
   }
 };
-
-// src/node/setupServer.ts
-var import_ClientRequest = require("@mswjs/interceptors/ClientRequest");
-var import_XMLHttpRequest = require("@mswjs/interceptors/XMLHttpRequest");
-var import_fetch = require("@mswjs/interceptors/fetch");
 var setupServer = (...handlers) => {
-  return new SetupServerApi(
+  return new SetupServerApi2(
     [import_ClientRequest.ClientRequestInterceptor, import_XMLHttpRequest.XMLHttpRequestInterceptor, import_fetch.FetchInterceptor],
     ...handlers
   );

package/lib/node/index.mjs

@@ -20,29 +20,21 @@ var __async = (__this, __arguments, generator) => {
 };
 
 // src/node/SetupServerApi.ts
-import { invariant } from "outvariant";
 import {
   BatchInterceptor,
   InterceptorReadyState
 } from "@mswjs/interceptors";
+import { invariant } from "outvariant";
 import { SetupApi } from '../core/SetupApi.mjs';
-import { mergeRight } from '../core/utils/internal/mergeRight.mjs';
 import { handleRequest } from '../core/utils/handleRequest.mjs';
 import { devUtils } from '../core/utils/internal/devUtils.mjs';
-
-// src/node/utils/isNodeExceptionLike.ts
-function isNodeExceptionLike(error) {
-  return !!error && typeof error === "object" && "code" in error;
-}
-
-// src/node/SetupServerApi.ts
+import { mergeRight } from '../core/utils/internal/mergeRight.mjs';
 var DEFAULT_LISTEN_OPTIONS = {
   onUnhandledRequest: "warn"
 };
 var SetupServerApi = class extends SetupApi {
   constructor(interceptors, ...handlers) {
     super(...handlers);
-    this.context = this.createContext();
     this.interceptor = new BatchInterceptor({
       name: "setup-server",
       interceptors: interceptors.map((Interceptor2) => new Interceptor2())
@@ -50,19 +42,12 @@ var SetupServerApi = class extends SetupApi {
     this.resolvedOptions = {};
     this.init();
   }
-  createContext() {
-    return {
-      get nodeEvents() {
-        return import("events").then((events) => events).catch(() => void 0);
-      }
-    };
-  }
   /**
    * Subscribe to all requests that are using the interceptor object
    */
   init() {
     this.interceptor.on("request", (_0) => __async(this, [_0], function* ({ request, requestId }) {
-      yield this.setRequestAbortSignalMaxListeners(request);
+      this.onRequest(request);
       const response = yield handleRequest(
         request,
         requestId,
@@ -111,6 +96,23 @@ var SetupServerApi = class extends SetupApi {
   close() {
     this.dispose();
   }
+  onRequest(request) {
+  }
+};
+
+// src/node/setupServer.ts
+import { ClientRequestInterceptor } from "@mswjs/interceptors/ClientRequest";
+import { XMLHttpRequestInterceptor } from "@mswjs/interceptors/XMLHttpRequest";
+import { FetchInterceptor } from "@mswjs/interceptors/fetch";
+import { defaultMaxListeners, setMaxListeners } from "events";
+
+// src/node/utils/isNodeExceptionLike.ts
+function isNodeExceptionLike(error) {
+  return !!error && typeof error === "object" && "code" in error;
+}
+
+// src/node/setupServer.ts
+var SetupServerApi2 = class extends SetupServerApi {
   /**
    * Bump the maximum number of event listeners on the
    * request's "AbortSignal". This prepares the request
@@ -120,36 +122,21 @@ var SetupServerApi = class extends SetupApi {
    * "AbortController" so if the parent aborts, all the
    * clones are automatically aborted.
    */
-  setRequestAbortSignalMaxListeners(request) {
-    return __async(this, null, function* () {
-      const events = yield this.context.nodeEvents;
-      if (typeof events === "undefined") {
-        return;
-      }
-      const { setMaxListeners, defaultMaxListeners } = events;
-      if (typeof setMaxListeners !== "function") {
-        return;
-      }
-      try {
-        setMaxListeners(
-          Math.max(defaultMaxListeners, this.currentHandlers.length),
-          request.signal
-        );
-      } catch (error) {
-        if (!(isNodeExceptionLike(error) && error.code === "ERR_INVALID_ARG_TYPE")) {
-          throw error;
-        }
+  onRequest(request) {
+    try {
+      setMaxListeners(
+        Math.max(defaultMaxListeners, this.currentHandlers.length),
+        request.signal
+      );
+    } catch (error) {
+      if (!(isNodeExceptionLike(error) && error.code === "ERR_INVALID_ARG_TYPE")) {
+        throw error;
       }
-    });
+    }
   }
 };
-
-// src/node/setupServer.ts
-import { ClientRequestInterceptor } from "@mswjs/interceptors/ClientRequest";
-import { XMLHttpRequestInterceptor } from "@mswjs/interceptors/XMLHttpRequest";
-import { FetchInterceptor } from "@mswjs/interceptors/fetch";
 var setupServer = (...handlers) => {
-  return new SetupServerApi(
+  return new SetupServerApi2(
     [ClientRequestInterceptor, XMLHttpRequestInterceptor, FetchInterceptor],
     ...handlers
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "msw",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "description": "Seamless REST/GraphQL API mocking library for browser and Node.js.",
   "main": "./lib/core/index.js",
   "module": "./lib/core/index.mjs",
@@ -193,9 +193,10 @@
     "build": "pnpm clean && cross-env NODE_ENV=production tsup && pnpm patch:dts",
     "patch:dts": "node \"./config/scripts/patch-ts.js\"",
     "check:exports": "node \"./config/scripts/validate-esm.js\"",
-    "test": "pnpm test:unit && pnpm test:node && pnpm test:browser",
+    "test": "pnpm test:unit && pnpm test:node && pnpm test:browser && pnpm test:native",
     "test:unit": "vitest",
     "test:node": "vitest run --config=./test/node/vitest.config.ts",
+    "test:native": "vitest run --config=./test/native/vitest.config.ts",
     "test:browser": "playwright test -c ./test/browser/playwright.config.ts",
     "test:modules:node": "vitest run --config=./test/modules/node/vitest.config.ts",
     "test:modules:browser": "playwright test -c ./test/modules/browser/playwright.config.ts",