refactor: expose trackProp function

TkDodo · TkDodo · commit 1971f74d4dd1 · 2024-03-03T21:17:11.000+01:00
diff --git a/packages/query-core/src/queriesObserver.ts b/packages/query-core/src/queriesObserver.ts
@@ -168,19 +168,17 @@ export class QueriesObserver<
         return this.#combineResult(r ?? result, combine)
       },
       () => {
-        const trackedMatches = matches.map((match, index) => {
+        return matches.map((match, index) => {
           const observerResult = result[index]!
           return !match.defaultedQueryOptions.notifyOnChangeProps
-            ? match.observer.trackResult(observerResult, (accessedKey) => {
-                // invoke getter on all observers to ensure proper (synchronized) tracking (#7000)
-                matches.forEach((_, i) => {
-                  void trackedMatches[i]![accessedKey]
+            ? match.observer.trackResult(observerResult, (accessedProp) => {
+                // track property on all observers to ensure proper (synchronized) tracking (#7000)
+                matches.forEach((m) => {
+                  m.observer.trackProp(accessedProp)
                 })
               })
             : observerResult
         })
-
-        return trackedMatches
       },
     ]
   }
diff --git a/packages/query-core/src/queryObserver.ts b/packages/query-core/src/queryObserver.ts
@@ -247,7 +247,7 @@ export class QueryObserver<
 
   trackResult(
     result: QueryObserverResult<TData, TError>,
-    onPropertyTracked?: (key: keyof QueryObserverResult) => void,
+    onPropTracked?: (key: keyof QueryObserverResult) => void,
   ): QueryObserverResult<TData, TError> {
     const trackedResult = {} as QueryObserverResult<TData, TError>
 
@@ -256,10 +256,8 @@ export class QueryObserver<
         configurable: false,
         enumerable: true,
         get: () => {
-          if (!this.#trackedProps.has(key as keyof QueryObserverResult)) {
-            this.#trackedProps.add(key as keyof QueryObserverResult)
-            onPropertyTracked?.(key as keyof QueryObserverResult)
-          }
+          this.trackProp(key as keyof QueryObserverResult)
+          onPropTracked?.(key as keyof QueryObserverResult)
           return result[key as keyof QueryObserverResult]
         },
       })
@@ -268,6 +266,10 @@ export class QueryObserver<
     return trackedResult
   }
 
+  trackProp(key: keyof QueryObserverResult) {
+    this.#trackedProps.add(key)
+  }
+
   getCurrentQuery(): Query<TQueryFnData, TError, TQueryData, TQueryKey> {
     return this.#currentQuery
   }
