@tanstack/form-core 1.2.2 → 1.2.4

package/src/FieldApi.ts

@@ -119,8 +119,7 @@ type UnwrapFormValidateOrFnForInner<
     : undefined
 
 export type UnwrapFieldValidateOrFn<
-  TParentData,
-  TName extends DeepKeys<TParentData>,
+  TName extends string,
   TValidateOrFn extends undefined | FieldValidateOrFn<any, any, any>,
   TFormValidateOrFn extends undefined | FormValidateOrFn<any>,
 > =
@@ -202,8 +201,7 @@ type UnwrapFormAsyncValidateOrFnForInner<
     : undefined
 
 export type UnwrapFieldAsyncValidateOrFn<
-  TParentData,
-  TName extends DeepKeys<TParentData>,
+  TName extends string,
   TValidateOrFn extends undefined | FieldAsyncValidateOrFn<any, any, any>,
   TFormValidateOrFn extends undefined | FormAsyncValidateOrFn<any>,
 > =
@@ -446,31 +444,45 @@ export interface FieldOptions<
  * An object type representing the required options for the FieldApi class.
  */
 export interface FieldApiOptions<
-  TParentData,
-  TName extends DeepKeys<TParentData>,
-  TData extends DeepValue<TParentData, TName>,
-  TOnMount extends undefined | FieldValidateOrFn<TParentData, TName, TData>,
-  TOnChange extends undefined | FieldValidateOrFn<TParentData, TName, TData>,
-  TOnChangeAsync extends
+  in out TParentData,
+  in out TName extends DeepKeys<TParentData>,
+  in out TData extends DeepValue<TParentData, TName>,
+  in out TOnMount extends
+    | undefined
+    | FieldValidateOrFn<TParentData, TName, TData>,
+  in out TOnChange extends
+    | undefined
+    | FieldValidateOrFn<TParentData, TName, TData>,
+  in out TOnChangeAsync extends
     | undefined
     | FieldAsyncValidateOrFn<TParentData, TName, TData>,
-  TOnBlur extends undefined | FieldValidateOrFn<TParentData, TName, TData>,
-  TOnBlurAsync extends
+  in out TOnBlur extends
+    | undefined
+    | FieldValidateOrFn<TParentData, TName, TData>,
+  in out TOnBlurAsync extends
     | undefined
     | FieldAsyncValidateOrFn<TParentData, TName, TData>,
-  TOnSubmit extends undefined | FieldValidateOrFn<TParentData, TName, TData>,
-  TOnSubmitAsync extends
+  in out TOnSubmit extends
+    | undefined
+    | FieldValidateOrFn<TParentData, TName, TData>,
+  in out TOnSubmitAsync extends
     | undefined
     | FieldAsyncValidateOrFn<TParentData, TName, TData>,
-  TFormOnMount extends undefined | FormValidateOrFn<TParentData>,
-  TFormOnChange extends undefined | FormValidateOrFn<TParentData>,
-  TFormOnChangeAsync extends undefined | FormAsyncValidateOrFn<TParentData>,
-  TFormOnBlur extends undefined | FormValidateOrFn<TParentData>,
-  TFormOnBlurAsync extends undefined | FormAsyncValidateOrFn<TParentData>,
-  TFormOnSubmit extends undefined | FormValidateOrFn<TParentData>,
-  TFormOnSubmitAsync extends undefined | FormAsyncValidateOrFn<TParentData>,
-  TFormOnServer extends undefined | FormAsyncValidateOrFn<TParentData>,
-  TParentSubmitMeta,
+  in out TFormOnMount extends undefined | FormValidateOrFn<TParentData>,
+  in out TFormOnChange extends undefined | FormValidateOrFn<TParentData>,
+  in out TFormOnChangeAsync extends
+    | undefined
+    | FormAsyncValidateOrFn<TParentData>,
+  in out TFormOnBlur extends undefined | FormValidateOrFn<TParentData>,
+  in out TFormOnBlurAsync extends
+    | undefined
+    | FormAsyncValidateOrFn<TParentData>,
+  in out TFormOnSubmit extends undefined | FormValidateOrFn<TParentData>,
+  in out TFormOnSubmitAsync extends
+    | undefined
+    | FormAsyncValidateOrFn<TParentData>,
+  in out TFormOnServer extends undefined | FormAsyncValidateOrFn<TParentData>,
+  in out TParentSubmitMeta,
 > extends FieldOptions<
     TParentData,
     TName,
@@ -538,28 +550,13 @@ export type FieldMetaBase<
    * A map of errors related to the field value.
    */
   errorMap: ValidationErrorMap<
-    UnwrapFieldValidateOrFn<TParentData, TName, TOnMount, TFormOnMount>,
-    UnwrapFieldValidateOrFn<TParentData, TName, TOnChange, TFormOnChange>,
-    UnwrapFieldAsyncValidateOrFn<
-      TParentData,
-      TName,
-      TOnChangeAsync,
-      TFormOnChangeAsync
-    >,
-    UnwrapFieldValidateOrFn<TParentData, TName, TOnBlur, TFormOnBlur>,
-    UnwrapFieldAsyncValidateOrFn<
-      TParentData,
-      TName,
-      TOnBlurAsync,
-      TFormOnBlurAsync
-    >,
-    UnwrapFieldValidateOrFn<TParentData, TName, TOnSubmit, TFormOnSubmit>,
-    UnwrapFieldAsyncValidateOrFn<
-      TParentData,
-      TName,
-      TOnSubmitAsync,
-      TFormOnSubmitAsync
-    >
+    UnwrapFieldValidateOrFn<TName, TOnMount, TFormOnMount>,
+    UnwrapFieldValidateOrFn<TName, TOnChange, TFormOnChange>,
+    UnwrapFieldAsyncValidateOrFn<TName, TOnChangeAsync, TFormOnChangeAsync>,
+    UnwrapFieldValidateOrFn<TName, TOnBlur, TFormOnBlur>,
+    UnwrapFieldAsyncValidateOrFn<TName, TOnBlurAsync, TFormOnBlurAsync>,
+    UnwrapFieldValidateOrFn<TName, TOnSubmit, TFormOnSubmit>,
+    UnwrapFieldAsyncValidateOrFn<TName, TOnSubmitAsync, TFormOnSubmitAsync>
   >
   /**
    * A flag indicating whether the field is currently being validated.
@@ -617,40 +614,25 @@ export type FieldMetaDerived<
    */
   errors: Array<
     | UnwrapOneLevelOfArray<
-        UnwrapFieldValidateOrFn<TParentData, TName, TOnMount, TFormOnMount>
+        UnwrapFieldValidateOrFn<TName, TOnMount, TFormOnMount>
       >
     | UnwrapOneLevelOfArray<
-        UnwrapFieldValidateOrFn<TParentData, TName, TOnChange, TFormOnChange>
+        UnwrapFieldValidateOrFn<TName, TOnChange, TFormOnChange>
       >
     | UnwrapOneLevelOfArray<
-        UnwrapFieldAsyncValidateOrFn<
-          TParentData,
-          TName,
-          TOnChangeAsync,
-          TFormOnChangeAsync
-        >
+        UnwrapFieldAsyncValidateOrFn<TName, TOnChangeAsync, TFormOnChangeAsync>
       >
     | UnwrapOneLevelOfArray<
-        UnwrapFieldValidateOrFn<TParentData, TName, TOnBlur, TFormOnBlur>
+        UnwrapFieldValidateOrFn<TName, TOnBlur, TFormOnBlur>
       >
     | UnwrapOneLevelOfArray<
-        UnwrapFieldAsyncValidateOrFn<
-          TParentData,
-          TName,
-          TOnBlurAsync,
-          TFormOnBlurAsync
-        >
+        UnwrapFieldAsyncValidateOrFn<TName, TOnBlurAsync, TFormOnBlurAsync>
       >
     | UnwrapOneLevelOfArray<
-        UnwrapFieldValidateOrFn<TParentData, TName, TOnSubmit, TFormOnSubmit>
+        UnwrapFieldValidateOrFn<TName, TOnSubmit, TFormOnSubmit>
       >
     | UnwrapOneLevelOfArray<
-        UnwrapFieldAsyncValidateOrFn<
-          TParentData,
-          TName,
-          TOnSubmitAsync,
-          TFormOnSubmitAsync
-        >
+        UnwrapFieldAsyncValidateOrFn<TName, TOnSubmitAsync, TFormOnSubmitAsync>
       >
   >
   /**
@@ -858,31 +840,45 @@ export type AnyFieldApi = FieldApi<
  * the `new FieldApi` constructor.
  */
 export class FieldApi<
-  TParentData,
-  TName extends DeepKeys<TParentData>,
-  TData extends DeepValue<TParentData, TName>,
-  TOnMount extends undefined | FieldValidateOrFn<TParentData, TName, TData>,
-  TOnChange extends undefined | FieldValidateOrFn<TParentData, TName, TData>,
-  TOnChangeAsync extends
+  in out TParentData,
+  in out TName extends DeepKeys<TParentData>,
+  in out TData extends DeepValue<TParentData, TName>,
+  in out TOnMount extends
+    | undefined
+    | FieldValidateOrFn<TParentData, TName, TData>,
+  in out TOnChange extends
+    | undefined
+    | FieldValidateOrFn<TParentData, TName, TData>,
+  in out TOnChangeAsync extends
     | undefined
     | FieldAsyncValidateOrFn<TParentData, TName, TData>,
-  TOnBlur extends undefined | FieldValidateOrFn<TParentData, TName, TData>,
-  TOnBlurAsync extends
+  in out TOnBlur extends
+    | undefined
+    | FieldValidateOrFn<TParentData, TName, TData>,
+  in out TOnBlurAsync extends
     | undefined
     | FieldAsyncValidateOrFn<TParentData, TName, TData>,
-  TOnSubmit extends undefined | FieldValidateOrFn<TParentData, TName, TData>,
-  TOnSubmitAsync extends
+  in out TOnSubmit extends
+    | undefined
+    | FieldValidateOrFn<TParentData, TName, TData>,
+  in out TOnSubmitAsync extends
     | undefined
     | FieldAsyncValidateOrFn<TParentData, TName, TData>,
-  TFormOnMount extends undefined | FormValidateOrFn<TParentData>,
-  TFormOnChange extends undefined | FormValidateOrFn<TParentData>,
-  TFormOnChangeAsync extends undefined | FormAsyncValidateOrFn<TParentData>,
-  TFormOnBlur extends undefined | FormValidateOrFn<TParentData>,
-  TFormOnBlurAsync extends undefined | FormAsyncValidateOrFn<TParentData>,
-  TFormOnSubmit extends undefined | FormValidateOrFn<TParentData>,
-  TFormOnSubmitAsync extends undefined | FormAsyncValidateOrFn<TParentData>,
-  TFormOnServer extends undefined | FormAsyncValidateOrFn<TParentData>,
-  TParentSubmitMeta,
+  in out TFormOnMount extends undefined | FormValidateOrFn<TParentData>,
+  in out TFormOnChange extends undefined | FormValidateOrFn<TParentData>,
+  in out TFormOnChangeAsync extends
+    | undefined
+    | FormAsyncValidateOrFn<TParentData>,
+  in out TFormOnBlur extends undefined | FormValidateOrFn<TParentData>,
+  in out TFormOnBlurAsync extends
+    | undefined
+    | FormAsyncValidateOrFn<TParentData>,
+  in out TFormOnSubmit extends undefined | FormValidateOrFn<TParentData>,
+  in out TFormOnSubmitAsync extends
+    | undefined
+    | FormAsyncValidateOrFn<TParentData>,
+  in out TFormOnServer extends undefined | FormAsyncValidateOrFn<TParentData>,
+  in out TParentSubmitMeta,
 > {
   /**
    * A reference to the form API instance.
@@ -1135,17 +1131,25 @@ export class FieldApi<
       TParentSubmitMeta
     >,
   ) => {
-    // Default Value
+    this.options = opts as never
+
+    const nameHasChanged = this.name !== opts.name
+    this.name = opts.name
 
+    // Default Value
     if (this.state.value === undefined) {
       const formDefault = getBy(opts.form.options.defaultValues, opts.name)
 
-      if (opts.defaultValue !== undefined) {
-        this.setValue(opts.defaultValue as never, {
+      const defaultValue = opts.defaultValue ?? formDefault
+
+      // The name is dynamic in array fields. It changes when the user performs operations like removing or reordering.
+      // In this case, we don't want to force a default value if the store managed to find an existing value.
+      if (nameHasChanged) {
+        this.setValue((val) => val || defaultValue, {
           dontUpdateMeta: true,
         })
-      } else if (formDefault !== undefined) {
-        this.setValue(formDefault as never, {
+      } else if (defaultValue !== undefined) {
+        this.setValue(defaultValue as never, {
           dontUpdateMeta: true,
         })
       }
@@ -1155,9 +1159,6 @@ export class FieldApi<
     if (this.form.getFieldMeta(this.name) === undefined) {
       this.setMeta(this.state.meta)
     }
-
-    this.options = opts as never
-    this.name = opts.name
   }
 
   /**
@@ -1310,10 +1311,7 @@ export class FieldApi<
       if (!field.instance) continue
       const { onChangeListenTo, onBlurListenTo } =
         field.instance.options.validators || {}
-      if (
-        cause === 'change' &&
-        onChangeListenTo?.includes(this.name as string)
-      ) {
+      if (cause === 'change' && onChangeListenTo?.includes(this.name)) {
         linkedFields.push(field.instance)
       }
       if (cause === 'blur' && onBlurListenTo?.includes(this.name as string)) {

package/src/FormApi.ts

@@ -236,16 +236,16 @@ export interface FormTransform<
  * An object representing the options for a form.
  */
 export interface FormOptions<
-  TFormData,
-  TOnMount extends undefined | FormValidateOrFn<TFormData>,
-  TOnChange extends undefined | FormValidateOrFn<TFormData>,
-  TOnChangeAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
-  TOnBlur extends undefined | FormValidateOrFn<TFormData>,
-  TOnBlurAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
-  TOnSubmit extends undefined | FormValidateOrFn<TFormData>,
-  TOnSubmitAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
-  TOnServer extends undefined | FormAsyncValidateOrFn<TFormData>,
-  TSubmitMeta = never,
+  in out TFormData,
+  in out TOnMount extends undefined | FormValidateOrFn<TFormData>,
+  in out TOnChange extends undefined | FormValidateOrFn<TFormData>,
+  in out TOnChangeAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
+  in out TOnBlur extends undefined | FormValidateOrFn<TFormData>,
+  in out TOnBlurAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
+  in out TOnSubmit extends undefined | FormValidateOrFn<TFormData>,
+  in out TOnSubmitAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
+  in out TOnServer extends undefined | FormAsyncValidateOrFn<TFormData>,
+  in out TSubmitMeta = never,
 > {
   /**
    * Set initial values for your form.
@@ -393,15 +393,15 @@ export type FieldInfo<TFormData> = {
  * An object representing the current state of the form.
  */
 export type BaseFormState<
-  TFormData,
-  TOnMount extends undefined | FormValidateOrFn<TFormData>,
-  TOnChange extends undefined | FormValidateOrFn<TFormData>,
-  TOnChangeAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
-  TOnBlur extends undefined | FormValidateOrFn<TFormData>,
-  TOnBlurAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
-  TOnSubmit extends undefined | FormValidateOrFn<TFormData>,
-  TOnSubmitAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
-  TOnServer extends undefined | FormAsyncValidateOrFn<TFormData>,
+  in out TFormData,
+  in out TOnMount extends undefined | FormValidateOrFn<TFormData>,
+  in out TOnChange extends undefined | FormValidateOrFn<TFormData>,
+  in out TOnChangeAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
+  in out TOnBlur extends undefined | FormValidateOrFn<TFormData>,
+  in out TOnBlurAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
+  in out TOnSubmit extends undefined | FormValidateOrFn<TFormData>,
+  in out TOnSubmitAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
+  in out TOnServer extends undefined | FormAsyncValidateOrFn<TFormData>,
 > = {
   /**
    * The current values of the form fields.
@@ -468,15 +468,15 @@ export type BaseFormState<
 }
 
 export type DerivedFormState<
-  TFormData,
-  TOnMount extends undefined | FormValidateOrFn<TFormData>,
-  TOnChange extends undefined | FormValidateOrFn<TFormData>,
-  TOnChangeAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
-  TOnBlur extends undefined | FormValidateOrFn<TFormData>,
-  TOnBlurAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
-  TOnSubmit extends undefined | FormValidateOrFn<TFormData>,
-  TOnSubmitAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
-  TOnServer extends undefined | FormAsyncValidateOrFn<TFormData>,
+  in out TFormData,
+  in out TOnMount extends undefined | FormValidateOrFn<TFormData>,
+  in out TOnChange extends undefined | FormValidateOrFn<TFormData>,
+  in out TOnChangeAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
+  in out TOnBlur extends undefined | FormValidateOrFn<TFormData>,
+  in out TOnBlurAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
+  in out TOnSubmit extends undefined | FormValidateOrFn<TFormData>,
+  in out TOnSubmitAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
+  in out TOnServer extends undefined | FormAsyncValidateOrFn<TFormData>,
 > = {
   /**
    * A boolean indicating if the form is currently validating.
@@ -537,38 +537,38 @@ export type DerivedFormState<
   fieldMeta: Record<DeepKeys<TFormData>, AnyFieldMeta>
 }
 
-export type FormState<
-  TFormData,
-  TOnMount extends undefined | FormValidateOrFn<TFormData>,
-  TOnChange extends undefined | FormValidateOrFn<TFormData>,
-  TOnChangeAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
-  TOnBlur extends undefined | FormValidateOrFn<TFormData>,
-  TOnBlurAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
-  TOnSubmit extends undefined | FormValidateOrFn<TFormData>,
-  TOnSubmitAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
-  TOnServer extends undefined | FormAsyncValidateOrFn<TFormData>,
-> = BaseFormState<
-  TFormData,
-  TOnMount,
-  TOnChange,
-  TOnChangeAsync,
-  TOnBlur,
-  TOnBlurAsync,
-  TOnSubmit,
-  TOnSubmitAsync,
-  TOnServer
-> &
-  DerivedFormState<
-    TFormData,
-    TOnMount,
-    TOnChange,
-    TOnChangeAsync,
-    TOnBlur,
-    TOnBlurAsync,
-    TOnSubmit,
-    TOnSubmitAsync,
-    TOnServer
-  >
+export interface FormState<
+  in out TFormData,
+  in out TOnMount extends undefined | FormValidateOrFn<TFormData>,
+  in out TOnChange extends undefined | FormValidateOrFn<TFormData>,
+  in out TOnChangeAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
+  in out TOnBlur extends undefined | FormValidateOrFn<TFormData>,
+  in out TOnBlurAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
+  in out TOnSubmit extends undefined | FormValidateOrFn<TFormData>,
+  in out TOnSubmitAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
+  in out TOnServer extends undefined | FormAsyncValidateOrFn<TFormData>,
+> extends BaseFormState<
+      TFormData,
+      TOnMount,
+      TOnChange,
+      TOnChangeAsync,
+      TOnBlur,
+      TOnBlurAsync,
+      TOnSubmit,
+      TOnSubmitAsync,
+      TOnServer
+    >,
+    DerivedFormState<
+      TFormData,
+      TOnMount,
+      TOnChange,
+      TOnChangeAsync,
+      TOnBlur,
+      TOnBlurAsync,
+      TOnSubmit,
+      TOnSubmitAsync,
+      TOnServer
+    > {}
 
 export type AnyFormState = FormState<
   any,
@@ -662,16 +662,16 @@ export type AnyFormApi = FormApi<
  * However, if you need to create a new instance manually, you can do so by calling the `new FormApi` constructor.
  */
 export class FormApi<
-  TFormData,
-  TOnMount extends undefined | FormValidateOrFn<TFormData>,
-  TOnChange extends undefined | FormValidateOrFn<TFormData>,
-  TOnChangeAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
-  TOnBlur extends undefined | FormValidateOrFn<TFormData>,
-  TOnBlurAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
-  TOnSubmit extends undefined | FormValidateOrFn<TFormData>,
-  TOnSubmitAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
-  TOnServer extends undefined | FormAsyncValidateOrFn<TFormData>,
-  TSubmitMeta = never,
+  in out TFormData,
+  in out TOnMount extends undefined | FormValidateOrFn<TFormData>,
+  in out TOnChange extends undefined | FormValidateOrFn<TFormData>,
+  in out TOnChangeAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
+  in out TOnBlur extends undefined | FormValidateOrFn<TFormData>,
+  in out TOnBlurAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
+  in out TOnSubmit extends undefined | FormValidateOrFn<TFormData>,
+  in out TOnSubmitAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
+  in out TOnServer extends undefined | FormAsyncValidateOrFn<TFormData>,
+  in out TSubmitMeta = never,
 > {
   /**
    * The options for the form.

package/src/util-types.ts

@@ -19,132 +19,92 @@ type Try<A1, A2, Catch = never> = A1 extends A2 ? A1 : Catch
  */
 export type Narrow<A> = Try<A, [], NarrowRaw<A>>
 
-type ComputeRange<
-  N extends number,
-  Result extends Array<unknown> = [],
-> = Result['length'] extends N
-  ? Result
-  : ComputeRange<N, [...Result, Result['length']]>
-type Index40 = ComputeRange<40>[number]
-
-// Is this type a tuple?
-type IsTuple<T> = T extends readonly any[] & { length: infer Length }
-  ? Length extends Index40
+type IsAny<T> = 0 extends 1 & T ? true : false
+
+export type ArrayAccessor<TPrefix extends string> = `${TPrefix}[${number}]`
+
+export type DeepRecordArrayUnion<
+  T extends ReadonlyArray<any>,
+  TPrefix extends string,
+  TAcc,
+> = DeepRecordUnion<
+  T[number],
+  ArrayAccessor<TPrefix>,
+  TAcc | Record<ArrayAccessor<TPrefix>, T[number]>
+>
+
+export type TupleAccessor<
+  TPrefix extends string,
+  TKey,
+> = `${TPrefix}[${TKey & string}]`
+
+export type AllTupleKeys<T> = T extends any ? keyof T & `${number}` : never
+
+export type DeepRecordTupleUnion<
+  T extends ReadonlyArray<any>,
+  TPrefix extends string,
+  TAcc,
+  TAllKeys extends AllTupleKeys<T> = AllTupleKeys<T>,
+> = TAllKeys extends any
+  ? DeepRecordUnion<
+      T[TAllKeys],
+      TupleAccessor<TPrefix, TAllKeys>,
+      TAcc | Record<TupleAccessor<TPrefix, TAllKeys>, T[TAllKeys]>
+    >
+  : never
+
+export type AllObjectKeys<T> = T extends any
+  ? keyof T & (string | number)
+  : never
+
+export type ObjectAccessor<
+  TPrefix extends string,
+  TKey extends string | number,
+> = TPrefix extends '' ? `${TKey}` : `${TPrefix}.${TKey}`
+
+export type DeepRecordObjectUnion<
+  T,
+  TPrefix extends string,
+  TAcc,
+  TAllKeys extends AllObjectKeys<T> = AllObjectKeys<T>,
+> = TAllKeys extends any
+  ? DeepRecordUnion<
+      T[TAllKeys],
+      ObjectAccessor<TPrefix, TAllKeys>,
+      TAcc | Record<ObjectAccessor<TPrefix, TAllKeys>, T[TAllKeys]>
+    >
+  : never
+
+export type DeepRecordUnion<T, TPrefix extends string = '', TAcc = never> =
+  IsAny<T> extends true
     ? T
-    : never
+    : T extends string | number | boolean | bigint | Date
+      ? TAcc
+      : T extends ReadonlyArray<any>
+        ? number extends T['length']
+          ? DeepRecordArrayUnion<T, TPrefix, TAcc>
+          : DeepRecordTupleUnion<T, TPrefix, TAcc>
+        : T extends object
+          ? DeepRecordObjectUnion<T, TPrefix, TAcc>
+          : TAcc
+
+export type UnionToIntersection<T> = (
+  T extends any ? (param: T) => any : never
+) extends (param: infer TI) => any
+  ? TI
   : never
 
-// If this type is a tuple, what indices are allowed?
-type AllowedIndexes<
-  Tuple extends ReadonlyArray<any>,
-  Keys extends number = never,
-> = Tuple extends readonly []
-  ? Keys
-  : Tuple extends readonly [infer _, ...infer Tail]
-    ? AllowedIndexes<Tail, Keys | Tail['length']>
-    : Keys
-
-type PrefixArrayAccessor<T extends any[], TDepth extends any[]> = {
-  [K in keyof T]: `[${number}]${DeepKeys<T[K], TDepth>}`
-}[number]
-
-type PrefixTupleAccessor<
-  T extends any[],
-  TIndex extends number,
-  TDepth extends any[],
-> = {
-  [K in TIndex]: `[${K}]` | `[${K}]${DeepKeys<T[K], TDepth>}`
-}[TIndex]
-
-type PrefixObjectAccessor<T extends object, TDepth extends any[]> = {
-  [K in keyof T]-?: K extends string | number
-    ?
-        | PrefixFromDepth<K, TDepth>
-        | `${PrefixFromDepth<K, TDepth>}${DeepKeys<T[K], [TDepth]>}`
-    : never
-}[keyof T]
+export type DeepRecord<T> = UnionToIntersection<DeepRecordUnion<T>>
 
 /**
  * The keys of an object or array, deeply nested.
  */
-export type DeepKeys<T, TDepth extends any[] = []> = TDepth['length'] extends 5
-  ? never
-  : unknown extends T
-    ? PrefixFromDepth<string, TDepth>
-    : T extends readonly any[] & IsTuple<T>
-      ? PrefixTupleAccessor<T, AllowedIndexes<T>, TDepth>
-      : T extends any[]
-        ? PrefixArrayAccessor<T, [...TDepth, any]>
-        : T extends Date
-          ? never
-          : T extends object
-            ? PrefixObjectAccessor<T, TDepth>
-            : T extends string | number | boolean | bigint
-              ? ''
-              : never
-
-type PrefixFromDepth<
-  T extends string | number,
-  TDepth extends any[],
-> = TDepth['length'] extends 0 ? T : `.${T}`
-
-// Hack changing Typescript's default get behavior in order to work with union objects
-type Get<T, K extends string> = T extends { [Key in K]: infer V }
-  ? V
-  : T extends { [Key in K]?: infer W }
-    ? W | undefined
-    : never
-
-type ApplyNull<T> = null extends T ? null : never
-type ApplyUndefined<T> = undefined extends T ? undefined : never
+export type DeepKeys<T> = unknown extends T
+  ? string
+  : keyof DeepRecord<T> & string
 
 /**
  * Infer the type of a deeply nested property within an object or an array.
  */
-export type DeepValue<
-  // The object or array in which we have the property whose type we're trying to infer
-  TValue,
-  // A string representing the path of the property we're trying to access
-  TAccessor,
-  // Depth for preventing infinite recursion
-  TDepth extends ReadonlyArray<any> = [],
-> = unknown extends TValue // If TValue is any it will recurse forever, this terminates the recursion
-  ? TValue
-  : TDepth['length'] extends 10
-    ? unknown
-    : // Check if we're looking for the property in an array
-      TValue extends ReadonlyArray<any>
-      ? TAccessor extends `[${infer TBrackets}].${infer TAfter}`
-        ? /*
-          Extract the first element from the accessor path (`TBrackets`)
-          and recursively call `DeepValue` with it
-        */
-          DeepValue<
-            DeepValue<TValue, TBrackets, [...TDepth, any]>,
-            TAfter,
-            [...TDepth, any]
-          >
-        : TAccessor extends `[${infer TBrackets}]`
-          ? DeepValue<TValue, TBrackets, [...TDepth, any]>
-          : TAccessor extends keyof TValue
-            ? TValue[TAccessor]
-            : TValue[TAccessor & number]
-      : TAccessor extends `${infer TBefore}[${infer TEverythingElse}`
-        ? DeepValue<
-            DeepValue<TValue, TBefore, [...TDepth, any]>,
-            `[${TEverythingElse}`,
-            [...TDepth, any]
-          >
-        : TAccessor extends `[${infer TBrackets}]`
-          ? DeepValue<TValue, TBrackets, [...TDepth, any]>
-          : TAccessor extends `${infer TBefore}.${infer TAfter}`
-            ? DeepValue<
-                DeepValue<TValue, TBefore, [...TDepth, any]>,
-                TAfter,
-                [...TDepth, any]
-              >
-            : TAccessor extends string
-              ?
-                  | Get<TValue, TAccessor>
-                  | (ApplyNull<TValue> | ApplyUndefined<TValue>)
-              : never
+export type DeepValue<TValue, TAccessor> = DeepRecord<TValue>[TAccessor &
+  keyof DeepRecord<TValue>]