msw 0.47.0 → 0.47.1

package/lib/index.d.ts

@@ -1,5 +1,5 @@
-import { R as ResponseTransformer, s as status, a as set, d as delay, f as fetch, b as RequestHandler, S as SetupWorkerApi, D as DefaultContext, c as DefaultBodyType, M as MockedRequest, e as ResponseResolver, g as ResponseResolutionContext, h as SerializedResponse, i as RequestHandlerDefaultInfo, j as MockedResponse, k as ResponseLookupResult, l as SharedOptions, m as ServerLifecycleEventsMap } from './glossary-c690f512.js';
-export { A as AsyncResponseResolverReturnType, c as DefaultBodyType, u as DefaultRequestMultipartBody, y as DelayMode, M as MockedRequest, H as MockedRequestInit, j as MockedResponse, z as RequestCache, E as RequestDestination, b as RequestHandler, B as RequestMode, F as RequestPriority, C as RequestRedirect, G as RequestReferrerPolicy, v as ResponseComposition, w as ResponseCompositionOptions, x as ResponseFunction, e as ResponseResolver, t as ResponseResolverReturnType, R as ResponseTransformer, S as SetupWorkerApi, l as SharedOptions, q as StartOptions, o as createResponseComposition, p as defaultContext, n as defaultResponse, r as response } from './glossary-c690f512.js';
+import { R as ResponseTransformer, s as status, a as set, d as delay, f as fetch, b as RequestHandler, S as SetupWorkerApi, D as DefaultContext, c as DefaultBodyType, M as MockedRequest, e as ResponseResolver, g as ResponseResolutionContext, h as SerializedResponse, i as RequestHandlerDefaultInfo, j as MockedResponse, k as ResponseLookupResult, l as SharedOptions, m as ServerLifecycleEventsMap } from './glossary-3d04462e.js';
+export { A as AsyncResponseResolverReturnType, c as DefaultBodyType, u as DefaultRequestMultipartBody, y as DelayMode, M as MockedRequest, H as MockedRequestInit, j as MockedResponse, z as RequestCache, E as RequestDestination, b as RequestHandler, B as RequestMode, F as RequestPriority, C as RequestRedirect, G as RequestReferrerPolicy, v as ResponseComposition, w as ResponseCompositionOptions, x as ResponseFunction, e as ResponseResolver, t as ResponseResolverReturnType, R as ResponseTransformer, S as SetupWorkerApi, l as SharedOptions, q as StartOptions, o as createResponseComposition, p as defaultContext, n as defaultResponse, r as response } from './glossary-3d04462e.js';
 import * as cookieUtils from 'cookie';
 import { GraphQLError, OperationTypeNode, DocumentNode } from 'graphql';
 import { StrictEventEmitter } from 'strict-event-emitter';
@@ -170,7 +170,7 @@ declare class RestHandler<RequestType extends MockedRequest<DefaultBodyType> = M
     parse(request: RequestType, resolutionContext?: ResponseResolutionContext): Match;
     protected getPublicRequest(request: RequestType, parsedResult: ParsedRestRequest): RestRequest<any, PathParams>;
     predicate(request: RequestType, parsedResult: ParsedRestRequest): boolean;
-    log(request: RequestType, response: SerializedResponse): void;
+    log(request: RequestType, response: SerializedResponse<any>): void;
 }
 
 declare const rest: {
@@ -236,7 +236,7 @@ declare class GraphQLHandler<Request extends GraphQLRequest<any> = GraphQLReques
     parse(request: MockedRequest): ParsedGraphQLRequest<GraphQLVariables>;
     protected getPublicRequest(request: Request, parsedResult: ParsedGraphQLRequest): GraphQLRequest<any>;
     predicate(request: MockedRequest, parsedResult: ParsedGraphQLRequest): boolean;
-    log(request: Request, response: SerializedResponse, handler: this, parsedRequest: ParsedGraphQLRequest): void;
+    log(request: Request, response: SerializedResponse<any>, parsedRequest: ParsedGraphQLRequest): void;
 }
 
 interface TypedDocumentNode<Result = {
@@ -343,11 +343,6 @@ interface HandleRequestOptions<ResponseType> {
      * Invoked when the mocked response is ready to be sent.
      */
     onMockedResponse?(response: ResponseType, handler: RequiredDeep<ResponseLookupResult>): void;
-    /**
-     * Invoked when the mocked response is sent.
-     * Respects the response delay duration.
-     */
-    onMockedResponseSent?(response: ResponseType, handler: RequiredDeep<ResponseLookupResult>): void;
 }
 declare function handleRequest<ResponseType extends Record<string, any> = MockedResponse<string>>(request: MockedRequest, handlers: RequestHandler[], options: RequiredDeep<SharedOptions>, emitter: StrictEventEmitter<ServerLifecycleEventsMap>, handleRequestOptions?: HandleRequestOptions<ResponseType>): Promise<ResponseType | undefined>;
 

package/lib/index.js

@@ -1091,10 +1091,7 @@ var RestHandler = class extends RequestHandler {
     const statusColor = getStatusCodeColor(response2.status);
     console.groupCollapsed(devUtils.formatMessage("%s %s %s (%c%s%c)"), getTimestamp(), request.method, publicUrl, `color:${statusColor}`, `${response2.status} ${response2.statusText}`, "color:inherit");
     console.log("Request", loggedRequest);
-    console.log("Handler:", {
-      mask: this.info.path,
-      resolver: this.resolver
-    });
+    console.log("Handler:", this);
     console.log("Response", loggedResponse);
     console.groupEnd();
   }
@@ -1196,7 +1193,7 @@ Consider naming this operation or using "graphql.operation" request handler to i
     const hasMatchingOperationName = this.info.operationName instanceof RegExp ? this.info.operationName.test(parsedResult.operationName || "") : parsedResult.operationName === this.info.operationName;
     return hasMatchingUrl.matches && hasMatchingOperationType && hasMatchingOperationName;
   }
-  log(request, response2, handler, parsedRequest) {
+  log(request, response2, parsedRequest) {
     const loggedRequest = prepareRequest(request);
     const loggedResponse = prepareResponse(response2);
     const statusColor = getStatusCodeColor(response2.status);
@@ -1327,7 +1324,7 @@ function readResponseCookies(request, response2) {
 
 // src/utils/handleRequest.ts
 async function handleRequest(request, handlers, options, emitter, handleRequestOptions) {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f;
   emitter.emit("request:start", request);
   if (request.headers.get("x-msw-bypass") === "true") {
     emitter.emit("request:end", request);
@@ -1368,11 +1365,21 @@ async function handleRequest(request, handlers, options, emitter, handleRequestO
   const requiredLookupResult = lookupResult;
   const transformedResponse = ((_e = handleRequestOptions == null ? void 0 : handleRequestOptions.transformResponse) == null ? void 0 : _e.call(handleRequestOptions, response2)) || response2;
   (_f = handleRequestOptions == null ? void 0 : handleRequestOptions.onMockedResponse) == null ? void 0 : _f.call(handleRequestOptions, transformedResponse, requiredLookupResult);
-  (_g = handleRequestOptions == null ? void 0 : handleRequestOptions.onMockedResponseSent) == null ? void 0 : _g.call(handleRequestOptions, transformedResponse, requiredLookupResult);
   emitter.emit("request:end", request);
   return transformedResponse;
 }
 
+// src/utils/logging/serializeResponse.ts
+var import_headers_polyfill8 = require("headers-polyfill");
+function serializeResponse(source) {
+  return {
+    status: source.status,
+    statusText: source.statusText,
+    headers: (0, import_headers_polyfill8.flattenHeadersObject)((0, import_headers_polyfill8.headersToObject)(source.headers)),
+    body: source.body
+  };
+}
+
 // src/setupWorker/start/createRequestListener.ts
 var createRequestListener = (context, options) => {
   return async (event, message) => {
@@ -1384,7 +1391,7 @@ var createRequestListener = (context, options) => {
         onPassthroughResponse() {
           messageChannel.postMessage("NOT_FOUND");
         },
-        async onMockedResponse(response2) {
+        async onMockedResponse(response2, { handler, publicRequest, parsedRequest }) {
           if (response2.body instanceof ReadableStream) {
             throw new Error(devUtils.formatMessage('Failed to construct a mocked response with a "ReadableStream" body: mocked streams are not supported. Follow https://github.com/mswjs/msw/issues/1336 for more details.'));
           }
@@ -1394,12 +1401,11 @@ var createRequestListener = (context, options) => {
           messageChannel.postMessage("MOCK_RESPONSE", __spreadProps(__spreadValues({}, response2), {
             body: responseBody
           }), [responseBodyBuffer]);
-        },
-        onMockedResponseSent(response2, { handler, publicRequest, parsedRequest }) {
-          if (options.quiet) {
-            return;
+          if (!options.quiet) {
+            context.emitter.once("response:mocked", (response3) => {
+              handler.log(publicRequest, serializeResponse(response3), parsedRequest);
+            });
           }
-          handler.log(publicRequest, response2, handler, parsedRequest);
         }
       });
     } catch (error2) {
@@ -1625,11 +1631,44 @@ function prepareStartHandler(handler, context) {
 }
 
 // src/setupWorker/start/createFallbackRequestListener.ts
-var import_interceptors3 = require("@mswjs/interceptors");
+var import_interceptors4 = 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 __spreadProps(__spreadValues({}, response2), {
+    ok: response2.status >= 200 && response2.status < 300,
+    url: "",
+    type: "default",
+    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
+  });
+}
+
+// src/setupWorker/start/createFallbackRequestListener.ts
 function createFallbackRequestListener(context, options) {
-  const interceptor = new import_interceptors3.BatchInterceptor({
+  const interceptor = new import_interceptors4.BatchInterceptor({
     name: "fallback",
     interceptors: [new import_fetch3.FetchInterceptor(), new import_XMLHttpRequest.XMLHttpRequestInterceptor()]
   });
@@ -1647,9 +1686,11 @@ function createFallbackRequestListener(context, options) {
           delay: response3.delay
         };
       },
-      onMockedResponseSent(response3, { handler, publicRequest, parsedRequest }) {
+      onMockedResponse(_, { handler, publicRequest, parsedRequest }) {
         if (!options.quiet) {
-          handler.log(publicRequest, response3, handler, parsedRequest);
+          context.emitter.once("response:mocked", (response3) => {
+            handler.log(publicRequest, serializeResponse(response3), parsedRequest);
+          });
         }
       }
     });
@@ -1657,6 +1698,17 @@ function createFallbackRequestListener(context, options) {
       request.respondWith(response2);
     }
   });
+  interceptor.on("response", (request, response2) => {
+    if (!request.id) {
+      return;
+    }
+    const browserResponse = createResponseFromIsomorphicResponse(response2);
+    if (response2.headers.get("x-powered-by") === "msw") {
+      context.emitter.emit("response:mocked", browserResponse, request.id);
+    } else {
+      context.emitter.emit("response:bypass", browserResponse, request.id);
+    }
+  });
   interceptor.apply();
   return interceptor;
 }