@wagmi/core 3.2.0 → 3.2.2

package/src/query/waitForTransactionReceipt.ts

@@ -1,5 +1,3 @@
-import type { QueryOptions } from '@tanstack/query-core'
-
 import {
   type WaitForTransactionReceiptErrorType,
   type WaitForTransactionReceiptParameters,
@@ -8,43 +6,49 @@ import {
 } from '../actions/waitForTransactionReceipt.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 WaitForTransactionReceiptOptions<
   config extends Config,
   chainId extends config['chains'][number]['id'],
+  selectData = WaitForTransactionReceiptData<config, chainId>,
 > = Compute<
   ExactPartial<WaitForTransactionReceiptParameters<config, chainId>> &
     ScopeKeyParameter
->
+> &
+  QueryParameter<
+    WaitForTransactionReceiptQueryFnData<config, chainId>,
+    WaitForTransactionReceiptErrorType,
+    selectData,
+    WaitForTransactionReceiptQueryKey<config, chainId>
+  >
 
 export function waitForTransactionReceiptQueryOptions<
   config extends Config,
   chainId extends config['chains'][number]['id'],
+  selectData = WaitForTransactionReceiptData<config, chainId>,
 >(
   config: config,
-  options: WaitForTransactionReceiptOptions<config, chainId> = {},
-) {
+  options: WaitForTransactionReceiptOptions<config, chainId, selectData> = {},
+): WaitForTransactionReceiptQueryOptions<config, chainId, selectData> {
   return {
-    async queryFn({ queryKey }) {
-      const { hash, ...parameters } = queryKey[1]
-      if (!hash) throw new Error('hash is required')
+    ...options.query,
+    enabled: Boolean(options.hash && (options.query?.enabled ?? true)),
+    queryFn: async (context) => {
+      const [, { scopeKey: _, ...parameters }] = context.queryKey
+      if (!parameters.hash) throw new Error('hash is required')
       return waitForTransactionReceipt(config, {
         ...parameters,
         onReplaced: options.onReplaced,
-        hash,
+        hash: parameters.hash,
       }) as unknown as Promise<
         WaitForTransactionReceiptReturnType<config, chainId>
       >
     },
     queryKey: waitForTransactionReceiptQueryKey(options),
-  } as const satisfies QueryOptions<
-    WaitForTransactionReceiptQueryFnData<config, chainId>,
-    WaitForTransactionReceiptErrorType,
-    WaitForTransactionReceiptData<config, chainId>,
-    WaitForTransactionReceiptQueryKey<config, chainId>
-  >
+  }
 }
 
 export type WaitForTransactionReceiptQueryFnData<
@@ -60,7 +64,12 @@ export type WaitForTransactionReceiptData<
 export function waitForTransactionReceiptQueryKey<
   config extends Config,
   chainId extends config['chains'][number]['id'],
->(options: WaitForTransactionReceiptOptions<config, chainId> = {}) {
+>(
+  options: Compute<
+    ExactPartial<WaitForTransactionReceiptParameters<config, chainId>> &
+      ScopeKeyParameter
+  > = {},
+) {
   const { onReplaced: _, ...rest } = options
   return ['waitForTransactionReceipt', filterQueryOptions(rest)] as const
 }
@@ -69,3 +78,14 @@ export type WaitForTransactionReceiptQueryKey<
   config extends Config,
   chainId extends config['chains'][number]['id'],
 > = ReturnType<typeof waitForTransactionReceiptQueryKey<config, chainId>>
+
+export type WaitForTransactionReceiptQueryOptions<
+  config extends Config,
+  chainId extends config['chains'][number]['id'],
+  selectData = WaitForTransactionReceiptData<config, chainId>,
+> = QueryOptions<
+  WaitForTransactionReceiptQueryFnData<config, chainId>,
+  WaitForTransactionReceiptErrorType,
+  selectData,
+  WaitForTransactionReceiptQueryKey<config, chainId>
+>

package/src/tempo/Connectors.ts

@@ -392,48 +392,58 @@ export function webAuthn(options: webAuthn.Parameters) {
 
       const targetChain = defineChain({
         ...chain,
-        async prepareTransactionRequest(args, { phase }) {
-          const keyAuthorization = await (async () => {
-            {
-              const keyAuthorization = (
-                args as {
-                  keyAuthorization?:
-                    | KeyAuthorization.KeyAuthorization
-                    | undefined
-                }
-              ).keyAuthorization
-              if (keyAuthorization) return keyAuthorization
-            }
+        prepareTransactionRequest: [
+          async (args, { phase }) => {
+            const keyAuthorization = await (async () => {
+              {
+                const keyAuthorization = (
+                  args as {
+                    keyAuthorization?:
+                      | KeyAuthorization.KeyAuthorization
+                      | undefined
+                  }
+                ).keyAuthorization
+                if (keyAuthorization) return keyAuthorization
+              }
 
-            const keyAuthorization = await config.storage?.getItem(
-              `pendingKeyAuthorization:${targetAccount?.address.toLowerCase()}`,
-            )
-            await config.storage?.removeItem(
-              `pendingKeyAuthorization:${targetAccount?.address.toLowerCase()}`,
-            )
-            return keyAuthorization
-          })()
+              const keyAuthorization = await config.storage?.getItem(
+                `pendingKeyAuthorization:${targetAccount?.address.toLowerCase()}`,
+              )
+              await config.storage?.removeItem(
+                `pendingKeyAuthorization:${targetAccount?.address.toLowerCase()}`,
+              )
+              return keyAuthorization
+            })()
 
-          const [prepareTransactionRequestFn, options] = (() => {
-            if (!chain.prepareTransactionRequest) return [undefined, undefined]
-            if (typeof chain.prepareTransactionRequest === 'function')
-              return [chain.prepareTransactionRequest, undefined]
-            return chain.prepareTransactionRequest
-          })()
+            const [prepareTransactionRequestFn, options] = (() => {
+              if (!chain.prepareTransactionRequest)
+                return [undefined, undefined]
+              if (typeof chain.prepareTransactionRequest === 'function')
+                return [chain.prepareTransactionRequest, undefined]
+              return chain.prepareTransactionRequest
+            })()
 
-          const request = await (async () => {
-            if (!prepareTransactionRequestFn) return {}
-            if (!options || options?.runAt?.includes(phase))
-              return await prepareTransactionRequestFn(args, { phase })
-            return {}
-          })()
+            const request = await (async () => {
+              if (!prepareTransactionRequestFn) return {}
+              if (!options || options?.runAt?.includes(phase))
+                return await prepareTransactionRequestFn(args, { phase })
+              return {}
+            })()
 
-          return {
-            ...args,
-            ...request,
-            keyAuthorization,
-          }
-        },
+            return {
+              ...args,
+              ...request,
+              keyAuthorization,
+            }
+          },
+          {
+            runAt: [
+              'afterFillParameters',
+              'beforeFillParameters',
+              'beforeFillTransaction',
+            ],
+          },
+        ],
       })
 
       return createClient({

package/src/tempo/actions/amm.ts

@@ -2,13 +2,13 @@ import type { Account, BaseErrorType } from 'viem'
 import { Actions } from 'viem/tempo'
 import { getConnectorClient } from '../../actions/getConnectorClient.js'
 import type { Config } from '../../createConfig.js'
-import { filterQueryOptions } from '../../query/utils.js'
 import type {
   ChainIdParameter,
   ConnectorParameter,
 } from '../../types/properties.js'
 import type { UnionLooseOmit } from '../../types/utils.js'
 import type { QueryOptions, QueryParameter } from './utils.js'
+import { filterQueryOptions } from './utils.js'
 
 /**
  * Gets the reserves for a liquidity pool.
@@ -180,7 +180,7 @@ export namespace getLiquidityBalance {
       queryKey: queryKey(rest),
       async queryFn({ queryKey }) {
         const [, parameters] = queryKey
-        return await getLiquidityBalance(config, parameters)
+        return await getLiquidityBalance(config, parameters as any)
       },
     }
   }

package/src/tempo/actions/fee.ts

@@ -2,13 +2,13 @@ import type { Account, BaseErrorType } from 'viem'
 import { Actions } from 'viem/tempo'
 import { getConnectorClient } from '../../actions/getConnectorClient.js'
 import type { Config } from '../../createConfig.js'
-import { filterQueryOptions } from '../../query/utils.js'
 import type {
   ChainIdParameter,
   ConnectorParameter,
 } from '../../types/properties.js'
 import type { PartialBy, UnionLooseOmit } from '../../types/utils.js'
 import type { QueryOptions, QueryParameter } from './utils.js'
+import { filterQueryOptions } from './utils.js'
 
 /**
  * Gets the user's default fee token.

package/src/tempo/actions/nonce.ts

@@ -1,10 +1,10 @@
 import type { BaseErrorType } from 'viem'
 import { Actions } from 'viem/tempo'
 import type { Config } from '../../createConfig.js'
-import { filterQueryOptions } from '../../query/utils.js'
 import type { ChainIdParameter } from '../../types/properties.js'
 import type { PartialBy } from '../../types/utils.js'
 import type { QueryOptions, QueryParameter } from './utils.js'
+import { filterQueryOptions } from './utils.js'
 
 /**
  * Gets the nonce for an account and nonce key.

package/src/tempo/actions/utils.ts

@@ -24,3 +24,29 @@ export type QueryOptions<
   Query.QueryOptions<queryFnData, error, data, queryKey>,
   'queryKey' | 'queryFn'
 > & { enabled: boolean }
+
+export function filterQueryOptions<type extends Record<string, unknown>>(
+  options: type,
+): type {
+  // biome-ignore format: no formatting
+  const {
+    // import('@tanstack/query-core').QueryOptions
+    // biome-ignore lint/correctness/noUnusedVariables: tossing
+    _defaulted, behavior, gcTime, initialData, initialDataUpdatedAt, maxPages, meta, networkMode, queryFn, queryHash, queryKey, queryKeyHashFn, retry, retryDelay, structuralSharing,
+
+    // import('@tanstack/query-core').InfiniteQueryObserverOptions
+    // biome-ignore lint/correctness/noUnusedVariables: tossing
+    getPreviousPageParam, getNextPageParam, initialPageParam,
+
+    // import('@tanstack/react-query').UseQueryOptions
+    // biome-ignore lint/correctness/noUnusedVariables: tossing
+    _optimisticResults, enabled, notifyOnChangeProps, placeholderData, refetchInterval, refetchIntervalInBackground, refetchOnMount, refetchOnReconnect, refetchOnWindowFocus, retryOnMount, select, staleTime, suspense, throwOnError,
+
+    // wagmi
+    // biome-ignore lint/correctness/noUnusedVariables: tossing
+    config, connector, query,
+    ...rest
+  } = options
+
+  return rest as type
+}

package/src/types/query.ts

@@ -0,0 +1,40 @@
+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
+  >
+}

package/src/version.ts

@@ -1 +1 @@
-export const version = '3.2.0'
+export const version = '3.2.2'