fix: made queryFn of streamedQuery not consume signal directly (so that only streamFn can consume it)

Author: razhayat

packages/query-core/src/__tests__/streamedQuery.test.tsx

@@ -456,7 +456,7 @@ describe('streamedQuery', () => {
 
     expect(queryClient.getQueryState(key)).toMatchObject({
       status: 'success',
-      fetchStatus: 'idle',
+      fetchStatus: 'fetching',
       data: [0, 1],
     })
   })

packages/query-core/src/infiniteQueryBehavior.ts

@@ -30,7 +30,7 @@ export function infiniteQueryBehavior<TQueryFnData, TError, TData, TPageParam>(
         const addSignalProperty = (object: unknown) => {
           addConsumeAwareSignal(
             object,
-            context.signal,
+            () => context.signal,
             () => (cancelled = true),
           )
         }

packages/query-core/src/streamedQuery.ts

@@ -1,5 +1,10 @@
 import { addConsumeAwareSignal, addToEnd } from './utils'
-import type { QueryFunction, QueryFunctionContext, QueryKey } from './types'
+import type {
+  OmitKeyof,
+  QueryFunction,
+  QueryFunctionContext,
+  QueryKey,
+} from './types'
 
 type BaseStreamedQueryParams<TQueryFnData, TQueryKey extends QueryKey> = {
   streamFn: (
@@ -74,10 +79,17 @@ export function streamedQuery<
     let result = initialValue
 
     let cancelled = false
-    const streamFnContext = { ...context }
-    addConsumeAwareSignal(
-      streamFnContext,
-      context.signal,
+    const streamFnContext = addConsumeAwareSignal<
+      OmitKeyof<typeof context, 'signal'>
+    >(
+      {
+        client: context.client,
+        meta: context.meta,
+        queryKey: context.queryKey,
+        pageParam: context.pageParam,
+        direction: context.direction,
+      },
+      () => context.signal,
       () => (cancelled = true),
     )
 

packages/query-core/src/utils.ts

@@ -466,14 +466,15 @@ export function shouldThrowError<T extends (...args: Array<any>) => boolean>(
   return !!throwOnError
 }
 
-export function addConsumeAwareSignal(
-  object: unknown,
-  signal: AbortSignal,
+export function addConsumeAwareSignal<T>(
+  object: T,
+  getSignal: () => AbortSignal,
   onCancelled: VoidFunction,
-) {
+): T & { signal: AbortSignal } {
   Object.defineProperty(object, 'signal', {
     enumerable: true,
     get: () => {
+      const signal = getSignal()
       if (signal.aborted) {
         onCancelled()
       } else {
@@ -484,4 +485,6 @@ export function addConsumeAwareSignal(
       return signal
     },
   })
+
+  return object as T & { signal: AbortSignal }
 }