@tanstack/vue-query 5.101.4 → 5.102.1

package/src/useMutationState.ts

@@ -48,27 +48,52 @@ export function useIsMutating(
   return length
 }
 
-export type MutationStateOptions<TResult = MutationState> = {
+type MutationTypeFromResult<TResult> = [TResult] extends [
+  MutationState<
+    infer TData,
+    infer TError,
+    infer TVariables,
+    infer TOnMutateResult
+  >,
+]
+  ? Mutation<TData, TError, TVariables, TOnMutateResult>
+  : Mutation
+
+export type MutationStateOptions<
+  TResult = MutationState,
+  TMutation extends Mutation<any, any, any, any> =
+    MutationTypeFromResult<TResult>,
+> = {
   filters?: MutationFilters
-  select?: (mutation: Mutation) => TResult
+  select?: (mutation: TMutation) => TResult
 }
 
-function getResult<TResult = MutationState>(
+function getResult<
+  TResult = MutationState,
+  TMutation extends Mutation<any, any, any, any> =
+    MutationTypeFromResult<TResult>,
+>(
   mutationCache: MutationCache,
-  options: MutationStateOptions<TResult>,
+  options: MutationStateOptions<TResult, TMutation>,
 ): Array<TResult> {
   return mutationCache
     .findAll(options.filters)
     .map(
       (mutation): TResult =>
-        (options.select ? options.select(mutation) : mutation.state) as TResult,
+        (options.select
+          ? options.select(mutation as TMutation)
+          : mutation.state) as TResult,
     )
 }
 
-export function useMutationState<TResult = MutationState>(
+export function useMutationState<
+  TResult = MutationState,
+  TMutation extends Mutation<any, any, any, any> =
+    MutationTypeFromResult<TResult>,
+>(
   options:
-    | MutationStateOptions<TResult>
-    | (() => MutationStateOptions<TResult>) = {},
+    | MutationStateOptions<TResult, TMutation>
+    | (() => MutationStateOptions<TResult, TMutation>) = {},
   queryClient?: QueryClient,
 ): Readonly<Ref<Array<TResult>>> {
   const resolvedOptions = computed(() => {

package/src/usePrefetchInfiniteQuery.ts

@@ -1,58 +1,45 @@
 import { getCurrentScope, unref, watchEffect } from 'vue-demi'
+import { noop } from '@tanstack/query-core'
 import { useQueryClient } from './useQueryClient'
 import { cloneDeepUnref } from './utils'
 import type {
   DefaultError,
-  FetchInfiniteQueryOptions,
-  FetchQueryOptions,
-  GetNextPageParamFunction,
+  DistributiveOmit,
   InfiniteData,
-  InitialPageParam,
-  OmitKeyof,
+  InfiniteQueryExecuteOptions,
   QueryKey,
   SkipToken,
 } from '@tanstack/query-core'
 import type { QueryClient } from './queryClient'
 import type { MaybeRefDeep, MaybeRefOrGetter } from './types'
 
-type PrefetchInfinitePages<TQueryFnData, TPageParam> =
-  | {
-      pages?: never
-      getNextPageParam?: GetNextPageParamFunction<TPageParam, TQueryFnData>
-    }
-  | {
-      pages: number
-      getNextPageParam: GetNextPageParamFunction<TPageParam, TQueryFnData>
-    }
-
 export type UsePrefetchInfiniteQueryOptions<
   TQueryFnData,
   TError,
   TData,
   TQueryKey extends QueryKey,
   TPageParam,
-> = OmitKeyof<
-  FetchQueryOptions<
+> = DistributiveOmit<
+  InfiniteQueryExecuteOptions<
     TQueryFnData,
     TError,
-    InfiniteData<TData, TPageParam>,
+    TData,
     TQueryKey,
     TPageParam
   >,
-  'queryFn' | 'initialPageParam'
-> &
-  InitialPageParam<TPageParam> & {
-    queryFn?: Exclude<
-      FetchQueryOptions<
-        TQueryFnData,
-        TError,
-        InfiniteData<TData, TPageParam>,
-        TQueryKey,
-        TPageParam
-      >['queryFn'],
-      SkipToken
-    >
-  } & PrefetchInfinitePages<TQueryFnData, TPageParam>
+  'queryFn'
+> & {
+  queryFn?: Exclude<
+    InfiniteQueryExecuteOptions<
+      TQueryFnData,
+      TError,
+      TData,
+      TQueryKey,
+      TPageParam
+    >['queryFn'],
+    SkipToken
+  >
+}
 
 function isGetter<T>(value: MaybeRefOrGetter<T>): value is () => T {
   return typeof value === 'function'
@@ -61,7 +48,7 @@ function isGetter<T>(value: MaybeRefOrGetter<T>): value is () => T {
 export function usePrefetchInfiniteQuery<
   TQueryFnData = unknown,
   TError = DefaultError,
-  TData = TQueryFnData,
+  TData = InfiniteData<TQueryFnData>,
   TQueryKey extends QueryKey = QueryKey,
   TPageParam = unknown,
 >(
@@ -90,6 +77,7 @@ export function usePrefetchInfiniteQuery<
 
   watchEffect(() => {
     const resolvedOptions = isGetter(options) ? options() : unref(options)
+
     const clonedOptions: UsePrefetchInfiniteQueryOptions<
       TQueryFnData,
       TError,
@@ -99,15 +87,7 @@ export function usePrefetchInfiniteQuery<
     > = cloneDeepUnref(resolvedOptions)
 
     if (!client.getQueryState(clonedOptions.queryKey)) {
-      void client.prefetchInfiniteQuery(
-        clonedOptions as FetchInfiniteQueryOptions<
-          TQueryFnData,
-          TError,
-          TData,
-          TQueryKey,
-          TPageParam
-        >,
-      )
+      void client.infiniteQuery(clonedOptions).then(noop).catch(noop)
     }
   })
 }

package/src/usePrefetchQuery.ts

@@ -1,10 +1,11 @@
 import { getCurrentScope, unref, watchEffect } from 'vue-demi'
+import { noop } from '@tanstack/query-core'
 import { useQueryClient } from './useQueryClient'
 import { cloneDeepUnref } from './utils'
 import type {
   DefaultError,
-  FetchQueryOptions,
   OmitKeyof,
+  QueryExecuteOptions,
   QueryKey,
   SkipToken,
 } from '@tanstack/query-core'
@@ -15,13 +16,28 @@ export type UsePrefetchQueryOptions<
   TQueryFnData,
   TError,
   TData,
+  TQueryData,
   TQueryKey extends QueryKey,
 > = OmitKeyof<
-  FetchQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
+  QueryExecuteOptions<
+    TQueryFnData,
+    TError,
+    TData,
+    TQueryData,
+    TQueryKey,
+    never
+  >,
   'queryFn'
 > & {
   queryFn?: Exclude<
-    FetchQueryOptions<TQueryFnData, TError, TData, TQueryKey>['queryFn'],
+    QueryExecuteOptions<
+      TQueryFnData,
+      TError,
+      TData,
+      TQueryData,
+      TQueryKey,
+      never
+    >['queryFn'],
     SkipToken
   >
 }
@@ -34,11 +50,18 @@ export function usePrefetchQuery<
   TQueryFnData = unknown,
   TError = DefaultError,
   TData = TQueryFnData,
+  TQueryData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
 >(
   options: MaybeRefOrGetter<
     MaybeRefDeep<
-      UsePrefetchQueryOptions<TQueryFnData, TError, TData, TQueryKey>
+      UsePrefetchQueryOptions<
+        TQueryFnData,
+        TError,
+        TData,
+        TQueryData,
+        TQueryKey
+      >
     >
   >,
   queryClient?: QueryClient,
@@ -59,11 +82,12 @@ export function usePrefetchQuery<
       TQueryFnData,
       TError,
       TData,
+      TQueryData,
       TQueryKey
     > = cloneDeepUnref(resolvedOptions)
 
     if (!client.getQueryState(clonedOptions.queryKey)) {
-      void client.prefetchQuery(clonedOptions)
+      void client.query(clonedOptions).catch(noop)
     }
   })
 }

package/src/useQuery.ts

@@ -42,15 +42,25 @@ export type UseQueryOptions<
               TQueryData,
               DeepUnwrapRef<TQueryKey>
             >)
-      : MaybeRefDeep<
-          QueryObserverOptions<
-            TQueryFnData,
-            TError,
-            TData,
-            TQueryData,
-            DeepUnwrapRef<TQueryKey>
-          >[Property]
-        >
+      : Property extends 'queryKey'
+        ? MaybeRef<
+            QueryObserverOptions<
+              TQueryFnData,
+              TError,
+              TData,
+              TQueryData,
+              TQueryKey
+            >[Property]
+          >
+        : MaybeRefDeep<
+            QueryObserverOptions<
+              TQueryFnData,
+              TError,
+              TData,
+              TQueryData,
+              DeepUnwrapRef<TQueryKey>
+            >[Property]
+          >
   } & ShallowOption
 >