msw 2.1.0 → 2.1.2

package/lib/mockServiceWorker.js

@@ -2,7 +2,7 @@
 /* tslint:disable */
 
 /**
- * Mock Service Worker (2.1.0).
+ * Mock Service Worker (2.1.2).
  * @see https://github.com/mswjs/msw
  * - Please do NOT modify this file.
  * - Please do NOT serve this file on production.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "msw",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "Seamless REST/GraphQL API mocking library for browser and Node.js.",
   "main": "./lib/core/index.js",
   "module": "./lib/core/index.mjs",

package/src/core/handlers/GraphQLHandler.test.ts

@@ -9,6 +9,7 @@ import {
   GraphQLResolverExtras,
   isDocumentNode,
 } from './GraphQLHandler'
+import { uuidv4 } from '../utils/internal/uuidv4'
 import { HttpResponse } from '../HttpResponse'
 import { ResponseResolver } from './RequestHandler'
 
@@ -736,7 +737,8 @@ describe('run', () => {
         userId: 'abc-123',
       },
     })
-    const result = await handler.run({ request })
+    const requestId = uuidv4()
+    const result = await handler.run({ request, requestId })
 
     expect(result!.handler).toEqual(handler)
     expect(result!.parsedResult).toEqual({
@@ -777,7 +779,8 @@ describe('run', () => {
     const request = createPostGraphQLRequest({
       query: LOGIN,
     })
-    const result = await handler.run({ request })
+    const requestId = uuidv4()
+    const result = await handler.run({ request, requestId })
 
     expect(result).toBeNull()
   })
@@ -824,7 +827,8 @@ describe('request', () => {
         `,
     })
 
-    await handler.run({ request })
+    const requestId = uuidv4()
+    await handler.run({ request, requestId })
 
     expect(matchAllResolver).toHaveBeenCalledTimes(1)
     expect(matchAllResolver.mock.calls[0][0]).toHaveProperty(

package/src/core/handlers/HttpHandler.test.ts

@@ -1,6 +1,7 @@
 /**
  * @vitest-environment jsdom
  */
+import { uuidv4 } from '../utils/internal/uuidv4'
 import { HttpHandler, HttpRequestResolverExtras } from './HttpHandler'
 import { HttpResponse } from '..'
 import { ResponseResolver } from './RequestHandler'
@@ -151,7 +152,8 @@ describe('run', () => {
   test('returns a mocked response given a matching request', async () => {
     const handler = new HttpHandler('GET', '/user/:userId', resolver)
     const request = new Request(new URL('/user/abc-123', location.href))
-    const result = await handler.run({ request })
+    const requestId = uuidv4()
+    const result = await handler.run({ request, requestId })
 
     expect(result!.handler).toEqual(handler)
     expect(result!.parsedResult).toEqual({
@@ -174,6 +176,7 @@ describe('run', () => {
     const handler = new HttpHandler('POST', '/login', resolver)
     const result = await handler.run({
       request: new Request(new URL('/users', location.href)),
+      requestId: uuidv4(),
     })
 
     expect(result).toBeNull()
@@ -183,12 +186,13 @@ describe('run', () => {
     const handler = new HttpHandler('GET', '/users', resolver)
     const result = await handler.run({
       request: new Request(new URL('/users', location.href)),
+      requestId: uuidv4(),
     })
 
     expect(result?.parsedResult?.match?.params).toEqual({})
   })
 
-  test('exhauses resolver until its generator completes', async () => {
+  test('exhausts resolver until its generator completes', async () => {
     const handler = new HttpHandler('GET', '/users', function* () {
       let count = 0
 
@@ -203,6 +207,7 @@ describe('run', () => {
     const run = async () => {
       const result = await handler.run({
         request: new Request(new URL('/users', location.href)),
+        requestId: uuidv4(),
       })
       return result?.response?.text()
     }

package/src/core/handlers/RequestHandler.ts

@@ -64,6 +64,7 @@ export type ResponseResolverInfo<
   RequestBodyType extends DefaultBodyType = DefaultBodyType,
 > = {
   request: StrictRequest<RequestBodyType>
+  requestId: string
 } & ResolverExtraInfo
 
 export type ResponseResolver<

package/src/core/index.ts

@@ -34,7 +34,7 @@ export type {
   RequestQuery,
   HttpRequestParsedResult,
 } from './handlers/HttpHandler'
-export type { HttpResponseResolver } from './http'
+export type { HttpRequestHandler, HttpResponseResolver } from './http'
 
 export type {
   GraphQLQuery,
@@ -42,7 +42,7 @@ export type {
   GraphQLRequestBody,
   GraphQLJsonRequestBody,
 } from './handlers/GraphQLHandler'
-export type { GraphQLResponseResolver } from './graphql'
+export type { GraphQLRequestHandler, GraphQLResponseResolver } from './graphql'
 
 export type { Path, PathParams, Match } from './utils/matching/matchRequestUrl'
 export type { ParsedGraphQLRequest } from './utils/internal/parseGraphQLRequest'