Fix inference

Author: colinhacks

README.md

@@ -68,7 +68,7 @@ Example:
 ```tsx
 import { useForm } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
-import { z } from 'zod';
+import { z } from 'zod'; // or 'zod/v4'
 
 const schema = z.object({
   id: z.number(),

bun.lock

@@ -1444,7 +1444,7 @@
 
     "yup": ["[email protected]", "", { "dependencies": { "property-expr": "^2.0.5", "tiny-case": "^1.0.3", "toposort": "^2.0.2", "type-fest": "^2.19.0" } }, "sha512-JED8pB50qbA4FOkDol0bYF/p60qSEDQqBD0/qeIrUCG1KbPBIQ776fCUNb9ldbPcSTxA69g/47XTo4TqWiuXOA=="],
 
-    "zod": ["[email protected].51", "", {}, "sha512-TQSnBldh+XSGL+opiSIq0575wvDPqu09AqWe1F7JhUMKY+M91/aGlK4MhpVNO7MgYfHcVCB1ffwAUTJzllKJqg=="],
+    "zod": ["[email protected].30", "", {}, "sha512-VolhdEtu6TJr/fzGuHA/SZ5ixvXqA6ADOG9VRcQ3rdOKmF5hkmcJbyaQjUH5BgmpA9gej++zYRX7zjSmdReIwA=="],
 
     "@asamuzakjp/css-color/lru-cache": ["[email protected]", "", {}, "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="],
 

standard-schema/src/__tests__/__fixtures__/data.ts

@@ -1,6 +1,6 @@
 import { StandardSchemaV1 } from '@standard-schema/spec';
 import { Field, InternalFieldName } from 'react-hook-form';
-import { z } from 'zod';
+import { z } from 'zod/v3';
 
 export const schema = z
   .object({

standard-schema/src/__tests__/standard-schema.ts

@@ -1,5 +1,5 @@
 import { Resolver, SubmitHandler, useForm } from 'react-hook-form';
-import { z } from 'zod';
+import { z } from 'zod/v3';
 import { standardSchemaResolver } from '..';
 import {
   customSchema,

typeschema/src/__tests__/Form-native-validation.tsx

@@ -3,7 +3,7 @@ import user from '@testing-library/user-event';
 import type { Infer } from '@typeschema/main';
 import React from 'react';
 import { useForm } from 'react-hook-form';
-import { z } from 'zod';
+import { z } from 'zod/v3';
 import { typeschemaResolver } from '..';
 
 const USERNAME_REQUIRED_MESSAGE = 'username field is required';

typeschema/src/__tests__/Form.tsx

@@ -3,7 +3,7 @@ import user from '@testing-library/user-event';
 import type { Infer } from '@typeschema/main';
 import React from 'react';
 import { useForm } from 'react-hook-form';
-import { z } from 'zod';
+import { z } from 'zod/v3';
 import { typeschemaResolver } from '..';
 
 const schema = z.object({

typeschema/src/__tests__/__fixtures__/data.ts

@@ -1,5 +1,5 @@
 import { Field, InternalFieldName } from 'react-hook-form';
-import { z } from 'zod';
+import { z } from 'zod/v3';
 
 export const schema = z
   .object({

typeschema/src/__tests__/typeschema.ts

@@ -1,6 +1,6 @@
 import * as typeschema from '@typeschema/main';
 import { Resolver, SubmitHandler, useForm } from 'react-hook-form';
-import { z } from 'zod';
+import { z } from 'zod/v3';
 import { typeschemaResolver } from '..';
 import { fields, invalidData, schema, validData } from './__fixtures__/data';
 

zod/src/__tests__/Form-native-validation.tsx

@@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react';
 import user from '@testing-library/user-event';
 import React from 'react';
 import { useForm } from 'react-hook-form';
-import { z } from 'zod';
+import { z } from 'zod/v3';
 import { zodResolver } from '..';
 
 const USERNAME_REQUIRED_MESSAGE = 'username field is required';

zod/src/__tests__/Form.tsx

@@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react';
 import user from '@testing-library/user-event';
 import React from 'react';
 import { useForm } from 'react-hook-form';
-import { z } from 'zod';
+import { z } from 'zod/v3';
 import { zodResolver } from '..';
 
 const schema = z.object({

zod/src/__tests__/__fixtures__/data-v3.ts

@@ -1,5 +1,5 @@
 import { Field, InternalFieldName } from 'react-hook-form';
-import { z } from 'zod';
+import { z } from 'zod/v3';
 
 export const schema = z
   .object({

zod/src/__tests__/zod-v3.ts

@@ -1,5 +1,5 @@
 import { Resolver, SubmitHandler, useForm } from 'react-hook-form';
-import { z } from 'zod';
+import { z } from 'zod/v3';
 import { zodResolver } from '..';
 import { fields, invalidData, schema, validData } from './__fixtures__/data-v3';
 

zod/src/__tests__/zod-v4.ts

@@ -1,5 +1,5 @@
 import { Resolver, SubmitHandler, useForm } from 'react-hook-form';
-import { z } from 'zod';
+import { z } from 'zod/v4';
 import { zodResolver } from '..';
 import { fields, invalidData, schema, validData } from './__fixtures__/data-v4';
 

zod/src/zod.ts

@@ -148,13 +148,6 @@ interface Zod3Type<O = unknown, I = unknown> {
   };
 }
 
-interface Zod4Type<O = unknown, I = unknown> {
-  _zod: {
-    output: O;
-    input: I;
-  };
-}
-
 // some type magic to make versions pre-3.25.0 still work
 type IsUnresolved<T> = PropertyKey extends keyof T ? true : false;
 type UnresolvedFallback<T, Fallback> = IsUnresolved<typeof z3> extends true
@@ -202,16 +195,27 @@ export function zodResolver<Input extends FieldValues, Context, Output>(
   schemaOptions: Zod3ParseParams | undefined,
   resolverOptions: RawResolverOptions,
 ): Resolver<Input, Context, Input>;
-export function zodResolver<Input extends FieldValues, Context, Output>(
-  schema: Zod4Type<Output, Input>,
+// the Zod 4 overloads need to be generic for complicated reasons
+export function zodResolver<
+  Input extends FieldValues,
+  Context,
+  Output,
+  T extends z4.$ZodType<Output, Input> = z4.$ZodType<Output, Input>,
+>(
+  schema: T,
   schemaOptions?: Zod4ParseParams, // already partial
   resolverOptions?: NonRawResolverOptions,
-): Resolver<Input, Context, Output>;
-export function zodResolver<Input extends FieldValues, Context, Output>(
-  schema: Zod4Type<Output, Input>,
-  schemaOptions?: Zod4ParseParams, // already partial
-  resolverOptions?: RawResolverOptions,
-): Resolver<Input, Context, Input>;
+): Resolver<z4.input<T>, Context, z4.output<T>>;
+export function zodResolver<
+  Input extends FieldValues,
+  Context,
+  Output,
+  T extends z4.$ZodType<Output, Input> = z4.$ZodType<Output, Input>,
+>(
+  schema: z4.$ZodType<Output, Input>,
+  schemaOptions: Zod4ParseParams | undefined, // already partial
+  resolverOptions: RawResolverOptions,
+): Resolver<z4.input<T>, Context, z4.input<T>>;
 /**
  * Creates a resolver function for react-hook-form that validates form data using a Zod schema
  * @param {z3.ZodSchema<Input>} schema - The Zod schema used to validate the form data