Refactor

nota · Dec 10, 2024 · 9404e48 · 9404e48
1 parent 91d928b
commit 9404e48
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 24 deletions.
diff --git a/src/valibot/index.ts b/src/valibot/index.ts
@@ -125,6 +125,22 @@ export type ValibotApiResSchema<
   SC extends keyof AResponses & StatusCode,
 > = AResponses[SC] extends AnyV ? AResponses[SC] : never;
 
+type ValibotRequestValidatorsGenerator<E extends ValibotApiEndpoints> = <
+  Path extends string,
+  M extends string,
+>(
+  input: ValidatorsRawInput<Path, M>,
+) => Result<ToValibotValidators<E, Path, M>, ValidatorInputError>;
+type ValibotResponseValidatorsGenerator<E extends ValibotApiEndpoints> = <
+  Path extends string,
+  M extends string,
+  SC extends number,
+>(
+  input: ResponseValidatorsRawInput<Path, M, SC>,
+) => Result<
+  ToValibotResponseValidators<ApiResponses<E, Path, M>, SC>,
+  ValidatorInputError
+>;
 /**
  * Create a new validator for the given endpoints.
  *
@@ -133,7 +149,7 @@ export type ValibotApiResSchema<
 export const newValibotValidator = <E extends ValibotApiEndpoints>(
   endpoints: E,
 ) => {
-  const { req, res } = createValidator(
+  return createValidator(
     endpoints,
     (spec: ValibotApiSpec, input, key) =>
       toResult(v.safeParse(spec[key]!, input[key])),
@@ -142,17 +158,9 @@ export const newValibotValidator = <E extends ValibotApiEndpoints>(
       // FIXME: schemaがundefinedの場合の処理
       return toResult(v.safeParse(schema!, input[key]));
     },
-  );
-  return {
-    req: req as <Path extends string, M extends string>(
-      input: ValidatorsRawInput<Path, M>,
-    ) => Result<ToValibotValidators<E, Path, M>, ValidatorInputError>,
-    res: res as <Path extends string, M extends string, SC extends number>(
-      input: ResponseValidatorsRawInput<Path, M, SC>,
-    ) => Result<
-      ToValibotResponseValidators<ApiResponses<E, Path, M>, SC>,
-      ValidatorInputError
-    >,
+  ) as {
+    req: ValibotRequestValidatorsGenerator<E>;
+    res: ValibotResponseValidatorsGenerator<E>;
   };
 };
 

diff --git a/src/zod/index.ts b/src/zod/index.ts
@@ -121,13 +121,30 @@ export type ToApiResponses<AR extends ZodAnyApiResponses> = {
   };
 };
 
+type ZodRequestValidatorsGenerator<E extends ZodApiEndpoints> = <
+  Path extends string,
+  M extends string,
+>(
+  input: ValidatorsRawInput<Path, M>,
+) => Result<ToZodValidators<E, Path, M>, ValidatorInputError>;
+type ZodResponseValidatorsGenerator<E extends ZodApiEndpoints> = <
+  Path extends string,
+  M extends string,
+  SC extends number,
+>(
+  input: ResponseValidatorsRawInput<Path, M, SC>,
+) => Result<
+  ToZodResponseValidators<ApiResponses<E, Path, M>, SC>,
+  ValidatorInputError
+>;
+
 /**
  * Create a new validator for the given endpoints.
  *
  * @param endpoints API endpoints
  */
 export const newZodValidator = <E extends ZodApiEndpoints>(endpoints: E) => {
-  const { req, res } = createValidator(
+  return createValidator(
     endpoints,
     (spec: ZodApiSpec, input, key) =>
       toResult(spec[key]!.safeParse(input[key])),
@@ -136,17 +153,9 @@ export const newZodValidator = <E extends ZodApiEndpoints>(endpoints: E) => {
       // FIXME: schemaがundefinedの場合の処理
       return toResult(schema!.safeParse(input[key]));
     },
-  );
-  return {
-    req: req as <Path extends string, M extends string>(
-      input: ValidatorsRawInput<Path, M>,
-    ) => Result<ToZodValidators<E, Path, M>, ValidatorInputError>,
-    res: res as <Path extends string, M extends string, SC extends number>(
-      input: ResponseValidatorsRawInput<Path, M, SC>,
-    ) => Result<
-      ToZodResponseValidators<ApiResponses<E, Path, M>, SC>,
-      ValidatorInputError
-    >,
+  ) as {
+    req: ZodRequestValidatorsGenerator<E>;
+    res: ZodResponseValidatorsGenerator<E>;
   };
 };