Pass complete queries options to getOptimisticResult.

Author: dagstuan

packages/angular-query-experimental/src/inject-queries.ts

@@ -279,9 +279,7 @@ export function injectQueries<
     const optimisticResultSignal = computed(() =>
       observerSignal().getOptimisticResult(
         defaultedQueries(),
-        (optionsSignal() as QueriesObserverOptions<TCombinedResult>).combine,
-        (optionsSignal() as QueriesObserverOptions<TCombinedResult>)
-          .structuralSharing,
+        optionsSignal() as QueriesObserverOptions<TCombinedResult>,
       ),
     )
 

packages/preact-query/src/useQueries.ts

@@ -270,8 +270,7 @@ export function useQueries<
   const [optimisticResult, getCombinedResult, trackResult] =
     observer.getOptimisticResult(
       defaultedQueries,
-      (options as QueriesObserverOptions<TCombinedResult>).combine,
-      options.structuralSharing,
+      options as QueriesObserverOptions<TCombinedResult>,
     )
 
   const shouldSubscribe = !isRestoring && options.subscribed !== false

packages/query-core/src/queriesObserver.ts

@@ -180,11 +180,7 @@ export class QueriesObserver<
 
   getOptimisticResult(
     queries: Array<QueryObserverOptions>,
-    combine: CombineFn<TCombinedResult> | undefined,
-    structuralSharing:
-      | boolean
-      | ((oldData: unknown | undefined, newData: unknown) => unknown)
-      | undefined,
+    options?: QueriesObserverOptions<TCombinedResult>,
   ): [
     rawResult: Array<QueryObserverResult>,
     combineResult: (r?: Array<QueryObserverResult>) => TCombinedResult,
@@ -203,8 +199,7 @@ export class QueriesObserver<
       (r?: Array<QueryObserverResult>) => {
         return this.#combineResult(
           r ?? result,
-          combine,
-          structuralSharing,
+          options,
           queryHashes,
         )
       },
@@ -233,13 +228,11 @@ export class QueriesObserver<
 
   #combineResult(
     input: Array<QueryObserverResult>,
-    combine: CombineFn<TCombinedResult> | undefined,
-    structuralSharing:
-      | boolean
-      | ((oldData: unknown | undefined, newData: unknown) => unknown)
-      | undefined = true,
+    options?: QueriesObserverOptions<TCombinedResult>,
     queryHashes?: Array<string>,
   ): TCombinedResult {
+    const combine = options?.combine
+    const structuralSharing = options?.structuralSharing ?? true
     if (combine) {
       const lastHashes = this.#lastQueryHashes
       const queryHashesChanged =
@@ -325,8 +318,7 @@ export class QueriesObserver<
       const newTracked = this.#trackResult(this.#result, this.#observerMatches)
       const newResult = this.#combineResult(
         newTracked,
-        this.#options?.combine,
-        this.#options?.structuralSharing,
+        this.#options,
       )
 
       if (previousResult !== newResult) {

packages/react-query/src/useQueries.ts

@@ -271,8 +271,7 @@ export function useQueries<
   const [optimisticResult, getCombinedResult, trackResult] =
     observer.getOptimisticResult(
       defaultedQueries,
-      (options as QueriesObserverOptions<TCombinedResult>).combine,
-      options.structuralSharing,
+      options as QueriesObserverOptions<TCombinedResult>,
     )
 
   const shouldSubscribe = !isRestoring && options.subscribed !== false

packages/solid-query/src/useQueries.ts

@@ -235,9 +235,7 @@ export function useQueries<
   const [state, setState] = createStore<TCombinedResult>(
     observer.getOptimisticResult(
       defaultedQueries(),
-      (queriesOptions() as QueriesObserverOptions<TCombinedResult>).combine,
-      (queriesOptions() as QueriesObserverOptions<TCombinedResult>)
-        .structuralSharing,
+      queriesOptions() as QueriesObserverOptions<TCombinedResult>,
     )[1](),
   )
 
@@ -248,10 +246,7 @@ export function useQueries<
         setState(
           observer.getOptimisticResult(
             defaultedQueries(),
-            (queriesOptions() as QueriesObserverOptions<TCombinedResult>)
-              .combine,
-            (queriesOptions() as QueriesObserverOptions<TCombinedResult>)
-              .structuralSharing,
+            queriesOptions() as QueriesObserverOptions<TCombinedResult>,
           )[1](),
         ),
     ),

packages/svelte-query/src/createQueries.svelte.ts

@@ -237,8 +237,7 @@ export function createQueries<
   function createResult() {
     const [_, getCombinedResult, trackResult] = observer.getOptimisticResult(
       resolvedQueryOptions,
-      derivedCreateQueriesOptions.combine as QueriesObserverOptions<TCombinedResult>['combine'],
-      derivedCreateQueriesOptions.structuralSharing,
+      derivedCreateQueriesOptions as QueriesObserverOptions<TCombinedResult>,
     )
     return getCombinedResult(trackResult())
   }

packages/vue-query/src/useQueries.ts

@@ -304,8 +304,7 @@ export function useQueries<
   const getOptimisticResult = () => {
     const [results, getCombinedResult] = observer.getOptimisticResult(
       defaultedQueries.value,
-      (options as QueriesObserverOptions<TCombinedResult>).combine,
-      options.structuralSharing,
+      options as QueriesObserverOptions<TCombinedResult>,
     )
 
     return getCombinedResult(
@@ -315,8 +314,7 @@ export function useQueries<
           refetch: async (...args: Array<any>) => {
             const [{ [index]: query }] = observer.getOptimisticResult(
               defaultedQueries.value,
-              (options as QueriesObserverOptions<TCombinedResult>).combine,
-              options.structuralSharing,
+              options as QueriesObserverOptions<TCombinedResult>,
             )
 
             return query!.refetch(...args)