Merge mutation and query options

Author: razor-x

src/lib/seam/use-seam-mutation.ts

@@ -13,16 +13,16 @@ import { NullSeamClientError, useSeamClient } from 'lib/seam/use-seam-client.js'
 
 export function useSeamMutation<T extends SeamHttpEndpointMutationPaths>(
   endpointPath: T,
-  options?: Parameters<SeamHttpEndpoints[T]>[1],
-  mutationOptions: MutationOptions<
-    MutationData<T>,
-    SeamHttpApiError,
-    MutationParameters<T>
-  > = {}
+  options: Parameters<SeamHttpEndpoints[T]>[1] &
+    MutationOptions<
+      MutationData<T>,
+      SeamHttpApiError,
+      MutationParameters<T>
+    > = {}
 ): UseMutationResult<MutationData<T>, SeamHttpApiError, MutationParameters<T>> {
   const { endpointClient: client } = useSeamClient()
   return useMutation({
-    ...mutationOptions,
+    ...options,
     mutationFn: async (parameters) => {
       if (client === null) throw new NullSeamClientError()
       // Using @ts-expect-error over any is preferred, but not possible here because TypeScript will run out of memory.

src/lib/seam/use-seam-query.ts

@@ -14,13 +14,13 @@ import { useSeamClient } from 'lib/seam/use-seam-client.js'
 export function useSeamQuery<T extends SeamHttpEndpointQueryPaths>(
   endpointPath: T,
   parameters?: Parameters<SeamHttpEndpoints[T]>[0],
-  options?: Parameters<SeamHttpEndpoints[T]>[1],
-  queryOptions: QueryOptions<QueryData<T>, SeamHttpApiError> = {}
+  options: Parameters<SeamHttpEndpoints[T]>[1] &
+    QueryOptions<QueryData<T>, SeamHttpApiError> = {}
 ): UseQueryResult<QueryData<T>, SeamHttpApiError> {
   const { endpointClient: client } = useSeamClient()
   return useQuery({
     enabled: client != null,
-    ...queryOptions,
+    ...options,
     queryKey: [endpointPath, parameters],
     queryFn: async () => {
       if (client == null) return null