@tanstack/form-core 0.0.4 → 0.0.6

package/src/FieldApi.ts

@@ -5,10 +5,9 @@ import { Store } from '@tanstack/store'
 
 export type ValidationCause = 'change' | 'blur' | 'submit'
 
-export type FieldOptions<TData, TFormData> = {
+export interface FieldOptions<TData, TFormData> {
   name: unknown extends TFormData ? string : DeepKeys<TFormData>
   defaultValue?: TData
-  form?: FormApi<TFormData>
   validate?: (
     value: TData,
     fieldApi: FieldApi<TData, TFormData>,
@@ -24,6 +23,13 @@ export type FieldOptions<TData, TFormData> = {
   defaultMeta?: Partial<FieldMeta>
 }
 
+export type FieldApiOptions<TData, TFormData> = FieldOptions<
+  TData,
+  TFormData
+> & {
+  form: FormApi<TFormData>
+}
+
 export type FieldMeta = {
   isTouched: boolean
   touchedError?: ValidationError
@@ -31,20 +37,27 @@ export type FieldMeta = {
   isValidating: boolean
 }
 
-export type ChangeProps<TData> = {
+export type UserChangeProps<TData> = {
   onChange?: (updater: Updater<TData>) => void
   onBlur?: (event: any) => void
 }
 
-export type InputProps = {
+export type UserInputProps = {
   onChange?: (event: any) => void
   onBlur?: (event: any) => void
 }
 
-export type FieldApiOptions<TData, TFormData> = RequiredByKey<
-  FieldOptions<TData, TFormData>,
-  'form'
->
+export type ChangeProps<TData> = {
+  value: TData
+  onChange: (updater: Updater<TData>) => void
+  onBlur: (event: any) => void
+}
+
+export type InputProps = {
+  value: string
+  onChange: (event: any) => void
+  onBlur: (event: any) => void
+}
 
 let uid = 0
 
@@ -332,7 +345,7 @@ export class FieldApi<TData, TFormData> {
     return undefined
   }
 
-  getChangeProps = <T extends ChangeProps<any>>(
+  getChangeProps = <T extends UserChangeProps<any>>(
     props: T = {} as T,
   ): ChangeProps<TData> & Omit<T, keyof ChangeProps<TData>> => {
     return {
@@ -350,7 +363,7 @@ export class FieldApi<TData, TFormData> {
     } as ChangeProps<TData> & Omit<T, keyof ChangeProps<TData>>
   }
 
-  getInputProps = <T extends InputProps>(
+  getInputProps = <T extends UserInputProps>(
     props: T = {} as T,
   ): InputProps & Omit<T, keyof InputProps> => {
     return {

package/src/FormApi.ts

@@ -1,17 +1,25 @@
-import type { FormEvent } from 'react'
 import { Store } from '@tanstack/store'
 //
 import type { DeepKeys, DeepValue, Updater } from './utils'
 import { functionalUpdate, getBy, setBy } from './utils'
 import type { FieldApi, FieldMeta, ValidationCause } from './FieldApi'
 
+export interface Register {
+  // FormSubmitEvent
+}
+
+export type FormSubmitEvent = Register extends {
+  FormSubmitEvent: infer E
+}
+  ? E
+  : Event
+
 export type FormOptions<TData> = {
   defaultValues?: TData
   defaultState?: Partial<FormState<TData>>
   onSubmit?: (values: TData, formApi: FormApi<TData>) => void
   onInvalidSubmit?: (values: TData, formApi: FormApi<TData>) => void
   validate?: (values: TData, formApi: FormApi<TData>) => Promise<any>
-  debugForm?: boolean
   defaultValidatePristine?: boolean
   defaultValidateOn?: ValidationCause
   defaultValidateAsyncOn?: ValidationCause
@@ -53,7 +61,7 @@ export type FormState<TData> = {
   submissionAttempts: number
 }
 
-export function getDefaultFormState<TData>(
+function getDefaultFormState<TData>(
   defaultState: Partial<FormState<TData>>,
 ): FormState<TData> {
   return {
@@ -247,7 +255,7 @@ export class FormApi<TFormData> {
     return this.validationMeta.validationPromise
   }
 
-  handleSubmit = async (e: FormEvent & { __handled?: boolean }) => {
+  handleSubmit = async (e: FormSubmitEvent) => {
     e.preventDefault()
     e.stopPropagation()