@tanstack/query-core 5.51.21 → 5.52.0

package/src/__tests__/queryClient.test.tsx

@@ -218,13 +218,13 @@ describe('queryClient', () => {
       expect(testCache.find({ queryKey: key })).toBe(testCache.get('someKey'))
     })
 
-    test('should create a new query if query was not found', () => {
+    test('should create a new query if query was not found 1', () => {
       const key = queryKey()
       queryClient.setQueryData(key, 'bar')
       expect(queryClient.getQueryData(key)).toBe('bar')
     })
 
-    test('should create a new query if query was not found', () => {
+    test('should create a new query if query was not found 2', () => {
       const key = queryKey()
       queryClient.setQueryData(key, 'qux')
       expect(queryClient.getQueryData(key)).toBe('qux')
@@ -1074,7 +1074,7 @@ describe('queryClient', () => {
       expect(queryFn2).toHaveBeenCalledTimes(1)
     })
 
-    test('should be able to refetch all active and inactive queries', async () => {
+    test('should be able to refetch all active and inactive queries (queryClient.refetchQueries()', async () => {
       const key1 = queryKey()
       const key2 = queryKey()
       const queryFn1 = vi
@@ -1097,7 +1097,7 @@ describe('queryClient', () => {
       expect(queryFn2).toHaveBeenCalledTimes(2)
     })
 
-    test('should be able to refetch all active and inactive queries', async () => {
+    test('should be able to refetch all active and inactive queries (queryClient.refetchQueries({ type: "all" }))', async () => {
       const key1 = queryKey()
       const key2 = queryKey()
       const queryFn1 = vi

package/src/__tests__/queryObserver.test.tsx

@@ -157,7 +157,7 @@ describe('queryObserver', () => {
       unsubscribe()
     })
 
-    test('should not be re-fetched if not subscribed to after enabled was toggled to true', async () => {
+    test('should not be re-fetched if not subscribed to after enabled was toggled to true (fetchStatus: "idle")', async () => {
       const unsubscribe = observer.subscribe(vi.fn())
 
       // Toggle enabled
@@ -175,7 +175,7 @@ describe('queryObserver', () => {
       expect(count).toBe(0)
     })
 
-    test('should not be re-fetched if not subscribed to after enabled was toggled to true', async () => {
+    test('should not be re-fetched if not subscribed to after enabled was toggled to true (fetchStatus: "fetching")', async () => {
       const unsubscribe = observer.subscribe(vi.fn())
 
       // Toggle enabled

package/src/infiniteQueryObserver.ts

@@ -4,6 +4,7 @@ import {
   hasPreviousPage,
   infiniteQueryBehavior,
 } from './infiniteQueryBehavior'
+import type { Subscribable } from './subscribable'
 import type {
   DefaultError,
   DefaultedInfiniteQueryObserverOptions,
@@ -16,7 +17,7 @@ import type {
   QueryKey,
 } from './types'
 import type { QueryClient } from './queryClient'
-import type { NotifyOptions, ObserverFetchOptions } from './queryObserver'
+import type { NotifyOptions } from './queryObserver'
 import type { Query } from './query'
 
 type InfiniteQueryObserverListener<TData, TError> = (
@@ -38,17 +39,33 @@ export class InfiniteQueryObserver<
   TQueryKey
 > {
   // Type override
-  subscribe!: (
-    listener?: InfiniteQueryObserverListener<TData, TError>,
-  ) => () => void
+  subscribe!: Subscribable<
+    InfiniteQueryObserverListener<TData, TError>
+  >['subscribe']
 
   // Type override
-  getCurrentResult!: () => InfiniteQueryObserverResult<TData, TError>
+  getCurrentResult!: ReplaceReturnType<
+    QueryObserver<
+      TQueryFnData,
+      TError,
+      TData,
+      InfiniteData<TQueryData, TPageParam>,
+      TQueryKey
+    >['getCurrentResult'],
+    InfiniteQueryObserverResult<TData, TError>
+  >
 
   // Type override
-  protected fetch!: (
-    fetchOptions: ObserverFetchOptions,
-  ) => Promise<InfiniteQueryObserverResult<TData, TError>>
+  protected fetch!: ReplaceReturnType<
+    QueryObserver<
+      TQueryFnData,
+      TError,
+      TData,
+      InfiniteData<TQueryData, TPageParam>,
+      TQueryKey
+    >['fetch'],
+    Promise<InfiniteQueryObserverResult<TData, TError>>
+  >
 
   constructor(
     client: QueryClient,
@@ -176,3 +193,8 @@ export class InfiniteQueryObserver<
     return result as InfiniteQueryObserverResult<TData, TError>
   }
 }
+
+type ReplaceReturnType<
+  TFunction extends (...args: Array<any>) => unknown,
+  TReturn,
+> = (...args: Parameters<TFunction>) => TReturn

package/src/queryObserver.ts

@@ -34,7 +34,7 @@ export interface NotifyOptions {
   listeners?: boolean
 }
 
-export interface ObserverFetchOptions extends FetchOptions {
+interface ObserverFetchOptions extends FetchOptions {
   throwOnError?: boolean
 }
 

package/src/subscribable.ts

@@ -1,10 +1,7 @@
-type Listener = () => void
-
-export class Subscribable<TListener extends Function = Listener> {
-  protected listeners: Set<TListener>
+export class Subscribable<TListener extends Function> {
+  protected listeners = new Set<TListener>()
 
   constructor() {
-    this.listeners = new Set()
     this.subscribe = this.subscribe.bind(this)
   }