@tanstack/react-form 0.3.5 → 0.3.7

package/build/legacy/types.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/types.ts"],"sourcesContent":["import type { FieldOptions, DeepKeys } from '@tanstack/form-core'\n\nexport type UseFieldOptions<\n  TData,\n  TParentData,\n  TName extends DeepKeys<TParentData>,\n> = FieldOptions<TData, TParentData, TName> & {\n  mode?: 'value' | 'array'\n}\n"],"mappings":";;;;;;;;;;;;;;;;AAAA;AAAA;","names":[]}
+{"version":3,"sources":["../../src/types.ts"],"sourcesContent":["import type { FieldOptions, DeepKeys, DeepValue } from '@tanstack/form-core'\n\nexport type UseFieldOptions<\n  TParentData,\n  TName extends DeepKeys<TParentData>,\n  TData = DeepValue<TParentData, TName>,\n> = FieldOptions<TParentData, TName, TData> & {\n  mode?: 'value' | 'array'\n}\n"],"mappings":";;;;;;;;;;;;;;;;AAAA;AAAA;","names":[]}

package/build/legacy/types.d.cts

@@ -1,6 +1,6 @@
-import { DeepKeys, FieldOptions } from '@tanstack/form-core';
+import { DeepKeys, DeepValue, FieldOptions } from '@tanstack/form-core';
 
-type UseFieldOptions<TData, TParentData, TName extends DeepKeys<TParentData>> = FieldOptions<TData, TParentData, TName> & {
+type UseFieldOptions<TParentData, TName extends DeepKeys<TParentData>, TData = DeepValue<TParentData, TName>> = FieldOptions<TParentData, TName, TData> & {
     mode?: 'value' | 'array';
 };
 

package/build/legacy/types.d.ts

@@ -1,6 +1,6 @@
-import { DeepKeys, FieldOptions } from '@tanstack/form-core';
+import { DeepKeys, DeepValue, FieldOptions } from '@tanstack/form-core';
 
-type UseFieldOptions<TData, TParentData, TName extends DeepKeys<TParentData>> = FieldOptions<TData, TParentData, TName> & {
+type UseFieldOptions<TParentData, TName extends DeepKeys<TParentData>, TData = DeepValue<TParentData, TName>> = FieldOptions<TParentData, TName, TData> & {
     mode?: 'value' | 'array';
 };
 

package/build/legacy/useField.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/useField.tsx"],"sourcesContent":["import React, { useState } from 'react'\nimport { useStore } from '@tanstack/react-store'\nimport type {\n  DeepKeys,\n  DeepValue,\n  Narrow,\n  ResolveData,\n} from '@tanstack/form-core'\nimport { FieldApi, functionalUpdate } from '@tanstack/form-core'\nimport { useFormContext, formContext } from './formContext'\nimport useIsomorphicLayoutEffect from 'use-isomorphic-layout-effect'\nimport type { UseFieldOptions } from './types'\n\ndeclare module '@tanstack/form-core' {\n  // eslint-disable-next-line no-shadow\n  interface FieldApi<\n    TData,\n    TParentData,\n    TName extends DeepKeys<TParentData>,\n    TResolvedData extends ResolveData<TData, TParentData, TName> = ResolveData<\n      TData,\n      TParentData,\n      TName\n    >,\n  > {\n    Field: FieldComponent<TData>\n  }\n}\n\nexport type UseField<TParentData> = <TName extends DeepKeys<TParentData>>(\n  opts?: { name: Narrow<TName> } & UseFieldOptions<\n    DeepValue<TParentData, TName>,\n    TParentData,\n    TName\n  >,\n) => FieldApi<DeepValue<TParentData, TName>, TParentData, TName>\n\nexport function useField<\n  TData,\n  TParentData,\n  TName extends DeepKeys<TParentData>,\n>(\n  opts: UseFieldOptions<TData, TParentData, TName>,\n): FieldApi<\n  TData,\n  TParentData,\n  TName\n  // Omit<typeof opts, 'onMount'> & {\n  //   form: FormApi<TParentData>\n  // }\n> {\n  // Get the form API either manually or from context\n  const { formApi, parentFieldName } = useFormContext()\n\n  const [fieldApi] = useState(() => {\n    const name = (\n      typeof opts.index === 'number'\n        ? [parentFieldName, opts.index, opts.name]\n        : [parentFieldName, opts.name]\n    )\n      .filter((d) => d !== undefined)\n      .join('.')\n\n    const api = new FieldApi({\n      ...opts,\n      form: formApi,\n      name: name,\n    } as never)\n\n    api.Field = Field as never\n\n    return api\n  })\n\n  /**\n   * fieldApi.update should not have any side effects. Think of it like a `useRef`\n   * that we need to keep updated every render with the most up-to-date information.\n   */\n  useIsomorphicLayoutEffect(() => {\n    fieldApi.update({ ...opts, form: formApi } as never)\n  })\n\n  useStore(\n    fieldApi.store,\n    opts.mode === 'array'\n      ? (state: any) => {\n          return [state.meta, Object.keys(state.value || []).length]\n        }\n      : undefined,\n  )\n  // Instantiates field meta and removes it when unrendered\n  useIsomorphicLayoutEffect(() => fieldApi.mount(), [fieldApi])\n\n  return fieldApi as never\n}\n\ntype FieldComponentProps<\n  TData,\n  TParentData,\n  TName extends DeepKeys<TParentData>,\n  TResolvedData extends ResolveData<TData, TParentData, TName>,\n> = {\n  children: (\n    fieldApi: FieldApi<TData, TParentData, TName, TResolvedData>,\n  ) => any\n} & (TParentData extends any[]\n  ? {\n      name?: TName\n      index: number\n    }\n  : {\n      name: TName\n      index?: never\n    }) &\n  Omit<UseFieldOptions<TData, TParentData, TName>, 'name' | 'index'>\n\nexport type FieldComponent<TParentData> = <\n  TData,\n  TName extends DeepKeys<TParentData>,\n  TResolvedData extends ResolveData<TData, TParentData, TName> = ResolveData<\n    TData,\n    TParentData,\n    TName\n  >,\n>({\n  children,\n  ...fieldOptions\n}: FieldComponentProps<TData, TParentData, TName, TResolvedData>) => any\n\nexport function Field<TData, TParentData, TName extends DeepKeys<TParentData>>({\n  children,\n  ...fieldOptions\n}: {\n  children: (fieldApi: FieldApi<TData, TParentData, TName>) => any\n} & UseFieldOptions<TData, TParentData, TName>) {\n  const fieldApi = useField(fieldOptions as any)\n\n  return (\n    <formContext.Provider\n      value={{ formApi: fieldApi.form, parentFieldName: fieldApi.name }}\n      children={functionalUpdate(children, fieldApi as any)}\n    />\n  )\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAgC;AAChC,yBAAyB;AAOzB,uBAA2C;AAC3C,yBAA4C;AAC5C,0CAAsC;AA2B/B,SAAS,SAKd,MAQA;AAEA,QAAM,EAAE,SAAS,gBAAgB,QAAI,mCAAe;AAEpD,QAAM,CAAC,QAAQ,QAAI,uBAAS,MAAM;AAChC,UAAM,QACJ,OAAO,KAAK,UAAU,WAClB,CAAC,iBAAiB,KAAK,OAAO,KAAK,IAAI,IACvC,CAAC,iBAAiB,KAAK,IAAI,GAE9B,OAAO,CAAC,MAAM,MAAM,MAAS,EAC7B,KAAK,GAAG;AAEX,UAAM,MAAM,IAAI,0BAAS;AAAA,MACvB,GAAG;AAAA,MACH,MAAM;AAAA,MACN;AAAA,IACF,CAAU;AAEV,QAAI,QAAQ;AAEZ,WAAO;AAAA,EACT,CAAC;AAMD,0CAAAA,SAA0B,MAAM;AAC9B,aAAS,OAAO,EAAE,GAAG,MAAM,MAAM,QAAQ,CAAU;AAAA,EACrD,CAAC;AAED;AAAA,IACE,SAAS;AAAA,IACT,KAAK,SAAS,UACV,CAAC,UAAe;AACd,aAAO,CAAC,MAAM,MAAM,OAAO,KAAK,MAAM,SAAS,CAAC,CAAC,EAAE,MAAM;AAAA,IAC3D,IACA;AAAA,EACN;AAEA,0CAAAA,SAA0B,MAAM,SAAS,MAAM,GAAG,CAAC,QAAQ,CAAC;AAE5D,SAAO;AACT;AAmCO,SAAS,MAA+D;AAAA,EAC7E;AAAA,EACA,GAAG;AACL,GAEgD;AAC9C,QAAM,WAAW,SAAS,YAAmB;AAE7C,SACE,6BAAAC,QAAA;AAAA,IAAC,+BAAY;AAAA,IAAZ;AAAA,MACC,OAAO,EAAE,SAAS,SAAS,MAAM,iBAAiB,SAAS,KAAK;AAAA,MAChE,cAAU,mCAAiB,UAAU,QAAe;AAAA;AAAA,EACtD;AAEJ;","names":["useIsomorphicLayoutEffect","React"]}
+{"version":3,"sources":["../../src/useField.tsx"],"sourcesContent":["import React, { useState } from 'react'\nimport { useStore } from '@tanstack/react-store'\nimport type { DeepKeys, DeepValue, Narrow } from '@tanstack/form-core'\nimport { FieldApi, functionalUpdate } from '@tanstack/form-core'\nimport { useFormContext, formContext } from './formContext'\nimport useIsomorphicLayoutEffect from 'use-isomorphic-layout-effect'\nimport type { UseFieldOptions } from './types'\n\ndeclare module '@tanstack/form-core' {\n  // eslint-disable-next-line no-shadow\n  interface FieldApi<\n    TParentData,\n    TName extends DeepKeys<TParentData>,\n    TData = DeepValue<TParentData, TName>,\n  > {\n    Field: FieldComponent<TData>\n  }\n}\n\nexport type UseField<TParentData> = <TName extends DeepKeys<TParentData>>(\n  opts?: { name: Narrow<TName> } & UseFieldOptions<TParentData, TName>,\n) => FieldApi<TParentData, TName, DeepValue<TParentData, TName>>\n\nexport function useField<TParentData, TName extends DeepKeys<TParentData>>(\n  opts: UseFieldOptions<TParentData, TName>,\n): FieldApi<\n  TParentData,\n  TName\n  // Omit<typeof opts, 'onMount'> & {\n  //   form: FormApi<TParentData>\n  // }\n> {\n  // Get the form API either manually or from context\n  const { formApi, parentFieldName } = useFormContext()\n\n  const [fieldApi] = useState(() => {\n    const name = (\n      typeof opts.index === 'number'\n        ? [parentFieldName, opts.index, opts.name]\n        : [parentFieldName, opts.name]\n    )\n      .filter((d) => d !== undefined)\n      .join('.')\n\n    const api = new FieldApi({\n      ...opts,\n      form: formApi,\n      name: name,\n    } as never)\n\n    api.Field = Field as never\n\n    return api\n  })\n\n  /**\n   * fieldApi.update should not have any side effects. Think of it like a `useRef`\n   * that we need to keep updated every render with the most up-to-date information.\n   */\n  useIsomorphicLayoutEffect(() => {\n    fieldApi.update({ ...opts, form: formApi } as never)\n  })\n\n  useStore(\n    fieldApi.store,\n    opts.mode === 'array'\n      ? (state: any) => {\n          return [state.meta, Object.keys(state.value || []).length]\n        }\n      : undefined,\n  )\n  // Instantiates field meta and removes it when unrendered\n  useIsomorphicLayoutEffect(() => fieldApi.mount(), [fieldApi])\n\n  return fieldApi as never\n}\n\ntype FieldComponentProps<\n  TParentData,\n  TName extends DeepKeys<TParentData>,\n  TData = DeepValue<TParentData, TName>,\n> = {\n  children: (fieldApi: FieldApi<TParentData, TName, TData>) => any\n} & (TParentData extends any[]\n  ? {\n      name?: TName\n      index: number\n    }\n  : {\n      name: TName\n      index?: never\n    }) &\n  Omit<UseFieldOptions<TParentData, TName>, 'name' | 'index'>\n\nexport type FieldComponent<TParentData> = <\n  TName extends DeepKeys<TParentData>,\n  TData = DeepValue<TParentData, TName>,\n>({\n  children,\n  ...fieldOptions\n}: FieldComponentProps<TParentData, TName, TData>) => any\n\nexport function Field<TParentData, TName extends DeepKeys<TParentData>>({\n  children,\n  ...fieldOptions\n}: {\n  children: (fieldApi: FieldApi<TParentData, TName>) => any\n} & UseFieldOptions<TParentData, TName>) {\n  const fieldApi = useField(fieldOptions as any)\n\n  return (\n    <formContext.Provider\n      value={{ formApi: fieldApi.form, parentFieldName: fieldApi.name }}\n      children={functionalUpdate(children, fieldApi as any)}\n    />\n  )\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAgC;AAChC,yBAAyB;AAEzB,uBAA2C;AAC3C,yBAA4C;AAC5C,0CAAsC;AAkB/B,SAAS,SACd,MAOA;AAEA,QAAM,EAAE,SAAS,gBAAgB,QAAI,mCAAe;AAEpD,QAAM,CAAC,QAAQ,QAAI,uBAAS,MAAM;AAChC,UAAM,QACJ,OAAO,KAAK,UAAU,WAClB,CAAC,iBAAiB,KAAK,OAAO,KAAK,IAAI,IACvC,CAAC,iBAAiB,KAAK,IAAI,GAE9B,OAAO,CAAC,MAAM,MAAM,MAAS,EAC7B,KAAK,GAAG;AAEX,UAAM,MAAM,IAAI,0BAAS;AAAA,MACvB,GAAG;AAAA,MACH,MAAM;AAAA,MACN;AAAA,IACF,CAAU;AAEV,QAAI,QAAQ;AAEZ,WAAO;AAAA,EACT,CAAC;AAMD,0CAAAA,SAA0B,MAAM;AAC9B,aAAS,OAAO,EAAE,GAAG,MAAM,MAAM,QAAQ,CAAU;AAAA,EACrD,CAAC;AAED;AAAA,IACE,SAAS;AAAA,IACT,KAAK,SAAS,UACV,CAAC,UAAe;AACd,aAAO,CAAC,MAAM,MAAM,OAAO,KAAK,MAAM,SAAS,CAAC,CAAC,EAAE,MAAM;AAAA,IAC3D,IACA;AAAA,EACN;AAEA,0CAAAA,SAA0B,MAAM,SAAS,MAAM,GAAG,CAAC,QAAQ,CAAC;AAE5D,SAAO;AACT;AA2BO,SAAS,MAAwD;AAAA,EACtE;AAAA,EACA,GAAG;AACL,GAEyC;AACvC,QAAM,WAAW,SAAS,YAAmB;AAE7C,SACE,6BAAAC,QAAA;AAAA,IAAC,+BAAY;AAAA,IAAZ;AAAA,MACC,OAAO,EAAE,SAAS,SAAS,MAAM,iBAAiB,SAAS,KAAK;AAAA,MAChE,cAAU,mCAAiB,UAAU,QAAe;AAAA;AAAA,EACtD;AAEJ;","names":["useIsomorphicLayoutEffect","React"]}

package/build/legacy/useField.d.cts

@@ -1,27 +1,27 @@
-import { DeepKeys, ResolveData, Narrow, DeepValue, FieldApi } from '@tanstack/form-core';
+import { DeepKeys, DeepValue, Narrow, FieldApi } from '@tanstack/form-core';
 import { UseFieldOptions } from './types.cjs';
 
 declare module '@tanstack/form-core' {
-    interface FieldApi<TData, TParentData, TName extends DeepKeys<TParentData>, TResolvedData extends ResolveData<TData, TParentData, TName> = ResolveData<TData, TParentData, TName>> {
+    interface FieldApi<TParentData, TName extends DeepKeys<TParentData>, TData = DeepValue<TParentData, TName>> {
         Field: FieldComponent<TData>;
     }
 }
 type UseField<TParentData> = <TName extends DeepKeys<TParentData>>(opts?: {
     name: Narrow<TName>;
-} & UseFieldOptions<DeepValue<TParentData, TName>, TParentData, TName>) => FieldApi<DeepValue<TParentData, TName>, TParentData, TName>;
-declare function useField<TData, TParentData, TName extends DeepKeys<TParentData>>(opts: UseFieldOptions<TData, TParentData, TName>): FieldApi<TData, TParentData, TName>;
-type FieldComponentProps<TData, TParentData, TName extends DeepKeys<TParentData>, TResolvedData extends ResolveData<TData, TParentData, TName>> = {
-    children: (fieldApi: FieldApi<TData, TParentData, TName, TResolvedData>) => any;
+} & UseFieldOptions<TParentData, TName>) => FieldApi<TParentData, TName, DeepValue<TParentData, TName>>;
+declare function useField<TParentData, TName extends DeepKeys<TParentData>>(opts: UseFieldOptions<TParentData, TName>): FieldApi<TParentData, TName>;
+type FieldComponentProps<TParentData, TName extends DeepKeys<TParentData>, TData = DeepValue<TParentData, TName>> = {
+    children: (fieldApi: FieldApi<TParentData, TName, TData>) => any;
 } & (TParentData extends any[] ? {
     name?: TName;
     index: number;
 } : {
     name: TName;
     index?: never;
-}) & Omit<UseFieldOptions<TData, TParentData, TName>, 'name' | 'index'>;
-type FieldComponent<TParentData> = <TData, TName extends DeepKeys<TParentData>, TResolvedData extends ResolveData<TData, TParentData, TName> = ResolveData<TData, TParentData, TName>>({ children, ...fieldOptions }: FieldComponentProps<TData, TParentData, TName, TResolvedData>) => any;
-declare function Field<TData, TParentData, TName extends DeepKeys<TParentData>>({ children, ...fieldOptions }: {
-    children: (fieldApi: FieldApi<TData, TParentData, TName>) => any;
-} & UseFieldOptions<TData, TParentData, TName>): JSX.Element;
+}) & Omit<UseFieldOptions<TParentData, TName>, 'name' | 'index'>;
+type FieldComponent<TParentData> = <TName extends DeepKeys<TParentData>, TData = DeepValue<TParentData, TName>>({ children, ...fieldOptions }: FieldComponentProps<TParentData, TName, TData>) => any;
+declare function Field<TParentData, TName extends DeepKeys<TParentData>>({ children, ...fieldOptions }: {
+    children: (fieldApi: FieldApi<TParentData, TName>) => any;
+} & UseFieldOptions<TParentData, TName>): JSX.Element;
 
 export { Field, FieldComponent, UseField, useField };

package/build/legacy/useField.d.ts

@@ -1,27 +1,27 @@
-import { DeepKeys, ResolveData, Narrow, DeepValue, FieldApi } from '@tanstack/form-core';
+import { DeepKeys, DeepValue, Narrow, FieldApi } from '@tanstack/form-core';
 import { UseFieldOptions } from './types.js';
 
 declare module '@tanstack/form-core' {
-    interface FieldApi<TData, TParentData, TName extends DeepKeys<TParentData>, TResolvedData extends ResolveData<TData, TParentData, TName> = ResolveData<TData, TParentData, TName>> {
+    interface FieldApi<TParentData, TName extends DeepKeys<TParentData>, TData = DeepValue<TParentData, TName>> {
         Field: FieldComponent<TData>;
     }
 }
 type UseField<TParentData> = <TName extends DeepKeys<TParentData>>(opts?: {
     name: Narrow<TName>;
-} & UseFieldOptions<DeepValue<TParentData, TName>, TParentData, TName>) => FieldApi<DeepValue<TParentData, TName>, TParentData, TName>;
-declare function useField<TData, TParentData, TName extends DeepKeys<TParentData>>(opts: UseFieldOptions<TData, TParentData, TName>): FieldApi<TData, TParentData, TName>;
-type FieldComponentProps<TData, TParentData, TName extends DeepKeys<TParentData>, TResolvedData extends ResolveData<TData, TParentData, TName>> = {
-    children: (fieldApi: FieldApi<TData, TParentData, TName, TResolvedData>) => any;
+} & UseFieldOptions<TParentData, TName>) => FieldApi<TParentData, TName, DeepValue<TParentData, TName>>;
+declare function useField<TParentData, TName extends DeepKeys<TParentData>>(opts: UseFieldOptions<TParentData, TName>): FieldApi<TParentData, TName>;
+type FieldComponentProps<TParentData, TName extends DeepKeys<TParentData>, TData = DeepValue<TParentData, TName>> = {
+    children: (fieldApi: FieldApi<TParentData, TName, TData>) => any;
 } & (TParentData extends any[] ? {
     name?: TName;
     index: number;
 } : {
     name: TName;
     index?: never;
-}) & Omit<UseFieldOptions<TData, TParentData, TName>, 'name' | 'index'>;
-type FieldComponent<TParentData> = <TData, TName extends DeepKeys<TParentData>, TResolvedData extends ResolveData<TData, TParentData, TName> = ResolveData<TData, TParentData, TName>>({ children, ...fieldOptions }: FieldComponentProps<TData, TParentData, TName, TResolvedData>) => any;
-declare function Field<TData, TParentData, TName extends DeepKeys<TParentData>>({ children, ...fieldOptions }: {
-    children: (fieldApi: FieldApi<TData, TParentData, TName>) => any;
-} & UseFieldOptions<TData, TParentData, TName>): JSX.Element;
+}) & Omit<UseFieldOptions<TParentData, TName>, 'name' | 'index'>;
+type FieldComponent<TParentData> = <TName extends DeepKeys<TParentData>, TData = DeepValue<TParentData, TName>>({ children, ...fieldOptions }: FieldComponentProps<TParentData, TName, TData>) => any;
+declare function Field<TParentData, TName extends DeepKeys<TParentData>>({ children, ...fieldOptions }: {
+    children: (fieldApi: FieldApi<TParentData, TName>) => any;
+} & UseFieldOptions<TParentData, TName>): JSX.Element;
 
 export { Field, FieldComponent, UseField, useField };

package/build/legacy/useField.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/useField.tsx"],"sourcesContent":["import React, { useState } from 'react'\nimport { useStore } from '@tanstack/react-store'\nimport type {\n  DeepKeys,\n  DeepValue,\n  Narrow,\n  ResolveData,\n} from '@tanstack/form-core'\nimport { FieldApi, functionalUpdate } from '@tanstack/form-core'\nimport { useFormContext, formContext } from './formContext'\nimport useIsomorphicLayoutEffect from 'use-isomorphic-layout-effect'\nimport type { UseFieldOptions } from './types'\n\ndeclare module '@tanstack/form-core' {\n  // eslint-disable-next-line no-shadow\n  interface FieldApi<\n    TData,\n    TParentData,\n    TName extends DeepKeys<TParentData>,\n    TResolvedData extends ResolveData<TData, TParentData, TName> = ResolveData<\n      TData,\n      TParentData,\n      TName\n    >,\n  > {\n    Field: FieldComponent<TData>\n  }\n}\n\nexport type UseField<TParentData> = <TName extends DeepKeys<TParentData>>(\n  opts?: { name: Narrow<TName> } & UseFieldOptions<\n    DeepValue<TParentData, TName>,\n    TParentData,\n    TName\n  >,\n) => FieldApi<DeepValue<TParentData, TName>, TParentData, TName>\n\nexport function useField<\n  TData,\n  TParentData,\n  TName extends DeepKeys<TParentData>,\n>(\n  opts: UseFieldOptions<TData, TParentData, TName>,\n): FieldApi<\n  TData,\n  TParentData,\n  TName\n  // Omit<typeof opts, 'onMount'> & {\n  //   form: FormApi<TParentData>\n  // }\n> {\n  // Get the form API either manually or from context\n  const { formApi, parentFieldName } = useFormContext()\n\n  const [fieldApi] = useState(() => {\n    const name = (\n      typeof opts.index === 'number'\n        ? [parentFieldName, opts.index, opts.name]\n        : [parentFieldName, opts.name]\n    )\n      .filter((d) => d !== undefined)\n      .join('.')\n\n    const api = new FieldApi({\n      ...opts,\n      form: formApi,\n      name: name,\n    } as never)\n\n    api.Field = Field as never\n\n    return api\n  })\n\n  /**\n   * fieldApi.update should not have any side effects. Think of it like a `useRef`\n   * that we need to keep updated every render with the most up-to-date information.\n   */\n  useIsomorphicLayoutEffect(() => {\n    fieldApi.update({ ...opts, form: formApi } as never)\n  })\n\n  useStore(\n    fieldApi.store,\n    opts.mode === 'array'\n      ? (state: any) => {\n          return [state.meta, Object.keys(state.value || []).length]\n        }\n      : undefined,\n  )\n  // Instantiates field meta and removes it when unrendered\n  useIsomorphicLayoutEffect(() => fieldApi.mount(), [fieldApi])\n\n  return fieldApi as never\n}\n\ntype FieldComponentProps<\n  TData,\n  TParentData,\n  TName extends DeepKeys<TParentData>,\n  TResolvedData extends ResolveData<TData, TParentData, TName>,\n> = {\n  children: (\n    fieldApi: FieldApi<TData, TParentData, TName, TResolvedData>,\n  ) => any\n} & (TParentData extends any[]\n  ? {\n      name?: TName\n      index: number\n    }\n  : {\n      name: TName\n      index?: never\n    }) &\n  Omit<UseFieldOptions<TData, TParentData, TName>, 'name' | 'index'>\n\nexport type FieldComponent<TParentData> = <\n  TData,\n  TName extends DeepKeys<TParentData>,\n  TResolvedData extends ResolveData<TData, TParentData, TName> = ResolveData<\n    TData,\n    TParentData,\n    TName\n  >,\n>({\n  children,\n  ...fieldOptions\n}: FieldComponentProps<TData, TParentData, TName, TResolvedData>) => any\n\nexport function Field<TData, TParentData, TName extends DeepKeys<TParentData>>({\n  children,\n  ...fieldOptions\n}: {\n  children: (fieldApi: FieldApi<TData, TParentData, TName>) => any\n} & UseFieldOptions<TData, TParentData, TName>) {\n  const fieldApi = useField(fieldOptions as any)\n\n  return (\n    <formContext.Provider\n      value={{ formApi: fieldApi.form, parentFieldName: fieldApi.name }}\n      children={functionalUpdate(children, fieldApi as any)}\n    />\n  )\n}\n"],"mappings":";AAAA,OAAO,SAAS,gBAAgB;AAChC,SAAS,gBAAgB;AAOzB,SAAS,UAAU,wBAAwB;AAC3C,SAAS,gBAAgB,mBAAmB;AAC5C,OAAO,+BAA+B;AA2B/B,SAAS,SAKd,MAQA;AAEA,QAAM,EAAE,SAAS,gBAAgB,IAAI,eAAe;AAEpD,QAAM,CAAC,QAAQ,IAAI,SAAS,MAAM;AAChC,UAAM,QACJ,OAAO,KAAK,UAAU,WAClB,CAAC,iBAAiB,KAAK,OAAO,KAAK,IAAI,IACvC,CAAC,iBAAiB,KAAK,IAAI,GAE9B,OAAO,CAAC,MAAM,MAAM,MAAS,EAC7B,KAAK,GAAG;AAEX,UAAM,MAAM,IAAI,SAAS;AAAA,MACvB,GAAG;AAAA,MACH,MAAM;AAAA,MACN;AAAA,IACF,CAAU;AAEV,QAAI,QAAQ;AAEZ,WAAO;AAAA,EACT,CAAC;AAMD,4BAA0B,MAAM;AAC9B,aAAS,OAAO,EAAE,GAAG,MAAM,MAAM,QAAQ,CAAU;AAAA,EACrD,CAAC;AAED;AAAA,IACE,SAAS;AAAA,IACT,KAAK,SAAS,UACV,CAAC,UAAe;AACd,aAAO,CAAC,MAAM,MAAM,OAAO,KAAK,MAAM,SAAS,CAAC,CAAC,EAAE,MAAM;AAAA,IAC3D,IACA;AAAA,EACN;AAEA,4BAA0B,MAAM,SAAS,MAAM,GAAG,CAAC,QAAQ,CAAC;AAE5D,SAAO;AACT;AAmCO,SAAS,MAA+D;AAAA,EAC7E;AAAA,EACA,GAAG;AACL,GAEgD;AAC9C,QAAM,WAAW,SAAS,YAAmB;AAE7C,SACE;AAAA,IAAC,YAAY;AAAA,IAAZ;AAAA,MACC,OAAO,EAAE,SAAS,SAAS,MAAM,iBAAiB,SAAS,KAAK;AAAA,MAChE,UAAU,iBAAiB,UAAU,QAAe;AAAA;AAAA,EACtD;AAEJ;","names":[]}
+{"version":3,"sources":["../../src/useField.tsx"],"sourcesContent":["import React, { useState } from 'react'\nimport { useStore } from '@tanstack/react-store'\nimport type { DeepKeys, DeepValue, Narrow } from '@tanstack/form-core'\nimport { FieldApi, functionalUpdate } from '@tanstack/form-core'\nimport { useFormContext, formContext } from './formContext'\nimport useIsomorphicLayoutEffect from 'use-isomorphic-layout-effect'\nimport type { UseFieldOptions } from './types'\n\ndeclare module '@tanstack/form-core' {\n  // eslint-disable-next-line no-shadow\n  interface FieldApi<\n    TParentData,\n    TName extends DeepKeys<TParentData>,\n    TData = DeepValue<TParentData, TName>,\n  > {\n    Field: FieldComponent<TData>\n  }\n}\n\nexport type UseField<TParentData> = <TName extends DeepKeys<TParentData>>(\n  opts?: { name: Narrow<TName> } & UseFieldOptions<TParentData, TName>,\n) => FieldApi<TParentData, TName, DeepValue<TParentData, TName>>\n\nexport function useField<TParentData, TName extends DeepKeys<TParentData>>(\n  opts: UseFieldOptions<TParentData, TName>,\n): FieldApi<\n  TParentData,\n  TName\n  // Omit<typeof opts, 'onMount'> & {\n  //   form: FormApi<TParentData>\n  // }\n> {\n  // Get the form API either manually or from context\n  const { formApi, parentFieldName } = useFormContext()\n\n  const [fieldApi] = useState(() => {\n    const name = (\n      typeof opts.index === 'number'\n        ? [parentFieldName, opts.index, opts.name]\n        : [parentFieldName, opts.name]\n    )\n      .filter((d) => d !== undefined)\n      .join('.')\n\n    const api = new FieldApi({\n      ...opts,\n      form: formApi,\n      name: name,\n    } as never)\n\n    api.Field = Field as never\n\n    return api\n  })\n\n  /**\n   * fieldApi.update should not have any side effects. Think of it like a `useRef`\n   * that we need to keep updated every render with the most up-to-date information.\n   */\n  useIsomorphicLayoutEffect(() => {\n    fieldApi.update({ ...opts, form: formApi } as never)\n  })\n\n  useStore(\n    fieldApi.store,\n    opts.mode === 'array'\n      ? (state: any) => {\n          return [state.meta, Object.keys(state.value || []).length]\n        }\n      : undefined,\n  )\n  // Instantiates field meta and removes it when unrendered\n  useIsomorphicLayoutEffect(() => fieldApi.mount(), [fieldApi])\n\n  return fieldApi as never\n}\n\ntype FieldComponentProps<\n  TParentData,\n  TName extends DeepKeys<TParentData>,\n  TData = DeepValue<TParentData, TName>,\n> = {\n  children: (fieldApi: FieldApi<TParentData, TName, TData>) => any\n} & (TParentData extends any[]\n  ? {\n      name?: TName\n      index: number\n    }\n  : {\n      name: TName\n      index?: never\n    }) &\n  Omit<UseFieldOptions<TParentData, TName>, 'name' | 'index'>\n\nexport type FieldComponent<TParentData> = <\n  TName extends DeepKeys<TParentData>,\n  TData = DeepValue<TParentData, TName>,\n>({\n  children,\n  ...fieldOptions\n}: FieldComponentProps<TParentData, TName, TData>) => any\n\nexport function Field<TParentData, TName extends DeepKeys<TParentData>>({\n  children,\n  ...fieldOptions\n}: {\n  children: (fieldApi: FieldApi<TParentData, TName>) => any\n} & UseFieldOptions<TParentData, TName>) {\n  const fieldApi = useField(fieldOptions as any)\n\n  return (\n    <formContext.Provider\n      value={{ formApi: fieldApi.form, parentFieldName: fieldApi.name }}\n      children={functionalUpdate(children, fieldApi as any)}\n    />\n  )\n}\n"],"mappings":";AAAA,OAAO,SAAS,gBAAgB;AAChC,SAAS,gBAAgB;AAEzB,SAAS,UAAU,wBAAwB;AAC3C,SAAS,gBAAgB,mBAAmB;AAC5C,OAAO,+BAA+B;AAkB/B,SAAS,SACd,MAOA;AAEA,QAAM,EAAE,SAAS,gBAAgB,IAAI,eAAe;AAEpD,QAAM,CAAC,QAAQ,IAAI,SAAS,MAAM;AAChC,UAAM,QACJ,OAAO,KAAK,UAAU,WAClB,CAAC,iBAAiB,KAAK,OAAO,KAAK,IAAI,IACvC,CAAC,iBAAiB,KAAK,IAAI,GAE9B,OAAO,CAAC,MAAM,MAAM,MAAS,EAC7B,KAAK,GAAG;AAEX,UAAM,MAAM,IAAI,SAAS;AAAA,MACvB,GAAG;AAAA,MACH,MAAM;AAAA,MACN;AAAA,IACF,CAAU;AAEV,QAAI,QAAQ;AAEZ,WAAO;AAAA,EACT,CAAC;AAMD,4BAA0B,MAAM;AAC9B,aAAS,OAAO,EAAE,GAAG,MAAM,MAAM,QAAQ,CAAU;AAAA,EACrD,CAAC;AAED;AAAA,IACE,SAAS;AAAA,IACT,KAAK,SAAS,UACV,CAAC,UAAe;AACd,aAAO,CAAC,MAAM,MAAM,OAAO,KAAK,MAAM,SAAS,CAAC,CAAC,EAAE,MAAM;AAAA,IAC3D,IACA;AAAA,EACN;AAEA,4BAA0B,MAAM,SAAS,MAAM,GAAG,CAAC,QAAQ,CAAC;AAE5D,SAAO;AACT;AA2BO,SAAS,MAAwD;AAAA,EACtE;AAAA,EACA,GAAG;AACL,GAEyC;AACvC,QAAM,WAAW,SAAS,YAAmB;AAE7C,SACE;AAAA,IAAC,YAAY;AAAA,IAAZ;AAAA,MACC,OAAO,EAAE,SAAS,SAAS,MAAM,iBAAiB,SAAS,KAAK;AAAA,MAChE,UAAU,iBAAiB,UAAU,QAAe;AAAA;AAAA,EACtD;AAEJ;","names":[]}

package/build/modern/types.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/types.ts"],"sourcesContent":["import type { FieldOptions, DeepKeys } from '@tanstack/form-core'\n\nexport type UseFieldOptions<\n  TData,\n  TParentData,\n  TName extends DeepKeys<TParentData>,\n> = FieldOptions<TData, TParentData, TName> & {\n  mode?: 'value' | 'array'\n}\n"],"mappings":";;;;;;;;;;;;;;;;AAAA;AAAA;","names":[]}
+{"version":3,"sources":["../../src/types.ts"],"sourcesContent":["import type { FieldOptions, DeepKeys, DeepValue } from '@tanstack/form-core'\n\nexport type UseFieldOptions<\n  TParentData,\n  TName extends DeepKeys<TParentData>,\n  TData = DeepValue<TParentData, TName>,\n> = FieldOptions<TParentData, TName, TData> & {\n  mode?: 'value' | 'array'\n}\n"],"mappings":";;;;;;;;;;;;;;;;AAAA;AAAA;","names":[]}

package/build/modern/types.d.cts

@@ -1,6 +1,6 @@
-import { DeepKeys, FieldOptions } from '@tanstack/form-core';
+import { DeepKeys, DeepValue, FieldOptions } from '@tanstack/form-core';
 
-type UseFieldOptions<TData, TParentData, TName extends DeepKeys<TParentData>> = FieldOptions<TData, TParentData, TName> & {
+type UseFieldOptions<TParentData, TName extends DeepKeys<TParentData>, TData = DeepValue<TParentData, TName>> = FieldOptions<TParentData, TName, TData> & {
     mode?: 'value' | 'array';
 };
 

package/build/modern/types.d.ts

@@ -1,6 +1,6 @@
-import { DeepKeys, FieldOptions } from '@tanstack/form-core';
+import { DeepKeys, DeepValue, FieldOptions } from '@tanstack/form-core';
 
-type UseFieldOptions<TData, TParentData, TName extends DeepKeys<TParentData>> = FieldOptions<TData, TParentData, TName> & {
+type UseFieldOptions<TParentData, TName extends DeepKeys<TParentData>, TData = DeepValue<TParentData, TName>> = FieldOptions<TParentData, TName, TData> & {
     mode?: 'value' | 'array';
 };
 

package/build/modern/useField.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/useField.tsx"],"sourcesContent":["import React, { useState } from 'react'\nimport { useStore } from '@tanstack/react-store'\nimport type {\n  DeepKeys,\n  DeepValue,\n  Narrow,\n  ResolveData,\n} from '@tanstack/form-core'\nimport { FieldApi, functionalUpdate } from '@tanstack/form-core'\nimport { useFormContext, formContext } from './formContext'\nimport useIsomorphicLayoutEffect from 'use-isomorphic-layout-effect'\nimport type { UseFieldOptions } from './types'\n\ndeclare module '@tanstack/form-core' {\n  // eslint-disable-next-line no-shadow\n  interface FieldApi<\n    TData,\n    TParentData,\n    TName extends DeepKeys<TParentData>,\n    TResolvedData extends ResolveData<TData, TParentData, TName> = ResolveData<\n      TData,\n      TParentData,\n      TName\n    >,\n  > {\n    Field: FieldComponent<TData>\n  }\n}\n\nexport type UseField<TParentData> = <TName extends DeepKeys<TParentData>>(\n  opts?: { name: Narrow<TName> } & UseFieldOptions<\n    DeepValue<TParentData, TName>,\n    TParentData,\n    TName\n  >,\n) => FieldApi<DeepValue<TParentData, TName>, TParentData, TName>\n\nexport function useField<\n  TData,\n  TParentData,\n  TName extends DeepKeys<TParentData>,\n>(\n  opts: UseFieldOptions<TData, TParentData, TName>,\n): FieldApi<\n  TData,\n  TParentData,\n  TName\n  // Omit<typeof opts, 'onMount'> & {\n  //   form: FormApi<TParentData>\n  // }\n> {\n  // Get the form API either manually or from context\n  const { formApi, parentFieldName } = useFormContext()\n\n  const [fieldApi] = useState(() => {\n    const name = (\n      typeof opts.index === 'number'\n        ? [parentFieldName, opts.index, opts.name]\n        : [parentFieldName, opts.name]\n    )\n      .filter((d) => d !== undefined)\n      .join('.')\n\n    const api = new FieldApi({\n      ...opts,\n      form: formApi,\n      name: name,\n    } as never)\n\n    api.Field = Field as never\n\n    return api\n  })\n\n  /**\n   * fieldApi.update should not have any side effects. Think of it like a `useRef`\n   * that we need to keep updated every render with the most up-to-date information.\n   */\n  useIsomorphicLayoutEffect(() => {\n    fieldApi.update({ ...opts, form: formApi } as never)\n  })\n\n  useStore(\n    fieldApi.store,\n    opts.mode === 'array'\n      ? (state: any) => {\n          return [state.meta, Object.keys(state.value || []).length]\n        }\n      : undefined,\n  )\n  // Instantiates field meta and removes it when unrendered\n  useIsomorphicLayoutEffect(() => fieldApi.mount(), [fieldApi])\n\n  return fieldApi as never\n}\n\ntype FieldComponentProps<\n  TData,\n  TParentData,\n  TName extends DeepKeys<TParentData>,\n  TResolvedData extends ResolveData<TData, TParentData, TName>,\n> = {\n  children: (\n    fieldApi: FieldApi<TData, TParentData, TName, TResolvedData>,\n  ) => any\n} & (TParentData extends any[]\n  ? {\n      name?: TName\n      index: number\n    }\n  : {\n      name: TName\n      index?: never\n    }) &\n  Omit<UseFieldOptions<TData, TParentData, TName>, 'name' | 'index'>\n\nexport type FieldComponent<TParentData> = <\n  TData,\n  TName extends DeepKeys<TParentData>,\n  TResolvedData extends ResolveData<TData, TParentData, TName> = ResolveData<\n    TData,\n    TParentData,\n    TName\n  >,\n>({\n  children,\n  ...fieldOptions\n}: FieldComponentProps<TData, TParentData, TName, TResolvedData>) => any\n\nexport function Field<TData, TParentData, TName extends DeepKeys<TParentData>>({\n  children,\n  ...fieldOptions\n}: {\n  children: (fieldApi: FieldApi<TData, TParentData, TName>) => any\n} & UseFieldOptions<TData, TParentData, TName>) {\n  const fieldApi = useField(fieldOptions as any)\n\n  return (\n    <formContext.Provider\n      value={{ formApi: fieldApi.form, parentFieldName: fieldApi.name }}\n      children={functionalUpdate(children, fieldApi as any)}\n    />\n  )\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAgC;AAChC,yBAAyB;AAOzB,uBAA2C;AAC3C,yBAA4C;AAC5C,0CAAsC;AA2B/B,SAAS,SAKd,MAQA;AAEA,QAAM,EAAE,SAAS,gBAAgB,QAAI,mCAAe;AAEpD,QAAM,CAAC,QAAQ,QAAI,uBAAS,MAAM;AAChC,UAAM,QACJ,OAAO,KAAK,UAAU,WAClB,CAAC,iBAAiB,KAAK,OAAO,KAAK,IAAI,IACvC,CAAC,iBAAiB,KAAK,IAAI,GAE9B,OAAO,CAAC,MAAM,MAAM,MAAS,EAC7B,KAAK,GAAG;AAEX,UAAM,MAAM,IAAI,0BAAS;AAAA,MACvB,GAAG;AAAA,MACH,MAAM;AAAA,MACN;AAAA,IACF,CAAU;AAEV,QAAI,QAAQ;AAEZ,WAAO;AAAA,EACT,CAAC;AAMD,0CAAAA,SAA0B,MAAM;AAC9B,aAAS,OAAO,EAAE,GAAG,MAAM,MAAM,QAAQ,CAAU;AAAA,EACrD,CAAC;AAED;AAAA,IACE,SAAS;AAAA,IACT,KAAK,SAAS,UACV,CAAC,UAAe;AACd,aAAO,CAAC,MAAM,MAAM,OAAO,KAAK,MAAM,SAAS,CAAC,CAAC,EAAE,MAAM;AAAA,IAC3D,IACA;AAAA,EACN;AAEA,0CAAAA,SAA0B,MAAM,SAAS,MAAM,GAAG,CAAC,QAAQ,CAAC;AAE5D,SAAO;AACT;AAmCO,SAAS,MAA+D;AAAA,EAC7E;AAAA,EACA,GAAG;AACL,GAEgD;AAC9C,QAAM,WAAW,SAAS,YAAmB;AAE7C,SACE,6BAAAC,QAAA;AAAA,IAAC,+BAAY;AAAA,IAAZ;AAAA,MACC,OAAO,EAAE,SAAS,SAAS,MAAM,iBAAiB,SAAS,KAAK;AAAA,MAChE,cAAU,mCAAiB,UAAU,QAAe;AAAA;AAAA,EACtD;AAEJ;","names":["useIsomorphicLayoutEffect","React"]}
+{"version":3,"sources":["../../src/useField.tsx"],"sourcesContent":["import React, { useState } from 'react'\nimport { useStore } from '@tanstack/react-store'\nimport type { DeepKeys, DeepValue, Narrow } from '@tanstack/form-core'\nimport { FieldApi, functionalUpdate } from '@tanstack/form-core'\nimport { useFormContext, formContext } from './formContext'\nimport useIsomorphicLayoutEffect from 'use-isomorphic-layout-effect'\nimport type { UseFieldOptions } from './types'\n\ndeclare module '@tanstack/form-core' {\n  // eslint-disable-next-line no-shadow\n  interface FieldApi<\n    TParentData,\n    TName extends DeepKeys<TParentData>,\n    TData = DeepValue<TParentData, TName>,\n  > {\n    Field: FieldComponent<TData>\n  }\n}\n\nexport type UseField<TParentData> = <TName extends DeepKeys<TParentData>>(\n  opts?: { name: Narrow<TName> } & UseFieldOptions<TParentData, TName>,\n) => FieldApi<TParentData, TName, DeepValue<TParentData, TName>>\n\nexport function useField<TParentData, TName extends DeepKeys<TParentData>>(\n  opts: UseFieldOptions<TParentData, TName>,\n): FieldApi<\n  TParentData,\n  TName\n  // Omit<typeof opts, 'onMount'> & {\n  //   form: FormApi<TParentData>\n  // }\n> {\n  // Get the form API either manually or from context\n  const { formApi, parentFieldName } = useFormContext()\n\n  const [fieldApi] = useState(() => {\n    const name = (\n      typeof opts.index === 'number'\n        ? [parentFieldName, opts.index, opts.name]\n        : [parentFieldName, opts.name]\n    )\n      .filter((d) => d !== undefined)\n      .join('.')\n\n    const api = new FieldApi({\n      ...opts,\n      form: formApi,\n      name: name,\n    } as never)\n\n    api.Field = Field as never\n\n    return api\n  })\n\n  /**\n   * fieldApi.update should not have any side effects. Think of it like a `useRef`\n   * that we need to keep updated every render with the most up-to-date information.\n   */\n  useIsomorphicLayoutEffect(() => {\n    fieldApi.update({ ...opts, form: formApi } as never)\n  })\n\n  useStore(\n    fieldApi.store,\n    opts.mode === 'array'\n      ? (state: any) => {\n          return [state.meta, Object.keys(state.value || []).length]\n        }\n      : undefined,\n  )\n  // Instantiates field meta and removes it when unrendered\n  useIsomorphicLayoutEffect(() => fieldApi.mount(), [fieldApi])\n\n  return fieldApi as never\n}\n\ntype FieldComponentProps<\n  TParentData,\n  TName extends DeepKeys<TParentData>,\n  TData = DeepValue<TParentData, TName>,\n> = {\n  children: (fieldApi: FieldApi<TParentData, TName, TData>) => any\n} & (TParentData extends any[]\n  ? {\n      name?: TName\n      index: number\n    }\n  : {\n      name: TName\n      index?: never\n    }) &\n  Omit<UseFieldOptions<TParentData, TName>, 'name' | 'index'>\n\nexport type FieldComponent<TParentData> = <\n  TName extends DeepKeys<TParentData>,\n  TData = DeepValue<TParentData, TName>,\n>({\n  children,\n  ...fieldOptions\n}: FieldComponentProps<TParentData, TName, TData>) => any\n\nexport function Field<TParentData, TName extends DeepKeys<TParentData>>({\n  children,\n  ...fieldOptions\n}: {\n  children: (fieldApi: FieldApi<TParentData, TName>) => any\n} & UseFieldOptions<TParentData, TName>) {\n  const fieldApi = useField(fieldOptions as any)\n\n  return (\n    <formContext.Provider\n      value={{ formApi: fieldApi.form, parentFieldName: fieldApi.name }}\n      children={functionalUpdate(children, fieldApi as any)}\n    />\n  )\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAgC;AAChC,yBAAyB;AAEzB,uBAA2C;AAC3C,yBAA4C;AAC5C,0CAAsC;AAkB/B,SAAS,SACd,MAOA;AAEA,QAAM,EAAE,SAAS,gBAAgB,QAAI,mCAAe;AAEpD,QAAM,CAAC,QAAQ,QAAI,uBAAS,MAAM;AAChC,UAAM,QACJ,OAAO,KAAK,UAAU,WAClB,CAAC,iBAAiB,KAAK,OAAO,KAAK,IAAI,IACvC,CAAC,iBAAiB,KAAK,IAAI,GAE9B,OAAO,CAAC,MAAM,MAAM,MAAS,EAC7B,KAAK,GAAG;AAEX,UAAM,MAAM,IAAI,0BAAS;AAAA,MACvB,GAAG;AAAA,MACH,MAAM;AAAA,MACN;AAAA,IACF,CAAU;AAEV,QAAI,QAAQ;AAEZ,WAAO;AAAA,EACT,CAAC;AAMD,0CAAAA,SAA0B,MAAM;AAC9B,aAAS,OAAO,EAAE,GAAG,MAAM,MAAM,QAAQ,CAAU;AAAA,EACrD,CAAC;AAED;AAAA,IACE,SAAS;AAAA,IACT,KAAK,SAAS,UACV,CAAC,UAAe;AACd,aAAO,CAAC,MAAM,MAAM,OAAO,KAAK,MAAM,SAAS,CAAC,CAAC,EAAE,MAAM;AAAA,IAC3D,IACA;AAAA,EACN;AAEA,0CAAAA,SAA0B,MAAM,SAAS,MAAM,GAAG,CAAC,QAAQ,CAAC;AAE5D,SAAO;AACT;AA2BO,SAAS,MAAwD;AAAA,EACtE;AAAA,EACA,GAAG;AACL,GAEyC;AACvC,QAAM,WAAW,SAAS,YAAmB;AAE7C,SACE,6BAAAC,QAAA;AAAA,IAAC,+BAAY;AAAA,IAAZ;AAAA,MACC,OAAO,EAAE,SAAS,SAAS,MAAM,iBAAiB,SAAS,KAAK;AAAA,MAChE,cAAU,mCAAiB,UAAU,QAAe;AAAA;AAAA,EACtD;AAEJ;","names":["useIsomorphicLayoutEffect","React"]}

package/build/modern/useField.d.cts

@@ -1,27 +1,27 @@
-import { DeepKeys, ResolveData, Narrow, DeepValue, FieldApi } from '@tanstack/form-core';
+import { DeepKeys, DeepValue, Narrow, FieldApi } from '@tanstack/form-core';
 import { UseFieldOptions } from './types.cjs';
 
 declare module '@tanstack/form-core' {
-    interface FieldApi<TData, TParentData, TName extends DeepKeys<TParentData>, TResolvedData extends ResolveData<TData, TParentData, TName> = ResolveData<TData, TParentData, TName>> {
+    interface FieldApi<TParentData, TName extends DeepKeys<TParentData>, TData = DeepValue<TParentData, TName>> {
         Field: FieldComponent<TData>;
     }
 }
 type UseField<TParentData> = <TName extends DeepKeys<TParentData>>(opts?: {
     name: Narrow<TName>;
-} & UseFieldOptions<DeepValue<TParentData, TName>, TParentData, TName>) => FieldApi<DeepValue<TParentData, TName>, TParentData, TName>;
-declare function useField<TData, TParentData, TName extends DeepKeys<TParentData>>(opts: UseFieldOptions<TData, TParentData, TName>): FieldApi<TData, TParentData, TName>;
-type FieldComponentProps<TData, TParentData, TName extends DeepKeys<TParentData>, TResolvedData extends ResolveData<TData, TParentData, TName>> = {
-    children: (fieldApi: FieldApi<TData, TParentData, TName, TResolvedData>) => any;
+} & UseFieldOptions<TParentData, TName>) => FieldApi<TParentData, TName, DeepValue<TParentData, TName>>;
+declare function useField<TParentData, TName extends DeepKeys<TParentData>>(opts: UseFieldOptions<TParentData, TName>): FieldApi<TParentData, TName>;
+type FieldComponentProps<TParentData, TName extends DeepKeys<TParentData>, TData = DeepValue<TParentData, TName>> = {
+    children: (fieldApi: FieldApi<TParentData, TName, TData>) => any;
 } & (TParentData extends any[] ? {
     name?: TName;
     index: number;
 } : {
     name: TName;
     index?: never;
-}) & Omit<UseFieldOptions<TData, TParentData, TName>, 'name' | 'index'>;
-type FieldComponent<TParentData> = <TData, TName extends DeepKeys<TParentData>, TResolvedData extends ResolveData<TData, TParentData, TName> = ResolveData<TData, TParentData, TName>>({ children, ...fieldOptions }: FieldComponentProps<TData, TParentData, TName, TResolvedData>) => any;
-declare function Field<TData, TParentData, TName extends DeepKeys<TParentData>>({ children, ...fieldOptions }: {
-    children: (fieldApi: FieldApi<TData, TParentData, TName>) => any;
-} & UseFieldOptions<TData, TParentData, TName>): JSX.Element;
+}) & Omit<UseFieldOptions<TParentData, TName>, 'name' | 'index'>;
+type FieldComponent<TParentData> = <TName extends DeepKeys<TParentData>, TData = DeepValue<TParentData, TName>>({ children, ...fieldOptions }: FieldComponentProps<TParentData, TName, TData>) => any;
+declare function Field<TParentData, TName extends DeepKeys<TParentData>>({ children, ...fieldOptions }: {
+    children: (fieldApi: FieldApi<TParentData, TName>) => any;
+} & UseFieldOptions<TParentData, TName>): JSX.Element;
 
 export { Field, FieldComponent, UseField, useField };

package/build/modern/useField.d.ts

@@ -1,27 +1,27 @@
-import { DeepKeys, ResolveData, Narrow, DeepValue, FieldApi } from '@tanstack/form-core';
+import { DeepKeys, DeepValue, Narrow, FieldApi } from '@tanstack/form-core';
 import { UseFieldOptions } from './types.js';
 
 declare module '@tanstack/form-core' {
-    interface FieldApi<TData, TParentData, TName extends DeepKeys<TParentData>, TResolvedData extends ResolveData<TData, TParentData, TName> = ResolveData<TData, TParentData, TName>> {
+    interface FieldApi<TParentData, TName extends DeepKeys<TParentData>, TData = DeepValue<TParentData, TName>> {
         Field: FieldComponent<TData>;
     }
 }
 type UseField<TParentData> = <TName extends DeepKeys<TParentData>>(opts?: {
     name: Narrow<TName>;
-} & UseFieldOptions<DeepValue<TParentData, TName>, TParentData, TName>) => FieldApi<DeepValue<TParentData, TName>, TParentData, TName>;
-declare function useField<TData, TParentData, TName extends DeepKeys<TParentData>>(opts: UseFieldOptions<TData, TParentData, TName>): FieldApi<TData, TParentData, TName>;
-type FieldComponentProps<TData, TParentData, TName extends DeepKeys<TParentData>, TResolvedData extends ResolveData<TData, TParentData, TName>> = {
-    children: (fieldApi: FieldApi<TData, TParentData, TName, TResolvedData>) => any;
+} & UseFieldOptions<TParentData, TName>) => FieldApi<TParentData, TName, DeepValue<TParentData, TName>>;
+declare function useField<TParentData, TName extends DeepKeys<TParentData>>(opts: UseFieldOptions<TParentData, TName>): FieldApi<TParentData, TName>;
+type FieldComponentProps<TParentData, TName extends DeepKeys<TParentData>, TData = DeepValue<TParentData, TName>> = {
+    children: (fieldApi: FieldApi<TParentData, TName, TData>) => any;
 } & (TParentData extends any[] ? {
     name?: TName;
     index: number;
 } : {
     name: TName;
     index?: never;
-}) & Omit<UseFieldOptions<TData, TParentData, TName>, 'name' | 'index'>;
-type FieldComponent<TParentData> = <TData, TName extends DeepKeys<TParentData>, TResolvedData extends ResolveData<TData, TParentData, TName> = ResolveData<TData, TParentData, TName>>({ children, ...fieldOptions }: FieldComponentProps<TData, TParentData, TName, TResolvedData>) => any;
-declare function Field<TData, TParentData, TName extends DeepKeys<TParentData>>({ children, ...fieldOptions }: {
-    children: (fieldApi: FieldApi<TData, TParentData, TName>) => any;
-} & UseFieldOptions<TData, TParentData, TName>): JSX.Element;
+}) & Omit<UseFieldOptions<TParentData, TName>, 'name' | 'index'>;
+type FieldComponent<TParentData> = <TName extends DeepKeys<TParentData>, TData = DeepValue<TParentData, TName>>({ children, ...fieldOptions }: FieldComponentProps<TParentData, TName, TData>) => any;
+declare function Field<TParentData, TName extends DeepKeys<TParentData>>({ children, ...fieldOptions }: {
+    children: (fieldApi: FieldApi<TParentData, TName>) => any;
+} & UseFieldOptions<TParentData, TName>): JSX.Element;
 
 export { Field, FieldComponent, UseField, useField };

package/build/modern/useField.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/useField.tsx"],"sourcesContent":["import React, { useState } from 'react'\nimport { useStore } from '@tanstack/react-store'\nimport type {\n  DeepKeys,\n  DeepValue,\n  Narrow,\n  ResolveData,\n} from '@tanstack/form-core'\nimport { FieldApi, functionalUpdate } from '@tanstack/form-core'\nimport { useFormContext, formContext } from './formContext'\nimport useIsomorphicLayoutEffect from 'use-isomorphic-layout-effect'\nimport type { UseFieldOptions } from './types'\n\ndeclare module '@tanstack/form-core' {\n  // eslint-disable-next-line no-shadow\n  interface FieldApi<\n    TData,\n    TParentData,\n    TName extends DeepKeys<TParentData>,\n    TResolvedData extends ResolveData<TData, TParentData, TName> = ResolveData<\n      TData,\n      TParentData,\n      TName\n    >,\n  > {\n    Field: FieldComponent<TData>\n  }\n}\n\nexport type UseField<TParentData> = <TName extends DeepKeys<TParentData>>(\n  opts?: { name: Narrow<TName> } & UseFieldOptions<\n    DeepValue<TParentData, TName>,\n    TParentData,\n    TName\n  >,\n) => FieldApi<DeepValue<TParentData, TName>, TParentData, TName>\n\nexport function useField<\n  TData,\n  TParentData,\n  TName extends DeepKeys<TParentData>,\n>(\n  opts: UseFieldOptions<TData, TParentData, TName>,\n): FieldApi<\n  TData,\n  TParentData,\n  TName\n  // Omit<typeof opts, 'onMount'> & {\n  //   form: FormApi<TParentData>\n  // }\n> {\n  // Get the form API either manually or from context\n  const { formApi, parentFieldName } = useFormContext()\n\n  const [fieldApi] = useState(() => {\n    const name = (\n      typeof opts.index === 'number'\n        ? [parentFieldName, opts.index, opts.name]\n        : [parentFieldName, opts.name]\n    )\n      .filter((d) => d !== undefined)\n      .join('.')\n\n    const api = new FieldApi({\n      ...opts,\n      form: formApi,\n      name: name,\n    } as never)\n\n    api.Field = Field as never\n\n    return api\n  })\n\n  /**\n   * fieldApi.update should not have any side effects. Think of it like a `useRef`\n   * that we need to keep updated every render with the most up-to-date information.\n   */\n  useIsomorphicLayoutEffect(() => {\n    fieldApi.update({ ...opts, form: formApi } as never)\n  })\n\n  useStore(\n    fieldApi.store,\n    opts.mode === 'array'\n      ? (state: any) => {\n          return [state.meta, Object.keys(state.value || []).length]\n        }\n      : undefined,\n  )\n  // Instantiates field meta and removes it when unrendered\n  useIsomorphicLayoutEffect(() => fieldApi.mount(), [fieldApi])\n\n  return fieldApi as never\n}\n\ntype FieldComponentProps<\n  TData,\n  TParentData,\n  TName extends DeepKeys<TParentData>,\n  TResolvedData extends ResolveData<TData, TParentData, TName>,\n> = {\n  children: (\n    fieldApi: FieldApi<TData, TParentData, TName, TResolvedData>,\n  ) => any\n} & (TParentData extends any[]\n  ? {\n      name?: TName\n      index: number\n    }\n  : {\n      name: TName\n      index?: never\n    }) &\n  Omit<UseFieldOptions<TData, TParentData, TName>, 'name' | 'index'>\n\nexport type FieldComponent<TParentData> = <\n  TData,\n  TName extends DeepKeys<TParentData>,\n  TResolvedData extends ResolveData<TData, TParentData, TName> = ResolveData<\n    TData,\n    TParentData,\n    TName\n  >,\n>({\n  children,\n  ...fieldOptions\n}: FieldComponentProps<TData, TParentData, TName, TResolvedData>) => any\n\nexport function Field<TData, TParentData, TName extends DeepKeys<TParentData>>({\n  children,\n  ...fieldOptions\n}: {\n  children: (fieldApi: FieldApi<TData, TParentData, TName>) => any\n} & UseFieldOptions<TData, TParentData, TName>) {\n  const fieldApi = useField(fieldOptions as any)\n\n  return (\n    <formContext.Provider\n      value={{ formApi: fieldApi.form, parentFieldName: fieldApi.name }}\n      children={functionalUpdate(children, fieldApi as any)}\n    />\n  )\n}\n"],"mappings":";AAAA,OAAO,SAAS,gBAAgB;AAChC,SAAS,gBAAgB;AAOzB,SAAS,UAAU,wBAAwB;AAC3C,SAAS,gBAAgB,mBAAmB;AAC5C,OAAO,+BAA+B;AA2B/B,SAAS,SAKd,MAQA;AAEA,QAAM,EAAE,SAAS,gBAAgB,IAAI,eAAe;AAEpD,QAAM,CAAC,QAAQ,IAAI,SAAS,MAAM;AAChC,UAAM,QACJ,OAAO,KAAK,UAAU,WAClB,CAAC,iBAAiB,KAAK,OAAO,KAAK,IAAI,IACvC,CAAC,iBAAiB,KAAK,IAAI,GAE9B,OAAO,CAAC,MAAM,MAAM,MAAS,EAC7B,KAAK,GAAG;AAEX,UAAM,MAAM,IAAI,SAAS;AAAA,MACvB,GAAG;AAAA,MACH,MAAM;AAAA,MACN;AAAA,IACF,CAAU;AAEV,QAAI,QAAQ;AAEZ,WAAO;AAAA,EACT,CAAC;AAMD,4BAA0B,MAAM;AAC9B,aAAS,OAAO,EAAE,GAAG,MAAM,MAAM,QAAQ,CAAU;AAAA,EACrD,CAAC;AAED;AAAA,IACE,SAAS;AAAA,IACT,KAAK,SAAS,UACV,CAAC,UAAe;AACd,aAAO,CAAC,MAAM,MAAM,OAAO,KAAK,MAAM,SAAS,CAAC,CAAC,EAAE,MAAM;AAAA,IAC3D,IACA;AAAA,EACN;AAEA,4BAA0B,MAAM,SAAS,MAAM,GAAG,CAAC,QAAQ,CAAC;AAE5D,SAAO;AACT;AAmCO,SAAS,MAA+D;AAAA,EAC7E;AAAA,EACA,GAAG;AACL,GAEgD;AAC9C,QAAM,WAAW,SAAS,YAAmB;AAE7C,SACE;AAAA,IAAC,YAAY;AAAA,IAAZ;AAAA,MACC,OAAO,EAAE,SAAS,SAAS,MAAM,iBAAiB,SAAS,KAAK;AAAA,MAChE,UAAU,iBAAiB,UAAU,QAAe;AAAA;AAAA,EACtD;AAEJ;","names":[]}
+{"version":3,"sources":["../../src/useField.tsx"],"sourcesContent":["import React, { useState } from 'react'\nimport { useStore } from '@tanstack/react-store'\nimport type { DeepKeys, DeepValue, Narrow } from '@tanstack/form-core'\nimport { FieldApi, functionalUpdate } from '@tanstack/form-core'\nimport { useFormContext, formContext } from './formContext'\nimport useIsomorphicLayoutEffect from 'use-isomorphic-layout-effect'\nimport type { UseFieldOptions } from './types'\n\ndeclare module '@tanstack/form-core' {\n  // eslint-disable-next-line no-shadow\n  interface FieldApi<\n    TParentData,\n    TName extends DeepKeys<TParentData>,\n    TData = DeepValue<TParentData, TName>,\n  > {\n    Field: FieldComponent<TData>\n  }\n}\n\nexport type UseField<TParentData> = <TName extends DeepKeys<TParentData>>(\n  opts?: { name: Narrow<TName> } & UseFieldOptions<TParentData, TName>,\n) => FieldApi<TParentData, TName, DeepValue<TParentData, TName>>\n\nexport function useField<TParentData, TName extends DeepKeys<TParentData>>(\n  opts: UseFieldOptions<TParentData, TName>,\n): FieldApi<\n  TParentData,\n  TName\n  // Omit<typeof opts, 'onMount'> & {\n  //   form: FormApi<TParentData>\n  // }\n> {\n  // Get the form API either manually or from context\n  const { formApi, parentFieldName } = useFormContext()\n\n  const [fieldApi] = useState(() => {\n    const name = (\n      typeof opts.index === 'number'\n        ? [parentFieldName, opts.index, opts.name]\n        : [parentFieldName, opts.name]\n    )\n      .filter((d) => d !== undefined)\n      .join('.')\n\n    const api = new FieldApi({\n      ...opts,\n      form: formApi,\n      name: name,\n    } as never)\n\n    api.Field = Field as never\n\n    return api\n  })\n\n  /**\n   * fieldApi.update should not have any side effects. Think of it like a `useRef`\n   * that we need to keep updated every render with the most up-to-date information.\n   */\n  useIsomorphicLayoutEffect(() => {\n    fieldApi.update({ ...opts, form: formApi } as never)\n  })\n\n  useStore(\n    fieldApi.store,\n    opts.mode === 'array'\n      ? (state: any) => {\n          return [state.meta, Object.keys(state.value || []).length]\n        }\n      : undefined,\n  )\n  // Instantiates field meta and removes it when unrendered\n  useIsomorphicLayoutEffect(() => fieldApi.mount(), [fieldApi])\n\n  return fieldApi as never\n}\n\ntype FieldComponentProps<\n  TParentData,\n  TName extends DeepKeys<TParentData>,\n  TData = DeepValue<TParentData, TName>,\n> = {\n  children: (fieldApi: FieldApi<TParentData, TName, TData>) => any\n} & (TParentData extends any[]\n  ? {\n      name?: TName\n      index: number\n    }\n  : {\n      name: TName\n      index?: never\n    }) &\n  Omit<UseFieldOptions<TParentData, TName>, 'name' | 'index'>\n\nexport type FieldComponent<TParentData> = <\n  TName extends DeepKeys<TParentData>,\n  TData = DeepValue<TParentData, TName>,\n>({\n  children,\n  ...fieldOptions\n}: FieldComponentProps<TParentData, TName, TData>) => any\n\nexport function Field<TParentData, TName extends DeepKeys<TParentData>>({\n  children,\n  ...fieldOptions\n}: {\n  children: (fieldApi: FieldApi<TParentData, TName>) => any\n} & UseFieldOptions<TParentData, TName>) {\n  const fieldApi = useField(fieldOptions as any)\n\n  return (\n    <formContext.Provider\n      value={{ formApi: fieldApi.form, parentFieldName: fieldApi.name }}\n      children={functionalUpdate(children, fieldApi as any)}\n    />\n  )\n}\n"],"mappings":";AAAA,OAAO,SAAS,gBAAgB;AAChC,SAAS,gBAAgB;AAEzB,SAAS,UAAU,wBAAwB;AAC3C,SAAS,gBAAgB,mBAAmB;AAC5C,OAAO,+BAA+B;AAkB/B,SAAS,SACd,MAOA;AAEA,QAAM,EAAE,SAAS,gBAAgB,IAAI,eAAe;AAEpD,QAAM,CAAC,QAAQ,IAAI,SAAS,MAAM;AAChC,UAAM,QACJ,OAAO,KAAK,UAAU,WAClB,CAAC,iBAAiB,KAAK,OAAO,KAAK,IAAI,IACvC,CAAC,iBAAiB,KAAK,IAAI,GAE9B,OAAO,CAAC,MAAM,MAAM,MAAS,EAC7B,KAAK,GAAG;AAEX,UAAM,MAAM,IAAI,SAAS;AAAA,MACvB,GAAG;AAAA,MACH,MAAM;AAAA,MACN;AAAA,IACF,CAAU;AAEV,QAAI,QAAQ;AAEZ,WAAO;AAAA,EACT,CAAC;AAMD,4BAA0B,MAAM;AAC9B,aAAS,OAAO,EAAE,GAAG,MAAM,MAAM,QAAQ,CAAU;AAAA,EACrD,CAAC;AAED;AAAA,IACE,SAAS;AAAA,IACT,KAAK,SAAS,UACV,CAAC,UAAe;AACd,aAAO,CAAC,MAAM,MAAM,OAAO,KAAK,MAAM,SAAS,CAAC,CAAC,EAAE,MAAM;AAAA,IAC3D,IACA;AAAA,EACN;AAEA,4BAA0B,MAAM,SAAS,MAAM,GAAG,CAAC,QAAQ,CAAC;AAE5D,SAAO;AACT;AA2BO,SAAS,MAAwD;AAAA,EACtE;AAAA,EACA,GAAG;AACL,GAEyC;AACvC,QAAM,WAAW,SAAS,YAAmB;AAE7C,SACE;AAAA,IAAC,YAAY;AAAA,IAAZ;AAAA,MACC,OAAO,EAAE,SAAS,SAAS,MAAM,iBAAiB,SAAS,KAAK;AAAA,MAChE,UAAU,iBAAiB,UAAU,QAAe;AAAA;AAAA,EACtD;AAEJ;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/react-form",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "description": "Powerful, type-safe forms for React.",
   "author": "tannerlinsley",
   "license": "MIT",
@@ -54,7 +54,7 @@
     "@tanstack/react-store": "0.1.3",
     "@tanstack/store": "0.1.3",
     "use-isomorphic-layout-effect": "^1.1.2",
-    "@tanstack/form-core": "0.3.5"
+    "@tanstack/form-core": "0.3.7"
   },
   "peerDependencies": {
     "react": "^17.0.0 || ^18.0.0",

package/src/tests/useField.test.tsx

@@ -18,13 +18,17 @@ describe('useField', () => {
     const formFactory = createFormFactory<Person>()
 
     function Comp() {
-      const form = formFactory.useForm()
+      const form = formFactory.useForm({
+        defaultValues: {
+          firstName: 'FirstName',
+          lastName: 'LastName',
+        },
+      })
 
       return (
         <form.Provider>
           <form.Field
             name="firstName"
-            defaultValue="FirstName"
             children={(field) => {
               return (
                 <input
@@ -45,6 +49,47 @@ describe('useField', () => {
     expect(input).toHaveValue('FirstName')
   })
 
+  it('should use field default value first', async () => {
+    type Person = {
+      firstName: string
+      lastName: string
+    }
+
+    const formFactory = createFormFactory<Person>()
+
+    function Comp() {
+      const form = formFactory.useForm({
+        defaultValues: {
+          firstName: 'FirstName',
+          lastName: 'LastName',
+        },
+      })
+
+      return (
+        <form.Provider>
+          <form.Field
+            name="firstName"
+            defaultValue="otherName"
+            children={(field) => {
+              return (
+                <input
+                  data-testid="fieldinput"
+                  value={field.state.value}
+                  onBlur={field.handleBlur}
+                  onChange={(e) => field.handleChange(e.target.value)}
+                />
+              )
+            }}
+          />
+        </form.Provider>
+      )
+    }
+
+    const { getByTestId } = render(<Comp />)
+    const input = getByTestId('fieldinput')
+    expect(input).toHaveValue('otherName')
+  })
+
   it('should not validate on change if isTouched is false', async () => {
     type Person = {
       firstName: string

package/src/types.ts

@@ -1,9 +1,9 @@
-import type { FieldOptions, DeepKeys } from '@tanstack/form-core'
+import type { FieldOptions, DeepKeys, DeepValue } from '@tanstack/form-core'
 
 export type UseFieldOptions<
-  TData,
   TParentData,
   TName extends DeepKeys<TParentData>,
-> = FieldOptions<TData, TParentData, TName> & {
+  TData = DeepValue<TParentData, TName>,
+> = FieldOptions<TParentData, TName, TData> & {
   mode?: 'value' | 'array'
 }

package/src/useField.tsx

@@ -1,11 +1,6 @@
 import React, { useState } from 'react'
 import { useStore } from '@tanstack/react-store'
-import type {
-  DeepKeys,
-  DeepValue,
-  Narrow,
-  ResolveData,
-} from '@tanstack/form-core'
+import type { DeepKeys, DeepValue, Narrow } from '@tanstack/form-core'
 import { FieldApi, functionalUpdate } from '@tanstack/form-core'
 import { useFormContext, formContext } from './formContext'
 import useIsomorphicLayoutEffect from 'use-isomorphic-layout-effect'
@@ -14,35 +9,21 @@ import type { UseFieldOptions } from './types'
 declare module '@tanstack/form-core' {
   // eslint-disable-next-line no-shadow
   interface FieldApi<
-    TData,
     TParentData,
     TName extends DeepKeys<TParentData>,
-    TResolvedData extends ResolveData<TData, TParentData, TName> = ResolveData<
-      TData,
-      TParentData,
-      TName
-    >,
+    TData = DeepValue<TParentData, TName>,
   > {
     Field: FieldComponent<TData>
   }
 }
 
 export type UseField<TParentData> = <TName extends DeepKeys<TParentData>>(
-  opts?: { name: Narrow<TName> } & UseFieldOptions<
-    DeepValue<TParentData, TName>,
-    TParentData,
-    TName
-  >,
-) => FieldApi<DeepValue<TParentData, TName>, TParentData, TName>
+  opts?: { name: Narrow<TName> } & UseFieldOptions<TParentData, TName>,
+) => FieldApi<TParentData, TName, DeepValue<TParentData, TName>>
 
-export function useField<
-  TData,
-  TParentData,
-  TName extends DeepKeys<TParentData>,
->(
-  opts: UseFieldOptions<TData, TParentData, TName>,
+export function useField<TParentData, TName extends DeepKeys<TParentData>>(
+  opts: UseFieldOptions<TParentData, TName>,
 ): FieldApi<
-  TData,
   TParentData,
   TName
   // Omit<typeof opts, 'onMount'> & {
@@ -95,14 +76,11 @@ export function useField<
 }
 
 type FieldComponentProps<
-  TData,
   TParentData,
   TName extends DeepKeys<TParentData>,
-  TResolvedData extends ResolveData<TData, TParentData, TName>,
+  TData = DeepValue<TParentData, TName>,
 > = {
-  children: (
-    fieldApi: FieldApi<TData, TParentData, TName, TResolvedData>,
-  ) => any
+  children: (fieldApi: FieldApi<TParentData, TName, TData>) => any
 } & (TParentData extends any[]
   ? {
       name?: TName
@@ -112,27 +90,22 @@ type FieldComponentProps<
       name: TName
       index?: never
     }) &
-  Omit<UseFieldOptions<TData, TParentData, TName>, 'name' | 'index'>
+  Omit<UseFieldOptions<TParentData, TName>, 'name' | 'index'>
 
 export type FieldComponent<TParentData> = <
-  TData,
   TName extends DeepKeys<TParentData>,
-  TResolvedData extends ResolveData<TData, TParentData, TName> = ResolveData<
-    TData,
-    TParentData,
-    TName
-  >,
+  TData = DeepValue<TParentData, TName>,
 >({
   children,
   ...fieldOptions
-}: FieldComponentProps<TData, TParentData, TName, TResolvedData>) => any
+}: FieldComponentProps<TParentData, TName, TData>) => any
 
-export function Field<TData, TParentData, TName extends DeepKeys<TParentData>>({
+export function Field<TParentData, TName extends DeepKeys<TParentData>>({
   children,
   ...fieldOptions
 }: {
-  children: (fieldApi: FieldApi<TData, TParentData, TName>) => any
-} & UseFieldOptions<TData, TParentData, TName>) {
+  children: (fieldApi: FieldApi<TParentData, TName>) => any
+} & UseFieldOptions<TParentData, TName>) {
   const fieldApi = useField(fieldOptions as any)
 
   return (