@wagmi/core 2.0.0-alpha.1 → 2.0.0-alpha.3

package/src/query/types.ts

@@ -1,6 +1,65 @@
-import type { Evaluate } from '../types/utils.js'
+import type {
+  DefaultError,
+  InfiniteQueryObserverOptions,
+  MutateOptions,
+  QueryKey,
+  QueryMeta,
+} from '@tanstack/query-core'
 
-export type ScopeKeyParameter = { scopeKey?: string | undefined }
+import type { Evaluate, Omit } from '../types/utils.js'
+
+export type InfiniteQueryOptions<
+  queryFnData = unknown,
+  error = DefaultError,
+  data = queryFnData,
+  queryData = queryFnData,
+  queryKey extends QueryKey = QueryKey,
+  pageParam = unknown,
+  ///
+  options extends InfiniteQueryObserverOptions<
+    queryFnData,
+    error,
+    data,
+    queryData,
+    queryKey,
+    pageParam
+  > = InfiniteQueryObserverOptions<
+    queryFnData,
+    error,
+    data,
+    queryData,
+    queryKey,
+    pageParam
+  >,
+> = Evaluate<
+  // `queryFn` doesn't pass through `pageParam` correctly
+  Omit<options, 'queryFn'> & {
+    // TS2742: `QueryFunctionContext` not exported from `@tanstack/query-core`
+    queryFn?(context: {
+      queryKey: queryKey
+      signal: AbortSignal
+      pageParam: pageParam
+      direction: 'forward' | 'backward'
+      meta: QueryMeta | undefined
+    }): ReturnType<NonNullable<options['queryFn']>>
+  }
+>
+
+export type Mutate<
+  data = unknown,
+  error = unknown,
+  variables = void,
+  context = unknown,
+> = (
+  ...args: Parameters<MutateFn<data, error, Evaluate<variables>, context>>
+) => void
+
+export type MutateAsync<
+  data = unknown,
+  error = unknown,
+  variables = void,
+  context = unknown,
+> = MutateFn<data, error, Evaluate<variables>, context>
 
 type MutateFn<
   data = unknown,
@@ -11,42 +70,14 @@ type MutateFn<
   ? (
       variables?: variables,
       options?:
-        | Evaluate<
-            import('@tanstack/query-core').MutateOptions<
-              data,
-              error,
-              variables,
-              context
-            >
-          >
+        | Evaluate<MutateOptions<data, error, variables, context>>
         | undefined,
     ) => Promise<data>
   : (
       variables: variables,
       options?:
-        | Evaluate<
-            import('@tanstack/query-core').MutateOptions<
-              data,
-              error,
-              variables,
-              context
-            >
-          >
+        | Evaluate<MutateOptions<data, error, variables, context>>
         | undefined,
     ) => Promise<data>
 
-export type Mutate<
-  data = unknown,
-  error = unknown,
-  variables = void,
-  context = unknown,
-> = (
-  ...args: Parameters<MutateFn<data, error, Evaluate<variables>, context>>
-) => void
-
-export type MutateAsync<
-  data = unknown,
-  error = unknown,
-  variables = void,
-  context = unknown,
-> = MutateFn<data, error, Evaluate<variables>, context>
+export type ScopeKeyParameter = { scopeKey?: string | undefined }

package/src/query/utils.ts

@@ -45,6 +45,21 @@ export function filterQueryOptions<type extends Record<string, unknown>>(
   // destructuring is super fast
   // biome-ignore format: no formatting
   const {
+    // import('@tanstack/query-core').QueryOptions
+    // biome-ignore lint/correctness/noUnusedVariables: remove properties
+    _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: remove properties
+    getPreviousPageParam, getNextPageParam, initialPageParam,
+    
+    // import('@tanstack/react-query').UseQueryOptions
+    // biome-ignore lint/correctness/noUnusedVariables: remove properties
+    _optimisticResults, enabled, notifyOnChangeProps, placeholderData, refetchInterval, refetchIntervalInBackground, refetchOnMount, refetchOnReconnect, refetchOnWindowFocus, retryOnMount, select, staleTime, suspense, throwOnError,
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // wagmi
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // biome-ignore lint/correctness/noUnusedVariables: remove properties
     config, connector, query,
     ...rest

package/src/query/waitForTransactionReceipt.ts

@@ -23,7 +23,7 @@ export function waitForTransactionReceiptQueryOptions<
   config extends Config,
   chainId extends config['chains'][number]['id'],
 >(
-  config: Config,
+  config: config,
   options: WaitForTransactionReceiptOptions<config, chainId> = {},
 ) {
   return {

package/src/types/utils.ts

@@ -37,14 +37,6 @@ export type Mutable<type extends object> = {
   -readonly [key in keyof type]: type[key]
 }
 
-/**
- * Use to prevent a usage of type from being inferred in other generics.
-
- * @see https://github.com/pelotom/type-zoo/#noinfert
- * @see https://github.com/Microsoft/TypeScript/issues/14829#issuecomment-322267089
- */
-export type NoInfer<type> = type & { [key in keyof type]: type[key] }
-
 /** Strict version of built-in Omit type */
 export type Omit<type, keys extends keyof type> = Pick<
   type,

package/src/version.ts

@@ -1 +1 @@
-export const version = '2.0.0-alpha.1'
+export const version = '2.0.0-alpha.3'