Fix union type flattened error type

colinhacks · Mar 2, 2022 · 6cadd62 · 6cadd62
1 parent 363937b
commit 6cadd62
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/deno/lib/types.ts b/deno/lib/types.ts
@@ -50,13 +50,15 @@ export type ZodTypeAny = ZodType<any, any, any>;
 export type TypeOf<T extends ZodType<any, any, any>> = T["_output"];
 export type input<T extends ZodType<any, any, any>> = T["_input"];
 export type output<T extends ZodType<any, any, any>> = T["_output"];
+
+type allKeys<T> = T extends any ? keyof T : never;
 export type TypeOfFlattenedError<
   T extends ZodType<any, any, any>,
   U = string
 > = {
   formErrors: U[];
   fieldErrors: {
-    [P in keyof TypeOf<T>]?: U[];
+    [P in allKeys<TypeOf<T>>]?: U[];
   };
 };
 export type TypeOfFormErrors<

diff --git a/src/types.ts b/src/types.ts
@@ -50,13 +50,15 @@ export type ZodTypeAny = ZodType<any, any, any>;
 export type TypeOf<T extends ZodType<any, any, any>> = T["_output"];
 export type input<T extends ZodType<any, any, any>> = T["_input"];
 export type output<T extends ZodType<any, any, any>> = T["_output"];
+
+type allKeys<T> = T extends any ? keyof T : never;
 export type TypeOfFlattenedError<
   T extends ZodType<any, any, any>,
   U = string
 > = {
   formErrors: U[];
   fieldErrors: {
-    [P in keyof TypeOf<T>]?: U[];
+    [P in allKeys<TypeOf<T>>]?: U[];
   };
 };
 export type TypeOfFormErrors<