Merge pull request #20 from react-hook-form/improve-types

import types from core lib

Author: bluebill1049

package.json

@@ -72,7 +72,7 @@
     "prettier": "^2.0.5",
     "react": "^16.9.0",
     "react-dom": "^16.9.0",
-    "react-hook-form": "^6.0.0-rc.4",
+    "react-hook-form": "^6.7.0",
     "react-test-renderer": "^16.9.0",
     "rimraf": "^3.0.2",
     "rollup": "^2.15.0",
@@ -86,7 +86,7 @@
   "peerDependencies": {
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0",
-    "react-hook-form": ">=6.0.0"
+    "react-hook-form": ">=6.6.0"
   },
   "husky": {
     "hooks": {

src/ErrorMessage.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
-import { useFormContext, get } from 'react-hook-form';
-import { Props, FieldErrors } from './types';
+import { useFormContext, get, FieldErrors } from 'react-hook-form';
+import { Props } from './types';
 
 const ErrorMessage = <
   TFieldErrors extends FieldErrors,

src/types.ts

@@ -1,87 +1,11 @@
 import React from 'react';
-
-export type NonUndefined<T> = T extends undefined ? never : T;
-
-export type Assign<T extends object, U extends object> = T & Omit<U, keyof T>;
-
-export type DeepMap<T, TValue> = {
-  [K in keyof T]?: IsAny<T[K]> extends true
-    ? any
-    : NonUndefined<T[K]> extends NestedValue | Date | FileList
-    ? TValue
-    : NonUndefined<T[K]> extends object
-    ? DeepMap<T[K], TValue>
-    : NonUndefined<T[K]> extends Array<infer U>
-    ? IsAny<U> extends true
-      ? Array<any>
-      : U extends NestedValue | Date | FileList
-      ? Array<TValue>
-      : U extends object
-      ? Array<DeepMap<U, TValue>>
-      : Array<TValue>
-    : TValue;
-};
-
-export type IsAny<T> = boolean extends (T extends never ? true : false)
-  ? true
-  : false;
-
-export type IsFlatObject<T extends object> = Extract<
-  Exclude<T[keyof T], NestedValue | Date | FileList>,
-  any[] | object
-> extends never
-  ? true
-  : false;
-
-declare const $NestedValue: unique symbol;
-
-export type FieldValues = Record<string, any>;
-
-export type FieldName<TFieldValues extends FieldValues> = IsFlatObject<
-  TFieldValues
-> extends true
-  ? Extract<keyof TFieldValues, string>
-  : string;
-
-export type NestedValue<TValue extends any[] | object = any[] | object> = {
-  [$NestedValue]: never;
-} & TValue;
-
-export type Ref = FieldElement;
-
-export type CustomElement<TFieldValues extends FieldValues> = {
-  name: FieldName<TFieldValues>;
-  type?: string;
-  value?: any;
-  checked?: boolean;
-  options?: HTMLOptionsCollection;
-  files?: FileList | null;
-  focus?: () => void;
-};
-
-export type FieldElement<TFieldValues extends FieldValues = FieldValues> =
-  | HTMLInputElement
-  | HTMLSelectElement
-  | HTMLTextAreaElement
-  | CustomElement<TFieldValues>;
-
-export type Message = string;
-
-export type ValidateResult = Message | Message[] | boolean | undefined;
-
-export type MultipleFieldErrors = Record<string, ValidateResult>;
-
-export type FieldError = {
-  type: string;
-  ref?: Ref;
-  types?: MultipleFieldErrors;
-  message?: Message;
-  isManual?: boolean;
-};
-
-export type FieldErrors<
-  TFieldValues extends FieldValues = FieldValues
-> = DeepMap<TFieldValues, FieldError>;
+import {
+  Assign,
+  FieldName,
+  Message,
+  MultipleFieldErrors,
+  FieldErrors,
+} from 'react-hook-form';
 
 export type FieldValuesFromFieldErrors<
   TFieldErrors

yarn.lock

@@ -3799,10 +3799,10 @@ react-dom@^16.9.0:
     prop-types "^15.6.2"
     scheduler "^0.19.1"
 
-react-hook-form@^6.0.0-rc.4:
-  version "6.0.0-rc.4"
-  resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-6.0.0-rc.4.tgz#83889afbf8aeda7741e983e7a512e42dfd6d13af"
-  integrity sha512-22t+lh8bDv2ajY66QGsfoMhdJa+G4Qlm7XbnCzw24+CaZnr/UoMNAubeVFVkrQB4COXoErA94L0aMt19BqGkmg==
+react-hook-form@^6.7.0:
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-6.7.0.tgz#84702b6a56c6c81d7c43cbfbd343e4884dd1e6be"
+  integrity sha512-2ySZ/lyp8xinKUMv/yoSo3NcNknfrHGlJ1pIV2U80H0WlFSGaGZ0wvAHmgfl1L5ZhoQND6mawcv09wuM8OGVPw==
 
 react-is@^16.12.0, react-is@^16.8.1, react-is@^16.8.6:
   version "16.13.1"