chore: move "handleWebSocketEvent" to "ws"

mswjs · Apr 2, 2024 · c6450d9 · c6450d9
1 parent 0776e73
commit c6450d9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/browser/setupWorker/setupWorker.ts b/src/browser/setupWorker/setupWorker.ts
@@ -23,7 +23,7 @@ import type { WebSocketHandler } from '~/core/handlers/WebSocketHandler'
 import { SetupWorker } from './glossary'
 import { supportsReadableStreamTransfer } from '../utils/supportsReadableStreamTransfer'
 import { webSocketInterceptor } from '~/core/ws/webSocketInterceptor'
-import { handleWebSocketEvent } from '~/core/utils/handleWebSocketEvent'
+import { handleWebSocketEvent } from '~/core/ws/handleWebSocketEvent'
 import { attachWebSocketLogger } from '~/core/ws/utils/attachWebSocketLogger'
 
 interface Listener {

diff --git a/src/core/utils/handleWebSocketEvent.ts → src/core/ws/handleWebSocketEvent.ts b/src/core/utils/handleWebSocketEvent.ts → src/core/ws/handleWebSocketEvent.ts
@@ -1,7 +1,7 @@
 import type { WebSocketConnectionData } from '@mswjs/interceptors/lib/browser/interceptors/WebSocket'
 import { RequestHandler } from '../handlers/RequestHandler'
 import { WebSocketHandler, kDispatchEvent } from '../handlers/WebSocketHandler'
-import { webSocketInterceptor } from '../ws/webSocketInterceptor'
+import { webSocketInterceptor } from './webSocketInterceptor'
 
 interface HandleWebSocketEventOptions {
   getHandlers: () => Array<RequestHandler | WebSocketHandler>

diff --git a/src/core/ws/ws.ts b/src/core/ws/ws.ts
@@ -35,9 +35,9 @@ function createWebSocketLinkHandler(url: Path) {
 
   return {
     clients: clientManager.clients,
-    on<K extends keyof WebSocketHandlerEventMap>(
-      event: K,
-      listener: (...args: WebSocketHandlerEventMap[K]) => void,
+    on<EventType extends keyof WebSocketHandlerEventMap>(
+      event: EventType,
+      listener: (...args: WebSocketHandlerEventMap[EventType]) => void,
     ): WebSocketHandler {
       const handler = new WebSocketHandler(url)
 

diff --git a/src/node/SetupServerCommonApi.ts b/src/node/SetupServerCommonApi.ts
@@ -18,7 +18,7 @@ import type { WebSocketHandler } from '~/core/handlers/WebSocketHandler'
 import { mergeRight } from '~/core/utils/internal/mergeRight'
 import { devUtils } from '~/core/utils/internal/devUtils'
 import type { SetupServerCommon } from './glossary'
-import { handleWebSocketEvent } from '~/core/utils/handleWebSocketEvent'
+import { handleWebSocketEvent } from '~/core/ws/handleWebSocketEvent'
 import { webSocketInterceptor } from '~/core/ws/webSocketInterceptor'
 
 export const DEFAULT_LISTEN_OPTIONS: RequiredDeep<SharedOptions> = {