fix: remove query immediately if cacheTime is 0

Author: boschni

src/core/query.ts

@@ -164,9 +164,13 @@ export class Query<TData = unknown, TError = unknown, TQueryFnData = TData> {
     this.clearGcTimeout()
 
     if (!this.observers.length && isValidTimeout(this.cacheTime)) {
-      this.gcTimeout = setTimeout(() => {
+      if (!this.cacheTime) {
         this.cache.remove(this)
-      }, this.cacheTime)
+      } else {
+        this.gcTimeout = setTimeout(() => {
+          this.cache.remove(this)
+        }, this.cacheTime)
+      }
     }
   }
 

src/core/tests/queryCache.test.tsx

@@ -1009,9 +1009,8 @@ describe('queryCache', () => {
     })
     expect(queryCache.find(key)).toBeDefined()
     const unsubscribe = observer.subscribe()
-    unsubscribe()
     expect(queryCache.find(key)).toBeDefined()
-    await sleep(100)
+    unsubscribe()
     expect(queryCache.find(key)).toBeUndefined()
   })
 
@@ -1411,6 +1410,31 @@ describe('queryCache', () => {
 
       consoleMock.mockRestore()
     })
+
+    test('queries with cacheTime 0 should be removed immediately after unsubscribing', async () => {
+      const consoleMock = mockConsoleError()
+      const key = queryKey()
+      const testClient = new QueryClient()
+      let count = 0
+      const observer = new QueryObserver(testClient, {
+        queryKey: key,
+        queryFn: () => {
+          count++
+          return 'data'
+        },
+        cacheTime: 0,
+        staleTime: Infinity,
+      })
+      const unsubscribe1 = observer.subscribe()
+      unsubscribe1()
+      await sleep(10)
+      const unsubscribe2 = observer.subscribe()
+      unsubscribe2()
+      await sleep(10)
+      expect(count).toBe(2)
+      testClient.clear()
+      consoleMock.mockRestore()
+    })
   })
 
   describe('QueryObserver', () => {