Dispose of the queryRef when changing to previously used variables to allow the InMemoryCache to determine cached behavior

.changeset/nice-eyes-return.md

@@ -0,0 +1,5 @@
+---
+'@apollo/client': minor
+---
+
+When changing variables back to a previously used set of variables, do not automatically cache the result as part of the query reference. Instead, dispose of the query reference so that the `InMemoryCache` can determine the cached behavior. This means that fetch policies that would guarantee a network request are now honored when switching back to previously used variables.

.size-limit.cjs

@@ -1,7 +1,7 @@
 const checks = [
   {
     path: "dist/apollo-client.min.cjs",
-    limit: "37880"
+    limit: "37890"
   },
   {
     path: "dist/main.cjs",

src/react/cache/QueryReference.ts

@@ -62,6 +62,8 @@ export class InternalQueryReference<TData = unknown> {
   private resolve: ((result: ApolloQueryResult<TData>) => void) | undefined;
   private reject: ((error: unknown) => void) | undefined;
 
+  private references = 0;
+
   constructor(
     observable: ObservableQuery<TData>,
     options: InternalQueryReferenceOptions
@@ -94,15 +96,6 @@ export class InternalQueryReference<TData = unknown> {
     }
 
     this.subscription = observable
-      .map((result) => {
-        // Maintain the last successful `data` value if the next result does not
-        // have one.
-        if (result.data === void 0) {
-          result.data = this.result.data;
-        }
-
-        return result;
-      })
       .filter(({ data }) => !equal(data, {}))
       .subscribe({
         next: this.handleNext,
@@ -123,6 +116,28 @@ export class InternalQueryReference<TData = unknown> {
     return this.observable.options;
   }
 
+  retain() {
+    this.references++;
+    clearTimeout(this.autoDisposeTimeoutId);
+    let disposed = false;
+
+    return () => {
+      if (disposed) {
+        return;
+      }
+
+      disposed = true;
+      this.references--;
+
+      // Wait before fully disposing in case the app is running in strict mode.
+      setTimeout(() => {
+        if (!this.references) {
+          this.dispose();
+        }
+      });
+    };
+  }
+
   didChangeOptions(watchQueryOptions: WatchQueryOptions) {
     return OBSERVED_CHANGED_OPTIONS.some(
       (option) =>
@@ -157,11 +172,6 @@ export class InternalQueryReference<TData = unknown> {
   }
 
   listen(listener: Listener<TData>) {
-    // As soon as the component listens for updates, we know it has finished
-    // suspending and is ready to receive updates, so we can remove the auto
-    // dispose timer.
-    clearTimeout(this.autoDisposeTimeoutId);
-
     this.listeners.add(listener);
 
     return () => {
@@ -185,7 +195,7 @@ export class InternalQueryReference<TData = unknown> {
     return promise;
   }
 
-  dispose() {
+  private dispose() {
     this.subscription.unsubscribe();
     this.onDispose();
   }
@@ -197,6 +207,11 @@ export class InternalQueryReference<TData = unknown> {
   private handleNext(result: ApolloQueryResult<TData>) {
     switch (this.status) {
       case 'loading': {
+        // Maintain the last successful `data` value if the next result does not
+        // have one.
+        if (result.data === void 0) {
+          result.data = this.result.data;
+        }
         this.status = 'idle';
         this.result = result;
         this.resolve?.(result);
@@ -207,6 +222,12 @@ export class InternalQueryReference<TData = unknown> {
           return;
         }
 
+        // Maintain the last successful `data` value if the next result does not
+        // have one.
+        if (result.data === void 0) {
+          result.data = this.result.data;
+        }
+
         this.result = result;
         this.promise = createFulfilledPromise(result);
         this.deliver(this.promise);