@tanstack/react-form 0.3.1 → 0.3.3

package/build/modern/useField.js

@@ -0,0 +1,48 @@
+// src/useField.tsx
+import React, { useState } from "react";
+import { useStore } from "@tanstack/react-store";
+import { FieldApi, functionalUpdate } from "@tanstack/form-core";
+import { useFormContext, formContext } from "./formContext.js";
+import useIsomorphicLayoutEffect from "use-isomorphic-layout-effect";
+function useField(opts) {
+  const { formApi, parentFieldName } = useFormContext();
+  const [fieldApi] = useState(() => {
+    const name = (typeof opts.index === "number" ? [parentFieldName, opts.index, opts.name] : [parentFieldName, opts.name]).filter((d) => d !== void 0).join(".");
+    const api = new FieldApi({
+      ...opts,
+      form: formApi,
+      name
+    });
+    api.Field = Field;
+    return api;
+  });
+  useIsomorphicLayoutEffect(() => {
+    fieldApi.update({ ...opts, form: formApi });
+  });
+  useStore(
+    fieldApi.store,
+    opts.mode === "array" ? (state) => {
+      return [state.meta, Object.keys(state.value || []).length];
+    } : void 0
+  );
+  useIsomorphicLayoutEffect(() => fieldApi.mount(), [fieldApi]);
+  return fieldApi;
+}
+function Field({
+  children,
+  ...fieldOptions
+}) {
+  const fieldApi = useField(fieldOptions);
+  return /* @__PURE__ */ React.createElement(
+    formContext.Provider,
+    {
+      value: { formApi: fieldApi.form, parentFieldName: fieldApi.name },
+      children: functionalUpdate(children, fieldApi)
+    }
+  );
+}
+export {
+  Field,
+  useField
+};
+//# sourceMappingURL=useField.js.map

package/build/modern/useField.js.map

@@ -0,0 +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  FieldApiOptions,\n  Narrow,\n} from '@tanstack/form-core'\nimport { FieldApi, type FormApi, 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<_TData, TFormData, Opts, TData> {\n    Field: FieldComponent<TData, TFormData>\n  }\n}\n\nexport type UseField<TFormData> = <TField extends DeepKeys<TFormData>>(\n  opts?: { name: Narrow<TField> } & UseFieldOptions<\n    DeepValue<TFormData, TField>,\n    TFormData\n  >,\n) => FieldApi<DeepValue<TFormData, TField>, TFormData>\n\nexport function useField<\n  TData,\n  TFormData,\n  TName extends unknown extends TFormData\n    ? string\n    : DeepKeys<TFormData> = unknown extends TFormData\n    ? string\n    : DeepKeys<TFormData>,\n>(\n  opts: UseFieldOptions<TData, TFormData, TName>,\n): FieldApi<\n  TData,\n  TFormData,\n  Omit<typeof opts, 'onMount'> & {\n    form: FormApi<TFormData>\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  TFormData,\n  TField,\n  TName extends unknown extends TFormData ? string : DeepKeys<TFormData>,\n> = {\n  children: (\n    fieldApi: FieldApi<\n      TField,\n      TFormData,\n      FieldApiOptions<TField, TFormData, TName>\n    >,\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<TField, TFormData, TName>, 'name' | 'index'>\n\nexport type FieldComponent<TParentData, TFormData> = <\n  // Type of the field\n  TField,\n  // Name of the field\n  TName extends unknown extends TFormData ? string : DeepKeys<TFormData>,\n>({\n  children,\n  ...fieldOptions\n}: FieldComponentProps<TParentData, TFormData, TField, TName>) => any\n\nexport function Field<TData, TFormData>({\n  children,\n  ...fieldOptions\n}: {\n  children: (fieldApi: FieldApi<TData, TFormData>) => any\n} & UseFieldOptions<TData, TFormData>) {\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,UAAwB,wBAAwB;AACzD,SAAS,gBAAgB,mBAAmB;AAC5C,OAAO,+BAA+B;AAiB/B,SAAS,SASd,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;AAoCO,SAAS,MAAwB;AAAA,EACtC;AAAA,EACA,GAAG;AACL,GAEuC;AACrC,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/useForm.cjs

@@ -0,0 +1,72 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/useForm.tsx
+var useForm_exports = {};
+__export(useForm_exports, {
+  useForm: () => useForm
+});
+module.exports = __toCommonJS(useForm_exports);
+var import_form_core = require("@tanstack/form-core");
+var import_react_store = require("@tanstack/react-store");
+var import_react = __toESM(require("react"), 1);
+var import_useField = require("./useField.cjs");
+var import_formContext = require("./formContext.cjs");
+var import_use_isomorphic_layout_effect = __toESM(require("use-isomorphic-layout-effect"), 1);
+function useForm(opts) {
+  const [formApi] = (0, import_react.useState)(() => {
+    const api = new import_form_core.FormApi(opts);
+    api.Provider = function Provider(props) {
+      return /* @__PURE__ */ import_react.default.createElement(import_formContext.formContext.Provider, { ...props, value: { formApi: api } });
+    };
+    api.Field = import_useField.Field;
+    api.useField = import_useField.useField;
+    api.useStore = (selector) => {
+      return (0, import_react_store.useStore)(api.store, selector);
+    };
+    api.Subscribe = (props) => {
+      return (0, import_form_core.functionalUpdate)(
+        props.children,
+        // eslint-disable-next-line react-hooks/rules-of-hooks
+        (0, import_react_store.useStore)(api.store, props.selector)
+      );
+    };
+    return api;
+  });
+  formApi.useStore((state) => state.isSubmitting);
+  (0, import_use_isomorphic_layout_effect.default)(() => {
+    formApi.update(opts);
+  });
+  return formApi;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  useForm
+});
+//# sourceMappingURL=useForm.cjs.map

package/build/modern/useForm.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/useForm.tsx"],"sourcesContent":["import type { FormState, FormOptions } from '@tanstack/form-core'\nimport { FormApi, functionalUpdate } from '@tanstack/form-core'\nimport type { NoInfer } from '@tanstack/react-store'\nimport { useStore } from '@tanstack/react-store'\nimport React, { type ReactNode, useState } from 'react'\nimport { type UseField, type FieldComponent, Field, useField } from './useField'\nimport { formContext } from './formContext'\nimport useIsomorphicLayoutEffect from 'use-isomorphic-layout-effect'\n\ndeclare module '@tanstack/form-core' {\n  // eslint-disable-next-line no-shadow\n  interface FormApi<TFormData> {\n    Provider: (props: { children: any }) => any\n    Field: FieldComponent<TFormData, TFormData>\n    useField: UseField<TFormData>\n    useStore: <TSelected = NoInfer<FormState<TFormData>>>(\n      selector?: (state: NoInfer<FormState<TFormData>>) => TSelected,\n    ) => TSelected\n    Subscribe: <TSelected = NoInfer<FormState<TFormData>>>(props: {\n      selector?: (state: NoInfer<FormState<TFormData>>) => TSelected\n      children: ((state: NoInfer<TSelected>) => ReactNode) | ReactNode\n    }) => any\n  }\n}\n\nexport function useForm<TData>(opts?: FormOptions<TData>): FormApi<TData> {\n  const [formApi] = useState(() => {\n    // @ts-ignore\n    const api = new FormApi<TData>(opts)\n\n    api.Provider = function Provider(props) {\n      return <formContext.Provider {...props} value={{ formApi: api }} />\n    }\n    api.Field = Field as any\n    api.useField = useField as any\n    api.useStore = (\n      // @ts-ignore\n      selector,\n    ) => {\n      // eslint-disable-next-line react-hooks/rules-of-hooks\n      return useStore(api.store as any, selector as any) as any\n    }\n    api.Subscribe = (\n      // @ts-ignore\n      props,\n    ) => {\n      return functionalUpdate(\n        props.children,\n        // eslint-disable-next-line react-hooks/rules-of-hooks\n        useStore(api.store as any, props.selector as any),\n      ) as any\n    }\n\n    return api\n  })\n\n  formApi.useStore((state) => state.isSubmitting)\n\n  /**\n   * formApi.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    formApi.update(opts)\n  })\n\n  return formApi as any\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,uBAA0C;AAE1C,yBAAyB;AACzB,mBAAgD;AAChD,sBAAoE;AACpE,yBAA4B;AAC5B,0CAAsC;AAkB/B,SAAS,QAAe,MAA2C;AACxE,QAAM,CAAC,OAAO,QAAI,uBAAS,MAAM;AAE/B,UAAM,MAAM,IAAI,yBAAe,IAAI;AAEnC,QAAI,WAAW,SAAS,SAAS,OAAO;AACtC,aAAO,6BAAAA,QAAA,cAAC,+BAAY,UAAZ,EAAsB,GAAG,OAAO,OAAO,EAAE,SAAS,IAAI,GAAG;AAAA,IACnE;AACA,QAAI,QAAQ;AACZ,QAAI,WAAW;AACf,QAAI,WAAW,CAEb,aACG;AAEH,iBAAO,6BAAS,IAAI,OAAc,QAAe;AAAA,IACnD;AACA,QAAI,YAAY,CAEd,UACG;AACH,iBAAO;AAAA,QACL,MAAM;AAAA;AAAA,YAEN,6BAAS,IAAI,OAAc,MAAM,QAAe;AAAA,MAClD;AAAA,IACF;AAEA,WAAO;AAAA,EACT,CAAC;AAED,UAAQ,SAAS,CAAC,UAAU,MAAM,YAAY;AAM9C,0CAAAC,SAA0B,MAAM;AAC9B,YAAQ,OAAO,IAAI;AAAA,EACrB,CAAC;AAED,SAAO;AACT;","names":["React","useIsomorphicLayoutEffect"]}

package/build/modern/useForm.d.cts

@@ -0,0 +1,23 @@
+import { FormState, FormOptions, FormApi } from '@tanstack/form-core';
+import { NoInfer } from '@tanstack/react-store';
+import { ReactNode } from 'react';
+import { FieldComponent, UseField } from './useField.cjs';
+import './types.cjs';
+
+declare module '@tanstack/form-core' {
+    interface FormApi<TFormData> {
+        Provider: (props: {
+            children: any;
+        }) => any;
+        Field: FieldComponent<TFormData, TFormData>;
+        useField: UseField<TFormData>;
+        useStore: <TSelected = NoInfer<FormState<TFormData>>>(selector?: (state: NoInfer<FormState<TFormData>>) => TSelected) => TSelected;
+        Subscribe: <TSelected = NoInfer<FormState<TFormData>>>(props: {
+            selector?: (state: NoInfer<FormState<TFormData>>) => TSelected;
+            children: ((state: NoInfer<TSelected>) => ReactNode) | ReactNode;
+        }) => any;
+    }
+}
+declare function useForm<TData>(opts?: FormOptions<TData>): FormApi<TData>;
+
+export { useForm };

package/build/modern/useForm.d.ts

@@ -0,0 +1,23 @@
+import { FormState, FormOptions, FormApi } from '@tanstack/form-core';
+import { NoInfer } from '@tanstack/react-store';
+import { ReactNode } from 'react';
+import { FieldComponent, UseField } from './useField.js';
+import './types.js';
+
+declare module '@tanstack/form-core' {
+    interface FormApi<TFormData> {
+        Provider: (props: {
+            children: any;
+        }) => any;
+        Field: FieldComponent<TFormData, TFormData>;
+        useField: UseField<TFormData>;
+        useStore: <TSelected = NoInfer<FormState<TFormData>>>(selector?: (state: NoInfer<FormState<TFormData>>) => TSelected) => TSelected;
+        Subscribe: <TSelected = NoInfer<FormState<TFormData>>>(props: {
+            selector?: (state: NoInfer<FormState<TFormData>>) => TSelected;
+            children: ((state: NoInfer<TSelected>) => ReactNode) | ReactNode;
+        }) => any;
+    }
+}
+declare function useForm<TData>(opts?: FormOptions<TData>): FormApi<TData>;
+
+export { useForm };

package/build/modern/useForm.js

@@ -0,0 +1,37 @@
+// src/useForm.tsx
+import { FormApi, functionalUpdate } from "@tanstack/form-core";
+import { useStore } from "@tanstack/react-store";
+import React, { useState } from "react";
+import { Field, useField } from "./useField.js";
+import { formContext } from "./formContext.js";
+import useIsomorphicLayoutEffect from "use-isomorphic-layout-effect";
+function useForm(opts) {
+  const [formApi] = useState(() => {
+    const api = new FormApi(opts);
+    api.Provider = function Provider(props) {
+      return /* @__PURE__ */ React.createElement(formContext.Provider, { ...props, value: { formApi: api } });
+    };
+    api.Field = Field;
+    api.useField = useField;
+    api.useStore = (selector) => {
+      return useStore(api.store, selector);
+    };
+    api.Subscribe = (props) => {
+      return functionalUpdate(
+        props.children,
+        // eslint-disable-next-line react-hooks/rules-of-hooks
+        useStore(api.store, props.selector)
+      );
+    };
+    return api;
+  });
+  formApi.useStore((state) => state.isSubmitting);
+  useIsomorphicLayoutEffect(() => {
+    formApi.update(opts);
+  });
+  return formApi;
+}
+export {
+  useForm
+};
+//# sourceMappingURL=useForm.js.map

package/build/modern/useForm.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/useForm.tsx"],"sourcesContent":["import type { FormState, FormOptions } from '@tanstack/form-core'\nimport { FormApi, functionalUpdate } from '@tanstack/form-core'\nimport type { NoInfer } from '@tanstack/react-store'\nimport { useStore } from '@tanstack/react-store'\nimport React, { type ReactNode, useState } from 'react'\nimport { type UseField, type FieldComponent, Field, useField } from './useField'\nimport { formContext } from './formContext'\nimport useIsomorphicLayoutEffect from 'use-isomorphic-layout-effect'\n\ndeclare module '@tanstack/form-core' {\n  // eslint-disable-next-line no-shadow\n  interface FormApi<TFormData> {\n    Provider: (props: { children: any }) => any\n    Field: FieldComponent<TFormData, TFormData>\n    useField: UseField<TFormData>\n    useStore: <TSelected = NoInfer<FormState<TFormData>>>(\n      selector?: (state: NoInfer<FormState<TFormData>>) => TSelected,\n    ) => TSelected\n    Subscribe: <TSelected = NoInfer<FormState<TFormData>>>(props: {\n      selector?: (state: NoInfer<FormState<TFormData>>) => TSelected\n      children: ((state: NoInfer<TSelected>) => ReactNode) | ReactNode\n    }) => any\n  }\n}\n\nexport function useForm<TData>(opts?: FormOptions<TData>): FormApi<TData> {\n  const [formApi] = useState(() => {\n    // @ts-ignore\n    const api = new FormApi<TData>(opts)\n\n    api.Provider = function Provider(props) {\n      return <formContext.Provider {...props} value={{ formApi: api }} />\n    }\n    api.Field = Field as any\n    api.useField = useField as any\n    api.useStore = (\n      // @ts-ignore\n      selector,\n    ) => {\n      // eslint-disable-next-line react-hooks/rules-of-hooks\n      return useStore(api.store as any, selector as any) as any\n    }\n    api.Subscribe = (\n      // @ts-ignore\n      props,\n    ) => {\n      return functionalUpdate(\n        props.children,\n        // eslint-disable-next-line react-hooks/rules-of-hooks\n        useStore(api.store as any, props.selector as any),\n      ) as any\n    }\n\n    return api\n  })\n\n  formApi.useStore((state) => state.isSubmitting)\n\n  /**\n   * formApi.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    formApi.update(opts)\n  })\n\n  return formApi as any\n}\n"],"mappings":";AACA,SAAS,SAAS,wBAAwB;AAE1C,SAAS,gBAAgB;AACzB,OAAO,SAAyB,gBAAgB;AAChD,SAA6C,OAAO,gBAAgB;AACpE,SAAS,mBAAmB;AAC5B,OAAO,+BAA+B;AAkB/B,SAAS,QAAe,MAA2C;AACxE,QAAM,CAAC,OAAO,IAAI,SAAS,MAAM;AAE/B,UAAM,MAAM,IAAI,QAAe,IAAI;AAEnC,QAAI,WAAW,SAAS,SAAS,OAAO;AACtC,aAAO,oCAAC,YAAY,UAAZ,EAAsB,GAAG,OAAO,OAAO,EAAE,SAAS,IAAI,GAAG;AAAA,IACnE;AACA,QAAI,QAAQ;AACZ,QAAI,WAAW;AACf,QAAI,WAAW,CAEb,aACG;AAEH,aAAO,SAAS,IAAI,OAAc,QAAe;AAAA,IACnD;AACA,QAAI,YAAY,CAEd,UACG;AACH,aAAO;AAAA,QACL,MAAM;AAAA;AAAA,QAEN,SAAS,IAAI,OAAc,MAAM,QAAe;AAAA,MAClD;AAAA,IACF;AAEA,WAAO;AAAA,EACT,CAAC;AAED,UAAQ,SAAS,CAAC,UAAU,MAAM,YAAY;AAM9C,4BAA0B,MAAM;AAC9B,YAAQ,OAAO,IAAI;AAAA,EACrB,CAAC;AAED,SAAO;AACT;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/react-form",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "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.1"
+    "@tanstack/form-core": "0.3.3"
   },
   "peerDependencies": {
     "react": "^17.0.0 || ^18.0.0",

package/src/tests/useField.test-d.tsx

@@ -0,0 +1,63 @@
+import { assertType } from 'vitest'
+import * as React from 'react'
+import { useForm } from '../useForm'
+
+it('should type state.value properly', () => {
+  function Comp() {
+    const form = useForm({
+      defaultValues: {
+        firstName: 'test',
+        age: 84,
+      },
+    } as const)
+
+    return (
+      <form.Provider>
+        <form.Field
+          name="firstName"
+          children={(field) => {
+            assertType<'test'>(field.state.value)
+          }}
+        />
+        <form.Field
+          name="age"
+          children={(field) => {
+            assertType<84>(field.state.value)
+          }}
+        />
+      </form.Provider>
+    )
+  }
+})
+
+it('should type onChange properly', () => {
+  function Comp() {
+    const form = useForm({
+      defaultValues: {
+        firstName: 'test',
+        age: 84,
+      },
+    } as const)
+
+    return (
+      <form.Provider>
+        <form.Field
+          name="firstName"
+          onChange={(val) => {
+            assertType<'test'>(val)
+            return null
+          }}
+          children={(field) => null}
+        />
+        <form.Field
+          name="age"
+          onChange={(val) => {
+            assertType<84>(val)
+            return null
+          }}
+          children={(field) => null}
+        />
+      </form.Provider>
+    )
+  }
+})

package/src/types.ts

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

package/src/useField.tsx

@@ -3,17 +3,17 @@ import { useStore } from '@tanstack/react-store'
 import type {
   DeepKeys,
   DeepValue,
-  FieldOptions,
+  FieldApiOptions,
   Narrow,
 } from '@tanstack/form-core'
-import { FieldApi, functionalUpdate } from '@tanstack/form-core'
+import { FieldApi, type FormApi, functionalUpdate } from '@tanstack/form-core'
 import { useFormContext, formContext } from './formContext'
 import useIsomorphicLayoutEffect from 'use-isomorphic-layout-effect'
 import type { UseFieldOptions } from './types'
 
 declare module '@tanstack/form-core' {
   // eslint-disable-next-line no-shadow
-  interface FieldApi<TData, TFormData> {
+  interface FieldApi<_TData, TFormData, Opts, TData> {
     Field: FieldComponent<TData, TFormData>
   }
 }
@@ -25,13 +25,27 @@ export type UseField<TFormData> = <TField extends DeepKeys<TFormData>>(
   >,
 ) => FieldApi<DeepValue<TFormData, TField>, TFormData>
 
-export function useField<TData, TFormData>(
-  opts: UseFieldOptions<TData, TFormData>,
-): FieldApi<TData, TFormData> {
+export function useField<
+  TData,
+  TFormData,
+  TName extends unknown extends TFormData
+    ? string
+    : DeepKeys<TFormData> = unknown extends TFormData
+    ? string
+    : DeepKeys<TFormData>,
+>(
+  opts: UseFieldOptions<TData, TFormData, TName>,
+): FieldApi<
+  TData,
+  TFormData,
+  Omit<typeof opts, 'onMount'> & {
+    form: FormApi<TFormData>
+  }
+> {
   // Get the form API either manually or from context
   const { formApi, parentFieldName } = useFormContext()
 
-  const [fieldApi] = useState<FieldApi<TData, TFormData>>(() => {
+  const [fieldApi] = useState(() => {
     const name = (
       typeof opts.index === 'number'
         ? [parentFieldName, opts.index, opts.name]
@@ -40,9 +54,13 @@ export function useField<TData, TFormData>(
       .filter((d) => d !== undefined)
       .join('.')
 
-    const api = new FieldApi({ ...opts, form: formApi, name: name as any })
+    const api = new FieldApi({
+      ...opts,
+      form: formApi,
+      name: name,
+    } as never)
 
-    api.Field = Field as any
+    api.Field = Field as never
 
     return api
   })
@@ -56,70 +74,52 @@ export function useField<TData, TFormData>(
   })
 
   useStore(
-    fieldApi.store as any,
+    fieldApi.store,
     opts.mode === 'array'
       ? (state: any) => {
           return [state.meta, Object.keys(state.value || []).length]
         }
       : undefined,
   )
-
   // Instantiates field meta and removes it when unrendered
   useIsomorphicLayoutEffect(() => fieldApi.mount(), [fieldApi])
 
-  return fieldApi
+  return fieldApi as never
 }
 
-// export type FieldValue<TFormData, TField> = TFormData extends any[]
-//   ? TField extends `[${infer TIndex extends number | 'i'}].${infer TRest}`
-//     ? DeepValue<TFormData[TIndex extends 'i' ? number : TIndex], TRest>
-//     : TField extends `[${infer TIndex extends number | 'i'}]`
-//     ? TFormData[TIndex extends 'i' ? number : TIndex]
-//     : never
-//   : TField extends `${infer TPrefix}[${infer TIndex extends
-//       | number
-//       | 'i'}].${infer TRest}`
-//   ? DeepValue<
-//       DeepValue<TFormData, TPrefix>[TIndex extends 'i' ? number : TIndex],
-//       TRest
-//     >
-//   : TField extends `${infer TPrefix}[${infer TIndex extends number | 'i'}]`
-//   ? DeepValue<TFormData, TPrefix>[TIndex extends 'i' ? number : TIndex]
-//   : DeepValue<TFormData, TField>
-
-export type FieldValue<TFormData, TField> = TFormData extends any[]
-  ? unknown extends TField
-    ? TFormData[number]
-    : DeepValue<TFormData[number], TField>
-  : DeepValue<TFormData, TField>
-
-// type Test1 = FieldValue<{ foo: { bar: string }[] }, 'foo'>
-// //   ^?
-// type Test2 = FieldValue<{ foo: { bar: string }[] }, 'foo[i]'>
-// //   ^?
-// type Test3 = FieldValue<{ foo: { bar: string }[] }, 'foo[2].bar'>
-// //   ^?
-
-export type FieldComponent<TParentData, TFormData> = <TField>({
-  children,
-  ...fieldOptions
-}: {
+type FieldComponentProps<
+  TParentData,
+  TFormData,
+  TField,
+  TName extends unknown extends TFormData ? string : DeepKeys<TFormData>,
+> = {
   children: (
-    fieldApi: FieldApi<FieldValue<TParentData, TField>, TFormData>,
+    fieldApi: FieldApi<
+      TField,
+      TFormData,
+      FieldApiOptions<TField, TFormData, TName>
+    >,
   ) => any
-} & Omit<
-  UseFieldOptions<FieldValue<TParentData, TField>, TFormData>,
-  'name' | 'index'
-> &
-  (TParentData extends any[]
-    ? {
-        name?: TField extends undefined ? TField : DeepKeys<TParentData>
-        index: number
-      }
-    : {
-        name: TField extends undefined ? TField : DeepKeys<TParentData>
-        index?: never
-      })) => any
+} & (TParentData extends any[]
+  ? {
+      name?: TName
+      index: number
+    }
+  : {
+      name: TName
+      index?: never
+    }) &
+  Omit<UseFieldOptions<TField, TFormData, TName>, 'name' | 'index'>
+
+export type FieldComponent<TParentData, TFormData> = <
+  // Type of the field
+  TField,
+  // Name of the field
+  TName extends unknown extends TFormData ? string : DeepKeys<TFormData>,
+>({
+  children,
+  ...fieldOptions
+}: FieldComponentProps<TParentData, TFormData, TField, TName>) => any
 
 export function Field<TData, TFormData>({
   children,

package/src/useForm.tsx

@@ -28,10 +28,9 @@ export function useForm<TData>(opts?: FormOptions<TData>): FormApi<TData> {
     // @ts-ignore
     const api = new FormApi<TData>(opts)
 
-    // eslint-disable-next-line react/display-name
-    api.Provider = (props) => (
-      <formContext.Provider {...props} value={{ formApi: api }} />
-    )
+    api.Provider = function Provider(props) {
+      return <formContext.Provider {...props} value={{ formApi: api }} />
+    }
     api.Field = Field as any
     api.useField = useField as any
     api.useStore = (