Avoid unnecessary checking for undefined client.queryManager.

apollographql · Apr 16, 2019 · 112493b · 112493b
1 parent 8087830
commit 112493b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 21 deletions.
diff --git a/packages/apollo-client/src/ApolloClient.ts b/packages/apollo-client/src/ApolloClient.ts
@@ -273,9 +273,7 @@ export default class ApolloClient<TCacheShape> implements DataProxy {
    * to dispose of this `ApolloClient` instance.
    */
   public stop() {
-    if (this.queryManager) {
-      this.queryManager.stop();
-    }
+    this.queryManager.stop();
   }
 
   /**
@@ -505,29 +503,18 @@ export default class ApolloClient<TCacheShape> implements DataProxy {
    */
   public resetStore(): Promise<ApolloQueryResult<any>[] | null> {
     return Promise.resolve()
-      .then(() => {
-        return this.queryManager
-          ? this.queryManager.clearStore()
-          : Promise.resolve(null);
-      })
+      .then(() => this.queryManager.clearStore())
       .then(() => Promise.all(this.resetStoreCallbacks.map(fn => fn())))
-      .then(() => {
-        return this.queryManager && this.queryManager.reFetchObservableQueries
-          ? this.queryManager.reFetchObservableQueries()
-          : Promise.resolve(null);
-      });
+      .then(() => this.queryManager.reFetchObservableQueries());
   }
 
   /**
    * Remove all data from the store. Unlike `resetStore`, `clearStore` will
    * not refetch any active queries.
    */
-  public clearStore(): Promise<any | null> {
-    const { queryManager } = this;
+  public clearStore(): Promise<any[]> {
     return Promise.resolve()
-      .then(() =>
-        queryManager ? queryManager.clearStore() : Promise.resolve(null),
-      )
+      .then(() => this.queryManager.clearStore())
       .then(() => Promise.all(this.clearStoreCallbacks.map(fn => fn())));
   }
 
@@ -570,9 +557,7 @@ export default class ApolloClient<TCacheShape> implements DataProxy {
   public reFetchObservableQueries(
     includeStandby?: boolean,
   ): Promise<ApolloQueryResult<any>[]> | Promise<null> {
-    return this.queryManager
-      ? this.queryManager.reFetchObservableQueries(includeStandby)
-      : Promise.resolve(null);
+    return this.queryManager.reFetchObservableQueries(includeStandby);
   }
 
   /**

diff --git a/packages/apollo-client/src/__tests__/client.ts b/packages/apollo-client/src/__tests__/client.ts
@@ -2296,6 +2296,7 @@ describe('client', () => {
       cache: new InMemoryCache(),
     });
     client.queryManager = {
+      reFetchObservableQueries() {},
       clearStore: () => {
         done();
       },