Skip to content

feat: make InfiniteQueryObserver's type more robust #3571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 5, 2022
+16 −9
Merged

feat: make InfiniteQueryObserver's type more robust #3571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/core/infiniteQueryBehavior.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ export function getPreviousPageParam(
* Returns `undefined` if it cannot be determined.
*/
export function hasNextPage(
options: QueryOptions<any, any>,
options: QueryOptions<any, any, any, any>,
pages?: unknown
): boolean | undefined {
if (options.getNextPageParam && Array.isArray(pages)) {
Expand All @@ -191,7 +191,7 @@ export function hasNextPage(
* Returns `undefined` if it cannot be determined.
*/
export function hasPreviousPage(
options: QueryOptions<any, any>,
options: QueryOptions<any, any, any, any>,
pages?: unknown
): boolean | undefined {
if (options.getPreviousPageParam && Array.isArray(pages)) {
Expand Down
21 changes: 14 additions & 7 deletions src/core/infiniteQueryObserver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import type {
InfiniteData,
InfiniteQueryObserverOptions,
InfiniteQueryObserverResult,
QueryKey,
} from './types'
import type { QueryClient } from './queryClient'
import {
Expand All @@ -27,12 +28,14 @@ export class InfiniteQueryObserver<
TQueryFnData = unknown,
TError = unknown,
TData = TQueryFnData,
TQueryData = TQueryFnData
TQueryData = TQueryFnData,
TQueryKey extends QueryKey = QueryKey
> extends QueryObserver<
TQueryFnData,
TError,
InfiniteData<TData>,
InfiniteData<TQueryData>
InfiniteData<TQueryData>,
TQueryKey
> {
// Type override
subscribe!: (
Expand All @@ -54,7 +57,8 @@ export class InfiniteQueryObserver<
TQueryFnData,
TError,
TData,
TQueryData
TQueryData,
TQueryKey
>
) {
super(client, options)
Expand All @@ -71,7 +75,8 @@ export class InfiniteQueryObserver<
TQueryFnData,
TError,
TData,
TQueryData
TQueryData,
TQueryKey
>,
notifyOptions?: NotifyOptions
): void {
Expand All @@ -89,7 +94,8 @@ export class InfiniteQueryObserver<
TQueryFnData,
TError,
TData,
TQueryData
TQueryData,
TQueryKey
>
): InfiniteQueryObserverResult<TData, TError> {
options.behavior = infiniteQueryBehavior()
Expand Down Expand Up @@ -125,12 +131,13 @@ export class InfiniteQueryObserver<
}

protected createResult(
query: Query<TQueryFnData, TError, InfiniteData<TQueryData>>,
query: Query<TQueryFnData, TError, InfiniteData<TQueryData>, TQueryKey>,
options: InfiniteQueryObserverOptions<
TQueryFnData,
TError,
TData,
TQueryData
TQueryData,
TQueryKey
>
): InfiniteQueryObserverResult<TData, TError> {
const { state } = query
Expand Down