packages/extension-query/src/internal/MutationRunner.ts

@@ -35,12 +35,13 @@ export const make = <EH, K extends readonly unknown[], A, E, HandledE, R>(
     const context = yield* Effect.context<R | QueryClient.TagClassShape<EH, HandledE> | EH>()
     const globalStateRef = yield* SubscriptionRef.make(AsyncData.noData<A, Exclude<E, HandledE>>())
 
+    const queryStateTag = QueryState.makeTag<A, Exclude<E, HandledE>>()
+
     const run = (key: K) => Effect.all([
-        QueryClient,
+        queryStateTag,
-        QueryState.makeTag<A, Exclude<E, HandledE>>(),
+        QueryClient.pipe(Effect.flatMap(client => client.ErrorHandler)),
     ]).pipe(
-        Effect.flatMap(([client, state]) => client.ErrorHandler.pipe(
+        Effect.flatMap(([state, errorHandler]) => state.set(AsyncData.loading()).pipe(
-            Effect.flatMap(errorHandler => state.set(AsyncData.loading()).pipe(
             Effect.andThen(mutation(key)),
             errorHandler.handle,
             Effect.matchCauseEffect({
@@ -51,7 +52,6 @@ export const make = <EH, K extends readonly unknown[], A, E, HandledE, R>(
                     Effect.tap(state.set)
                 ),
             }),
-            ))
         )),
 
         Effect.provide(context),
@@ -60,7 +60,7 @@ export const make = <EH, K extends readonly unknown[], A, E, HandledE, R>(
 
     const mutate = (...key: K) => run(key).pipe(
         Effect.provide(QueryState.layer(
-            QueryState.makeTag<A, Exclude<E, HandledE>>(),
+            queryStateTag,
             globalStateRef,
             value => Ref.set(globalStateRef, value),
         ))
@@ -74,7 +74,7 @@ export const make = <EH, K extends readonly unknown[], A, E, HandledE, R>(
             Effect.tap(() => Queue.shutdown(stateQueue)),
 
             Effect.provide(QueryState.layer(
-                QueryState.makeTag<A, Exclude<E, HandledE>>(),
+                queryStateTag,
                 stateRef,
                 value => Queue.offer(stateQueue, value).pipe(
                     Effect.andThen(Ref.set(stateRef, value)),

packages/extension-query/src/internal/QueryRunner.ts

@@ -2,6 +2,8 @@ import { BrowserStream } from "@effect/platform-browser"
 import * as AsyncData from "@typed/async-data"
 import { type Cause, type Context, Effect, Fiber, identity, Option, Ref, type Scope, Stream, SubscriptionRef } from "effect"
 import type * as QueryClient from "../QueryClient.js"
+import * as QueryProgress from "../QueryProgress.js"
+import * as QueryState from "./QueryState.js"
 
 
 export interface QueryRunner<K extends readonly unknown[], A, E, R> {
@@ -43,6 +45,9 @@ export const make = <EH, K extends readonly unknown[], A, E, HandledE, R>(
     const stateRef = yield* SubscriptionRef.make(AsyncData.noData<A, Exclude<E, HandledE>>())
     const fiberRef = yield* SubscriptionRef.make(Option.none<Fiber.RuntimeFiber<void, Cause.NoSuchElementException>>())
 
+    const queryStateTag = QueryState.makeTag<A, Exclude<E, HandledE>>()
+    const queryStateLayer = QueryState.layer(queryStateTag, stateRef, value => Ref.set(stateRef, value))
+
     const interrupt = fiberRef.pipe(
         Effect.flatMap(Option.match({
             onSome: fiber => Ref.set(fiberRef, Option.none()).pipe(
@@ -64,27 +69,32 @@ export const make = <EH, K extends readonly unknown[], A, E, HandledE, R>(
         }))
     )
 
-    const run = QueryClient.pipe(
+    const run = Effect.all([
-        Effect.flatMap(client => client.ErrorHandler),
+        queryStateTag,
-        Effect.flatMap(errorHandler => latestKeyRef.pipe(
+        QueryClient.pipe(Effect.flatMap(client => client.ErrorHandler)),
+    ]).pipe(
+        Effect.flatMap(([state, errorHandler]) => latestKeyRef.pipe(
             Effect.flatMap(identity),
             Effect.flatMap(key => query(key).pipe(
                 errorHandler.handle,
                 Effect.matchCauseEffect({
-                    onSuccess: v => Ref.set(stateRef, AsyncData.success(v)),
+                    onSuccess: v => state.set(AsyncData.success(v)),
-                    onFailure: c => Ref.set(stateRef, AsyncData.failure(c)),
+                    onFailure: c => state.set(AsyncData.failure(c)),
                 }),
             )),
         )),
 
         Effect.provide(context),
+        Effect.provide(QueryProgress.QueryProgress.Live),
     )
 
-    const forkFetch = interrupt.pipe(
+    const forkFetch = queryStateTag.pipe(
-        Effect.andThen(Ref.set(stateRef, AsyncData.loading()).pipe(
+        Effect.flatMap(state => interrupt.pipe(
+            Effect.andThen(state.set(AsyncData.loading()).pipe(
                 Effect.andThen(run),
                 Effect.fork,
             )),
+        )),
 
         Effect.flatMap(fiber =>
             Ref.set(fiberRef, Option.some(fiber)).pipe(
@@ -94,10 +104,12 @@ export const make = <EH, K extends readonly unknown[], A, E, HandledE, R>(
         ),
 
         Effect.forkDaemon,
+        Effect.provide(queryStateLayer),
     )
 
-    const forkRefresh = interrupt.pipe(
+    const forkRefresh = queryStateTag.pipe(
-        Effect.andThen(Ref.update(stateRef, previous => {
+        Effect.flatMap(state => interrupt.pipe(
+            Effect.andThen(state.update(previous => {
                 if (AsyncData.isSuccess(previous) || AsyncData.isFailure(previous))
                     return AsyncData.refreshing(previous)
                 if (AsyncData.isRefreshing(previous))
@@ -106,6 +118,7 @@ export const make = <EH, K extends readonly unknown[], A, E, HandledE, R>(
             }).pipe(
                 Effect.andThen(run),
                 Effect.fork,
+            ))
         )),
 
         Effect.flatMap(fiber =>
@@ -116,6 +129,7 @@ export const make = <EH, K extends readonly unknown[], A, E, HandledE, R>(
         ),
 
         Effect.forkDaemon,
+        Effect.provide(queryStateLayer),
     )
 
     const fetchOnKeyChange = Effect.addFinalizer(() => interrupt).pipe(