@tanstack/solid-query 5.35.5 → 5.36.1

package/build/dev.cjs

@@ -380,9 +380,7 @@ function useIsMutating(filters, queryClient) {
 }
 function getResult(mutationCache, options) {
   return mutationCache.findAll(options.filters).map(
-    (mutation) => options.select ? options.select(
-      mutation
-    ) : mutation.state
+    (mutation) => options.select ? options.select(mutation) : mutation.state
   );
 }
 function useMutationState(options = () => ({}), queryClient) {

package/build/dev.js

@@ -379,9 +379,7 @@ function useIsMutating(filters, queryClient) {
 }
 function getResult(mutationCache, options) {
   return mutationCache.findAll(options.filters).map(
-    (mutation) => options.select ? options.select(
-      mutation
-    ) : mutation.state
+    (mutation) => options.select ? options.select(mutation) : mutation.state
   );
 }
 function useMutationState(options = () => ({}), queryClient) {

package/build/index.cjs

@@ -371,9 +371,7 @@ function useIsMutating(filters, queryClient) {
 }
 function getResult(mutationCache, options) {
   return mutationCache.findAll(options.filters).map(
-    (mutation) => options.select ? options.select(
-      mutation
-    ) : mutation.state
+    (mutation) => options.select ? options.select(mutation) : mutation.state
   );
 }
 function useMutationState(options = () => ({}), queryClient) {

package/build/index.d.cts

@@ -120,7 +120,7 @@ declare function useIsMutating(filters?: Accessor<MutationFilters>, queryClient?
 
 type MutationStateOptions<TResult = MutationState> = {
     filters?: MutationFilters;
-    select?: (mutation: Mutation<unknown, DefaultError, unknown, unknown>) => TResult;
+    select?: (mutation: Mutation) => TResult;
 };
 declare function useMutationState<TResult = MutationState>(options?: Accessor<MutationStateOptions<TResult>>, queryClient?: Accessor<QueryClient>): Accessor<Array<TResult>>;
 

package/build/index.d.ts

@@ -120,7 +120,7 @@ declare function useIsMutating(filters?: Accessor<MutationFilters>, queryClient?
 
 type MutationStateOptions<TResult = MutationState> = {
     filters?: MutationFilters;
-    select?: (mutation: Mutation<unknown, DefaultError, unknown, unknown>) => TResult;
+    select?: (mutation: Mutation) => TResult;
 };
 declare function useMutationState<TResult = MutationState>(options?: Accessor<MutationStateOptions<TResult>>, queryClient?: Accessor<QueryClient>): Accessor<Array<TResult>>;
 

package/build/index.js

@@ -370,9 +370,7 @@ function useIsMutating(filters, queryClient) {
 }
 function getResult(mutationCache, options) {
   return mutationCache.findAll(options.filters).map(
-    (mutation) => options.select ? options.select(
-      mutation
-    ) : mutation.state
+    (mutation) => options.select ? options.select(mutation) : mutation.state
   );
 }
 function useMutationState(options = () => ({}), queryClient) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-query",
-  "version": "5.35.5",
+  "version": "5.36.1",
   "description": "Primitives for managing, caching and syncing asynchronous and remote data in Solid",
   "author": "tannerlinsley",
   "license": "MIT",
@@ -45,7 +45,7 @@
   ],
   "dependencies": {
     "solid-js": "^1.8.14",
-    "@tanstack/query-core": "5.35.5"
+    "@tanstack/query-core": "5.36.1"
   },
   "devDependencies": {
     "tsup-preset-solid": "^2.2.0",

package/src/__tests__/createInfiniteQuery.test.tsx

@@ -103,7 +103,9 @@ describe('useInfiniteQuery', () => {
       isFetchedAfterMount: false,
       isFetching: true,
       isPaused: false,
+      isFetchNextPageError: false,
       isFetchingNextPage: false,
+      isFetchPreviousPageError: false,
       isFetchingPreviousPage: false,
       isPending: true,
       isLoading: true,
@@ -136,7 +138,9 @@ describe('useInfiniteQuery', () => {
       isFetchedAfterMount: true,
       isFetching: false,
       isPaused: false,
+      isFetchNextPageError: false,
       isFetchingNextPage: false,
+      isFetchPreviousPageError: false,
       isFetchingPreviousPage: false,
       isPending: false,
       isLoading: false,
@@ -679,6 +683,330 @@ describe('useInfiniteQuery', () => {
     })
   })
 
+  it('should return the correct states when refetch fails', async () => {
+    const key = queryKey()
+    const states: Array<
+      Partial<CreateInfiniteQueryResult<InfiniteData<number>>>
+    > = []
+    let isRefetch = false
+
+    function Page() {
+      const state = createInfiniteQuery(() => ({
+        queryKey: key,
+        queryFn: async ({ pageParam }) => {
+          await sleep(10)
+          if (isRefetch) {
+            throw new Error()
+          } else {
+            return Number(pageParam)
+          }
+        },
+        getPreviousPageParam: (firstPage) => firstPage - 1,
+        getNextPageParam: (lastPage) => lastPage + 1,
+        initialPageParam: 10,
+        notifyOnChangeProps: 'all',
+        retry: false,
+      }))
+
+      createRenderEffect(() => {
+        states.push({
+          data: state.data ? JSON.parse(JSON.stringify(state.data)) : undefined,
+          isFetching: state.isFetching,
+          isFetchNextPageError: state.isFetchNextPageError,
+          isFetchingNextPage: state.isFetchingNextPage,
+          isFetchPreviousPageError: state.isFetchPreviousPageError,
+          isFetchingPreviousPage: state.isFetchingPreviousPage,
+          isRefetchError: state.isRefetchError,
+          isRefetching: state.isRefetching,
+        })
+      })
+
+      return (
+        <div>
+          <button
+            onClick={() => {
+              isRefetch = true
+              state.refetch()
+            }}
+          >
+            refetch
+          </button>
+          <div>data: {state.data?.pages.join(',') ?? 'null'}</div>
+          <div>isFetching: {String(state.isFetching)}</div>
+        </div>
+      )
+    }
+
+    const rendered = render(() => (
+      <QueryClientProvider client={queryClient}>
+        <Page />
+      </QueryClientProvider>
+    ))
+
+    await waitFor(() => rendered.getByText('data: 10'))
+    fireEvent.click(rendered.getByRole('button', { name: /refetch/i }))
+
+    await waitFor(() => rendered.getByText('isFetching: false'))
+    await waitFor(() => expect(states.length).toBe(4))
+
+    // Initial fetch
+    expect(states[0]).toMatchObject({
+      data: undefined,
+      isFetching: true,
+      isFetchNextPageError: false,
+      isFetchingNextPage: false,
+      isFetchPreviousPageError: false,
+      isFetchingPreviousPage: false,
+      isRefetchError: false,
+      isRefetching: false,
+    })
+    // Initial fetch done
+    expect(states[1]).toMatchObject({
+      data: { pages: [10] },
+      isFetching: false,
+      isFetchNextPageError: false,
+      isFetchingNextPage: false,
+      isFetchPreviousPageError: false,
+      isFetchingPreviousPage: false,
+      isRefetchError: false,
+      isRefetching: false,
+    })
+    // Refetch
+    expect(states[2]).toMatchObject({
+      data: { pages: [10] },
+      isFetching: true,
+      isFetchNextPageError: false,
+      isFetchingNextPage: false,
+      isFetchPreviousPageError: false,
+      isFetchingPreviousPage: false,
+      isRefetchError: false,
+      isRefetching: true,
+    })
+    // Refetch failed
+    expect(states[3]).toMatchObject({
+      data: { pages: [10] },
+      isFetching: false,
+      isFetchNextPageError: false,
+      isFetchingNextPage: false,
+      isFetchPreviousPageError: false,
+      isFetchingPreviousPage: false,
+      isRefetchError: true,
+      isRefetching: false,
+    })
+  })
+
+  it('should return the correct states when fetchNextPage fails', async () => {
+    const key = queryKey()
+    const states: Array<
+      Partial<CreateInfiniteQueryResult<InfiniteData<number>>>
+    > = []
+
+    function Page() {
+      const state = createInfiniteQuery(() => ({
+        queryKey: key,
+        queryFn: async ({ pageParam }) => {
+          await sleep(10)
+          if (pageParam !== 10) {
+            throw new Error()
+          } else {
+            return Number(pageParam)
+          }
+        },
+        getPreviousPageParam: (firstPage) => firstPage - 1,
+        getNextPageParam: (lastPage) => lastPage + 1,
+        initialPageParam: 10,
+        notifyOnChangeProps: 'all',
+        retry: false,
+      }))
+
+      createRenderEffect(() => {
+        states.push({
+          data: state.data ? JSON.parse(JSON.stringify(state.data)) : undefined,
+          isFetching: state.isFetching,
+          isFetchNextPageError: state.isFetchNextPageError,
+          isFetchingNextPage: state.isFetchingNextPage,
+          isFetchPreviousPageError: state.isFetchPreviousPageError,
+          isFetchingPreviousPage: state.isFetchingPreviousPage,
+          isRefetchError: state.isRefetchError,
+          isRefetching: state.isRefetching,
+        })
+      })
+
+      return (
+        <div>
+          <button onClick={() => state.fetchNextPage()}>fetchNextPage</button>
+          <div>data: {state.data?.pages.join(',') ?? 'null'}</div>
+          <div>isFetching: {String(state.isFetching)}</div>
+        </div>
+      )
+    }
+
+    const rendered = render(() => (
+      <QueryClientProvider client={queryClient}>
+        <Page />
+      </QueryClientProvider>
+    ))
+
+    await waitFor(() => rendered.getByText('data: 10'))
+    fireEvent.click(rendered.getByRole('button', { name: /fetchNextPage/i }))
+
+    await waitFor(() => rendered.getByText('isFetching: false'))
+    await waitFor(() => expect(states.length).toBe(4))
+
+    // Initial fetch
+    expect(states[0]).toMatchObject({
+      data: undefined,
+      isFetching: true,
+      isFetchNextPageError: false,
+      isFetchingNextPage: false,
+      isFetchPreviousPageError: false,
+      isFetchingPreviousPage: false,
+      isRefetchError: false,
+      isRefetching: false,
+    })
+    // Initial fetch done
+    expect(states[1]).toMatchObject({
+      data: { pages: [10] },
+      isFetching: false,
+      isFetchNextPageError: false,
+      isFetchingNextPage: false,
+      isFetchPreviousPageError: false,
+      isFetchingPreviousPage: false,
+      isRefetchError: false,
+      isRefetching: false,
+    })
+    // Fetch next page
+    expect(states[2]).toMatchObject({
+      data: { pages: [10] },
+      isFetching: true,
+      isFetchNextPageError: false,
+      isFetchingNextPage: true,
+      isFetchPreviousPageError: false,
+      isFetchingPreviousPage: false,
+      isRefetchError: false,
+      isRefetching: false,
+    })
+    // Fetch next page failed
+    expect(states[3]).toMatchObject({
+      data: { pages: [10] },
+      isFetching: false,
+      isFetchNextPageError: true,
+      isFetchingNextPage: false,
+      isFetchPreviousPageError: false,
+      isFetchingPreviousPage: false,
+      isRefetchError: false,
+      isRefetching: false,
+    })
+  })
+
+  it('should return the correct states when fetchPreviousPage fails', async () => {
+    const key = queryKey()
+    const states: Array<
+      Partial<CreateInfiniteQueryResult<InfiniteData<number>>>
+    > = []
+
+    function Page() {
+      const state = createInfiniteQuery(() => ({
+        queryKey: key,
+        queryFn: async ({ pageParam }) => {
+          await sleep(10)
+          if (pageParam !== 10) {
+            throw new Error()
+          } else {
+            return Number(pageParam)
+          }
+        },
+        getPreviousPageParam: (firstPage) => firstPage - 1,
+        getNextPageParam: (lastPage) => lastPage + 1,
+        initialPageParam: 10,
+        notifyOnChangeProps: 'all',
+        retry: false,
+      }))
+
+      createRenderEffect(() => {
+        states.push({
+          data: state.data ? JSON.parse(JSON.stringify(state.data)) : undefined,
+          isFetching: state.isFetching,
+          isFetchNextPageError: state.isFetchNextPageError,
+          isFetchingNextPage: state.isFetchingNextPage,
+          isFetchPreviousPageError: state.isFetchPreviousPageError,
+          isFetchingPreviousPage: state.isFetchingPreviousPage,
+          isRefetchError: state.isRefetchError,
+          isRefetching: state.isRefetching,
+        })
+      })
+
+      return (
+        <div>
+          <button onClick={() => state.fetchPreviousPage()}>
+            fetchPreviousPage
+          </button>
+          <div>data: {state.data?.pages.join(',') ?? 'null'}</div>
+          <div>isFetching: {String(state.isFetching)}</div>
+        </div>
+      )
+    }
+
+    const rendered = render(() => (
+      <QueryClientProvider client={queryClient}>
+        <Page />
+      </QueryClientProvider>
+    ))
+
+    await waitFor(() => rendered.getByText('data: 10'))
+    fireEvent.click(
+      rendered.getByRole('button', { name: /fetchPreviousPage/i }),
+    )
+
+    await waitFor(() => rendered.getByText('isFetching: false'))
+    await waitFor(() => expect(states.length).toBe(4))
+
+    // Initial fetch
+    expect(states[0]).toMatchObject({
+      data: undefined,
+      isFetching: true,
+      isFetchNextPageError: false,
+      isFetchingNextPage: false,
+      isFetchPreviousPageError: false,
+      isFetchingPreviousPage: false,
+      isRefetchError: false,
+      isRefetching: false,
+    })
+    // Initial fetch done
+    expect(states[1]).toMatchObject({
+      data: { pages: [10] },
+      isFetching: false,
+      isFetchNextPageError: false,
+      isFetchingNextPage: false,
+      isFetchPreviousPageError: false,
+      isFetchingPreviousPage: false,
+      isRefetchError: false,
+      isRefetching: false,
+    })
+    // Fetch previous page
+    expect(states[2]).toMatchObject({
+      data: { pages: [10] },
+      isFetching: true,
+      isFetchNextPageError: false,
+      isFetchingNextPage: false,
+      isFetchPreviousPageError: false,
+      isFetchingPreviousPage: true,
+      isRefetchError: false,
+      isRefetching: false,
+    })
+    // Fetch previous page failed
+    expect(states[3]).toMatchObject({
+      data: { pages: [10] },
+      isFetching: false,
+      isFetchNextPageError: false,
+      isFetchingNextPage: false,
+      isFetchPreviousPageError: true,
+      isFetchingPreviousPage: false,
+      isRefetchError: false,
+      isRefetching: false,
+    })
+  })
+
   it('should silently cancel any ongoing fetch when fetching more', async () => {
     const key = queryKey()
     const states: Array<

package/src/__tests__/useMutationState.test-d.tsx

@@ -8,9 +8,7 @@ describe('useMutationState', () => {
       filters: { status: 'pending' },
     }))
 
-    expectTypeOf(result()).toEqualTypeOf<
-      Array<MutationState<unknown, Error, void, unknown>>
-    >()
+    expectTypeOf(result()).toEqualTypeOf<Array<MutationState>>()
   })
   it('should infer with select', () => {
     const result = useMutationState(() => ({

package/src/useMutationState.ts

@@ -2,7 +2,6 @@ import { createEffect, createMemo, createSignal, onCleanup } from 'solid-js'
 import { replaceEqualDeep } from '@tanstack/query-core'
 import { useQueryClient } from './QueryClientProvider'
 import type {
-  DefaultError,
   Mutation,
   MutationCache,
   MutationFilters,
@@ -13,9 +12,7 @@ import type { QueryClient } from './QueryClient'
 
 type MutationStateOptions<TResult = MutationState> = {
   filters?: MutationFilters
-  select?: (
-    mutation: Mutation<unknown, DefaultError, unknown, unknown>,
-  ) => TResult
+  select?: (mutation: Mutation) => TResult
 }
 
 function getResult<TResult = MutationState>(
@@ -26,11 +23,7 @@ function getResult<TResult = MutationState>(
     .findAll(options.filters)
     .map(
       (mutation): TResult =>
-        (options.select
-          ? options.select(
-              mutation as Mutation<unknown, DefaultError, unknown, unknown>,
-            )
-          : mutation.state) as TResult,
+        (options.select ? options.select(mutation) : mutation.state) as TResult,
     )
 }