Fix schema type error mentioned in issue 549

yup/src/__tests__/Form.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import user from '@testing-library/user-event';
-import { useForm } from 'react-hook-form';
+import { SubmitHandler, useForm } from 'react-hook-form';
 import * as Yup from 'yup';
 import { yupResolver } from '..';
 
@@ -10,18 +10,18 @@ const schema = Yup.object({
   password: Yup.string().required(),
 });
 
-type FormData = Yup.InferType<typeof schema> & { unusedProperty: string };
+type FormData = Yup.InferType<typeof schema>;
 
 interface Props {
-  onSubmit: (data: FormData) => void;
+  onSubmit: SubmitHandler<FormData>;
 }
 
 function TestComponent({ onSubmit }: Props) {
   const {
     register,
     formState: { errors },
     handleSubmit,
-  } = useForm<FormData>({
+  } = useForm({
     resolver: yupResolver(schema), // Useful to check TypeScript regressions
   });
 

yup/src/__tests__/__fixtures__/data.ts

@@ -35,7 +35,7 @@ export const schemaWithWhen = yup.object({
   }),
 });
 
-export const validData: yup.InferType<typeof schema> = {
+export const validData = {
   username: 'Doe',
   password: 'Password123_',
   repeatPassword: 'Password123_',
@@ -50,14 +50,15 @@ export const validData: yup.InferType<typeof schema> = {
       name: 'name',
     },
   ],
-};
+} satisfies yup.InferType<typeof schema>;
 
 export const invalidData = {
   password: '___',
   email: '',
   birthYear: 'birthYear',
   like: [{ id: 'z' }],
-};
+  // Must be set to "unknown", otherwise typescript knows that it is invalid
+} as unknown as Required<yup.InferType<typeof schema>>;
 
 export const fields: Record<InternalFieldName, Field['_f']> = {
   username: {

yup/src/index.ts

@@ -1,2 +1 @@
 export * from './yup';
-export * from './types';

yup/src/yup.ts

@@ -1,7 +1,11 @@
 import * as Yup from 'yup';
 import { toNestError, validateFieldsNatively } from '@hookform/resolvers';
-import { appendErrors, FieldError } from 'react-hook-form';
-import { Resolver } from './types';
+import {
+  appendErrors,
+  FieldError,
+  FieldValues,
+  Resolver,
+} from 'react-hook-form';
 
 /**
  * Why `path!` ? because it could be `undefined` in some case
@@ -38,9 +42,22 @@ const parseErrorSchema = (
   );
 };
 
-export const yupResolver: Resolver =
-  (schema, schemaOptions = {}, resolverOptions = {}) =>
-  async (values, context, options) => {
+export function yupResolver<TFieldValues extends FieldValues>(
+  schema: Yup.ObjectSchema<TFieldValues>,
+  schemaOptions: Parameters<(typeof schema)['validate']>[1] = {},
+  resolverOptions: {
+    /**
+     * @default async
+     */
+    mode?: 'async' | 'sync';
+    /**
+     * Return the raw input values rather than the parsed values.
+     * @default false
+     */
+    raw?: boolean;
+  } = {},
+): Resolver<TFieldValues> {
+  return async (values, context, options) => {
     try {
       if (schemaOptions.context && process.env.NODE_ENV === 'development') {
         // eslint-disable-next-line no-console
@@ -80,3 +97,4 @@ export const yupResolver: Resolver =
       };
     }
   };
+}