wagmi 2.0.0-beta.4 → 2.0.0-beta.6

package/src/hooks/useEnsAvatar.ts

@@ -48,11 +48,11 @@ export function useEnsAvatar<
   const config = useConfig(parameters)
   const chainId = useChainId()
 
-  const queryOptions = getEnsAvatarQueryOptions(config, {
+  const options = getEnsAvatarQueryOptions(config, {
     ...parameters,
     chainId: parameters.chainId ?? chainId,
   })
   const enabled = Boolean(name && (query.enabled ?? true))
 
-  return useQuery({ ...query, ...queryOptions, enabled })
+  return useQuery({ ...query, ...options, enabled })
 }

package/src/hooks/useEnsName.ts

@@ -44,11 +44,11 @@ export function useEnsName<
   const config = useConfig(parameters)
   const chainId = useChainId()
 
-  const queryOptions = getEnsNameQueryOptions(config, {
+  const options = getEnsNameQueryOptions(config, {
     ...parameters,
     chainId: parameters.chainId ?? chainId,
   })
   const enabled = Boolean(address && (query.enabled ?? true))
 
-  return useQuery({ ...query, ...queryOptions, enabled })
+  return useQuery({ ...query, ...options, enabled })
 }

package/src/hooks/useEnsResolver.ts

@@ -48,11 +48,11 @@ export function useEnsResolver<
   const config = useConfig(parameters)
   const chainId = useChainId()
 
-  const queryOptions = getEnsResolverQueryOptions(config, {
+  const options = getEnsResolverQueryOptions(config, {
     ...parameters,
     chainId: parameters.chainId ?? chainId,
   })
   const enabled = Boolean(name && (query.enabled ?? true))
 
-  return useQuery({ ...query, ...queryOptions, enabled })
+  return useQuery({ ...query, ...options, enabled })
 }

package/src/hooks/useEstimateFeesPerGas.ts

@@ -53,10 +53,10 @@ export function useEstimateFeesPerGas<
   const config = useConfig(parameters)
   const chainId = useChainId()
 
-  const queryOptions = estimateFeesPerGasQueryOptions(config, {
+  const options = estimateFeesPerGasQueryOptions(config, {
     ...parameters,
     chainId: parameters.chainId ?? chainId,
   })
 
-  return useQuery({ ...query, ...queryOptions })
+  return useQuery({ ...query, ...options })
 }

package/src/hooks/useEstimateGas.ts

@@ -64,13 +64,13 @@ export function useEstimateGas(
   const account = parameters.account ?? connectorClient?.account
   const chainId = useChainId()
 
-  const queryOptions = estimateGasQueryOptions(config, {
-    ...(parameters as any),
+  const options = estimateGasQueryOptions(config, {
+    ...parameters,
     account,
     chainId: parameters.chainId ?? chainId,
     connector,
   })
   const enabled = Boolean((account || connector) && (query.enabled ?? true))
 
-  return useQuery({ ...query, ...queryOptions, enabled })
+  return useQuery({ ...query, ...options, enabled })
 }

package/src/hooks/useInfiniteReadContracts.ts

@@ -16,7 +16,10 @@ import type {
   InfiniteReadContractsData,
   InfiniteReadContractsOptions,
 } from '../exports/query.js'
-import type { ConfigParameter } from '../types/properties.js'
+import type {
+  ConfigParameter,
+  InfiniteQueryParameter,
+} from '../types/properties.js'
 import {
   type UseInfiniteQueryParameters,
   type UseInfiniteQueryReturnType,
@@ -33,16 +36,15 @@ export type UseInfiniteContractReadsParameters<
   pageParam = unknown,
   selectData = InfiniteReadContractsData<contracts, allowFailure>,
 > = InfiniteReadContractsOptions<contracts, allowFailure, pageParam, config> &
-  ConfigParameter<config> & {
-    query: UseInfiniteQueryParameters<
-      InfiniteReadContractsQueryFnData<contracts, allowFailure>,
-      ReadContractsErrorType,
-      selectData,
-      InfiniteReadContractsData<contracts, allowFailure>,
-      InfiniteReadContractsQueryKey<contracts, allowFailure, pageParam, config>,
-      pageParam
-    >
-  }
+  ConfigParameter<config> &
+  InfiniteQueryParameter<
+    InfiniteReadContractsQueryFnData<contracts, allowFailure>,
+    ReadContractsErrorType,
+    selectData,
+    InfiniteReadContractsData<contracts, allowFailure>,
+    InfiniteReadContractsQueryKey<contracts, allowFailure, pageParam, config>,
+    pageParam
+  >
 
 export type UseInfiniteContractReadsReturnType<
   contracts extends readonly unknown[] = readonly ContractFunctionParameters[],
@@ -71,7 +73,7 @@ export function useInfiniteReadContracts<
   const config = useConfig(parameters)
   const chainId = useChainId()
 
-  const queryOptions = infiniteReadContractsQueryOptions(config, {
+  const options = infiniteReadContractsQueryOptions(config, {
     ...parameters,
     chainId,
     contracts: contracts as UseInfiniteContractReadsParameters['contracts'],
@@ -79,9 +81,9 @@ export function useInfiniteReadContracts<
   })
 
   return useInfiniteQuery({
-    ...queryOptions,
     ...(query as any),
-    initialPageParam: queryOptions.initialPageParam,
+    ...options,
+    initialPageParam: options.initialPageParam,
     structuralSharing: query.structuralSharing ?? structuralSharing,
   })
 }

package/src/hooks/useReadContract.ts

@@ -87,17 +87,17 @@ export function useReadContract<
   const config = useConfig(parameters)
   const chainId = useChainId()
 
-  const queryOptions = readContractQueryOptions(config, {
-    ...(parameters as any),
-    chainId: parameters.chainId ?? chainId,
-  })
+  const options = readContractQueryOptions<config, abi, functionName, args>(
+    config,
+    { ...(parameters as any), chainId: parameters.chainId ?? chainId },
+  )
   const enabled = Boolean(
     address && abi && functionName && (query.enabled ?? true),
   )
 
   return useQuery({
-    ...queryOptions,
     ...query,
+    ...options,
     enabled,
     structuralSharing: query.structuralSharing ?? structuralSharing,
   })

package/src/hooks/useReadContracts.ts

@@ -14,9 +14,12 @@ import {
   readContractsQueryOptions,
 } from '@wagmi/core/query'
 import { useMemo } from 'react'
-import type { ContractFunctionParameters } from 'viem'
+import { type ContractFunctionParameters } from 'viem'
 
-import type { ConfigParameter, QueryParameter } from '../types/properties.js'
+import {
+  type ConfigParameter,
+  type QueryParameter,
+} from '../types/properties.js'
 import {
   type UseQueryReturnType,
   structuralSharing,
@@ -66,11 +69,11 @@ export function useReadContracts<
   const config = useConfig(parameters)
   const chainId = useChainId()
 
-  const queryOptions = readContractsQueryOptions(config, {
-    ...parameters,
-    chainId,
-    contracts,
-  })
+  const options = readContractsQueryOptions<config, contracts, allowFailure>(
+    config,
+    { ...parameters, chainId },
+  )
+
   const enabled = useMemo(() => {
     let isContractsValid = false
     for (const contract of contracts) {
@@ -86,7 +89,7 @@ export function useReadContracts<
   }, [contracts, query.enabled])
 
   return useQuery({
-    ...queryOptions,
+    ...options,
     ...query,
     enabled,
     structuralSharing: query.structuralSharing ?? structuralSharing,

package/src/hooks/useSimulateContract.ts

@@ -104,8 +104,14 @@ export function useSimulateContract<
   })
   const chainId = useChainId()
 
-  const queryOptions = simulateContractQueryOptions(config, {
-    ...(parameters as any),
+  const options = simulateContractQueryOptions<
+    config,
+    abi,
+    functionName,
+    args,
+    chainId
+  >(config, {
+    ...parameters,
     account: parameters.account ?? connectorClient?.account,
     chainId: parameters.chainId ?? chainId,
   })
@@ -113,5 +119,5 @@ export function useSimulateContract<
     abi && address && functionName && (query.enabled ?? true),
   )
 
-  return useQuery({ ...query, ...queryOptions, enabled })
+  return useQuery({ ...query, ...options, enabled })
 }

package/src/hooks/useToken.ts

@@ -50,11 +50,11 @@ export function useToken<
   const config = useConfig(parameters)
   const chainId = useChainId()
 
-  const queryOptions = getTokenQueryOptions(config, {
+  const options = getTokenQueryOptions(config, {
     ...parameters,
     chainId: parameters.chainId ?? chainId,
   })
   const enabled = Boolean(address && (query.enabled ?? true))
 
-  return useQuery({ ...query, ...queryOptions, enabled })
+  return useQuery({ ...query, ...options, enabled })
 }

package/src/hooks/useTransaction.ts

@@ -53,7 +53,7 @@ export function useTransaction<
   const config = useConfig(parameters)
   const chainId = useChainId()
 
-  const queryOptions = getTransactionQueryOptions(config, {
+  const options = getTransactionQueryOptions(config, {
     ...parameters,
     chainId: parameters.chainId ?? chainId,
   })
@@ -61,5 +61,9 @@ export function useTransaction<
     !(blockHash && blockNumber && blockTag && hash) && (query.enabled ?? true),
   )
 
-  return useQuery({ ...query, ...queryOptions, enabled })
+  return useQuery({
+    ...(query as any),
+    ...options,
+    enabled,
+  }) as UseTransactionReturnType<config, chainId, selectData>
 }

package/src/hooks/useTransactionCount.ts

@@ -0,0 +1,59 @@
+'use client'
+
+import {
+  type Config,
+  type GetTransactionCountErrorType,
+  type ResolvedRegister,
+} from '@wagmi/core'
+import type { Evaluate } from '@wagmi/core/internal'
+import type { GetTransactionCountQueryFnData } from '@wagmi/core/query'
+import {
+  type GetTransactionCountData,
+  type GetTransactionCountOptions,
+  type GetTransactionCountQueryKey,
+  getTransactionCountQueryOptions,
+} from '@wagmi/core/query'
+
+import type { ConfigParameter, QueryParameter } from '../types/properties.js'
+import { type UseQueryReturnType, useQuery } from '../utils/query.js'
+import { useChainId } from './useChainId.js'
+import { useConfig } from './useConfig.js'
+
+export type UseTransactionCountParameters<
+  config extends Config = Config,
+  selectData = GetTransactionCountData,
+> = Evaluate<
+  GetTransactionCountOptions<config> &
+    ConfigParameter<config> &
+    QueryParameter<
+      GetTransactionCountQueryFnData,
+      GetTransactionCountErrorType,
+      selectData,
+      GetTransactionCountQueryKey<config>
+    >
+>
+
+export type UseTransactionCountReturnType<
+  selectData = GetTransactionCountData,
+> = UseQueryReturnType<selectData, GetTransactionCountErrorType>
+
+/** https://beta.wagmi.sh/react/api/hooks/useTransactionCount */
+export function useTransactionCount<
+  config extends Config = ResolvedRegister['config'],
+  selectData = GetTransactionCountData,
+>(
+  parameters: UseTransactionCountParameters<config, selectData> = {},
+): UseTransactionCountReturnType<selectData> {
+  const { address, query = {} } = parameters
+
+  const config = useConfig(parameters)
+  const chainId = useChainId()
+
+  const options = getTransactionCountQueryOptions(config, {
+    ...parameters,
+    chainId: parameters.chainId ?? chainId,
+  })
+  const enabled = Boolean(address && (query.enabled ?? true))
+
+  return useQuery({ ...query, ...options, enabled })
+}

package/src/hooks/useWaitForTransactionReceipt.ts

@@ -57,11 +57,15 @@ export function useWaitForTransactionReceipt<
   const config = useConfig(parameters)
   const chainId = useChainId()
 
-  const queryOptions = waitForTransactionReceiptQueryOptions(config, {
+  const options = waitForTransactionReceiptQueryOptions(config, {
     ...parameters,
     chainId: parameters.chainId ?? chainId,
   })
-  const enabled = Boolean(!hash && (query.enabled ?? true))
+  const enabled = Boolean(hash && (query.enabled ?? true))
 
-  return useQuery({ ...query, ...queryOptions, enabled })
+  return useQuery({
+    ...(query as any),
+    ...options,
+    enabled,
+  }) as UseWaitForTransactionReceiptReturnType<config, chainId, selectData>
 }

package/src/hooks/useWalletClient.ts

@@ -73,11 +73,14 @@ export function useWalletClient<
   const { address, connector, status } = useAccount()
   const chainId = useChainId()
 
-  const { queryKey, ...options } = getWalletClientQueryOptions(config, {
-    ...parameters,
-    chainId: parameters.chainId ?? chainId,
-    connector: parameters.connector ?? connector,
-  })
+  const { queryKey, ...options } = getWalletClientQueryOptions<config, chainId>(
+    config,
+    {
+      ...parameters,
+      chainId: parameters.chainId ?? chainId,
+      connector: parameters.connector ?? connector,
+    },
+  )
   const enabled = Boolean(status !== 'disconnected' && (query.enabled ?? true))
 
   // biome-ignore lint/nursery/useExhaustiveDependencies: `queryKey` not required

package/src/types/properties.ts

@@ -1,7 +1,11 @@
-import type { DefaultError, QueryKey } from '@tanstack/react-query'
-import type { Config } from '@wagmi/core'
+import { type DefaultError, type QueryKey } from '@tanstack/react-query'
+import { type Config } from '@wagmi/core'
+import { type Omit } from '@wagmi/core/internal'
 
-import type { UseQueryParameters } from '../utils/query.js'
+import type {
+  UseInfiniteQueryParameters,
+  UseQueryParameters,
+} from '../utils/query.js'
 
 export type EnabledParameter = {
   enabled?: boolean | undefined
@@ -17,5 +21,31 @@ export type QueryParameter<
   data = queryFnData,
   queryKey extends QueryKey = QueryKey,
 > = {
-  query?: UseQueryParameters<queryFnData, error, data, queryKey> | undefined
+  query?:
+    | Omit<
+        UseQueryParameters<queryFnData, error, data, queryKey>,
+        'queryFn' | 'queryHash' | 'queryKey' | 'queryKeyHashFn' | 'throwOnError'
+      >
+    | undefined
+}
+
+export type InfiniteQueryParameter<
+  queryFnData = unknown,
+  error = DefaultError,
+  data = queryFnData,
+  queryData = queryFnData,
+  queryKey extends QueryKey = QueryKey,
+  pageParam = unknown,
+> = {
+  query: Omit<
+    UseInfiniteQueryParameters<
+      queryFnData,
+      error,
+      data,
+      queryData,
+      queryKey,
+      pageParam
+    >,
+    'queryFn' | 'queryHash' | 'queryKey' | 'queryKeyHashFn' | 'throwOnError'
+  >
 }

package/src/utils/query.ts

@@ -52,23 +52,12 @@ export type UseQueryParameters<
   queryKey extends QueryKey = QueryKey,
 > = Evaluate<
   ExactPartial<
-    Omit<
-      UseQueryOptions<queryFnData, error, data, queryKey>,
-      | 'initialData'
-      | 'queryFn'
-      | 'queryHash'
-      | 'queryKey'
-      | 'queryKeyHashFn'
-      | 'throwOnError'
-    >
+    Omit<UseQueryOptions<queryFnData, error, data, queryKey>, 'initialData'>
   > & {
     // Fix `initialData` type
-    initialData?: UseQueryOptions<
-      queryFnData,
-      error,
-      data,
-      queryKey
-    >['initialData']
+    initialData?:
+      | UseQueryOptions<queryFnData, error, data, queryKey>['initialData']
+      | undefined
   }
 >
 
@@ -113,20 +102,17 @@ export type UseInfiniteQueryParameters<
       queryKey,
       pageParam
     >,
-    | 'initialData'
-    | 'queryFn'
-    | 'queryHash'
-    | 'queryKey'
-    | 'queryKeyHashFn'
-    | 'throwOnError'
+    'initialData'
   > & {
     // Fix `initialData` type
-    initialData?: UseInfiniteQueryOptions<
-      queryFnData,
-      error,
-      data,
-      queryKey
-    >['initialData']
+    initialData?:
+      | UseInfiniteQueryOptions<
+          queryFnData,
+          error,
+          data,
+          queryKey
+        >['initialData']
+      | undefined
   }
 >
 

package/src/version.ts

@@ -1 +1 @@
-export const version = '2.0.0-beta.4'
+export const version = '2.0.0-beta.6'