@tanstack/form-core 0.3.6 → 0.4.0

package/build/legacy/FormApi.js

@@ -1,5 +1,3 @@
-import "./chunk-4QZDOMDG.js";
-
 // src/FormApi.ts
 import { Store } from "@tanstack/store";
 import { functionalUpdate, getBy, isNonEmptyArray, setBy } from "./utils.js";
@@ -62,18 +60,16 @@ var FormApi = class {
     this.validateAllFields = async (cause) => {
       const fieldValidationPromises = [];
       this.store.batch(() => {
-        void Object.values(this.fieldInfo).forEach(
-          (field) => {
-            Object.values(field.instances).forEach((instance) => {
-              if (!instance.state.meta.isTouched) {
-                instance.setMeta((prev) => ({ ...prev, isTouched: true }));
-                fieldValidationPromises.push(
-                  Promise.resolve().then(() => instance.validate(cause))
-                );
-              }
-            });
-          }
-        );
+        void Object.values(this.fieldInfo).forEach((field) => {
+          Object.values(field.instances).forEach((instance) => {
+            if (!instance.state.meta.isTouched) {
+              instance.setMeta((prev) => ({ ...prev, isTouched: true }));
+              fieldValidationPromises.push(
+                Promise.resolve().then(() => instance.validate(cause))
+              );
+            }
+          });
+        });
       });
       return Promise.all(fieldValidationPromises);
     };

package/build/legacy/FormApi.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/FormApi.ts"],"sourcesContent":["import { Store } from '@tanstack/store'\n//\nimport type { DeepKeys, DeepValue, Updater } from './utils'\nimport { functionalUpdate, getBy, isNonEmptyArray, setBy } from './utils'\nimport type { FieldApi, FieldMeta, ValidationCause } from './FieldApi'\n\nexport type FormOptions<TData> = {\n  defaultValues?: TData\n  defaultState?: Partial<FormState<TData>>\n  asyncDebounceMs?: number\n  onMount?: (values: TData, formApi: FormApi<TData>) => ValidationError\n  onMountAsync?: (\n    values: TData,\n    formApi: FormApi<TData>,\n  ) => ValidationError | Promise<ValidationError>\n  onMountAsyncDebounceMs?: number\n  onChange?: (values: TData, formApi: FormApi<TData>) => ValidationError\n  onChangeAsync?: (\n    values: TData,\n    formApi: FormApi<TData>,\n  ) => ValidationError | Promise<ValidationError>\n  onChangeAsyncDebounceMs?: number\n  onBlur?: (values: TData, formApi: FormApi<TData>) => ValidationError\n  onBlurAsync?: (\n    values: TData,\n    formApi: FormApi<TData>,\n  ) => ValidationError | Promise<ValidationError>\n  onBlurAsyncDebounceMs?: number\n  onSubmit?: (values: TData, formApi: FormApi<TData>) => any | Promise<any>\n  onSubmitInvalid?: (values: TData, formApi: FormApi<TData>) => void\n}\n\nexport type FieldInfo<TFormData> = {\n  instances: Record<string, FieldApi<TFormData, any, any>>\n} & ValidationMeta\n\nexport type ValidationMeta = {\n  validationCount?: number\n  validationAsyncCount?: number\n  validationPromise?: Promise<ValidationError[]>\n  validationResolve?: (errors: ValidationError[]) => void\n  validationReject?: (errors: unknown) => void\n}\n\nexport type ValidationError = undefined | false | null | string\n\nexport type ValidationErrorMapKeys = `on${Capitalize<ValidationCause>}`\n\nexport type ValidationErrorMap = {\n  [K in ValidationErrorMapKeys]?: ValidationError\n}\n\nexport type FormState<TData> = {\n  values: TData\n  // Form Validation\n  isFormValidating: boolean\n  formValidationCount: number\n  isFormValid: boolean\n  formError?: ValidationError\n  // Fields\n  fieldMeta: Record<DeepKeys<TData>, FieldMeta>\n  isFieldsValidating: boolean\n  isFieldsValid: boolean\n  isSubmitting: boolean\n  // General\n  isTouched: boolean\n  isSubmitted: boolean\n  isValidating: boolean\n  isValid: boolean\n  canSubmit: boolean\n  submissionAttempts: number\n}\n\nfunction getDefaultFormState<TData>(\n  defaultState: Partial<FormState<TData>>,\n): FormState<TData> {\n  return {\n    values: defaultState.values ?? ({} as never),\n    fieldMeta: defaultState.fieldMeta ?? ({} as never),\n    canSubmit: defaultState.canSubmit ?? true,\n    isFieldsValid: defaultState.isFieldsValid ?? false,\n    isFieldsValidating: defaultState.isFieldsValidating ?? false,\n    isFormValid: defaultState.isFormValid ?? false,\n    isFormValidating: defaultState.isFormValidating ?? false,\n    isSubmitted: defaultState.isSubmitted ?? false,\n    isSubmitting: defaultState.isSubmitting ?? false,\n    isTouched: defaultState.isTouched ?? false,\n    isValid: defaultState.isValid ?? false,\n    isValidating: defaultState.isValidating ?? false,\n    submissionAttempts: defaultState.submissionAttempts ?? 0,\n    formValidationCount: defaultState.formValidationCount ?? 0,\n  }\n}\n\nexport class FormApi<TFormData> {\n  // // This carries the context for nested fields\n  options: FormOptions<TFormData> = {}\n  store!: Store<FormState<TFormData>>\n  // Do not use __state directly, as it is not reactive.\n  // Please use form.useStore() utility to subscribe to state\n  state!: FormState<TFormData>\n  fieldInfo: Record<DeepKeys<TFormData>, FieldInfo<TFormData>> = {} as any\n  fieldName?: string\n  validationMeta: ValidationMeta = {}\n\n  constructor(opts?: FormOptions<TFormData>) {\n    this.store = new Store<FormState<TFormData>>(\n      getDefaultFormState({\n        ...(opts?.defaultState as any),\n        values: opts?.defaultValues ?? opts?.defaultState?.values,\n        isFormValid: true,\n      }),\n      {\n        onUpdate: () => {\n          let { state } = this.store\n          // Computed state\n          const fieldMetaValues = Object.values(state.fieldMeta) as (\n            | FieldMeta\n            | undefined\n          )[]\n\n          const isFieldsValidating = fieldMetaValues.some(\n            (field) => field?.isValidating,\n          )\n\n          const isFieldsValid = !fieldMetaValues.some((field) =>\n            isNonEmptyArray(field?.errors),\n          )\n\n          const isTouched = fieldMetaValues.some((field) => field?.isTouched)\n\n          const isValidating = isFieldsValidating || state.isFormValidating\n          const isFormValid = !state.formError\n          const isValid = isFieldsValid && isFormValid\n          const canSubmit =\n            (state.submissionAttempts === 0 && !isTouched) ||\n            (!isValidating && !state.isSubmitting && isValid)\n\n          state = {\n            ...state,\n            isFieldsValidating,\n            isFieldsValid,\n            isFormValid,\n            isValid,\n            canSubmit,\n            isTouched,\n          }\n\n          this.store.state = state\n          this.state = state\n        },\n      },\n    )\n\n    this.state = this.store.state\n\n    this.update(opts || {})\n  }\n\n  update = (options?: FormOptions<TFormData>) => {\n    if (!options) return\n\n    this.store.batch(() => {\n      const shouldUpdateValues =\n        options.defaultValues &&\n        options.defaultValues !== this.options.defaultValues &&\n        !this.state.isTouched\n\n      const shouldUpdateState =\n        options.defaultState !== this.options.defaultState &&\n        !this.state.isTouched\n\n      this.store.setState(() =>\n        getDefaultFormState(\n          Object.assign(\n            {},\n            this.state as any,\n            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n            shouldUpdateState ? options.defaultState : {},\n            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n            shouldUpdateValues\n              ? {\n                  values: options.defaultValues,\n                }\n              : {},\n          ),\n        ),\n      )\n    })\n\n    this.options = options\n  }\n\n  reset = () =>\n    this.store.setState(() =>\n      getDefaultFormState({\n        ...(this.options.defaultState as any),\n        values: this.options.defaultValues ?? this.options.defaultState?.values,\n      }),\n    )\n\n  validateAllFields = async (cause: ValidationCause) => {\n    const fieldValidationPromises: Promise<ValidationError[]>[] = [] as any\n    this.store.batch(() => {\n      void (Object.values(this.fieldInfo) as FieldInfo<any>[]).forEach(\n        (field) => {\n          Object.values(field.instances).forEach((instance) => {\n            // If any fields are not touched\n            if (!instance.state.meta.isTouched) {\n              // Mark them as touched\n              instance.setMeta((prev) => ({ ...prev, isTouched: true }))\n              // Validate the field\n              fieldValidationPromises.push(\n                Promise.resolve().then(() => instance.validate(cause)),\n              )\n            }\n          })\n        },\n      )\n    })\n\n    return Promise.all(fieldValidationPromises)\n  }\n\n  handleSubmit = async () => {\n    // Check to see that the form and all fields have been touched\n    // If they have not, touch them all and run validation\n    // Run form validation\n    // Submit the form\n\n    this.store.setState((old) => ({\n      ...old,\n      // Submission attempts mark the form as not submitted\n      isSubmitted: false,\n      // Count submission attempts\n      submissionAttempts: old.submissionAttempts + 1,\n    }))\n\n    // Don't let invalid forms submit\n    if (!this.state.canSubmit) return\n\n    this.store.setState((d) => ({ ...d, isSubmitting: true }))\n\n    const done = () => {\n      this.store.setState((prev) => ({ ...prev, isSubmitting: false }))\n    }\n\n    // Validate all fields\n    await this.validateAllFields('submit')\n\n    // Fields are invalid, do not submit\n    if (!this.state.isFieldsValid) {\n      done()\n      this.options.onSubmitInvalid?.(this.state.values, this)\n      return\n    }\n\n    // Run validation for the form\n    // await this.validateForm()\n\n    if (!this.state.isValid) {\n      done()\n      this.options.onSubmitInvalid?.(this.state.values, this)\n      return\n    }\n\n    try {\n      // Run the submit code\n      await this.options.onSubmit?.(this.state.values, this)\n\n      this.store.batch(() => {\n        this.store.setState((prev) => ({ ...prev, isSubmitted: true }))\n        done()\n      })\n    } catch (err) {\n      done()\n      throw err\n    }\n  }\n\n  getFieldValue = <TField extends DeepKeys<TFormData>>(\n    field: TField,\n  ): DeepValue<TFormData, TField> => getBy(this.state.values, field)\n\n  getFieldMeta = <TField extends DeepKeys<TFormData>>(\n    field: TField,\n  ): FieldMeta | undefined => {\n    return this.state.fieldMeta[field]\n  }\n\n  getFieldInfo = <TField extends DeepKeys<TFormData>>(\n    field: TField,\n  ): FieldInfo<TFormData> => {\n    // eslint-disable-next-line  @typescript-eslint/no-unnecessary-condition\n    return (this.fieldInfo[field] ||= {\n      instances: {},\n    })\n  }\n\n  setFieldMeta = <TField extends DeepKeys<TFormData>>(\n    field: TField,\n    updater: Updater<FieldMeta>,\n  ) => {\n    this.store.setState((prev) => {\n      return {\n        ...prev,\n        fieldMeta: {\n          ...prev.fieldMeta,\n          [field]: functionalUpdate(updater, prev.fieldMeta[field]),\n        },\n      }\n    })\n  }\n\n  setFieldValue = <TField extends DeepKeys<TFormData>>(\n    field: TField,\n    updater: Updater<DeepValue<TFormData, TField>>,\n    opts?: { touch?: boolean },\n  ) => {\n    const touch = opts?.touch\n\n    this.store.batch(() => {\n      if (touch) {\n        this.setFieldMeta(field, (prev) => ({\n          ...prev,\n          isTouched: true,\n        }))\n      }\n\n      this.store.setState((prev) => {\n        return {\n          ...prev,\n          values: setBy(prev.values, field, updater),\n        }\n      })\n    })\n  }\n\n  pushFieldValue = <TField extends DeepKeys<TFormData>>(\n    field: TField,\n    value: DeepValue<TFormData, TField>[number],\n    opts?: { touch?: boolean },\n  ) => {\n    return this.setFieldValue(\n      field,\n      (prev) => [...(Array.isArray(prev) ? prev : []), value] as any,\n      opts,\n    )\n  }\n\n  insertFieldValue = <TField extends DeepKeys<TFormData>>(\n    field: TField,\n    index: number,\n    value: DeepValue<TFormData, TField>[number],\n    opts?: { touch?: boolean },\n  ) => {\n    this.setFieldValue(\n      field,\n      (prev) => {\n        return (prev as DeepValue<TFormData, TField>[]).map((d, i) =>\n          i === index ? value : d,\n        ) as any\n      },\n      opts,\n    )\n  }\n\n  removeFieldValue = <TField extends DeepKeys<TFormData>>(\n    field: TField,\n    index: number,\n    opts?: { touch?: boolean },\n  ) => {\n    this.setFieldValue(\n      field,\n      (prev) => {\n        return (prev as DeepValue<TFormData, TField>[]).filter(\n          (_d, i) => i !== index,\n        ) as any\n      },\n      opts,\n    )\n  }\n\n  swapFieldValues = <TField extends DeepKeys<TFormData>>(\n    field: TField,\n    index1: number,\n    index2: number,\n  ) => {\n    this.setFieldValue(field, (prev: any) => {\n      const prev1 = prev[index1]!\n      const prev2 = prev[index2]!\n      return setBy(setBy(prev, `${index1}`, prev2), `${index2}`, prev1)\n    })\n  }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../src/FormApi.ts"],"sourcesContent":["import { Store } from '@tanstack/store'\nimport type { DeepKeys, DeepValue, Updater } from './utils'\nimport { functionalUpdate, getBy, isNonEmptyArray, setBy } from './utils'\nimport type { FieldApi, FieldMeta, ValidationCause } from './FieldApi'\nimport type { ValidationError, Validator } from './types'\n\ntype ValidateFn<TData, ValidatorType> = (\n  values: TData,\n  formApi: FormApi<TData, ValidatorType>,\n) => ValidationError\n\ntype ValidateOrFn<TData, ValidatorType> = ValidatorType extends Validator<TData>\n  ? Parameters<ReturnType<ValidatorType>['validate']>[1]\n  : ValidateFn<TData, ValidatorType>\n\ntype ValidateAsyncFn<TData, ValidatorType> = (\n  value: TData,\n  fieldApi: FormApi<TData, ValidatorType>,\n) => ValidationError | Promise<ValidationError>\n\nexport type FormOptions<TData, ValidatorType> = {\n  defaultValues?: TData\n  defaultState?: Partial<FormState<TData>>\n  asyncDebounceMs?: number\n  validator?: ValidatorType\n  onMount?: ValidateOrFn<TData, ValidatorType>\n  onMountAsync?: ValidateAsyncFn<TData, ValidatorType>\n  onMountAsyncDebounceMs?: number\n  onChange?: ValidateOrFn<TData, ValidatorType>\n  onChangeAsync?: ValidateAsyncFn<TData, ValidatorType>\n  onChangeAsyncDebounceMs?: number\n  onBlur?: ValidateOrFn<TData, ValidatorType>\n  onBlurAsync?: ValidateAsyncFn<TData, ValidatorType>\n  onBlurAsyncDebounceMs?: number\n  onSubmit?: (\n    values: TData,\n    formApi: FormApi<TData, ValidatorType>,\n  ) => any | Promise<any>\n  onSubmitInvalid?: (\n    values: TData,\n    formApi: FormApi<TData, ValidatorType>,\n  ) => void\n}\n\nexport type FieldInfo<TFormData, ValidatorType> = {\n  instances: Record<string, FieldApi<TFormData, any, unknown, ValidatorType>>\n} & ValidationMeta\n\nexport type ValidationMeta = {\n  validationCount?: number\n  validationAsyncCount?: number\n  validationPromise?: Promise<ValidationError[]>\n  validationResolve?: (errors: ValidationError[]) => void\n  validationReject?: (errors: unknown) => void\n}\n\nexport type ValidationErrorMapKeys = `on${Capitalize<ValidationCause>}`\n\nexport type ValidationErrorMap = {\n  [K in ValidationErrorMapKeys]?: ValidationError\n}\n\nexport type FormState<TData> = {\n  values: TData\n  // Form Validation\n  isFormValidating: boolean\n  formValidationCount: number\n  isFormValid: boolean\n  formError?: ValidationError\n  // Fields\n  fieldMeta: Record<DeepKeys<TData>, FieldMeta>\n  isFieldsValidating: boolean\n  isFieldsValid: boolean\n  isSubmitting: boolean\n  // General\n  isTouched: boolean\n  isSubmitted: boolean\n  isValidating: boolean\n  isValid: boolean\n  canSubmit: boolean\n  submissionAttempts: number\n}\n\nfunction getDefaultFormState<TData>(\n  defaultState: Partial<FormState<TData>>,\n): FormState<TData> {\n  return {\n    values: defaultState.values ?? ({} as never),\n    fieldMeta: defaultState.fieldMeta ?? ({} as never),\n    canSubmit: defaultState.canSubmit ?? true,\n    isFieldsValid: defaultState.isFieldsValid ?? false,\n    isFieldsValidating: defaultState.isFieldsValidating ?? false,\n    isFormValid: defaultState.isFormValid ?? false,\n    isFormValidating: defaultState.isFormValidating ?? false,\n    isSubmitted: defaultState.isSubmitted ?? false,\n    isSubmitting: defaultState.isSubmitting ?? false,\n    isTouched: defaultState.isTouched ?? false,\n    isValid: defaultState.isValid ?? false,\n    isValidating: defaultState.isValidating ?? false,\n    submissionAttempts: defaultState.submissionAttempts ?? 0,\n    formValidationCount: defaultState.formValidationCount ?? 0,\n  }\n}\n\nexport class FormApi<TFormData, ValidatorType> {\n  // // This carries the context for nested fields\n  options: FormOptions<TFormData, ValidatorType> = {}\n  store!: Store<FormState<TFormData>>\n  // Do not use __state directly, as it is not reactive.\n  // Please use form.useStore() utility to subscribe to state\n  state!: FormState<TFormData>\n  fieldInfo: Record<DeepKeys<TFormData>, FieldInfo<TFormData, ValidatorType>> =\n    {} as any\n  fieldName?: string\n  validationMeta: ValidationMeta = {}\n\n  constructor(opts?: FormOptions<TFormData, ValidatorType>) {\n    this.store = new Store<FormState<TFormData>>(\n      getDefaultFormState({\n        ...(opts?.defaultState as any),\n        values: opts?.defaultValues ?? opts?.defaultState?.values,\n        isFormValid: true,\n      }),\n      {\n        onUpdate: () => {\n          let { state } = this.store\n          // Computed state\n          const fieldMetaValues = Object.values(state.fieldMeta) as (\n            | FieldMeta\n            | undefined\n          )[]\n\n          const isFieldsValidating = fieldMetaValues.some(\n            (field) => field?.isValidating,\n          )\n\n          const isFieldsValid = !fieldMetaValues.some((field) =>\n            isNonEmptyArray(field?.errors),\n          )\n\n          const isTouched = fieldMetaValues.some((field) => field?.isTouched)\n\n          const isValidating = isFieldsValidating || state.isFormValidating\n          const isFormValid = !state.formError\n          const isValid = isFieldsValid && isFormValid\n          const canSubmit =\n            (state.submissionAttempts === 0 && !isTouched) ||\n            (!isValidating && !state.isSubmitting && isValid)\n\n          state = {\n            ...state,\n            isFieldsValidating,\n            isFieldsValid,\n            isFormValid,\n            isValid,\n            canSubmit,\n            isTouched,\n          }\n\n          this.store.state = state\n          this.state = state\n        },\n      },\n    )\n\n    this.state = this.store.state\n\n    this.update(opts || {})\n  }\n\n  update = (options?: FormOptions<TFormData, ValidatorType>) => {\n    if (!options) return\n\n    this.store.batch(() => {\n      const shouldUpdateValues =\n        options.defaultValues &&\n        options.defaultValues !== this.options.defaultValues &&\n        !this.state.isTouched\n\n      const shouldUpdateState =\n        options.defaultState !== this.options.defaultState &&\n        !this.state.isTouched\n\n      this.store.setState(() =>\n        getDefaultFormState(\n          Object.assign(\n            {},\n            this.state as any,\n            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n            shouldUpdateState ? options.defaultState : {},\n            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n            shouldUpdateValues\n              ? {\n                  values: options.defaultValues,\n                }\n              : {},\n          ),\n        ),\n      )\n    })\n\n    this.options = options\n  }\n\n  reset = () =>\n    this.store.setState(() =>\n      getDefaultFormState({\n        ...(this.options.defaultState as any),\n        values: this.options.defaultValues ?? this.options.defaultState?.values,\n      }),\n    )\n\n  validateAllFields = async (cause: ValidationCause) => {\n    const fieldValidationPromises: Promise<ValidationError[]>[] = [] as any\n    this.store.batch(() => {\n      void (\n        Object.values(this.fieldInfo) as FieldInfo<any, ValidatorType>[]\n      ).forEach((field) => {\n        Object.values(field.instances).forEach((instance) => {\n          // If any fields are not touched\n          if (!instance.state.meta.isTouched) {\n            // Mark them as touched\n            instance.setMeta((prev) => ({ ...prev, isTouched: true }))\n            // Validate the field\n            fieldValidationPromises.push(\n              Promise.resolve().then(() => instance.validate(cause)),\n            )\n          }\n        })\n      })\n    })\n\n    return Promise.all(fieldValidationPromises)\n  }\n\n  handleSubmit = async () => {\n    // Check to see that the form and all fields have been touched\n    // If they have not, touch them all and run validation\n    // Run form validation\n    // Submit the form\n\n    this.store.setState((old) => ({\n      ...old,\n      // Submission attempts mark the form as not submitted\n      isSubmitted: false,\n      // Count submission attempts\n      submissionAttempts: old.submissionAttempts + 1,\n    }))\n\n    // Don't let invalid forms submit\n    if (!this.state.canSubmit) return\n\n    this.store.setState((d) => ({ ...d, isSubmitting: true }))\n\n    const done = () => {\n      this.store.setState((prev) => ({ ...prev, isSubmitting: false }))\n    }\n\n    // Validate all fields\n    await this.validateAllFields('submit')\n\n    // Fields are invalid, do not submit\n    if (!this.state.isFieldsValid) {\n      done()\n      this.options.onSubmitInvalid?.(this.state.values, this)\n      return\n    }\n\n    // Run validation for the form\n    // await this.validateForm()\n\n    if (!this.state.isValid) {\n      done()\n      this.options.onSubmitInvalid?.(this.state.values, this)\n      return\n    }\n\n    try {\n      // Run the submit code\n      await this.options.onSubmit?.(this.state.values, this)\n\n      this.store.batch(() => {\n        this.store.setState((prev) => ({ ...prev, isSubmitted: true }))\n        done()\n      })\n    } catch (err) {\n      done()\n      throw err\n    }\n  }\n\n  getFieldValue = <TField extends DeepKeys<TFormData>>(\n    field: TField,\n  ): DeepValue<TFormData, TField> => getBy(this.state.values, field)\n\n  getFieldMeta = <TField extends DeepKeys<TFormData>>(\n    field: TField,\n  ): FieldMeta | undefined => {\n    return this.state.fieldMeta[field]\n  }\n\n  getFieldInfo = <TField extends DeepKeys<TFormData>>(\n    field: TField,\n  ): FieldInfo<TFormData, ValidatorType> => {\n    // eslint-disable-next-line  @typescript-eslint/no-unnecessary-condition\n    return (this.fieldInfo[field] ||= {\n      instances: {},\n    })\n  }\n\n  setFieldMeta = <TField extends DeepKeys<TFormData>>(\n    field: TField,\n    updater: Updater<FieldMeta>,\n  ) => {\n    this.store.setState((prev) => {\n      return {\n        ...prev,\n        fieldMeta: {\n          ...prev.fieldMeta,\n          [field]: functionalUpdate(updater, prev.fieldMeta[field]),\n        },\n      }\n    })\n  }\n\n  setFieldValue = <TField extends DeepKeys<TFormData>>(\n    field: TField,\n    updater: Updater<DeepValue<TFormData, TField>>,\n    opts?: { touch?: boolean },\n  ) => {\n    const touch = opts?.touch\n\n    this.store.batch(() => {\n      if (touch) {\n        this.setFieldMeta(field, (prev) => ({\n          ...prev,\n          isTouched: true,\n        }))\n      }\n\n      this.store.setState((prev) => {\n        return {\n          ...prev,\n          values: setBy(prev.values, field, updater),\n        }\n      })\n    })\n  }\n\n  pushFieldValue = <TField extends DeepKeys<TFormData>>(\n    field: TField,\n    value: DeepValue<TFormData, TField> extends any[]\n      ? DeepValue<TFormData, TField>[number]\n      : never,\n    opts?: { touch?: boolean },\n  ) => {\n    return this.setFieldValue(\n      field,\n      (prev) => [...(Array.isArray(prev) ? prev : []), value] as any,\n      opts,\n    )\n  }\n\n  insertFieldValue = <TField extends DeepKeys<TFormData>>(\n    field: TField,\n    index: number,\n    value: DeepValue<TFormData, TField> extends any[]\n      ? DeepValue<TFormData, TField>[number]\n      : never,\n    opts?: { touch?: boolean },\n  ) => {\n    this.setFieldValue(\n      field,\n      (prev) => {\n        return (prev as DeepValue<TFormData, TField>[]).map((d, i) =>\n          i === index ? value : d,\n        ) as any\n      },\n      opts,\n    )\n  }\n\n  removeFieldValue = <TField extends DeepKeys<TFormData>>(\n    field: TField,\n    index: number,\n    opts?: { touch?: boolean },\n  ) => {\n    this.setFieldValue(\n      field,\n      (prev) => {\n        return (prev as DeepValue<TFormData, TField>[]).filter(\n          (_d, i) => i !== index,\n        ) as any\n      },\n      opts,\n    )\n  }\n\n  swapFieldValues = <TField extends DeepKeys<TFormData>>(\n    field: TField,\n    index1: number,\n    index2: number,\n  ) => {\n    this.setFieldValue(field, (prev: any) => {\n      const prev1 = prev[index1]!\n      const prev2 = prev[index2]!\n      return setBy(setBy(prev, `${index1}`, prev2), `${index2}`, prev1)\n    })\n  }\n}\n"],"mappings":"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","names":[]}

package/build/legacy/index.cjs

@@ -20,10 +20,12 @@ module.exports = __toCommonJS(src_exports);
 __reExport(src_exports, require("./FormApi.cjs"), module.exports);
 __reExport(src_exports, require("./FieldApi.cjs"), module.exports);
 __reExport(src_exports, require("./utils.cjs"), module.exports);
+__reExport(src_exports, require("./types.cjs"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./FormApi.cjs"),
   ...require("./FieldApi.cjs"),
-  ...require("./utils.cjs")
+  ...require("./utils.cjs"),
+  ...require("./types.cjs")
 });
 //# sourceMappingURL=index.cjs.map

package/build/legacy/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts"],"sourcesContent":["export * from './FormApi'\nexport * from './FieldApi'\nexport * from './utils'\n"],"mappings":";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA,wBAAc,0BAAd;AACA,wBAAc,2BADd;AAEA,wBAAc,wBAFd;","names":[]}
+{"version":3,"sources":["../../src/index.ts"],"sourcesContent":["export * from './FormApi'\nexport * from './FieldApi'\nexport * from './utils'\nexport * from './types'\n"],"mappings":";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA,wBAAc,0BAAd;AACA,wBAAc,2BADd;AAEA,wBAAc,wBAFd;AAGA,wBAAc,wBAHd;","names":[]}

package/build/legacy/index.d.cts

@@ -1,25 +1,30 @@
 import { Store } from '@tanstack/store';
 import { DeepKeys, DeepValue, Updater } from './utils.cjs';
 export { Narrow, Pretty, RequiredByKey, UpdaterFn, functionalUpdate, getBy, isNonEmptyArray, setBy } from './utils.cjs';
+import { ValidationError, Validator } from './types.cjs';
 
-type FormOptions<TData> = {
+type ValidateFn$1<TData, ValidatorType> = (values: TData, formApi: FormApi<TData, ValidatorType>) => ValidationError;
+type ValidateOrFn$1<TData, ValidatorType> = ValidatorType extends Validator<TData> ? Parameters<ReturnType<ValidatorType>['validate']>[1] : ValidateFn$1<TData, ValidatorType>;
+type ValidateAsyncFn$1<TData, ValidatorType> = (value: TData, fieldApi: FormApi<TData, ValidatorType>) => ValidationError | Promise<ValidationError>;
+type FormOptions<TData, ValidatorType> = {
     defaultValues?: TData;
     defaultState?: Partial<FormState<TData>>;
     asyncDebounceMs?: number;
-    onMount?: (values: TData, formApi: FormApi<TData>) => ValidationError;
-    onMountAsync?: (values: TData, formApi: FormApi<TData>) => ValidationError | Promise<ValidationError>;
+    validator?: ValidatorType;
+    onMount?: ValidateOrFn$1<TData, ValidatorType>;
+    onMountAsync?: ValidateAsyncFn$1<TData, ValidatorType>;
     onMountAsyncDebounceMs?: number;
-    onChange?: (values: TData, formApi: FormApi<TData>) => ValidationError;
-    onChangeAsync?: (values: TData, formApi: FormApi<TData>) => ValidationError | Promise<ValidationError>;
+    onChange?: ValidateOrFn$1<TData, ValidatorType>;
+    onChangeAsync?: ValidateAsyncFn$1<TData, ValidatorType>;
     onChangeAsyncDebounceMs?: number;
-    onBlur?: (values: TData, formApi: FormApi<TData>) => ValidationError;
-    onBlurAsync?: (values: TData, formApi: FormApi<TData>) => ValidationError | Promise<ValidationError>;
+    onBlur?: ValidateOrFn$1<TData, ValidatorType>;
+    onBlurAsync?: ValidateAsyncFn$1<TData, ValidatorType>;
     onBlurAsyncDebounceMs?: number;
-    onSubmit?: (values: TData, formApi: FormApi<TData>) => any | Promise<any>;
-    onSubmitInvalid?: (values: TData, formApi: FormApi<TData>) => void;
+    onSubmit?: (values: TData, formApi: FormApi<TData, ValidatorType>) => any | Promise<any>;
+    onSubmitInvalid?: (values: TData, formApi: FormApi<TData, ValidatorType>) => void;
 };
-type FieldInfo<TFormData> = {
-    instances: Record<string, FieldApi<TFormData, any, any>>;
+type FieldInfo<TFormData, ValidatorType> = {
+    instances: Record<string, FieldApi<TFormData, any, unknown, ValidatorType>>;
 } & ValidationMeta;
 type ValidationMeta = {
     validationCount?: number;
@@ -28,7 +33,6 @@ type ValidationMeta = {
     validationResolve?: (errors: ValidationError[]) => void;
     validationReject?: (errors: unknown) => void;
 };
-type ValidationError = undefined | false | null | string;
 type ValidationErrorMapKeys = `on${Capitalize<ValidationCause>}`;
 type ValidationErrorMap = {
     [K in ValidationErrorMapKeys]?: ValidationError;
@@ -50,29 +54,29 @@ type FormState<TData> = {
     canSubmit: boolean;
     submissionAttempts: number;
 };
-declare class FormApi<TFormData> {
-    options: FormOptions<TFormData>;
+declare class FormApi<TFormData, ValidatorType> {
+    options: FormOptions<TFormData, ValidatorType>;
     store: Store<FormState<TFormData>>;
     state: FormState<TFormData>;
-    fieldInfo: Record<DeepKeys<TFormData>, FieldInfo<TFormData>>;
+    fieldInfo: Record<DeepKeys<TFormData>, FieldInfo<TFormData, ValidatorType>>;
     fieldName?: string;
     validationMeta: ValidationMeta;
-    constructor(opts?: FormOptions<TFormData>);
-    update: (options?: FormOptions<TFormData>) => void;
+    constructor(opts?: FormOptions<TFormData, ValidatorType>);
+    update: (options?: FormOptions<TFormData, ValidatorType>) => void;
     reset: () => void;
     validateAllFields: (cause: ValidationCause) => Promise<ValidationError[][]>;
     handleSubmit: () => Promise<void>;
     getFieldValue: <TField extends DeepKeys<TFormData>>(field: TField) => DeepValue<TFormData, TField>;
     getFieldMeta: <TField extends DeepKeys<TFormData>>(field: TField) => FieldMeta | undefined;
-    getFieldInfo: <TField extends DeepKeys<TFormData>>(field: TField) => FieldInfo<TFormData>;
+    getFieldInfo: <TField extends DeepKeys<TFormData>>(field: TField) => FieldInfo<TFormData, ValidatorType>;
     setFieldMeta: <TField extends DeepKeys<TFormData>>(field: TField, updater: Updater<FieldMeta>) => void;
     setFieldValue: <TField extends DeepKeys<TFormData>>(field: TField, updater: Updater<DeepValue<TFormData, TField>>, opts?: {
         touch?: boolean;
     }) => void;
-    pushFieldValue: <TField extends DeepKeys<TFormData>>(field: TField, value: DeepValue<TFormData, TField>[number], opts?: {
+    pushFieldValue: <TField extends DeepKeys<TFormData>>(field: TField, value: DeepValue<TFormData, TField> extends any[] ? DeepValue<TFormData, TField>[number] : never, opts?: {
         touch?: boolean;
     }) => void;
-    insertFieldValue: <TField extends DeepKeys<TFormData>>(field: TField, index: number, value: DeepValue<TFormData, TField>[number], opts?: {
+    insertFieldValue: <TField extends DeepKeys<TFormData>>(field: TField, index: number, value: DeepValue<TFormData, TField> extends any[] ? DeepValue<TFormData, TField>[number] : never, opts?: {
         touch?: boolean;
     }) => void;
     removeFieldValue: <TField extends DeepKeys<TFormData>>(field: TField, index: number, opts?: {
@@ -82,35 +86,29 @@ declare class FormApi<TFormData> {
 }
 
 type ValidationCause = 'change' | 'blur' | 'submit' | 'mount';
-type ValidateFn<TParentData, TName extends DeepKeys<TParentData>, TData> = (value: TData, fieldApi: FieldApi<TParentData, TName>) => ValidationError;
-type ValidateAsyncFn<TParentData, TName extends DeepKeys<TParentData>, TData> = (value: TData, fieldApi: FieldApi<TParentData, TName>) => ValidationError | Promise<ValidationError>;
-interface FieldOptions<TParentData, 
-/**
- * This allows us to restrict the name to only be a valid field name while
- * also assigning it to a generic
- */
-TName extends DeepKeys<TParentData>, 
-/**
- * If TData is unknown, we can use the TName generic to determine the type
- */
-TData = DeepValue<TParentData, TName>> {
-    name: DeepKeys<TParentData>;
+type ValidateFn<TParentData, TName extends DeepKeys<TParentData>, ValidatorType, TData extends DeepValue<TParentData, TName> = DeepValue<TParentData, TName>> = (value: TData, fieldApi: FieldApi<TParentData, TName, ValidatorType, TData>) => ValidationError;
+type ValidateOrFn<TParentData, TName extends DeepKeys<TParentData>, ValidatorType, FormValidator, TData extends DeepValue<TParentData, TName> = DeepValue<TParentData, TName>> = ValidatorType extends Validator<TData> ? Parameters<ReturnType<ValidatorType>['validate']>[1] | ValidateFn<TParentData, TName, ValidatorType, TData> : FormValidator extends Validator<TData> ? Parameters<ReturnType<FormValidator>['validate']>[1] | ValidateFn<TParentData, TName, ValidatorType, TData> : ValidateFn<TParentData, TName, ValidatorType, TData>;
+type ValidateAsyncFn<TParentData, TName extends DeepKeys<TParentData>, ValidatorType, TData extends DeepValue<TParentData, TName> = DeepValue<TParentData, TName>> = (value: TData, fieldApi: FieldApi<TParentData, TName, ValidatorType, TData>) => ValidationError | Promise<ValidationError>;
+type AsyncValidateOrFn<TParentData, TName extends DeepKeys<TParentData>, ValidatorType, FormValidator, TData extends DeepValue<TParentData, TName> = DeepValue<TParentData, TName>> = ValidatorType extends Validator<TData> ? Parameters<ReturnType<ValidatorType>['validate']>[1] | ValidateAsyncFn<TParentData, TName, ValidatorType, TData> : FormValidator extends Validator<TData> ? Parameters<ReturnType<FormValidator>['validate']>[1] | ValidateAsyncFn<TParentData, TName, ValidatorType, TData> : ValidateAsyncFn<TParentData, TName, ValidatorType, TData>;
+interface FieldOptions<TParentData, TName extends DeepKeys<TParentData>, ValidatorType, FormValidator, TData extends DeepValue<TParentData, TName> = DeepValue<TParentData, TName>> {
+    name: TName;
     index?: TData extends any[] ? number : never;
     defaultValue?: TData;
     asyncDebounceMs?: number;
     asyncAlways?: boolean;
-    onMount?: (formApi: FieldApi<TParentData, TName>) => void;
-    onChange?: ValidateFn<TParentData, TName, TData>;
-    onChangeAsync?: ValidateAsyncFn<TParentData, TName, TData>;
+    validator?: ValidatorType;
+    onMount?: (formApi: FieldApi<TParentData, TName, ValidatorType, TData>) => void;
+    onChange?: ValidateOrFn<TParentData, TName, ValidatorType, FormValidator, TData>;
+    onChangeAsync?: AsyncValidateOrFn<TParentData, TName, ValidatorType, FormValidator, TData>;
     onChangeAsyncDebounceMs?: number;
-    onBlur?: ValidateFn<TParentData, TName, TData>;
-    onBlurAsync?: ValidateAsyncFn<TParentData, TName, TData>;
+    onBlur?: ValidateOrFn<TParentData, TName, ValidatorType, FormValidator, TData>;
+    onBlurAsync?: AsyncValidateOrFn<TParentData, TName, ValidatorType, FormValidator, TData>;
     onBlurAsyncDebounceMs?: number;
-    onSubmitAsync?: ValidateAsyncFn<TParentData, TName, TData>;
+    onSubmitAsync?: AsyncValidateOrFn<TParentData, TName, ValidatorType, FormValidator, TData>;
     defaultMeta?: Partial<FieldMeta>;
 }
-interface FieldApiOptions<TParentData, TName extends DeepKeys<TParentData>, TData = DeepValue<TParentData, TName>> extends FieldOptions<TParentData, TName, TData> {
-    form: FormApi<TParentData>;
+interface FieldApiOptions<TParentData, TName extends DeepKeys<TParentData>, ValidatorType, FormValidator, TData extends DeepValue<TParentData, TName> = DeepValue<TParentData, TName>> extends FieldOptions<TParentData, TName, ValidatorType, FormValidator, TData> {
+    form: FormApi<TParentData, FormValidator>;
 }
 type FieldMeta = {
     isTouched: boolean;
@@ -124,20 +122,17 @@ type FieldState<TData> = {
     meta: FieldMeta;
 };
 type ResolveName<TParentData> = unknown extends TParentData ? string : DeepKeys<TParentData>;
-declare class FieldApi<TParentData, TName extends DeepKeys<TParentData>, TData = DeepValue<TParentData, TName>> {
-    #private;
+declare class FieldApi<TParentData, TName extends DeepKeys<TParentData>, ValidatorType, FormValidator, TData extends DeepValue<TParentData, TName> = DeepValue<TParentData, TName>> {
     uid: number;
-    form: FieldApiOptions<TParentData, TName, TData>['form'];
+    form: FieldApiOptions<TParentData, TName, ValidatorType, TData>['form'];
     name: DeepKeys<TParentData>;
-    options: FieldApiOptions<TParentData, TName>;
+    options: FieldApiOptions<TParentData, TName, ValidatorType, TData>;
     store: Store<FieldState<TData>>;
     state: FieldState<TData>;
     prevState: FieldState<TData>;
-    constructor(opts: FieldApiOptions<TParentData, TName, TData> & {
-        form: FormApi<TParentData>;
-    });
+    constructor(opts: FieldApiOptions<TParentData, TName, ValidatorType, FormValidator, TData>);
     mount: () => () => void;
-    update: (opts: FieldApiOptions<TParentData, TName, TData>) => void;
+    update: (opts: FieldApiOptions<TParentData, TName, ValidatorType, TData>) => void;
     getValue: () => TData;
     setValue: (updater: Updater<TData>, options?: {
         touch?: boolean;
@@ -146,13 +141,14 @@ declare class FieldApi<TParentData, TName extends DeepKeys<TParentData>, TData =
     _getMeta: () => FieldMeta | undefined;
     getMeta: () => FieldMeta;
     setMeta: (updater: Updater<FieldMeta>) => void;
-    getInfo: () => FieldInfo<TParentData>;
+    getInfo: () => FieldInfo<TParentData, TData>;
     pushValue: (value: TData extends any[] ? TData[number] : never) => void;
     insertValue: (index: number, value: TData extends any[] ? TData[number] : never) => void;
     removeValue: (index: number) => void;
     swapValues: (aIndex: number, bIndex: number) => void;
-    getSubField: <TSubName extends DeepKeys<TData>, TSubData = DeepValue<TData, TSubName>>(name: TSubName) => FieldApi<TData, TSubName, TSubData>;
+    getSubField: <TSubName extends DeepKeys<TData>, TSubData extends DeepValue<TData, TSubName> = DeepValue<TData, TSubName>>(name: TSubName) => FieldApi<TData, TSubName, ValidatorType, TSubData, DeepValue<TData, TSubName>>;
     validateSync: (value: TData | undefined, cause: ValidationCause) => void;
+    __leaseValidateAsync: () => number;
     cancelValidateAsync: () => void;
     validateAsync: (value: TData | undefined, cause: ValidationCause) => Promise<ValidationError[]>;
     validate: (cause: ValidationCause, value?: TData) => ValidationError[] | Promise<ValidationError[]>;
@@ -160,4 +156,4 @@ declare class FieldApi<TParentData, TName extends DeepKeys<TParentData>, TData =
     handleBlur: () => void;
 }
 
-export { DeepKeys, DeepValue, FieldApi, FieldApiOptions, FieldInfo, FieldMeta, FieldOptions, FieldState, FormApi, FormOptions, FormState, ResolveName, Updater, ValidationCause, ValidationError, ValidationErrorMap, ValidationErrorMapKeys, ValidationMeta };
+export { DeepKeys, DeepValue, FieldApi, FieldApiOptions, FieldInfo, FieldMeta, FieldOptions, FieldState, FormApi, FormOptions, FormState, ResolveName, Updater, ValidationCause, ValidationError, ValidationErrorMap, ValidationErrorMapKeys, ValidationMeta, Validator };

package/build/legacy/index.d.ts

@@ -1,25 +1,30 @@
 import { Store } from '@tanstack/store';
 import { DeepKeys, DeepValue, Updater } from './utils.js';
 export { Narrow, Pretty, RequiredByKey, UpdaterFn, functionalUpdate, getBy, isNonEmptyArray, setBy } from './utils.js';
+import { ValidationError, Validator } from './types.js';
 
-type FormOptions<TData> = {
+type ValidateFn$1<TData, ValidatorType> = (values: TData, formApi: FormApi<TData, ValidatorType>) => ValidationError;
+type ValidateOrFn$1<TData, ValidatorType> = ValidatorType extends Validator<TData> ? Parameters<ReturnType<ValidatorType>['validate']>[1] : ValidateFn$1<TData, ValidatorType>;
+type ValidateAsyncFn$1<TData, ValidatorType> = (value: TData, fieldApi: FormApi<TData, ValidatorType>) => ValidationError | Promise<ValidationError>;
+type FormOptions<TData, ValidatorType> = {
     defaultValues?: TData;
     defaultState?: Partial<FormState<TData>>;
     asyncDebounceMs?: number;
-    onMount?: (values: TData, formApi: FormApi<TData>) => ValidationError;
-    onMountAsync?: (values: TData, formApi: FormApi<TData>) => ValidationError | Promise<ValidationError>;
+    validator?: ValidatorType;
+    onMount?: ValidateOrFn$1<TData, ValidatorType>;
+    onMountAsync?: ValidateAsyncFn$1<TData, ValidatorType>;
     onMountAsyncDebounceMs?: number;
-    onChange?: (values: TData, formApi: FormApi<TData>) => ValidationError;
-    onChangeAsync?: (values: TData, formApi: FormApi<TData>) => ValidationError | Promise<ValidationError>;
+    onChange?: ValidateOrFn$1<TData, ValidatorType>;
+    onChangeAsync?: ValidateAsyncFn$1<TData, ValidatorType>;
     onChangeAsyncDebounceMs?: number;
-    onBlur?: (values: TData, formApi: FormApi<TData>) => ValidationError;
-    onBlurAsync?: (values: TData, formApi: FormApi<TData>) => ValidationError | Promise<ValidationError>;
+    onBlur?: ValidateOrFn$1<TData, ValidatorType>;
+    onBlurAsync?: ValidateAsyncFn$1<TData, ValidatorType>;
     onBlurAsyncDebounceMs?: number;
-    onSubmit?: (values: TData, formApi: FormApi<TData>) => any | Promise<any>;
-    onSubmitInvalid?: (values: TData, formApi: FormApi<TData>) => void;
+    onSubmit?: (values: TData, formApi: FormApi<TData, ValidatorType>) => any | Promise<any>;
+    onSubmitInvalid?: (values: TData, formApi: FormApi<TData, ValidatorType>) => void;
 };
-type FieldInfo<TFormData> = {
-    instances: Record<string, FieldApi<TFormData, any, any>>;
+type FieldInfo<TFormData, ValidatorType> = {
+    instances: Record<string, FieldApi<TFormData, any, unknown, ValidatorType>>;
 } & ValidationMeta;
 type ValidationMeta = {
     validationCount?: number;
@@ -28,7 +33,6 @@ type ValidationMeta = {
     validationResolve?: (errors: ValidationError[]) => void;
     validationReject?: (errors: unknown) => void;
 };
-type ValidationError = undefined | false | null | string;
 type ValidationErrorMapKeys = `on${Capitalize<ValidationCause>}`;
 type ValidationErrorMap = {
     [K in ValidationErrorMapKeys]?: ValidationError;
@@ -50,29 +54,29 @@ type FormState<TData> = {
     canSubmit: boolean;
     submissionAttempts: number;
 };
-declare class FormApi<TFormData> {
-    options: FormOptions<TFormData>;
+declare class FormApi<TFormData, ValidatorType> {
+    options: FormOptions<TFormData, ValidatorType>;
     store: Store<FormState<TFormData>>;
     state: FormState<TFormData>;
-    fieldInfo: Record<DeepKeys<TFormData>, FieldInfo<TFormData>>;
+    fieldInfo: Record<DeepKeys<TFormData>, FieldInfo<TFormData, ValidatorType>>;
     fieldName?: string;
     validationMeta: ValidationMeta;
-    constructor(opts?: FormOptions<TFormData>);
-    update: (options?: FormOptions<TFormData>) => void;
+    constructor(opts?: FormOptions<TFormData, ValidatorType>);
+    update: (options?: FormOptions<TFormData, ValidatorType>) => void;
     reset: () => void;
     validateAllFields: (cause: ValidationCause) => Promise<ValidationError[][]>;
     handleSubmit: () => Promise<void>;
     getFieldValue: <TField extends DeepKeys<TFormData>>(field: TField) => DeepValue<TFormData, TField>;
     getFieldMeta: <TField extends DeepKeys<TFormData>>(field: TField) => FieldMeta | undefined;
-    getFieldInfo: <TField extends DeepKeys<TFormData>>(field: TField) => FieldInfo<TFormData>;
+    getFieldInfo: <TField extends DeepKeys<TFormData>>(field: TField) => FieldInfo<TFormData, ValidatorType>;
     setFieldMeta: <TField extends DeepKeys<TFormData>>(field: TField, updater: Updater<FieldMeta>) => void;
     setFieldValue: <TField extends DeepKeys<TFormData>>(field: TField, updater: Updater<DeepValue<TFormData, TField>>, opts?: {
         touch?: boolean;
     }) => void;
-    pushFieldValue: <TField extends DeepKeys<TFormData>>(field: TField, value: DeepValue<TFormData, TField>[number], opts?: {
+    pushFieldValue: <TField extends DeepKeys<TFormData>>(field: TField, value: DeepValue<TFormData, TField> extends any[] ? DeepValue<TFormData, TField>[number] : never, opts?: {
         touch?: boolean;
     }) => void;
-    insertFieldValue: <TField extends DeepKeys<TFormData>>(field: TField, index: number, value: DeepValue<TFormData, TField>[number], opts?: {
+    insertFieldValue: <TField extends DeepKeys<TFormData>>(field: TField, index: number, value: DeepValue<TFormData, TField> extends any[] ? DeepValue<TFormData, TField>[number] : never, opts?: {
         touch?: boolean;
     }) => void;
     removeFieldValue: <TField extends DeepKeys<TFormData>>(field: TField, index: number, opts?: {
@@ -82,35 +86,29 @@ declare class FormApi<TFormData> {
 }
 
 type ValidationCause = 'change' | 'blur' | 'submit' | 'mount';
-type ValidateFn<TParentData, TName extends DeepKeys<TParentData>, TData> = (value: TData, fieldApi: FieldApi<TParentData, TName>) => ValidationError;
-type ValidateAsyncFn<TParentData, TName extends DeepKeys<TParentData>, TData> = (value: TData, fieldApi: FieldApi<TParentData, TName>) => ValidationError | Promise<ValidationError>;
-interface FieldOptions<TParentData, 
-/**
- * This allows us to restrict the name to only be a valid field name while
- * also assigning it to a generic
- */
-TName extends DeepKeys<TParentData>, 
-/**
- * If TData is unknown, we can use the TName generic to determine the type
- */
-TData = DeepValue<TParentData, TName>> {
-    name: DeepKeys<TParentData>;
+type ValidateFn<TParentData, TName extends DeepKeys<TParentData>, ValidatorType, TData extends DeepValue<TParentData, TName> = DeepValue<TParentData, TName>> = (value: TData, fieldApi: FieldApi<TParentData, TName, ValidatorType, TData>) => ValidationError;
+type ValidateOrFn<TParentData, TName extends DeepKeys<TParentData>, ValidatorType, FormValidator, TData extends DeepValue<TParentData, TName> = DeepValue<TParentData, TName>> = ValidatorType extends Validator<TData> ? Parameters<ReturnType<ValidatorType>['validate']>[1] | ValidateFn<TParentData, TName, ValidatorType, TData> : FormValidator extends Validator<TData> ? Parameters<ReturnType<FormValidator>['validate']>[1] | ValidateFn<TParentData, TName, ValidatorType, TData> : ValidateFn<TParentData, TName, ValidatorType, TData>;
+type ValidateAsyncFn<TParentData, TName extends DeepKeys<TParentData>, ValidatorType, TData extends DeepValue<TParentData, TName> = DeepValue<TParentData, TName>> = (value: TData, fieldApi: FieldApi<TParentData, TName, ValidatorType, TData>) => ValidationError | Promise<ValidationError>;
+type AsyncValidateOrFn<TParentData, TName extends DeepKeys<TParentData>, ValidatorType, FormValidator, TData extends DeepValue<TParentData, TName> = DeepValue<TParentData, TName>> = ValidatorType extends Validator<TData> ? Parameters<ReturnType<ValidatorType>['validate']>[1] | ValidateAsyncFn<TParentData, TName, ValidatorType, TData> : FormValidator extends Validator<TData> ? Parameters<ReturnType<FormValidator>['validate']>[1] | ValidateAsyncFn<TParentData, TName, ValidatorType, TData> : ValidateAsyncFn<TParentData, TName, ValidatorType, TData>;
+interface FieldOptions<TParentData, TName extends DeepKeys<TParentData>, ValidatorType, FormValidator, TData extends DeepValue<TParentData, TName> = DeepValue<TParentData, TName>> {
+    name: TName;
     index?: TData extends any[] ? number : never;
     defaultValue?: TData;
     asyncDebounceMs?: number;
     asyncAlways?: boolean;
-    onMount?: (formApi: FieldApi<TParentData, TName>) => void;
-    onChange?: ValidateFn<TParentData, TName, TData>;
-    onChangeAsync?: ValidateAsyncFn<TParentData, TName, TData>;
+    validator?: ValidatorType;
+    onMount?: (formApi: FieldApi<TParentData, TName, ValidatorType, TData>) => void;
+    onChange?: ValidateOrFn<TParentData, TName, ValidatorType, FormValidator, TData>;
+    onChangeAsync?: AsyncValidateOrFn<TParentData, TName, ValidatorType, FormValidator, TData>;
     onChangeAsyncDebounceMs?: number;
-    onBlur?: ValidateFn<TParentData, TName, TData>;
-    onBlurAsync?: ValidateAsyncFn<TParentData, TName, TData>;
+    onBlur?: ValidateOrFn<TParentData, TName, ValidatorType, FormValidator, TData>;
+    onBlurAsync?: AsyncValidateOrFn<TParentData, TName, ValidatorType, FormValidator, TData>;
     onBlurAsyncDebounceMs?: number;
-    onSubmitAsync?: ValidateAsyncFn<TParentData, TName, TData>;
+    onSubmitAsync?: AsyncValidateOrFn<TParentData, TName, ValidatorType, FormValidator, TData>;
     defaultMeta?: Partial<FieldMeta>;
 }
-interface FieldApiOptions<TParentData, TName extends DeepKeys<TParentData>, TData = DeepValue<TParentData, TName>> extends FieldOptions<TParentData, TName, TData> {
-    form: FormApi<TParentData>;
+interface FieldApiOptions<TParentData, TName extends DeepKeys<TParentData>, ValidatorType, FormValidator, TData extends DeepValue<TParentData, TName> = DeepValue<TParentData, TName>> extends FieldOptions<TParentData, TName, ValidatorType, FormValidator, TData> {
+    form: FormApi<TParentData, FormValidator>;
 }
 type FieldMeta = {
     isTouched: boolean;
@@ -124,20 +122,17 @@ type FieldState<TData> = {
     meta: FieldMeta;
 };
 type ResolveName<TParentData> = unknown extends TParentData ? string : DeepKeys<TParentData>;
-declare class FieldApi<TParentData, TName extends DeepKeys<TParentData>, TData = DeepValue<TParentData, TName>> {
-    #private;
+declare class FieldApi<TParentData, TName extends DeepKeys<TParentData>, ValidatorType, FormValidator, TData extends DeepValue<TParentData, TName> = DeepValue<TParentData, TName>> {
     uid: number;
-    form: FieldApiOptions<TParentData, TName, TData>['form'];
+    form: FieldApiOptions<TParentData, TName, ValidatorType, TData>['form'];
     name: DeepKeys<TParentData>;
-    options: FieldApiOptions<TParentData, TName>;
+    options: FieldApiOptions<TParentData, TName, ValidatorType, TData>;
     store: Store<FieldState<TData>>;
     state: FieldState<TData>;
     prevState: FieldState<TData>;
-    constructor(opts: FieldApiOptions<TParentData, TName, TData> & {
-        form: FormApi<TParentData>;
-    });
+    constructor(opts: FieldApiOptions<TParentData, TName, ValidatorType, FormValidator, TData>);
     mount: () => () => void;
-    update: (opts: FieldApiOptions<TParentData, TName, TData>) => void;
+    update: (opts: FieldApiOptions<TParentData, TName, ValidatorType, TData>) => void;
     getValue: () => TData;
     setValue: (updater: Updater<TData>, options?: {
         touch?: boolean;
@@ -146,13 +141,14 @@ declare class FieldApi<TParentData, TName extends DeepKeys<TParentData>, TData =
     _getMeta: () => FieldMeta | undefined;
     getMeta: () => FieldMeta;
     setMeta: (updater: Updater<FieldMeta>) => void;
-    getInfo: () => FieldInfo<TParentData>;
+    getInfo: () => FieldInfo<TParentData, TData>;
     pushValue: (value: TData extends any[] ? TData[number] : never) => void;
     insertValue: (index: number, value: TData extends any[] ? TData[number] : never) => void;
     removeValue: (index: number) => void;
     swapValues: (aIndex: number, bIndex: number) => void;
-    getSubField: <TSubName extends DeepKeys<TData>, TSubData = DeepValue<TData, TSubName>>(name: TSubName) => FieldApi<TData, TSubName, TSubData>;
+    getSubField: <TSubName extends DeepKeys<TData>, TSubData extends DeepValue<TData, TSubName> = DeepValue<TData, TSubName>>(name: TSubName) => FieldApi<TData, TSubName, ValidatorType, TSubData, DeepValue<TData, TSubName>>;
     validateSync: (value: TData | undefined, cause: ValidationCause) => void;
+    __leaseValidateAsync: () => number;
     cancelValidateAsync: () => void;
     validateAsync: (value: TData | undefined, cause: ValidationCause) => Promise<ValidationError[]>;
     validate: (cause: ValidationCause, value?: TData) => ValidationError[] | Promise<ValidationError[]>;
@@ -160,4 +156,4 @@ declare class FieldApi<TParentData, TName extends DeepKeys<TParentData>, TData =
     handleBlur: () => void;
 }
 
-export { DeepKeys, DeepValue, FieldApi, FieldApiOptions, FieldInfo, FieldMeta, FieldOptions, FieldState, FormApi, FormOptions, FormState, ResolveName, Updater, ValidationCause, ValidationError, ValidationErrorMap, ValidationErrorMapKeys, ValidationMeta };
+export { DeepKeys, DeepValue, FieldApi, FieldApiOptions, FieldInfo, FieldMeta, FieldOptions, FieldState, FormApi, FormOptions, FormState, ResolveName, Updater, ValidationCause, ValidationError, ValidationErrorMap, ValidationErrorMapKeys, ValidationMeta, Validator };

package/build/legacy/index.js

@@ -2,4 +2,5 @@
 export * from "./FormApi.js";
 export * from "./FieldApi.js";
 export * from "./utils.js";
+export * from "./types.js";
 //# sourceMappingURL=index.js.map

package/build/legacy/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts"],"sourcesContent":["export * from './FormApi'\nexport * from './FieldApi'\nexport * from './utils'\n"],"mappings":";AAAA,cAAc;AACd,cAAc;AACd,cAAc;","names":[]}
+{"version":3,"sources":["../../src/index.ts"],"sourcesContent":["export * from './FormApi'\nexport * from './FieldApi'\nexport * from './utils'\nexport * from './types'\n"],"mappings":";AAAA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;","names":[]}

package/build/legacy/types.cjs

@@ -0,0 +1,19 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/types.ts
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);
+//# sourceMappingURL=types.cjs.map

package/build/legacy/types.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/types.ts"],"sourcesContent":["export type ValidationError = undefined | false | null | string\n\n// If/when TypeScript supports higher-kinded types, this should not be `unknown` anymore\nexport type Validator<Type, Fn = unknown> = () => {\n  validate(value: Type, fn: Fn): ValidationError\n  validateAsync(value: Type, fn: Fn): Promise<ValidationError>\n}\n"],"mappings":";;;;;;;;;;;;;;;;AAAA;AAAA;","names":[]}

package/build/legacy/types.d.cts

@@ -0,0 +1,7 @@
+type ValidationError = undefined | false | null | string;
+type Validator<Type, Fn = unknown> = () => {
+    validate(value: Type, fn: Fn): ValidationError;
+    validateAsync(value: Type, fn: Fn): Promise<ValidationError>;
+};
+
+export { ValidationError, Validator };

package/build/legacy/types.d.ts

@@ -0,0 +1,7 @@
+type ValidationError = undefined | false | null | string;
+type Validator<Type, Fn = unknown> = () => {
+    validate(value: Type, fn: Fn): ValidationError;
+    validateAsync(value: Type, fn: Fn): Promise<ValidationError>;
+};
+
+export { ValidationError, Validator };

package/build/legacy/types.js

@@ -0,0 +1 @@
+//# sourceMappingURL=types.js.map

package/build/legacy/utils.js

@@ -1,5 +1,3 @@
-import "./chunk-4QZDOMDG.js";
-
 // src/utils.ts
 function functionalUpdate(updater, input) {
   return typeof updater === "function" ? updater(input) : updater;