fix(core): Always exclude teardowns from subscriptionExchange (#3206)

urql-graphql · May 3, 2023 · 351d3ef · 351d3ef
1 parent 67c991f
commit 351d3ef
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/.changeset/green-geese-switch.md b/.changeset/green-geese-switch.md
@@ -0,0 +1,5 @@
+---
+'@urql/core': patch
+---
+
+Don't allow `isSubscriptionOperation` option in `subscriptionExchange` to include `teardown` operations, to avoid confusion.
diff --git a/packages/core/src/exchanges/subscription.ts b/packages/core/src/exchanges/subscription.ts
@@ -186,20 +186,22 @@ export const subscriptionExchange =
         };
       });
     };
+
     const isSubscriptionOperationFn =
       isSubscriptionOperation ||
-      (operation => {
-        const { kind } = operation;
-        return (
-          kind === 'subscription' ||
-          (!!enableAllOperations && (kind === 'query' || kind === 'mutation'))
-        );
-      });
+      (operation =>
+        operation.kind === 'subscription' ||
+        (!!enableAllOperations &&
+          (operation.kind === 'query' || operation.kind === 'mutation')));
 
     return ops$ => {
       const subscriptionResults$ = pipe(
         ops$,
-        filter(isSubscriptionOperationFn),
+        filter(
+          operation =>
+            operation.kind !== 'teardown' &&
+            isSubscriptionOperationFn(operation)
+        ),
         mergeMap(operation => {
           const { key } = operation;
           const teardown$ = pipe(
@@ -216,7 +218,11 @@ export const subscriptionExchange =
 
       const forward$ = pipe(
         ops$,
-        filter(op => !isSubscriptionOperationFn(op)),
+        filter(
+          operation =>
+            operation.kind === 'teardown' ||
+            !isSubscriptionOperationFn(operation)
+        ),
         forward
       );