msw 2.0.2 → 2.0.4

package/lib/browser/index.js

@@ -264,18 +264,18 @@ var createRequestListener = (context, options) => {
               const responseCloneForLogs = response.clone();
               const responseInit = (0, import_toResponseInit.toResponseInit)(response);
               if (context.supports.readableStreamTransfer) {
-                const responseStream = response.body;
+                const responseStreamOrNull = response.body;
                 messageChannel.postMessage(
                   "MOCK_RESPONSE",
                   __spreadProps(__spreadValues({}, responseInit), {
-                    body: responseStream
+                    body: responseStreamOrNull
                   }),
-                  responseStream ? [responseStream] : void 0
+                  responseStreamOrNull ? [responseStreamOrNull] : void 0
                 );
               } else {
-                const responseBuffer = yield responseClone.arrayBuffer();
+                const responseBufferOrNull = response.body === null ? null : yield responseClone.arrayBuffer();
                 messageChannel.postMessage("MOCK_RESPONSE", __spreadProps(__spreadValues({}, responseInit), {
-                  body: responseBuffer
+                  body: responseBufferOrNull
                 }));
               }
               if (!options.quiet) {

package/lib/browser/index.mjs

@@ -240,18 +240,18 @@ var createRequestListener = (context, options) => {
               const responseCloneForLogs = response.clone();
               const responseInit = toResponseInit(response);
               if (context.supports.readableStreamTransfer) {
-                const responseStream = response.body;
+                const responseStreamOrNull = response.body;
                 messageChannel.postMessage(
                   "MOCK_RESPONSE",
                   __spreadProps(__spreadValues({}, responseInit), {
-                    body: responseStream
+                    body: responseStreamOrNull
                   }),
-                  responseStream ? [responseStream] : void 0
+                  responseStreamOrNull ? [responseStreamOrNull] : void 0
                 );
               } else {
-                const responseBuffer = yield responseClone.arrayBuffer();
+                const responseBufferOrNull = response.body === null ? null : yield responseClone.arrayBuffer();
                 messageChannel.postMessage("MOCK_RESPONSE", __spreadProps(__spreadValues({}, responseInit), {
-                  body: responseBuffer
+                  body: responseBufferOrNull
                 }));
               }
               if (!options.quiet) {

package/lib/core/{GraphQLHandler-b42ca96f.d.ts → GraphQLHandler-d46c4f60.d.ts}

@@ -1,5 +1,5 @@
 import { OperationTypeNode, DocumentNode, GraphQLError } from 'graphql';
-import { g as RequestHandlerDefaultInfo, D as DefaultBodyType, R as RequestHandler, a as ResponseResolver, c as RequestHandlerOptions } from './RequestHandler-1a5dbdc7.js';
+import { g as RequestHandlerDefaultInfo, D as DefaultBodyType, R as RequestHandler, a as ResponseResolver, c as RequestHandlerOptions } from './RequestHandler-bb5cbb8f.js';
 import { Path } from './utils/matching/matchRequestUrl.js';
 
 interface ParsedGraphQLQuery {

package/lib/core/HttpResponse.d.ts

@@ -1,2 +1,2 @@
-export { f as HttpResponse, H as HttpResponseInit, S as StrictRequest, e as StrictResponse } from './RequestHandler-1a5dbdc7.js';
+export { f as HttpResponse, H as HttpResponseInit, S as StrictRequest, e as StrictResponse } from './RequestHandler-bb5cbb8f.js';
 import './typeUtils.js';

package/lib/core/HttpResponse.js

@@ -36,7 +36,9 @@ class HttpResponse extends Response {
    */
   static text(body, init) {
     const responseInit = (0, import_decorators.normalizeResponseInit)(init);
-    responseInit.headers.set("Content-Type", "text/plain");
+    if (!responseInit.headers.has("Content-Type")) {
+      responseInit.headers.set("Content-Type", "text/plain");
+    }
     return new HttpResponse(body, responseInit);
   }
   /**
@@ -47,7 +49,9 @@ class HttpResponse extends Response {
    */
   static json(body, init) {
     const responseInit = (0, import_decorators.normalizeResponseInit)(init);
-    responseInit.headers.set("Content-Type", "application/json");
+    if (!responseInit.headers.has("Content-Type")) {
+      responseInit.headers.set("Content-Type", "application/json");
+    }
     return new HttpResponse(
       JSON.stringify(body),
       responseInit
@@ -61,7 +65,9 @@ class HttpResponse extends Response {
    */
   static xml(body, init) {
     const responseInit = (0, import_decorators.normalizeResponseInit)(init);
-    responseInit.headers.set("Content-Type", "text/xml");
+    if (!responseInit.headers.has("Content-Type")) {
+      responseInit.headers.set("Content-Type", "text/xml");
+    }
     return new HttpResponse(body, responseInit);
   }
   /**

package/lib/core/HttpResponse.mjs

@@ -16,7 +16,9 @@ class HttpResponse extends Response {
    */
   static text(body, init) {
     const responseInit = normalizeResponseInit(init);
-    responseInit.headers.set("Content-Type", "text/plain");
+    if (!responseInit.headers.has("Content-Type")) {
+      responseInit.headers.set("Content-Type", "text/plain");
+    }
     return new HttpResponse(body, responseInit);
   }
   /**
@@ -27,7 +29,9 @@ class HttpResponse extends Response {
    */
   static json(body, init) {
     const responseInit = normalizeResponseInit(init);
-    responseInit.headers.set("Content-Type", "application/json");
+    if (!responseInit.headers.has("Content-Type")) {
+      responseInit.headers.set("Content-Type", "application/json");
+    }
     return new HttpResponse(
       JSON.stringify(body),
       responseInit
@@ -41,7 +45,9 @@ class HttpResponse extends Response {
    */
   static xml(body, init) {
     const responseInit = normalizeResponseInit(init);
-    responseInit.headers.set("Content-Type", "text/xml");
+    if (!responseInit.headers.has("Content-Type")) {
+      responseInit.headers.set("Content-Type", "text/xml");
+    }
     return new HttpResponse(body, responseInit);
   }
   /**

package/lib/core/{RequestHandler-1a5dbdc7.d.ts → RequestHandler-bb5cbb8f.d.ts}

@@ -52,7 +52,7 @@ declare class HttpResponse extends Response {
      * HttpResponse.json({ firstName: 'John' })
      * HttpResponse.json({ error: 'Not Authorized' }, { status: 401 })
      */
-    static json<BodyType extends DefaultBodyType>(body?: BodyType | null, init?: HttpResponseInit): StrictResponse<BodyType>;
+    static json<BodyType extends JsonBodyType>(body?: BodyType | null, init?: HttpResponseInit): StrictResponse<BodyType>;
     /**
      * Create a `Response` with a `Content-Type: "application/xml"` body.
      * @example
@@ -83,13 +83,14 @@ declare class HttpResponse extends Response {
 
 type DefaultRequestMultipartBody = Record<string, string | File | Array<string | File>>;
 type DefaultBodyType = Record<string, any> | DefaultRequestMultipartBody | string | number | boolean | null | undefined;
+type JsonBodyType = Record<string, any> | string | number | boolean | null | undefined;
 interface RequestHandlerDefaultInfo {
     header: string;
 }
 interface RequestHandlerInternalInfo {
     callFrame?: string;
 }
-type ResponseResolverReturnType<BodyType extends DefaultBodyType = undefined> = (BodyType extends undefined ? Response : StrictResponse<BodyType>) | undefined | void;
+type ResponseResolverReturnType<BodyType extends DefaultBodyType = undefined> = ([BodyType] extends [undefined] ? Response : StrictResponse<BodyType>) | undefined | void;
 type MaybeAsyncResponseResolverReturnType<BodyType extends DefaultBodyType> = MaybePromise<ResponseResolverReturnType<BodyType>>;
 type AsyncResponseResolverReturnType<BodyType extends DefaultBodyType> = MaybeAsyncResponseResolverReturnType<BodyType> | Generator<MaybeAsyncResponseResolverReturnType<BodyType>, MaybeAsyncResponseResolverReturnType<BodyType>, MaybeAsyncResponseResolverReturnType<BodyType>>;
 type ResponseResolverInfo<ResolverExtraInfo extends Record<string, unknown>, RequestBodyType extends DefaultBodyType = DefaultBodyType> = {
@@ -169,4 +170,4 @@ declare abstract class RequestHandler<HandlerInfo extends RequestHandlerDefaultI
     private createExecutionResult;
 }
 
-export { AsyncResponseResolverReturnType as A, DefaultBodyType as D, HttpResponseInit as H, MaybeAsyncResponseResolverReturnType as M, RequestHandler as R, StrictRequest as S, ResponseResolver as a, ResponseResolverReturnType as b, RequestHandlerOptions as c, DefaultRequestMultipartBody as d, StrictResponse as e, HttpResponse as f, RequestHandlerDefaultInfo as g, ResponseLookupResult as h, ResponseResolutionContext as i, getResponse as j, RequestHandlerInternalInfo as k, ResponseResolverInfo as l, RequestHandlerArgs as m, RequestHandlerExecutionResult as n };
+export { AsyncResponseResolverReturnType as A, DefaultBodyType as D, HttpResponseInit as H, JsonBodyType as J, MaybeAsyncResponseResolverReturnType as M, RequestHandler as R, StrictRequest as S, ResponseResolver as a, ResponseResolverReturnType as b, RequestHandlerOptions as c, DefaultRequestMultipartBody as d, StrictResponse as e, HttpResponse as f, RequestHandlerDefaultInfo as g, ResponseLookupResult as h, ResponseResolutionContext as i, getResponse as j, RequestHandlerInternalInfo as k, ResponseResolverInfo as l, RequestHandlerArgs as m, RequestHandlerExecutionResult as n };

package/lib/core/SetupApi.d.ts

@@ -1,5 +1,5 @@
 import { EventMap, Emitter } from 'strict-event-emitter';
-import { R as RequestHandler, g as RequestHandlerDefaultInfo } from './RequestHandler-1a5dbdc7.js';
+import { R as RequestHandler, g as RequestHandlerDefaultInfo } from './RequestHandler-bb5cbb8f.js';
 import { LifeCycleEventEmitter } from './sharedOptions.js';
 import { Disposable } from './utils/internal/Disposable.js';
 import './typeUtils.js';

package/lib/core/graphql.d.ts

@@ -1,6 +1,6 @@
 import { DocumentNode } from 'graphql';
-import { a as ResponseResolver, c as RequestHandlerOptions } from './RequestHandler-1a5dbdc7.js';
-import { a as GraphQLVariables, d as GraphQLHandlerNameSelector, e as GraphQLResolverExtras, f as GraphQLResponseBody, G as GraphQLHandler } from './GraphQLHandler-b42ca96f.js';
+import { a as ResponseResolver, c as RequestHandlerOptions } from './RequestHandler-bb5cbb8f.js';
+import { a as GraphQLVariables, d as GraphQLHandlerNameSelector, e as GraphQLResolverExtras, f as GraphQLResponseBody, G as GraphQLHandler } from './GraphQLHandler-d46c4f60.js';
 import { Path } from './utils/matching/matchRequestUrl.js';
 import './typeUtils.js';
 

package/lib/core/handlers/GraphQLHandler.d.ts

@@ -1,5 +1,5 @@
 import 'graphql';
-import '../RequestHandler-1a5dbdc7.js';
+import '../RequestHandler-bb5cbb8f.js';
 import '../utils/matching/matchRequestUrl.js';
-export { E as ExpectedOperationTypeNode, G as GraphQLHandler, k as GraphQLHandlerInfo, d as GraphQLHandlerNameSelector, c as GraphQLJsonRequestBody, b as GraphQLRequestBody, e as GraphQLResolverExtras, f as GraphQLResponseBody, a as GraphQLVariables, l as isDocumentNode } from '../GraphQLHandler-b42ca96f.js';
+export { E as ExpectedOperationTypeNode, G as GraphQLHandler, k as GraphQLHandlerInfo, d as GraphQLHandlerNameSelector, c as GraphQLJsonRequestBody, b as GraphQLRequestBody, e as GraphQLResolverExtras, f as GraphQLResponseBody, a as GraphQLVariables, l as isDocumentNode } from '../GraphQLHandler-d46c4f60.js';
 import '../typeUtils.js';

package/lib/core/handlers/HttpHandler.d.ts

@@ -1,4 +1,4 @@
-import { g as RequestHandlerDefaultInfo, R as RequestHandler, a as ResponseResolver, c as RequestHandlerOptions, i as ResponseResolutionContext } from '../RequestHandler-1a5dbdc7.js';
+import { g as RequestHandlerDefaultInfo, R as RequestHandler, a as ResponseResolver, c as RequestHandlerOptions, i as ResponseResolutionContext } from '../RequestHandler-bb5cbb8f.js';
 import { Path, Match, PathParams } from '../utils/matching/matchRequestUrl.js';
 import '../typeUtils.js';
 

package/lib/core/handlers/RequestHandler.d.ts

@@ -1,2 +1,2 @@
-export { A as AsyncResponseResolverReturnType, D as DefaultBodyType, d as DefaultRequestMultipartBody, M as MaybeAsyncResponseResolverReturnType, R as RequestHandler, m as RequestHandlerArgs, g as RequestHandlerDefaultInfo, n as RequestHandlerExecutionResult, k as RequestHandlerInternalInfo, c as RequestHandlerOptions, a as ResponseResolver, l as ResponseResolverInfo, b as ResponseResolverReturnType } from '../RequestHandler-1a5dbdc7.js';
+export { A as AsyncResponseResolverReturnType, D as DefaultBodyType, d as DefaultRequestMultipartBody, J as JsonBodyType, M as MaybeAsyncResponseResolverReturnType, R as RequestHandler, m as RequestHandlerArgs, g as RequestHandlerDefaultInfo, n as RequestHandlerExecutionResult, k as RequestHandlerInternalInfo, c as RequestHandlerOptions, a as ResponseResolver, l as ResponseResolverInfo, b as ResponseResolverReturnType } from '../RequestHandler-bb5cbb8f.js';
 import '../typeUtils.js';

package/lib/core/http.d.ts

@@ -1,4 +1,4 @@
-import { D as DefaultBodyType, a as ResponseResolver, c as RequestHandlerOptions } from './RequestHandler-1a5dbdc7.js';
+import { D as DefaultBodyType, a as ResponseResolver, c as RequestHandlerOptions } from './RequestHandler-bb5cbb8f.js';
 import { HttpRequestResolverExtras, HttpHandler } from './handlers/HttpHandler.js';
 import { PathParams, Path } from './utils/matching/matchRequestUrl.js';
 import './typeUtils.js';

package/lib/core/index.d.ts

@@ -1,9 +1,9 @@
 export { SetupApi } from './SetupApi.js';
-export { A as AsyncResponseResolverReturnType, D as DefaultBodyType, d as DefaultRequestMultipartBody, f as HttpResponse, H as HttpResponseInit, R as RequestHandler, c as RequestHandlerOptions, a as ResponseResolver, b as ResponseResolverReturnType, S as StrictRequest, e as StrictResponse } from './RequestHandler-1a5dbdc7.js';
+export { A as AsyncResponseResolverReturnType, D as DefaultBodyType, d as DefaultRequestMultipartBody, f as HttpResponse, H as HttpResponseInit, J as JsonBodyType, R as RequestHandler, c as RequestHandlerOptions, a as ResponseResolver, b as ResponseResolverReturnType, S as StrictRequest, e as StrictResponse } from './RequestHandler-bb5cbb8f.js';
 export { http } from './http.js';
 export { HttpHandler, HttpMethods, HttpRequestParsedResult, RequestQuery } from './handlers/HttpHandler.js';
 export { graphql } from './graphql.js';
-export { G as GraphQLHandler, c as GraphQLJsonRequestBody, b as GraphQLRequestBody, a as GraphQLVariables, P as ParsedGraphQLRequest } from './GraphQLHandler-b42ca96f.js';
+export { G as GraphQLHandler, c as GraphQLJsonRequestBody, b as GraphQLRequestBody, a as GraphQLVariables, P as ParsedGraphQLRequest } from './GraphQLHandler-d46c4f60.js';
 export { Match, Path, PathParams, matchRequestUrl } from './utils/matching/matchRequestUrl.js';
 export { HandleRequestOptions, handleRequest } from './utils/handleRequest.js';
 export { cleanUrl } from './utils/url/cleanUrl.js';

package/lib/core/sharedOptions.d.ts

@@ -1,6 +1,6 @@
 import { Emitter } from 'strict-event-emitter';
 import { UnhandledRequestStrategy } from './utils/request/onUnhandledRequest.js';
-import './RequestHandler-1a5dbdc7.js';
+import './RequestHandler-bb5cbb8f.js';
 import './typeUtils.js';
 
 interface SharedOptions {

package/lib/core/utils/HttpResponse/decorators.d.ts

@@ -1,4 +1,4 @@
-import { H as HttpResponseInit } from '../../RequestHandler-1a5dbdc7.js';
+import { H as HttpResponseInit } from '../../RequestHandler-bb5cbb8f.js';
 import '../../typeUtils.js';
 
 interface HttpResponseDecoratedInit extends HttpResponseInit {

package/lib/core/utils/getResponse.d.ts

@@ -1,2 +1,2 @@
-export { h as ResponseLookupResult, i as ResponseResolutionContext, j as getResponse } from '../RequestHandler-1a5dbdc7.js';
+export { h as ResponseLookupResult, i as ResponseResolutionContext, j as getResponse } from '../RequestHandler-bb5cbb8f.js';
 import '../typeUtils.js';

package/lib/core/utils/handleRequest.d.ts

@@ -1,5 +1,5 @@
 import { Emitter } from 'strict-event-emitter';
-import { h as ResponseLookupResult, R as RequestHandler } from '../RequestHandler-1a5dbdc7.js';
+import { h as ResponseLookupResult, R as RequestHandler } from '../RequestHandler-bb5cbb8f.js';
 import { SharedOptions, LifeCycleEventsMap } from '../sharedOptions.js';
 import { RequiredDeep } from '../typeUtils.js';
 import './request/onUnhandledRequest.js';

package/lib/core/utils/internal/parseGraphQLRequest.d.ts

@@ -1,5 +1,5 @@
 import 'graphql';
-export { i as GraphQLMultipartRequestBody, h as GraphQLParsedOperationsMap, g as ParsedGraphQLQuery, P as ParsedGraphQLRequest, p as parseDocumentNode, j as parseGraphQLRequest } from '../../GraphQLHandler-b42ca96f.js';
-import '../../RequestHandler-1a5dbdc7.js';
+export { i as GraphQLMultipartRequestBody, h as GraphQLParsedOperationsMap, g as ParsedGraphQLQuery, P as ParsedGraphQLRequest, p as parseDocumentNode, j as parseGraphQLRequest } from '../../GraphQLHandler-d46c4f60.js';
+import '../../RequestHandler-bb5cbb8f.js';
 import '../../typeUtils.js';
 import '../matching/matchRequestUrl.js';

package/lib/core/utils/internal/parseMultipartData.d.ts

@@ -1,4 +1,4 @@
-import { d as DefaultRequestMultipartBody } from '../../RequestHandler-1a5dbdc7.js';
+import { d as DefaultRequestMultipartBody } from '../../RequestHandler-bb5cbb8f.js';
 import '../../typeUtils.js';
 
 /**

package/lib/core/utils/internal/requestHandlerUtils.d.ts

@@ -1,4 +1,4 @@
-import { R as RequestHandler, g as RequestHandlerDefaultInfo, c as RequestHandlerOptions } from '../../RequestHandler-1a5dbdc7.js';
+import { R as RequestHandler, g as RequestHandlerDefaultInfo, c as RequestHandlerOptions } from '../../RequestHandler-bb5cbb8f.js';
 import '../../typeUtils.js';
 
 declare function use(currentHandlers: Array<RequestHandler>, ...handlers: Array<RequestHandler>): void;

package/lib/core/utils/request/onUnhandledRequest.d.ts

@@ -1,4 +1,4 @@
-import { R as RequestHandler } from '../../RequestHandler-1a5dbdc7.js';
+import { R as RequestHandler } from '../../RequestHandler-bb5cbb8f.js';
 import '../../typeUtils.js';
 
 interface UnhandledRequestPrint {