msw 2.1.4 → 2.1.5

package/lib/mockServiceWorker.js

@@ -2,7 +2,7 @@
 /* tslint:disable */
 
 /**
- * Mock Service Worker (2.1.4).
+ * Mock Service Worker (2.1.5).
  * @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.4",
+  "version": "2.1.5",
   "description": "Seamless REST/GraphQL API mocking library for browser and Node.js.",
   "main": "./lib/core/index.js",
   "module": "./lib/core/index.mjs",
@@ -95,7 +95,7 @@
     "@bundled-es-modules/cookie": "^2.0.0",
     "@bundled-es-modules/statuses": "^1.0.1",
     "@mswjs/cookies": "^1.1.0",
-    "@mswjs/interceptors": "^0.25.14",
+    "@mswjs/interceptors": "^0.25.15",
     "@open-draft/until": "^2.1.0",
     "@types/cookie": "^0.6.0",
     "@types/statuses": "^2.0.4",
@@ -189,10 +189,10 @@
     "check:exports": "node \"./config/scripts/validate-esm.js\"",
     "test": "pnpm test:unit && pnpm test:node && pnpm test:browser && pnpm test:native",
     "test:unit": "vitest",
-    "test:node": "vitest run --config=./test/node/vitest.config.ts",
-    "test:native": "vitest run --config=./test/native/vitest.config.ts",
+    "test:node": "vitest --config=./test/node/vitest.config.ts",
+    "test:native": "vitest --config=./test/native/vitest.config.ts",
     "test:browser": "playwright test -c ./test/browser/playwright.config.ts",
-    "test:modules:node": "vitest run --config=./test/modules/node/vitest.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",
     "release": "release publish",

package/src/browser/setupWorker/glossary.ts

@@ -103,6 +103,7 @@ export interface SetupWorkerInternalContext {
   worker: ServiceWorker | null
   registration: ServiceWorkerRegistration | null
   requestHandlers: Array<RequestHandler>
+  requests: Map<string, Request>
   emitter: Emitter<LifeCycleEventsMap>
   keepAliveInterval?: number
   workerChannel: {

package/src/browser/setupWorker/setupWorker.ts

@@ -60,6 +60,7 @@ export class SetupWorkerApi
       worker: null,
       registration: null,
       requestHandlers: this.currentHandlers,
+      requests: new Map(),
       emitter: this.emitter,
       workerChannel: {
         on: (eventType, callback) => {

package/src/browser/setupWorker/start/createRequestListener.ts

@@ -8,6 +8,7 @@ import {
   WorkerChannel,
 } from './utils/createMessageChannel'
 import { parseWorkerRequest } from '../../utils/parseWorkerRequest'
+import { RequestHandler } from '~/core/handlers/RequestHandler'
 import { handleRequest } from '~/core/utils/handleRequest'
 import { RequiredDeep } from '~/core/typeUtils'
 import { devUtils } from '~/core/utils/internal/devUtils'
@@ -30,6 +31,14 @@ export const createRequestListener = (
     const request = parseWorkerRequest(message.payload)
     const requestCloneForLogs = request.clone()
 
+    // Make this the first requets clone before the
+    // request resolution pipeline even starts.
+    // Store the clone in cache so the first matching
+    // request handler would skip the cloning phase.
+    const requestClone = request.clone()
+    RequestHandler.cache.set(request, requestClone)
+    context.requests.set(requestId, requestClone)
+
     try {
       await handleRequest(
         request,

package/src/browser/setupWorker/start/createResponseListener.ts

@@ -1,8 +1,8 @@
-import {
+import type {
   ServiceWorkerIncomingEventsMap,
   SetupWorkerInternalContext,
 } from '../glossary'
-import { ServiceWorkerMessage } from './utils/createMessageChannel'
+import type { ServiceWorkerMessage } from './utils/createMessageChannel'
 import { isResponseWithoutBody } from '@mswjs/interceptors'
 
 export function createResponseListener(context: SetupWorkerInternalContext) {
@@ -15,6 +15,12 @@ export function createResponseListener(context: SetupWorkerInternalContext) {
   ) => {
     const { payload: responseJson } = message
 
+    // Get the Request instance reference stored in the
+    // request listener.
+    const { requestId } = responseJson
+    const request = context.requests.get(requestId)!
+    context.requests.delete(requestId)
+
     /**
      * CORS requests with `mode: "no-cors"` result in "opaque" responses.
      * That kind of responses cannot be manipulated in JavaScript due
@@ -46,11 +52,7 @@ export function createResponseListener(context: SetupWorkerInternalContext) {
       responseJson.isMockedResponse ? 'response:mocked' : 'response:bypass',
       {
         response,
-        /**
-         * @todo @fixme In this context, we don't know anything about
-         * the request.
-         */
-        request: null as any,
+        request,
         requestId: responseJson.requestId,
       },
     )

package/src/core/handlers/GraphQLHandler.ts

@@ -17,7 +17,7 @@ import {
   parseGraphQLRequest,
   parseDocumentNode,
 } from '../utils/internal/parseGraphQLRequest'
-import { getPublicUrlFromRequest } from '../utils/request/getPublicUrlFromRequest'
+import { toPublicUrl } from '../utils/request/toPublicUrl'
 import { devUtils } from '../utils/internal/devUtils'
 import { getAllRequestCookies } from '../utils/request/getRequestCookies'
 
@@ -200,7 +200,7 @@ export class GraphQLHandler extends RequestHandler<
     }
 
     if (!args.parsedResult.operationName && this.info.operationType !== 'all') {
-      const publicUrl = getPublicUrlFromRequest(args.request)
+      const publicUrl = toPublicUrl(args.request.url)
 
       devUtils.warn(`\
 Failed to intercept a GraphQL request at "${args.request.method} ${publicUrl}": anonymous GraphQL operations are not supported.

package/src/core/handlers/HttpHandler.ts

@@ -11,7 +11,7 @@ import {
   Path,
   PathParams,
 } from '../utils/matching/matchRequestUrl'
-import { getPublicUrlFromRequest } from '../utils/request/getPublicUrlFromRequest'
+import { toPublicUrl } from '../utils/request/toPublicUrl'
 import { getAllRequestCookies } from '../utils/request/getRequestCookies'
 import { cleanUrl, getSearchParams } from '../utils/url/cleanUrl'
 import {
@@ -147,7 +147,7 @@ export class HttpHandler extends RequestHandler<
   }
 
   async log(args: { request: Request; response: Response }) {
-    const publicUrl = getPublicUrlFromRequest(args.request)
+    const publicUrl = toPublicUrl(args.request.url)
     const loggedRequest = await serializeRequest(args.request)
     const loggedResponse = await serializeResponse(args.response)
     const statusColor = getStatusCodeColor(loggedResponse.status)

package/src/core/utils/internal/parseGraphQLRequest.ts

@@ -5,7 +5,7 @@ import type {
 } from 'graphql'
 import { parse } from 'graphql'
 import type { GraphQLVariables } from '../../handlers/GraphQLHandler'
-import { getPublicUrlFromRequest } from '../request/getPublicUrlFromRequest'
+import { toPublicUrl } from '../request/toPublicUrl'
 import { devUtils } from './devUtils'
 import { jsonParse } from './jsonParse'
 import { parseMultipartData } from './parseMultipartData'
@@ -184,7 +184,7 @@ export async function parseGraphQLRequest(
   const parsedResult = parseQuery(query)
 
   if (parsedResult instanceof Error) {
-    const requestPublicUrl = getPublicUrlFromRequest(request)
+    const requestPublicUrl = toPublicUrl(request.url)
 
     throw new Error(
       devUtils.formatMessage(

package/src/core/utils/request/onUnhandledRequest.ts

@@ -1,4 +1,4 @@
-import { getPublicUrlFromRequest } from './getPublicUrlFromRequest'
+import { toPublicUrl } from './toPublicUrl'
 import { devUtils } from '../internal/devUtils'
 
 export interface UnhandledRequestPrint {
@@ -21,7 +21,9 @@ export async function onUnhandledRequest(
   request: Request,
   strategy: UnhandledRequestStrategy = 'warn',
 ): Promise<void> {
-  const publicUrl = getPublicUrlFromRequest(request)
+  const url = new URL(request.url)
+  const publicUrl = toPublicUrl(url)
+
   const unhandledRequestMessage = `intercepted a request without a matching request handler:\n\n  \u2022 ${request.method} ${publicUrl}\n\nIf you still wish to intercept this unhandled request, please create a request handler for it.\nRead more: https://mswjs.io/docs/getting-started/mocks`
 
   function applyStrategy(strategy: UnhandledRequestStrategy) {
@@ -64,5 +66,15 @@ export async function onUnhandledRequest(
     return
   }
 
+  /**
+   * @note Ignore "file://" requests.
+   * Those often are an implementation detail of modern tooling
+   * that fetches modules via HTTP. Developers don't issue those
+   * requests and so they mustn't be warned about them.
+   */
+  if (url.protocol === 'file:') {
+    return
+  }
+
   applyStrategy(strategy)
 }

package/src/core/utils/request/toPublicUrl.test.ts

@@ -0,0 +1,18 @@
+/**
+ * @vitest-environment jsdom
+ */
+import { toPublicUrl } from './toPublicUrl'
+
+test('returns an absolute request URL withouth search params', () => {
+  expect(toPublicUrl(new URL('https://test.mswjs.io/path'))).toBe(
+    'https://test.mswjs.io/path',
+  )
+
+  expect(toPublicUrl(new URL('http://localhost/path'))).toBe('/path')
+
+  expect(toPublicUrl(new URL('http://localhost/path?foo=bar'))).toBe('/path')
+})
+
+it('returns a relative URL given the request to the same origin', () => {
+  expect(toPublicUrl('http://localhost/user')).toBe('/user')
+})

package/src/core/utils/request/toPublicUrl.ts

@@ -0,0 +1,15 @@
+/**
+ * Returns a relative URL if the given request URL is relative
+ * to the current origin. Otherwise returns an absolute URL.
+ */
+export function toPublicUrl(url: string | URL): string {
+  if (typeof location === 'undefined') {
+    return url.toString()
+  }
+
+  const urlInstance = url instanceof URL ? url : new URL(url)
+
+  return urlInstance.origin === location.origin
+    ? urlInstance.pathname
+    : urlInstance.origin + urlInstance.pathname
+}

package/lib/core/utils/request/getPublicUrlFromRequest.d.mts

@@ -1,7 +0,0 @@
-/**
- * Returns a relative URL if the given request URL is relative to the current origin.
- * Otherwise returns an absolute URL.
- */
-declare function getPublicUrlFromRequest(request: Request): string;
-
-export { getPublicUrlFromRequest };

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

@@ -1,7 +0,0 @@
-/**
- * Returns a relative URL if the given request URL is relative to the current origin.
- * Otherwise returns an absolute URL.
- */
-declare function getPublicUrlFromRequest(request: Request): string;
-
-export { getPublicUrlFromRequest };

package/lib/core/utils/request/getPublicUrlFromRequest.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../../src/core/utils/request/getPublicUrlFromRequest.ts"],"sourcesContent":["/**\n * Returns a relative URL if the given request URL is relative to the current origin.\n * Otherwise returns an absolute URL.\n */\nexport function getPublicUrlFromRequest(request: Request): string {\n  if (typeof location === 'undefined') {\n    return request.url\n  }\n\n  const url = new URL(request.url)\n\n  return url.origin === location.origin\n    ? url.pathname\n    : url.origin + url.pathname\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAIO,SAAS,wBAAwB,SAA0B;AAChE,MAAI,OAAO,aAAa,aAAa;AACnC,WAAO,QAAQ;AAAA,EACjB;AAEA,QAAM,MAAM,IAAI,IAAI,QAAQ,GAAG;AAE/B,SAAO,IAAI,WAAW,SAAS,SAC3B,IAAI,WACJ,IAAI,SAAS,IAAI;AACvB;","names":[]}

package/lib/core/utils/request/getPublicUrlFromRequest.mjs

@@ -1,11 +0,0 @@
-function getPublicUrlFromRequest(request) {
-  if (typeof location === "undefined") {
-    return request.url;
-  }
-  const url = new URL(request.url);
-  return url.origin === location.origin ? url.pathname : url.origin + url.pathname;
-}
-export {
-  getPublicUrlFromRequest
-};
-//# sourceMappingURL=getPublicUrlFromRequest.mjs.map

package/lib/core/utils/request/getPublicUrlFromRequest.mjs.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../../src/core/utils/request/getPublicUrlFromRequest.ts"],"sourcesContent":["/**\n * Returns a relative URL if the given request URL is relative to the current origin.\n * Otherwise returns an absolute URL.\n */\nexport function getPublicUrlFromRequest(request: Request): string {\n  if (typeof location === 'undefined') {\n    return request.url\n  }\n\n  const url = new URL(request.url)\n\n  return url.origin === location.origin\n    ? url.pathname\n    : url.origin + url.pathname\n}\n"],"mappings":"AAIO,SAAS,wBAAwB,SAA0B;AAChE,MAAI,OAAO,aAAa,aAAa;AACnC,WAAO,QAAQ;AAAA,EACjB;AAEA,QAAM,MAAM,IAAI,IAAI,QAAQ,GAAG;AAE/B,SAAO,IAAI,WAAW,SAAS,SAC3B,IAAI,WACJ,IAAI,SAAS,IAAI;AACvB;","names":[]}

package/src/core/utils/request/getPublicUrlFromRequest.test.ts

@@ -1,26 +0,0 @@
-/**
- * @vitest-environment jsdom
- */
-import { getPublicUrlFromRequest } from './getPublicUrlFromRequest'
-
-test('returns an absolute request URL withouth search params', () => {
-  expect(
-    getPublicUrlFromRequest(new Request(new URL('https://test.mswjs.io/path'))),
-  ).toBe('https://test.mswjs.io/path')
-
-  expect(
-    getPublicUrlFromRequest(new Request(new URL('http://localhost/path'))),
-  ).toBe('/path')
-
-  expect(
-    getPublicUrlFromRequest(
-      new Request(new URL('http://localhost/path?foo=bar')),
-    ),
-  ).toBe('/path')
-})
-
-it('returns a relative URL given the request to the same origin', () => {
-  expect(getPublicUrlFromRequest(new Request('http://localhost/user'))).toBe(
-    '/user',
-  )
-})

package/src/core/utils/request/getPublicUrlFromRequest.ts

@@ -1,15 +0,0 @@
-/**
- * Returns a relative URL if the given request URL is relative to the current origin.
- * Otherwise returns an absolute URL.
- */
-export function getPublicUrlFromRequest(request: Request): string {
-  if (typeof location === 'undefined') {
-    return request.url
-  }
-
-  const url = new URL(request.url)
-
-  return url.origin === location.origin
-    ? url.pathname
-    : url.origin + url.pathname
-}