Pull partial data from cache even when fetchType === FetchType.refetch.

Should fix apollographql#4741.
CopyJosh · Apr 23, 2019 · 82e7530 · 82e7530
1 parent 9fe470c
commit 82e7530
Show file tree

Hide file tree

Showing 2 changed files with 78 additions and 9 deletions.
diff --git a/packages/apollo-client/src/__tests__/local-state/general.ts b/packages/apollo-client/src/__tests__/local-state/general.ts
@@ -415,6 +415,79 @@ describe('Cache manipulation', () => {
         expect({ ...data }).toMatchObject({ field: '1234' });
       });
   });
+
+  it("should read @client fields from cache on refetch (#4741)", function (done) {
+    const query = gql`
+      query FetchInitialData {
+        serverData @client {
+          id
+          title
+        }
+        selectedItemId @client
+      }
+    `;
+
+    const mutation = gql`
+      mutation Select {
+        select(itemId: $id) @client
+      }
+    `;
+
+    const serverData = {
+      __typename: "ServerData",
+      id: 123,
+      title: "Oyez and Onoz",
+    };
+
+    let selectedItemId = -1;
+    const client = new ApolloClient({
+      cache: new InMemoryCache(),
+      link: ApolloLink.empty(),
+      resolvers: {
+        Query: {
+          serverData() {
+            return serverData;
+          },
+          selectedItemId() {
+            return selectedItemId;
+          },
+        },
+        Mutation: {
+          select(_, { itemId }) {
+            selectedItemId = itemId;
+          }
+        }
+      },
+    });
+
+    client.watchQuery({ query }).subscribe({
+      next(result) {
+        expect(result).toEqual({
+          data: {
+            serverData,
+            selectedItemId,
+          },
+          loading: false,
+          networkStatus: 7,
+          stale: false,
+        });
+
+        if (selectedItemId !== 123) {
+          client.mutate({
+            mutation,
+            variables: {
+              id: 123,
+            },
+            refetchQueries: [
+              "FetchInitialData",
+            ],
+          });
+        } else {
+          done();
+        }
+      },
+    });
+  });
 });
 
 describe('Sample apps', () => {

diff --git a/packages/apollo-client/src/core/QueryManager.ts b/packages/apollo-client/src/core/QueryManager.ts
@@ -359,17 +359,13 @@ export class QueryManager<TStore> {
     options = { ...options, variables };
 
     let storeResult: any;
-    let needToFetch: boolean =
+    const isNetworkOnly =
       fetchPolicy === 'network-only' || fetchPolicy === 'no-cache';
+    let needToFetch = isNetworkOnly;
 
-    // If this is not a force fetch, we want to diff the query against the
-    // store before we fetch it from the network interface.
-    // TODO we hit the cache even if the policy is network-first. This could be unnecessary if the network is up.
-    if (
-      fetchType !== FetchType.refetch &&
-      fetchPolicy !== 'network-only' &&
-      fetchPolicy !== 'no-cache'
-    ) {
+    // Unless we are completely skipping the cache, we want to diff the query
+    // against the cache before we fetch it from the network interface.
+    if (!isNetworkOnly) {
       const { complete, result } = this.dataStore.getCache().diff({
         query,
         variables,