@tanstack/solid-query 4.7.1 → 4.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-query",
-  "version": "4.7.1",
+  "version": "4.8.0",
   "description": "Primitives for managing, caching and syncing asynchronous and remote data in Solid",
   "author": "tannerlinsley",
   "license": "MIT",
@@ -26,12 +26,6 @@
     "./package.json": "./package.json"
   },
   "sideEffects": false,
-  "scripts": {
-    "clean": "rm -rf ./build",
-    "test:eslint": "../../node_modules/.bin/eslint --ext .ts,.tsx ./src",
-    "test:jest": "../../node_modules/.bin/jest --config jest.config.js",
-    "test:jest:dev": "yarn test:jest --watch"
-  },
   "files": [
     "build/lib/*",
     "build/umd/*",
@@ -43,10 +37,16 @@
     "jscodeshift": "^0.13.1"
   },
   "dependencies": {
-    "@tanstack/query-core": "4.7.1"
+    "@tanstack/query-core": "4.8.0"
   },
   "peerDependencies": {
     "solid-js": "^1.5.4"
   },
-  "peerDependenciesMeta": {}
-}
+  "peerDependenciesMeta": {},
+  "scripts": {
+    "clean": "rm -rf ./build",
+    "test:eslint": "../../node_modules/.bin/eslint --ext .ts,.tsx ./src",
+    "test:jest": "../../node_modules/.bin/jest --config jest.config.js",
+    "test:jest:dev": "pnpm test:jest --watch"
+  }
+}

package/src/__tests__/createInfiniteQuery.test.tsx

@@ -93,6 +93,7 @@ describe('useInfiniteQuery', () => {
       isFetchingNextPage: false,
       isFetchingPreviousPage: false,
       isLoading: true,
+      isInitialLoading: true,
       isLoadingError: false,
       isPlaceholderData: false,
       isPreviousData: false,
@@ -125,6 +126,7 @@ describe('useInfiniteQuery', () => {
       isFetchingNextPage: false,
       isFetchingPreviousPage: false,
       isLoading: false,
+      isInitialLoading: false,
       isLoadingError: false,
       isPlaceholderData: false,
       isPreviousData: false,
@@ -938,34 +940,28 @@ describe('useInfiniteQuery', () => {
     const firstCtx = fetchPage.mock.calls[callIndex]![0]
     expect(firstCtx.pageParam).toBeUndefined()
     expect(firstCtx.queryKey).toEqual(key())
-    if (typeof AbortSignal === 'function') {
-      expect(firstCtx.signal).toBeInstanceOf(AbortSignal)
-      expect(firstCtx.signal?.aborted).toBe(false)
-      expect(onAborts[callIndex]).not.toHaveBeenCalled()
-      expect(abortListeners[callIndex]).not.toHaveBeenCalled()
-    }
+    expect(firstCtx.signal).toBeInstanceOf(AbortSignal)
+    expect(firstCtx.signal?.aborted).toBe(false)
+    expect(onAborts[callIndex]).not.toHaveBeenCalled()
+    expect(abortListeners[callIndex]).not.toHaveBeenCalled()
 
     callIndex = 1
     const secondCtx = fetchPage.mock.calls[callIndex]![0]
     expect(secondCtx.pageParam).toBe(11)
     expect(secondCtx.queryKey).toEqual(key())
-    if (typeof AbortSignal === 'function') {
-      expect(secondCtx.signal).toBeInstanceOf(AbortSignal)
-      expect(secondCtx.signal?.aborted).toBe(true)
-      expect(onAborts[callIndex]).toHaveBeenCalledTimes(1)
-      expect(abortListeners[callIndex]).toHaveBeenCalledTimes(1)
-    }
+    expect(secondCtx.signal).toBeInstanceOf(AbortSignal)
+    expect(secondCtx.signal?.aborted).toBe(true)
+    expect(onAborts[callIndex]).toHaveBeenCalledTimes(1)
+    expect(abortListeners[callIndex]).toHaveBeenCalledTimes(1)
 
     callIndex = 2
     const thirdCtx = fetchPage.mock.calls[callIndex]![0]
     expect(thirdCtx.pageParam).toBe(11)
     expect(thirdCtx.queryKey).toEqual(key())
-    if (typeof AbortSignal === 'function') {
-      expect(thirdCtx.signal).toBeInstanceOf(AbortSignal)
-      expect(thirdCtx.signal?.aborted).toBe(false)
-      expect(onAborts[callIndex]).not.toHaveBeenCalled()
-      expect(abortListeners[callIndex]).not.toHaveBeenCalled()
-    }
+    expect(thirdCtx.signal).toBeInstanceOf(AbortSignal)
+    expect(thirdCtx.signal?.aborted).toBe(false)
+    expect(onAborts[callIndex]).not.toHaveBeenCalled()
+    expect(abortListeners[callIndex]).not.toHaveBeenCalled()
   })
 
   it('should not cancel an ongoing fetchNextPage request when another fetchNextPage is invoked if `cancelRefetch: false` is used ', async () => {
@@ -1024,23 +1020,19 @@ describe('useInfiniteQuery', () => {
     const firstCtx = fetchPage.mock.calls[callIndex]![0]
     expect(firstCtx.pageParam).toBeUndefined()
     expect(firstCtx.queryKey).toEqual(key())
-    if (typeof AbortSignal === 'function') {
-      expect(firstCtx.signal).toBeInstanceOf(AbortSignal)
-      expect(firstCtx.signal?.aborted).toBe(false)
-      expect(onAborts[callIndex]).not.toHaveBeenCalled()
-      expect(abortListeners[callIndex]).not.toHaveBeenCalled()
-    }
+    expect(firstCtx.signal).toBeInstanceOf(AbortSignal)
+    expect(firstCtx.signal?.aborted).toBe(false)
+    expect(onAborts[callIndex]).not.toHaveBeenCalled()
+    expect(abortListeners[callIndex]).not.toHaveBeenCalled()
 
     callIndex = 1
     const secondCtx = fetchPage.mock.calls[callIndex]![0]
     expect(secondCtx.pageParam).toBe(11)
     expect(secondCtx.queryKey).toEqual(key())
-    if (typeof AbortSignal === 'function') {
-      expect(secondCtx.signal).toBeInstanceOf(AbortSignal)
-      expect(secondCtx.signal?.aborted).toBe(false)
-      expect(onAborts[callIndex]).not.toHaveBeenCalled()
-      expect(abortListeners[callIndex]).not.toHaveBeenCalled()
-    }
+    expect(secondCtx.signal).toBeInstanceOf(AbortSignal)
+    expect(secondCtx.signal?.aborted).toBe(false)
+    expect(onAborts[callIndex]).not.toHaveBeenCalled()
+    expect(abortListeners[callIndex]).not.toHaveBeenCalled()
   })
 
   it('should keep fetching first page when not loaded yet and triggering fetch more', async () => {
@@ -1145,22 +1137,12 @@ describe('useInfiniteQuery', () => {
 
     await sleep(300)
 
-    if (typeof AbortSignal === 'function') {
-      expect(fetches).toBe(2)
-      expect(queryClient.getQueryState(key())).toMatchObject({
-        data: initialData,
-        status: 'success',
-        error: null,
-      })
-    } else {
-      // if AbortSignal is not consumed, fetches should not abort
-      expect(fetches).toBe(4)
-      expect(queryClient.getQueryState(key())).toMatchObject({
-        data: { pages: [0, 10, 20, 30], pageParams: [0, 1, 2, 3] },
-        status: 'success',
-        error: null,
-      })
-    }
+    expect(fetches).toBe(2)
+    expect(queryClient.getQueryState(key())).toMatchObject({
+      data: initialData,
+      status: 'success',
+      error: null,
+    })
   })
 
   it('should be able to override the cursor in the fetchNextPage callback', async () => {
@@ -1857,7 +1839,7 @@ describe('useInfiniteQuery', () => {
       const promise = new Promise<string>((resolve, reject) => {
         cancelFn = jest.fn(() => reject('Cancelled'))
         signal?.addEventListener('abort', cancelFn)
-        sleep(10).then(() => resolve('OK'))
+        sleep(20).then(() => resolve('OK'))
       })
 
       return promise
@@ -1882,8 +1864,6 @@ describe('useInfiniteQuery', () => {
 
     await waitFor(() => screen.getByText('off'))
 
-    if (typeof AbortSignal === 'function') {
-      expect(cancelFn).toHaveBeenCalled()
-    }
+    expect(cancelFn).toHaveBeenCalled()
   })
 })

package/src/__tests__/createQuery.test.tsx

@@ -273,6 +273,7 @@ describe('createQuery', () => {
       isFetching: true,
       isPaused: false,
       isLoading: true,
+      isInitialLoading: true,
       isLoadingError: false,
       isPlaceholderData: false,
       isPreviousData: false,
@@ -299,6 +300,7 @@ describe('createQuery', () => {
       isFetching: false,
       isPaused: false,
       isLoading: false,
+      isInitialLoading: false,
       isLoadingError: false,
       isPlaceholderData: false,
       isPreviousData: false,
@@ -361,6 +363,7 @@ describe('createQuery', () => {
       isFetching: true,
       isPaused: false,
       isLoading: true,
+      isInitialLoading: true,
       isLoadingError: false,
       isPlaceholderData: false,
       isPreviousData: false,
@@ -387,6 +390,7 @@ describe('createQuery', () => {
       isFetching: true,
       isPaused: false,
       isLoading: true,
+      isInitialLoading: true,
       isLoadingError: false,
       isPlaceholderData: false,
       isPreviousData: false,
@@ -413,6 +417,7 @@ describe('createQuery', () => {
       isFetching: false,
       isPaused: false,
       isLoading: false,
+      isInitialLoading: false,
       isLoadingError: true,
       isPlaceholderData: false,
       isPreviousData: false,
@@ -4936,7 +4941,7 @@ describe('createQuery', () => {
       const promise = new Promise<string>((resolve, reject) => {
         cancelFn = jest.fn(() => reject('Cancelled'))
         signal?.addEventListener('abort', cancelFn)
-        sleep(10).then(() => resolve('OK'))
+        sleep(20).then(() => resolve('OK'))
       })
 
       return promise
@@ -4961,9 +4966,7 @@ describe('createQuery', () => {
 
     await waitFor(() => screen.getByText('off'))
 
-    if (typeof AbortSignal === 'function') {
-      expect(cancelFn).toHaveBeenCalled()
-    }
+    expect(cancelFn).toHaveBeenCalled()
   })
 
   it('should cancel the query if the signal was consumed and there are no more subscriptions', async () => {
@@ -5013,19 +5016,11 @@ describe('createQuery', () => {
       dataUpdateCount: 1,
     })
 
-    if (typeof AbortSignal === 'function') {
-      expect(queryCache.find([key(), 1])?.state).toMatchObject({
-        data: undefined,
-        status: 'loading',
-        fetchStatus: 'idle',
-      })
-    } else {
-      expect(queryCache.find([key(), 1])?.state).toMatchObject({
-        data: 'data 1',
-        status: 'success',
-        dataUpdateCount: 1,
-      })
-    }
+    expect(queryCache.find([key(), 1])?.state).toMatchObject({
+      data: undefined,
+      status: 'loading',
+      fetchStatus: 'idle',
+    })
 
     expect(queryCache.find([key(), 2])?.state).toMatchObject({
       data: 'data 2',
@@ -5033,19 +5028,11 @@ describe('createQuery', () => {
       dataUpdateCount: 1,
     })
 
-    if (typeof AbortSignal === 'function') {
-      expect(queryCache.find([key(), 3])?.state).toMatchObject({
-        data: undefined,
-        status: 'loading',
-        fetchStatus: 'idle',
-      })
-    } else {
-      expect(queryCache.find([key(), 3])?.state).toMatchObject({
-        data: 'data 3',
-        status: 'success',
-        dataUpdateCount: 1,
-      })
-    }
+    expect(queryCache.find([key(), 3])?.state).toMatchObject({
+      data: undefined,
+      status: 'loading',
+      fetchStatus: 'idle',
+    })
   })
 
   it('should refetch when quickly switching to a failed query', async () => {
@@ -6195,7 +6182,7 @@ describe('createQuery', () => {
         status: 'success',
       })
 
-      expect(count).toBe(typeof AbortSignal === 'function' ? 1 : 2)
+      expect(count).toBe(1)
 
       onlineMock.mockRestore()
     })