fix stupid types

ridafkih · Oct 15, 2022 · 9cab332 · 9cab332
1 parent b1a5c01
commit 9cab332
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/lib/@types/method.ts b/lib/@types/method.ts
@@ -2,7 +2,6 @@ import type { Context } from "koa";
 import type { ZodNull, infer as ZodInfer } from "zod";
 import type {
   NonNullableValidStructure,
-  ValidStructure,
 } from "@/@types/valid-structure";
 
 interface OverrideBody<T extends Record<string, unknown> | undefined> extends Exclude<Context["request"], "body"> {
@@ -14,7 +13,7 @@ interface OverrideRequest<T extends Record<string, unknown> | undefined> extends
 }
 
 export type ExtendedContext<
-  RequestBody extends ValidStructure = ZodNull,
+  RequestBody = ZodNull,
   URLParams extends Record<string, string> = Record<string, never>
 > = OverrideRequest<
   RequestBody extends NonNullableValidStructure
@@ -25,7 +24,7 @@ export type ExtendedContext<
 };
 
 type MethodContext<
-  RequestSchema extends ValidStructure,
+  RequestSchema,
   URLParams extends Record<string, string> = Record<string, never>
 > = ExtendedContext<RequestSchema, URLParams>;
 
@@ -42,8 +41,8 @@ type MethodHandlerFunctionResponse<ResponseSchema> =
       };
 
 export type MethodHandlerFunction<
-  RequestSchema extends ValidStructure,
-  ResponseSchema extends ValidStructure,
+  RequestSchema,
+  ResponseSchema,
   URLParams extends Record<string, string>
 > = (
   context: MethodContext<RequestSchema, URLParams>

diff --git a/lib/src/create-method.ts b/lib/src/create-method.ts
@@ -8,8 +8,8 @@ import type {
 type MiddlewareStack = Array<Middleware>;
 
 export type CreateMethodOptions<
-  RequestSchema extends ValidStructure,
-  ResponseSchema extends ValidStructure,
+  RequestSchema,
+  ResponseSchema,
   URLParams extends Record<string, string>
 > = {
   schema: {
@@ -35,8 +35,8 @@ export type CreateMethodOptions<
  * @returns The method object.
  */
 export const method = <
-  ResponseSchema extends ValidStructure,
-  RequestSchema extends ValidStructure,
+  ResponseSchema,
+  RequestSchema,
   URLParams extends Record<string, string>
 >(
   options: CreateMethodOptions<RequestSchema, ResponseSchema, URLParams>

diff --git a/lib/src/create-route.ts b/lib/src/create-route.ts
@@ -8,11 +8,13 @@ import type { ValidStructure } from "@/@types/valid-structure";
  * @returns An object containing the methods.
  */
 export const route = <
-  URLParams extends Record<string, string> = Record<string, never>
+  URLParams extends Record<string, string> = Record<string, never>,
+  RequestBody extends ValidStructure = ValidStructure,
+  ResponseBody extends ValidStructure = ValidStructure
 >(methods: {
   [K in MethodName]?: CreateMethodOptions<
-    ValidStructure,
-    ValidStructure,
+    RequestBody,
+    ResponseBody,
     URLParams
   >;
 }) => methods;