msw 2.1.3 → 2.1.5

package/lib/iife/index.js

@@ -1107,7 +1107,7 @@ var MockServiceWorker = (() => {
     return stringToRegexp(path, keys, options);
   }
 
-  // node_modules/.pnpm/@mswjs+interceptors@0.25.14/node_modules/@mswjs/interceptors/lib/browser/chunk-UJZOJSMP.mjs
+  // node_modules/.pnpm/@mswjs+interceptors@0.25.15/node_modules/@mswjs/interceptors/lib/browser/chunk-UJZOJSMP.mjs
   var encoder = new TextEncoder();
   function encodeBuffer(text) {
     return encoder.encode(text);
@@ -1420,7 +1420,7 @@ var MockServiceWorker = (() => {
     return message3.toString();
   }
 
-  // node_modules/.pnpm/@mswjs+interceptors@0.25.14/node_modules/@mswjs/interceptors/lib/browser/chunk-WZQN3FMY.mjs
+  // node_modules/.pnpm/@mswjs+interceptors@0.25.15/node_modules/@mswjs/interceptors/lib/browser/chunk-WZQN3FMY.mjs
   var IS_PATCHED_MODULE = Symbol("isPatchedModule");
   function getGlobalSymbol(symbol) {
     return (
@@ -1565,7 +1565,7 @@ var MockServiceWorker = (() => {
     }
   };
 
-  // node_modules/.pnpm/@mswjs+interceptors@0.25.14/node_modules/@mswjs/interceptors/lib/browser/index.mjs
+  // node_modules/.pnpm/@mswjs+interceptors@0.25.15/node_modules/@mswjs/interceptors/lib/browser/index.mjs
   var BatchInterceptor = class extends Interceptor {
     constructor(options) {
       BatchInterceptor.symbol = Symbol(options.name);
@@ -1674,13 +1674,13 @@ var MockServiceWorker = (() => {
     };
   }
 
-  // src/core/utils/request/getPublicUrlFromRequest.ts
-  function getPublicUrlFromRequest(request) {
+  // src/core/utils/request/toPublicUrl.ts
+  function toPublicUrl(url) {
     if (typeof location === "undefined") {
-      return request.url;
+      return url.toString();
     }
-    const url = new URL(request.url);
-    return url.origin === location.origin ? url.pathname : url.origin + url.pathname;
+    const urlInstance = url instanceof URL ? url : new URL(url);
+    return urlInstance.origin === location.origin ? urlInstance.pathname : urlInstance.origin + urlInstance.pathname;
   }
 
   // node_modules/.pnpm/@bundled-es-modules+cookie@2.0.0/node_modules/@bundled-es-modules/cookie/index-esm.js
@@ -2300,7 +2300,7 @@ Invalid value has been removed from localStorage to prevent subsequent failed pa
       };
     }
     async log(args) {
-      const publicUrl = getPublicUrlFromRequest(args.request);
+      const publicUrl = toPublicUrl(args.request.url);
       const loggedRequest = await serializeRequest(args.request);
       const loggedResponse = await serializeResponse(args.response);
       const statusColor = getStatusCodeColor(loggedResponse.status);
@@ -5383,7 +5383,7 @@ spurious results.`);
     const { query, variables } = input;
     const parsedResult = parseQuery(query);
     if (parsedResult instanceof Error) {
-      const requestPublicUrl = getPublicUrlFromRequest(request);
+      const requestPublicUrl = toPublicUrl(request.url);
       throw new Error(
         devUtils.formatMessage(
           'Failed to intercept a GraphQL request to "%s %s": cannot parse query. See the error message from the parser below.\n\n%s',
@@ -5482,7 +5482,7 @@ spurious results.`);
         return false;
       }
       if (!args.parsedResult.operationName && this.info.operationType !== "all") {
-        const publicUrl = getPublicUrlFromRequest(args.request);
+        const publicUrl = toPublicUrl(args.request.url);
         devUtils.warn(`Failed to intercept a GraphQL request at "${args.request.method} ${publicUrl}": anonymous GraphQL operations are not supported.
 
 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`);
@@ -5633,222 +5633,20 @@ Consider naming this operation or using "graphql.operation()" request handler to
     return null;
   };
 
-  // node_modules/.pnpm/@bundled-es-modules+js-levenshtein@2.0.1/node_modules/@bundled-es-modules/js-levenshtein/index-esm.js
-  var __create5 = Object.create;
-  var __defProp7 = Object.defineProperty;
-  var __getOwnPropDesc6 = Object.getOwnPropertyDescriptor;
-  var __getOwnPropNames6 = Object.getOwnPropertyNames;
-  var __getProtoOf5 = Object.getPrototypeOf;
-  var __hasOwnProp6 = Object.prototype.hasOwnProperty;
-  var __commonJS5 = (cb, mod) => function __require() {
-    return mod || (0, cb[__getOwnPropNames6(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-  };
-  var __copyProps6 = (to, from, except, desc) => {
-    if (from && typeof from === "object" || typeof from === "function") {
-      for (let key of __getOwnPropNames6(from))
-        if (!__hasOwnProp6.call(to, key) && key !== except)
-          __defProp7(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc6(from, key)) || desc.enumerable });
-    }
-    return to;
-  };
-  var __toESM5 = (mod, isNodeMode, target) => (target = mod != null ? __create5(__getProtoOf5(mod)) : {}, __copyProps6(
-    // 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 ? __defProp7(target, "default", { value: mod, enumerable: true }) : target,
-    mod
-  ));
-  var require_js_levenshtein = __commonJS5({
-    "node_modules/js-levenshtein/index.js"(exports, module) {
-      "use strict";
-      module.exports = /* @__PURE__ */ function() {
-        function _min(d0, d1, d2, bx, ay) {
-          return d0 < d1 || d2 < d1 ? d0 > d2 ? d2 + 1 : d0 + 1 : bx === ay ? d1 : d1 + 1;
-        }
-        return function(a, b) {
-          if (a === b) {
-            return 0;
-          }
-          if (a.length > b.length) {
-            var tmp = a;
-            a = b;
-            b = tmp;
-          }
-          var la = a.length;
-          var lb = b.length;
-          while (la > 0 && a.charCodeAt(la - 1) === b.charCodeAt(lb - 1)) {
-            la--;
-            lb--;
-          }
-          var offset = 0;
-          while (offset < la && a.charCodeAt(offset) === b.charCodeAt(offset)) {
-            offset++;
-          }
-          la -= offset;
-          lb -= offset;
-          if (la === 0 || lb < 3) {
-            return lb;
-          }
-          var x = 0;
-          var y;
-          var d0;
-          var d1;
-          var d2;
-          var d3;
-          var dd;
-          var dy;
-          var ay;
-          var bx0;
-          var bx1;
-          var bx2;
-          var bx3;
-          var vector = [];
-          for (y = 0; y < la; y++) {
-            vector.push(y + 1);
-            vector.push(a.charCodeAt(offset + y));
-          }
-          var len = vector.length - 1;
-          for (; x < lb - 3; ) {
-            bx0 = b.charCodeAt(offset + (d0 = x));
-            bx1 = b.charCodeAt(offset + (d1 = x + 1));
-            bx2 = b.charCodeAt(offset + (d2 = x + 2));
-            bx3 = b.charCodeAt(offset + (d3 = x + 3));
-            dd = x += 4;
-            for (y = 0; y < len; y += 2) {
-              dy = vector[y];
-              ay = vector[y + 1];
-              d0 = _min(dy, d0, d1, bx0, ay);
-              d1 = _min(d0, d1, d2, bx1, ay);
-              d2 = _min(d1, d2, d3, bx2, ay);
-              dd = _min(d2, d3, dd, bx3, ay);
-              vector[y] = dd;
-              d3 = d2;
-              d2 = d1;
-              d1 = d0;
-              d0 = dy;
-            }
-          }
-          for (; x < lb; ) {
-            bx0 = b.charCodeAt(offset + (d0 = x));
-            dd = ++x;
-            for (y = 0; y < len; y += 2) {
-              dy = vector[y];
-              vector[y] = dd = _min(dy, d0, dd, bx0, vector[y + 1]);
-              d0 = dy;
-            }
-          }
-          return dd;
-        };
-      }();
-    }
-  });
-  var import_js_levenshtein = __toESM5(require_js_levenshtein(), 1);
-  var source_default3 = import_js_levenshtein.default;
-
   // src/core/utils/request/onUnhandledRequest.ts
-  var getStringMatchScore = source_default3;
-  var MAX_MATCH_SCORE = 3;
-  var MAX_SUGGESTION_COUNT = 4;
-  var TYPE_MATCH_DELTA = 0.5;
-  function groupHandlersByType(handlers) {
-    return handlers.reduce(
-      (groups, handler) => {
-        if (handler instanceof HttpHandler) {
-          groups.http.push(handler);
-        }
-        if (handler instanceof GraphQLHandler) {
-          groups.graphql.push(handler);
-        }
-        return groups;
-      },
-      {
-        http: [],
-        graphql: []
-      }
-    );
-  }
-  function getHttpHandlerScore() {
-    return (request, handler) => {
-      const { path, method } = handler.info;
-      if (path instanceof RegExp || method instanceof RegExp) {
-        return Infinity;
-      }
-      const hasSameMethod = isStringEqual(request.method, method);
-      const methodScoreDelta = hasSameMethod ? TYPE_MATCH_DELTA : 0;
-      const requestPublicUrl = getPublicUrlFromRequest(request);
-      const score = getStringMatchScore(requestPublicUrl, path);
-      return score - methodScoreDelta;
-    };
-  }
-  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;
-      const operationTypeScoreDelta = hasSameOperationType ? TYPE_MATCH_DELTA : 0;
-      const score = getStringMatchScore(parsedQuery.operationName, operationName);
-      return score - operationTypeScoreDelta;
-    };
-  }
-  function getSuggestedHandler(request, handlers, getScore) {
-    const suggestedHandlers = handlers.reduce((suggestions, handler) => {
-      const score = getScore(request, handler);
-      return suggestions.concat([[score, handler]]);
-    }, []).sort(([leftScore], [rightScore]) => leftScore - rightScore).filter(([score]) => score <= MAX_MATCH_SCORE).slice(0, MAX_SUGGESTION_COUNT).map(([, handler]) => handler);
-    return suggestedHandlers;
-  }
-  function getSuggestedHandlersMessage(handlers) {
-    if (handlers.length > 1) {
-      return `Did you mean to request one of the following resources instead?
+  async function onUnhandledRequest(request, strategy = "warn") {
+    const url = new URL(request.url);
+    const publicUrl = toPublicUrl(url);
+    const unhandledRequestMessage = `intercepted a request without a matching request handler:
 
-${handlers.map((handler) => `  \u2022 ${handler.info.header}`).join("\n")}`;
-    }
-    return `Did you mean to request "${handlers[0].info.header}" instead?`;
-  }
-  async function onUnhandledRequest(request, handlers, strategy = "warn") {
-    const parsedGraphQLQuery = await parseGraphQLRequest(request).catch(
-      () => null
-    );
-    const publicUrl = getPublicUrlFromRequest(request);
-    function generateHandlerSuggestion() {
-      const handlerGroups = groupHandlersByType(handlers);
-      const relevantHandlers = parsedGraphQLQuery ? handlerGroups.graphql : handlerGroups.http;
-      const suggestedHandlers = getSuggestedHandler(
-        request,
-        relevantHandlers,
-        parsedGraphQLQuery ? getGraphQLHandlerScore(parsedGraphQLQuery) : getHttpHandlerScore()
-      );
-      return suggestedHandlers.length > 0 ? getSuggestedHandlersMessage(suggestedHandlers) : "";
-    }
-    function getGraphQLRequestHeader(parsedGraphQLRequest) {
-      if (!parsedGraphQLRequest?.operationName) {
-        return `anonymous ${parsedGraphQLRequest?.operationType} (${request.method} ${publicUrl})`;
-      }
-      return `${parsedGraphQLRequest.operationType} ${parsedGraphQLRequest.operationName} (${request.method} ${publicUrl})`;
-    }
-    function generateUnhandledRequestMessage() {
-      const requestHeader = parsedGraphQLQuery ? getGraphQLRequestHeader(parsedGraphQLQuery) : `${request.method} ${publicUrl}`;
-      const handlerSuggestion = generateHandlerSuggestion();
-      const messageTemplate = [
-        `intercepted a request without a matching request handler:`,
-        `  \u2022 ${requestHeader}`,
-        handlerSuggestion,
-        `If you still wish to intercept this unhandled request, please create a request handler for it.
-Read more: https://mswjs.io/docs/getting-started/mocks`
-      ].filter(Boolean);
-      return messageTemplate.join("\n\n");
-    }
+  \u2022 ${request.method} ${publicUrl}
+
+If you still wish to intercept this unhandled request, please create a request handler for it.
+Read more: https://mswjs.io/docs/getting-started/mocks`;
     function applyStrategy(strategy2) {
-      const message3 = generateUnhandledRequestMessage();
       switch (strategy2) {
         case "error": {
-          devUtils.error("Error: %s", message3);
+          devUtils.error("Error: %s", unhandledRequestMessage);
           throw new Error(
             devUtils.formatMessage(
               'Cannot bypass a request when using the "error" strategy for the "onUnhandledRequest" option.'
@@ -5856,7 +5654,7 @@ Read more: https://mswjs.io/docs/getting-started/mocks`
           );
         }
         case "warn": {
-          devUtils.warn("Warning: %s", message3);
+          devUtils.warn("Warning: %s", unhandledRequestMessage);
           break;
         }
         case "bypass":
@@ -5877,6 +5675,9 @@ Read more: https://mswjs.io/docs/getting-started/mocks`
       });
       return;
     }
+    if (url.protocol === "file:") {
+      return;
+    }
     applyStrategy(strategy);
   }
 
@@ -5911,7 +5712,7 @@ Read more: https://mswjs.io/docs/getting-started/mocks`
       throw lookupResult.error;
     }
     if (!lookupResult.data) {
-      await onUnhandledRequest(request, handlers, options.onUnhandledRequest);
+      await onUnhandledRequest(request, options.onUnhandledRequest);
       emitter.emit("request:unhandled", { request, requestId });
       emitter.emit("request:end", { request, requestId });
       handleRequestOptions?.onPassthroughResponse?.(request);
@@ -6299,6 +6100,9 @@ Learn more about creating the Service Worker script: https://mswjs.io/docs/cli/i
       const requestId = message3.payload.id;
       const request = parseWorkerRequest(message3.payload);
       const requestCloneForLogs = request.clone();
+      const requestClone = request.clone();
+      RequestHandler.cache.set(request, requestClone);
+      context.requests.set(requestId, requestClone);
       try {
         await handleRequest(
           request,
@@ -6390,6 +6194,9 @@ This exception has been gracefully handled as a 500 response, however, it's stro
   function createResponseListener(context) {
     return (_, message3) => {
       const { payload: responseJson } = message3;
+      const { requestId } = responseJson;
+      const request = context.requests.get(requestId);
+      context.requests.delete(requestId);
       if (responseJson.type?.includes("opaque")) {
         return;
       }
@@ -6407,11 +6214,7 @@ This exception has been gracefully handled as a 500 response, however, it's stro
         responseJson.isMockedResponse ? "response:mocked" : "response:bypass",
         {
           response,
-          /**
-           * @todo @fixme In this context, we don't know anything about
-           * the request.
-           */
-          request: null,
+          request,
           requestId: responseJson.requestId
         }
       );
@@ -6644,7 +6447,7 @@ If this message still persists after updating, please report an issue: https://g
     }
   };
 
-  // node_modules/.pnpm/@mswjs+interceptors@0.25.14/node_modules/@mswjs/interceptors/lib/browser/chunk-72HT65NX.mjs
+  // node_modules/.pnpm/@mswjs+interceptors@0.25.15/node_modules/@mswjs/interceptors/lib/browser/chunk-72HT65NX.mjs
   function uuidv4() {
     return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
       const r = Math.random() * 16 | 0;
@@ -6689,7 +6492,7 @@ If this message still persists after updating, please report an issue: https://g
     }
   }
 
-  // node_modules/.pnpm/@mswjs+interceptors@0.25.14/node_modules/@mswjs/interceptors/lib/browser/chunk-KDHQ3KDO.mjs
+  // node_modules/.pnpm/@mswjs+interceptors@0.25.15/node_modules/@mswjs/interceptors/lib/browser/chunk-44V5AUD6.mjs
   function isPropertyAccessible2(obj, key) {
     try {
       obj[key];
@@ -6698,6 +6501,14 @@ If this message still persists after updating, please report an issue: https://g
       return false;
     }
   }
+  function canParseUrl(url) {
+    try {
+      new URL(url);
+      return true;
+    } catch (_error) {
+      return false;
+    }
+  }
   var _FetchInterceptor = class extends Interceptor {
     constructor() {
       super(_FetchInterceptor.symbol);
@@ -6714,7 +6525,8 @@ If this message still persists after updating, please report an issue: https://g
       globalThis.fetch = async (input, init) => {
         var _a2;
         const requestId = uuidv4();
-        const request = new Request(input, init);
+        const resolvedInput = typeof input === "string" && typeof location !== "undefined" && !canParseUrl(input) ? new URL(input, location.origin) : input;
+        const request = new Request(resolvedInput, init);
         this.logger.info("[%s] %s", request.method, request.url);
         const { interactiveRequest, requestController } = toInteractiveRequest(request);
         this.logger.info(
@@ -6826,7 +6638,7 @@ If this message still persists after updating, please report an issue: https://g
     });
   }
 
-  // node_modules/.pnpm/@mswjs+interceptors@0.25.14/node_modules/@mswjs/interceptors/lib/browser/chunk-DZVB7JEV.mjs
+  // node_modules/.pnpm/@mswjs+interceptors@0.25.15/node_modules/@mswjs/interceptors/lib/browser/chunk-DZVB7JEV.mjs
   function concatArrayBuffer(left, right) {
     const result = new Uint8Array(left.byteLength + right.byteLength);
     result.set(left, 0);
@@ -7670,6 +7482,7 @@ If this message still persists after updating, please report an issue: https://g
         worker: null,
         registration: null,
         requestHandlers: this.currentHandlers,
+        requests: /* @__PURE__ */ new Map(),
         emitter: this.emitter,
         workerChannel: {
           on: (eventType, callback) => {