fix(bindings): Fix handlers for subscriptions receiving null (#3581)

urql-graphql · May 3, 2024 · 9272cef · 9272cef
1 parent 0204e04
commit 9272cef
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/.changeset/famous-deers-marry.md b/.changeset/famous-deers-marry.md
@@ -0,0 +1,8 @@
+---
+'@urql/preact': patch
+'@urql/svelte': patch
+'urql': patch
+'@urql/vue': patch
+---
+
+Fix subscription handlers to not receive `null` values.
diff --git a/packages/preact-urql/src/hooks/useSubscription.ts b/packages/preact-urql/src/hooks/useSubscription.ts
@@ -282,7 +282,7 @@ export function useSubscription<
               const { current: handler } = handlerRef;
               // If a handler has been passed, it's used to merge new data in
               const data =
-                partial.data !== undefined
+                partial.data != null
                   ? typeof handler === 'function'
                     ? handler(result.data, partial.data)
                     : partial.data

diff --git a/packages/react-urql/src/hooks/useSubscription.ts b/packages/react-urql/src/hooks/useSubscription.ts
@@ -266,10 +266,14 @@ export function useSubscription<
       deferDispatch(setState, state => {
         const nextResult = computeNextState(state[1], result);
         if (state[1] === nextResult) return state;
-        if (handlerRef.current && state[1].data !== nextResult.data) {
+        if (
+          handlerRef.current &&
+          nextResult.data != null &&
+          state[1].data !== nextResult.data
+        ) {
           nextResult.data = handlerRef.current(
             state[1].data,
-            nextResult.data!
+            nextResult.data
           ) as any;
         }
 

diff --git a/packages/svelte-urql/src/subscriptionStore.ts b/packages/svelte-urql/src/subscriptionStore.ts
@@ -183,7 +183,7 @@ export function subscriptionStore<
       ),
       scan((result: OperationResultState<Result, Variables>, partial) => {
         const data =
-          partial.data !== undefined
+          partial.data != null
             ? typeof handler === 'function'
               ? handler(result.data, partial.data)
               : partial.data

diff --git a/packages/vue-urql/src/useSubscription.ts b/packages/vue-urql/src/useSubscription.ts
@@ -306,9 +306,9 @@ export function callUseSubscription<
             subscribe(result => {
               fetching.value = true;
               data.value =
-                result.data !== undefined
+                result.data != null
                   ? typeof scanHandler.value === 'function'
-                    ? scanHandler.value(data.value as any, result.data!)
+                    ? scanHandler.value(data.value as any, result.data)
                     : result.data
                   : (result.data as any);
               error.value = result.error;