@tanstack/query-core 4.7.1 → 4.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/query-core",
-  "version": "4.7.1",
+  "version": "4.8.0",
   "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/queryObserver.ts

@@ -547,13 +547,16 @@ export class QueryObserver<
     }
 
     const isFetching = fetchStatus === 'fetching'
+    const isLoading = status === 'loading'
+    const isError = status === 'error'
 
     const result: QueryObserverBaseResult<TData, TError> = {
       status,
       fetchStatus,
-      isLoading: status === 'loading',
+      isLoading,
       isSuccess: status === 'success',
-      isError: status === 'error',
+      isError,
+      isInitialLoading: isLoading && isFetching,
       data,
       dataUpdatedAt,
       error,
@@ -564,13 +567,13 @@ export class QueryObserver<
       isFetchedAfterMount:
         state.dataUpdateCount > queryInitialState.dataUpdateCount ||
         state.errorUpdateCount > queryInitialState.errorUpdateCount,
-      isFetching: isFetching,
-      isRefetching: isFetching && status !== 'loading',
-      isLoadingError: status === 'error' && state.dataUpdatedAt === 0,
+      isFetching,
+      isRefetching: isFetching && !isLoading,
+      isLoadingError: isError && state.dataUpdatedAt === 0,
       isPaused: fetchStatus === 'paused',
       isPlaceholderData,
       isPreviousData,
-      isRefetchError: status === 'error' && state.dataUpdatedAt !== 0,
+      isRefetchError: isError && state.dataUpdatedAt !== 0,
       isStale: isStale(query, options),
       refetch: this.refetch,
       remove: this.remove,

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)
     })
   })

package/src/types.ts

@@ -373,6 +373,7 @@ export interface QueryObserverBaseResult<TData = unknown, TError = unknown> {
   isFetching: boolean
   isLoading: boolean
   isLoadingError: boolean
+  isInitialLoading: boolean
   isPaused: boolean
   isPlaceholderData: boolean
   isPreviousData: boolean