wagmi 3.3.0 → 3.3.2

package/src/hooks/useBytecode.ts

@@ -1,19 +1,16 @@
 'use client'
-
 import type {
   Config,
   GetBytecodeErrorType,
   ResolvedRegister,
 } from '@wagmi/core'
 import type { Compute } from '@wagmi/core/internal'
-import type { GetBytecodeQueryFnData } from '@wagmi/core/query'
 import {
   type GetBytecodeData,
   type GetBytecodeOptions,
-  type GetBytecodeQueryKey,
   getBytecodeQueryOptions,
 } from '@wagmi/core/query'
-import type { ConfigParameter, QueryParameter } from '../types/properties.js'
+import type { ConfigParameter } from '../types/properties.js'
 import { type UseQueryReturnType, useQuery } from '../utils/query.js'
 import { useChainId } from './useChainId.js'
 import { useConfig } from './useConfig.js'
@@ -21,16 +18,7 @@ import { useConfig } from './useConfig.js'
 export type UseBytecodeParameters<
   config extends Config = Config,
   selectData = GetBytecodeData,
-> = Compute<
-  GetBytecodeOptions<config> &
-    ConfigParameter<config> &
-    QueryParameter<
-      GetBytecodeQueryFnData,
-      GetBytecodeErrorType,
-      selectData,
-      GetBytecodeQueryKey<config>
-    >
->
+> = Compute<GetBytecodeOptions<config, selectData> & ConfigParameter<config>>
 
 export type UseBytecodeReturnType<selectData = GetBytecodeData> =
   UseQueryReturnType<selectData, GetBytecodeErrorType>
@@ -42,16 +30,12 @@ export function useBytecode<
 >(
   parameters: UseBytecodeParameters<config, selectData> = {},
 ): UseBytecodeReturnType<selectData> {
-  const { address, query = {} } = parameters
-
   const config = useConfig(parameters)
   const chainId = useChainId({ config })
-
   const options = getBytecodeQueryOptions(config, {
     ...parameters,
     chainId: parameters.chainId ?? chainId,
+    query: parameters.query,
   })
-  const enabled = Boolean(address && (query.enabled ?? true))
-
-  return useQuery({ ...query, ...options, enabled })
+  return useQuery(options)
 }

package/src/hooks/useCall.ts

@@ -1,16 +1,12 @@
 'use client'
-
 import type { CallErrorType, Config, ResolvedRegister } from '@wagmi/core'
 import type { Compute } from '@wagmi/core/internal'
-import type { CallQueryFnData } from '@wagmi/core/query'
 import {
   type CallData,
   type CallOptions,
-  type CallQueryKey,
   callQueryOptions,
 } from '@wagmi/core/query'
-
-import type { ConfigParameter, QueryParameter } from '../types/properties.js'
+import type { ConfigParameter } from '../types/properties.js'
 import { type UseQueryReturnType, useQuery } from '../utils/query.js'
 import { useChainId } from './useChainId.js'
 import { useConfig } from './useConfig.js'
@@ -18,16 +14,7 @@ import { useConfig } from './useConfig.js'
 export type UseCallParameters<
   config extends Config = Config,
   selectData = CallData,
-> = Compute<
-  CallOptions<config> &
-    ConfigParameter<config> &
-    QueryParameter<
-      CallQueryFnData,
-      CallErrorType,
-      selectData,
-      CallQueryKey<config>
-    >
->
+> = Compute<CallOptions<config, selectData> & ConfigParameter<config>>
 
 export type UseCallReturnType<selectData = CallData> = UseQueryReturnType<
   selectData,
@@ -41,15 +28,12 @@ export function useCall<
 >(
   parameters: UseCallParameters<config, selectData> = {},
 ): UseCallReturnType<selectData> {
-  const { query = {} } = parameters
-
   const config = useConfig(parameters)
   const chainId = useChainId({ config })
-
   const options = callQueryOptions(config, {
     ...parameters,
     chainId: parameters.chainId ?? chainId,
+    query: parameters.query,
   })
-
-  return useQuery({ ...query, ...options })
+  return useQuery(options)
 }

package/src/hooks/useCallsStatus.ts

@@ -1,5 +1,4 @@
 'use client'
-
 import type {
   Config,
   GetCallsStatusErrorType,
@@ -9,28 +8,17 @@ import type { Compute } from '@wagmi/core/internal'
 import {
   type GetCallsStatusData,
   type GetCallsStatusOptions,
-  type GetCallsStatusQueryFnData,
-  type GetCallsStatusQueryKey,
   getCallsStatusQueryOptions,
 } from '@wagmi/core/query'
-
-import type { ConfigParameter, QueryParameter } from '../types/properties.js'
+import type { ConfigParameter } from '../types/properties.js'
 import { type UseQueryReturnType, useQuery } from '../utils/query.js'
 import { useConfig } from './useConfig.js'
+import { useConnection } from './useConnection.js'
 
 export type UseCallsStatusParameters<
   config extends Config = Config,
   selectData = GetCallsStatusData,
-> = Compute<
-  GetCallsStatusOptions &
-    ConfigParameter<config> &
-    QueryParameter<
-      GetCallsStatusQueryFnData,
-      GetCallsStatusErrorType,
-      selectData,
-      GetCallsStatusQueryKey
-    >
->
+> = Compute<GetCallsStatusOptions<selectData> & ConfigParameter<config>>
 
 export type UseCallsStatusReturnType<selectData = GetCallsStatusData> =
   UseQueryReturnType<selectData, GetCallsStatusErrorType>
@@ -42,11 +30,12 @@ export function useCallsStatus<
 >(
   parameters: UseCallsStatusParameters<config, selectData>,
 ): UseCallsStatusReturnType<selectData> {
-  const { query = {} } = parameters
-
   const config = useConfig(parameters)
-
-  const options = getCallsStatusQueryOptions(config, parameters)
-
-  return useQuery({ ...query, ...options })
+  const { connector } = useConnection({ config })
+  const options = getCallsStatusQueryOptions(config, {
+    ...parameters,
+    connector: parameters.connector ?? connector,
+    query: parameters.query,
+  })
+  return useQuery(options)
 }

package/src/hooks/useCapabilities.ts

@@ -1,5 +1,4 @@
 'use client'
-
 import type {
   Config,
   GetCapabilitiesErrorType,
@@ -9,12 +8,9 @@ import type { Compute } from '@wagmi/core/internal'
 import {
   type GetCapabilitiesData,
   type GetCapabilitiesOptions,
-  type GetCapabilitiesQueryFnData,
-  type GetCapabilitiesQueryKey,
   getCapabilitiesQueryOptions,
 } from '@wagmi/core/query'
-
-import type { ConfigParameter, QueryParameter } from '../types/properties.js'
+import type { ConfigParameter } from '../types/properties.js'
 import { type UseQueryReturnType, useQuery } from '../utils/query.js'
 import { useConfig } from './useConfig.js'
 import { useConnection } from './useConnection.js'
@@ -24,14 +20,7 @@ export type UseCapabilitiesParameters<
   chainId extends config['chains'][number]['id'] | undefined = undefined,
   selectData = GetCapabilitiesData<config, chainId>,
 > = Compute<
-  GetCapabilitiesOptions<config, chainId> &
-    ConfigParameter<config> &
-    QueryParameter<
-      GetCapabilitiesQueryFnData<config, chainId>,
-      GetCapabilitiesErrorType,
-      selectData,
-      GetCapabilitiesQueryKey<config, chainId>
-    >
+  GetCapabilitiesOptions<config, chainId, selectData> & ConfigParameter<config>
 >
 
 export type UseCapabilitiesReturnType<
@@ -48,18 +37,13 @@ export function useCapabilities<
 >(
   parameters: UseCapabilitiesParameters<config, chainId, selectData> = {},
 ): UseCapabilitiesReturnType<config, chainId, selectData> {
-  const { account, query = {} } = parameters
-
-  const { address } = useConnection()
   const config = useConfig(parameters)
-
+  const { address, connector } = useConnection({ config })
   const options = getCapabilitiesQueryOptions(config, {
     ...parameters,
-    account: account ?? address,
+    account: parameters.account ?? address,
+    connector: parameters.connector ?? connector,
+    query: parameters.query,
   })
-
-  return useQuery({
-    ...query,
-    ...options,
-  } as never) as UseCapabilitiesReturnType<config, chainId, selectData>
+  return useQuery(options as never) as any
 }

package/src/hooks/useConnectorClient.ts

@@ -6,22 +6,16 @@ import type {
   GetConnectorClientErrorType,
   ResolvedRegister,
 } from '@wagmi/core'
-import type { Compute, Omit } from '@wagmi/core/internal'
+import type { Compute } from '@wagmi/core/internal'
 import {
   type GetConnectorClientData,
   type GetConnectorClientOptions,
-  type GetConnectorClientQueryFnData,
-  type GetConnectorClientQueryKey,
   getConnectorClientQueryOptions,
 } from '@wagmi/core/query'
 import { useEffect, useRef } from 'react'
 
 import type { ConfigParameter } from '../types/properties.js'
-import {
-  type UseQueryParameters,
-  type UseQueryReturnType,
-  useQuery,
-} from '../utils/query.js'
+import { type UseQueryReturnType, useQuery } from '../utils/query.js'
 import { useChainId } from './useChainId.js'
 import { useConfig } from './useConfig.js'
 import { useConnection } from './useConnection.js'
@@ -32,22 +26,8 @@ export type UseConnectorClientParameters<
     config['chains'][number]['id'] = config['chains'][number]['id'],
   selectData = GetConnectorClientData<config, chainId>,
 > = Compute<
-  GetConnectorClientOptions<config, chainId> &
-    ConfigParameter<config> & {
-      query?:
-        | Compute<
-            Omit<
-              UseQueryParameters<
-                GetConnectorClientQueryFnData<config, chainId>,
-                GetConnectorClientErrorType,
-                selectData,
-                GetConnectorClientQueryKey<config, chainId>
-              >,
-              'gcTime' | 'staleTime'
-            >
-          >
-        | undefined
-    }
+  GetConnectorClientOptions<config, chainId, selectData> &
+    ConfigParameter<config>
 >
 
 export type UseConnectorClientReturnType<
@@ -66,48 +46,31 @@ export function useConnectorClient<
 >(
   parameters: UseConnectorClientParameters<config, chainId, selectData> = {},
 ): UseConnectorClientReturnType<config, chainId, selectData> {
-  const { query = {}, ...rest } = parameters
-
-  const config = useConfig(rest)
-  const queryClient = useQueryClient()
-  const { address, connector, status } = useConnection({ config })
+  const config = useConfig(parameters)
   const chainId = useChainId({ config })
-  const activeConnector = parameters.connector ?? connector
-
-  const { queryKey, ...options } = getConnectorClientQueryOptions<
-    config,
-    chainId
-  >(config, {
+  const { address, connector } = useConnection({ config })
+  const options = getConnectorClientQueryOptions(config, {
     ...parameters,
     chainId: parameters.chainId ?? chainId,
-    connector: activeConnector,
+    connector: parameters.connector ?? connector,
+    query: parameters.query as any,
   })
-  const enabled = Boolean(
-    (status === 'connected' ||
-      (status === 'reconnecting' && activeConnector?.getProvider)) &&
-      (query.enabled ?? true),
-  )
 
   const addressRef = useRef(address)
+  const queryClient = useQueryClient()
   // biome-ignore lint/correctness/useExhaustiveDependencies: `queryKey` not required
   useEffect(() => {
     const previousAddress = addressRef.current
     if (!address && previousAddress) {
       // remove when account is disconnected
-      queryClient.removeQueries({ queryKey })
+      queryClient.removeQueries({ queryKey: options.queryKey })
       addressRef.current = undefined
     } else if (address !== previousAddress) {
       // invalidate when address changes
-      queryClient.invalidateQueries({ queryKey })
+      queryClient.invalidateQueries({ queryKey: options.queryKey })
       addressRef.current = address
     }
   }, [address, queryClient])
 
-  return useQuery({
-    ...query,
-    ...options,
-    queryKey,
-    enabled,
-    staleTime: Number.POSITIVE_INFINITY,
-  })
+  return useQuery(options) as any
 }

package/src/hooks/useEnsAddress.ts

@@ -1,5 +1,4 @@
 'use client'
-
 import type {
   Config,
   GetEnsAddressErrorType,
@@ -9,12 +8,9 @@ import type { Compute } from '@wagmi/core/internal'
 import {
   type GetEnsAddressData,
   type GetEnsAddressOptions,
-  type GetEnsAddressQueryFnData,
-  type GetEnsAddressQueryKey,
   getEnsAddressQueryOptions,
 } from '@wagmi/core/query'
-
-import type { ConfigParameter, QueryParameter } from '../types/properties.js'
+import type { ConfigParameter } from '../types/properties.js'
 import { type UseQueryReturnType, useQuery } from '../utils/query.js'
 import { useChainId } from './useChainId.js'
 import { useConfig } from './useConfig.js'
@@ -22,16 +18,7 @@ import { useConfig } from './useConfig.js'
 export type UseEnsAddressParameters<
   config extends Config = Config,
   selectData = GetEnsAddressData,
-> = Compute<
-  GetEnsAddressOptions<config> &
-    ConfigParameter<config> &
-    QueryParameter<
-      GetEnsAddressQueryFnData,
-      GetEnsAddressErrorType,
-      selectData,
-      GetEnsAddressQueryKey<config>
-    >
->
+> = Compute<GetEnsAddressOptions<config, selectData> & ConfigParameter<config>>
 
 export type UseEnsAddressReturnType<selectData = GetEnsAddressData> =
   UseQueryReturnType<selectData, GetEnsAddressErrorType>
@@ -43,16 +30,12 @@ export function useEnsAddress<
 >(
   parameters: UseEnsAddressParameters<config, selectData> = {},
 ): UseEnsAddressReturnType<selectData> {
-  const { name, query = {} } = parameters
-
   const config = useConfig(parameters)
   const chainId = useChainId({ config })
-
   const options = getEnsAddressQueryOptions(config, {
     ...parameters,
     chainId: parameters.chainId ?? chainId,
+    query: parameters.query,
   })
-  const enabled = Boolean(name && (query.enabled ?? true))
-
-  return useQuery({ ...query, ...options, enabled })
+  return useQuery(options)
 }

package/src/hooks/useEnsAvatar.ts

@@ -1,5 +1,4 @@
 'use client'
-
 import type {
   Config,
   GetEnsAvatarErrorType,
@@ -9,12 +8,9 @@ import type { Compute } from '@wagmi/core/internal'
 import {
   type GetEnsAvatarData,
   type GetEnsAvatarOptions,
-  type GetEnsAvatarQueryFnData,
-  type GetEnsAvatarQueryKey,
   getEnsAvatarQueryOptions,
 } from '@wagmi/core/query'
-
-import type { ConfigParameter, QueryParameter } from '../types/properties.js'
+import type { ConfigParameter } from '../types/properties.js'
 import { type UseQueryReturnType, useQuery } from '../utils/query.js'
 import { useChainId } from './useChainId.js'
 import { useConfig } from './useConfig.js'
@@ -22,16 +18,7 @@ import { useConfig } from './useConfig.js'
 export type UseEnsAvatarParameters<
   config extends Config = Config,
   selectData = GetEnsAvatarData,
-> = Compute<
-  GetEnsAvatarOptions<config> &
-    ConfigParameter<config> &
-    QueryParameter<
-      GetEnsAvatarQueryFnData,
-      GetEnsAvatarErrorType,
-      selectData,
-      GetEnsAvatarQueryKey<config>
-    >
->
+> = Compute<GetEnsAvatarOptions<config, selectData> & ConfigParameter<config>>
 
 export type UseEnsAvatarReturnType<selectData = GetEnsAvatarData> =
   UseQueryReturnType<selectData, GetEnsAvatarErrorType>
@@ -43,16 +30,12 @@ export function useEnsAvatar<
 >(
   parameters: UseEnsAvatarParameters<config, selectData> = {},
 ): UseEnsAvatarReturnType<selectData> {
-  const { name, query = {} } = parameters
-
   const config = useConfig(parameters)
   const chainId = useChainId({ config })
-
   const options = getEnsAvatarQueryOptions(config, {
     ...parameters,
     chainId: parameters.chainId ?? chainId,
+    query: parameters.query,
   })
-  const enabled = Boolean(name && (query.enabled ?? true))
-
-  return useQuery({ ...query, ...options, enabled })
+  return useQuery(options)
 }

package/src/hooks/useEnsName.ts

@@ -1,16 +1,12 @@
 'use client'
-
 import type { Config, GetEnsNameErrorType, ResolvedRegister } from '@wagmi/core'
 import type { Compute } from '@wagmi/core/internal'
 import {
   type GetEnsNameData,
   type GetEnsNameOptions,
-  type GetEnsNameQueryFnData,
-  type GetEnsNameQueryKey,
   getEnsNameQueryOptions,
 } from '@wagmi/core/query'
-
-import type { ConfigParameter, QueryParameter } from '../types/properties.js'
+import type { ConfigParameter } from '../types/properties.js'
 import { type UseQueryReturnType, useQuery } from '../utils/query.js'
 import { useChainId } from './useChainId.js'
 import { useConfig } from './useConfig.js'
@@ -18,16 +14,7 @@ import { useConfig } from './useConfig.js'
 export type UseEnsNameParameters<
   config extends Config = Config,
   selectData = GetEnsNameData,
-> = Compute<
-  GetEnsNameOptions<config> &
-    ConfigParameter<config> &
-    QueryParameter<
-      GetEnsNameQueryFnData,
-      GetEnsNameErrorType,
-      selectData,
-      GetEnsNameQueryKey<config>
-    >
->
+> = Compute<GetEnsNameOptions<config, selectData> & ConfigParameter<config>>
 
 export type UseEnsNameReturnType<selectData = GetEnsNameData> =
   UseQueryReturnType<selectData, GetEnsNameErrorType>
@@ -39,16 +26,12 @@ export function useEnsName<
 >(
   parameters: UseEnsNameParameters<config, selectData> = {},
 ): UseEnsNameReturnType<selectData> {
-  const { address, query = {} } = parameters
-
   const config = useConfig(parameters)
   const chainId = useChainId({ config })
-
   const options = getEnsNameQueryOptions(config, {
     ...parameters,
     chainId: parameters.chainId ?? chainId,
+    query: parameters.query,
   })
-  const enabled = Boolean(address && (query.enabled ?? true))
-
-  return useQuery({ ...query, ...options, enabled })
+  return useQuery(options)
 }

package/src/hooks/useEnsResolver.ts

@@ -1,5 +1,4 @@
 'use client'
-
 import type {
   Config,
   GetEnsResolverErrorType,
@@ -9,12 +8,9 @@ import type { Compute } from '@wagmi/core/internal'
 import {
   type GetEnsResolverData,
   type GetEnsResolverOptions,
-  type GetEnsResolverQueryFnData,
-  type GetEnsResolverQueryKey,
   getEnsResolverQueryOptions,
 } from '@wagmi/core/query'
-
-import type { ConfigParameter, QueryParameter } from '../types/properties.js'
+import type { ConfigParameter } from '../types/properties.js'
 import { type UseQueryReturnType, useQuery } from '../utils/query.js'
 import { useChainId } from './useChainId.js'
 import { useConfig } from './useConfig.js'
@@ -22,16 +18,7 @@ import { useConfig } from './useConfig.js'
 export type UseEnsResolverParameters<
   config extends Config = Config,
   selectData = GetEnsResolverData,
-> = Compute<
-  GetEnsResolverOptions<config> &
-    ConfigParameter<config> &
-    QueryParameter<
-      GetEnsResolverQueryFnData,
-      GetEnsResolverErrorType,
-      selectData,
-      GetEnsResolverQueryKey<config>
-    >
->
+> = Compute<GetEnsResolverOptions<config, selectData> & ConfigParameter<config>>
 
 export type UseEnsResolverReturnType<selectData = GetEnsResolverData> =
   UseQueryReturnType<selectData, GetEnsResolverErrorType>
@@ -43,16 +30,12 @@ export function useEnsResolver<
 >(
   parameters: UseEnsResolverParameters<config, selectData> = {},
 ): UseEnsResolverReturnType<selectData> {
-  const { name, query = {} } = parameters
-
   const config = useConfig(parameters)
   const chainId = useChainId({ config })
-
   const options = getEnsResolverQueryOptions(config, {
     ...parameters,
     chainId: parameters.chainId ?? chainId,
+    query: parameters.query,
   })
-  const enabled = Boolean(name && (query.enabled ?? true))
-
-  return useQuery({ ...query, ...options, enabled })
+  return useQuery(options)
 }

package/src/hooks/useEnsText.ts

@@ -1,16 +1,12 @@
 'use client'
-
 import type { Config, GetEnsTextErrorType, ResolvedRegister } from '@wagmi/core'
 import type { Compute } from '@wagmi/core/internal'
 import {
   type GetEnsTextData,
   type GetEnsTextOptions,
-  type GetEnsTextQueryFnData,
-  type GetEnsTextQueryKey,
   getEnsTextQueryOptions,
 } from '@wagmi/core/query'
-
-import type { ConfigParameter, QueryParameter } from '../types/properties.js'
+import type { ConfigParameter } from '../types/properties.js'
 import { type UseQueryReturnType, useQuery } from '../utils/query.js'
 import { useChainId } from './useChainId.js'
 import { useConfig } from './useConfig.js'
@@ -18,16 +14,7 @@ import { useConfig } from './useConfig.js'
 export type UseEnsTextParameters<
   config extends Config = Config,
   selectData = GetEnsTextData,
-> = Compute<
-  GetEnsTextOptions<config> &
-    ConfigParameter<config> &
-    QueryParameter<
-      GetEnsTextQueryFnData,
-      GetEnsTextErrorType,
-      selectData,
-      GetEnsTextQueryKey<config>
-    >
->
+> = Compute<GetEnsTextOptions<config, selectData> & ConfigParameter<config>>
 
 export type UseEnsTextReturnType<selectData = GetEnsTextData> =
   UseQueryReturnType<selectData, GetEnsTextErrorType>
@@ -39,16 +26,12 @@ export function useEnsText<
 >(
   parameters: UseEnsTextParameters<config, selectData> = {},
 ): UseEnsTextReturnType<selectData> {
-  const { key, name, query = {} } = parameters
-
   const config = useConfig(parameters)
   const chainId = useChainId({ config })
-
   const options = getEnsTextQueryOptions(config, {
     ...parameters,
     chainId: parameters.chainId ?? chainId,
+    query: parameters.query,
   })
-  const enabled = Boolean(key && name && (query.enabled ?? true))
-
-  return useQuery({ ...query, ...options, enabled })
+  return useQuery(options)
 }

package/src/hooks/useEstimateFeesPerGas.ts

@@ -1,5 +1,4 @@
 'use client'
-
 import type {
   Config,
   EstimateFeesPerGasErrorType,
@@ -9,13 +8,10 @@ import type { Compute } from '@wagmi/core/internal'
 import {
   type EstimateFeesPerGasData,
   type EstimateFeesPerGasOptions,
-  type EstimateFeesPerGasQueryFnData,
-  type EstimateFeesPerGasQueryKey,
   estimateFeesPerGasQueryOptions,
 } from '@wagmi/core/query'
 import type { FeeValuesType } from 'viem'
-
-import type { ConfigParameter, QueryParameter } from '../types/properties.js'
+import type { ConfigParameter } from '../types/properties.js'
 import { type UseQueryReturnType, useQuery } from '../utils/query.js'
 import { useChainId } from './useChainId.js'
 import { useConfig } from './useConfig.js'
@@ -25,14 +21,7 @@ export type UseEstimateFeesPerGasParameters<
   config extends Config = Config,
   selectData = EstimateFeesPerGasData<type>,
 > = Compute<
-  EstimateFeesPerGasOptions<type, config> &
-    ConfigParameter<config> &
-    QueryParameter<
-      EstimateFeesPerGasQueryFnData<type>,
-      EstimateFeesPerGasErrorType,
-      selectData,
-      EstimateFeesPerGasQueryKey<config, type>
-    >
+  EstimateFeesPerGasOptions<type, config, selectData> & ConfigParameter<config>
 >
 
 export type UseEstimateFeesPerGasReturnType<
@@ -48,15 +37,12 @@ export function useEstimateFeesPerGas<
 >(
   parameters: UseEstimateFeesPerGasParameters<type, config, selectData> = {},
 ): UseEstimateFeesPerGasReturnType<type, selectData> {
-  const { query = {} } = parameters
-
   const config = useConfig(parameters)
   const chainId = useChainId({ config })
-
   const options = estimateFeesPerGasQueryOptions(config, {
     ...parameters,
     chainId: parameters.chainId ?? chainId,
+    query: parameters.query,
   })
-
-  return useQuery({ ...query, ...options })
+  return useQuery(options)
 }