Make ObservableQuery responsible for Reobserver creation logic.

apollographql · May 4, 2020 · fefbe5d · fefbe5d
1 parent dd86a71
commit fefbe5d
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 51 deletions.
diff --git a/src/core/ObservableQuery.ts b/src/core/ObservableQuery.ts
@@ -275,14 +275,12 @@ export class ObservableQuery<
       };
     }
 
-    return this.queryManager
-      .observeQuery(this, this.observer)
-      .reobserve({
-        fetchPolicy,
-        variables: this.options.variables,
-        // Always disable polling for refetches.
-        pollInterval: 0,
-      }, NetworkStatus.refetch);
+    return this.newReobserver(false).reobserve({
+      fetchPolicy,
+      variables: this.options.variables,
+      // Always disable polling for refetches.
+      pollInterval: 0,
+    }, NetworkStatus.refetch);
   }
 
   public fetchMore<K extends keyof TVariables>(
@@ -564,19 +562,30 @@ export class ObservableQuery<
   }
 
   private reobserver?: Reobserver<TData, TVariables>;
+
   private getReobserver(): Reobserver<TData, TVariables> {
-    return this.reobserver || (
-      this.reobserver = this.queryManager.observeQuery(
-        this,
-        this.observer,
-        // Passing this.options explicitly here prevents observeQuery from
-        // making a shallow copy of the options object before passing it
-        // to the constructor of the returned Reobserver object. In other
-        // words, this extra argument allows this.reobserver.options to be
-        // === this.options, so we don't have to worry about synchronizing
-        // the properties of two distinct objects.
-        this.options,
-      )
+    return this.reobserver || (this.reobserver = this.newReobserver(true));
+  }
+
+  private newReobserver(shareOptions: boolean) {
+    const { queryManager, queryId } = this;
+    queryManager.setObservableQuery(this);
+    return new Reobserver<TData, TVariables>(
+      this.observer,
+      // Sharing options allows this.reobserver.options to be ===
+      // this.options, so we don't have to worry about synchronizing the
+      // properties of two distinct objects.
+      shareOptions ? this.options : { ...this.options },
+      (currentOptions, newNetworkStatus) => {
+        queryManager.setObservableQuery(this);
+        return queryManager.fetchQueryObservable(
+          queryId,
+          currentOptions,
+          newNetworkStatus,
+        );
+      },
+      // Avoid polling during SSR and when the query is already in flight.
+      !queryManager.ssrMode && (() => !queryManager.checkInFlight(queryId)),
     );
   }
 

diff --git a/src/core/QueryManager.ts b/src/core/QueryManager.ts
@@ -24,7 +24,6 @@ import { ApolloError, isApolloError } from '../errors/ApolloError';
 import {
   ObservableSubscription,
   Observable,
-  Observer,
 } from '../utilities/observables/Observable';
 import { MutationStore } from '../data/mutations';
 import {
@@ -56,7 +55,6 @@ import { isNonEmptyArray } from '../utilities/common/arrays';
 import { ApolloCache } from '../cache/core/cache';
 
 import { QueryInfo, QueryStoreValue } from './QueryInfo';
-import { Reobserver } from './Reobserver';
 
 const { hasOwnProperty } = Object.prototype;
 
@@ -614,34 +612,8 @@ export class QueryManager<TStore> {
     return Promise.all(observableQueryPromises);
   }
 
-  public observeQuery<TData, TVars>(
-    observableQuery: ObservableQuery<TData, TVars>,
-    observer: Observer<ApolloQueryResult<TData>>,
-    // If no options are passed, make a shallow defensive copy of the
-    // ObservableQuery options.
-    options = { ...observableQuery.options },
-  ): Reobserver<TData, TVars> {
-    const { queryId } = observableQuery;
-
-    const setObsQuery = () =>
-      this.getQuery(queryId).setObservableQuery(observableQuery);
-
-    setObsQuery();
-
-    return new Reobserver<TData, TVars>(
-      observer,
-      options,
-      (currentOptions, newNetworkStatus) => {
-        setObsQuery();
-        return this.fetchQueryObservable(
-          observableQuery.queryId,
-          currentOptions,
-          newNetworkStatus,
-        );
-      },
-      // Avoid polling during SSR and when the query is already in flight.
-      !this.ssrMode && (() => !this.checkInFlight(queryId)),
-    );
+  public setObservableQuery(observableQuery: ObservableQuery<any, any>) {
+    this.getQuery(observableQuery.queryId).setObservableQuery(observableQuery);
   }
 
   public startGraphQLSubscription<T = any>({
@@ -866,7 +838,7 @@ export class QueryManager<TStore> {
     );
   }
 
-  private fetchQueryObservable<TData, TVars>(
+  public fetchQueryObservable<TData, TVars>(
     queryId: string,
     options: WatchQueryOptions<TVars>,
     // The initial networkStatus for this fetch, most often