Refactor

Author: pascalbaljet

packages/core/src/index.ts

@@ -1,6 +1,8 @@
 import { Config } from './config'
 import { Router } from './router'
 
+export { UseFormUtils } from './useFormUtils'
+
 export { config } from './config'
 export { getScrollableParent } from './domUtils'
 export { objectToFormData } from './formData'

packages/core/src/types.ts

@@ -583,6 +583,12 @@ export type ProgressSettings = {
 
 export type UrlMethodPair = { url: string; method: Method }
 
+type UseFormInertiaArguments<TForm> = [data: TForm | (() => TForm)] | [rememberKey: string, data: TForm | (() => TForm)]
+type UseFormPrecognitionArguments<TForm> =
+  | [urlMethodPair: UrlMethodPair | (() => UrlMethodPair), data: TForm | (() => TForm)]
+  | [method: Method | (() => Method), url: string | (() => string), data: TForm | (() => TForm)]
+export type UseFormArguments<TForm> = UseFormInertiaArguments<TForm> | UseFormPrecognitionArguments<TForm>
+
 export type FormComponentOptions = Pick<
   VisitOptions,
   'preserveScroll' | 'preserveState' | 'preserveUrl' | 'replace' | 'only' | 'except' | 'reset'

packages/core/src/useFormUtils.ts

@@ -0,0 +1,61 @@
+import { FormDataType, Method, UrlMethodPair, UseFormArguments } from './types'
+
+export class UseFormUtils {
+  public static normalizeWayfinderArgsToCallback(
+    ...args: [UrlMethodPair | (() => UrlMethodPair)] | [Method | (() => Method), string | (() => string)]
+  ): () => UrlMethodPair {
+    return () => {
+      if (args.length === 2) {
+        return {
+          method: typeof args[0] === 'function' ? args[0]() : args[0],
+          url: typeof args[1] === 'function' ? args[1]() : args[1],
+        }
+      }
+
+      return typeof args[0] === 'function' ? args[0]() : args[0]
+    }
+  }
+
+  public static parseUseFormArgs<TForm extends FormDataType<TForm>>(
+    ...args: UseFormArguments<TForm>
+  ): {
+    rememberKey: string | null
+    data: TForm | (() => TForm)
+    precognitionEndpoint: (() => UrlMethodPair) | null
+  } {
+    // Pattern 1: [data: TForm | (() => TForm)]
+    if (args.length === 1) {
+      return {
+        rememberKey: null,
+        data: args[0] as TForm | (() => TForm),
+        precognitionEndpoint: null,
+      }
+    }
+
+    // Pattern 2 & 3: Two arguments - need to distinguish by first arg type
+    if (args.length === 2) {
+      if (typeof args[0] === 'string') {
+        // Pattern 2: [rememberKey: string, data: TForm | (() => TForm)]
+        return {
+          rememberKey: args[0],
+          data: args[1] as TForm | (() => TForm),
+          precognitionEndpoint: null,
+        }
+      } else {
+        // Pattern 3: [urlMethodPair: UrlMethodPair | (() => UrlMethodPair), data: TForm | (() => TForm)]
+        return {
+          rememberKey: null,
+          data: args[1] as TForm | (() => TForm),
+          precognitionEndpoint: this.normalizeWayfinderArgsToCallback(args[0]),
+        }
+      }
+    }
+
+    // Pattern 4: [method: Method | (() => Method), url: string | (() => string), data: TForm | (() => TForm)]
+    return {
+      rememberKey: null,
+      data: args[2] as TForm | (() => TForm),
+      precognitionEndpoint: this.normalizeWayfinderArgsToCallback(args[0], args[1]),
+    }
+  }
+}