@tanstack/query-core 4.6.1 → 4.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/query-core",
-  "version": "4.6.1",
+  "version": "4.7.2",
   "description": "TODO",
   "author": "tannerlinsley",
   "license": "MIT",
@@ -31,4 +31,4 @@
     "clean": "rm -rf ./build",
     "test:eslint": "../../node_modules/.bin/eslint --ext .ts,.tsx ./src"
   }
-}
+}

package/src/queryClient.ts

@@ -105,32 +105,36 @@ export class QueryClient {
     return this.mutationCache.findAll({ ...filters, fetching: true }).length
   }
 
-  getQueryData<TData = unknown>(
+  getQueryData<TQueryFnData = unknown>(
     queryKey: QueryKey,
     filters?: QueryFilters,
-  ): TData | undefined {
-    return this.queryCache.find<TData>(queryKey, filters)?.state.data
+  ): TQueryFnData | undefined {
+    return this.queryCache.find<TQueryFnData>(queryKey, filters)?.state.data
   }
 
-  getQueriesData<TData = unknown>(queryKey: QueryKey): [QueryKey, TData][]
-  getQueriesData<TData = unknown>(filters: QueryFilters): [QueryKey, TData][]
-  getQueriesData<TData = unknown>(
+  getQueriesData<TQueryFnData = unknown>(
+    queryKey: QueryKey,
+  ): [QueryKey, TQueryFnData | undefined][]
+  getQueriesData<TQueryFnData = unknown>(
+    filters: QueryFilters,
+  ): [QueryKey, TQueryFnData | undefined][]
+  getQueriesData<TQueryFnData = unknown>(
     queryKeyOrFilters: QueryKey | QueryFilters,
-  ): [QueryKey, TData][] {
+  ): [QueryKey, TQueryFnData | undefined][] {
     return this.getQueryCache()
       .findAll(queryKeyOrFilters)
       .map(({ queryKey, state }) => {
-        const data = state.data as TData
+        const data = state.data as TQueryFnData | undefined
         return [queryKey, data]
       })
   }
 
-  setQueryData<TData>(
+  setQueryData<TQueryFnData>(
     queryKey: QueryKey,
-    updater: Updater<TData | undefined, TData | undefined>,
+    updater: Updater<TQueryFnData | undefined, TQueryFnData | undefined>,
     options?: SetDataOptions,
-  ): TData | undefined {
-    const query = this.queryCache.find<TData>(queryKey)
+  ): TQueryFnData | undefined {
+    const query = this.queryCache.find<TQueryFnData>(queryKey)
     const prevData = query?.state.data
     const data = functionalUpdate(updater, prevData)
 
@@ -145,38 +149,38 @@ export class QueryClient {
       .setData(data, { ...options, manual: true })
   }
 
-  setQueriesData<TData>(
+  setQueriesData<TQueryFnData>(
     queryKey: QueryKey,
-    updater: Updater<TData | undefined, TData | undefined>,
+    updater: Updater<TQueryFnData | undefined, TQueryFnData | undefined>,
     options?: SetDataOptions,
-  ): [QueryKey, TData | undefined][]
+  ): [QueryKey, TQueryFnData | undefined][]
 
-  setQueriesData<TData>(
+  setQueriesData<TQueryFnData>(
     filters: QueryFilters,
-    updater: Updater<TData | undefined, TData | undefined>,
+    updater: Updater<TQueryFnData | undefined, TQueryFnData | undefined>,
     options?: SetDataOptions,
-  ): [QueryKey, TData | undefined][]
+  ): [QueryKey, TQueryFnData | undefined][]
 
-  setQueriesData<TData>(
+  setQueriesData<TQueryFnData>(
     queryKeyOrFilters: QueryKey | QueryFilters,
-    updater: Updater<TData | undefined, TData | undefined>,
+    updater: Updater<TQueryFnData | undefined, TQueryFnData | undefined>,
     options?: SetDataOptions,
-  ): [QueryKey, TData | undefined][] {
+  ): [QueryKey, TQueryFnData | undefined][] {
     return notifyManager.batch(() =>
       this.getQueryCache()
         .findAll(queryKeyOrFilters)
         .map(({ queryKey }) => [
           queryKey,
-          this.setQueryData<TData>(queryKey, updater, options),
+          this.setQueryData<TQueryFnData>(queryKey, updater, options),
         ]),
     )
   }
 
-  getQueryState<TData = unknown, TError = undefined>(
+  getQueryState<TQueryFnData = unknown, TError = undefined>(
     queryKey: QueryKey,
     filters?: QueryFilters,
-  ): QueryState<TData, TError> | undefined {
-    return this.queryCache.find<TData, TError>(queryKey, filters)?.state
+  ): QueryState<TQueryFnData, TError> | undefined {
+    return this.queryCache.find<TQueryFnData, TError>(queryKey, filters)?.state
   }
 
   removeQueries(filters?: QueryFilters): void

package/src/tests/query.test.tsx

@@ -201,11 +201,7 @@ describe('query', () => {
     expect(args).toBeDefined()
     expect(args.pageParam).toBeUndefined()
     expect(args.queryKey).toEqual(key)
-    if (typeof AbortSignal === 'function') {
-      expect(args.signal).toBeInstanceOf(AbortSignal)
-    } else {
-      expect(args.signal).toBeUndefined()
-    }
+    expect(args.signal).toBeInstanceOf(AbortSignal)
   })
 
   test('should continue if cancellation is not supported and signal is not consumed', async () => {
@@ -259,20 +255,11 @@ describe('query', () => {
 
     const query = queryCache.find(key)!
 
-    if (typeof AbortSignal === 'function') {
-      expect(query.state).toMatchObject({
-        data: undefined,
-        status: 'loading',
-        fetchStatus: 'idle',
-      })
-    } else {
-      expect(query.state).toMatchObject({
-        data: 'data',
-        status: 'success',
-        fetchStatus: 'idle',
-        dataUpdateCount: 1,
-      })
-    }
+    expect(query.state).toMatchObject({
+      data: undefined,
+      status: 'loading',
+      fetchStatus: 'idle',
+    })
   })
 
   test('should provide an AbortSignal to the queryFn that provides info about the cancellation state', async () => {
@@ -312,12 +299,8 @@ describe('query', () => {
 
     expect(queryFn).toHaveBeenCalledTimes(1)
 
-    let signal = queryFn.mock.calls[0]![0].signal
-
-    if (typeof AbortSignal === 'function') {
-      signal = queryFn.mock.calls[0]![0].signal
-      expect(signal?.aborted).toBe(false)
-    }
+    const signal = queryFn.mock.calls[0]![0].signal
+    expect(signal?.aborted).toBe(false)
     expect(onAbort).not.toHaveBeenCalled()
     expect(abortListener).not.toHaveBeenCalled()
 
@@ -325,11 +308,9 @@ describe('query', () => {
 
     await sleep(100)
 
-    if (typeof AbortSignal === 'function') {
-      expect(signal?.aborted).toBe(true)
-      expect(onAbort).toHaveBeenCalledTimes(1)
-      expect(abortListener).toHaveBeenCalledTimes(1)
-    }
+    expect(signal?.aborted).toBe(true)
+    expect(onAbort).toHaveBeenCalledTimes(1)
+    expect(abortListener).toHaveBeenCalledTimes(1)
     expect(isCancelledError(error)).toBe(true)
   })
 

package/src/tests/queryClient.test.tsx

@@ -1176,9 +1176,7 @@ describe('queryClient', () => {
 
       await queryClient.refetchQueries()
       observer.destroy()
-      if (typeof AbortSignal === 'function') {
-        expect(abortFn).toHaveBeenCalledTimes(1)
-      }
+      expect(abortFn).toHaveBeenCalledTimes(1)
       expect(fetchCount).toBe(2)
     })
 
@@ -1203,9 +1201,7 @@ describe('queryClient', () => {
 
       await queryClient.refetchQueries(undefined, { cancelRefetch: false })
       observer.destroy()
-      if (typeof AbortSignal === 'function') {
-        expect(abortFn).toHaveBeenCalledTimes(0)
-      }
+      expect(abortFn).toHaveBeenCalledTimes(0)
       expect(fetchCount).toBe(1)
     })
   })