@tanstack/form-core 0.42.1 → 0.43.0

package/dist/esm/FormApi.d.ts

@@ -1,26 +1,30 @@
 import { Derived, Store } from '@tanstack/store';
-import { StandardSchemaV1 } from './standardSchemaValidator.js';
-import { FieldApi, FieldMeta, FieldMetaBase } from './FieldApi.js';
-import { FormValidationError, FormValidationErrorMap, UpdateMetaOptions, ValidationCause, ValidationError, ValidationErrorMap, ValidationErrorMapKeys, ValidationSource, Validator } from './types.js';
+import { StandardSchemaV1, StandardSchemaV1Issue, TStandardSchemaValidatorValue } from './standardSchemaValidator.js';
+import { AnyFieldMeta, AnyFieldMetaBase, FieldApi } from './FieldApi.js';
+import { FormValidationError, FormValidationErrorMap, UpdateMetaOptions, ValidationCause, ValidationError, ValidationErrorMap, ValidationErrorMapKeys } from './types.js';
 import { DeepKeys, DeepValue } from './util-types.js';
 import { Updater } from './utils.js';
-export type FieldsErrorMapFromValidator<TFormData> = Partial<Record<DeepKeys<TFormData>, ValidationErrorMap>>;
-export type FormValidateFn<TFormData, TFormValidator extends Validator<TFormData, unknown> | undefined = undefined> = (props: {
+/**
+ * @private
+ */
+type FormErrorMapFromValidator<TFormData, TOnMount extends undefined | FormValidateOrFn<TFormData>, TOnChange extends undefined | FormValidateOrFn<TFormData>, TOnChangeAsync extends undefined | FormAsyncValidateOrFn<TFormData>, TOnBlur extends undefined | FormValidateOrFn<TFormData>, TOnBlurAsync extends undefined | FormAsyncValidateOrFn<TFormData>, TOnSubmit extends undefined | FormValidateOrFn<TFormData>, TOnSubmitAsync extends undefined | FormAsyncValidateOrFn<TFormData>> = Partial<Record<DeepKeys<TFormData>, ValidationErrorMap<TOnMount, TOnChange, TOnChangeAsync, TOnBlur, TOnBlurAsync, TOnSubmit, TOnSubmitAsync>>>;
+export type FormValidateFn<TFormData> = (props: {
     value: TFormData;
-    formApi: FormApi<TFormData, TFormValidator>;
-}) => FormValidationError<TFormData>;
+    formApi: FormApi<TFormData, any, any, any, any, any, any, any, any>;
+}) => unknown;
 /**
  * @private
  */
-export type FormValidateOrFn<TFormData, TFormValidator extends Validator<TFormData, unknown> | undefined = undefined> = TFormValidator extends Validator<TFormData, infer TFN> ? TFN | FormValidateFn<TFormData, TFormValidator> : FormValidateFn<TFormData, TFormValidator> | StandardSchemaV1<TFormData, unknown>;
+export type FormValidateOrFn<TFormData> = FormValidateFn<TFormData> | StandardSchemaV1<TFormData, unknown>;
+export type UnwrapFormValidateOrFn<TValidateOrFn extends undefined | FormValidateOrFn<any>> = [TValidateOrFn] extends [FormValidateFn<any>] ? ReturnType<TValidateOrFn> : [TValidateOrFn] extends [StandardSchemaV1<any, any>] ? Record<string, StandardSchemaV1Issue[]> : undefined;
 /**
  * @private
  */
-export type FormValidateAsyncFn<TFormData, TFormValidator extends Validator<TFormData, unknown> | undefined = undefined> = (props: {
+export type FormValidateAsyncFn<TFormData> = (props: {
     value: TFormData;
-    formApi: FormApi<TFormData, TFormValidator>;
+    formApi: FormApi<TFormData, any, any, any, any, any, any, any, any>;
     signal: AbortSignal;
-}) => FormValidationError<TFormData> | Promise<FormValidationError<TFormData>>;
+}) => unknown | Promise<unknown>;
 export type FormValidator<TFormData, TType, TFn = unknown> = {
     validate(options: {
         value: TType;
@@ -32,20 +36,21 @@ export type FormValidator<TFormData, TType, TFn = unknown> = {
 /**
  * @private
  */
-export type FormAsyncValidateOrFn<TFormData, TFormValidator extends Validator<TFormData, unknown> | undefined = undefined> = TFormValidator extends Validator<TFormData, infer FFN> ? FFN | FormValidateAsyncFn<TFormData, TFormValidator> : FormValidateAsyncFn<TFormData, TFormValidator> | StandardSchemaV1<TFormData, unknown>;
-export interface FormValidators<TFormData, TFormValidator extends Validator<TFormData, unknown> | undefined = undefined> {
+export type FormAsyncValidateOrFn<TFormData> = FormValidateAsyncFn<TFormData> | StandardSchemaV1<TFormData, unknown>;
+export type UnwrapFormAsyncValidateOrFn<TValidateOrFn extends undefined | FormAsyncValidateOrFn<any>> = [TValidateOrFn] extends [FormValidateAsyncFn<any>] ? Awaited<ReturnType<TValidateOrFn>> : [TValidateOrFn] extends [StandardSchemaV1<any, any>] ? Record<string, StandardSchemaV1Issue[]> : undefined;
+export interface FormValidators<TFormData, TOnMount extends undefined | FormValidateOrFn<TFormData>, TOnChange extends undefined | FormValidateOrFn<TFormData>, TOnChangeAsync extends undefined | FormAsyncValidateOrFn<TFormData>, TOnBlur extends undefined | FormValidateOrFn<TFormData>, TOnBlurAsync extends undefined | FormAsyncValidateOrFn<TFormData>, TOnSubmit extends undefined | FormValidateOrFn<TFormData>, TOnSubmitAsync extends undefined | FormAsyncValidateOrFn<TFormData>> {
     /**
      * Optional function that fires as soon as the component mounts.
      */
-    onMount?: FormValidateOrFn<TFormData, TFormValidator>;
+    onMount?: TOnMount;
     /**
      * Optional function that checks the validity of your data whenever a value changes
      */
-    onChange?: FormValidateOrFn<TFormData, TFormValidator>;
+    onChange?: TOnChange;
     /**
      * Optional onChange asynchronous counterpart to onChange. Useful for more complex validation logic that might involve server requests.
      */
-    onChangeAsync?: FormAsyncValidateOrFn<TFormData, TFormValidator>;
+    onChangeAsync?: TOnChangeAsync;
     /**
      * The default time in milliseconds that if set to a number larger than 0, will debounce the async validation event by this length of time in milliseconds.
      */
@@ -53,29 +58,29 @@ export interface FormValidators<TFormData, TFormValidator extends Validator<TFor
     /**
      * Optional function that validates the form data when a field loses focus, returns a `FormValidationError`
      */
-    onBlur?: FormValidateOrFn<TFormData, TFormValidator>;
+    onBlur?: TOnBlur;
     /**
      * Optional onBlur asynchronous validation method for when a field loses focus returns a ` FormValidationError` or a promise of `Promise<FormValidationError>`
      */
-    onBlurAsync?: FormAsyncValidateOrFn<TFormData, TFormValidator>;
+    onBlurAsync?: TOnBlurAsync;
     /**
      * The default time in milliseconds that if set to a number larger than 0, will debounce the async validation event by this length of time in milliseconds.
      */
     onBlurAsyncDebounceMs?: number;
-    onSubmit?: FormValidateOrFn<TFormData, TFormValidator>;
-    onSubmitAsync?: FormAsyncValidateOrFn<TFormData, TFormValidator>;
+    onSubmit?: TOnSubmit;
+    onSubmitAsync?: TOnSubmitAsync;
 }
 /**
  * @private
  */
-export interface FormTransform<TFormData, TFormValidator extends Validator<TFormData, unknown> | undefined = undefined> {
-    fn: (formBase: FormApi<TFormData, TFormValidator>) => FormApi<TFormData, TFormValidator>;
+export interface FormTransform<TFormData, TOnMount extends undefined | FormValidateOrFn<TFormData>, TOnChange extends undefined | FormValidateOrFn<TFormData>, TOnChangeAsync extends undefined | FormAsyncValidateOrFn<TFormData>, TOnBlur extends undefined | FormValidateOrFn<TFormData>, TOnBlurAsync extends undefined | FormAsyncValidateOrFn<TFormData>, TOnSubmit extends undefined | FormValidateOrFn<TFormData>, TOnSubmitAsync extends undefined | FormAsyncValidateOrFn<TFormData>, TOnServer extends undefined | FormAsyncValidateOrFn<TFormData>> {
+    fn: (formBase: FormApi<TFormData, TOnMount, TOnChange, TOnChangeAsync, TOnBlur, TOnBlurAsync, TOnSubmit, TOnSubmitAsync, TOnServer>) => FormApi<TFormData, TOnMount, TOnChange, TOnChangeAsync, TOnBlur, TOnBlurAsync, TOnSubmit, TOnSubmitAsync, TOnServer>;
     deps: unknown[];
 }
 /**
  * An object representing the options for a form.
  */
-export interface FormOptions<TFormData, TFormValidator extends Validator<TFormData, unknown> | undefined = undefined> {
+export interface FormOptions<TFormData, TOnMount extends undefined | FormValidateOrFn<TFormData>, TOnChange extends undefined | FormValidateOrFn<TFormData>, TOnChangeAsync extends undefined | FormAsyncValidateOrFn<TFormData>, TOnBlur extends undefined | FormValidateOrFn<TFormData>, TOnBlurAsync extends undefined | FormAsyncValidateOrFn<TFormData>, TOnSubmit extends undefined | FormValidateOrFn<TFormData>, TOnSubmitAsync extends undefined | FormAsyncValidateOrFn<TFormData>, TOnServer extends undefined | FormAsyncValidateOrFn<TFormData>> {
     /**
      * Set initial values for your form.
      */
@@ -83,7 +88,7 @@ export interface FormOptions<TFormData, TFormValidator extends Validator<TFormDa
     /**
      * The default state for the form.
      */
-    defaultState?: Partial<FormState<TFormData>>;
+    defaultState?: Partial<FormState<TFormData, TOnMount, TOnChange, TOnChangeAsync, TOnBlur, TOnBlurAsync, TOnSubmit, TOnSubmitAsync, TOnServer>>;
     /**
      * If true, always run async validation, even when sync validation has produced an error. Defaults to undefined.
      */
@@ -92,29 +97,25 @@ export interface FormOptions<TFormData, TFormValidator extends Validator<TFormDa
      * Optional time in milliseconds if you want to introduce a delay before firing off an async action.
      */
     asyncDebounceMs?: number;
-    /**
-     * A validator adapter to support usage of extra validation types (IE: Zod, Yup, or Valibot usage)
-     */
-    validatorAdapter?: TFormValidator;
     /**
      * A list of validators to pass to the form
      */
-    validators?: FormValidators<TFormData, TFormValidator>;
+    validators?: FormValidators<TFormData, TOnMount, TOnChange, TOnChangeAsync, TOnBlur, TOnBlurAsync, TOnSubmit, TOnSubmitAsync>;
     /**
      * A function to be called when the form is submitted, what should happen once the user submits a valid form returns `any` or a promise `Promise<any>`
      */
     onSubmit?: (props: {
         value: TFormData;
-        formApi: FormApi<TFormData, TFormValidator>;
+        formApi: FormApi<TFormData, TOnMount, TOnChange, TOnChangeAsync, TOnBlur, TOnBlurAsync, TOnSubmit, TOnSubmitAsync, TOnServer>;
     }) => any | Promise<any>;
     /**
      * Specify an action for scenarios where the user tries to submit an invalid form.
      */
     onSubmitInvalid?: (props: {
         value: TFormData;
-        formApi: FormApi<TFormData, TFormValidator>;
+        formApi: FormApi<TFormData, TOnMount, TOnChange, TOnChangeAsync, TOnBlur, TOnBlurAsync, TOnSubmit, TOnSubmitAsync, TOnServer>;
     }) => void;
-    transform?: FormTransform<TFormData, TFormValidator>;
+    transform?: FormTransform<TFormData, TOnMount, TOnChange, TOnChangeAsync, TOnBlur, TOnBlurAsync, TOnSubmit, TOnSubmitAsync, TOnServer>;
 }
 /**
  * An object representing the validation metadata for a field. Not intended for public usage.
@@ -128,11 +129,11 @@ export type ValidationMeta = {
 /**
  * An object representing the field information for a specific field within the form.
  */
-export type FieldInfo<TFormData, TFormValidator extends Validator<TFormData, unknown> | undefined = undefined> = {
+export type FieldInfo<TFormData> = {
     /**
      * An instance of the FieldAPI.
      */
-    instance: FieldApi<TFormData, any, Validator<unknown, unknown> | undefined, TFormValidator> | null;
+    instance: FieldApi<TFormData, any, any, any, any, any, any, any, any, any, any, any, any, any, any, any, any, any> | null;
     /**
      * A record of field validation internal handling.
      */
@@ -141,7 +142,7 @@ export type FieldInfo<TFormData, TFormValidator extends Validator<TFormData, unk
 /**
  * An object representing the current state of the form.
  */
-export type BaseFormState<TFormData> = {
+export type BaseFormState<TFormData, TOnMount extends undefined | FormValidateOrFn<TFormData>, TOnChange extends undefined | FormValidateOrFn<TFormData>, TOnChangeAsync extends undefined | FormAsyncValidateOrFn<TFormData>, TOnBlur extends undefined | FormValidateOrFn<TFormData>, TOnBlurAsync extends undefined | FormAsyncValidateOrFn<TFormData>, TOnSubmit extends undefined | FormValidateOrFn<TFormData>, TOnSubmitAsync extends undefined | FormAsyncValidateOrFn<TFormData>, TOnServer extends undefined | FormAsyncValidateOrFn<TFormData>> = {
     /**
      * The current values of the form fields.
      */
@@ -149,7 +150,7 @@ export type BaseFormState<TFormData> = {
     /**
      * The error map for the form itself.
      */
-    errorMap: FormValidationErrorMap;
+    errorMap: FormValidationErrorMap<UnwrapFormValidateOrFn<TOnMount>, UnwrapFormValidateOrFn<TOnChange>, UnwrapFormAsyncValidateOrFn<TOnChangeAsync>, UnwrapFormValidateOrFn<TOnBlur>, UnwrapFormAsyncValidateOrFn<TOnBlurAsync>, UnwrapFormValidateOrFn<TOnSubmit>, UnwrapFormAsyncValidateOrFn<TOnSubmitAsync>, UnwrapFormAsyncValidateOrFn<TOnServer>>;
     /**
      * An internal mechanism used for keeping track of validation logic in a form.
      */
@@ -157,7 +158,7 @@ export type BaseFormState<TFormData> = {
     /**
      * A record of field metadata for each field in the form, not including the derived properties, like `errors` and such
      */
-    fieldMetaBase: Record<DeepKeys<TFormData>, FieldMetaBase>;
+    fieldMetaBase: Record<DeepKeys<TFormData>, AnyFieldMetaBase>;
     /**
      * A boolean indicating if the form is currently in the process of being submitted after `handleSubmit` is called.
      *
@@ -184,7 +185,7 @@ export type BaseFormState<TFormData> = {
      */
     submissionAttempts: number;
 };
-export type DerivedFormState<TFormData> = {
+export type DerivedFormState<TFormData, TOnMount extends undefined | FormValidateOrFn<TFormData>, TOnChange extends undefined | FormValidateOrFn<TFormData>, TOnChangeAsync extends undefined | FormAsyncValidateOrFn<TFormData>, TOnBlur extends undefined | FormValidateOrFn<TFormData>, TOnBlurAsync extends undefined | FormAsyncValidateOrFn<TFormData>, TOnSubmit extends undefined | FormValidateOrFn<TFormData>, TOnSubmitAsync extends undefined | FormAsyncValidateOrFn<TFormData>, TOnServer extends undefined | FormAsyncValidateOrFn<TFormData>> = {
     /**
      * A boolean indicating if the form is currently validating.
      */
@@ -196,7 +197,7 @@ export type DerivedFormState<TFormData> = {
     /**
      * The error array for the form itself.
      */
-    errors: ValidationError[];
+    errors: Array<UnwrapFormValidateOrFn<TOnMount> | UnwrapFormValidateOrFn<TOnChange> | UnwrapFormAsyncValidateOrFn<TOnChangeAsync> | UnwrapFormValidateOrFn<TOnBlur> | UnwrapFormAsyncValidateOrFn<TOnBlurAsync> | UnwrapFormValidateOrFn<TOnSubmit> | UnwrapFormAsyncValidateOrFn<TOnSubmitAsync> | UnwrapFormAsyncValidateOrFn<TOnServer>>;
     /**
      * A boolean indicating if any of the form fields are currently validating.
      */
@@ -232,9 +233,16 @@ export type DerivedFormState<TFormData> = {
     /**
      * A record of field metadata for each field in the form.
      */
-    fieldMeta: Record<DeepKeys<TFormData>, FieldMeta>;
+    fieldMeta: Record<DeepKeys<TFormData>, AnyFieldMeta>;
 };
-export type FormState<TFormData> = BaseFormState<TFormData> & DerivedFormState<TFormData>;
+export type FormState<TFormData, TOnMount extends undefined | FormValidateOrFn<TFormData>, TOnChange extends undefined | FormValidateOrFn<TFormData>, TOnChangeAsync extends undefined | FormAsyncValidateOrFn<TFormData>, TOnBlur extends undefined | FormValidateOrFn<TFormData>, TOnBlurAsync extends undefined | FormAsyncValidateOrFn<TFormData>, TOnSubmit extends undefined | FormValidateOrFn<TFormData>, TOnSubmitAsync extends undefined | FormAsyncValidateOrFn<TFormData>, TOnServer extends undefined | FormAsyncValidateOrFn<TFormData>> = BaseFormState<TFormData, TOnMount, TOnChange, TOnChangeAsync, TOnBlur, TOnBlurAsync, TOnSubmit, TOnSubmitAsync, TOnServer> & DerivedFormState<TFormData, TOnMount, TOnChange, TOnChangeAsync, TOnBlur, TOnBlurAsync, TOnSubmit, TOnSubmitAsync, TOnServer>;
+export type AnyFormState = FormState<any, any, any, any, any, any, any, any, any>;
+/**
+ * @public
+ *
+ * A type representing the Form API with all generics set to `any` for convenience.
+ */
+export type AnyFormApi = FormApi<any, any, any, any, any, any, any, any, any>;
 /**
  * A class representing the Form API. It handles the logic and interactions with the form state.
  *
@@ -242,19 +250,19 @@ export type FormState<TFormData> = BaseFormState<TFormData> & DerivedFormState<T
  * hook/function like `useForm` or `createForm` to create a new instance for you that uses your framework's reactivity model.
  * However, if you need to create a new instance manually, you can do so by calling the `new FormApi` constructor.
  */
-export declare class FormApi<TFormData, TFormValidator extends Validator<TFormData, unknown> | undefined = undefined> {
+export declare class FormApi<TFormData, TOnMount extends undefined | FormValidateOrFn<TFormData>, TOnChange extends undefined | FormValidateOrFn<TFormData>, TOnChangeAsync extends undefined | FormAsyncValidateOrFn<TFormData>, TOnBlur extends undefined | FormValidateOrFn<TFormData>, TOnBlurAsync extends undefined | FormAsyncValidateOrFn<TFormData>, TOnSubmit extends undefined | FormValidateOrFn<TFormData>, TOnSubmitAsync extends undefined | FormAsyncValidateOrFn<TFormData>, TOnServer extends undefined | FormAsyncValidateOrFn<TFormData>> {
     /**
      * The options for the form.
      */
-    options: FormOptions<TFormData, TFormValidator>;
-    baseStore: Store<BaseFormState<TFormData>>;
-    fieldMetaDerived: Derived<Record<DeepKeys<TFormData>, FieldMeta>>;
-    store: Derived<FormState<TFormData>>;
+    options: FormOptions<TFormData, TOnMount, TOnChange, TOnChangeAsync, TOnBlur, TOnBlurAsync, TOnSubmit, TOnSubmitAsync, TOnServer>;
+    baseStore: Store<BaseFormState<TFormData, TOnMount, TOnChange, TOnChangeAsync, TOnBlur, TOnBlurAsync, TOnSubmit, TOnSubmitAsync, TOnServer>>;
+    fieldMetaDerived: Derived<Record<DeepKeys<TFormData>, AnyFieldMeta>>;
+    store: Derived<FormState<TFormData, TOnMount, TOnChange, TOnChangeAsync, TOnBlur, TOnBlurAsync, TOnSubmit, TOnSubmitAsync, TOnServer>>;
     /**
      * A record of field information for each field in the form.
      */
-    fieldInfo: Record<DeepKeys<TFormData>, FieldInfo<TFormData, TFormValidator>>;
-    get state(): FormState<TFormData>;
+    fieldInfo: Record<DeepKeys<TFormData>, FieldInfo<TFormData>>;
+    get state(): FormState<TFormData, TOnMount, TOnChange, TOnChangeAsync, TOnBlur, TOnBlurAsync, TOnSubmit, TOnSubmitAsync, TOnServer>;
     /**
      * @private
      */
@@ -262,24 +270,22 @@ export declare class FormApi<TFormData, TFormValidator extends Validator<TFormDa
     /**
      * Constructs a new `FormApi` instance with the given form options.
      */
-    constructor(opts?: FormOptions<TFormData, TFormValidator>);
+    constructor(opts?: FormOptions<TFormData, TOnMount, TOnChange, TOnChangeAsync, TOnBlur, TOnBlurAsync, TOnSubmit, TOnSubmitAsync, TOnServer>);
     /**
      * @private
      */
-    runValidator<TValue extends {
-        value: TFormData;
-        formApi: FormApi<any, any>;
-        validationSource: ValidationSource;
+    runValidator<TValue extends TStandardSchemaValidatorValue<TFormData> & {
+        formApi: AnyFormApi;
     }, TType extends 'validate' | 'validateAsync'>(props: {
-        validate: TType extends 'validate' ? FormValidateOrFn<TFormData, TFormValidator> : FormAsyncValidateOrFn<TFormData, TFormValidator>;
+        validate: TType extends 'validate' ? FormValidateOrFn<TFormData> : FormAsyncValidateOrFn<TFormData>;
         value: TValue;
         type: TType;
-    }): ReturnType<ReturnType<Validator<any>>[TType]>;
+    }): unknown;
     mount: () => () => void;
     /**
      * Updates the form options and form state.
      */
-    update: (options?: FormOptions<TFormData, TFormValidator>) => void;
+    update: (options?: FormOptions<TFormData, TOnMount, TOnChange, TOnChangeAsync, TOnBlur, TOnBlurAsync, TOnSubmit, TOnSubmitAsync, TOnServer>) => void;
     /**
      * Resets the form state to the default values.
      * If values are provided, the form will be reset to those values instead and the default values will be updated.
@@ -293,31 +299,31 @@ export declare class FormApi<TFormData, TFormValidator extends Validator<TFormDa
     /**
      * Validates all fields using the correct handlers for a given validation cause.
      */
-    validateAllFields: (cause: ValidationCause) => Promise<ValidationError[]>;
+    validateAllFields: (cause: ValidationCause) => Promise<unknown[]>;
     /**
      * Validates the children of a specified array in the form starting from a given index until the end using the correct handlers for a given validation type.
      */
-    validateArrayFieldsStartingFrom: <TField extends DeepKeys<TFormData>>(field: TField, index: number, cause: ValidationCause) => Promise<ValidationError[]>;
+    validateArrayFieldsStartingFrom: <TField extends DeepKeys<TFormData>>(field: TField, index: number, cause: ValidationCause) => Promise<unknown[]>;
     /**
      * Validates a specified field in the form using the correct handlers for a given validation type.
      */
-    validateField: <TField extends DeepKeys<TFormData>>(field: TField, cause: ValidationCause) => ValidationError[] | Promise<ValidationError[]>;
+    validateField: <TField extends DeepKeys<TFormData>>(field: TField, cause: ValidationCause) => unknown[] | Promise<unknown[]>;
     /**
      * TODO: This code is copied from FieldApi, we should refactor to share
      * @private
      */
     validateSync: (cause: ValidationCause) => {
         hasErrored: boolean;
-        fieldsErrorMap: FieldsErrorMapFromValidator<TFormData>;
+        fieldsErrorMap: FormErrorMapFromValidator<TFormData, TOnMount, TOnChange, TOnChangeAsync, TOnBlur, TOnBlurAsync, TOnSubmit, TOnSubmitAsync>;
     };
     /**
      * @private
      */
-    validateAsync: (cause: ValidationCause) => Promise<FieldsErrorMapFromValidator<TFormData>>;
+    validateAsync: (cause: ValidationCause) => Promise<FormErrorMapFromValidator<TFormData, TOnMount, TOnChange, TOnChangeAsync, TOnBlur, TOnBlurAsync, TOnSubmit, TOnSubmitAsync>>;
     /**
      * @private
      */
-    validate: (cause: ValidationCause) => FieldsErrorMapFromValidator<TFormData> | Promise<FieldsErrorMapFromValidator<TFormData>>;
+    validate: (cause: ValidationCause) => FormErrorMapFromValidator<TFormData, TOnMount, TOnChange, TOnChangeAsync, TOnBlur, TOnBlurAsync, TOnSubmit, TOnSubmitAsync> | Promise<FormErrorMapFromValidator<TFormData, TOnMount, TOnChange, TOnChangeAsync, TOnBlur, TOnBlurAsync, TOnSubmit, TOnSubmitAsync>>;
     /**
      * Handles the form submission, performs validation, and calls the appropriate onSubmit or onInvalidSubmit callbacks.
      */
@@ -329,16 +335,16 @@ export declare class FormApi<TFormData, TFormValidator extends Validator<TFormDa
     /**
      * Gets the metadata of the specified field.
      */
-    getFieldMeta: <TField extends DeepKeys<TFormData>>(field: TField) => FieldMeta | undefined;
+    getFieldMeta: <TField extends DeepKeys<TFormData>>(field: TField) => AnyFieldMeta | undefined;
     /**
      * Gets the field info of the specified field.
      */
-    getFieldInfo: <TField extends DeepKeys<TFormData>>(field: TField) => FieldInfo<TFormData, TFormValidator>;
+    getFieldInfo: <TField extends DeepKeys<TFormData>>(field: TField) => FieldInfo<TFormData>;
     /**
      * Updates the metadata of the specified field.
      */
-    setFieldMeta: <TField extends DeepKeys<TFormData>>(field: TField, updater: Updater<FieldMeta>) => void;
-    resetFieldMeta: <TField extends DeepKeys<TFormData>>(fieldMeta: Record<TField, FieldMeta>) => Record<TField, FieldMeta>;
+    setFieldMeta: <TField extends DeepKeys<TFormData>>(field: TField, updater: Updater<AnyFieldMeta>) => void;
+    resetFieldMeta: <TField extends DeepKeys<TFormData>>(fieldMeta: Record<TField, AnyFieldMeta>) => Record<TField, AnyFieldMeta>;
     /**
      * Sets the value of the specified field and optionally updates the touched state.
      */
@@ -368,5 +374,6 @@ export declare class FormApi<TFormData, TFormValidator extends Validator<TFormDa
     /**
      * Updates the form's errorMap
      */
-    setErrorMap(errorMap: ValidationErrorMap): void;
+    setErrorMap(errorMap: ValidationErrorMap<TOnMount, TOnChange, TOnChangeAsync, TOnBlur, TOnBlurAsync, TOnSubmit, TOnSubmitAsync>): void;
 }
+export {};

package/dist/esm/FormApi.js

@@ -1,6 +1,6 @@
 import { batch, Store, Derived } from "@tanstack/store";
-import { shallow, getSyncValidatorArray, getAsyncValidatorArray, getBy, functionalUpdate, setBy, deleteBy, isNonEmptyArray } from "./utils.js";
-import { isStandardSchemaValidator, standardSchemaValidator } from "./standardSchemaValidator.js";
+import { shallow, getSyncValidatorArray, getAsyncValidatorArray, getBy, functionalUpdate, setBy, deleteBy, isNonEmptyArray, isGlobalFormValidationError } from "./utils.js";
+import { isStandardSchemaValidator, standardSchemaValidators } from "./standardSchemaValidator.js";
 import { metaHelper } from "./metaHelper.js";
 function getDefaultFormState(defaultState) {
   return {
@@ -20,9 +20,6 @@ function getDefaultFormState(defaultState) {
     }
   };
 }
-const isFormValidationError = (error) => {
-  return typeof error === "object";
-};
 class FormApi {
   /**
    * Constructs a new `FormApi` instance with the given form options.
@@ -89,19 +86,21 @@ class FormApi {
     this.validateAllFields = async (cause) => {
       const fieldValidationPromises = [];
       batch(() => {
-        void Object.values(this.fieldInfo).forEach((field) => {
-          if (!field.instance) return;
-          const fieldInstance = field.instance;
-          fieldValidationPromises.push(
-            // Remember, `validate` is either a sync operation or a promise
-            Promise.resolve().then(
-              () => fieldInstance.validate(cause, { skipFormValidation: true })
-            )
-          );
-          if (!field.instance.state.meta.isTouched) {
-            field.instance.setMeta((prev) => ({ ...prev, isTouched: true }));
+        void Object.values(this.fieldInfo).forEach(
+          (field) => {
+            if (!field.instance) return;
+            const fieldInstance = field.instance;
+            fieldValidationPromises.push(
+              // Remember, `validate` is either a sync operation or a promise
+              Promise.resolve().then(
+                () => fieldInstance.validate(cause, { skipFormValidation: true })
+              )
+            );
+            if (!field.instance.state.meta.isTouched) {
+              field.instance.setMeta((prev) => ({ ...prev, isTouched: true }));
+            }
           }
-        });
+        );
       });
       const fieldErrorMapMap = await Promise.all(fieldValidationPromises);
       return fieldErrorMapMap.flat();
@@ -340,13 +339,15 @@ class FormApi {
         return;
       }
       batch(() => {
-        void Object.values(this.fieldInfo).forEach((field) => {
-          var _a3, _b2, _c2;
-          (_c2 = (_b2 = (_a3 = field.instance) == null ? void 0 : _a3.options.listeners) == null ? void 0 : _b2.onSubmit) == null ? void 0 : _c2.call(_b2, {
-            value: field.instance.state.value,
-            fieldApi: field.instance
-          });
-        });
+        void Object.values(this.fieldInfo).forEach(
+          (field) => {
+            var _a3, _b2, _c2;
+            (_c2 = (_b2 = (_a3 = field.instance) == null ? void 0 : _a3.options.listeners) == null ? void 0 : _b2.onSubmit) == null ? void 0 : _c2.call(_b2, {
+              value: field.instance.state.value,
+              fieldApi: field.instance
+            });
+          }
+        );
       });
       try {
         await ((_f = (_e = this.options).onSubmit) == null ? void 0 : _f.call(_e, { value: this.state.values, formApi: this }));
@@ -532,13 +533,13 @@ class FormApi {
     this.baseStore = new Store(
       getDefaultFormState({
         ...opts == null ? void 0 : opts.defaultState,
-        values: (opts == null ? void 0 : opts.defaultValues) ?? ((_a = opts == null ? void 0 : opts.defaultState) == null ? void 0 : _a.values),
-        isFormValid: true
+        values: (opts == null ? void 0 : opts.defaultValues) ?? ((_a = opts == null ? void 0 : opts.defaultState) == null ? void 0 : _a.values)
       })
     );
     this.fieldMetaDerived = new Derived({
       deps: [this.baseStore],
       fn: ({ prevDepVals, currDepVals, prevVal: _prevVal }) => {
+        var _a2;
         const prevVal = _prevVal;
         const prevBaseStore = prevDepVals == null ? void 0 : prevDepVals[0];
         const currBaseStore = currDepVals[0];
@@ -555,6 +556,12 @@ class FormApi {
             fieldErrors = Object.values(currBaseVal.errorMap ?? {}).filter(
               (val) => val !== void 0
             );
+            const fieldInstance = (_a2 = this.getFieldInfo(fieldName)) == null ? void 0 : _a2.instance;
+            if (fieldInstance && !fieldInstance.options.disableErrorFlat) {
+              fieldErrors = fieldErrors == null ? void 0 : fieldErrors.flat(
+                1
+              );
+            }
           }
           const isFieldPristine = !currBaseVal.isDirty;
           if (prevFieldInfo && prevFieldInfo.isPristine === isFieldPristine && prevFieldInfo.errors === fieldErrors && currBaseVal === prevBaseVal) {
@@ -607,20 +614,15 @@ class FormApi {
         const isValidating = !!isFieldsValidating;
         let errors = (prevVal == null ? void 0 : prevVal.errors) ?? [];
         if (!prevBaseStore || currBaseStore.errorMap !== prevBaseStore.errorMap) {
-          errors = Object.values(currBaseStore.errorMap).reduce(
-            (prev, curr) => {
-              if (curr === void 0) return prev;
-              if (typeof curr === "string") {
-                prev.push(curr);
-                return prev;
-              } else if (curr && isFormValidationError(curr)) {
-                prev.push(curr.form);
-                return prev;
-              }
+          errors = Object.values(currBaseStore.errorMap).reduce((prev, curr) => {
+            if (curr === void 0) return prev;
+            if (curr && isGlobalFormValidationError(curr)) {
+              prev.push(curr.form);
               return prev;
-            },
-            []
-          );
+            }
+            prev.push(curr);
+            return prev;
+          }, []);
         }
         const isFormValid = errors.length === 0;
         const isValid = isFieldsValid && isFormValid;
@@ -670,12 +672,8 @@ class FormApi {
    * @private
    */
   runValidator(props) {
-    const adapter = this.options.validatorAdapter;
-    if (adapter && (typeof props.validate !== "function" || "~standard" in props.validate)) {
-      return adapter()[props.type](props.value, props.validate);
-    }
     if (isStandardSchemaValidator(props.validate)) {
-      return standardSchemaValidator()()[props.type](
+      return standardSchemaValidators[props.type](
         props.value,
         props.validate
       );
@@ -686,25 +684,24 @@ class FormApi {
    * Updates the form's errorMap
    */
   setErrorMap(errorMap) {
-    this.baseStore.setState((prev) => ({
-      ...prev,
-      errorMap: {
-        ...prev.errorMap,
-        ...errorMap
-      }
-    }));
+    this.baseStore.setState(
+      (prev) => ({
+        ...prev,
+        errorMap: {
+          ...prev.errorMap,
+          ...errorMap
+        }
+      })
+    );
   }
 }
 function normalizeError(rawError) {
   if (rawError) {
-    if (typeof rawError === "object") {
+    if (isGlobalFormValidationError(rawError)) {
       const formError = normalizeError(rawError.form).formError;
       const fieldErrors = rawError.fields;
       return { formError, fieldErrors };
     }
-    if (typeof rawError !== "string") {
-      return { formError: "Invalid Form Values" };
-    }
     return { formError: rawError };
   }
   return { formError: void 0 };