@wagmi/core 3.2.0 → 3.2.2

package/dist/types/tempo/actions/utils.d.ts

@@ -6,4 +6,5 @@ export type QueryParameter<queryFnData = unknown, error = Query.DefaultError, da
 export type QueryOptions<queryFnData = unknown, error = Query.DefaultError, data = queryFnData, queryKey extends Query.QueryKey = Query.QueryKey> = RequiredBy<Query.QueryOptions<queryFnData, error, data, queryKey>, 'queryKey' | 'queryFn'> & {
     enabled: boolean;
 };
+export declare function filterQueryOptions<type extends Record<string, unknown>>(options: type): type;
 //# sourceMappingURL=utils.d.ts.map

package/dist/types/tempo/actions/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/tempo/actions/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,KAAK,MAAM,sBAAsB,CAAA;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAEtE,MAAM,MAAM,cAAc,CACxB,WAAW,GAAG,OAAO,EACrB,KAAK,GAAG,KAAK,CAAC,YAAY,EAC1B,IAAI,GAAG,WAAW,EAClB,QAAQ,SAAS,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,IAC9C;IACF,KAAK,CAAC,EACF,cAAc,CACZ,YAAY,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,EAChD,UAAU,GAAG,SAAS,CACvB,GACD,SAAS,CAAA;CACd,CAAA;AAED,MAAM,MAAM,YAAY,CACtB,WAAW,GAAG,OAAO,EACrB,KAAK,GAAG,KAAK,CAAC,YAAY,EAC1B,IAAI,GAAG,WAAW,EAClB,QAAQ,SAAS,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,IAC9C,UAAU,CACZ,KAAK,CAAC,YAAY,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,EACtD,UAAU,GAAG,SAAS,CACvB,GAAG;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/tempo/actions/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,KAAK,MAAM,sBAAsB,CAAA;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAEtE,MAAM,MAAM,cAAc,CACxB,WAAW,GAAG,OAAO,EACrB,KAAK,GAAG,KAAK,CAAC,YAAY,EAC1B,IAAI,GAAG,WAAW,EAClB,QAAQ,SAAS,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,IAC9C;IACF,KAAK,CAAC,EACF,cAAc,CACZ,YAAY,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,EAChD,UAAU,GAAG,SAAS,CACvB,GACD,SAAS,CAAA;CACd,CAAA;AAED,MAAM,MAAM,YAAY,CACtB,WAAW,GAAG,OAAO,EACrB,KAAK,GAAG,KAAK,CAAC,YAAY,EAC1B,IAAI,GAAG,WAAW,EAClB,QAAQ,SAAS,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,IAC9C,UAAU,CACZ,KAAK,CAAC,YAAY,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,EACtD,UAAU,GAAG,SAAS,CACvB,GAAG;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAA;AAExB,wBAAgB,kBAAkB,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrE,OAAO,EAAE,IAAI,GACZ,IAAI,CAsBN"}

package/dist/types/types/query.d.ts

@@ -0,0 +1,9 @@
+import type * as Query from '@tanstack/query-core';
+import type { RequiredBy, UnionLooseOmit } from './utils.js';
+export type QueryParameter<queryFnData = unknown, error = Query.DefaultError, data = queryFnData, queryKey extends Query.QueryKey = Query.QueryKey> = {
+    query?: UnionLooseOmit<QueryOptions<queryFnData, error, data, queryKey>, 'queryKey' | 'queryFn'> | undefined;
+};
+export type QueryOptions<queryFnData = unknown, error = Query.DefaultError, data = queryFnData, queryKey extends Query.QueryKey = Query.QueryKey> = Omit<RequiredBy<Query.QueryObserverOptions<queryFnData, error, data, queryFnData, queryKey>, 'queryKey'>, 'queryFn' | 'queryHash' | 'queryKeyHashFn' | 'throwOnError'> & {
+    queryFn: Exclude<Query.QueryObserverOptions<queryFnData, error, data, queryFnData, queryKey>['queryFn'], typeof Query.skipToken | undefined>;
+};
+//# sourceMappingURL=query.d.ts.map

package/dist/types/types/query.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../src/types/query.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,KAAK,MAAM,sBAAsB,CAAA;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAE5D,MAAM,MAAM,cAAc,CACxB,WAAW,GAAG,OAAO,EACrB,KAAK,GAAG,KAAK,CAAC,YAAY,EAC1B,IAAI,GAAG,WAAW,EAClB,QAAQ,SAAS,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,IAC9C;IACF,KAAK,CAAC,EACF,cAAc,CACZ,YAAY,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,EAChD,UAAU,GAAG,SAAS,CACvB,GACD,SAAS,CAAA;CACd,CAAA;AAED,MAAM,MAAM,YAAY,CACtB,WAAW,GAAG,OAAO,EACrB,KAAK,GAAG,KAAK,CAAC,YAAY,EAC1B,IAAI,GAAG,WAAW,EAClB,QAAQ,SAAS,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,IAC9C,IAAI,CACN,UAAU,CACR,KAAK,CAAC,oBAAoB,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,CAAC,EAC3E,UAAU,CACX,EACD,SAAS,GAAG,WAAW,GAAG,gBAAgB,GAAG,cAAc,CAC5D,GAAG;IACF,OAAO,EAAE,OAAO,CACd,KAAK,CAAC,oBAAoB,CACxB,WAAW,EACX,KAAK,EACL,IAAI,EACJ,WAAW,EACX,QAAQ,CACT,CAAC,SAAS,CAAC,EACZ,OAAO,KAAK,CAAC,SAAS,GAAG,SAAS,CACnC,CAAA;CACF,CAAA"}

package/dist/types/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "3.2.0";
+export declare const version = "3.2.2";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wagmi/core",
   "description": "VanillaJS library for Ethereum",
-  "version": "3.2.0",
+  "version": "3.2.2",
   "license": "MIT",
   "repository": {
     "type": "git",

package/src/actions/prepareTransactionRequest.ts

@@ -13,7 +13,6 @@ import type { Config } from '../createConfig.js'
 import type { SelectChains } from '../types/chain.js'
 import type { ChainIdParameter } from '../types/properties.js'
 import type {
-  Compute,
   IsNarrowable,
   UnionCompute,
   UnionStrictOmit,
@@ -73,19 +72,17 @@ export type PrepareTransactionRequestReturnType<
   ///
   chains extends readonly Chain[] = SelectChains<config, chainId>,
 > = {
-  [key in keyof chains]: Compute<
-    viem_PrepareTransactionRequestReturnType<
+  [key in keyof chains]: viem_PrepareTransactionRequestReturnType<
+    IsNarrowable<chains[key], Chain> extends true ? chains[key] : undefined,
+    Account,
+    chains[key],
+    Account,
+    request extends viem_PrepareTransactionRequestRequest<
       IsNarrowable<chains[key], Chain> extends true ? chains[key] : undefined,
-      Account,
-      chains[key],
-      Account,
-      request extends viem_PrepareTransactionRequestRequest<
-        IsNarrowable<chains[key], Chain> extends true ? chains[key] : undefined,
-        chains[key]
-      >
-        ? request
-        : never
+      chains[key]
     >
+      ? request
+      : never
   > & {
     chainId: chains[key]['id']
   }

package/src/actions/simulateContract.ts

@@ -20,12 +20,7 @@ import type {
   ChainIdParameter,
   ConnectorParameter,
 } from '../types/properties.js'
-import type {
-  Compute,
-  PartialBy,
-  UnionCompute,
-  UnionStrictOmit,
-} from '../types/utils.js'
+import type { Compute, PartialBy, UnionCompute } from '../types/utils.js'
 import { getAction } from '../utils/getAction.js'
 import {
   type GetConnectorClientErrorType,
@@ -51,19 +46,16 @@ export type SimulateContractParameters<
   chains extends readonly Chain[] = SelectChains<config, chainId>,
 > = {
   [key in keyof chains]: UnionCompute<
-    UnionStrictOmit<
-      viem_SimulateContractParameters<
-        abi,
-        functionName,
-        args,
-        chains[key],
-        chains[key],
-        Account | Address
-      >,
-      'chain'
+    // TODO: Should use `UnionStrictOmit<..., 'chain'>` on `viem_SimulateContractParameters` result instead, but it knocks out inference for overloads
+    viem_SimulateContractParameters<
+      abi,
+      functionName,
+      args,
+      chains[key],
+      chains[key],
+      Account | Address
     >
-  > &
-    ChainIdParameter<config, chainId> &
+  > & { chain?: never } & ChainIdParameter<config, chainId> &
     ConnectorParameter
 }[number]
 
@@ -117,7 +109,7 @@ export async function simulateContract<
   config extends Config,
   const abi extends Abi | readonly unknown[],
   functionName extends ContractFunctionName<abi, 'nonpayable' | 'payable'>,
-  args extends ContractFunctionArgs<
+  const args extends ContractFunctionArgs<
     abi,
     'nonpayable' | 'payable',
     functionName

package/src/actions/verifyTypedData.ts

@@ -8,14 +8,14 @@ import {
 
 import type { Config } from '../createConfig.js'
 import type { ChainIdParameter } from '../types/properties.js'
-import type { Compute } from '../types/utils.js'
+import type { UnionCompute } from '../types/utils.js'
 import { getAction } from '../utils/getAction.js'
 
 export type VerifyTypedDataParameters<
   typedData extends TypedData | Record<string, unknown> = TypedData,
   primaryType extends keyof typedData | 'EIP712Domain' = keyof typedData,
   config extends Config = Config,
-> = Compute<
+> = UnionCompute<
   viem_VerifyTypedDataParameters<typedData, primaryType> &
     ChainIdParameter<config>
 >

package/src/exports/internal.ts

@@ -31,6 +31,8 @@ export type {
   ScopeKeyParameter,
 } from '../types/properties.js'
 
+export type { QueryParameter } from '../types/query.js'
+
 export type {
   Compute,
   ExactPartial,

package/src/exports/query.ts

@@ -8,6 +8,7 @@ export {
   type CallOptions,
   type CallQueryFnData,
   type CallQueryKey,
+  type CallQueryOptions,
   callQueryKey,
   callQueryOptions,
 } from '../query/call.js'
@@ -41,6 +42,7 @@ export {
   type EstimateFeesPerGasOptions,
   type EstimateFeesPerGasQueryFnData,
   type EstimateFeesPerGasQueryKey,
+  type EstimateFeesPerGasQueryOptions,
   estimateFeesPerGasQueryKey,
   estimateFeesPerGasQueryOptions,
 } from '../query/estimateFeesPerGas.js'
@@ -50,6 +52,7 @@ export {
   type EstimateGasOptions,
   type EstimateGasQueryFnData,
   type EstimateGasQueryKey,
+  type EstimateGasQueryOptions,
   estimateGasQueryKey,
   estimateGasQueryOptions,
 } from '../query/estimateGas.js'
@@ -59,6 +62,7 @@ export {
   type EstimateMaxPriorityFeePerGasOptions,
   type EstimateMaxPriorityFeePerGasQueryFnData,
   type EstimateMaxPriorityFeePerGasQueryKey,
+  type EstimateMaxPriorityFeePerGasQueryOptions,
   estimateMaxPriorityFeePerGasQueryKey,
   estimateMaxPriorityFeePerGasQueryOptions,
 } from '../query/estimateMaxPriorityFeePerGas.js'
@@ -68,6 +72,7 @@ export {
   type GetBalanceOptions,
   type GetBalanceQueryFnData,
   type GetBalanceQueryKey,
+  type GetBalanceQueryOptions,
   getBalanceQueryKey,
   getBalanceQueryOptions,
 } from '../query/getBalance.js'
@@ -77,6 +82,7 @@ export {
   type GetBlockOptions,
   type GetBlockQueryFnData,
   type GetBlockQueryKey,
+  type GetBlockQueryOptions,
   getBlockQueryKey,
   getBlockQueryOptions,
 } from '../query/getBlock.js'
@@ -86,6 +92,7 @@ export {
   type GetBlockNumberOptions,
   type GetBlockNumberQueryFnData,
   type GetBlockNumberQueryKey,
+  type GetBlockNumberQueryOptions,
   getBlockNumberQueryKey,
   getBlockNumberQueryOptions,
 } from '../query/getBlockNumber.js'
@@ -95,6 +102,7 @@ export {
   type GetBlockTransactionCountOptions,
   type GetBlockTransactionCountQueryFnData,
   type GetBlockTransactionCountQueryKey,
+  type GetBlockTransactionCountQueryOptions,
   getBlockTransactionCountQueryKey,
   getBlockTransactionCountQueryOptions,
 } from '../query/getBlockTransactionCount.js'
@@ -104,6 +112,7 @@ export {
   type GetBytecodeOptions,
   type GetBytecodeQueryFnData,
   type GetBytecodeQueryKey,
+  type GetBytecodeQueryOptions,
   getBytecodeQueryKey,
   getBytecodeQueryOptions,
 } from '../query/getBytecode.js'
@@ -113,6 +122,7 @@ export {
   type GetCallsStatusOptions,
   type GetCallsStatusQueryFnData,
   type GetCallsStatusQueryKey,
+  type GetCallsStatusQueryOptions,
   getCallsStatusQueryKey,
   getCallsStatusQueryOptions,
 } from '../query/getCallsStatus.js'
@@ -122,6 +132,7 @@ export {
   type GetCapabilitiesOptions,
   type GetCapabilitiesQueryFnData,
   type GetCapabilitiesQueryKey,
+  type GetCapabilitiesQueryOptions,
   getCapabilitiesQueryKey,
   getCapabilitiesQueryOptions,
 } from '../query/getCapabilities.js'
@@ -131,6 +142,7 @@ export {
   type GetConnectorClientOptions,
   type GetConnectorClientQueryFnData,
   type GetConnectorClientQueryKey,
+  type GetConnectorClientQueryOptions,
   getConnectorClientQueryKey,
   getConnectorClientQueryOptions,
 } from '../query/getConnectorClient.js'
@@ -140,6 +152,7 @@ export {
   type GetEnsAddressOptions,
   type GetEnsAddressQueryFnData,
   type GetEnsAddressQueryKey,
+  type GetEnsAddressQueryOptions,
   getEnsAddressQueryKey,
   getEnsAddressQueryOptions,
 } from '../query/getEnsAddress.js'
@@ -149,6 +162,7 @@ export {
   type GetEnsAvatarOptions,
   type GetEnsAvatarQueryFnData,
   type GetEnsAvatarQueryKey,
+  type GetEnsAvatarQueryOptions,
   getEnsAvatarQueryKey,
   getEnsAvatarQueryOptions,
 } from '../query/getEnsAvatar.js'
@@ -158,6 +172,7 @@ export {
   type GetEnsNameOptions,
   type GetEnsNameQueryFnData,
   type GetEnsNameQueryKey,
+  type GetEnsNameQueryOptions,
   getEnsNameQueryKey,
   getEnsNameQueryOptions,
 } from '../query/getEnsName.js'
@@ -167,6 +182,7 @@ export {
   type GetEnsResolverOptions,
   type GetEnsResolverQueryFnData,
   type GetEnsResolverQueryKey,
+  type GetEnsResolverQueryOptions,
   getEnsResolverQueryKey,
   getEnsResolverQueryOptions,
 } from '../query/getEnsResolver.js'
@@ -176,6 +192,7 @@ export {
   type GetEnsTextOptions,
   type GetEnsTextQueryFnData,
   type GetEnsTextQueryKey,
+  type GetEnsTextQueryOptions,
   getEnsTextQueryKey,
   getEnsTextQueryOptions,
 } from '../query/getEnsText.js'
@@ -185,6 +202,7 @@ export {
   type GetFeeHistoryOptions,
   type GetFeeHistoryQueryFnData,
   type GetFeeHistoryQueryKey,
+  type GetFeeHistoryQueryOptions,
   getFeeHistoryQueryKey,
   getFeeHistoryQueryOptions,
 } from '../query/getFeeHistory.js'
@@ -194,6 +212,7 @@ export {
   type GetGasPriceOptions,
   type GetGasPriceQueryFnData,
   type GetGasPriceQueryKey,
+  type GetGasPriceQueryOptions,
   getGasPriceQueryKey,
   getGasPriceQueryOptions,
 } from '../query/getGasPrice.js'
@@ -203,6 +222,7 @@ export {
   type GetProofOptions,
   type GetProofQueryFnData,
   type GetProofQueryKey,
+  type GetProofQueryOptions,
   getProofQueryKey,
   getProofQueryOptions,
 } from '../query/getProof.js'
@@ -212,6 +232,7 @@ export {
   type GetStorageAtOptions,
   type GetStorageAtQueryFnData,
   type GetStorageAtQueryKey,
+  type GetStorageAtQueryOptions,
   getStorageAtQueryKey,
   getStorageAtQueryOptions,
 } from '../query/getStorageAt.js'
@@ -221,6 +242,7 @@ export {
   type GetTransactionOptions,
   type GetTransactionQueryFnData,
   type GetTransactionQueryKey,
+  type GetTransactionQueryOptions,
   getTransactionQueryKey,
   getTransactionQueryOptions,
 } from '../query/getTransaction.js'
@@ -230,6 +252,7 @@ export {
   type GetTransactionConfirmationsOptions,
   type GetTransactionConfirmationsQueryFnData,
   type GetTransactionConfirmationsQueryKey,
+  type GetTransactionConfirmationsQueryOptions,
   getTransactionConfirmationsQueryKey,
   getTransactionConfirmationsQueryOptions,
 } from '../query/getTransactionConfirmations.js'
@@ -239,6 +262,7 @@ export {
   type GetTransactionCountOptions,
   type GetTransactionCountQueryFnData,
   type GetTransactionCountQueryKey,
+  type GetTransactionCountQueryOptions,
   getTransactionCountQueryKey,
   getTransactionCountQueryOptions,
 } from '../query/getTransactionCount.js'
@@ -248,6 +272,7 @@ export {
   type GetTransactionReceiptOptions,
   type GetTransactionReceiptQueryFnData,
   type GetTransactionReceiptQueryKey,
+  type GetTransactionReceiptQueryOptions,
   getTransactionReceiptQueryKey,
   getTransactionReceiptQueryOptions,
 } from '../query/getTransactionReceipt.js'
@@ -257,6 +282,7 @@ export {
   type GetWalletClientOptions,
   type GetWalletClientQueryFnData,
   type GetWalletClientQueryKey,
+  type GetWalletClientQueryOptions,
   getWalletClientQueryKey,
   getWalletClientQueryOptions,
 } from '../query/getWalletClient.js'
@@ -275,6 +301,7 @@ export {
   type PrepareTransactionRequestOptions,
   type PrepareTransactionRequestQueryFnData,
   type PrepareTransactionRequestQueryKey,
+  type PrepareTransactionRequestQueryOptions,
   prepareTransactionRequestQueryKey,
   prepareTransactionRequestQueryOptions,
 } from '../query/prepareTransactionRequest.js'
@@ -284,6 +311,7 @@ export {
   type ReadContractOptions,
   type ReadContractQueryFnData,
   type ReadContractQueryKey,
+  type ReadContractQueryOptions,
   readContractQueryKey,
   readContractQueryOptions,
 } from '../query/readContract.js'
@@ -293,6 +321,7 @@ export {
   type ReadContractsOptions,
   type ReadContractsQueryFnData,
   type ReadContractsQueryKey,
+  type ReadContractsQueryOptions,
   readContractsQueryKey,
   readContractsQueryOptions,
 } from '../query/readContracts.js'
@@ -366,6 +395,7 @@ export {
   type SimulateContractOptions,
   type SimulateContractQueryFnData,
   type SimulateContractQueryKey,
+  type SimulateContractQueryOptions,
   simulateContractQueryKey,
   simulateContractQueryOptions,
 } from '../query/simulateContract.js'
@@ -406,6 +436,7 @@ export {
   type VerifyMessageOptions,
   type VerifyMessageQueryFnData,
   type VerifyMessageQueryKey,
+  type VerifyMessageQueryOptions,
   verifyMessageQueryKey,
   verifyMessageQueryOptions,
 } from '../query/verifyMessage.js'
@@ -415,6 +446,7 @@ export {
   type VerifyTypedDataOptions,
   type VerifyTypedDataQueryFnData,
   type VerifyTypedDataQueryKey,
+  type VerifyTypedDataQueryOptions,
   verifyTypedDataQueryKey,
   verifyTypedDataQueryOptions,
 } from '../query/verifyTypedData.js'
@@ -424,6 +456,7 @@ export {
   type WaitForCallsStatusOptions,
   type WaitForCallsStatusQueryFnData,
   type WaitForCallsStatusQueryKey,
+  type WaitForCallsStatusQueryOptions,
   waitForCallsStatusQueryKey,
   waitForCallsStatusQueryOptions,
 } from '../query/waitForCallsStatus.js'
@@ -433,6 +466,7 @@ export {
   type WaitForTransactionReceiptOptions,
   type WaitForTransactionReceiptQueryFnData,
   type WaitForTransactionReceiptQueryKey,
+  type WaitForTransactionReceiptQueryOptions,
   waitForTransactionReceiptQueryKey,
   waitForTransactionReceiptQueryOptions,
 } from '../query/waitForTransactionReceipt.js'

package/src/query/call.ts

@@ -1,5 +1,3 @@
-import type { QueryOptions } from '@tanstack/query-core'
-
 import {
   type CallErrorType,
   type CallParameters,
@@ -8,32 +6,35 @@ import {
 } from '../actions/call.js'
 import type { Config } from '../createConfig.js'
 import type { ScopeKeyParameter } from '../types/properties.js'
+import type { QueryOptions, QueryParameter } from '../types/query.js'
 import type { Compute, ExactPartial } from '../types/utils.js'
 import { filterQueryOptions } from './utils.js'
 
-export type CallOptions<config extends Config> = Compute<
+export type CallOptions<config extends Config, selectData = CallData> = Compute<
   ExactPartial<CallParameters<config>> & ScopeKeyParameter
->
+> &
+  QueryParameter<
+    CallQueryFnData,
+    CallErrorType,
+    selectData,
+    CallQueryKey<config>
+  >
 
-export function callQueryOptions<config extends Config>(
+export function callQueryOptions<config extends Config, selectData = CallData>(
   config: config,
-  options: CallOptions<config> = {},
-) {
+  options: CallOptions<config, selectData> = {},
+): CallQueryOptions<config, selectData> {
   return {
-    async queryFn({ queryKey }) {
-      const { scopeKey: _, ...parameters } = queryKey[1]
+    ...options.query,
+    queryFn: async (context) => {
+      const [, { scopeKey: _, ...parameters }] = context.queryKey
       const data = await call(config, {
         ...parameters,
       } as CallParameters)
       return data ?? null
     },
     queryKey: callQueryKey(options),
-  } as const satisfies QueryOptions<
-    CallQueryFnData,
-    CallErrorType,
-    CallData,
-    CallQueryKey<config>
-  >
+  }
 }
 
 export type CallQueryFnData = CallReturnType
@@ -41,7 +42,9 @@ export type CallQueryFnData = CallReturnType
 export type CallData = CallQueryFnData
 
 export function callQueryKey<config extends Config>(
-  options: CallOptions<config>,
+  options: Compute<
+    ExactPartial<CallParameters<config>> & ScopeKeyParameter
+  > = {},
 ) {
   return ['call', filterQueryOptions(options)] as const
 }
@@ -49,3 +52,13 @@ export function callQueryKey<config extends Config>(
 export type CallQueryKey<config extends Config> = ReturnType<
   typeof callQueryKey<config>
 >
+
+export type CallQueryOptions<
+  config extends Config,
+  selectData = CallData,
+> = QueryOptions<
+  CallQueryFnData,
+  CallErrorType,
+  selectData,
+  CallQueryKey<config>
+>

package/src/query/estimateFeesPerGas.ts

@@ -1,4 +1,3 @@
-import type { QueryOptions } from '@tanstack/query-core'
 import type { FeeValuesType } from 'viem'
 
 import {
@@ -9,32 +8,40 @@ import {
 } from '../actions/estimateFeesPerGas.js'
 import type { Config } from '../createConfig.js'
 import type { ScopeKeyParameter } from '../types/properties.js'
+import type { QueryOptions, QueryParameter } from '../types/query.js'
 import type { Compute, ExactPartial } from '../types/utils.js'
 import { filterQueryOptions } from './utils.js'
 
 export type EstimateFeesPerGasOptions<
   type extends FeeValuesType,
   config extends Config,
+  selectData = EstimateFeesPerGasData<type>,
 > = Compute<
   ExactPartial<EstimateFeesPerGasParameters<type, config>> & ScopeKeyParameter
->
+> &
+  QueryParameter<
+    EstimateFeesPerGasQueryFnData<type>,
+    EstimateFeesPerGasErrorType,
+    selectData,
+    EstimateFeesPerGasQueryKey<config, type>
+  >
 
 export function estimateFeesPerGasQueryOptions<
   config extends Config,
   type extends FeeValuesType = 'eip1559',
->(config: config, options: EstimateFeesPerGasOptions<type, config> = {}) {
+  selectData = EstimateFeesPerGasData<type>,
+>(
+  config: config,
+  options: EstimateFeesPerGasOptions<type, config, selectData> = {},
+): EstimateFeesPerGasQueryOptions<type, config, selectData> {
   return {
-    async queryFn({ queryKey }) {
-      const { scopeKey: _, ...parameters } = queryKey[1]
+    ...options.query,
+    queryFn: async (context) => {
+      const [, { scopeKey: _, ...parameters }] = context.queryKey
       return estimateFeesPerGas(config, parameters)
     },
     queryKey: estimateFeesPerGasQueryKey(options),
-  } as const satisfies QueryOptions<
-    EstimateFeesPerGasQueryFnData<type>,
-    EstimateFeesPerGasErrorType,
-    EstimateFeesPerGasData<type>,
-    EstimateFeesPerGasQueryKey<config, type>
-  >
+  }
 }
 
 export type EstimateFeesPerGasQueryFnData<type extends FeeValuesType> =
@@ -46,7 +53,11 @@ export type EstimateFeesPerGasData<type extends FeeValuesType> =
 export function estimateFeesPerGasQueryKey<
   config extends Config,
   type extends FeeValuesType = 'eip1559',
->(options: EstimateFeesPerGasOptions<type, config> = {}) {
+>(
+  options: Compute<
+    ExactPartial<EstimateFeesPerGasParameters<type, config>> & ScopeKeyParameter
+  > = {},
+) {
   return ['estimateFeesPerGas', filterQueryOptions(options)] as const
 }
 
@@ -54,3 +65,14 @@ export type EstimateFeesPerGasQueryKey<
   config extends Config,
   type extends FeeValuesType,
 > = ReturnType<typeof estimateFeesPerGasQueryKey<config, type>>
+
+export type EstimateFeesPerGasQueryOptions<
+  type extends FeeValuesType,
+  config extends Config,
+  selectData = EstimateFeesPerGasData<type>,
+> = QueryOptions<
+  EstimateFeesPerGasQueryFnData<type>,
+  EstimateFeesPerGasErrorType,
+  selectData,
+  EstimateFeesPerGasQueryKey<config, type>
+>