fix(react-query): fix inferring data as | undefined when using initia…

…lData without queryFn (#8674)
TanStack · Feb 20, 2025 · 9ac54b1 · 9ac54b1
1 parent d07a3db
commit 9ac54b1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/packages/react-query/src/__tests__/useQuery.test-d.tsx b/packages/react-query/src/__tests__/useQuery.test-d.tsx
@@ -105,6 +105,15 @@ describe('initialData', () => {
         expectTypeOf(data).toEqualTypeOf<{ wow: boolean }>()
       }
     })
+
+    it('data should not have undefined when initialData is provided', () => {
+      const { data } = useQuery({
+        queryKey: ['query-key'],
+        initialData: 42,
+      })
+
+      expectTypeOf(data).toEqualTypeOf<number>()
+    })
   })
 
   describe('custom hook', () => {

diff --git a/packages/react-query/src/queryOptions.ts b/packages/react-query/src/queryOptions.ts
@@ -47,7 +47,7 @@ export type DefinedInitialDataOptions<
   initialData:
     | NonUndefinedGuard<TQueryFnData>
     | (() => NonUndefinedGuard<TQueryFnData>)
-  queryFn: QueryFunction<TQueryFnData, TQueryKey>
+  queryFn?: QueryFunction<TQueryFnData, TQueryKey>
 }
 
 export function queryOptions<