wagmi 2.0.0-beta.3 → 2.0.0-beta.5

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({ ...queryOptions, ...query, 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({ ...queryOptions, ...query, 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({ ...queryOptions, ...query, enabled })
+  return useQuery({
+    ...(query as any),
+    ...options,
+    enabled,
+  }) as UseTransactionReturnType<config, chainId, selectData>
 }

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({ ...queryOptions, ...query, 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
@@ -88,8 +91,8 @@ export function useWalletClient<
   }, [address, queryClient])
 
   return useQuery({
-    ...options,
     ...query,
+    ...options,
     queryKey,
     enabled,
     staleTime: Infinity,

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.3'
+export const version = '2.0.0-beta.5'