@effect-app/vue 4.0.4 → 4.0.6

package/src/atomQuery.ts

@@ -23,9 +23,11 @@ import * as S from "effect-app/Schema"
 import * as Cause from "effect/Cause"
 import * as Duration from "effect/Duration"
 import * as Equal from "effect/Equal"
-import * as Hash from "effect/Hash"
+import * as Exit from "effect/Exit"
 import { isHttpClientError } from "effect/http/HttpClientError"
 import type * as Layer from "effect/Layer"
+import * as MutableHashMap from "effect/MutableHashMap"
+import * as MutableHashSet from "effect/MutableHashSet"
 import * as AsyncResult from "effect/reactivity/AsyncResult"
 import * as Atom from "effect/reactivity/Atom"
 import * as AtomRegistry from "effect/reactivity/AtomRegistry"
@@ -34,7 +36,7 @@ import * as Stream from "effect/Stream"
 import type * as Tracer from "effect/Tracer"
 import { clearQueryReadDependencies, getQueryReadDependencies, type QueryInvalidationMode, registerQueryInvalidationMode, setQueryReadDependencies } from "./dependencyMetadata.ts"
 import { reportRuntimeError } from "./lib.ts"
-import { beginLiveQueryFetch, endLiveQueryFetch, type LiveQueryOptions, registerLiveQuery } from "./liveQueryInvalidation.ts"
+import { acquireLiveQueryFetch, awaitLiveQueryFetch, type LiveQueryOptions, registerLiveQuery, releaseLiveQueryFetch } from "./liveQueryInvalidation.ts"
 import { atomsToRefetch, observeQueryAtom } from "./queryLifetime.ts"
 
 /** All non-empty prefixes of a key, longest last. `[a,b,c]` -> `[[a],[a,b],[a,b,c]]`. */
@@ -43,11 +45,10 @@ const prefixesOf = (key: ReadonlyArray<unknown>): ReadonlyArray<ReadonlyArray<un
 
 const uniqueKeys = (keys: ReadonlyArray<ReadonlyArray<unknown>>): ReadonlyArray<ReadonlyArray<unknown>> => {
   const out: Array<ReadonlyArray<unknown>> = []
-  const seen = new Set<number>()
+  const seen = MutableHashSet.empty<ReadonlyArray<unknown>>()
   for (const key of keys) {
-    const hash = Hash.hash(key)
-    if (seen.has(hash)) continue
-    seen.add(hash)
+    if (MutableHashSet.has(seen, key)) continue
+    MutableHashSet.add(seen, key)
     out.push(key)
   }
   return out
@@ -58,20 +59,21 @@ const uniqueKeys = (keys: ReadonlyArray<ReadonlyArray<unknown>>): ReadonlyArray<
 // alive in the registry (mounted OR cached within idle-ttl). Invalidation *marks* every matching
 // atom stale; it only *refetches* atoms that currently have observers (TanStack refetchType:
 // "active"). Idle cache entries refetch on the next mount.
-const keyAtoms = new Map<number, Set<Atom.Atom<AsyncResult.AsyncResult<any, any>>>>()
+const keyAtoms = MutableHashMap.empty<ReadonlyArray<unknown>, Set<Atom.Atom<AsyncResult.AsyncResult<any, any>>>>()
 
 const trackByKeys =
   (keys: ReadonlyArray<ReadonlyArray<unknown>>) =>
   <A, E>(atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>): Atom.Atom<AsyncResult.AsyncResult<A, E>> =>
     Atom.transform(atom, (get) => {
       for (const key of keys) {
-        const h = Hash.hash(key)
-        let set = keyAtoms.get(h)
-        if (!set) keyAtoms.set(h, set = new Set())
+        let set = Option.getOrUndefined(MutableHashMap.get(keyAtoms, key))
+        if (!set) MutableHashMap.set(keyAtoms, key, set = new Set())
         set.add(atom)
         get.addFinalizer(() => {
           set.delete(atom)
-          if (set.size === 0) keyAtoms.delete(h)
+          if (set.size === 0 && Option.getOrUndefined(MutableHashMap.get(keyAtoms, key)) === set) {
+            MutableHashMap.remove(keyAtoms, key)
+          }
         })
       }
       return get(atom)
@@ -111,7 +113,7 @@ const trackReadDependencies =
 const atomsForKeys = (keys: ReadonlyArray<unknown>): ReadonlyArray<Atom.Atom<AsyncResult.AsyncResult<any, any>>> => {
   const atoms = new Set<Atom.Atom<AsyncResult.AsyncResult<any, any>>>()
   for (const key of keys) {
-    const set = keyAtoms.get(Hash.hash(key))
+    const set = Option.getOrUndefined(MutableHashMap.get(keyAtoms, key))
     if (set) { for (const a of set) atoms.add(a) }
   }
   return [...atoms]
@@ -377,6 +379,16 @@ const recoverStuckWaitingOnMount =
       return current
     }, { initialValueTarget: wrapped })
 
+/** Runs `setup` once per mount (not per result change) and forwards the wrapped atom's results. */
+const withMountLifetime =
+  <A, E>(setup: (get: Atom.AtomContext) => void) =>
+  (atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>): Atom.Atom<AsyncResult.AsyncResult<A, E>> =>
+    Atom.transform(atom, (get) => {
+      setup(get)
+      get.subscribe(atom, (value) => get.setSelf(value))
+      return get.once(atom)
+    }, { initialValueTarget: atom })
+
 export const withQueryOptions = <A, E>(
   self: Atom.Atom<AsyncResult.AsyncResult<A, E>>,
   opts: AtomQueryOptions = {},
@@ -386,23 +398,15 @@ export const withQueryOptions = <A, E>(
   const staleTime: Duration.Input = opts.staleTime ?? defaults.staleTime
   let atom = self
   if (liveKey !== undefined) {
-    atom = Atom.transform(atom, (get) => {
-      const unregister = registerQueryInvalidationMode(liveKey, opts.invalidation ?? "await")
-      get.addFinalizer(unregister)
-      return get(self)
-    }, { initialValueTarget: self })
+    atom = withMountLifetime<A, E>((get) => {
+      get.addFinalizer(registerQueryInvalidationMode(liveKey, opts.invalidation ?? "await"))
+    })(atom)
   }
   if (opts.live && liveKey !== undefined) {
     const liveOptions = opts.live === true ? {} : opts.live
-    atom = Atom.transform(atom, (get) => {
-      const unregister = registerLiveQuery(
-        liveKey,
-        () => getQueryReadDependencies(liveKey),
-        liveOptions
-      )
-      get.addFinalizer(unregister)
-      return get(self)
-    }, { initialValueTarget: self })
+    atom = withMountLifetime<A, E>((get) => {
+      get.addFinalizer(registerLiveQuery(liveKey, () => getQueryReadDependencies(liveKey), liveOptions))
+    })(atom)
   }
   const revalidateOnFocus = opts.revalidateOnFocus ?? true
   atom = Atom.swr({
@@ -475,6 +479,10 @@ export const buildQueryFamily = <I, A, E>(
 
   return Atom.family((input: I) => {
     const fullKey = [...baseKey, input]
+    // metadata/live identity: projections of one handler read different data
+    const projectedFullKey = self.queryKeyProjectionHash === undefined
+      ? fullKey
+      : [...baseKey, self.queryKeyProjectionHash, input]
     // Record the repository/server read-dependencies seen while fetching, keyed by `fullKey`, so a
     // later mutation whose writes intersect them can derive this query as an invalidation target.
     // The last recorded reads are retained on the (memoized) family atom so `trackReadDependencies`
@@ -495,21 +503,34 @@ export const buildQueryFamily = <I, A, E>(
             const readsRef = yield* Ref.make(DataDependencies.empty())
             const writesRef = yield* Ref.make(DataDependencies.empty())
             const recorder = DataDependencies.makeDataDependencyRecorder(readsRef, writesRef)
-            const result = yield* self
+            return yield* self
               .handler(input)
-              .pipe(Effect.provideService(DataDependencies.DataDependencyRecorder, recorder))
-            lastReads = yield* Ref.get(readsRef)
-            setQueryReadDependencies(fullKey, lastReads)
-            return result
+              .pipe(
+                Effect.provideService(DataDependencies.DataDependencyRecorder, recorder),
+                // a failure (e.g. not found) still depends on what it read; keep a displayed success's reads
+                Effect.onExit((exit) =>
+                  Exit.isFailure(exit) && Cause.hasInterruptsOnly(exit.cause)
+                    ? Effect.void
+                    : Ref.get(readsRef).pipe(Effect.map((reads) => {
+                      lastReads = Exit.isSuccess(exit) ? reads : DataDependencies.merge(lastReads, reads)
+                      setQueryReadDependencies(projectedFullKey, lastReads)
+                    }))
+                )
+              )
           })
-        let liveFetch = false
         const effect = Effect
-          .gen(function*() {
-            liveFetch = yield* Effect.promise(() => beginLiveQueryFetch(fullKey))
-            return yield* recordReads.pipe(Effect.retry({ times: 5, while: isRetryable }))
-          })
+          .acquireUseRelease(
+            Effect.sync(() => acquireLiveQueryFetch(projectedFullKey)),
+            (live) =>
+              (live === undefined ? Effect.void : Effect.promise((signal) => awaitLiveQueryFetch(live, signal))).pipe(
+                Effect.andThen(recordReads.pipe(Effect.retry({ times: 5, while: isRetryable })))
+              ),
+            (live) =>
+              Effect.sync(() => {
+                if (live !== undefined) releaseLiveQueryFetch(live)
+              })
+          )
           .pipe(
-            Effect.ensuring(Effect.sync(() => endLiveQueryFetch(liveFetch))),
             Effect.tapCauseIf(Cause.hasDies, (cause) => reportRuntimeError(cause)),
             // On exit, the compute is no longer in-flight. An interrupt (subscriber lost interest / a
             // superseding refresh) may leave the result at `waiting`; with `inFlight` back at 0 that
@@ -531,13 +552,10 @@ export const buildQueryFamily = <I, A, E>(
     // Register under every prefix of the full key => hierarchical (prefix) invalidation. Two roles:
     //   - withReactivity: `Reactivity.invalidate(key)` refreshes this atom (the actual refetch).
     //   - trackByKeys:    records the atom in `keyAtoms` so the mutation can AWAIT its settle.
-    const projectedFullKey = self.queryKeyProjectionHash === undefined
-      ? fullKey
-      : [...baseKey, self.queryKeyProjectionHash, input]
     const reactivityKeys = uniqueKeys([...prefixesOf(fullKey), ...prefixesOf(projectedFullKey)])
     atom = rt.factory.withReactivity(reactivityKeys)(atom)
     atom = trackByKeys(reactivityKeys)(atom)
-    atom = trackReadDependencies(fullKey, () => lastReads)(atom)
+    atom = trackReadDependencies(projectedFullKey, () => lastReads)(atom)
     // gcTime LAST so the whole chain (incl. the registration + tracking) stays alive through the
     // idle window. Invalidation still finds the cached atom and marks it stale; it does not
     // refetch until an observer remounts (TanStack refetchType: "active").
@@ -558,8 +576,8 @@ export const buildQueryFamily = <I, A, E>(
     const observed = observeQueryAtom(result)
     queryFetchStates.set(result, fetchState)
     queryFetchStates.set(observed, fetchState)
-    atomQueryKeys.set(result, fullKey)
-    atomQueryKeys.set(observed, fullKey)
+    atomQueryKeys.set(result, projectedFullKey)
+    atomQueryKeys.set(observed, projectedFullKey)
     return observed
   })
 }

package/src/dependencyMetadata.ts

@@ -1,37 +1,42 @@
 import { DataDependencies } from "effect-app/client"
-import * as Hash from "effect/Hash"
+import * as MutableHashMap from "effect/MutableHashMap"
+import * as Option from "effect/Option"
 
 // Maps a live query's reactivity key (its full `[...queryKey, input]` key) to the
 // data dependencies it read while fetching. Populated when the query handler resolves and
 // cleared when the query atom is GC'd, so the set mirrors the live query atoms (mounted or
 // cached-within-ttl) — the atom equivalent of the former tanstack query cache.
 type Entry = { readonly key: ReadonlyArray<unknown>; readonly reads: DataDependencies.DataDependencies }
-const readDependencies = new Map<number, Entry>()
+const readDependencies = MutableHashMap.empty<ReadonlyArray<unknown>, Entry>()
 export type QueryInvalidationMode = "await" | "soft"
 type InvalidationModeEntry = { awaitSubscribers: number; softSubscribers: number }
-const invalidationModes = new Map<number, InvalidationModeEntry>()
+const invalidationModes = MutableHashMap.empty<ReadonlyArray<unknown>, InvalidationModeEntry>()
 
 export const registerQueryInvalidationMode = (
   key: ReadonlyArray<unknown>,
   mode: QueryInvalidationMode
 ): () => void => {
-  const hash = Hash.hash(key)
-  const entry = invalidationModes.get(hash) ?? { awaitSubscribers: 0, softSubscribers: 0 }
+  const entry = Option.getOrUndefined(MutableHashMap.get(invalidationModes, key))
+    ?? { awaitSubscribers: 0, softSubscribers: 0 }
   if (mode === "soft") entry.softSubscribers++
   else entry.awaitSubscribers++
-  invalidationModes.set(hash, entry)
+  MutableHashMap.set(invalidationModes, key, entry)
   let active = true
   return () => {
     if (!active) return
     active = false
     if (mode === "soft") entry.softSubscribers--
     else entry.awaitSubscribers--
-    if (entry.awaitSubscribers === 0 && entry.softSubscribers === 0) invalidationModes.delete(hash)
+    if (
+      entry.awaitSubscribers === 0
+      && entry.softSubscribers === 0
+      && Option.getOrUndefined(MutableHashMap.get(invalidationModes, key)) === entry
+    ) MutableHashMap.remove(invalidationModes, key)
   }
 }
 
 export const getQueryInvalidationMode = (key: ReadonlyArray<unknown>): QueryInvalidationMode => {
-  const entry = invalidationModes.get(Hash.hash(key))
+  const entry = Option.getOrUndefined(MutableHashMap.get(invalidationModes, key))
   return entry !== undefined && entry.awaitSubscribers === 0 && entry.softSubscribers > 0 ? "soft" : "await"
 }
 
@@ -39,18 +44,18 @@ export const setQueryReadDependencies = (
   key: ReadonlyArray<unknown>,
   reads: DataDependencies.DataDependencies
 ) => {
-  const h = Hash.hash(key)
-  if (!DataDependencies.isNonEmpty(reads)) readDependencies.delete(h)
-  else readDependencies.set(h, { key, reads })
+  if (!DataDependencies.isNonEmpty(reads)) MutableHashMap.remove(readDependencies, key)
+  else MutableHashMap.set(readDependencies, key, { key, reads })
 }
 
 export const clearQueryReadDependencies = (key: ReadonlyArray<unknown>) => {
-  readDependencies.delete(Hash.hash(key))
+  MutableHashMap.remove(readDependencies, key)
 }
 
 export const getQueryReadDependencies = (
   key: ReadonlyArray<unknown>
-): DataDependencies.DataDependencies => readDependencies.get(Hash.hash(key))?.reads ?? DataDependencies.empty()
+): DataDependencies.DataDependencies =>
+  Option.getOrUndefined(MutableHashMap.get(readDependencies, key))?.reads ?? DataDependencies.empty()
 
 /**
  * Reactivity keys of every live query whose recorded read-dependencies intersect this
@@ -62,7 +67,7 @@ export const getDerivedInvalidationKeys = (
 ): ReadonlyArray<ReadonlyArray<unknown>> => {
   if (!DataDependencies.isNonEmpty(writeDependencies)) return []
   const keys: Array<ReadonlyArray<unknown>> = []
-  for (const { key, reads } of readDependencies.values()) {
+  for (const { key, reads } of MutableHashMap.values(readDependencies)) {
     if (DataDependencies.intersects(reads, writeDependencies)) keys.push(key)
   }
   return keys