Cache exchange not forwarding teardown correctly urql-graphql#215

inkOfPixel · Apr 6, 2019 · 7299621 · 7299621
1 parent 4eada3b
commit 7299621
Showing 1 changed file with 21 additions and 13 deletions.
diff --git a/src/exchanges/cache.ts b/src/exchanges/cache.ts
@@ -73,27 +73,35 @@ export const cacheExchange: Exchange = ({ forward, client }) => {
       })
     );
 
-    const newOps$ = pipe(
-      sharedOps$,
-      filter(op => !shouldSkip(op) && !isOperationCached(op)),
-      map(mapTypeNames),
+    const forwardedOps$ = pipe(
+      merge([
+        pipe(
+          sharedOps$,
+          filter(op => !shouldSkip(op) && !isOperationCached(op)),
+          map(mapTypeNames)
+        ),
+        pipe(
+          sharedOps$,
+          filter(op => shouldSkip(op))
+        ),
+      ]),
       forward,
       tap(response => {
-        if (response.operation.operationName === 'mutation') {
+        if (
+          response.operation &&
+          response.operation.operationName === 'mutation'
+        ) {
           handleAfterMutation(response);
-        } else if (response.operation.operationName === 'query') {
+        } else if (
+          response.operation &&
+          response.operation.operationName === 'query'
+        ) {
           handleAfterQuery(response);
         }
       })
     );
 
-    const skippedOps$ = pipe(
-      sharedOps$,
-      filter(op => shouldSkip(op)),
-      forward
-    );
-
-    return merge([cachedOps$, newOps$, skippedOps$]);
+    return merge([cachedOps$, forwardedOps$]);
   };
 };