Skip to content

Commit

Permalink
fix(types): change the order of types so that correct type inference …
Browse files Browse the repository at this point in the history
…is picked for **Object syntax** (#1330)

* Change the order of types

Change the order of types so that correct type inference is picked for Object sytax

* change order of types

* Update usePaginatedQuery.ts
  • Loading branch information
udayvunnam committed Dec 7, 2020
1 parent 820b4ff commit 6e2e37e
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 14 deletions.
10 changes: 5 additions & 5 deletions src/react/useInfiniteQuery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ export interface UseInfiniteQueryObjectConfig<TResult, TError> {

// HOOK

// Object syntax
export function useInfiniteQuery<TResult = unknown, TError = unknown>(
config: UseInfiniteQueryObjectConfig<TResult, TError>
): InfiniteQueryResult<TResult, TError>

// Parameter syntax with optional config
export function useInfiniteQuery<TResult = unknown, TError = unknown>(
queryKey: QueryKey,
Expand All @@ -42,11 +47,6 @@ export function useInfiniteQuery<TResult = unknown, TError = unknown>(
queryConfig?: InfiniteQueryConfig<TResult, TError>
): InfiniteQueryResult<TResult, TError>

// Object syntax
export function useInfiniteQuery<TResult = unknown, TError = unknown>(
config: UseInfiniteQueryObjectConfig<TResult, TError>
): InfiniteQueryResult<TResult, TError>

// Implementation
export function useInfiniteQuery<TResult, TError>(
arg1: any,
Expand Down
10 changes: 5 additions & 5 deletions src/react/usePaginatedQuery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ export interface UsePaginatedQueryObjectConfig<TResult, TError> {

// HOOK

// Object syntax
export function usePaginatedQuery<TResult = unknown, TError = unknown>(
config: UsePaginatedQueryObjectConfig<TResult, TError>
): PaginatedQueryResult<TResult, TError>

// Parameter syntax with optional config
export function usePaginatedQuery<TResult = unknown, TError = unknown>(
queryKey: QueryKey,
Expand All @@ -47,11 +52,6 @@ export function usePaginatedQuery<TResult = unknown, TError = unknown>(
queryConfig?: PaginatedQueryConfig<TResult, TError>
): PaginatedQueryResult<TResult, TError>

// Object syntax
export function usePaginatedQuery<TResult = unknown, TError = unknown>(
config: UsePaginatedQueryObjectConfig<TResult, TError>
): PaginatedQueryResult<TResult, TError>

// Implementation
export function usePaginatedQuery<TResult, TError>(
arg1: any,
Expand Down
9 changes: 5 additions & 4 deletions src/react/useQuery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ export interface UseQueryObjectConfig<TResult, TError> {

// HOOK

// Object syntax
export function useQuery<TResult = unknown, TError = unknown>(
config: UseQueryObjectConfig<TResult, TError>
): QueryResult<TResult, TError>

// Parameter syntax with optional config
export function useQuery<TResult = unknown, TError = unknown>(
queryKey: QueryKey,
Expand All @@ -38,10 +43,6 @@ export function useQuery<TResult = unknown, TError = unknown>(
queryConfig?: QueryConfig<TResult, TError>
): QueryResult<TResult, TError>

// Object syntax
export function useQuery<TResult = unknown, TError = unknown>(
config: UseQueryObjectConfig<TResult, TError>
): QueryResult<TResult, TError>

// Implementation
export function useQuery<TResult, TError>(
Expand Down

1 comment on commit 6e2e37e

@vercel
Copy link

@vercel vercel bot commented on 6e2e37e Dec 7, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.