fix(core): form options prop combination errors

Author: harry-whorlow

packages/form-core/src/formOptions.ts

@@ -21,21 +21,19 @@ without losing the benefits from the TOptions generic.
 */
 
 export function formOptions<
-  TOptions extends Partial<
-    FormOptions<
-      TFormData,
-      TOnMount,
-      TOnChange,
-      TOnChangeAsync,
-      TOnBlur,
-      TOnBlurAsync,
-      TOnSubmit,
-      TOnSubmitAsync,
-      TOnDynamic,
-      TOnDynamicAsync,
-      TOnServer,
-      TSubmitMeta
-    >
+  TOptions extends FormOptions<
+    TFormData,
+    TOnMount,
+    TOnChange,
+    TOnChangeAsync,
+    TOnBlur,
+    TOnBlurAsync,
+    TOnSubmit,
+    TOnSubmitAsync,
+    TOnDynamic,
+    TOnDynamicAsync,
+    TOnServer,
+    TSubmitMeta
   >,
   TFormData,
   TOnMount extends undefined | FormValidateOrFn<TFormData>,
@@ -50,21 +48,19 @@ export function formOptions<
   TOnServer extends undefined | FormAsyncValidateOrFn<TFormData>,
   TSubmitMeta = never,
 >(
-  defaultOpts: Partial<
-    FormOptions<
-      TFormData,
-      TOnMount,
-      TOnChange,
-      TOnChangeAsync,
-      TOnBlur,
-      TOnBlurAsync,
-      TOnSubmit,
-      TOnSubmitAsync,
-      TOnDynamic,
-      TOnDynamicAsync,
-      TOnServer,
-      TSubmitMeta
-    >
+  defaultOpts: FormOptions<
+    TFormData,
+    TOnMount,
+    TOnChange,
+    TOnChangeAsync,
+    TOnBlur,
+    TOnBlurAsync,
+    TOnSubmit,
+    TOnSubmitAsync,
+    TOnDynamic,
+    TOnDynamicAsync,
+    TOnServer,
+    TSubmitMeta
   > &
     TOptions,
 ): TOptions {

packages/form-core/tests/formOptions.test-d.ts

@@ -323,4 +323,73 @@ describe('formOptions', () => {
       (undefined | 'Too short!' | 'needs formId')[]
     >()
   })
+
+  it('should allow form options to be passed to form with submit logic, and validators', () => {
+    type FormData = {
+      firstName: string
+      lastName: string
+    }
+
+    const formOpts = formOptions({
+      defaultValues: {
+        firstName: '',
+        lastName: '',
+      } as FormData,
+      onSubmit: (data) => {
+        console.log(data)
+      },
+      validators: {
+        onSubmit: (data) => {},
+      },
+    })
+
+    const form = new FormApi(formOpts)
+  })
+
+  it('should allow form options to be passed to form with submit logic, and listeners', () => {
+    type FormData = {
+      firstName: string
+      lastName: string
+    }
+
+    const formOpts = formOptions({
+      defaultValues: {
+        firstName: '',
+        lastName: '',
+      } as FormData,
+      onSubmit: (data) => {
+        console.log(data)
+      },
+      listeners: {
+        onSubmit: (data) => {},
+      },
+    })
+
+    const form = new FormApi(formOpts)
+  })
+
+  it('should allow form options to be passed to form with submit logic, listeners, and validators', () => {
+    type FormData = {
+      firstName: string
+      lastName: string
+    }
+
+    const formOpts = formOptions({
+      defaultValues: {
+        firstName: '',
+        lastName: '',
+      } as FormData,
+      onSubmit: (data) => {
+        console.log(data)
+      },
+      listeners: {
+        onSubmit: (data) => {},
+      },
+      validators: {
+        onSubmit: (data) => {},
+      },
+    })
+
+    const form = new FormApi(formOpts)
+  })
 })