@tanstack/form-core 1.28.0 → 1.28.2

package/dist/cjs/FormApi.cjs

@@ -33,7 +33,6 @@ class FormApi {
   constructor(opts) {
     this.options = {};
     this.fieldInfo = {};
-    this.prevTransformArray = [];
     this.mount = () => {
       const cleanupFieldMetaDerived = this.fieldMetaDerived.mount();
       const cleanupStoreDerived = this.store.mount();
@@ -96,12 +95,9 @@ class FormApi {
       if (!options) return;
       const oldOptions = this.options;
       this.options = options;
-      const shouldUpdateReeval = !!options.transform?.deps?.some(
-        (val, i) => val !== this.prevTransformArray[i]
-      );
       const shouldUpdateValues = options.defaultValues && !utils.evaluate(options.defaultValues, oldOptions.defaultValues) && !this.state.isTouched;
       const shouldUpdateState = !utils.evaluate(options.defaultState, oldOptions.defaultState) && !this.state.isTouched;
-      if (!shouldUpdateValues && !shouldUpdateState && !shouldUpdateReeval) return;
+      if (!shouldUpdateValues && !shouldUpdateState) return;
       store.batch(() => {
         this.baseStore.setState(
           () => getDefaultFormState(
@@ -111,8 +107,7 @@ class FormApi {
               shouldUpdateState ? options.defaultState : {},
               shouldUpdateValues ? {
                 values: options.defaultValues
-              } : {},
-              shouldUpdateReeval ? { _force_re_eval: !this.state._force_re_eval } : {}
+              } : {}
             )
           )
         );
@@ -866,12 +861,42 @@ class FormApi {
     };
     this._formId = opts?.formId ?? utils.uuid();
     this._devtoolsSubmissionOverride = false;
-    this.baseStore = new store.Store(
-      getDefaultFormState({
-        ...opts?.defaultState,
-        values: opts?.defaultValues ?? opts?.defaultState?.values
-      })
-    );
+    let baseStoreVal = getDefaultFormState({
+      ...opts?.defaultState,
+      values: opts?.defaultValues ?? opts?.defaultState?.values
+    });
+    if (opts?.transform) {
+      baseStoreVal = opts.transform({ state: baseStoreVal }).state;
+      for (const errKey of Object.keys(baseStoreVal.errorMap)) {
+        const errKeyMap = baseStoreVal.errorMap[errKey];
+        if (errKeyMap === void 0 || !utils.isGlobalFormValidationError(errKeyMap)) {
+          continue;
+        }
+        for (const fieldName of Object.keys(errKeyMap.fields)) {
+          const fieldErr = errKeyMap.fields[fieldName];
+          if (fieldErr === void 0) {
+            continue;
+          }
+          const existingFieldMeta = baseStoreVal.fieldMetaBase[fieldName];
+          baseStoreVal.fieldMetaBase[fieldName] = {
+            isTouched: false,
+            isValidating: false,
+            isBlurred: false,
+            isDirty: false,
+            ...existingFieldMeta ?? {},
+            errorSourceMap: {
+              ...existingFieldMeta?.["errorSourceMap"] ?? {},
+              onChange: "form"
+            },
+            errorMap: {
+              ...existingFieldMeta?.["errorMap"] ?? {},
+              [errKey]: fieldErr
+            }
+          };
+        }
+      }
+    }
+    this.baseStore = new store.Store(baseStoreVal);
     this.fieldMetaDerived = new store.Derived({
       deps: [this.baseStore],
       fn: ({ prevDepVals, currDepVals, prevVal: _prevVal }) => {
@@ -984,7 +1009,7 @@ class FormApi {
         if (prevVal && prevBaseStore && prevVal.errorMap === errorMap && prevVal.fieldMeta === this.fieldMetaDerived.state && prevVal.errors === errors && prevVal.isFieldsValidating === isFieldsValidating && prevVal.isFieldsValid === isFieldsValid && prevVal.isFormValid === isFormValid && prevVal.isValid === isValid && prevVal.canSubmit === canSubmit && prevVal.isTouched === isTouched && prevVal.isBlurred === isBlurred && prevVal.isPristine === isPristine && prevVal.isDefaultValue === isDefaultValue && prevVal.isDirty === isDirty && utils.evaluate(prevBaseStore, currBaseStore)) {
           return prevVal;
         }
-        let state = {
+        const state = {
           ...currBaseStore,
           errorMap,
           fieldMeta: this.fieldMetaDerived.state,
@@ -1000,14 +1025,6 @@ class FormApi {
           isDefaultValue,
           isDirty
         };
-        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 });
-          this.options.transform?.fn(newObj);
-          state = newObj.state;
-          this.prevTransformArray = transformArray;
-        }
         return state;
       }
     });