msw 1.2.1 → 1.2.3

package/lib/index.js

@@ -927,9 +927,10 @@ function prepareRequest(request) {
 var import_headers_polyfill6 = require("headers-polyfill");
 function prepareResponse(res) {
   const responseHeaders = (0, import_headers_polyfill6.objectToHeaders)(res.headers);
+  const parsedBody = parseBody(res.body, responseHeaders);
   return {
     ...res,
-    body: parseBody(res.body, responseHeaders)
+    body: parsedBody
   };
 }
 
@@ -1607,12 +1608,12 @@ async function handleRequest(request, handlers, options, emitter, handleRequestO
 
 // src/utils/logging/serializeResponse.ts
 var import_headers_polyfill9 = require("headers-polyfill");
-function serializeResponse(source) {
+async function serializeResponse(response2) {
   return {
-    status: source.status,
-    statusText: source.statusText,
-    headers: (0, import_headers_polyfill9.flattenHeadersObject)((0, import_headers_polyfill9.headersToObject)(source.headers)),
-    body: source.body
+    status: response2.status,
+    statusText: response2.statusText,
+    headers: (0, import_headers_polyfill9.flattenHeadersObject)((0, import_headers_polyfill9.headersToObject)(response2.headers)),
+    body: await response2.clone().text()
   };
 }
 
@@ -1642,6 +1643,7 @@ var createRequestListener = (context, options) => {
               );
             }
             const responseInstance = new Response(response2.body, response2);
+            const responseForLogs = responseInstance.clone();
             const responseBodyBuffer = await responseInstance.arrayBuffer();
             const responseBody = response2.body == null ? null : responseBodyBuffer;
             messageChannel.postMessage(
@@ -1653,10 +1655,10 @@ var createRequestListener = (context, options) => {
               [responseBodyBuffer]
             );
             if (!options.quiet) {
-              context.emitter.once("response:mocked", (response3) => {
+              context.emitter.once("response:mocked", async () => {
                 handler.log(
                   publicRequest,
-                  serializeResponse(response3),
+                  await serializeResponse(responseForLogs),
                   parsedRequest
                 );
               });
@@ -1902,45 +1904,22 @@ var DEFAULT_START_OPTIONS = {
 };
 
 // src/setupWorker/start/createFallbackRequestListener.ts
-var import_interceptors4 = require("@mswjs/interceptors");
+var import_interceptors3 = require("@mswjs/interceptors");
 var import_fetch3 = require("@mswjs/interceptors/lib/interceptors/fetch");
 var import_XMLHttpRequest = require("@mswjs/interceptors/lib/interceptors/XMLHttpRequest");
 
 // src/utils/request/createResponseFromIsomorphicResponse.ts
-var import_interceptors3 = require("@mswjs/interceptors");
-var noop = () => {
-  throw new Error("Not implemented");
-};
 function createResponseFromIsomorphicResponse(response2) {
-  return {
-    ...response2,
-    ok: response2.status >= 200 && response2.status < 300,
-    url: "",
-    type: "default",
+  return new Response(response2.body, {
     status: response2.status,
     statusText: response2.statusText,
-    headers: response2.headers,
-    body: new ReadableStream(),
-    redirected: response2.headers.get("Location") != null,
-    async text() {
-      return response2.body || "";
-    },
-    async json() {
-      return JSON.parse(response2.body || "");
-    },
-    async arrayBuffer() {
-      return (0, import_interceptors3.encodeBuffer)(response2.body || "");
-    },
-    bodyUsed: false,
-    formData: noop,
-    blob: noop,
-    clone: noop
-  };
+    headers: response2.headers
+  });
 }
 
 // src/setupWorker/start/createFallbackRequestListener.ts
 function createFallbackRequestListener(context, options) {
-  const interceptor = new import_interceptors4.BatchInterceptor({
+  const interceptor = new import_interceptors3.BatchInterceptor({
     name: "fallback",
     interceptors: [new import_fetch3.FetchInterceptor(), new import_XMLHttpRequest.XMLHttpRequestInterceptor()]
   });
@@ -1966,10 +1945,10 @@ function createFallbackRequestListener(context, options) {
         },
         onMockedResponse(_, { handler, publicRequest, parsedRequest }) {
           if (!options.quiet) {
-            context.emitter.once("response:mocked", (response3) => {
+            context.emitter.once("response:mocked", async (response3) => {
               handler.log(
                 publicRequest,
-                serializeResponse(response3),
+                await serializeResponse(response3),
                 parsedRequest
               );
             });