From 0449c4cb7519a5112b549c0e1dfdfcbac0526b4a Mon Sep 17 00:00:00 2001 From: Dominik Dorfmeister Date: Mon, 26 Aug 2024 19:19:48 +0200 Subject: [PATCH 1/3] fix(types): error booleans shouldn't permanently be typed as `false` --- packages/query-core/src/types.ts | 2 -- .../src/__tests__/useInfiniteQuery.test-d.tsx | 23 +++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/packages/query-core/src/types.ts b/packages/query-core/src/types.ts index 4ccde9fd3a..140cb1f867 100644 --- a/packages/query-core/src/types.ts +++ b/packages/query-core/src/types.ts @@ -853,8 +853,6 @@ export interface InfiniteQueryObserverRefetchErrorResult< isLoading: false isLoadingError: false isRefetchError: true - isFetchNextPageError: false - isFetchPreviousPageError: false isSuccess: false status: 'error' } diff --git a/packages/react-query/src/__tests__/useInfiniteQuery.test-d.tsx b/packages/react-query/src/__tests__/useInfiniteQuery.test-d.tsx index 8b25ee8830..a231d20600 100644 --- a/packages/react-query/src/__tests__/useInfiniteQuery.test-d.tsx +++ b/packages/react-query/src/__tests__/useInfiniteQuery.test-d.tsx @@ -117,3 +117,26 @@ describe('getNextPageParam / getPreviousPageParam', () => { >() }) }) + +describe('error booleans', () => { + it('should not be permanently `false`', () => { + const { + isFetchNextPageError, + isFetchPreviousPageError, + isLoadingError, + isRefetchError, + } = useInfiniteQuery({ + queryKey: ['key'], + queryFn: ({ pageParam }) => { + return pageParam * 5 + }, + initialPageParam: 1, + getNextPageParam: () => undefined, + }) + + expectTypeOf(isFetchNextPageError).toEqualTypeOf() + expectTypeOf(isFetchPreviousPageError).toEqualTypeOf() + expectTypeOf(isLoadingError).toEqualTypeOf() + expectTypeOf(isRefetchError).toEqualTypeOf() + }) +}) From 9dbd88a70a69c08c097498eca219a1bf338e3d5a Mon Sep 17 00:00:00 2001 From: Dominik Dorfmeister Date: Mon, 26 Aug 2024 19:36:42 +0200 Subject: [PATCH 2/3] fix(types): error booleans shouldn't permanently be typed as `false` --- .../query-core/src/__tests__/infiniteQueryObserver.test-d.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/query-core/src/__tests__/infiniteQueryObserver.test-d.tsx b/packages/query-core/src/__tests__/infiniteQueryObserver.test-d.tsx index 611bdf1719..9a8e3b9639 100644 --- a/packages/query-core/src/__tests__/infiniteQueryObserver.test-d.tsx +++ b/packages/query-core/src/__tests__/infiniteQueryObserver.test-d.tsx @@ -51,8 +51,8 @@ describe('InfiniteQueryObserver', () => { expectTypeOf(result.data).toEqualTypeOf>() expectTypeOf(result.error).toEqualTypeOf() expectTypeOf(result.status).toEqualTypeOf<'error'>() - expectTypeOf(result.isFetchNextPageError).toEqualTypeOf() - expectTypeOf(result.isFetchPreviousPageError).toEqualTypeOf() + expectTypeOf(result.isFetchNextPageError).toEqualTypeOf() + expectTypeOf(result.isFetchPreviousPageError).toEqualTypeOf() } if (result.isSuccess) { From e2948d3095332891899a3e7db486da5d4a67a521 Mon Sep 17 00:00:00 2001 From: Dominik Dorfmeister Date: Mon, 26 Aug 2024 19:47:18 +0200 Subject: [PATCH 3/3] chore: I don't understand these errors --- .../solid-query/src/__tests__/createInfiniteQuery.test.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/solid-query/src/__tests__/createInfiniteQuery.test.tsx b/packages/solid-query/src/__tests__/createInfiniteQuery.test.tsx index 416b676ee1..006cc165c7 100644 --- a/packages/solid-query/src/__tests__/createInfiniteQuery.test.tsx +++ b/packages/solid-query/src/__tests__/createInfiniteQuery.test.tsx @@ -689,6 +689,7 @@ describe('useInfiniteQuery', () => { const states: Array< Partial>> > = [] + let isRefetch = false function Page() { @@ -717,7 +718,7 @@ describe('useInfiniteQuery', () => { isFetchingNextPage: state.isFetchingNextPage, isFetchPreviousPageError: state.isFetchPreviousPageError, isFetchingPreviousPage: state.isFetchingPreviousPage, - isRefetchError: state.isRefetchError, + isRefetchError: state.isRefetchError as true, isRefetching: state.isRefetching, }) }) @@ -828,7 +829,7 @@ describe('useInfiniteQuery', () => { isFetchingNextPage: state.isFetchingNextPage, isFetchPreviousPageError: state.isFetchPreviousPageError, isFetchingPreviousPage: state.isFetchingPreviousPage, - isRefetchError: state.isRefetchError, + isRefetchError: state.isRefetchError as true, isRefetching: state.isRefetching, }) }) @@ -932,7 +933,7 @@ describe('useInfiniteQuery', () => { isFetchingNextPage: state.isFetchingNextPage, isFetchPreviousPageError: state.isFetchPreviousPageError, isFetchingPreviousPage: state.isFetchingPreviousPage, - isRefetchError: state.isRefetchError, + isRefetchError: state.isRefetchError as true, isRefetching: state.isRefetching, }) })