chore: fix various other issues

Author: crutchcorn

packages/form-core/src/FieldApi.ts

@@ -1,4 +1,4 @@
-import { createStore } from '@tanstack/store'
+import { batch, createStore } from '@tanstack/store'
 import {
   isStandardSchemaValidator,
   standardSchemaValidators,
@@ -8,7 +8,6 @@ import {
   determineFieldLevelErrorSourceAndValue,
   evaluate,
   getAsyncValidatorArray,
-  getBy,
   getSyncValidatorArray,
   mergeOpts,
 } from './utils'
@@ -1322,6 +1321,9 @@ export class FieldApi<
       value: this.state.value,
       fieldApi: this,
     })
+
+    // TODO: Remove
+    return () => {}
   }
 
   /**
@@ -1622,62 +1624,62 @@ export class FieldApi<
     // Needs type cast as eslint errantly believes this is always falsy
     let hasErrored = false as boolean
 
-    // batch(() => {
-    const validateFieldFn = (
-      field: AnyFieldApi,
-      validateObj: SyncValidator<any>,
-    ) => {
-      const errorMapKey = getErrorMapKey(validateObj.cause)
+    batch(() => {
+      const validateFieldFn = (
+        field: AnyFieldApi,
+        validateObj: SyncValidator<any>,
+      ) => {
+        const errorMapKey = getErrorMapKey(validateObj.cause)
+
+        const fieldLevelError = validateObj.validate
+          ? normalizeError(
+              field.runValidator({
+                validate: validateObj.validate,
+                value: {
+                  value: field.store.state.value,
+                  validationSource: 'field',
+                  fieldApi: field,
+                },
+                type: 'validate',
+              }),
+            )
+          : undefined
 
-      const fieldLevelError = validateObj.validate
-        ? normalizeError(
-            field.runValidator({
-              validate: validateObj.validate,
-              value: {
-                value: field.store.state.value,
-                validationSource: 'field',
-                fieldApi: field,
-              },
-              type: 'validate',
-            }),
-          )
-        : undefined
+        const formLevelError = errorFromForm[errorMapKey]
 
-      const formLevelError = errorFromForm[errorMapKey]
+        const { newErrorValue, newSource } =
+          determineFieldLevelErrorSourceAndValue({
+            formLevelError,
+            fieldLevelError,
+          })
 
-      const { newErrorValue, newSource } =
-        determineFieldLevelErrorSourceAndValue({
-          formLevelError,
-          fieldLevelError,
-        })
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+        if (field.state.meta.errorMap?.[errorMapKey] !== newErrorValue) {
+          field.setMeta((prev) => ({
+            ...prev,
+            errorMap: {
+              ...prev.errorMap,
+              [errorMapKey]: newErrorValue,
+            },
+            errorSourceMap: {
+              ...prev.errorSourceMap,
+              [errorMapKey]: newSource,
+            },
+          }))
+        }
+        if (newErrorValue) {
+          hasErrored = true
+        }
+      }
 
-      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-      if (field.state.meta.errorMap?.[errorMapKey] !== newErrorValue) {
-        field.setMeta((prev) => ({
-          ...prev,
-          errorMap: {
-            ...prev.errorMap,
-            [errorMapKey]: newErrorValue,
-          },
-          errorSourceMap: {
-            ...prev.errorSourceMap,
-            [errorMapKey]: newSource,
-          },
-        }))
+      for (const validateObj of validates) {
+        validateFieldFn(this, validateObj)
       }
-      if (newErrorValue) {
-        hasErrored = true
+      for (const fieldValitateObj of linkedFieldValidates) {
+        if (!fieldValitateObj.validate) continue
+        validateFieldFn(fieldValitateObj.field, fieldValitateObj)
       }
-    }
-
-    for (const validateObj of validates) {
-      validateFieldFn(this, validateObj)
-    }
-    for (const fieldValitateObj of linkedFieldValidates) {
-      if (!fieldValitateObj.validate) continue
-      validateFieldFn(fieldValitateObj.field, fieldValitateObj)
-    }
-    // })
+    })
 
     /**
      *  when we have an error for onSubmit in the state, we want

packages/form-core/src/FieldGroupApi.ts

@@ -1,6 +1,6 @@
 import { createStore } from '@tanstack/store'
 import { concatenatePaths, getBy, makePathArray } from './utils'
-import type { ReadonlyStore } from '@tanstack/store';
+import type { ReadonlyStore } from '@tanstack/store'
 import type { Updater } from './utils'
 import type {
   FormApi,
@@ -303,7 +303,9 @@ export class FieldGroupApi<
    *
    * TODO: Remove
    */
-  mount = () => {}
+  mount = () => {
+    return () => {}
+  }
 
   /**
    * 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.