msw 2.6.4 → 2.6.6

package/lib/browser/index.js

@@ -403,7 +403,7 @@ You can also automate this process and make the worker script update automatical
   }
 }
 
-// node_modules/.pnpm/@mswjs+interceptors@0.36.10/node_modules/@mswjs/interceptors/lib/browser/chunk-6HYIRFX2.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.37.0/node_modules/@mswjs/interceptors/lib/browser/chunk-6HYIRFX2.mjs
 var encoder = new TextEncoder();
 function encodeBuffer(text) {
   return encoder.encode(text);
@@ -419,54 +419,67 @@ function toArrayBuffer(array) {
   );
 }
 
-// node_modules/.pnpm/@mswjs+interceptors@0.36.10/node_modules/@mswjs/interceptors/lib/browser/chunk-6MOMO77R.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.37.0/node_modules/@mswjs/interceptors/lib/browser/chunk-F4BN745U.mjs
 var IS_PATCHED_MODULE = Symbol("isPatchedModule");
-function isPropertyAccessible(obj, key) {
-  try {
-    obj[key];
-    return true;
-  } catch (e) {
-    return false;
+var _FetchResponse = class extends Response {
+  static isConfigurableStatusCode(status) {
+    return status >= 200 && status <= 599;
   }
-}
-var RESPONSE_STATUS_CODES_WITHOUT_BODY = /* @__PURE__ */ new Set([
-  101,
-  103,
-  204,
-  205,
-  304
-]);
-var RESPONSE_STATUS_CODES_WITH_REDIRECT = /* @__PURE__ */ new Set([
-  301,
-  302,
-  303,
-  307,
-  308
-]);
-function isResponseWithoutBody(status) {
-  return RESPONSE_STATUS_CODES_WITHOUT_BODY.has(status);
-}
-function createServerErrorResponse(body) {
-  return new Response(
-    JSON.stringify(
-      body instanceof Error ? {
-        name: body.name,
-        message: body.message,
-        stack: body.stack
-      } : body
-    ),
-    {
-      status: 500,
-      statusText: "Unhandled Exception",
-      headers: {
-        "Content-Type": "application/json"
+  static isRedirectResponse(status) {
+    return _FetchResponse.STATUS_CODES_WITH_REDIRECT.includes(status);
+  }
+  /**
+   * Returns a boolean indicating whether the given response status
+   * code represents a response that can have a body.
+   */
+  static isResponseWithBody(status) {
+    return !_FetchResponse.STATUS_CODES_WITHOUT_BODY.includes(status);
+  }
+  static setUrl(url, response) {
+    if (!url) {
+      return;
+    }
+    if (response.url != "") {
+      return;
+    }
+    Object.defineProperty(response, "url", {
+      value: url,
+      enumerable: true,
+      configurable: true,
+      writable: false
+    });
+  }
+  constructor(body, init = {}) {
+    var _a;
+    const status = (_a = init.status) != null ? _a : 200;
+    const safeStatus = _FetchResponse.isConfigurableStatusCode(status) ? status : 200;
+    const finalBody = _FetchResponse.isResponseWithBody(status) ? body : null;
+    super(finalBody, {
+      ...init,
+      status: safeStatus
+    });
+    if (status !== safeStatus) {
+      const stateSymbol = Object.getOwnPropertySymbols(this).find(
+        (symbol) => symbol.description === "state"
+      );
+      if (stateSymbol) {
+        const state = Reflect.get(this, stateSymbol);
+        Reflect.set(state, "status", status);
+      } else {
+        Object.defineProperty(this, "status", {
+          value: status,
+          enumerable: true,
+          configurable: true,
+          writable: false
+        });
       }
     }
-  );
-}
-function isResponseError(response) {
-  return isPropertyAccessible(response, "type") && response.type === "error";
-}
+    _FetchResponse.setUrl(init.url, this);
+  }
+};
+var FetchResponse = _FetchResponse;
+FetchResponse.STATUS_CODES_WITHOUT_BODY = [101, 103, 204, 205, 304];
+FetchResponse.STATUS_CODES_WITH_REDIRECT = [301, 302, 303, 307, 308];
 
 // node_modules/.pnpm/@open-draft+logger@0.3.0/node_modules/@open-draft/logger/lib/index.mjs
 var __defProp2 = Object.defineProperty;
@@ -905,7 +918,7 @@ var _Emitter = class {
 var Emitter = _Emitter;
 Emitter.defaultMaxListeners = 10;
 
-// node_modules/.pnpm/@mswjs+interceptors@0.36.10/node_modules/@mswjs/interceptors/lib/browser/chunk-QED3Q6Z2.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.37.0/node_modules/@mswjs/interceptors/lib/browser/chunk-QED3Q6Z2.mjs
 var INTERNAL_REQUEST_ID_HEADER_NAME = "x-interceptors-internal-request-id";
 function getGlobalSymbol(symbol) {
   return (
@@ -1053,7 +1066,7 @@ function createRequestId() {
   return Math.random().toString(16).slice(2);
 }
 
-// node_modules/.pnpm/@mswjs+interceptors@0.36.10/node_modules/@mswjs/interceptors/lib/browser/index.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.37.0/node_modules/@mswjs/interceptors/lib/browser/index.mjs
 var BatchInterceptor = class extends Interceptor {
   constructor(options) {
     BatchInterceptor.symbol = Symbol(options.name);
@@ -1106,23 +1119,24 @@ function createResponseListener(context) {
     if (responseJson.type?.includes("opaque")) {
       return;
     }
-    const response = responseJson.status === 0 ? Response.error() : new Response(
+    const response = responseJson.status === 0 ? Response.error() : new FetchResponse(
       /**
        * Responses may be streams here, but when we create a response object
        * with null-body status codes, like 204, 205, 304 Response will
        * throw when passed a non-null body, so ensure it's null here
        * for those codes
        */
-      isResponseWithoutBody(responseJson.status) ? null : responseJson.body,
-      responseJson
+      FetchResponse.isResponseWithBody(responseJson.status) ? responseJson.body : null,
+      {
+        ...responseJson,
+        /**
+         * Set response URL if it's not set already.
+         * @see https://github.com/mswjs/msw/issues/2030
+         * @see https://developer.mozilla.org/en-US/docs/Web/API/Response/url
+         */
+        url: request.url
+      }
     );
-    if (!response.url) {
-      Object.defineProperty(response, "url", {
-        value: request.url,
-        enumerable: true,
-        writable: false
-      });
-    }
     context.emitter.emit(
       responseJson.isMockedResponse ? "response:mocked" : "response:bypass",
       {
@@ -1339,7 +1353,7 @@ var DeferredPromise = class extends Promise {
   }
 };
 
-// node_modules/.pnpm/@mswjs+interceptors@0.36.10/node_modules/@mswjs/interceptors/lib/browser/chunk-4RQHC4IY.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.37.0/node_modules/@mswjs/interceptors/lib/browser/chunk-H5O73WD2.mjs
 var InterceptorError = class extends Error {
   constructor(message) {
     super(message);
@@ -1400,6 +1414,35 @@ async function emitAsync(emitter, eventName, ...data) {
     await listener.apply(emitter, data);
   }
 }
+function isPropertyAccessible(obj, key) {
+  try {
+    obj[key];
+    return true;
+  } catch (e) {
+    return false;
+  }
+}
+function createServerErrorResponse(body) {
+  return new Response(
+    JSON.stringify(
+      body instanceof Error ? {
+        name: body.name,
+        message: body.message,
+        stack: body.stack
+      } : body
+    ),
+    {
+      status: 500,
+      statusText: "Unhandled Exception",
+      headers: {
+        "Content-Type": "application/json"
+      }
+    }
+  );
+}
+function isResponseError(response) {
+  return isPropertyAccessible(response, "type") && response.type === "error";
+}
 function isNodeLikeError(error2) {
   if (error2 == null) {
     return false;
@@ -1511,7 +1554,7 @@ async function handleRequest2(options) {
   return false;
 }
 
-// node_modules/.pnpm/@mswjs+interceptors@0.36.10/node_modules/@mswjs/interceptors/lib/browser/chunk-TX5GBTFY.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.37.0/node_modules/@mswjs/interceptors/lib/browser/chunk-TX5GBTFY.mjs
 function hasConfigurableGlobal(propertyName) {
   const descriptor = Object.getOwnPropertyDescriptor(globalThis, propertyName);
   if (typeof descriptor === "undefined") {
@@ -1532,7 +1575,7 @@ function hasConfigurableGlobal(propertyName) {
   return true;
 }
 
-// node_modules/.pnpm/@mswjs+interceptors@0.36.10/node_modules/@mswjs/interceptors/lib/browser/chunk-VXLPKFY4.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.37.0/node_modules/@mswjs/interceptors/lib/browser/chunk-HER3NHBG.mjs
 function canParseUrl(url) {
   try {
     new URL(url);
@@ -1708,8 +1751,9 @@ var _FetchInterceptor = class extends Interceptor {
             rawResponse
           });
           const decompressedStream = decompressResponse(rawResponse);
-          const response = decompressedStream === null ? rawResponse : new Response(decompressedStream, rawResponse);
-          if (RESPONSE_STATUS_CODES_WITH_REDIRECT.has(response.status)) {
+          const response = decompressedStream === null ? rawResponse : new FetchResponse(decompressedStream, rawResponse);
+          FetchResponse.setUrl(request.url, response);
+          if (FetchResponse.isRedirectResponse(response.status)) {
             if (request.redirect === "error") {
               responsePromise.reject(createNetworkError("unexpected redirect"));
               return;
@@ -1726,12 +1770,6 @@ var _FetchInterceptor = class extends Interceptor {
               return;
             }
           }
-          Object.defineProperty(response, "url", {
-            writable: false,
-            enumerable: true,
-            configurable: false,
-            value: request.url
-          });
           if (this.emitter.listenerCount("response") > 0) {
             this.logger.info('emitting the "response" event...');
             await emitAsync(this.emitter, "response", {
@@ -1797,7 +1835,7 @@ var _FetchInterceptor = class extends Interceptor {
 var FetchInterceptor = _FetchInterceptor;
 FetchInterceptor.symbol = Symbol("fetch");
 
-// node_modules/.pnpm/@mswjs+interceptors@0.36.10/node_modules/@mswjs/interceptors/lib/browser/chunk-MMAVIMED.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.37.0/node_modules/@mswjs/interceptors/lib/browser/chunk-4SRQFK76.mjs
 function concatArrayBuffer(left, right) {
   const result = new Uint8Array(left.byteLength + right.byteLength);
   result.set(left, 0);
@@ -1960,8 +1998,9 @@ function parseJson(data) {
   }
 }
 function createResponse(request, body) {
-  const responseBodyOrNull = isResponseWithoutBody(request.status) ? null : body;
-  return new Response(responseBodyOrNull, {
+  const responseBodyOrNull = FetchResponse.isResponseWithBody(request.status) ? body : null;
+  return new FetchResponse(responseBodyOrNull, {
+    url: request.responseURL,
     status: request.status,
     statusText: request.statusText,
     headers: createHeadersFromXMLHttpReqestHeaders(