@wagmi/core 2.0.0-alpha.5 → 2.0.0-alpha.7

package/src/connectors/injected.ts

@@ -28,11 +28,7 @@ export type InjectedParameters = {
   /**
    * [EIP-1193](https://eips.ethereum.org/EIPS/eip-1193) Ethereum Provider to target
    */
-  target?:
-    | TargetId
-    | TargetMap[TargetId]
-    | (() => TargetMap[TargetId] | undefined)
-    | undefined
+  target?: TargetId | Target | (() => Target | undefined) | undefined
 }
 
 const targetMap = {
@@ -91,7 +87,7 @@ const targetMap = {
 export function injected(parameters: InjectedParameters = {}) {
   const { shimDisconnect = true, unstable_shimAsyncInject } = parameters
 
-  function getTarget(): Evaluate<TargetMap[TargetId] & { id: string }> {
+  function getTarget(): Evaluate<Target & { id: string }> {
     const target = parameters.target
     if (typeof target === 'function') {
       const result = target()
@@ -151,7 +147,7 @@ export function injected(parameters: InjectedParameters = {}) {
         accounts = await this.getAccounts().catch(() => null)
         const isAuthorized = !!accounts?.length
         if (isAuthorized)
-          // Attempt to show another prompt for selecting connector if already connected
+          // Attempt to show another prompt for selecting account if already connected
           try {
             const permissions = await provider.request({
               method: 'wallet_requestPermissions',
@@ -262,7 +258,6 @@ export function injected(parameters: InjectedParameters = {}) {
         // automatically whenever there is a targeted connector configured.
         if (!parameters.target) {
           const connected = await config.storage?.getItem('injected.connected')
-          console.log({ connected })
           if (!connected) return false
         }
 
@@ -323,13 +318,11 @@ export function injected(parameters: InjectedParameters = {}) {
       const chain = config.chains.find((x) => x.id === chainId)
       if (!chain) throw new SwitchChainError(new ChainNotConfiguredError())
 
-      const id = numberToHex(chainId)
-
       try {
         await Promise.all([
           provider.request({
             method: 'wallet_switchEthereumChain',
-            params: [{ chainId: id }],
+            params: [{ chainId: numberToHex(chainId) }],
           }),
           new Promise<void>((resolve) =>
             config.emitter.once('change', ({ chainId: currentChainId }) => {
@@ -363,7 +356,7 @@ export function injected(parameters: InjectedParameters = {}) {
               method: 'wallet_addEthereumChain',
               params: [
                 {
-                  chainId: id,
+                  chainId: numberToHex(chainId),
                   chainName: chain.name,
                   nativeCurrency: chain.nativeCurrency,
                   rpcUrls: [chain.rpcUrls.public?.http[0] ?? ''],
@@ -459,7 +452,8 @@ type Target = {
     | ((window?: Window | undefined) => WalletProvider | undefined)
 }
 
-export type TargetId = Evaluate<WalletProviderFlags> extends `is${infer name}`
+/** @deprecated */
+type TargetId = Evaluate<WalletProviderFlags> extends `is${infer name}`
   ? name extends `${infer char}${infer rest}`
     ? `${Lowercase<char>}${rest}`
     : never
@@ -467,6 +461,7 @@ export type TargetId = Evaluate<WalletProviderFlags> extends `is${infer name}`
 
 type TargetMap = { [_ in TargetId]?: Target | undefined }
 
+/** @deprecated */
 type WalletProviderFlags =
   | 'isApexWallet'
   | 'isAvalanche'

package/src/exports/actions.ts

@@ -2,28 +2,28 @@
 // Actions
 
 export {
-  type ConnectError,
+  type ConnectErrorType,
   type ConnectParameters,
   type ConnectReturnType,
   connect,
 } from '../actions/connect.js'
 
 export {
-  type DisconnectError,
+  type DisconnectErrorType,
   type DisconnectParameters,
   type DisconnectReturnType,
   disconnect,
 } from '../actions/disconnect.js'
 
 export {
-  type EstimateGasError,
+  type EstimateGasErrorType,
   type EstimateGasParameters,
   type EstimateGasReturnType,
   estimateGas,
 } from '../actions/estimateGas.js'
 
 export {
-  type EstimateFeesPerGasError,
+  type EstimateFeesPerGasErrorType,
   type EstimateFeesPerGasParameters,
   type EstimateFeesPerGasReturnType,
   estimateFeesPerGas,
@@ -37,21 +37,21 @@ export {
 export {
   type GetBalanceParameters,
   type GetBalanceReturnType,
-  type GetBalanceError,
+  type GetBalanceErrorType,
   getBalance,
   /** @deprecated use `getBalance` instead */
   getBalance as fetchBalance,
 } from '../actions/getBalance.js'
 
 export {
-  type GetBlockError,
+  type GetBlockErrorType,
   type GetBlockParameters,
   type GetBlockReturnType,
   getBlock,
 } from '../actions/getBlock.js'
 
 export {
-  type GetBlockNumberError,
+  type GetBlockNumberErrorType,
   type GetBlockNumberParameters,
   type GetBlockNumberReturnType,
   getBlockNumber,
@@ -81,14 +81,14 @@ export {
 } from '../actions/getConnectors.js'
 
 export {
-  type GetConnectorClientError,
+  type GetConnectorClientErrorType,
   type GetConnectorClientParameters,
   type GetConnectorClientReturnType,
   getConnectorClient,
 } from '../actions/getConnectorClient.js'
 
 export {
-  type GetEnsAddressError,
+  type GetEnsAddressErrorType,
   type GetEnsAddressParameters,
   type GetEnsAddressReturnType,
   getEnsAddress,
@@ -97,7 +97,7 @@ export {
 } from '../actions/getEnsAddress.js'
 
 export {
-  type GetEnsAvatarError,
+  type GetEnsAvatarErrorType,
   type GetEnsAvatarParameters,
   type GetEnsAvatarReturnType,
   getEnsAvatar,
@@ -106,7 +106,7 @@ export {
 } from '../actions/getEnsAvatar.js'
 
 export {
-  type GetEnsNameError,
+  type GetEnsNameErrorType,
   type GetEnsNameParameters,
   type GetEnsNameReturnType,
   getEnsName,
@@ -115,7 +115,7 @@ export {
 } from '../actions/getEnsName.js'
 
 export {
-  type GetEnsResolverError,
+  type GetEnsResolverErrorType,
   type GetEnsResolverParameters,
   type GetEnsResolverReturnType,
   getEnsResolver,
@@ -130,7 +130,7 @@ export {
 } from '../actions/getPublicClient.js'
 
 export {
-  type GetTokenError,
+  type GetTokenErrorType,
   type GetTokenParameters,
   type GetTokenReturnType,
   getToken,
@@ -139,7 +139,7 @@ export {
 } from '../actions/getToken.js'
 
 export {
-  type GetTransactionError,
+  type GetTransactionErrorType,
   type GetTransactionParameters,
   type GetTransactionReturnType,
   getTransaction,
@@ -148,7 +148,7 @@ export {
 } from '../actions/getTransaction.js'
 
 export {
-  type GetWalletClientError,
+  type GetWalletClientErrorType,
   type GetWalletClientParameters,
   type GetWalletClientReturnType,
   getWalletClient,
@@ -163,61 +163,61 @@ export {
 export {
   type ReadContractParameters,
   type ReadContractReturnType,
-  type ReadContractError,
+  type ReadContractErrorType,
   readContract,
 } from '../actions/readContract.js'
 
 export {
   type ReadContractsParameters,
   type ReadContractsReturnType,
-  type ReadContractsError,
+  type ReadContractsErrorType,
   readContracts,
 } from '../actions/readContracts.js'
 
 export {
-  type ReconnectError,
+  type ReconnectErrorType,
   type ReconnectParameters,
   type ReconnectReturnType,
   reconnect,
 } from '../actions/reconnect.js'
 
 export {
-  type SendTransactionError,
+  type SendTransactionErrorType,
   type SendTransactionParameters,
   type SendTransactionReturnType,
   sendTransaction,
 } from '../actions/sendTransaction.js'
 
 export {
-  type SignMessageError,
+  type SignMessageErrorType,
   type SignMessageParameters,
   type SignMessageReturnType,
   signMessage,
 } from '../actions/signMessage.js'
 
 export {
-  type SignTypedDataError,
+  type SignTypedDataErrorType,
   type SignTypedDataParameters,
   type SignTypedDataReturnType,
   signTypedData,
 } from '../actions/signTypedData.js'
 
 export {
-  type SimulateContractError,
+  type SimulateContractErrorType,
   type SimulateContractParameters,
   type SimulateContractReturnType,
   simulateContract,
 } from '../actions/simulateContract.js'
 
 export {
-  type SwitchAccountError,
+  type SwitchAccountErrorType,
   type SwitchAccountParameters,
   type SwitchAccountReturnType,
   switchAccount,
 } from '../actions/switchAccount.js'
 
 export {
-  type SwitchChainError,
+  type SwitchChainErrorType,
   type SwitchChainParameters,
   type SwitchChainReturnType,
   switchChain,
@@ -286,7 +286,7 @@ export {
 } from '../actions/watchPublicClient.js'
 
 export {
-  type WaitForTransactionReceiptError,
+  type WaitForTransactionReceiptErrorType,
   type WaitForTransactionReceiptParameters,
   type WaitForTransactionReceiptReturnType,
   waitForTransactionReceipt,
@@ -295,7 +295,7 @@ export {
 } from '../actions/waitForTransactionReceipt.js'
 
 export {
-  type WriteContractError,
+  type WriteContractErrorType,
   type WriteContractParameters,
   type WriteContractReturnType,
   writeContract,

package/src/exports/index.ts

@@ -13,28 +13,28 @@ export {
 // Actions
 
 export {
-  type ConnectError,
+  type ConnectErrorType,
   type ConnectParameters,
   type ConnectReturnType,
   connect,
 } from '../actions/connect.js'
 
 export {
-  type DisconnectError,
+  type DisconnectErrorType,
   type DisconnectParameters,
   type DisconnectReturnType,
   disconnect,
 } from '../actions/disconnect.js'
 
 export {
-  type EstimateGasError,
+  type EstimateGasErrorType,
   type EstimateGasParameters,
   type EstimateGasReturnType,
   estimateGas,
 } from '../actions/estimateGas.js'
 
 export {
-  type EstimateFeesPerGasError,
+  type EstimateFeesPerGasErrorType,
   type EstimateFeesPerGasParameters,
   type EstimateFeesPerGasReturnType,
   estimateFeesPerGas,
@@ -48,21 +48,21 @@ export {
 export {
   type GetBalanceParameters,
   type GetBalanceReturnType,
-  type GetBalanceError,
+  type GetBalanceErrorType,
   getBalance,
   /** @deprecated use `getBalance` instead */
   getBalance as fetchBalance,
 } from '../actions/getBalance.js'
 
 export {
-  type GetBlockError,
+  type GetBlockErrorType,
   type GetBlockParameters,
   type GetBlockReturnType,
   getBlock,
 } from '../actions/getBlock.js'
 
 export {
-  type GetBlockNumberError,
+  type GetBlockNumberErrorType,
   type GetBlockNumberParameters,
   type GetBlockNumberReturnType,
   getBlockNumber,
@@ -92,14 +92,14 @@ export {
 } from '../actions/getConnectors.js'
 
 export {
-  type GetConnectorClientError,
+  type GetConnectorClientErrorType,
   type GetConnectorClientParameters,
   type GetConnectorClientReturnType,
   getConnectorClient,
 } from '../actions/getConnectorClient.js'
 
 export {
-  type GetEnsAddressError,
+  type GetEnsAddressErrorType,
   type GetEnsAddressParameters,
   type GetEnsAddressReturnType,
   getEnsAddress,
@@ -108,7 +108,7 @@ export {
 } from '../actions/getEnsAddress.js'
 
 export {
-  type GetEnsAvatarError,
+  type GetEnsAvatarErrorType,
   type GetEnsAvatarParameters,
   type GetEnsAvatarReturnType,
   getEnsAvatar,
@@ -117,7 +117,7 @@ export {
 } from '../actions/getEnsAvatar.js'
 
 export {
-  type GetEnsNameError,
+  type GetEnsNameErrorType,
   type GetEnsNameParameters,
   type GetEnsNameReturnType,
   getEnsName,
@@ -126,7 +126,7 @@ export {
 } from '../actions/getEnsName.js'
 
 export {
-  type GetEnsResolverError,
+  type GetEnsResolverErrorType,
   type GetEnsResolverParameters,
   type GetEnsResolverReturnType,
   getEnsResolver,
@@ -141,7 +141,7 @@ export {
 } from '../actions/getPublicClient.js'
 
 export {
-  type GetTokenError,
+  type GetTokenErrorType,
   type GetTokenParameters,
   type GetTokenReturnType,
   getToken,
@@ -150,7 +150,7 @@ export {
 } from '../actions/getToken.js'
 
 export {
-  type GetTransactionError,
+  type GetTransactionErrorType,
   type GetTransactionParameters,
   type GetTransactionReturnType,
   getTransaction,
@@ -159,7 +159,7 @@ export {
 } from '../actions/getTransaction.js'
 
 export {
-  type GetWalletClientError,
+  type GetWalletClientErrorType,
   type GetWalletClientParameters,
   type GetWalletClientReturnType,
   getWalletClient,
@@ -174,61 +174,61 @@ export {
 export {
   type ReadContractParameters,
   type ReadContractReturnType,
-  type ReadContractError,
+  type ReadContractErrorType,
   readContract,
 } from '../actions/readContract.js'
 
 export {
   type ReadContractsParameters,
   type ReadContractsReturnType,
-  type ReadContractsError,
+  type ReadContractsErrorType,
   readContracts,
 } from '../actions/readContracts.js'
 
 export {
-  type ReconnectError,
+  type ReconnectErrorType,
   type ReconnectParameters,
   type ReconnectReturnType,
   reconnect,
 } from '../actions/reconnect.js'
 
 export {
-  type SendTransactionError,
+  type SendTransactionErrorType,
   type SendTransactionParameters,
   type SendTransactionReturnType,
   sendTransaction,
 } from '../actions/sendTransaction.js'
 
 export {
-  type SignMessageError,
+  type SignMessageErrorType,
   type SignMessageParameters,
   type SignMessageReturnType,
   signMessage,
 } from '../actions/signMessage.js'
 
 export {
-  type SignTypedDataError,
+  type SignTypedDataErrorType,
   type SignTypedDataParameters,
   type SignTypedDataReturnType,
   signTypedData,
 } from '../actions/signTypedData.js'
 
 export {
-  type SimulateContractError,
+  type SimulateContractErrorType,
   type SimulateContractParameters,
   type SimulateContractReturnType,
   simulateContract,
 } from '../actions/simulateContract.js'
 
 export {
-  type SwitchAccountError,
+  type SwitchAccountErrorType,
   type SwitchAccountParameters,
   type SwitchAccountReturnType,
   switchAccount,
 } from '../actions/switchAccount.js'
 
 export {
-  type SwitchChainError,
+  type SwitchChainErrorType,
   type SwitchChainParameters,
   type SwitchChainReturnType,
   switchChain,
@@ -297,7 +297,7 @@ export {
 } from '../actions/watchPublicClient.js'
 
 export {
-  type WaitForTransactionReceiptError,
+  type WaitForTransactionReceiptErrorType,
   type WaitForTransactionReceiptParameters,
   type WaitForTransactionReceiptReturnType,
   waitForTransactionReceipt,
@@ -306,7 +306,7 @@ export {
 } from '../actions/waitForTransactionReceipt.js'
 
 export {
-  type WriteContractError,
+  type WriteContractErrorType,
   type WriteContractParameters,
   type WriteContractReturnType,
   writeContract,

package/src/exports/query.ts

@@ -235,4 +235,5 @@ export {
   writeContractMutationOptions,
 } from '../query/writeContract.js'
 
+export { type ScopeKeyParameter } from '../query/types.js'
 export { hashFn } from '../query/utils.js'

package/src/query/connect.ts

@@ -1,7 +1,7 @@
 import type { MutationOptions } from '@tanstack/query-core'
 
 import {
-  type ConnectError,
+  type ConnectErrorType,
   type ConnectParameters,
   type ConnectReturnType,
   connect,
@@ -18,7 +18,7 @@ export function connectMutationOptions<config extends Config>(config: config) {
     mutationKey: ['connect'],
   } as const satisfies MutationOptions<
     ConnectData<config>,
-    ConnectError,
+    ConnectErrorType,
     ConnectVariables<config>
   >
 }
@@ -29,7 +29,7 @@ export type ConnectVariables<config extends Config> = ConnectParameters<config>
 
 export type ConnectMutate<config extends Config, context = unknown> = Mutate<
   ConnectData<config>,
-  ConnectError,
+  ConnectErrorType,
   ConnectVariables<config>,
   context
 >
@@ -39,7 +39,7 @@ export type ConnectMutateAsync<
   context = unknown,
 > = MutateAsync<
   ConnectData<config>,
-  ConnectError,
+  ConnectErrorType,
   ConnectVariables<config>,
   context
 >

package/src/query/disconnect.ts

@@ -1,7 +1,7 @@
 import type { MutationOptions } from '@tanstack/query-core'
 
 import {
-  type DisconnectError,
+  type DisconnectErrorType,
   type DisconnectParameters,
   type DisconnectReturnType,
   disconnect,
@@ -19,7 +19,7 @@ export function disconnectMutationOptions<config extends Config>(
     mutationKey: ['disconnect'],
   } as const satisfies MutationOptions<
     DisconnectData,
-    DisconnectError,
+    DisconnectErrorType,
     DisconnectVariables
   >
 }
@@ -30,14 +30,14 @@ export type DisconnectVariables = DisconnectParameters | undefined
 
 export type DisconnectMutate<context = unknown> = Mutate<
   DisconnectData,
-  DisconnectError,
+  DisconnectErrorType,
   DisconnectVariables,
   context
 >
 
 export type DisconnectMutateAsync<context = unknown> = MutateAsync<
   DisconnectData,
-  DisconnectError,
+  DisconnectErrorType,
   DisconnectVariables,
   context
 >

package/src/query/estimateFeesPerGas.ts

@@ -2,7 +2,7 @@ import { type QueryOptions } from '@tanstack/query-core'
 import type { FeeValuesType } from 'viem'
 
 import {
-  type EstimateFeesPerGasError,
+  type EstimateFeesPerGasErrorType,
   type EstimateFeesPerGasParameters,
   type EstimateFeesPerGasReturnType,
   estimateFeesPerGas,
@@ -31,7 +31,7 @@ export function estimateFeesPerGasQueryOptions<
     queryKey: estimateFeesPerGasQueryKey(options),
   } as const satisfies QueryOptions<
     EstimateFeesPerGasQueryFnData<type>,
-    EstimateFeesPerGasError,
+    EstimateFeesPerGasErrorType,
     EstimateFeesPerGasData<type>,
     EstimateFeesPerGasQueryKey<config, type>
   >

package/src/query/estimateGas.ts

@@ -1,7 +1,7 @@
 import { type QueryOptions } from '@tanstack/query-core'
 
 import {
-  type EstimateGasError,
+  type EstimateGasErrorType,
   type EstimateGasParameters,
   type EstimateGasReturnType,
   estimateGas,
@@ -31,7 +31,7 @@ export function estimateGasQueryOptions<
     queryKey: estimateGasQueryKey(options),
   } as const satisfies QueryOptions<
     EstimateGasQueryFnData,
-    EstimateGasError,
+    EstimateGasErrorType,
     EstimateGasData,
     EstimateGasQueryKey<config, chainId>
   >

package/src/query/getBalance.ts

@@ -1,7 +1,7 @@
 import { type QueryOptions } from '@tanstack/query-core'
 
 import {
-  type GetBalanceError,
+  type GetBalanceErrorType,
   type GetBalanceParameters,
   type GetBalanceReturnType,
   getBalance,
@@ -32,7 +32,7 @@ export function getBalanceQueryOptions<config extends Config>(
     queryKey: getBalanceQueryKey(options),
   } as const satisfies QueryOptions<
     GetBalanceQueryFnData,
-    GetBalanceError,
+    GetBalanceErrorType,
     GetBalanceData,
     GetBalanceQueryKey<config>
   >

package/src/query/getBlock.ts

@@ -2,7 +2,7 @@ import { type QueryOptions } from '@tanstack/query-core'
 import type { BlockTag } from 'viem'
 
 import {
-  type GetBlockError,
+  type GetBlockErrorType,
   type GetBlockParameters,
   type GetBlockReturnType,
   getBlock,
@@ -43,7 +43,7 @@ export function getBlockQueryOptions<
     queryKey: getBlockQueryKey(options),
   } as const satisfies QueryOptions<
     GetBlockQueryFnData,
-    GetBlockError,
+    GetBlockErrorType,
     GetBlockData,
     GetBlockQueryKey<includeTransactions, blockTag, config, chainId>
   >

package/src/query/getBlockNumber.ts

@@ -1,7 +1,7 @@
 import { type QueryOptions } from '@tanstack/query-core'
 
 import {
-  type GetBlockNumberError,
+  type GetBlockNumberErrorType,
   type GetBlockNumberParameters,
   type GetBlockNumberReturnType,
   getBlockNumber,
@@ -32,7 +32,7 @@ export function getBlockNumberQueryOptions<
     queryKey: getBlockNumberQueryKey(options),
   } as const satisfies QueryOptions<
     GetBlockNumberQueryFnData,
-    GetBlockNumberError,
+    GetBlockNumberErrorType,
     GetBlockNumberData,
     GetBlockNumberQueryKey<config, chainId>
   >

package/src/query/getConnectorClient.ts

@@ -1,7 +1,7 @@
 import { type QueryOptions } from '@tanstack/query-core'
 
 import {
-  type GetConnectorClientError,
+  type GetConnectorClientErrorType,
   type GetConnectorClientParameters,
   type GetConnectorClientReturnType,
   getConnectorClient,
@@ -36,7 +36,7 @@ export function getConnectorClientQueryOptions<
     queryKey: getConnectorClientQueryKey(options),
   } as const satisfies QueryOptions<
     GetConnectorClientQueryFnData<config, chainId>,
-    GetConnectorClientError,
+    GetConnectorClientErrorType,
     GetConnectorClientData<config, chainId>,
     GetConnectorClientQueryKey<config, chainId>
   >