msw 2.12.13 → 2.12.14

package/lib/mockServiceWorker.js

@@ -7,7 +7,7 @@
  * - Please do NOT modify this file.
  */
 
-const PACKAGE_VERSION = '2.12.13'
+const PACKAGE_VERSION = '2.12.14'
 const INTEGRITY_CHECKSUM = '4db4a41e972cec1b64cc569c66952d82'
 const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
 const activeClientIds = new Set()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "msw",
-  "version": "2.12.13",
+  "version": "2.12.14",
   "description": "Seamless REST/GraphQL API mocking library for browser and Node.js.",
   "type": "commonjs",
   "main": "./lib/core/index.js",
@@ -285,7 +285,7 @@
     "vitest-environment-miniflare": "^2.14.4",
     "webpack": "^5.95.0",
     "webpack-http-server": "^0.5.0",
-    "msw": "2.12.13"
+    "msw": "2.12.14"
   },
   "peerDependencies": {
     "typescript": ">= 4.8.x"

package/src/core/utils/matching/matchRequestUrl.test.ts

@@ -1,6 +1,4 @@
-/**
- * @vitest-environment jsdom
- */
+// @vitest-environment jsdom
 import { coercePath, matchRequestUrl } from './matchRequestUrl'
 
 describe('matchRequestUrl', () => {
@@ -87,6 +85,77 @@ describe('matchRequestUrl', () => {
     })
   })
 
+  test('returns true when matching URLs with wildcard ports', () => {
+    expect
+      .soft(
+        matchRequestUrl(new URL('http://localhost:3000'), 'http://localhost:*'),
+      )
+      .toEqual({
+        matches: true,
+        params: {
+          '0': '3000/',
+        },
+      })
+
+    expect
+      .soft(
+        matchRequestUrl(
+          new URL('http://localhost:3000'),
+          'http://localhost:*/',
+        ),
+      )
+      .toEqual({
+        matches: true,
+        params: {
+          '0': '3000',
+        },
+      })
+  })
+
+  test('returns true when matching URLs with wildcard ports and pathnames', () => {
+    expect(
+      matchRequestUrl(
+        new URL('http://localhost:3000/resource'),
+        'http://localhost:*/resource',
+      ),
+    ).toEqual({
+      matches: true,
+      params: {
+        '0': '3000',
+      },
+    })
+  })
+
+  test('matches wildcard ports with other wildcard parameters', () => {
+    expect(
+      matchRequestUrl(
+        new URL('http://subdomain.localhost:3000/user/settings'),
+        'http://*.localhost:*/user/*',
+      ),
+    ).toEqual({
+      matches: true,
+      params: {
+        '0': 'subdomain',
+        '1': '3000',
+        '2': 'settings',
+      },
+    })
+  })
+
+  test('matches wildcard ports that also match a part of the pathname', () => {
+    expect(
+      matchRequestUrl(
+        new URL('http://localhost:3000/user/settings'),
+        'http://localhost:*/settings',
+      ),
+    ).toEqual({
+      matches: true,
+      params: {
+        '0': '3000/user',
+      },
+    })
+  })
+
   test('returns true for matching WebSocket URL', () => {
     expect(
       matchRequestUrl(new URL('ws://test.mswjs.io'), 'ws://test.mswjs.io'),
@@ -130,6 +199,17 @@ describe('matchRequestUrl', () => {
       },
     })
   })
+
+  test('returns true for matching WebSocket URLs with wildcard ports', () => {
+    expect(
+      matchRequestUrl(new URL('ws://localhost:3000'), 'ws://localhost:*'),
+    ).toEqual({
+      matches: true,
+      params: {
+        '0': '3000/',
+      },
+    })
+  })
 })
 
 describe('coercePath', () => {
@@ -156,6 +236,10 @@ describe('coercePath', () => {
     expect(coercePath('https://example.com:8080/:5678')).toEqual(
       'https\\://example.com\\:8080/:5678',
     )
+    expect(coercePath('http://localhost:*')).toEqual(
+      'http\\://localhost\\:(.*)',
+    )
+    expect(coercePath('ws://localhost:*')).toEqual('ws\\://localhost\\:(.*)')
   })
 
   test('replaces wildcard with an unnnamed capturing group', () => {

package/src/core/utils/matching/matchRequestUrl.ts

@@ -40,9 +40,9 @@ export function coercePath(path: string): string {
       )
       /**
        * Escape the port so that "path-to-regexp" can match
-       * absolute URLs including port numbers.
+       * absolute URLs with numeric or wildcard ports.
        */
-      .replace(/([^/])(:)(?=\d+)/, '$1\\$2')
+      .replace(/([^/])(:)(?=(?:\d+|\(\.\*\))(?=\/|$))/, '$1\\$2')
       /**
        * Escape the protocol so that "path-to-regexp" could match
        * absolute URL.