msw 2.2.9 → 2.2.11

package/lib/mockServiceWorker.js

@@ -8,7 +8,7 @@
  * - Please do NOT serve this file on production.
  */
 
-const PACKAGE_VERSION = '2.2.9'
+const PACKAGE_VERSION = '2.2.11'
 const INTEGRITY_CHECKSUM = '26357c79639bfa20d64c0efca2a87423'
 const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
 const activeClientIds = new Set()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "msw",
-  "version": "2.2.9",
+  "version": "2.2.11",
   "description": "Seamless REST/GraphQL API mocking library for browser and Node.js.",
   "main": "./lib/core/index.js",
   "module": "./lib/core/index.mjs",
@@ -162,7 +162,7 @@
     "typescript": "^5.4.2",
     "undici": "^5.20.0",
     "url-loader": "^4.1.1",
-    "vitest": "^0.34.6",
+    "vitest": "^1.2.2",
     "vitest-environment-miniflare": "^2.14.1",
     "webpack": "^5.89.0",
     "webpack-http-server": "^0.5.0"
@@ -199,7 +199,7 @@
     "test:browser": "playwright test -c ./test/browser/playwright.config.ts",
     "test:modules:node": "vitest --config=./test/modules/node/vitest.config.ts",
     "test:modules:browser": "playwright test -c ./test/modules/browser/playwright.config.ts",
-    "test:ts": "ts-node test/typings/run.ts",
+    "test:ts": "vitest --typecheck --config=./test/typings/vitest.config.ts",
     "release": "release publish",
     "postinstall": "node -e \"try{require('./config/scripts/postinstall')}catch(e){}\""
   }

package/src/core/HttpResponse.ts

@@ -1,4 +1,5 @@
 import type { DefaultBodyType, JsonBodyType } from './handlers/RequestHandler'
+import type { NoInfer } from './typeUtils'
 import {
   decorateResponse,
   normalizeResponseInit,
@@ -48,7 +49,7 @@ export class HttpResponse extends Response {
    * HttpResponse.text('Error', { status: 500 })
    */
   static text<BodyType extends string>(
-    body?: BodyType | null,
+    body?: NoInfer<BodyType> | null,
     init?: HttpResponseInit,
   ): StrictResponse<BodyType> {
     const responseInit = normalizeResponseInit(init)
@@ -77,7 +78,7 @@ export class HttpResponse extends Response {
    * HttpResponse.json({ error: 'Not Authorized' }, { status: 401 })
    */
   static json<BodyType extends JsonBodyType>(
-    body?: BodyType | null,
+    body?: NoInfer<BodyType> | null,
     init?: HttpResponseInit,
   ): StrictResponse<BodyType> {
     const responseInit = normalizeResponseInit(init)

package/src/core/graphql.ts

@@ -31,7 +31,10 @@ export type GraphQLRequestHandler = <
     | GraphQLHandlerNameSelector
     | DocumentNode
     | TypedDocumentNode<Query, Variables>,
-  resolver: GraphQLResponseResolver<Query, Variables>,
+  resolver: GraphQLResponseResolver<
+    [Query] extends [never] ? GraphQLQuery : Query,
+    Variables
+  >,
   options?: RequestHandlerOptions,
 ) => GraphQLHandler
 
@@ -41,7 +44,7 @@ export type GraphQLResponseResolver<
 > = ResponseResolver<
   GraphQLResolverExtras<Variables>,
   null,
-  GraphQLResponseBody<Query>
+  GraphQLResponseBody<[Query] extends [never] ? GraphQLQuery : Query>
 >
 
 function createScopedGraphQLHandler(
@@ -61,7 +64,7 @@ function createScopedGraphQLHandler(
 
 function createGraphQLOperationHandler(url: Path) {
   return <
-    Query extends Record<string, any>,
+    Query extends GraphQLQuery = GraphQLQuery,
     Variables extends GraphQLVariables = GraphQLVariables,
   >(
     resolver: ResponseResolver<

package/src/core/handlers/GraphQLHandler.ts

@@ -68,10 +68,13 @@ export interface GraphQLJsonRequestBody<Variables extends GraphQLVariables> {
   variables?: Variables
 }
 
-export interface GraphQLResponseBody<BodyType extends DefaultBodyType> {
-  data?: BodyType | null
-  errors?: readonly Partial<GraphQLError>[] | null
-}
+export type GraphQLResponseBody<BodyType extends DefaultBodyType> =
+  | {
+      data?: BodyType | null
+      errors?: readonly Partial<GraphQLError>[] | null
+    }
+  | null
+  | undefined
 
 export function isDocumentNode(
   value: DocumentNode | any,

package/src/core/handlers/HttpHandler.ts

@@ -102,7 +102,7 @@ export class HttpHandler extends RequestHandler<
     })
 
     devUtils.warn(
-      `Found a redundant usage of query parameters in the request handler URL for "${method} ${path}". Please match against a path instead and access query parameters in the response resolver function using "req.url.searchParams".`,
+      `Found a redundant usage of query parameters in the request handler URL for "${method} ${path}". Please match against a path instead and access query parameters using "new URL(request.url).searchParams" instead. Learn more: https://mswjs.io/docs/recipes/query-parameters`,
     )
   }
 

package/src/core/typeUtils.ts

@@ -18,3 +18,9 @@ export type RequiredDeep<
           : RequiredDeep<NonNullable<Type[Key]>, U>
       }
     : Type
+
+/**
+ * @fixme Remove this once TS 5.4 is the lowest supported version.
+ * Because "NoInfer" is a built-in type utility there.
+ */
+export type NoInfer<T> = [T][T extends any ? 0 : never]