Skip to content

Commit b25412a

Browse files
authored
ref: rename queryFn to streamFn in streamedQuery (#9606)
* ref: rename queryFn to streamFn in streamedQuery this avoids the weirdly double-nested queryFn naming * chore: docs * fix: docs
1 parent 8f24580 commit b25412a

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

docs/reference/streamedQuery.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { experimental_streamedQuery as streamedQuery } from '@tanstack/react-que
1313
const query = queryOptions({
1414
queryKey: ['data'],
1515
queryFn: streamedQuery({
16-
queryFn: fetchDataInChunks,
16+
streamFn: fetchDataInChunks,
1717
}),
1818
})
1919
```
@@ -22,11 +22,11 @@ const query = queryOptions({
2222
2323
**Options**
2424

25-
- `queryFn: (context: QueryFunctionContext) => Promise<AsyncIterable<TData>>`
25+
- `streamFn: (context: QueryFunctionContext) => Promise<AsyncIterable<TData>>`
2626
- **Required**
27-
- The function that returns a Promise of an AsyncIterable of data to stream in.
27+
- The function that returns a Promise of an AsyncIterable with data to stream in.
2828
- Receives a [QueryFunctionContext](../../framework/react/guides/query-functions.md#queryfunctioncontext)
29-
- `refetchMode?: 'append' | 'reset' | 'replace`
29+
- `refetchMode?: 'append' | 'reset' | 'replace'`
3030
- Optional
3131
- Defines how refetches are handled.
3232
- Defaults to `'reset'`

examples/react/chat/src/chat.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export const chatQueryOptions = (question: string) =>
2727
queryOptions({
2828
queryKey: ['chat', question],
2929
queryFn: streamedQuery({
30-
queryFn: () => chatAnswer(question),
30+
streamFn: () => chatAnswer(question),
3131
}),
3232
staleTime: Infinity,
3333
})

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ describe('streamedQuery', () => {
3434
const observer = new QueryObserver(queryClient, {
3535
queryKey: key,
3636
queryFn: streamedQuery({
37-
queryFn: () => createAsyncNumberGenerator(3),
37+
streamFn: () => createAsyncNumberGenerator(3),
3838
}),
3939
})
4040

@@ -78,7 +78,7 @@ describe('streamedQuery', () => {
7878
const observer = new QueryObserver(queryClient, {
7979
queryKey: key,
8080
queryFn: streamedQuery({
81-
queryFn: async function* () {
81+
streamFn: async function* () {
8282
for await (const num of createAsyncNumberGenerator(3)) {
8383
yield [num, num] as const
8484
}
@@ -133,7 +133,7 @@ describe('streamedQuery', () => {
133133
const observer = new QueryObserver(queryClient, {
134134
queryKey: key,
135135
queryFn: streamedQuery({
136-
queryFn: () => createAsyncNumberGenerator(2),
136+
streamFn: () => createAsyncNumberGenerator(2),
137137
}),
138138
})
139139

@@ -187,7 +187,7 @@ describe('streamedQuery', () => {
187187
const observer = new QueryObserver(queryClient, {
188188
queryKey: key,
189189
queryFn: streamedQuery({
190-
queryFn: () => createAsyncNumberGenerator(2),
190+
streamFn: () => createAsyncNumberGenerator(2),
191191
refetchMode: 'append',
192192
}),
193193
})
@@ -243,7 +243,7 @@ describe('streamedQuery', () => {
243243
const observer = new QueryObserver(queryClient, {
244244
queryKey: key,
245245
queryFn: streamedQuery({
246-
queryFn: () => createAsyncNumberGenerator(2, offset),
246+
streamFn: () => createAsyncNumberGenerator(2, offset),
247247
refetchMode: 'replace',
248248
}),
249249
})
@@ -300,7 +300,7 @@ describe('streamedQuery', () => {
300300
const observer = new QueryObserver(queryClient, {
301301
queryKey: key,
302302
queryFn: streamedQuery({
303-
queryFn: () => createAsyncNumberGenerator(3),
303+
streamFn: () => createAsyncNumberGenerator(3),
304304
refetchMode: 'append',
305305
}),
306306
})
@@ -355,7 +355,7 @@ describe('streamedQuery', () => {
355355
const observer = new QueryObserver(queryClient, {
356356
queryKey: key,
357357
queryFn: streamedQuery({
358-
queryFn: (context) => {
358+
streamFn: (context) => {
359359
// just consume the signal
360360
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
361361
const numbers = context.signal ? 3 : 0
@@ -397,7 +397,7 @@ describe('streamedQuery', () => {
397397
const observer = new QueryObserver(queryClient, {
398398
queryKey: key,
399399
queryFn: streamedQuery({
400-
queryFn: () => createAsyncNumberGenerator(2),
400+
streamFn: () => createAsyncNumberGenerator(2),
401401
reducer: (acc, chunk) => ({
402402
...acc,
403403
[chunk]: true,
@@ -433,7 +433,7 @@ describe('streamedQuery', () => {
433433
const observer = new QueryObserver(queryClient, {
434434
queryKey: key,
435435
queryFn: streamedQuery({
436-
queryFn: () => createAsyncNumberGenerator(2),
436+
streamFn: () => createAsyncNumberGenerator(2),
437437
reducer: (acc, chunk) => ({
438438
...acc,
439439
[chunk]: true,

packages/query-core/src/streamedQuery.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { addToEnd } from './utils'
22
import type { QueryFunction, QueryFunctionContext, QueryKey } from './types'
33

44
type BaseStreamedQueryParams<TQueryFnData, TQueryKey extends QueryKey> = {
5-
queryFn: (
5+
streamFn: (
66
context: QueryFunctionContext<TQueryKey>,
77
) => AsyncIterable<TQueryFnData> | Promise<AsyncIterable<TQueryFnData>>
88
refetchMode?: 'append' | 'reset' | 'replace'
@@ -48,7 +48,7 @@ export function streamedQuery<
4848
TData = Array<TQueryFnData>,
4949
TQueryKey extends QueryKey = QueryKey,
5050
>({
51-
queryFn,
51+
streamFn,
5252
refetchMode = 'reset',
5353
reducer = (items, chunk) =>
5454
addToEnd(items as Array<TQueryFnData>, chunk) as TData,
@@ -73,7 +73,7 @@ export function streamedQuery<
7373

7474
let result = initialValue
7575

76-
const stream = await queryFn(context)
76+
const stream = await streamFn(context)
7777

7878
for await (const chunk of stream) {
7979
if (context.signal.aborted) {

0 commit comments

Comments
 (0)