fix(typebox): improve type interface

Author: kotarella1110

typebox/src/typebox.ts

@@ -1,10 +1,9 @@
 import { toNestErrors, validateFieldsNatively } from '@hookform/resolvers';
-import { Static, StaticDecode, Type } from '@sinclair/typebox';
+import { Static, StaticDecode, TObject } from '@sinclair/typebox';
 import { TypeCheck } from '@sinclair/typebox/compiler';
 import { Value, type ValueError } from '@sinclair/typebox/value';
 import {
   FieldError,
-  FieldErrors,
   FieldValues,
   Resolver,
   appendErrors,
@@ -45,21 +44,19 @@ function parseErrorSchema(
   return errors;
 }
 
-export function typeboxResolver<Input extends FieldValues, Context>(
-  typecheck: TypeCheck<ReturnType<typeof Type.Object<Input>>>,
-): Resolver<
-  Static<ReturnType<typeof typecheck.Schema>>,
+export function typeboxResolver<
+  Input extends FieldValues,
   Context,
-  StaticDecode<ReturnType<typeof typecheck.Schema>>
->;
+  Schema extends TObject<Input> = TObject<Input>,
+>(
+  typecheck: TypeCheck<Schema>,
+): Resolver<Static<Schema>, Context, StaticDecode<Schema>>;
 
-export function typeboxResolver<Input extends FieldValues, Context>(
-  schema: ReturnType<typeof Type.Object<Input>>,
-): Resolver<Static<typeof schema>, Context, StaticDecode<typeof schema>>;
-
-export function typeboxResolver<Input extends FieldValues, Context, Output>(
-  schema: ReturnType<typeof Type.Object<Input>>,
-): Resolver<Static<typeof schema>, Context, Output>;
+export function typeboxResolver<
+  Input extends FieldValues,
+  Context,
+  Schema extends TObject<Input> = TObject<Input>,
+>(schema: Schema): Resolver<Static<Schema>, Context, StaticDecode<Schema>>;
 
 /**
  * Creates a resolver for react-hook-form using Typebox schema validation
@@ -77,10 +74,14 @@ export function typeboxResolver<Input extends FieldValues, Context, Output>(
  *   resolver: typeboxResolver(schema)
  * });
  */
-export function typeboxResolver<Input extends FieldValues, Context, Output>(
-  schema: ReturnType<typeof Type.Object<Input>>,
-): Resolver<Static<typeof schema>, Context, Output | Static<typeof schema>> {
-  return async (values: Static<typeof schema>, _, options) => {
+export function typeboxResolver<
+  Input extends FieldValues,
+  Context,
+  Schema extends TObject<Input>,
+>(
+  schema: Schema | TypeCheck<Schema>,
+): Resolver<Static<Schema>, Context, StaticDecode<Schema>> {
+  return async (values: Static<Schema>, _, options) => {
     const errors = Array.from(
       schema instanceof TypeCheck
         ? schema.Errors(values)
@@ -91,7 +92,7 @@ export function typeboxResolver<Input extends FieldValues, Context, Output>(
 
     if (!errors.length) {
       return {
-        errors: {} as FieldErrors,
+        errors: {},
         values,
       };
     }