msw 2.8.4 → 2.8.6

package/browser/package.json

@@ -1,7 +1,8 @@
 {
   "type": "module",
-  "main": "../lib/browser/index.mjs",
-  "types": "../lib/browser/index.d.mts",
+  "main": "../lib/browser/index.js",
+  "module": "../lib/browser/index.mjs",
+  "types": "../lib/browser/index.d.ts",
   "exports": {
     ".": {
       "module-sync": {

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.37.1/node_modules/@mswjs/interceptors/lib/browser/chunk-6HYIRFX2.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.38.7/node_modules/@mswjs/interceptors/lib/browser/chunk-6HYIRFX2.mjs
 var encoder = new TextEncoder();
 function encodeBuffer(text) {
   return encoder.encode(text);
@@ -419,8 +419,26 @@ function toArrayBuffer(array) {
   );
 }
 
-// node_modules/.pnpm/@mswjs+interceptors@0.37.1/node_modules/@mswjs/interceptors/lib/browser/chunk-F4BN745U.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.38.7/node_modules/@mswjs/interceptors/lib/browser/chunk-3RXCRGL2.mjs
 var IS_PATCHED_MODULE = Symbol("isPatchedModule");
+function canParseUrl(url) {
+  try {
+    new URL(url);
+    return true;
+  } catch (_error) {
+    return false;
+  }
+}
+function getValueBySymbol(symbolName, source) {
+  const ownSymbols = Object.getOwnPropertySymbols(source);
+  const symbol = ownSymbols.find((symbol2) => {
+    return symbol2.description === symbolName;
+  });
+  if (symbol) {
+    return Reflect.get(source, symbol);
+  }
+  return;
+}
 var _FetchResponse = class extends Response {
   static isConfigurableStatusCode(status) {
     return status >= 200 && status <= 599;
@@ -436,18 +454,30 @@ var _FetchResponse = class extends Response {
     return !_FetchResponse.STATUS_CODES_WITHOUT_BODY.includes(status);
   }
   static setUrl(url, response) {
-    if (!url) {
+    if (!url || url === "about:" || !canParseUrl(url)) {
       return;
     }
-    if (response.url != "") {
-      return;
+    const state = getValueBySymbol("state", response);
+    if (state) {
+      state.urlList.push(new URL(url));
+    } else {
+      Object.defineProperty(response, "url", {
+        value: url,
+        enumerable: true,
+        configurable: true,
+        writable: false
+      });
     }
-    Object.defineProperty(response, "url", {
-      value: url,
-      enumerable: true,
-      configurable: true,
-      writable: false
-    });
+  }
+  /**
+   * Parses the given raw HTTP headers into a Fetch API `Headers` instance.
+   */
+  static parseRawHeaders(rawHeaders) {
+    const headers = new Headers();
+    for (let line = 0; line < rawHeaders.length; line += 2) {
+      headers.append(rawHeaders[line], rawHeaders[line + 1]);
+    }
+    return headers;
   }
   constructor(body, init = {}) {
     var _a;
@@ -455,16 +485,14 @@ var _FetchResponse = class extends Response {
     const safeStatus = _FetchResponse.isConfigurableStatusCode(status) ? status : 200;
     const finalBody = _FetchResponse.isResponseWithBody(status) ? body : null;
     super(finalBody, {
-      ...init,
-      status: safeStatus
+      status: safeStatus,
+      statusText: init.statusText,
+      headers: init.headers
     });
     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);
+      const state = getValueBySymbol("state", this);
+      if (state) {
+        state.status = status;
       } else {
         Object.defineProperty(this, "status", {
           value: status,
@@ -480,6 +508,10 @@ var _FetchResponse = class extends Response {
 var FetchResponse = _FetchResponse;
 FetchResponse.STATUS_CODES_WITHOUT_BODY = [101, 103, 204, 205, 304];
 FetchResponse.STATUS_CODES_WITH_REDIRECT = [301, 302, 303, 307, 308];
+var kRawRequest = Symbol("kRawRequest");
+function setRawRequest(request, rawRequest) {
+  Reflect.set(request, kRawRequest, rawRequest);
+}
 
 // node_modules/.pnpm/@open-draft+logger@0.3.0/node_modules/@open-draft/logger/lib/index.mjs
 var __defProp2 = Object.defineProperty;
@@ -918,7 +950,7 @@ var _Emitter = class {
 var Emitter = _Emitter;
 Emitter.defaultMaxListeners = 10;
 
-// node_modules/.pnpm/@mswjs+interceptors@0.37.1/node_modules/@mswjs/interceptors/lib/browser/chunk-QED3Q6Z2.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.38.7/node_modules/@mswjs/interceptors/lib/browser/chunk-QED3Q6Z2.mjs
 var INTERNAL_REQUEST_ID_HEADER_NAME = "x-interceptors-internal-request-id";
 function getGlobalSymbol(symbol) {
   return (
@@ -1066,7 +1098,7 @@ function createRequestId() {
   return Math.random().toString(16).slice(2);
 }
 
-// node_modules/.pnpm/@mswjs+interceptors@0.37.1/node_modules/@mswjs/interceptors/lib/browser/index.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.38.7/node_modules/@mswjs/interceptors/lib/browser/index.mjs
 var BatchInterceptor = class extends Interceptor {
   constructor(options) {
     BatchInterceptor.symbol = Symbol(options.name);
@@ -1353,7 +1385,7 @@ var DeferredPromise = class extends Promise {
   }
 };
 
-// node_modules/.pnpm/@mswjs+interceptors@0.37.1/node_modules/@mswjs/interceptors/lib/browser/chunk-H5O73WD2.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.38.7/node_modules/@mswjs/interceptors/lib/browser/chunk-L37TY7LC.mjs
 var InterceptorError = class extends Error {
   constructor(message) {
     super(message);
@@ -1388,12 +1420,14 @@ var RequestController = class {
     this[kResponsePromise].resolve(response);
   }
   /**
-   * Error this request with the given error.
+   * Error this request with the given reason.
+   *
    * @example
    * controller.errorWith()
    * controller.errorWith(new Error('Oops!'))
+   * controller.errorWith({ message: 'Oops!'})
    */
-  errorWith(error2) {
+  errorWith(reason) {
     invariant.as(
       InterceptorError,
       !this[kRequestHandled],
@@ -1402,7 +1436,7 @@ var RequestController = class {
       this.request.url
     );
     this[kRequestHandled] = true;
-    this[kResponsePromise].resolve(error2);
+    this[kResponsePromise].resolve(reason);
   }
 };
 async function emitAsync(emitter, eventName, ...data) {
@@ -1414,6 +1448,9 @@ async function emitAsync(emitter, eventName, ...data) {
     await listener.apply(emitter, data);
   }
 }
+function isObject(value, loose = false) {
+  return loose ? Object.prototype.toString.call(value).startsWith("[object ") : Object.prototype.toString.call(value) === "[object Object]";
+}
 function isPropertyAccessible(obj, key) {
   try {
     obj[key];
@@ -1441,7 +1478,10 @@ function createServerErrorResponse(body) {
   );
 }
 function isResponseError(response) {
-  return isPropertyAccessible(response, "type") && response.type === "error";
+  return response != null && response instanceof Response && isPropertyAccessible(response, "type") && response.type === "error";
+}
+function isResponseLike(value) {
+  return isObject(value, true) && isPropertyAccessible(value, "status") && isPropertyAccessible(value, "statusText") && isPropertyAccessible(value, "bodyUsed");
 }
 function isNodeLikeError(error2) {
   if (error2 == null) {
@@ -1456,12 +1496,21 @@ async function handleRequest2(options) {
   const handleResponse = async (response) => {
     if (response instanceof Error) {
       options.onError(response);
-    } else if (isResponseError(response)) {
+      return true;
+    }
+    if (isResponseError(response)) {
       options.onRequestError(response);
-    } else {
+      return true;
+    }
+    if (isResponseLike(response)) {
       await options.onResponse(response);
+      return true;
     }
-    return true;
+    if (isObject(response)) {
+      options.onError(response);
+      return true;
+    }
+    return false;
   };
   const handleResponseError = async (error2) => {
     if (error2 instanceof InterceptorError) {
@@ -1499,7 +1548,7 @@ async function handleRequest2(options) {
     }
   }
   const result = await until(async () => {
-    const requestListtenersPromise = emitAsync(options.emitter, "request", {
+    const requestListenersPromise = emitAsync(options.emitter, "request", {
       requestId: options.requestId,
       request: options.request,
       controller: options.controller
@@ -1507,11 +1556,10 @@ async function handleRequest2(options) {
     await Promise.race([
       // Short-circuit the request handling promise if the request gets aborted.
       requestAbortPromise,
-      requestListtenersPromise,
+      requestListenersPromise,
       options.controller[kResponsePromise]
     ]);
-    const mockedResponse = await options.controller[kResponsePromise];
-    return mockedResponse;
+    return await options.controller[kResponsePromise];
   });
   if (requestAbortPromise.state === "rejected") {
     options.onError(requestAbortPromise.rejectionReason);
@@ -1554,7 +1602,7 @@ async function handleRequest2(options) {
   return false;
 }
 
-// node_modules/.pnpm/@mswjs+interceptors@0.37.1/node_modules/@mswjs/interceptors/lib/browser/chunk-TX5GBTFY.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.38.7/node_modules/@mswjs/interceptors/lib/browser/chunk-TX5GBTFY.mjs
 function hasConfigurableGlobal(propertyName) {
   const descriptor = Object.getOwnPropertyDescriptor(globalThis, propertyName);
   if (typeof descriptor === "undefined") {
@@ -1575,15 +1623,7 @@ function hasConfigurableGlobal(propertyName) {
   return true;
 }
 
-// node_modules/.pnpm/@mswjs+interceptors@0.37.1/node_modules/@mswjs/interceptors/lib/browser/chunk-HER3NHBG.mjs
-function canParseUrl(url) {
-  try {
-    new URL(url);
-    return true;
-  } catch (_error) {
-    return false;
-  }
-}
+// node_modules/.pnpm/@mswjs+interceptors@0.38.7/node_modules/@mswjs/interceptors/lib/browser/chunk-ARPHZXGT.mjs
 function createNetworkError(cause) {
   return Object.assign(new TypeError("Failed to fetch"), {
     cause
@@ -1731,8 +1771,11 @@ var _FetchInterceptor = class extends Interceptor {
     );
     globalThis.fetch = async (input, init) => {
       const requestId = createRequestId();
-      const resolvedInput = typeof input === "string" && typeof location !== "undefined" && !canParseUrl(input) ? new URL(input, location.origin) : input;
+      const resolvedInput = typeof input === "string" && typeof location !== "undefined" && !canParseUrl(input) ? new URL(input, location.href) : input;
       const request = new Request(resolvedInput, init);
+      if (input instanceof Request) {
+        setRawRequest(request, input);
+      }
       const responsePromise = new DeferredPromise();
       const controller = new RequestController(request);
       this.logger.info("[%s] %s", request.method, request.url);
@@ -1800,6 +1843,7 @@ var _FetchInterceptor = class extends Interceptor {
       this.logger.info(
         "no mocked response received, performing request as-is..."
       );
+      const requestCloneForResponseEvent = request.clone();
       return pureFetch(request).then(async (response) => {
         this.logger.info("original fetch performed", response);
         if (this.emitter.listenerCount("response") > 0) {
@@ -1808,7 +1852,7 @@ var _FetchInterceptor = class extends Interceptor {
           await emitAsync(this.emitter, "response", {
             response: responseClone,
             isMockedResponse: false,
-            request,
+            request: requestCloneForResponseEvent,
             requestId
           });
         }
@@ -1835,7 +1879,7 @@ var _FetchInterceptor = class extends Interceptor {
 var FetchInterceptor = _FetchInterceptor;
 FetchInterceptor.symbol = Symbol("fetch");
 
-// node_modules/.pnpm/@mswjs+interceptors@0.37.1/node_modules/@mswjs/interceptors/lib/browser/chunk-4SRQFK76.mjs
+// node_modules/.pnpm/@mswjs+interceptors@0.38.7/node_modules/@mswjs/interceptors/lib/browser/chunk-QKSBFQDK.mjs
 function concatArrayBuffer(left, right) {
   const result = new Uint8Array(left.byteLength + right.byteLength);
   result.set(left, 0);
@@ -2481,6 +2525,7 @@ var XMLHttpRequestController = class {
       }
     });
     define(fetchRequest, "headers", proxyHeaders);
+    setRawRequest(fetchRequest, this.request);
     this.logger.info("converted request to a Fetch API Request!", fetchRequest);
     return fetchRequest;
   }