react-hook-form 7.17.0 → 7.17.1

package/dist/types/controller.d.ts

@@ -1,38 +1,37 @@
 import * as React from 'react';
-import { FieldErrors } from '..';
 import { RegisterOptions } from './validator';
-import { Control, FieldError, FieldPathValue, FieldPathWithValue, FieldValues, IsAny, NestedValue, Primitive, RefCallBack, UnpackNestedValue, UseFormStateReturn } from './';
-declare type ControllerFieldError<TFieldValues extends FieldValues = FieldValues, TResult = any, TName extends FieldPathWithValue<TFieldValues, TResult> = FieldPathWithValue<TFieldValues, TResult>, FieldValuesAtPath = IsAny<TResult> extends true ? FieldPathValue<TFieldValues, TName> : TResult> = FieldValuesAtPath extends NestedValue | Primitive ? FieldError : FieldErrors<FieldValuesAtPath>;
-export declare type ControllerFieldState<TFieldValues extends FieldValues = FieldValues, TResult = any, TName extends FieldPathWithValue<TFieldValues, TResult> = FieldPathWithValue<TFieldValues, TResult>> = {
+import { Control, DeepMapImpl, DeepPartialImpl, FieldError, FieldPath, FieldPathValue, FieldValues, RefCallBack, UnionLike, UnpackNestedValue, UseFormStateReturn } from './';
+declare type ControllerFieldError<T> = DeepMapImpl<DeepPartialImpl<UnionLike<T>>, FieldError>;
+export declare type ControllerFieldState<TFieldValues extends FieldValues = FieldValues, TFieldName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>> = {
     invalid: boolean;
     isTouched: boolean;
     isDirty: boolean;
-    error?: ControllerFieldError<TFieldValues, TResult, TName>;
+    error?: ControllerFieldError<FieldPathValue<TFieldValues, TFieldName>>;
 };
-export declare type ControllerRenderProps<TFieldValues extends FieldValues = FieldValues, TResult = any, TName extends FieldPathWithValue<TFieldValues, TResult> = FieldPathWithValue<TFieldValues, TResult>> = {
+export declare type ControllerRenderProps<TFieldValues extends FieldValues = FieldValues, TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>> = {
     onChange: (...event: any[]) => void;
     onBlur: () => void;
-    value: IsAny<TResult> extends true ? UnpackNestedValue<FieldPathValue<TFieldValues, TName>> : UnpackNestedValue<TResult>;
+    value: UnpackNestedValue<FieldPathValue<TFieldValues, TName>>;
     name: TName;
     ref: RefCallBack;
 };
-export declare type UseControllerProps<TFieldValues extends FieldValues = FieldValues, TResult = any, TName extends FieldPathWithValue<TFieldValues, TResult> = FieldPathWithValue<TFieldValues, TResult>> = {
+export declare type UseControllerProps<TFieldValues extends FieldValues = FieldValues, TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>> = {
     name: TName;
     rules?: Omit<RegisterOptions<TFieldValues, TName>, 'valueAsNumber' | 'valueAsDate' | 'setValueAs' | 'disabled'>;
     shouldUnregister?: boolean;
-    defaultValue?: IsAny<TResult> extends true ? UnpackNestedValue<FieldPathValue<TFieldValues, TName>> : UnpackNestedValue<TResult>;
+    defaultValue?: UnpackNestedValue<FieldPathValue<TFieldValues, TName>>;
     control?: Control<TFieldValues>;
 };
-export declare type UseControllerReturn<TFieldValues extends FieldValues = FieldValues, TResult = any, TName extends FieldPathWithValue<TFieldValues, TResult> = FieldPathWithValue<TFieldValues, TResult>> = {
-    field: ControllerRenderProps<TFieldValues, TResult, TName>;
+export declare type UseControllerReturn<TFieldValues extends FieldValues = FieldValues, TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>> = {
+    field: ControllerRenderProps<TFieldValues, TName>;
     formState: UseFormStateReturn<TFieldValues>;
-    fieldState: ControllerFieldState<TFieldValues, TResult, TName>;
+    fieldState: ControllerFieldState<TFieldValues, TName>;
 };
-export declare type ControllerProps<TFieldValues extends FieldValues = FieldValues, TResult = any, TName extends FieldPathWithValue<TFieldValues, TResult> = FieldPathWithValue<TFieldValues, TResult>> = {
+export declare type ControllerProps<TFieldValues extends FieldValues = FieldValues, TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>> = {
     render: ({ field, fieldState, formState, }: {
-        field: ControllerRenderProps<TFieldValues, TResult, TName>;
-        fieldState: ControllerFieldState<TFieldValues, TResult, TName>;
+        field: ControllerRenderProps<TFieldValues, TName>;
+        fieldState: ControllerFieldState<TFieldValues, TName>;
         formState: UseFormStateReturn<TFieldValues>;
     }) => React.ReactElement;
-} & UseControllerProps<TFieldValues, TResult, TName>;
+} & UseControllerProps<TFieldValues, TName>;
 export {};

package/dist/types/form.d.ts

@@ -149,22 +149,21 @@ export declare type Names = {
     focus: InternalFieldName;
     watchAll: boolean;
 };
-export declare type BatchFieldArrayUpdate = <T extends Function, TFieldValues, TFieldArrayName extends FieldArrayPath<TFieldValues> = FieldArrayPath<TFieldValues>, TKeyName extends string = 'id'>(keyName: TKeyName, name: InternalFieldName, method: T, args: {
+export declare type BatchFieldArrayUpdate = <T extends Function, TFieldValues, TFieldArrayName extends FieldArrayPath<TFieldValues> = FieldArrayPath<TFieldValues>, TKeyName extends string = 'id'>(name: InternalFieldName, method: T, args: {
     argA?: unknown;
     argB?: unknown;
 }, updatedFieldArrayValues?: Partial<FieldArrayWithId<TFieldValues, TFieldArrayName, TKeyName>>[], shouldSetValue?: boolean, shouldSetFields?: boolean) => void;
 export declare type Control<TFieldValues extends FieldValues = FieldValues, TContext extends object = object> = {
-    _shouldUnregister?: boolean;
     _subjects: Subjects<TFieldValues>;
-    _removeFields: () => void;
+    _removeUnmounted: () => void;
     _names: Names;
     _stateFlags: {
         mount: boolean;
         action: boolean;
         watch: boolean;
     };
-    _updateProps: (props: UseFormProps<TFieldValues, TContext>) => void;
-    _getIsDirty: GetIsDirty;
+    _options: UseFormProps<TFieldValues, TContext>;
+    _getDirty: GetIsDirty;
     _formState: FormState<TFieldValues>;
     _updateValid: () => void;
     _fields: FieldRefs;
@@ -174,7 +173,7 @@ export declare type Control<TFieldValues extends FieldValues = FieldValues, TCon
     _getWatch: WatchInternal<TFieldValues>;
     register: UseFormRegister<TFieldValues>;
     _updateFieldArray: BatchFieldArrayUpdate;
-    _getFieldArrayValue: <TFieldArrayValues>(name: InternalFieldName) => Partial<TFieldArrayValues>[];
+    _getFieldArray: <TFieldArrayValues>(name: InternalFieldName) => Partial<TFieldArrayValues>[];
     unregister: UseFormUnregister<TFieldValues>;
 };
 export declare type WatchObserver<TFieldValues> = (value: UnpackNestedValue<TFieldValues>, info: {

package/dist/types/utils.d.ts

@@ -21,14 +21,14 @@ export declare type IsFlatObject<T extends object> = Extract<Exclude<T[keyof T],
 declare type IsTuple<T extends ReadonlyArray<any>> = number extends T['length'] ? false : true;
 declare type TupleKey<T extends ReadonlyArray<any>> = Exclude<keyof T, keyof any[]>;
 declare type ArrayKey = number;
-declare type PathImpl<K extends string | number, V> = V extends Primitive ? `${K}` : `${K}` | `${K}.${Path<V>}`;
+declare type PathImpl<K extends string | number, V> = V extends ReadonlyArray<any> | Record<any, unknown> ? `${K}` | `${K}.${Path<V>}` : `${K}`;
 export declare type Path<T> = T extends ReadonlyArray<infer V> ? IsTuple<T> extends true ? {
     [K in TupleKey<T>]-?: PathImpl<K & string, T[K]>;
 }[TupleKey<T>] : PathImpl<ArrayKey, V> : {
     [K in keyof T]-?: PathImpl<K & string, T[K]>;
 }[keyof T];
 export declare type FieldPath<TFieldValues extends FieldValues> = Path<TFieldValues>;
-declare type ArrayPathImpl<K extends string | number, V> = V extends Primitive ? never : V extends ReadonlyArray<infer U> ? U extends Primitive ? never : `${K}` | `${K}.${ArrayPath<V>}` : `${K}.${ArrayPath<V>}`;
+declare type ArrayPathImpl<K extends string | number, V> = IsAny<V> extends true ? `${K}` | `${K}.${ArrayPath<V>}` : V extends ReadonlyArray<infer U> ? U extends ReadonlyArray<any> | Record<any, unknown> ? `${K}` | `${K}.${ArrayPath<V>}` : never : V extends Record<any, unknown> ? `${K}.${ArrayPath<V>}` : never;
 export declare type ArrayPath<T> = T extends ReadonlyArray<infer V> ? IsTuple<T> extends true ? {
     [K in TupleKey<T>]-?: ArrayPathImpl<K & string, T[K]>;
 }[TupleKey<T>] : ArrayPathImpl<ArrayKey, V> : {
@@ -52,7 +52,4 @@ export declare type UnionLike<T> = [T] extends [Date | FileList | File | NestedV
 } : [T] extends [Record<any, unknown>] ? PartialBy<{
     [K in UnionKeys<T>]: UnionLike<UnionValues<T, K>>;
 }, Exclude<UnionKeys<T>, keyof T> | OptionalKeys<T>> : T;
-export declare type FieldPathWithValue<TFieldValues extends FieldValues, TResult = unknown, FieldPaths extends FieldPath<TFieldValues> = FieldPath<TFieldValues>> = {
-    [key in FieldPaths]: FieldPathValue<TFieldValues, key> extends TResult ? key : never;
-}[FieldPaths];
 export {};

package/dist/useController.d.ts

@@ -1,2 +1,2 @@
-import { FieldPathWithValue, FieldValues, UseControllerProps, UseControllerReturn } from './types';
-export declare function useController<TFieldValues extends FieldValues = FieldValues, TResult = any, TName extends FieldPathWithValue<TFieldValues, TResult> = FieldPathWithValue<TFieldValues, TResult>>(props: UseControllerProps<TFieldValues, TResult, TName>): UseControllerReturn<TFieldValues, TResult, TName>;
+import { FieldPath, FieldValues, UseControllerProps, UseControllerReturn } from './types';
+export declare function useController<TFieldValues extends FieldValues = FieldValues, TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>>(props: UseControllerProps<TFieldValues, TName>): UseControllerReturn<TFieldValues, TName>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-hook-form",
   "description": "Performant, flexible and extensible forms library for React Hooks",
-  "version": "7.17.0",
+  "version": "7.17.1",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
   "umd:main": "dist/index.umd.js",