refactor: remove observer factory

Author: boschni

src/react/useBaseQuery.ts

@@ -5,14 +5,10 @@ import { QueryObserver } from '../core/queryObserver'
 import { useQueryErrorResetBoundary } from './QueryErrorResetBoundary'
 import { useQueryClient } from './QueryClientProvider'
 import { UseBaseQueryOptions } from './types'
-import { QueryClient, QueryObserverOptions } from '../core'
 
 export function useBaseQuery<TData, TError, TQueryFnData, TQueryData>(
   options: UseBaseQueryOptions<TData, TError, TQueryFnData, TQueryData>,
-  createObserver: (
-    queryClient: QueryClient,
-    options: QueryObserverOptions<any, any, any, any>
-  ) => QueryObserver<any, any, any, any>
+  Observer: typeof QueryObserver
 ) {
   const queryClient = useQueryClient()
   const isMounted = useIsMounted()
@@ -27,7 +23,7 @@ export function useBaseQuery<TData, TError, TQueryFnData, TQueryData>(
   // Create query observer
   const observerRef = React.useRef<QueryObserver<any, any, any, any>>()
   const observer =
-    observerRef.current || createObserver(queryClient, defaultedOptions)
+    observerRef.current || new Observer(queryClient, defaultedOptions)
   observerRef.current = observer
 
   // Update options

src/react/useInfiniteQuery.ts

@@ -1,3 +1,4 @@
+import { QueryObserver } from '../core'
 import { InfiniteQueryObserver } from '../core/infiniteQueryObserver'
 import { QueryFunction, QueryKey } from '../core/types'
 import { parseQueryArgs } from '../core/utils'
@@ -40,7 +41,6 @@ export function useInfiniteQuery<TData, TError, TQueryFnData = TData>(
   const options = parseQueryArgs(arg1, arg2, arg3)
   return useBaseQuery(
     options,
-    (client, defaultedOptions) =>
-      new InfiniteQueryObserver(client, defaultedOptions)
+    InfiniteQueryObserver as typeof QueryObserver
   ) as UseInfiniteQueryResult<TData, TError>
 }

src/react/useQuery.ts

@@ -38,8 +38,5 @@ export function useQuery<TData, TError, TQueryFnData = TData>(
   arg3?: UseQueryOptions<TData, TError, TQueryFnData>
 ): UseQueryResult<TData, TError> {
   const parsedOptions = parseQueryArgs(arg1, arg2, arg3)
-  return useBaseQuery(
-    parsedOptions,
-    (client, defaultedOptions) => new QueryObserver(client, defaultedOptions)
-  )
+  return useBaseQuery(parsedOptions, QueryObserver)
 }