@hookform/resolvers 5.4.1 → 5.4.3

package/zod/src/zod.ts

@@ -40,7 +40,14 @@ function parseZod3Issues(
 
     if (!errors[_path]) {
       if ('unionErrors' in error) {
-        const unionError = error.unionErrors[0].errors[0];
+        // Surface the error from whichever union member came closest to
+        // matching (fewest issues), rather than always the first member —
+        // the first member isn't necessarily the one the input was meant for.
+        const closestUnionError = error.unionErrors.reduce(
+          (closest, current) =>
+            current.errors.length < closest.errors.length ? current : closest,
+        );
+        const unionError = closestUnionError.errors[0];
 
         errors[_path] = {
           message: unionError.message,
@@ -91,7 +98,13 @@ function parseZod4Issues(
 
     if (!errors[_path]) {
       if (error.code === 'invalid_union' && error.errors.length > 0) {
-        const unionError = error.errors[0][0];
+        // Surface the error from whichever union member came closest to
+        // matching (fewest issues), rather than always the first member —
+        // the first member isn't necessarily the one the input was meant for.
+        const closestBranch = error.errors.reduce((closest, branch) =>
+          branch.length < closest.length ? branch : closest,
+        );
+        const unionError = closestBranch[0];
 
         errors[_path] = {
           message: unionError.message,
@@ -149,6 +162,16 @@ interface Zod3Type<O = unknown, I = unknown> {
   };
 }
 
+// minimal interface to avoid assignability issues between zod v4 patch/minor
+// releases, which brand the full `$ZodType` shape with an exact version literal
+// (e.g. `_zod.version.minor`)
+interface Zod4Type<Output = unknown, Input = unknown> {
+  _zod: {
+    output: Output;
+    input: Input;
+  };
+}
+
 // 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
@@ -201,7 +224,7 @@ export function zodResolver<
   Input extends FieldValues,
   Context,
   Output,
-  T extends z4.$ZodType<Output, Input> = z4.$ZodType<Output, Input>,
+  T extends Zod4Type<Output, Input> = Zod4Type<Output, Input>,
 >(
   schema: T,
   schemaOptions?: Zod4ParseParams, // already partial
@@ -211,9 +234,9 @@ export function zodResolver<
   Input extends FieldValues,
   Context,
   Output,
-  T extends z4.$ZodType<Output, Input> = z4.$ZodType<Output, Input>,
+  T extends Zod4Type<Output, Input> = Zod4Type<Output, Input>,
 >(
-  schema: z4.$ZodType<Output, Input>,
+  schema: Zod4Type<Output, Input>,
   schemaOptions: Zod4ParseParams | undefined, // already partial
   resolverOptions: RawResolverOptions,
 ): Resolver<z4.input<T>, Context, z4.input<T>>;