refactor: return ~> response

unjs · Jul 26, 2023 · 532df6c · 532df6c
1 parent dd5ecf3
commit 532df6c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/src/event/event.ts b/src/event/event.ts
@@ -27,7 +27,7 @@ export interface NodeEventContext {
 
 export class H3Event<
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  Request extends EventHandlerRequest = EventHandlerRequest
+  _RequestT extends EventHandlerRequest = EventHandlerRequest
 > implements Pick<FetchEvent, "respondWith">
 {
   "__is_event__" = true;

diff --git a/src/event/utils.ts b/src/event/utils.ts
@@ -6,23 +6,26 @@ import type {
 
 export function defineEventHandler<
   Request extends EventHandlerRequest = EventHandlerRequest,
-  Return = any
->(handler: EventHandler<Request, Return>): EventHandler<Request, Return>;
+  Response = any
+>(handler: EventHandler<Request, Response>): EventHandler<Request, Response>;
 // TODO: remove when appropriate
 // This signature provides backwards compatibility with previous signature where first generic was return type
-export function defineEventHandler<Request = EventHandlerRequest, Return = any>(
+export function defineEventHandler<
+  Request = EventHandlerRequest,
+  Response = any
+>(
   handler: EventHandler<
     Request extends EventHandlerRequest ? Request : any,
-    Request extends EventHandlerRequest ? Return : Request
+    Request extends EventHandlerRequest ? Response : Request
   >
 ): EventHandler<
   Request extends EventHandlerRequest ? Request : any,
-  Request extends EventHandlerRequest ? Return : Request
+  Request extends EventHandlerRequest ? Response : Request
 >;
 export function defineEventHandler<
   Request extends EventHandlerRequest = EventHandlerRequest,
-  Return = any
->(handler: EventHandler<Request, Return>): EventHandler<Request, Return> {
+  Response = any
+>(handler: EventHandler<Request, Response>): EventHandler<Request, Response> {
   handler.__is_handler__ = true;
   return handler;
 }

diff --git a/src/types.ts b/src/types.ts
@@ -56,10 +56,10 @@ export type InferEventInput<
 
 export interface EventHandler<
   Request extends EventHandlerRequest = EventHandlerRequest,
-  Return = any
+  Response = EventHandlerResponse
 > {
   __is_handler__?: true;
-  (event: H3Event<Request>): EventHandlerResponse<Return>;
+  (event: H3Event<Request>): EventHandlerResponse<Response>;
 }
 
 export type LazyEventHandler = () => EventHandler | Promise<EventHandler>;