Skip to content

Commit 634b397

Browse files
authored
refactor(vue-query): reduce redundant ref() (#5639)
* refactor(vue-query): reduce redundant `ref()` * chore: run prettier
1 parent 9b48048 commit 634b397

File tree

2 files changed

+11
-19
lines changed

2 files changed

+11
-19
lines changed

packages/vue-query/src/useBaseQuery.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import {
44
readonly,
55
reactive,
66
watch,
7-
ref,
87
computed,
98
unref,
109
} from 'vue-demi'
@@ -71,17 +70,17 @@ export function useBaseQuery<
7170
const observer = new Observer(queryClient, defaultedOptions.value)
7271
const state = reactive(observer.getCurrentResult())
7372

74-
const unsubscribe = ref(() => {
73+
let unsubscribe = () => {
7574
// noop
76-
})
75+
}
7776

7877
watch(
7978
queryClient.isRestoring,
8079
(isRestoring) => {
8180
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
8281
if (!isRestoring) {
83-
unsubscribe.value()
84-
unsubscribe.value = observer.subscribe((result) => {
82+
unsubscribe()
83+
unsubscribe = observer.subscribe((result) => {
8584
updateState(state, result)
8685
})
8786
}
@@ -99,7 +98,7 @@ export function useBaseQuery<
9998
)
10099

101100
onScopeDispose(() => {
102-
unsubscribe.value()
101+
unsubscribe()
103102
})
104103

105104
const suspense = () => {

packages/vue-query/src/useQueries.ts

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
/* eslint-disable @typescript-eslint/no-explicit-any */
22
import { QueriesObserver } from '@tanstack/query-core'
3-
import {
4-
computed,
5-
onScopeDispose,
6-
reactive,
7-
readonly,
8-
ref,
9-
watch,
10-
} from 'vue-demi'
3+
import { computed, onScopeDispose, reactive, readonly, watch } from 'vue-demi'
114
import type { Ref } from 'vue-demi'
125

136
import type { QueryFunction, QueryObserverResult } from '@tanstack/query-core'
@@ -175,16 +168,16 @@ export function useQueries<T extends any[]>({
175168
const observer = new QueriesObserver(queryClient, defaultedQueries.value)
176169
const state = reactive(observer.getCurrentResult())
177170

178-
const unsubscribe = ref(() => {
171+
let unsubscribe = () => {
179172
// noop
180-
})
173+
}
181174

182175
watch(
183176
queryClient.isRestoring,
184177
(isRestoring) => {
185178
if (!isRestoring) {
186-
unsubscribe.value()
187-
unsubscribe.value = observer.subscribe((result) => {
179+
unsubscribe()
180+
unsubscribe = observer.subscribe((result) => {
188181
state.splice(0, result.length, ...result)
189182
})
190183
// Subscription would not fire for persisted results
@@ -208,7 +201,7 @@ export function useQueries<T extends any[]>({
208201
)
209202

210203
onScopeDispose(() => {
211-
unsubscribe.value()
204+
unsubscribe()
212205
})
213206

214207
return readonly(state) as UseQueriesResults<T>

0 commit comments

Comments
 (0)