refactor(queryObserver): get rid of double-defaulting of options in g…

…etOptimisticResult every call to getOptimisticResult already contains defaulted options, which we can enforce on type level by only accepting DefaultedQueryObserverOptions
TanStack · Feb 28, 2022 · 9d260e7 · 9d260e7
1 parent 02fd793
commit 9d260e7
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/src/core/infiniteQueryObserver.ts b/src/core/infiniteQueryObserver.ts
@@ -1,4 +1,5 @@
 import type {
+  DefaultedInfiniteQueryObserverOptions,
   FetchNextPageOptions,
   FetchPreviousPageOptions,
   InfiniteData,
@@ -84,7 +85,7 @@ export class InfiniteQueryObserver<
   }
 
   getOptimisticResult(
-    options: InfiniteQueryObserverOptions<
+    options: DefaultedInfiniteQueryObserverOptions<
       TQueryFnData,
       TError,
       TData,

diff --git a/src/core/queryObserver.ts b/src/core/queryObserver.ts
@@ -1,4 +1,4 @@
-import { RefetchPageFilters } from './types'
+import { DefaultedQueryObserverOptions, RefetchPageFilters } from './types'
 import {
   isServer,
   isValidTimeout,
@@ -205,21 +205,17 @@ export class QueryObserver<
   }
 
   getOptimisticResult(
-    options: QueryObserverOptions<
+    options: DefaultedQueryObserverOptions<
       TQueryFnData,
       TError,
       TData,
       TQueryData,
       TQueryKey
     >
   ): QueryObserverResult<TData, TError> {
-    const defaultedOptions = this.client.defaultQueryOptions(options)
-
-    const query = this.client
-      .getQueryCache()
-      .build(this.client, defaultedOptions)
+    const query = this.client.getQueryCache().build(this.client, options)
 
-    return this.createResult(query, defaultedOptions)
+    return this.createResult(query, options)
   }
 
   getCurrentResult(): QueryObserverResult<TData, TError> {

diff --git a/src/core/types.ts b/src/core/types.ts
@@ -246,6 +246,23 @@ export interface InfiniteQueryObserverOptions<
     TQueryKey
   > {}
 
+export type DefaultedInfiniteQueryObserverOptions<
+  TQueryFnData = unknown,
+  TError = unknown,
+  TData = TQueryFnData,
+  TQueryData = TQueryFnData,
+  TQueryKey extends QueryKey = QueryKey
+> = WithRequired<
+  InfiniteQueryObserverOptions<
+    TQueryFnData,
+    TError,
+    TData,
+    TQueryData,
+    TQueryKey
+  >,
+  'useErrorBoundary' | 'refetchOnReconnect'
+>
+
 export interface FetchQueryOptions<
   TQueryFnData = unknown,
   TError = unknown,