Add a count of active query watchers

lemonmade · May 30, 2024 · 442f69a · 442f69a
1 parent d58b911
commit 442f69a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/.changeset/clean-deers-shop.md b/.changeset/clean-deers-shop.md
@@ -0,0 +1,6 @@
+---
+'@quilted/preact-async': patch
+'@quilted/async': patch
+---
+
+Add a count of active query watchers
diff --git a/packages/async/source/AsyncActionCache.ts b/packages/async/source/AsyncActionCache.ts
@@ -51,7 +51,7 @@ export class AsyncActionCache {
     const initialCache = this.#initialCache.get(id);
     action = create(initialCache) as any as AsyncActionCacheEntry<Action>;
 
-    Object.assign(action, {id, key, tags});
+    Object.assign(action, {id, key, tags, watchers: 0});
     this.#cache.set(id, action);
 
     return action;
@@ -234,6 +234,7 @@ export type AsyncActionCacheEntry<
   readonly id: string;
   readonly key: AsyncActionCacheKey;
   readonly tags: readonly string[];
+  watchers: number;
 };
 
 export type AsyncActionCacheEntrySerialization<

diff --git a/packages/preact-async/source/hooks/async.ts b/packages/preact-async/source/hooks/async.ts
@@ -155,7 +155,19 @@ export function useAsync<Data = unknown, Input = unknown>(
   const action = actionSignal.value;
 
   useEffect(() => {
+    const actionAsCacheEntry =
+      'watchers' in action && typeof action.watchers === 'number'
+        ? action
+        : undefined;
+
+    if (actionAsCacheEntry) actionAsCacheEntry.watchers += 1;
+
     return () => {
+      if (actionAsCacheEntry) {
+        actionAsCacheEntry.watchers -= 1;
+        if (actionAsCacheEntry.watchers > 0) return;
+      }
+
       // TODO: don’t abort if there are other listeners?
       action.running?.abort();
     };