improve FieldErrors type (react-hook-form#1182)

mshahin364 · Mar 10, 2020 · 5e9b84f · 5e9b84f
1 parent 2a438be
commit 5e9b84f
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/src/types.ts b/src/types.ts
@@ -116,21 +116,25 @@ export type NestDataObject<FormValues> = {
   [Key in keyof FormValues]?: FormValues[Key] extends Array<infer U>
     ? 0 extends 1 & U
       ? any
-      : U extends object
-      ? keyof U extends never
-        ? any
-        : FieldErrors<U>[]
-      : U extends string | number
+      : unknown extends U
+      ? FieldError[]
+      : object extends U
       ? FieldError[]
-      : FieldError
+      : U extends Date
+      ? FieldError[]
+      : U extends object
+      ? FieldErrors<U>[]
+      : FieldError[]
     : 0 extends 1 & FormValues[Key]
     ? any
+    : unknown extends FormValues[Key]
+    ? FieldError
+    : object extends FormValues[Key]
+    ? FieldError
     : FormValues[Key] extends Date
     ? FieldError
     : FormValues[Key] extends object
-    ? keyof FormValues[Key] extends never
-      ? any
-      : FieldErrors<FormValues[Key]>
+    ? FieldErrors<FormValues[Key]>
     : FieldError;
 };