Extrapolate UseQueryConfig (breaking)

packages/react/src/client.ts

@@ -1,7 +1,11 @@
 import type { ClientWithEns } from '@ensdomains/ensjs/contracts'
 import type { QueryClient } from '@tanstack/react-query'
+import type { UseQueryParameters } from './hooks/useQuery.js'
 
 export type ParamWithClients<T> = T & {
   client: ClientWithEns
-  queryClient?: QueryClient
 }
+
+export type QueryConfig = {
+  queryClient?: QueryClient
+} & UseQueryParameters

packages/react/src/hooks/useDecodedName.ts

@@ -3,7 +3,7 @@ import {
   type GetDecodedNameParameters,
   type GetDecodedNameReturnType,
 } from '@ensdomains/ensjs/subgraph'
-import type { ParamWithClients } from '../client.js'
+import type { ParamWithClients, QueryConfig } from '../client.js'
 import { useQuery, type UseQueryReturnType } from './useQuery.js'
 
 export type UseDecodedNameParams = ParamWithClients<GetDecodedNameParameters>
@@ -20,8 +20,9 @@ export type UseDecodedNameReturnType = GetDecodedNameReturnType
  */
 export const useDecodedName = (
   params: UseDecodedNameParams,
+  query?: QueryConfig,
 ): UseQueryReturnType<UseDecodedNameReturnType> => {
-  const { client, queryClient } = params
+  const { client } = params
 
   return useQuery(
     ['ensjs', 'decoded-subgraph-name', params.name],
@@ -32,6 +33,6 @@ export const useDecodedName = (
         return result
       },
     },
-    queryClient,
+    query,
   )
 }

packages/react/src/hooks/useEnsAvailable.ts

@@ -3,7 +3,7 @@ import {
   type GetAvailableParameters,
   type GetAvailableReturnType,
 } from '@ensdomains/ensjs/public'
-import type { ParamWithClients } from '../client.js'
+import type { ParamWithClients, QueryConfig } from '../client.js'
 import { useQuery, type UseQueryReturnType } from './useQuery.js'
 
 export type UseEnsAvailableParams = ParamWithClients<GetAvailableParameters>
@@ -20,8 +20,9 @@ export type UseEnsAvailableReturnType = GetAvailableReturnType
  */
 export const useEnsAvailable = (
   params: UseEnsAvailableParams,
+  query?: QueryConfig,
 ): UseQueryReturnType<UseEnsAvailableReturnType> => {
-  const { client, queryClient } = params
+  const { client } = params
 
   return useQuery(
     ['ensjs', 'eth-name-available', params.name],
@@ -33,6 +34,6 @@ export const useEnsAvailable = (
         return result
       },
     },
-    queryClient,
+    query,
   )
 }

packages/react/src/hooks/useEnsCredentials.ts

@@ -1,5 +1,5 @@
 import { getTextRecord } from '@ensdomains/ensjs/public'
-import type { ParamWithClients } from '../client.js'
+import type { ParamWithClients, QueryConfig } from '../client.js'
 import { useQuery, type UseQueryReturnType } from './useQuery.js'
 
 export type UseEnsCredentialsParams = ParamWithClients<{ name: string }>
@@ -18,8 +18,9 @@ export type UseEnsCredentialsReturnType = ExternalCredential[]
  */
 export const useEnsCredentials = (
   params: UseEnsCredentialsParams,
+  query?: QueryConfig,
 ): UseQueryReturnType<UseEnsCredentialsReturnType> => {
-  const { name, client, queryClient } = params
+  const { name, client } = params
 
   return useQuery(
     ['ensjs', 'credentials', params.name],
@@ -41,6 +42,6 @@ export const useEnsCredentials = (
         return credentials
       },
     },
-    queryClient,
+    query,
   )
 }

packages/react/src/hooks/useEnsExpiry.ts

@@ -3,7 +3,7 @@ import {
   type GetExpiryParameters,
   type GetExpiryReturnType,
 } from '@ensdomains/ensjs/public'
-import type { ParamWithClients } from '../client.js'
+import type { ParamWithClients, QueryConfig } from '../client.js'
 import { useQuery, type UseQueryReturnType } from './useQuery.js'
 
 export type UseEnsExpiryParams = ParamWithClients<GetExpiryParameters>
@@ -20,18 +20,15 @@ export type UseEnsExpiryReturnType = GetExpiryReturnType
  */
 export const useEnsExpiry = (
   params: UseEnsExpiryParams,
+  query?: QueryConfig,
 ): UseQueryReturnType<UseEnsExpiryReturnType> => {
-  const { client, queryClient } = params
+  const { client } = params
 
   return useQuery(
     ['ensjs', 'ens-expiry', params.name],
     {
-      queryFn: async () => {
-        const result = await getExpiry(client, params)
-
-        return result
-      },
+      queryFn: async () => getExpiry(client, params),
     },
-    queryClient,
+    query,
   )
 }

packages/react/src/hooks/useEnsResolverInterfaces.ts

@@ -4,8 +4,7 @@ import {
   type GetSupportedInterfacesParameters,
   type GetSupportedInterfacesReturnType,
 } from '@ensdomains/ensjs/public'
-import type { ParamWithClients } from '../client.js'
-import { fallbackQueryClient } from '../query.js'
+import type { ParamWithClients, QueryConfig } from '../client.js'
 import { useQuery, type UseQueryReturnType } from './useQuery.js'
 
 export type UseEnsResolverInterfacesParams<
@@ -27,8 +26,9 @@ export type UseEnsResolverInterfacesReturnType<
  */
 export const useEnsResolverInterfaces = <Interfaces extends readonly Hex[]>(
   params: UseEnsResolverInterfacesParams<Interfaces>,
+  query?: QueryConfig,
 ): UseQueryReturnType<UseEnsResolverInterfacesReturnType<Interfaces>> => {
-  const { client, queryClient = fallbackQueryClient } = params
+  const { client } = params
 
   return useQuery(
     ['ensjs', 'resolver-interfaces', params.address],
@@ -39,6 +39,6 @@ export const useEnsResolverInterfaces = <Interfaces extends readonly Hex[]>(
         return result
       },
     },
-    queryClient,
+    query,
   )
 }

packages/react/src/hooks/useNamesForAddress.ts

@@ -3,8 +3,7 @@ import {
   getNamesForAddress,
   type GetNamesForAddressReturnType,
 } from '@ensdomains/ensjs/subgraph'
-import { fallbackQueryClient } from '../query.js'
-import type { ParamWithClients } from '../client.js'
+import type { ParamWithClients, QueryConfig } from '../client.js'
 import { useQuery, type UseQueryReturnType } from './useQuery.js'
 
 export type UseNamesForAddressParams = ParamWithClients<{
@@ -24,8 +23,9 @@ export type UseNamesForAddressReturnType = GetNamesForAddressReturnType
  */
 export const useNamesForAddress = (
   params: UseNamesForAddressParams,
+  queryConfig?: QueryConfig,
 ): UseQueryReturnType<UseNamesForAddressReturnType> => {
-  const { address, client, queryClient = fallbackQueryClient } = params
+  const { address, client } = params
 
   return useQuery(
     ['ensjs', 'names-for-address', address],
@@ -37,7 +37,9 @@ export const useNamesForAddress = (
 
         return result
       },
+      enabled: !!params.address,
+      initialData: [],
     },
-    queryClient,
+    queryConfig,
   )
 }

packages/react/src/hooks/useQuery.ts

@@ -1,14 +1,14 @@
 import {
   useQuery as useTanstackQuery,
   type DefaultError,
-  type QueryClient,
   type QueryKey,
   type UseQueryOptions,
   type UseQueryResult,
 } from '@tanstack/react-query'
 import type { ExactPartial } from 'viem'
 import { fallbackQueryClient } from '../query.js'
 import type { Compute } from '../utils/types.js'
+import type { QueryConfig } from '../client.js'
 
 export type UseQueryParameters<
   QueryFnData = unknown,
@@ -31,20 +31,25 @@ export type UseQueryReturnType<
   Error = DefaultError,
 > = UseQueryResult<Data, Error>
 
-export const useQuery = <Parameters, Data, Error>(
+export const useQuery = <
+  Parameters extends UseQueryParameters,
+  Data = unknown,
+  Error = unknown,
+>(
   key: QueryKey,
   queryParameters: Exclude<Parameters, 'queryKey'>,
-  queryClient?: QueryClient,
+  queryConfig?: QueryConfig,
 ): UseQueryReturnType<Data, Error> => {
   const parameters = {
     ...queryParameters,
+    ...queryConfig,
     queryKey: key,
   }
 
   // TODO: figure out why this is necessary
   // @ts-ignore
   return useTanstackQuery(
     { ...parameters } as any,
-    queryClient ?? fallbackQueryClient,
+    queryConfig?.queryClient ?? fallbackQueryClient,
   )
 }