Skip to content

Commit f21d932

Browse files
authored
fix(types): expose CancelOptions & SetDataOptions (TanStack#2855)
1 parent e3fb566 commit f21d932

File tree

4 files changed

+16
-12
lines changed

4 files changed

+16
-12
lines changed

src/core/query.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@ import type {
1515
QueryFunctionContext,
1616
EnsuredQueryKey,
1717
QueryMeta,
18+
CancelOptions,
19+
SetDataOptions,
1820
} from './types'
1921
import type { QueryCache } from './queryCache'
2022
import type { QueryObserver } from './queryObserver'
2123
import { notifyManager } from './notifyManager'
2224
import { getLogger } from './logger'
23-
import { Retryer, CancelOptions, isCancelledError } from './retryer'
25+
import { Retryer, isCancelledError } from './retryer'
2426

2527
// TYPES
2628

@@ -84,10 +86,6 @@ export interface FetchOptions {
8486
meta?: any
8587
}
8688

87-
export interface SetDataOptions {
88-
updatedAt?: number
89-
}
90-
9189
interface FailedAction {
9290
type: 'failed'
9391
}

src/core/queryClient.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,16 @@ import type {
2727
RefetchQueryFilters,
2828
ResetOptions,
2929
ResetQueryFilters,
30+
SetDataOptions,
3031
} from './types'
31-
import type { QueryState, SetDataOptions } from './query'
32+
import type { QueryState } from './query'
3233
import { QueryCache } from './queryCache'
3334
import { MutationCache } from './mutationCache'
3435
import { focusManager } from './focusManager'
3536
import { onlineManager } from './onlineManager'
3637
import { notifyManager } from './notifyManager'
37-
import { CancelOptions } from './retryer'
3838
import { infiniteQueryBehavior } from './infiniteQueryBehavior'
39+
import { CancelOptions } from './types'
3940

4041
// TYPES
4142

src/core/retryer.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { focusManager } from './focusManager'
22
import { onlineManager } from './onlineManager'
33
import { sleep } from './utils'
4+
import { CancelOptions } from './types'
45

56
// TYPES
67

@@ -41,11 +42,6 @@ export function isCancelable(value: any): value is Cancelable {
4142
return typeof value?.cancel === 'function'
4243
}
4344

44-
export interface CancelOptions {
45-
revert?: boolean
46-
silent?: boolean
47-
}
48-
4945
export class CancelledError {
5046
revert?: boolean
5147
silent?: boolean

src/core/types.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,3 +669,12 @@ export interface DefaultOptions<TError = unknown> {
669669
queries?: QueryObserverOptions<unknown, TError>
670670
mutations?: MutationObserverOptions<unknown, TError, unknown, unknown>
671671
}
672+
673+
export interface CancelOptions {
674+
revert?: boolean
675+
silent?: boolean
676+
}
677+
678+
export interface SetDataOptions {
679+
updatedAt?: number
680+
}

0 commit comments

Comments
 (0)