feat: improve UpgradeWebSocket types flow

Author: NamesMT

deno_dist/client/types.ts

@@ -1,4 +1,3 @@
-import type { UpgradedWebSocketResponseInputJSONType } from '../helper/websocket/index.ts'
 import type { Hono } from '../hono.ts'
 import type { Endpoint, ResponseFormat, Schema } from '../types.ts'
 import type { StatusCode, SuccessStatusCode } from '../utils/http-status.ts'
@@ -34,10 +33,10 @@ export type ClientRequest<S extends Schema> = {
         : {}
       : {}
   ) => URL
-} & (S['$get'] extends { input: { json: UpgradedWebSocketResponseInputJSONType } }
+} & (S['$get'] extends { outputFormat: 'ws' }
     ? S['$get'] extends { input: infer I }
       ? {
-          $ws: (args?: Omit<I, 'json'>) => WebSocket
+          $ws: (args?: I) => WebSocket
         }
       : {}
     : {})

deno_dist/helper/websocket/index.ts

@@ -12,8 +12,6 @@ export interface WSEvents {
   onError?: (evt: Event, ws: WSContext) => void
 }
 
-export type UpgradedWebSocketResponseInputJSONType = '__websocket'
-
 /**
  * Upgrade WebSocket Type
  */
@@ -23,9 +21,7 @@ export type UpgradeWebSocket = (
   any,
   string,
   {
-    in: {
-      json: UpgradedWebSocketResponseInputJSONType
-    }
+    outputFormat: 'ws'
   }
 >
 

src/client/types.ts

@@ -1,4 +1,3 @@
-import type { UpgradedWebSocketResponseInputJSONType } from '../helper/websocket'
 import type { Hono } from '../hono'
 import type { Endpoint, ResponseFormat, Schema } from '../types'
 import type { StatusCode, SuccessStatusCode } from '../utils/http-status'
@@ -34,10 +33,10 @@ export type ClientRequest<S extends Schema> = {
         : {}
       : {}
   ) => URL
-} & (S['$get'] extends { input: { json: UpgradedWebSocketResponseInputJSONType } }
+} & (S['$get'] extends { outputFormat: 'ws' }
     ? S['$get'] extends { input: infer I }
       ? {
-          $ws: (args?: Omit<I, 'json'>) => WebSocket
+          $ws: (args?: I) => WebSocket
         }
       : {}
     : {})

src/helper/websocket/index.ts

@@ -12,8 +12,6 @@ export interface WSEvents {
   onError?: (evt: Event, ws: WSContext) => void
 }
 
-export type UpgradedWebSocketResponseInputJSONType = '__websocket'
-
 /**
  * Upgrade WebSocket Type
  */
@@ -23,9 +21,7 @@ export type UpgradeWebSocket = (
   any,
   string,
   {
-    in: {
-      json: UpgradedWebSocketResponseInputJSONType
-    }
+    outputFormat: 'ws'
   }
 >