@tanstack/form-core 1.6.2 → 1.7.0

package/dist/cjs/FormApi.cjs

@@ -32,14 +32,15 @@ class FormApi {
     this.options = {};
     this.fieldInfo = {};
     this.prevTransformArray = [];
-    this.cumulativeFieldsErrorMap = {};
     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 });
       const { onMount } = this.options.validators || {};
       if (!onMount) return cleanup;
       this.validateSync("mount");
@@ -149,7 +150,7 @@ class FormApi {
       let hasErrored = false;
       const currentValidationErrorMap = {};
       store.batch(() => {
-        var _a2;
+        var _a2, _b;
         for (const validateObj of validates) {
           if (!validateObj.validate) continue;
           const rawError = this.runValidator({
@@ -163,44 +164,49 @@ class FormApi {
           });
           const { formError, fieldErrors } = normalizeError(rawError);
           const errorMapKey = getErrorMapKey(validateObj.cause);
-          if (fieldErrors) {
-            for (const [field, fieldError] of Object.entries(fieldErrors)) {
-              const oldErrorMap = this.cumulativeFieldsErrorMap[field] || {};
-              const newErrorMap = {
-                ...oldErrorMap,
-                [errorMapKey]: fieldError
-              };
-              currentValidationErrorMap[field] = newErrorMap;
-              this.cumulativeFieldsErrorMap[field] = newErrorMap;
-              const fieldMeta = this.getFieldMeta(field);
-              if (fieldMeta && fieldMeta.errorMap[errorMapKey] !== fieldError) {
-                this.setFieldMeta(field, (prev) => ({
-                  ...prev,
-                  errorMap: {
-                    ...prev.errorMap,
-                    [errorMapKey]: fieldError
-                  }
-                }));
-              }
-            }
-          }
-          for (const field of Object.keys(this.cumulativeFieldsErrorMap)) {
+          for (const field of Object.keys(
+            this.state.fieldMeta
+          )) {
             const fieldMeta = this.getFieldMeta(field);
-            if ((fieldMeta == null ? void 0 : fieldMeta.errorMap[errorMapKey]) && !((_a2 = currentValidationErrorMap[field]) == null ? void 0 : _a2[errorMapKey])) {
-              this.cumulativeFieldsErrorMap[field] = {
-                ...this.cumulativeFieldsErrorMap[field],
-                [errorMapKey]: void 0
+            if (!fieldMeta) continue;
+            const {
+              errorMap: currentErrorMap,
+              errorSourceMap: currentErrorMapSource
+            } = fieldMeta;
+            const newFormValidatorError = fieldErrors == null ? void 0 : fieldErrors[field];
+            const { newErrorValue, newSource } = utils.determineFormLevelErrorSourceAndValue({
+              newFormValidatorError,
+              isPreviousErrorFromFormValidator: (
+                // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+                (currentErrorMapSource == null ? void 0 : currentErrorMapSource[errorMapKey]) === "form"
+              ),
+              // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+              previousErrorValue: currentErrorMap == null ? void 0 : currentErrorMap[errorMapKey]
+            });
+            if (newSource === "form") {
+              currentValidationErrorMap[field] = {
+                ...currentValidationErrorMap[field],
+                [errorMapKey]: newFormValidatorError
               };
+            }
+            if (
+              // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+              (currentErrorMap == null ? void 0 : currentErrorMap[errorMapKey]) !== newErrorValue
+            ) {
               this.setFieldMeta(field, (prev) => ({
                 ...prev,
                 errorMap: {
                   ...prev.errorMap,
-                  [errorMapKey]: void 0
+                  [errorMapKey]: newErrorValue
+                },
+                errorSourceMap: {
+                  ...prev.errorSourceMap,
+                  [errorMapKey]: newSource
                 }
               }));
             }
           }
-          if (this.state.errorMap[errorMapKey] !== formError) {
+          if (((_a2 = this.state.errorMap) == null ? void 0 : _a2[errorMapKey]) !== formError) {
             this.baseStore.setState((prev) => ({
               ...prev,
               errorMap: {
@@ -214,7 +220,10 @@ class FormApi {
           }
         }
         const submitErrKey = getErrorMapKey("submit");
-        if (this.state.errorMap[submitErrKey] && cause !== "submit" && !hasErrored) {
+        if (
+          // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+          ((_b = this.state.errorMap) == null ? void 0 : _b[submitErrKey]) && cause !== "submit" && !hasErrored
+        ) {
           this.baseStore.setState((prev) => ({
             ...prev,
             errorMap: {
@@ -232,7 +241,7 @@ class FormApi {
         this.baseStore.setState((prev) => ({ ...prev, isFormValidating: true }));
       }
       const promises = [];
-      let fieldErrors;
+      let fieldErrorsFromFormValidators;
       for (const validateObj of validates) {
         if (!validateObj.validate) continue;
         const key = getErrorMapKey(validateObj.cause);
@@ -272,21 +281,46 @@ class FormApi {
             }
             const { formError, fieldErrors: fieldErrorsFromNormalizeError } = normalizeError(rawError);
             if (fieldErrorsFromNormalizeError) {
-              fieldErrors = fieldErrors ? { ...fieldErrors, ...fieldErrorsFromNormalizeError } : fieldErrorsFromNormalizeError;
+              fieldErrorsFromFormValidators = fieldErrorsFromFormValidators ? {
+                ...fieldErrorsFromFormValidators,
+                ...fieldErrorsFromNormalizeError
+              } : fieldErrorsFromNormalizeError;
             }
             const errorMapKey = getErrorMapKey(validateObj.cause);
-            if (fieldErrors) {
-              for (const [field, fieldError] of Object.entries(fieldErrors)) {
-                const fieldMeta = this.getFieldMeta(field);
-                if (fieldMeta && fieldMeta.errorMap[errorMapKey] !== fieldError) {
-                  this.setFieldMeta(field, (prev) => ({
-                    ...prev,
-                    errorMap: {
-                      ...prev.errorMap,
-                      [errorMapKey]: fieldError
-                    }
-                  }));
-                }
+            for (const field of Object.keys(
+              this.state.fieldMeta
+            )) {
+              const fieldMeta = this.getFieldMeta(field);
+              if (!fieldMeta) continue;
+              const {
+                errorMap: currentErrorMap,
+                errorSourceMap: currentErrorMapSource
+              } = fieldMeta;
+              const newFormValidatorError = fieldErrorsFromFormValidators == null ? void 0 : fieldErrorsFromFormValidators[field];
+              const { newErrorValue, newSource } = utils.determineFormLevelErrorSourceAndValue({
+                newFormValidatorError,
+                isPreviousErrorFromFormValidator: (
+                  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+                  (currentErrorMapSource == null ? void 0 : currentErrorMapSource[errorMapKey]) === "form"
+                ),
+                // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+                previousErrorValue: currentErrorMap == null ? void 0 : currentErrorMap[errorMapKey]
+              });
+              if (
+                // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+                (currentErrorMap == null ? void 0 : currentErrorMap[errorMapKey]) !== newErrorValue
+              ) {
+                this.setFieldMeta(field, (prev) => ({
+                  ...prev,
+                  errorMap: {
+                    ...prev.errorMap,
+                    [errorMapKey]: newErrorValue
+                  },
+                  errorSourceMap: {
+                    ...prev.errorSourceMap,
+                    [errorMapKey]: newSource
+                  }
+                }));
               }
             }
             this.baseStore.setState((prev) => ({
@@ -296,7 +330,9 @@ class FormApi {
                 [errorMapKey]: formError
               }
             }));
-            resolve(fieldErrors ? { fieldErrors, errorMapKey } : void 0);
+            resolve(
+              fieldErrorsFromFormValidators ? { fieldErrors: fieldErrorsFromFormValidators, errorMapKey } : void 0
+            );
           })
         );
       }
@@ -700,7 +736,7 @@ class FormApi {
     return props.validate(props.value);
   }
   async handleSubmit(submitMeta) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     this.baseStore.setState((old) => ({
       ...old,
       // Submission attempts mark the form as not submitted
@@ -754,8 +790,9 @@ class FormApi {
         }
       );
     });
+    (_f = (_e = this.options.listeners) == null ? void 0 : _e.onSubmit) == null ? void 0 : _f.call(_e, { formApi: this });
     try {
-      await ((_f = (_e = this.options).onSubmit) == null ? void 0 : _f.call(_e, {
+      await ((_h = (_g = this.options).onSubmit) == null ? void 0 : _h.call(_g, {
         value: this.state.values,
         formApi: this,
         meta: submitMeta ?? this.options.onSubmitMeta