feat: abort pending query signal on new query

posva · Mar 6, 2024 · 6b6195f · 6b6195f
1 parent 83db1f7
commit 6b6195f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/query-store.ts b/src/query-store.ts
@@ -63,6 +63,7 @@ export interface UseQueryEntry<TResult = unknown, TError = unknown>
   when: number
 
   pending: null | {
+    abortController: AbortController
     refreshCall: Promise<void>
     when: number
   }
@@ -253,9 +254,14 @@ export const useQueryCache = defineStore(QUERY_STORE_ID, () => {
 
     // we create an object and verify we are the most recent pending request
     // before doing anything
-    const signalController = new AbortController()
-    const { signal } = signalController
+    const abortController = new AbortController()
+    const { signal } = abortController
+    // abort any ongoing request
+    // TODO: test
+    entry.pending?.abortController.abort()
+
     const pendingCall = (entry.pending = {
+      abortController,
       refreshCall: entry
         .options!.query({ signal })
         .then((data) => {

diff --git a/src/use-query.ts b/src/use-query.ts
@@ -163,7 +163,7 @@ export function useQuery<TResult, TError = ErrorDefault>(
 }
 
 // TODO: createQuery with access to other properties as arguments for advanced (maybe even recommended) usage
-function _createQuery<TResult, TError = ErrorDefault>(
+function _defineQuery<TResult, TError = ErrorDefault>(
   setup: () => UseQueryOptions<TResult>,
 ) {
   return () => useQuery<TResult, TError>(setup())