fix(core): fix formOptions type inferance (#1687)

Co-authored-by: LeCarbonator <[email protected]>

Author: harry-whorlow

packages/form-core/src/FormApi.ts

@@ -57,6 +57,8 @@ type FormErrorMapFromValidator<
   TOnBlurAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
   TOnSubmit extends undefined | FormValidateOrFn<TFormData>,
   TOnSubmitAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
+  TOnDynamic extends undefined | FormValidateOrFn<TFormData>,
+  TOnDynamicAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
 > = Partial<
   Record<
     DeepKeys<TFormData>,
@@ -67,7 +69,9 @@ type FormErrorMapFromValidator<
       TOnBlur,
       TOnBlurAsync,
       TOnSubmit,
-      TOnSubmitAsync
+      TOnSubmitAsync,
+      TOnDynamic,
+      TOnDynamicAsync
     >
   >
 >
@@ -1491,7 +1495,9 @@ export class FormApi<
       TOnBlur,
       TOnBlurAsync,
       TOnSubmit,
-      TOnSubmitAsync
+      TOnSubmitAsync,
+      TOnDynamic,
+      TOnDynamicAsync
     >
   } => {
     const validates = getSyncValidatorArray(cause, {
@@ -1511,7 +1517,9 @@ export class FormApi<
       TOnBlur,
       TOnBlurAsync,
       TOnSubmit,
-      TOnSubmitAsync
+      TOnSubmitAsync,
+      TOnDynamic,
+      TOnDynamicAsync
     > = {}
 
     batch(() => {
@@ -1654,7 +1662,9 @@ export class FormApi<
       TOnBlur,
       TOnBlurAsync,
       TOnSubmit,
-      TOnSubmitAsync
+      TOnSubmitAsync,
+      TOnDynamic,
+      TOnDynamicAsync
     >
   > => {
     const validates = getAsyncValidatorArray(cause, {
@@ -1801,7 +1811,9 @@ export class FormApi<
       TOnBlur,
       TOnBlurAsync,
       TOnSubmit,
-      TOnSubmitAsync
+      TOnSubmitAsync,
+      TOnDynamic,
+      TOnDynamicAsync
     > = {}
     if (promises.length) {
       results = await Promise.all(promises)
@@ -1846,7 +1858,9 @@ export class FormApi<
         TOnBlur,
         TOnBlurAsync,
         TOnSubmit,
-        TOnSubmitAsync
+        TOnSubmitAsync,
+        TOnDynamic,
+        TOnDynamicAsync
       >
     | Promise<
         FormErrorMapFromValidator<
@@ -1857,7 +1871,9 @@ export class FormApi<
           TOnBlur,
           TOnBlurAsync,
           TOnSubmit,
-          TOnSubmitAsync
+          TOnSubmitAsync,
+          TOnDynamic,
+          TOnDynamicAsync
         >
       > => {
     // Attempt to sync validate first

packages/form-core/src/formOptions.ts

@@ -24,35 +24,45 @@ export function formOptions<
   TOptions extends Partial<
     FormOptions<
       TFormData,
-      undefined | FormValidateOrFn<TFormData>,
-      undefined | FormValidateOrFn<TFormData>,
-      undefined | FormAsyncValidateOrFn<TFormData>,
-      undefined | FormValidateOrFn<TFormData>,
-      undefined | FormAsyncValidateOrFn<TFormData>,
-      undefined | FormValidateOrFn<TFormData>,
-      undefined | FormAsyncValidateOrFn<TFormData>,
-      undefined | FormValidateOrFn<TFormData>,
-      undefined | FormAsyncValidateOrFn<TFormData>,
-      undefined | FormAsyncValidateOrFn<TFormData>,
+      TOnMount,
+      TOnChange,
+      TOnChangeAsync,
+      TOnBlur,
+      TOnBlurAsync,
+      TOnSubmit,
+      TOnSubmitAsync,
+      TOnDynamic,
+      TOnDynamicAsync,
+      TOnServer,
       TSubmitMeta
     >
   >,
-  TFormData = TOptions['defaultValues'],
-  TSubmitMeta = TOptions['onSubmitMeta'],
+  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>,
+  TOnDynamic extends undefined | FormValidateOrFn<TFormData>,
+  TOnDynamicAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
+  TOnServer extends undefined | FormAsyncValidateOrFn<TFormData>,
+  TSubmitMeta = never,
 >(
   defaultOpts: Partial<
     FormOptions<
       TFormData,
-      undefined | FormValidateOrFn<TFormData>,
-      undefined | FormValidateOrFn<TFormData>,
-      undefined | FormAsyncValidateOrFn<TFormData>,
-      undefined | FormValidateOrFn<TFormData>,
-      undefined | FormAsyncValidateOrFn<TFormData>,
-      undefined | FormValidateOrFn<TFormData>,
-      undefined | FormAsyncValidateOrFn<TFormData>,
-      undefined | FormValidateOrFn<TFormData>,
-      undefined | FormAsyncValidateOrFn<TFormData>,
-      undefined | FormAsyncValidateOrFn<TFormData>,
+      TOnMount,
+      TOnChange,
+      TOnChangeAsync,
+      TOnBlur,
+      TOnBlurAsync,
+      TOnSubmit,
+      TOnSubmitAsync,
+      TOnDynamic,
+      TOnDynamicAsync,
+      TOnServer,
       TSubmitMeta
     >
   > &