@tanstack/form-core 1.16.0 → 1.17.0

package/dist/esm/FormApi.js

@@ -1,5 +1,6 @@
 import { batch, Store, Derived } from "@tanstack/store";
 import { evaluate, getSyncValidatorArray, determineFormLevelErrorSourceAndValue, getAsyncValidatorArray, getBy, functionalUpdate, setBy, deleteBy, isNonEmptyArray, isGlobalFormValidationError } from "./utils.js";
+import { defaultValidationLogic } from "./ValidationLogic.js";
 import { standardSchemaValidators, isStandardSchemaValidator } from "./standardSchemaValidator.js";
 import { defaultFieldMeta, metaHelper } from "./metaHelper.js";
 function getDefaultFormState(defaultState) {
@@ -17,7 +18,8 @@ function getDefaultFormState(defaultState) {
       onBlur: void 0,
       onSubmit: void 0,
       onMount: void 0,
-      onServer: void 0
+      onServer: void 0,
+      onDynamic: void 0
     }
   };
 }
@@ -26,32 +28,29 @@ class FormApi {
    * Constructs a new `FormApi` instance with the given form options.
    */
   constructor(opts) {
-    var _a;
     this.options = {};
     this.fieldInfo = {};
     this.prevTransformArray = [];
     this.mount = () => {
-      var _a2, _b;
       const cleanupFieldMetaDerived = this.fieldMetaDerived.mount();
       const cleanupStoreDerived = this.store.mount();
       const cleanup = () => {
         cleanupFieldMetaDerived();
         cleanupStoreDerived();
       };
-      (_b = (_a2 = this.options.listeners) == null ? void 0 : _a2.onMount) == null ? void 0 : _b.call(_a2, { formApi: this });
+      this.options.listeners?.onMount?.({ formApi: this });
       const { onMount } = this.options.validators || {};
       if (!onMount) return cleanup;
       this.validateSync("mount");
       return cleanup;
     };
     this.update = (options) => {
-      var _a2, _b;
       if (!options) return;
       const oldOptions = this.options;
       this.options = options;
-      const shouldUpdateReeval = !!((_b = (_a2 = options.transform) == null ? void 0 : _a2.deps) == null ? void 0 : _b.some(
+      const shouldUpdateReeval = !!options.transform?.deps?.some(
         (val, i) => val !== this.prevTransformArray[i]
-      ));
+      );
       const shouldUpdateValues = options.defaultValues && !evaluate(options.defaultValues, oldOptions.defaultValues) && !this.state.isTouched;
       const shouldUpdateState = !evaluate(options.defaultState, oldOptions.defaultState) && !this.state.isTouched;
       if (!shouldUpdateValues && !shouldUpdateState && !shouldUpdateReeval) return;
@@ -74,21 +73,18 @@ class FormApi {
     this.reset = (values, opts2) => {
       const { fieldMeta: currentFieldMeta } = this.state;
       const fieldMetaBase = this.resetFieldMeta(currentFieldMeta);
-      if (values && !(opts2 == null ? void 0 : opts2.keepDefaultValues)) {
+      if (values && !opts2?.keepDefaultValues) {
         this.options = {
           ...this.options,
           defaultValues: values
         };
       }
       this.baseStore.setState(
-        () => {
-          var _a2;
-          return getDefaultFormState({
-            ...this.options.defaultState,
-            values: values ?? this.options.defaultValues ?? ((_a2 = this.options.defaultState) == null ? void 0 : _a2.values),
-            fieldMetaBase
-          });
-        }
+        () => getDefaultFormState({
+          ...this.options.defaultState,
+          values: values ?? this.options.defaultValues ?? this.options.defaultState?.values,
+          fieldMetaBase
+        })
       );
     };
     this.validateAllFields = async (cause) => {
@@ -135,8 +131,7 @@ class FormApi {
       return fieldErrorMapMap.flat();
     };
     this.validateField = (field, cause) => {
-      var _a2;
-      const fieldInstance = (_a2 = this.fieldInfo[field]) == null ? void 0 : _a2.instance;
+      const fieldInstance = this.fieldInfo[field]?.instance;
       if (!fieldInstance) return [];
       if (!fieldInstance.state.meta.isTouched) {
         fieldInstance.setMeta((prev) => ({ ...prev, isTouched: true }));
@@ -144,11 +139,14 @@ class FormApi {
       return fieldInstance.validate(cause);
     };
     this.validateSync = (cause) => {
-      const validates = getSyncValidatorArray(cause, this.options);
+      const validates = getSyncValidatorArray(cause, {
+        ...this.options,
+        form: this,
+        validationLogic: this.options.validationLogic || defaultValidationLogic
+      });
       let hasErrored = false;
       const currentValidationErrorMap = {};
       batch(() => {
-        var _a2, _b;
         for (const validateObj of validates) {
           if (!validateObj.validate) continue;
           const rawError = this.runValidator({
@@ -171,15 +169,15 @@ class FormApi {
               errorMap: currentErrorMap,
               errorSourceMap: currentErrorMapSource
             } = fieldMeta;
-            const newFormValidatorError = fieldErrors == null ? void 0 : fieldErrors[field];
+            const newFormValidatorError = fieldErrors?.[field];
             const { newErrorValue, newSource } = determineFormLevelErrorSourceAndValue({
               newFormValidatorError,
               isPreviousErrorFromFormValidator: (
                 // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-                (currentErrorMapSource == null ? void 0 : currentErrorMapSource[errorMapKey]) === "form"
+                currentErrorMapSource?.[errorMapKey] === "form"
               ),
               // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-              previousErrorValue: currentErrorMap == null ? void 0 : currentErrorMap[errorMapKey]
+              previousErrorValue: currentErrorMap?.[errorMapKey]
             });
             if (newSource === "form") {
               currentValidationErrorMap[field] = {
@@ -189,7 +187,7 @@ class FormApi {
             }
             if (
               // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-              (currentErrorMap == null ? void 0 : currentErrorMap[errorMapKey]) !== newErrorValue
+              currentErrorMap?.[errorMapKey] !== newErrorValue
             ) {
               this.setFieldMeta(field, (prev) => ({
                 ...prev,
@@ -204,7 +202,7 @@ class FormApi {
               }));
             }
           }
-          if (((_a2 = this.state.errorMap) == null ? void 0 : _a2[errorMapKey]) !== formError) {
+          if (this.state.errorMap?.[errorMapKey] !== formError) {
             this.baseStore.setState((prev) => ({
               ...prev,
               errorMap: {
@@ -220,7 +218,7 @@ class FormApi {
         const submitErrKey = getErrorMapKey("submit");
         if (
           // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-          ((_b = this.state.errorMap) == null ? void 0 : _b[submitErrKey]) && cause !== "submit" && !hasErrored
+          this.state.errorMap?.[submitErrKey] && cause !== "submit" && !hasErrored
         ) {
           this.baseStore.setState((prev) => ({
             ...prev,
@@ -230,11 +228,28 @@ class FormApi {
             }
           }));
         }
+        const serverErrKey = getErrorMapKey("server");
+        if (
+          // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+          this.state.errorMap?.[serverErrKey] && cause !== "server" && !hasErrored
+        ) {
+          this.baseStore.setState((prev) => ({
+            ...prev,
+            errorMap: {
+              ...prev.errorMap,
+              [serverErrKey]: void 0
+            }
+          }));
+        }
       });
       return { hasErrored, fieldsErrorMap: currentValidationErrorMap };
     };
     this.validateAsync = async (cause) => {
-      const validates = getAsyncValidatorArray(cause, this.options);
+      const validates = getAsyncValidatorArray(cause, {
+        ...this.options,
+        form: this,
+        validationLogic: this.options.validationLogic || defaultValidationLogic
+      });
       if (!this.state.isFormValidating) {
         this.baseStore.setState((prev) => ({ ...prev, isFormValidating: true }));
       }
@@ -244,7 +259,7 @@ class FormApi {
         if (!validateObj.validate) continue;
         const key = getErrorMapKey(validateObj.cause);
         const fieldValidatorMeta = this.state.validationMetaMap[key];
-        fieldValidatorMeta == null ? void 0 : fieldValidatorMeta.lastAbortController.abort();
+        fieldValidatorMeta?.lastAbortController.abort();
         const controller = new AbortController();
         this.state.validationMetaMap[key] = {
           lastAbortController: controller
@@ -294,19 +309,19 @@ class FormApi {
                 errorMap: currentErrorMap,
                 errorSourceMap: currentErrorMapSource
               } = fieldMeta;
-              const newFormValidatorError = fieldErrorsFromFormValidators == null ? void 0 : fieldErrorsFromFormValidators[field];
+              const newFormValidatorError = fieldErrorsFromFormValidators?.[field];
               const { newErrorValue, newSource } = determineFormLevelErrorSourceAndValue({
                 newFormValidatorError,
                 isPreviousErrorFromFormValidator: (
                   // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-                  (currentErrorMapSource == null ? void 0 : currentErrorMapSource[errorMapKey]) === "form"
+                  currentErrorMapSource?.[errorMapKey] === "form"
                 ),
                 // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-                previousErrorValue: currentErrorMap == null ? void 0 : currentErrorMap[errorMapKey]
+                previousErrorValue: currentErrorMap?.[errorMapKey]
               });
               if (
                 // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-                (currentErrorMap == null ? void 0 : currentErrorMap[errorMapKey]) !== newErrorValue
+                currentErrorMap?.[errorMapKey] !== newErrorValue
               ) {
                 this.setFieldMeta(field, (prev) => ({
                   ...prev,
@@ -339,7 +354,7 @@ class FormApi {
       if (promises.length) {
         results = await Promise.all(promises);
         for (const fieldValidationResult of results) {
-          if (fieldValidationResult == null ? void 0 : fieldValidationResult.fieldErrors) {
+          if (fieldValidationResult?.fieldErrors) {
             const { errorMapKey } = fieldValidationResult;
             for (const [field, fieldError] of Object.entries(
               fieldValidationResult.fieldErrors
@@ -372,17 +387,17 @@ class FormApi {
       return this.state.fieldMeta[field];
     };
     this.getFieldInfo = (field) => {
-      var _a2;
-      return (_a2 = this.fieldInfo)[field] || (_a2[field] = {
+      return this.fieldInfo[field] ||= {
         instance: null,
         validationMetaMap: {
           onChange: void 0,
           onBlur: void 0,
           onSubmit: void 0,
           onMount: void 0,
-          onServer: void 0
+          onServer: void 0,
+          onDynamic: void 0
         }
-      });
+      };
     };
     this.setFieldMeta = (field, updater) => {
       this.baseStore.setState((prev) => {
@@ -409,7 +424,7 @@ class FormApi {
       );
     };
     this.setFieldValue = (field, updater, opts2) => {
-      const dontUpdateMeta = (opts2 == null ? void 0 : opts2.dontUpdateMeta) ?? false;
+      const dontUpdateMeta = opts2?.dontUpdateMeta ?? false;
       batch(() => {
         if (!dontUpdateMeta) {
           this.setFieldMeta(field, (prev) => ({
@@ -418,7 +433,7 @@ class FormApi {
             isDirty: true,
             errorMap: {
               // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-              ...prev == null ? void 0 : prev.errorMap,
+              ...prev?.errorMap,
               onMount: void 0
             }
           }));
@@ -592,16 +607,15 @@ 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)
+        ...opts?.defaultState,
+        values: opts?.defaultValues ?? opts?.defaultState?.values
       })
     );
     this.fieldMetaDerived = new Derived({
       deps: [this.baseStore],
       fn: ({ prevDepVals, currDepVals, prevVal: _prevVal }) => {
-        var _a2, _b, _c;
         const prevVal = _prevVal;
-        const prevBaseStore = prevDepVals == null ? void 0 : prevDepVals[0];
+        const prevBaseStore = prevDepVals?.[0];
         const currBaseStore = currDepVals[0];
         let originalMetaCount = 0;
         const fieldMeta = {};
@@ -609,17 +623,17 @@ class FormApi {
           currBaseStore.fieldMetaBase
         )) {
           const currBaseMeta = currBaseStore.fieldMetaBase[fieldName];
-          const prevBaseMeta = prevBaseStore == null ? void 0 : prevBaseStore.fieldMetaBase[fieldName];
-          const prevFieldInfo = prevVal == null ? void 0 : prevVal[fieldName];
+          const prevBaseMeta = prevBaseStore?.fieldMetaBase[fieldName];
+          const prevFieldInfo = prevVal?.[fieldName];
           const curFieldVal = getBy(currBaseStore.values, fieldName);
-          let fieldErrors = prevFieldInfo == null ? void 0 : prevFieldInfo.errors;
+          let fieldErrors = prevFieldInfo?.errors;
           if (!prevBaseMeta || currBaseMeta.errorMap !== prevBaseMeta.errorMap) {
             fieldErrors = Object.values(currBaseMeta.errorMap ?? {}).filter(
               (val) => val !== void 0
             );
-            const fieldInstance = (_a2 = this.getFieldInfo(fieldName)) == null ? void 0 : _a2.instance;
+            const fieldInstance = this.getFieldInfo(fieldName)?.instance;
             if (fieldInstance && !fieldInstance.options.disableErrorFlat) {
-              fieldErrors = fieldErrors == null ? void 0 : fieldErrors.flat(
+              fieldErrors = fieldErrors?.flat(
                 1
               );
             }
@@ -632,7 +646,7 @@ class FormApi {
           ) || evaluate(
             curFieldVal,
             // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-            (_c = (_b = this.getFieldInfo(fieldName)) == null ? void 0 : _b.instance) == null ? void 0 : _c.options.defaultValue
+            this.getFieldInfo(fieldName)?.instance?.options.defaultValue
           );
           if (prevFieldInfo && prevFieldInfo.isPristine === isFieldPristine && prevFieldInfo.isValid === isFieldValid && prevFieldInfo.isDefaultValue === isDefaultValue && prevFieldInfo.errors === fieldErrors && currBaseMeta === prevBaseMeta) {
             fieldMeta[fieldName] = prevFieldInfo;
@@ -657,9 +671,8 @@ class FormApi {
     this.store = new Derived({
       deps: [this.baseStore, this.fieldMetaDerived],
       fn: ({ prevDepVals, currDepVals, prevVal: _prevVal }) => {
-        var _a2, _b, _c, _d;
         const prevVal = _prevVal;
-        const prevBaseStore = prevDepVals == null ? void 0 : prevDepVals[0];
+        const prevBaseStore = prevDepVals?.[0];
         const currBaseStore = currDepVals[0];
         const currFieldMeta = currDepVals[1];
         const fieldMetaValues = Object.values(currFieldMeta).filter(
@@ -676,20 +689,17 @@ class FormApi {
         );
         const shouldInvalidateOnMount = (
           // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-          isTouched && ((_a2 = currBaseStore.errorMap) == null ? void 0 : _a2.onMount)
+          isTouched && currBaseStore.errorMap?.onMount
         );
         const isDirty = fieldMetaValues.some((field) => field.isDirty);
         const isPristine = !isDirty;
         const hasOnMountError = Boolean(
           // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-          ((_b = currBaseStore.errorMap) == null ? void 0 : _b.onMount) || // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-          fieldMetaValues.some((f) => {
-            var _a3;
-            return (_a3 = f == null ? void 0 : f.errorMap) == null ? void 0 : _a3.onMount;
-          })
+          currBaseStore.errorMap?.onMount || // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+          fieldMetaValues.some((f) => f?.errorMap?.onMount)
         );
         const isValidating = !!isFieldsValidating;
-        let errors = (prevVal == null ? void 0 : prevVal.errors) ?? [];
+        let errors = prevVal?.errors ?? [];
         if (!prevBaseStore || currBaseStore.errorMap !== prevBaseStore.errorMap) {
           errors = Object.values(currBaseStore.errorMap).reduce((prev, curr) => {
             if (curr === void 0) return prev;
@@ -731,11 +741,11 @@ class FormApi {
           isDefaultValue,
           isDirty
         };
-        const transformArray = ((_c = this.options.transform) == null ? void 0 : _c.deps) ?? [];
+        const transformArray = this.options.transform?.deps ?? [];
         const shouldTransform = transformArray.length !== this.prevTransformArray.length || transformArray.some((val, i) => val !== this.prevTransformArray[i]);
         if (shouldTransform) {
           const newObj = Object.assign({}, this, { state });
-          (_d = this.options.transform) == null ? void 0 : _d.fn(newObj);
+          this.options.transform?.fn(newObj);
           state = newObj.state;
           this.prevTransformArray = transformArray;
         }
@@ -761,7 +771,6 @@ class FormApi {
     return props.validate(props.value);
   }
   async handleSubmit(submitMeta) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
     this.baseStore.setState((old) => ({
       ...old,
       // Submission attempts mark the form as not submitted
@@ -790,7 +799,7 @@ class FormApi {
     await this.validateAllFields("submit");
     if (!this.state.isFieldsValid) {
       done();
-      (_b = (_a = this.options).onSubmitInvalid) == null ? void 0 : _b.call(_a, {
+      this.options.onSubmitInvalid?.({
         value: this.state.values,
         formApi: this,
         meta: submitMetaArg
@@ -800,7 +809,7 @@ class FormApi {
     await this.validate("submit");
     if (!this.state.isValid) {
       done();
-      (_d = (_c = this.options).onSubmitInvalid) == null ? void 0 : _d.call(_c, {
+      this.options.onSubmitInvalid?.({
         value: this.state.values,
         formApi: this,
         meta: submitMetaArg
@@ -810,21 +819,20 @@ class FormApi {
     batch(() => {
       void Object.values(this.fieldInfo).forEach(
         (field) => {
-          var _a2, _b2, _c2;
-          (_c2 = (_b2 = (_a2 = field.instance) == null ? void 0 : _a2.options.listeners) == null ? void 0 : _b2.onSubmit) == null ? void 0 : _c2.call(_b2, {
+          field.instance?.options.listeners?.onSubmit?.({
             value: field.instance.state.value,
             fieldApi: field.instance
           });
         }
       );
     });
-    (_f = (_e = this.options.listeners) == null ? void 0 : _e.onSubmit) == null ? void 0 : _f.call(_e, { formApi: this, meta: submitMetaArg });
+    this.options.listeners?.onSubmit?.({ formApi: this, meta: submitMetaArg });
     try {
-      await ((_h = (_g = this.options).onSubmit) == null ? void 0 : _h.call(_g, {
+      await this.options.onSubmit?.({
         value: this.state.values,
         formApi: this,
         meta: submitMetaArg
-      }));
+      });
       batch(() => {
         this.baseStore.setState((prev) => ({
           ...prev,
@@ -862,7 +870,7 @@ class FormApi {
               ...prev,
               errorMap: {
                 ...prev.errorMap,
-                [errorMapKey]: fieldErrors == null ? void 0 : fieldErrors[fieldName]
+                [errorMapKey]: fieldErrors?.[fieldName]
               },
               errorSourceMap: {
                 ...prev.errorSourceMap,
@@ -911,6 +919,8 @@ function getErrorMapKey(cause) {
       return "onMount";
     case "server":
       return "onServer";
+    case "dynamic":
+      return "onDynamic";
     case "change":
     default:
       return "onChange";