npm - msw - Versions diffs - 0.36.0 → 0.36.4 - Mend

msw 0.36.0 → 0.36.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (23) hide show

package/README.md +42 -5
package/lib/esm/RequestHandler-deps.js +33 -9
package/lib/esm/index.js +14 -25
package/lib/esm/mockServiceWorker.js +1 -1
package/lib/esm/rest-deps.js +0 -1
package/lib/iife/index.js +3 -3
package/lib/iife/mockServiceWorker.js +1 -1
package/lib/types/handlers/GraphQLHandler.d.ts +2 -2
package/lib/types/handlers/RequestHandler.d.ts +7 -7
package/lib/types/handlers/RestHandler.d.ts +2 -2
package/lib/types/native/index.d.ts +1 -1
package/lib/types/node/setupServer.d.ts +1 -1
package/lib/types/utils/getResponse.d.ts +1 -1
package/lib/types/utils/handleRequest.d.ts +1 -1
package/lib/types/utils/internal/requestHandlerUtils.d.ts +1 -1
package/lib/types/utils/matching/matchRequestUrl.d.ts +1 -1
package/lib/types/utils/request/onUnhandledRequest.d.ts +1 -2
package/lib/types/utils/url/isAbsoluteUrl.d.ts +4 -0
package/lib/umd/index.js +49 -37
package/lib/umd/mockServiceWorker.js +1 -1
package/native/lib/index.js +50 -39
package/node/lib/index.js +50 -39
package/package.json +1 -1

package/lib/iife/mockServiceWorker.js CHANGED Viewed

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

package/lib/types/handlers/GraphQLHandler.d.ts CHANGED Viewed

@@ -7,7 +7,7 @@ import { fetch } from '../context/fetch';
 import { errors } from '../context/errors';
 import { GraphQLPayloadContext } from '../typeUtils';
 import { cookie } from '../context/cookie';
-import { MockedRequest, RequestHandler, ResponseResolver } from './RequestHandler';
+import { MockedRequest, RequestHandler, RequestHandlerDefaultInfo, ResponseResolver } from './RequestHandler';
 import { Path } from '../utils/matching/matchRequestUrl';
 import { ParsedGraphQLRequest, GraphQLMultipartRequestBody } from '../utils/internal/parseGraphQLRequest';
 export declare type ExpectedOperationTypeNode = OperationTypeNode | 'all';
@@ -24,7 +24,7 @@ export declare type GraphQLContext<QueryType extends Record<string, unknown>> =
 };
 export declare const graphqlContext: GraphQLContext<any>;
 export declare type GraphQLVariables = Record<string, any>;
-export interface GraphQLHandlerInfo {
+export interface GraphQLHandlerInfo extends RequestHandlerDefaultInfo {
     operationType: ExpectedOperationTypeNode;
     operationName: GraphQLHandlerNameSelector;
 }

package/lib/types/handlers/RequestHandler.d.ts CHANGED Viewed

@@ -29,19 +29,19 @@ export interface MockedRequest<Body = DefaultRequestBody> {
     body: Body;
     bodyUsed: Request['bodyUsed'];
 }
-interface RequestHandlerDefaultInfo {
+export interface RequestHandlerDefaultInfo {
+    header: string;
+}
+export interface RequestHandlerInternalInfo {
     callFrame?: string;
 }
-declare type RequestHandlerInfo<ExtraInfo extends Record<string, any>> = {
-    header: string;
-} & ExtraInfo;
 declare type ContextMap = Record<string, (...args: any[]) => any>;
 export declare type ResponseResolverReturnType<ReturnType> = ReturnType | undefined | void;
 export declare type MaybeAsyncResponseResolverReturnType<ReturnType> = ResponseResolverReturnType<ReturnType> | Promise<ResponseResolverReturnType<ReturnType>>;
 export declare type AsyncResponseResolverReturnType<ReturnType> = MaybeAsyncResponseResolverReturnType<ReturnType> | Generator<MaybeAsyncResponseResolverReturnType<ReturnType>, MaybeAsyncResponseResolverReturnType<ReturnType>, MaybeAsyncResponseResolverReturnType<ReturnType>>;
 export declare type ResponseResolver<RequestType = MockedRequest, ContextType = typeof defaultContext, BodyType = any> = (req: RequestType, res: ResponseComposition<BodyType>, context: ContextType) => AsyncResponseResolverReturnType<MockedResponse<BodyType>>;
 export interface RequestHandlerOptions<HandlerInfo> {
-    info: RequestHandlerInfo<HandlerInfo>;
+    info: HandlerInfo;
     resolver: ResponseResolver<any, any>;
     ctx?: ContextMap;
 }
@@ -51,8 +51,8 @@ export interface RequestHandlerExecutionResult<PublicRequestType> {
     request: PublicRequestType;
     response?: MockedResponse;
 }
-export declare abstract class RequestHandler<HandlerInfo extends Record<string, any> = Record<string, any>, Request extends MockedRequest = MockedRequest, ParsedResult = any, PublicRequest extends MockedRequest = Request> {
-    info: RequestHandlerDefaultInfo & RequestHandlerInfo<HandlerInfo>;
+export declare abstract class RequestHandler<HandlerInfo extends RequestHandlerDefaultInfo = RequestHandlerDefaultInfo, Request extends MockedRequest = MockedRequest, ParsedResult = any, PublicRequest extends MockedRequest = Request> {
+    info: HandlerInfo & RequestHandlerInternalInfo;
     shouldSkip: boolean;
     private ctx;
     private resolverGenerator?;

package/lib/types/handlers/RestHandler.d.ts CHANGED Viewed

@@ -2,9 +2,9 @@ import { body, cookie, delay, fetch, json, set, status, text, xml } from '../con
 import { SerializedResponse } from '../setupWorker/glossary';
 import { ResponseResolutionContext } from '../utils/getResponse';
 import { Match, Path, PathParams } from '../utils/matching/matchRequestUrl';
-import { DefaultRequestBody, MockedRequest, RequestHandler, ResponseResolver } from './RequestHandler';
+import { DefaultRequestBody, MockedRequest, RequestHandler, RequestHandlerDefaultInfo, ResponseResolver } from './RequestHandler';
 declare type RestHandlerMethod = string | RegExp;
-interface RestHandlerInfo {
+export interface RestHandlerInfo extends RequestHandlerDefaultInfo {
     method: RestHandlerMethod;
     path: Path;
 }

package/lib/types/native/index.d.ts CHANGED Viewed

	@@ -1 +1 @@
1	- export declare const setupServer: (...requestHandlers: import("..").RequestHandler<~~Record<string~~, ~~any>,~~ import("..").MockedRequest<import("..").DefaultRequestBody>, any, import("..").MockedRequest<import("..").DefaultRequestBody>>[]) => import("../node").SetupServerApi;
1	+ export declare const setupServer: (...requestHandlers: import("..").RequestHandler<import("../handlers/RequestHandler").RequestHandlerDefaultInfo, import("..").MockedRequest<import("..").DefaultRequestBody>, any, import("..").MockedRequest<import("..").DefaultRequestBody>>[]) => import("../node").SetupServerApi;

package/lib/types/node/setupServer.d.ts CHANGED Viewed

@@ -3,4 +3,4 @@
  * @param {RequestHandler[]} requestHandlers List of request handlers.
  * @see {@link https://mswjs.io/docs/api/setup-server `setupServer`}
  */
-export declare const setupServer: (...requestHandlers: import("..").RequestHandler<Record<string, any>, import("..").MockedRequest<import("..").DefaultRequestBody>, any, import("..").MockedRequest<import("..").DefaultRequestBody>>[]) => import("./glossary").SetupServerApi;
+export declare const setupServer: (...requestHandlers: import("..").RequestHandler<import("../handlers/RequestHandler").RequestHandlerDefaultInfo, import("..").MockedRequest<import("..").DefaultRequestBody>, any, import("..").MockedRequest<import("..").DefaultRequestBody>>[]) => import("./glossary").SetupServerApi;

package/lib/types/utils/getResponse.d.ts CHANGED Viewed

@@ -12,4 +12,4 @@ export interface ResponseResolutionContext {
 /**
  * Returns a mocked response for a given request using following request handlers.
  */
-export declare const getResponse: <Request_1 extends MockedRequest<import("../handlers/RequestHandler").DefaultRequestBody>, Handler extends RequestHandler<Record<string, any>, MockedRequest<import("../handlers/RequestHandler").DefaultRequestBody>, any, MockedRequest<import("../handlers/RequestHandler").DefaultRequestBody>>[]>(request: Request_1, handlers: Handler, resolutionContext?: ResponseResolutionContext | undefined) => Promise<ResponseLookupResult>;
+export declare const getResponse: <Request_1 extends MockedRequest<import("../handlers/RequestHandler").DefaultRequestBody>, Handler extends RequestHandler<import("../handlers/RequestHandler").RequestHandlerDefaultInfo, MockedRequest<import("../handlers/RequestHandler").DefaultRequestBody>, any, MockedRequest<import("../handlers/RequestHandler").DefaultRequestBody>>[]>(request: Request_1, handlers: Handler, resolutionContext?: ResponseResolutionContext | undefined) => Promise<ResponseLookupResult>;

package/lib/types/utils/handleRequest.d.ts CHANGED Viewed

@@ -14,7 +14,7 @@ export interface HandleRequestOptions<ResponseType> {
     };
     /**
      * Transforms a `MockedResponse` instance returned from a handler
-     * to a response instance
+     * to a response instance supported by the lower tooling (i.e. interceptors).
      */
     transformResponse?(response: MockedResponse<string>): ResponseType;
     /**

package/lib/types/utils/internal/requestHandlerUtils.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
 import { RequestHandler } from '../../handlers/RequestHandler';
 export declare function use(currentHandlers: RequestHandler[], ...handlers: RequestHandler[]): void;
 export declare function restoreHandlers(handlers: RequestHandler[]): void;
-export declare function resetHandlers(initialHandlers: RequestHandler[], ...nextHandlers: RequestHandler[]): RequestHandler<Record<string, any>, import("../../handlers/RequestHandler").MockedRequest<import("../../handlers/RequestHandler").DefaultRequestBody>, any, import("../../handlers/RequestHandler").MockedRequest<import("../../handlers/RequestHandler").DefaultRequestBody>>[];
+export declare function resetHandlers(initialHandlers: RequestHandler[], ...nextHandlers: RequestHandler[]): RequestHandler<import("../../handlers/RequestHandler").RequestHandlerDefaultInfo, import("../../handlers/RequestHandler").MockedRequest<import("../../handlers/RequestHandler").DefaultRequestBody>, any, import("../../handlers/RequestHandler").MockedRequest<import("../../handlers/RequestHandler").DefaultRequestBody>>[];

package/lib/types/utils/matching/matchRequestUrl.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 export declare type Path = string | RegExp;
-export declare type PathParams = Record<string, string | string[]>;
+export declare type PathParams = Record<string, string | ReadonlyArray<string>>;
 export interface Match {
     matches: boolean;
     params?: PathParams;

package/lib/types/utils/request/onUnhandledRequest.d.ts CHANGED Viewed

@@ -1,5 +1,4 @@
 import { MockedRequest, RequestHandler } from '../../handlers/RequestHandler';
-declare type UnhandledRequestCallback = (request: MockedRequest) => void;
+export declare type UnhandledRequestCallback = (request: MockedRequest) => void;
 export declare type UnhandledRequestStrategy = 'bypass' | 'warn' | 'error' | UnhandledRequestCallback;
 export declare function onUnhandledRequest(request: MockedRequest, handlers: RequestHandler[], strategy?: UnhandledRequestStrategy): void;
-export {};

package/lib/types/utils/url/isAbsoluteUrl.d.ts ADDED Viewed

@@ -0,0 +1,4 @@
+/**
+ * Determines if the given URL string is an absolute URL.
+ */
+export declare function isAbsoluteUrl(url: string): boolean;

package/lib/umd/index.js CHANGED Viewed

@@ -22885,12 +22885,23 @@ Invalid value has been removed from localStorage to prevent subsequent failed pa
       return path.replace(REDUNDANT_CHARACTERS_EXP, '');
   }
+  /**
+   * Determines if the given URL string is an absolute URL.
+   */
+  function isAbsoluteUrl(url) {
+      return /^([a-z][a-z\d\+\-\.]*:)?\/\//i.test(url);
+  }
   /**
    * Returns an absolute URL based on the given path.
    */
   function getAbsoluteUrl(path, baseUrl) {
-      // Ignore absolute URLs.
-      if (!path.startsWith('/')) {
+      // already absolute URL
+      if (isAbsoluteUrl(path)) {
+          return path;
+      }
+      // Ignore path with pattern start with *
+      if (path.startsWith('*')) {
           return path;
       }
       // Resolve a relative request URL against a given custom "baseUrl"
@@ -22924,18 +22935,31 @@ Invalid value has been removed from localStorage to prevent subsequent failed pa
    */
   function coercePath(path) {
       return (path
-          /**
-           * Escape the protocol so that "path-to-regexp" could match
-           * absolute URL.
-           * @see https://github.com/pillarjs/path-to-regexp/issues/259
-           */
-          .replace(/^([^\/]+)(:)(?=\/\/)/g, '$1\\$2')
           /**
            * Replace wildcards ("*") with unnamed capturing groups
            * because "path-to-regexp" doesn't support wildcards.
            * Ignore path parameter' modifiers (i.e. ":name*").
            */
-          .replace(/(?<!(^|\/|\*+):[\w]+)(\*{1,2})/g, '(.*)'));
+          .replace(/([:a-zA-Z_-]*)(\*{1,2})+/g, (_, parameterName, wildcard) => {
+          const expression = '(.*)';
+          if (!parameterName) {
+              return expression;
+          }
+          return parameterName.startsWith(':')
+              ? `${parameterName}${wildcard}`
+              : `${parameterName}${expression}`;
+      })
+          /**
+           * Escape the port so that "path-to-regexp" can match
+           * absolute URLs including port numbers.
+           */
+          .replace(/([^\/])(:)(?=\d+)/, '$1\\$2')
+          /**
+           * Escape the protocol so that "path-to-regexp" could match
+           * absolute URL.
+           * @see https://github.com/pillarjs/path-to-regexp/issues/259
+           */
+          .replace(/^([^\/]+)(:)(?=\/\/)/, '$1\\$2'));
   }
   /**
    * Returns the result of matching given request URL against a mask.
@@ -23188,7 +23212,6 @@ Invalid value has been removed from localStorage to prevent subsequent failed pa
           const matchesMethod = this.info.method instanceof RegExp
               ? this.info.method.test(request.method)
               : isStringEqual(this.info.method, request.method);
-          // console.log({ request, matchesMethod, parsedResult })
           return matchesMethod && parsedResult.matches;
       }
       log(request, response) {
@@ -23321,10 +23344,10 @@ Consider naming this operation or using "graphql.operation" request handler to i
           graphql: [],
       });
   }
-  function getScoreForRestHandler() {
+  function getRestHandlerScore() {
       return (request, handler) => {
           const { path, method } = handler.info;
-          if (path instanceof RegExp) {
+          if (path instanceof RegExp || method instanceof RegExp) {
               return Infinity;
           }
           const hasSameMethod = isStringEqual(request.method, method);
@@ -23335,12 +23358,15 @@ Consider naming this operation or using "graphql.operation" request handler to i
           return score - methodScoreDelta;
       };
   }
-  function getScoreForGraphQLHandler(parsedQuery) {
+  function getGraphQLHandlerScore(parsedQuery) {
       return (_, handler) => {
           if (typeof parsedQuery.operationName === 'undefined') {
               return Infinity;
           }
           const { operationType, operationName } = handler.info;
+          if (typeof operationName !== 'string') {
+              return Infinity;
+          }
           const hasSameOperationType = parsedQuery.operationType === operationType;
           // Always treat a handler with the same operation type as a more similar one.
           const operationTypeScoreDelta = hasSameOperationType ? TYPE_MATCH_DELTA : 0;
@@ -23350,16 +23376,12 @@ Consider naming this operation or using "graphql.operation" request handler to i
   }
   function getSuggestedHandler(request, handlers, getScore) {
       const suggestedHandlers = handlers
-          .reduce((acc, handler) => {
+          .reduce((suggestions, handler) => {
           const score = getScore(request, handler);
-          return acc.concat([[score, handler]]);
+          return suggestions.concat([[score, handler]]);
       }, [])
-          .sort(([leftScore], [rightScore]) => {
-          return leftScore - rightScore;
-      })
-          .filter(([score]) => {
-          return score <= MAX_MATCH_SCORE;
-      })
+          .sort(([leftScore], [rightScore]) => leftScore - rightScore)
+          .filter(([score]) => score <= MAX_MATCH_SCORE)
           .slice(0, MAX_SUGGESTION_COUNT)
           .map(([, handler]) => handler);
       return suggestedHandlers;
@@ -23389,8 +23411,8 @@ ${handlers.map((handler) => `  • ${handler.info.header}`).join('\n')}`;
           ? handlerGroups.graphql
           : handlerGroups.rest;
       const suggestedHandlers = getSuggestedHandler(request, relevantHandlers, parsedGraphQLQuery
-          ? getScoreForGraphQLHandler(parsedGraphQLQuery)
-          : getScoreForRestHandler());
+          ? getGraphQLHandlerScore(parsedGraphQLQuery)
+          : getRestHandlerScore());
       const handlerSuggestion = suggestedHandlers.length > 0
           ? getSuggestedHandlersMessage(suggestedHandlers)
           : '';
@@ -23413,7 +23435,7 @@ Read more: https://mswjs.io/docs/getting-started/mocks\
               // Print a developer-friendly error.
               devUtils.error('Error: %s', message);
               // Throw an exception to halt request processing and not perform the original request.
-              throw new Error('Cannot bypass a request when using the "error" strategy for the "onUnhandledRequest" option.');
+              throw new Error(devUtils.formatMessage('Cannot bypass a request when using the "error" strategy for the "onUnhandledRequest" option.'));
           }
           case 'warn': {
               devUtils.warn('Warning: %s', message);
@@ -24003,14 +24025,14 @@ If this message still persists after updating, please report an issue: https://g
   Object.defineProperty(uuid, "__esModule", { value: true });
   uuid.uuidv4 = void 0;
-  function uuidv4$1() {
+  function uuidv4() {
       return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
           var r = (Math.random() * 16) | 0;
           var v = c == 'x' ? r : (r & 0x3) | 0x8;
           return v.toString(16);
       });
   }
-  uuid.uuidv4 = uuidv4$1;
+  uuid.uuidv4 = uuidv4;
   var browser = {exports: {}};
@@ -28288,22 +28310,12 @@ If this message still persists after updating, please report an issue: https://g
   };
   interceptXMLHttpRequest_1 = XMLHttpRequest.interceptXMLHttpRequest = interceptXMLHttpRequest;
-  function uuidv4() {
-      return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-          const r = (Math.random() * 16) | 0;
-          const v = c == 'x' ? r : (r & 0x3) | 0x8;
-          return v.toString(16);
-      });
-  }
   /**
    * Converts a given isomorphic request to a `MockedRequest` instance.
    */
   function parseIsomorphicRequest(request) {
-      const requestId = uuidv4();
-      request.headers.set('x-msw-request-id', requestId);
       const mockedRequest = {
-          id: requestId,
+          id: request.id,
           url: request.url,
           method: request.method,
           body: parseBody(request.body, request.headers),

package/lib/umd/mockServiceWorker.js CHANGED Viewed

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

package/native/lib/index.js CHANGED Viewed

@@ -362,14 +362,6 @@ function tryDecode(str, decode) {
   }
 }
-function uuidv4() {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-        const r = (Math.random() * 16) | 0;
-        const v = c == 'x' ? r : (r & 0x3) | 0x8;
-        return v.toString(16);
-    });
-}
 /**
  * Parses a given value into a JSON.
  * Does not throw an exception on an invalid JSON string.
@@ -1048,10 +1040,8 @@ function setRequestCookies(request) {
  * Converts a given isomorphic request to a `MockedRequest` instance.
  */
 function parseIsomorphicRequest(request) {
-    const requestId = uuidv4();
-    request.headers.set('x-msw-request-id', requestId);
     const mockedRequest = {
-        id: requestId,
+        id: request.id,
         url: request.url,
         method: request.method,
         body: parseBody(request.body, request.headers),
@@ -5387,12 +5377,23 @@ function cleanUrl(path) {
     return path.replace(REDUNDANT_CHARACTERS_EXP, '');
 }
+/**
+ * Determines if the given URL string is an absolute URL.
+ */
+function isAbsoluteUrl(url) {
+    return /^([a-z][a-z\d\+\-\.]*:)?\/\//i.test(url);
+}
 /**
  * Returns an absolute URL based on the given path.
  */
 function getAbsoluteUrl(path, baseUrl) {
-    // Ignore absolute URLs.
-    if (!path.startsWith('/')) {
+    // already absolute URL
+    if (isAbsoluteUrl(path)) {
+        return path;
+    }
+    // Ignore path with pattern start with *
+    if (path.startsWith('*')) {
         return path;
     }
     // Resolve a relative request URL against a given custom "baseUrl"
@@ -5426,18 +5427,31 @@ function normalizePath(path, baseUrl) {
  */
 function coercePath(path) {
     return (path
-        /**
-         * Escape the protocol so that "path-to-regexp" could match
-         * absolute URL.
-         * @see https://github.com/pillarjs/path-to-regexp/issues/259
-         */
-        .replace(/^([^\/]+)(:)(?=\/\/)/g, '$1\\$2')
         /**
          * Replace wildcards ("*") with unnamed capturing groups
          * because "path-to-regexp" doesn't support wildcards.
          * Ignore path parameter' modifiers (i.e. ":name*").
          */
-        .replace(/(?<!(^|\/|\*+):[\w]+)(\*{1,2})/g, '(.*)'));
+        .replace(/([:a-zA-Z_-]*)(\*{1,2})+/g, (_, parameterName, wildcard) => {
+        const expression = '(.*)';
+        if (!parameterName) {
+            return expression;
+        }
+        return parameterName.startsWith(':')
+            ? `${parameterName}${wildcard}`
+            : `${parameterName}${expression}`;
+    })
+        /**
+         * Escape the port so that "path-to-regexp" can match
+         * absolute URLs including port numbers.
+         */
+        .replace(/([^\/])(:)(?=\d+)/, '$1\\$2')
+        /**
+         * Escape the protocol so that "path-to-regexp" could match
+         * absolute URL.
+         * @see https://github.com/pillarjs/path-to-regexp/issues/259
+         */
+        .replace(/^([^\/]+)(:)(?=\/\/)/, '$1\\$2'));
 }
 /**
  * Returns the result of matching given request URL against a mask.
@@ -5697,7 +5711,6 @@ class RestHandler extends RequestHandler {
         const matchesMethod = this.info.method instanceof RegExp
             ? this.info.method.test(request.method)
             : isStringEqual(this.info.method, request.method);
-        // console.log({ request, matchesMethod, parsedResult })
         return matchesMethod && parsedResult.matches;
     }
     log(request, response) {
@@ -5830,10 +5843,10 @@ function groupHandlersByType(handlers) {
         graphql: [],
     });
 }
-function getScoreForRestHandler() {
+function getRestHandlerScore() {
     return (request, handler) => {
         const { path, method } = handler.info;
-        if (path instanceof RegExp) {
+        if (path instanceof RegExp || method instanceof RegExp) {
             return Infinity;
         }
         const hasSameMethod = isStringEqual(request.method, method);
@@ -5844,12 +5857,15 @@ function getScoreForRestHandler() {
         return score - methodScoreDelta;
     };
 }
-function getScoreForGraphQLHandler(parsedQuery) {
+function getGraphQLHandlerScore(parsedQuery) {
     return (_, handler) => {
         if (typeof parsedQuery.operationName === 'undefined') {
             return Infinity;
         }
         const { operationType, operationName } = handler.info;
+        if (typeof operationName !== 'string') {
+            return Infinity;
+        }
         const hasSameOperationType = parsedQuery.operationType === operationType;
         // Always treat a handler with the same operation type as a more similar one.
         const operationTypeScoreDelta = hasSameOperationType ? TYPE_MATCH_DELTA : 0;
@@ -5859,16 +5875,12 @@ function getScoreForGraphQLHandler(parsedQuery) {
 }
 function getSuggestedHandler(request, handlers, getScore) {
     const suggestedHandlers = handlers
-        .reduce((acc, handler) => {
+        .reduce((suggestions, handler) => {
         const score = getScore(request, handler);
-        return acc.concat([[score, handler]]);
+        return suggestions.concat([[score, handler]]);
     }, [])
-        .sort(([leftScore], [rightScore]) => {
-        return leftScore - rightScore;
-    })
-        .filter(([score]) => {
-        return score <= MAX_MATCH_SCORE;
-    })
+        .sort(([leftScore], [rightScore]) => leftScore - rightScore)
+        .filter(([score]) => score <= MAX_MATCH_SCORE)
         .slice(0, MAX_SUGGESTION_COUNT)
         .map(([, handler]) => handler);
     return suggestedHandlers;
@@ -5898,8 +5910,8 @@ function onUnhandledRequest(request, handlers, strategy = 'warn') {
         ? handlerGroups.graphql
         : handlerGroups.rest;
     const suggestedHandlers = getSuggestedHandler(request, relevantHandlers, parsedGraphQLQuery
-        ? getScoreForGraphQLHandler(parsedGraphQLQuery)
-        : getScoreForRestHandler());
+        ? getGraphQLHandlerScore(parsedGraphQLQuery)
+        : getRestHandlerScore());
     const handlerSuggestion = suggestedHandlers.length > 0
         ? getSuggestedHandlersMessage(suggestedHandlers)
         : '';
@@ -5922,7 +5934,7 @@ Read more: https://mswjs.io/docs/getting-started/mocks\
             // Print a developer-friendly error.
             devUtils.error('Error: %s', message);
             // Throw an exception to halt request processing and not perform the original request.
-            throw new Error('Cannot bypass a request when using the "error" strategy for the "onUnhandledRequest" option.');
+            throw new Error(devUtils.formatMessage('Cannot bypass a request when using the "error" strategy for the "onUnhandledRequest" option.'));
         }
         case 'warn': {
             devUtils.warn('Warning: %s', message);
@@ -6054,15 +6066,14 @@ function createSetupServer(...interceptors$1) {
             },
         });
         interceptor.on('response', (request, response) => {
-            const requestId = request.headers.get('x-msw-request-id');
-            if (!requestId) {
+            if (!request.id) {
                 return;
             }
             if (response.headers.get('x-powered-by') === 'msw') {
-                emitter.emit('response:mocked', response, requestId);
+                emitter.emit('response:mocked', response, request.id);
             }
             else {
-                emitter.emit('response:bypass', response, requestId);
+                emitter.emit('response:bypass', response, request.id);
             }
         });
         return {