GC tanstack query when subscription is unsubscribed

Author: kevin-dp

packages/db/src/query/subset-dedupe.ts

@@ -239,10 +239,5 @@ export class DeduplicatedLoadSubset {
  * would reflect the mutated values rather than what was actually loaded.
  */
 export function cloneOptions(options: LoadSubsetOptions): LoadSubsetOptions {
-  return {
-    where: options.where,
-    orderBy: options.orderBy,
-    limit: options.limit,
-    // Note: We don't clone subscription as it's not part of predicate matching
-  }
+  return { ...options }
 }

packages/query-db-collection/src/query.ts

@@ -562,6 +562,13 @@ export function queryCollectionOptions(
         subscribeToQuery(localObserver, hashedQueryKey)
       }
 
+      // Tell tanstack query to GC the query when the subscription is unsubscribed
+      // The subscription is unsubscribed when the live query is GCed.
+      const subscription = opts.subscription
+      subscription?.once(`unsubscribed`, () => {
+        queryClient.removeQueries({ queryKey: key, exact: true })
+      })
+
       return readyPromise
     }
 
@@ -821,10 +828,6 @@ export function queryCollectionOptions(
         ? undefined
         : new DeduplicatedLoadSubset(createQueryFromOpts, createLocalQuery)
 
-    // TODO: run the tests, probably some will fail bc different requests are made now
-    //       so fix the test expectations
-    //       then also add all the new dedup tests that Sam also added to the Electric collection
-
     return {
       loadSubset: loadSubsetDedupe?.loadSubset,
       cleanup,