Pass options to useQuery and useMutation

Author: razor-x

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

@@ -11,19 +11,18 @@ import {
 
 import { NullSeamClientError, useSeamClient } from 'lib/seam/use-seam-client.js'
 
-type MutationOptions = Omit<UseMutationOptions, 'mutationFn'>
-
 export function useSeamMutation<T extends SeamHttpEndpointMutationPaths>(
   endpointPath: T,
   options?: Parameters<SeamHttpEndpoints[T]>[1],
-  _mutationOptions: MutationOptions = {}
-): UseMutationResult<
-  Awaited<ReturnType<SeamHttpEndpoints[T]>>,
-  SeamHttpApiError,
-  Parameters<SeamHttpEndpoints[T]>[1]
-> {
+  mutationOptions: MutationOptions<
+    MutationData<T>,
+    SeamHttpApiError,
+    MutationParameters<T>
+  > = {}
+): UseMutationResult<MutationData<T>, SeamHttpApiError, MutationParameters<T>> {
   const { endpointClient: client } = useSeamClient()
   return useMutation({
+    ...mutationOptions,
     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.
@@ -33,3 +32,13 @@ export function useSeamMutation<T extends SeamHttpEndpointMutationPaths>(
     },
   })
 }
+
+type MutationData<T extends SeamHttpEndpointMutationPaths> = Awaited<
+  ReturnType<SeamHttpEndpoints[T]>
+>
+
+type MutationParameters<T extends SeamHttpEndpointMutationPaths> = Parameters<
+  SeamHttpEndpoints[T]
+>[1]
+
+type MutationOptions<X, Y, Z> = Omit<UseMutationOptions<X, Y, Z>, 'mutationFn'>

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

@@ -11,17 +11,16 @@ import {
 
 import { useSeamClient } from 'lib/seam/use-seam-client.js'
 
-type QueryOptions = Omit<UseQueryOptions, 'queryKey' | 'queryFn'>
-
 export function useSeamQuery<T extends SeamHttpEndpointQueryPaths>(
   endpointPath: T,
   parameters?: Parameters<SeamHttpEndpoints[T]>[0],
   options?: Parameters<SeamHttpEndpoints[T]>[1],
-  _queryOptions: QueryOptions = {}
-): UseQueryResult<Awaited<ReturnType<SeamHttpEndpoints[T]>>, SeamHttpApiError> {
+  queryOptions: QueryOptions<QueryData<T>, SeamHttpApiError> = {}
+): UseQueryResult<QueryData<T>, SeamHttpApiError> {
   const { endpointClient: client } = useSeamClient()
   return useQuery({
     enabled: client != null,
+    ...queryOptions,
     queryKey: [endpointPath, parameters],
     queryFn: async () => {
       if (client == null) return null
@@ -32,3 +31,9 @@ export function useSeamQuery<T extends SeamHttpEndpointQueryPaths>(
     },
   })
 }
+
+type QueryData<T extends SeamHttpEndpointQueryPaths> = Awaited<
+  ReturnType<SeamHttpEndpoints[T]>
+>
+
+type QueryOptions<X, Y> = Omit<UseQueryOptions<X, Y>, 'queryKey' | 'queryFn'>