From 14f3b29fa7f48dc91eeb1d514b3592f88ae178a6 Mon Sep 17 00:00:00 2001
From: Damian Osipiuk <osipiukd+git@gmail.com>
Date: Wed, 25 Oct 2023 15:30:38 +0200
Subject: [PATCH] perf(vue-query): remove redundant type wrappers

---
 packages/vue-query/src/useBaseQuery.ts     |  1 -
 packages/vue-query/src/useInfiniteQuery.ts | 26 +++----------------
 packages/vue-query/src/useQuery.ts         | 29 ++++++++--------------
 3 files changed, 14 insertions(+), 42 deletions(-)

diff --git a/packages/vue-query/src/useBaseQuery.ts b/packages/vue-query/src/useBaseQuery.ts
index 3c5f047dab..0c42c2ab41 100644
--- a/packages/vue-query/src/useBaseQuery.ts
+++ b/packages/vue-query/src/useBaseQuery.ts
@@ -29,7 +29,6 @@ export type UseBaseQueryReturnType<
     | 'fetchNextPage'
     | 'fetchPreviousPage'
     | 'refetch'
-    | 'remove'
     ? Result[K]
     : ToRef<Readonly<Result>[K]>
 } & {
diff --git a/packages/vue-query/src/useInfiniteQuery.ts b/packages/vue-query/src/useInfiniteQuery.ts
index 3478a82d1e..6c0512e177 100644
--- a/packages/vue-query/src/useInfiniteQuery.ts
+++ b/packages/vue-query/src/useInfiniteQuery.ts
@@ -12,12 +12,7 @@ import type {
 
 import type { UseBaseQueryReturnType } from './useBaseQuery'
 
-import type {
-  DeepUnwrapRef,
-  DistributiveOmit,
-  MaybeRefDeep,
-  MaybeRefOrGetter,
-} from './types'
+import type { DeepUnwrapRef, MaybeRefDeep, MaybeRefOrGetter } from './types'
 import type { QueryClient } from './queryClient'
 
 export type UseInfiniteQueryOptions<
@@ -69,22 +64,11 @@ export type UseInfiniteQueryOptions<
       >
 }
 
-type InfiniteQueryReturnType<TData, TError> = UseBaseQueryReturnType<
+export type UseInfiniteQueryReturnType<TData, TError> = UseBaseQueryReturnType<
   TData,
   TError,
   InfiniteQueryObserverResult<TData, TError>
 >
-export type UseInfiniteQueryReturnType<TData, TError> = DistributiveOmit<
-  InfiniteQueryReturnType<TData, TError>,
-  'fetchNextPage' | 'fetchPreviousPage' | 'refetch'
-> & {
-  fetchNextPage: InfiniteQueryObserverResult<TData, TError>['fetchNextPage']
-  fetchPreviousPage: InfiniteQueryObserverResult<
-    TData,
-    TError
-  >['fetchPreviousPage']
-  refetch: InfiniteQueryObserverResult<TData, TError>['refetch']
-}
 
 export function useInfiniteQuery<
   TQueryFnData,
@@ -103,11 +87,9 @@ export function useInfiniteQuery<
   >,
   queryClient?: QueryClient,
 ): UseInfiniteQueryReturnType<TData, TError> {
-  const result = useBaseQuery(
+  return useBaseQuery(
     InfiniteQueryObserver as typeof QueryObserver,
     options,
     queryClient,
-  ) as InfiniteQueryReturnType<TData, TError>
-
-  return result
+  ) as UseInfiniteQueryReturnType<TData, TError>
 }
diff --git a/packages/vue-query/src/useQuery.ts b/packages/vue-query/src/useQuery.ts
index 94b0b5efac..44265d8b30 100644
--- a/packages/vue-query/src/useQuery.ts
+++ b/packages/vue-query/src/useQuery.ts
@@ -1,18 +1,15 @@
 import { QueryObserver } from '@tanstack/query-core'
 import { useBaseQuery } from './useBaseQuery'
-import type { ToRefs } from 'vue-demi'
 import type {
   DefaultError,
   DefinedQueryObserverResult,
   QueryKey,
   QueryObserverOptions,
-  QueryObserverResult,
   WithRequired,
 } from '@tanstack/query-core'
 import type { UseBaseQueryReturnType } from './useBaseQuery'
 import type {
   DeepUnwrapRef,
-  DistributiveOmit,
   MaybeRef,
   MaybeRefDeep,
   MaybeRefOrGetter,
@@ -86,20 +83,16 @@ export type DefinedInitialQueryOptions<
     | (() => NonUndefinedGuard<TQueryFnData>)
 }
 
-export type UseQueryReturnType<TData, TError> = DistributiveOmit<
-  UseBaseQueryReturnType<TData, TError>,
-  'refetch'
-> & {
-  refetch: QueryObserverResult<TData, TError>['refetch']
-}
+export type UseQueryReturnType<TData, TError> = UseBaseQueryReturnType<
+  TData,
+  TError
+>
 
-export type UseQueryDefinedReturnType<TData, TError> = DistributiveOmit<
-  ToRefs<Readonly<DefinedQueryObserverResult<TData, TError>>>,
-  'refetch'
-> & {
-  suspense: () => Promise<QueryObserverResult<TData, TError>>
-  refetch: QueryObserverResult<TData, TError>['refetch']
-}
+export type UseQueryDefinedReturnType<TData, TError> = UseBaseQueryReturnType<
+  TData,
+  TError,
+  DefinedQueryObserverResult<TData, TError>
+>
 
 export function useQuery<
   TQueryFnData = unknown,
@@ -154,7 +147,5 @@ export function useQuery<
 ):
   | UseQueryReturnType<TData, TError>
   | UseQueryDefinedReturnType<TData, TError> {
-  const result = useBaseQuery(QueryObserver, options, queryClient)
-
-  return result
+  return useBaseQuery(QueryObserver, options, queryClient)
 }