msw 2.1.4 → 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`);
@@ -5635,7 +5635,8 @@ Consider naming this operation or using "graphql.operation()" request handler to
 
   // src/core/utils/request/onUnhandledRequest.ts
   async function onUnhandledRequest(request, strategy = "warn") {
-    const publicUrl = getPublicUrlFromRequest(request);
+    const url = new URL(request.url);
+    const publicUrl = toPublicUrl(url);
     const unhandledRequestMessage = `intercepted a request without a matching request handler:
 
   \u2022 ${request.method} ${publicUrl}
@@ -5674,6 +5675,9 @@ Read more: https://mswjs.io/docs/getting-started/mocks`;
       });
       return;
     }
+    if (url.protocol === "file:") {
+      return;
+    }
     applyStrategy(strategy);
   }
 
@@ -6096,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,
@@ -6187,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;
       }
@@ -6204,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
         }
       );
@@ -6441,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;
@@ -6486,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];
@@ -6495,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);
@@ -6511,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(
@@ -6623,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);
@@ -7467,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) => {