From d798d1c831bc35f7b8219b6ad0c20409a3522c4c Mon Sep 17 00:00:00 2001
From: Raashish Aggarwal <94279692+raashish1601@users.noreply.github.com>
Date: Sat, 30 May 2026 19:20:11 +0530
Subject: [PATCH] fix(react-query): enforce selectless useQuery TData
 consistency

---
 .../src/__tests__/useQuery.test-d.tsx         | 24 +++++++++++
 packages/react-query/src/useQuery.ts          | 41 ++++++++++++++++---
 2 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/packages/react-query/src/__tests__/useQuery.test-d.tsx b/packages/react-query/src/__tests__/useQuery.test-d.tsx
index fa104f5f922..d9bd4c7dd81 100644
--- a/packages/react-query/src/__tests__/useQuery.test-d.tsx
+++ b/packages/react-query/src/__tests__/useQuery.test-d.tsx
@@ -6,6 +6,7 @@ import type { OmitKeyof, QueryFunction, UseQueryOptions } from '..'
 
 describe('useQuery', () => {
   const key = queryKey()
+  type Post = { title: string }
 
   // unspecified query function should default to unknown
   const noQueryFn = useQuery({ queryKey: key })
@@ -56,6 +57,29 @@ describe('useQuery', () => {
   // @ts-expect-error
   useQuery<number>({ queryKey: key, queryFn: () => 'test' })
 
+  // should error when specifying TData that does not match queryFn data and no select transform is used
+  // @ts-expect-error
+  useQuery<Post[], Error, number, string[]>({
+    queryKey: ['posts'],
+    queryFn: () =>
+      Promise.resolve([
+        {
+          title: 'Post',
+        } as Post,
+      ]),
+  })
+
+  useQuery<Post[], Error, number, string[]>({
+    queryKey: ['posts'],
+    queryFn: () =>
+      Promise.resolve([
+        {
+          title: 'Post',
+        } as Post,
+      ]),
+    select: (posts) => posts.length,
+  })
+
   // it should infer the result type from a generic query function
   function queryFn<T = string>(): Promise<T> {
     return Promise.resolve({} as T)
diff --git a/packages/react-query/src/useQuery.ts b/packages/react-query/src/useQuery.ts
index c0f2a6a8404..0940db26c97 100644
--- a/packages/react-query/src/useQuery.ts
+++ b/packages/react-query/src/useQuery.ts
@@ -12,23 +12,54 @@ import type {
   UndefinedInitialDataOptions,
 } from './queryOptions'
 
-export function useQuery<
+type UseQueryOptionsWithSelect<
   TQueryFnData = unknown,
   TError = DefaultError,
   TData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
+> = UseQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
+  select: Exclude<
+    UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>['select'],
+    undefined
+  >
+}
+
+type UseQueryOptionsWithoutSelect<
+  TQueryFnData = unknown,
+  TError = DefaultError,
+  TData = TQueryFnData,
+  TQueryKey extends QueryKey = QueryKey,
+> = Omit<UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>, 'select'>
+
+export function useQuery<
+  TQueryFnData = unknown,
+  TError = DefaultError,
+  TData extends TQueryFnData = TQueryFnData,
+  TQueryKey extends QueryKey = QueryKey,
 >(
-  options: DefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>,
+  options: DefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey> &
+    UseQueryOptionsWithoutSelect<TQueryFnData, TError, TData, TQueryKey>,
   queryClient?: QueryClient,
 ): DefinedUseQueryResult<NoInfer<TData>, TError>
 
 export function useQuery<
   TQueryFnData = unknown,
   TError = DefaultError,
-  TData = TQueryFnData,
+  TData extends TQueryFnData = TQueryFnData,
+  TQueryKey extends QueryKey = QueryKey,
+>(
+  options: UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey> &
+    UseQueryOptionsWithoutSelect<TQueryFnData, TError, TData, TQueryKey>,
+  queryClient?: QueryClient,
+): UseQueryResult<NoInfer<TData>, TError>
+
+export function useQuery<
+  TQueryFnData = unknown,
+  TError = DefaultError,
+  TData extends TQueryFnData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
 >(
-  options: UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>,
+  options: UseQueryOptionsWithoutSelect<TQueryFnData, TError, TData, TQueryKey>,
   queryClient?: QueryClient,
 ): UseQueryResult<NoInfer<TData>, TError>
 
@@ -38,7 +69,7 @@ export function useQuery<
   TData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
 >(
-  options: UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
+  options: UseQueryOptionsWithSelect<TQueryFnData, TError, TData, TQueryKey>,
   queryClient?: QueryClient,
 ): UseQueryResult<NoInfer<TData>, TError>