Skip to content

Commit 98b68c2

Browse files
committed
ref: rename queryFn to streamFn in streamedQuery
this avoids the weirdly double-nested queryFn naming
1 parent 0650eaf commit 98b68c2

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

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
@@ -396,7 +396,7 @@ describe('streamedQuery', () => {
396396
const observer = new QueryObserver(queryClient, {
397397
queryKey: key,
398398
queryFn: streamedQuery({
399-
queryFn: () => createAsyncNumberGenerator(3),
399+
streamFn: () => createAsyncNumberGenerator(3),
400400
maxChunks: 2,
401401
}),
402402
})
@@ -441,7 +441,7 @@ describe('streamedQuery', () => {
441441
const observer = new QueryObserver(queryClient, {
442442
queryKey: key,
443443
queryFn: streamedQuery({
444-
queryFn: () => createAsyncNumberGenerator(3),
444+
streamFn: () => createAsyncNumberGenerator(3),
445445
maxChunks: 2,
446446
refetchMode: 'append',
447447
}),

packages/query-core/src/streamedQuery.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ export function streamedQuery<
2020
TQueryFnData = unknown,
2121
TQueryKey extends QueryKey = QueryKey,
2222
>({
23-
queryFn,
23+
streamFn,
2424
refetchMode = 'reset',
2525
maxChunks,
2626
}: {
27-
queryFn: (
27+
streamFn: (
2828
context: QueryFunctionContext<TQueryKey>,
2929
) => AsyncIterable<TQueryFnData> | Promise<AsyncIterable<TQueryFnData>>
3030
refetchMode?: 'append' | 'reset' | 'replace'
@@ -46,7 +46,7 @@ export function streamedQuery<
4646
}
4747

4848
let result: Array<TQueryFnData> = []
49-
const stream = await queryFn(context)
49+
const stream = await streamFn(context)
5050

5151
for await (const chunk of stream) {
5252
if (context.signal.aborted) {

0 commit comments

Comments
 (0)