From 03048e3776041ff5f5776b1b739c18183aa7e33a Mon Sep 17 00:00:00 2001 From: ienrum <137467530+ienrum@users.noreply.github.com> Date: Thu, 11 Apr 2024 18:17:42 +0900 Subject: [PATCH] fix(react-query): reorder query function declarations (#7260) Co-authored-by: Dominik Dorfmeister --- packages/react-query/src/infiniteQueryOptions.ts | 8 ++++---- packages/react-query/src/queryOptions.ts | 8 ++++---- packages/react-query/src/useInfiniteQuery.ts | 8 ++++---- packages/react-query/src/useQuery.ts | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/react-query/src/infiniteQueryOptions.ts b/packages/react-query/src/infiniteQueryOptions.ts index 795dd12414..122bb1f858 100644 --- a/packages/react-query/src/infiniteQueryOptions.ts +++ b/packages/react-query/src/infiniteQueryOptions.ts @@ -48,14 +48,14 @@ export function infiniteQueryOptions< TQueryKey extends QueryKey = QueryKey, TPageParam = unknown, >( - options: UndefinedInitialDataInfiniteOptions< + options: DefinedInitialDataInfiniteOptions< TQueryFnData, TError, TData, TQueryKey, TPageParam >, -): UndefinedInitialDataInfiniteOptions< +): DefinedInitialDataInfiniteOptions< TQueryFnData, TError, TData, @@ -72,14 +72,14 @@ export function infiniteQueryOptions< TQueryKey extends QueryKey = QueryKey, TPageParam = unknown, >( - options: DefinedInitialDataInfiniteOptions< + options: UndefinedInitialDataInfiniteOptions< TQueryFnData, TError, TData, TQueryKey, TPageParam >, -): DefinedInitialDataInfiniteOptions< +): UndefinedInitialDataInfiniteOptions< TQueryFnData, TError, TData, diff --git a/packages/react-query/src/queryOptions.ts b/packages/react-query/src/queryOptions.ts index a5af952cb2..5eae0e4c23 100644 --- a/packages/react-query/src/queryOptions.ts +++ b/packages/react-query/src/queryOptions.ts @@ -29,8 +29,8 @@ export function queryOptions< TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, >( - options: UndefinedInitialDataOptions, -): UndefinedInitialDataOptions & { + options: DefinedInitialDataOptions, +): DefinedInitialDataOptions & { queryKey: DataTag } @@ -40,8 +40,8 @@ export function queryOptions< TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, >( - options: DefinedInitialDataOptions, -): DefinedInitialDataOptions & { + options: UndefinedInitialDataOptions, +): UndefinedInitialDataOptions & { queryKey: DataTag } diff --git a/packages/react-query/src/useInfiniteQuery.ts b/packages/react-query/src/useInfiniteQuery.ts index ebcd9ddef4..fd2ce11a7f 100644 --- a/packages/react-query/src/useInfiniteQuery.ts +++ b/packages/react-query/src/useInfiniteQuery.ts @@ -25,7 +25,7 @@ export function useInfiniteQuery< TQueryKey extends QueryKey = QueryKey, TPageParam = unknown, >( - options: UndefinedInitialDataInfiniteOptions< + options: DefinedInitialDataInfiniteOptions< TQueryFnData, TError, TData, @@ -33,7 +33,7 @@ export function useInfiniteQuery< TPageParam >, queryClient?: QueryClient, -): UseInfiniteQueryResult +): DefinedUseInfiniteQueryResult export function useInfiniteQuery< TQueryFnData, @@ -42,7 +42,7 @@ export function useInfiniteQuery< TQueryKey extends QueryKey = QueryKey, TPageParam = unknown, >( - options: DefinedInitialDataInfiniteOptions< + options: UndefinedInitialDataInfiniteOptions< TQueryFnData, TError, TData, @@ -50,7 +50,7 @@ export function useInfiniteQuery< TPageParam >, queryClient?: QueryClient, -): DefinedUseInfiniteQueryResult +): UseInfiniteQueryResult export function useInfiniteQuery< TQueryFnData, diff --git a/packages/react-query/src/useQuery.ts b/packages/react-query/src/useQuery.ts index 8742692eef..962ef4da66 100644 --- a/packages/react-query/src/useQuery.ts +++ b/packages/react-query/src/useQuery.ts @@ -18,9 +18,9 @@ export function useQuery< TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, >( - options: UndefinedInitialDataOptions, + options: DefinedInitialDataOptions, queryClient?: QueryClient, -): UseQueryResult +): DefinedUseQueryResult export function useQuery< TQueryFnData = unknown, @@ -28,9 +28,9 @@ export function useQuery< TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, >( - options: DefinedInitialDataOptions, + options: UndefinedInitialDataOptions, queryClient?: QueryClient, -): DefinedUseQueryResult +): UseQueryResult export function useQuery< TQueryFnData = unknown,