bun.lock

@@ -61,6 +61,7 @@
         "effect-lens": "2.0.0-beta.0",
       },
       "devDependencies": {
+        "@effect/platform-browser": "^4.0.0-beta.85",
         "@testing-library/react": "^16.3.0",
         "jsdom": "^26.1.0",
         "vitest": "^3.2.4",
@@ -3062,6 +3063,8 @@
 
     "dot-prop/is-obj": ["is-obj@2.0.0", "", {}, "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="],
 
+    "effect-fc-next/@effect/platform-browser": ["@effect/platform-browser@4.0.0-beta.87", "", { "dependencies": { "multipasta": "^0.2.7" }, "peerDependencies": { "effect": "^4.0.0-beta.87" } }, "sha512-sBUUdRt5PjFPLI7+ayxEX/jgnjCbOuc3I//98CmqiwhfgWbCMZ/rofYYb8Zk5tLpNsmdHnWgHWTsBLvH2SFrCw=="],
+
     "effect-fc-next/effect": ["effect@4.0.0-beta.85", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "fast-check": "^4.8.0", "find-my-way-ts": "^0.1.6", "ini": "^7.0.0", "kubernetes-types": "^1.30.0", "msgpackr": "^2.0.1", "multipasta": "^0.2.7", "toml": "^4.1.1", "uuid": "^14.0.0", "yaml": "^2.9.0" } }, "sha512-Cjv9YQyv4CiIccmRAQIWAoeESCpCpiuHYY8zb5vqiYs3Ac2yE5RQAnKq7z4Ir/3VJYZb8kxh6rS8czDDnpTdkQ=="],
 
     "effect-fc-next/effect-lens": ["effect-lens@2.0.0-beta.0", "", { "peerDependencies": { "effect": "4.0.0-beta.85" } }, "sha512-ntsRQSrzoX+GsNpkNVEGqebl/g1YOEDPIFRAHigf+4P6AtGnnOFcklqDHLrbm4zqnaxuWEgQvvn1J6S3eyC4yw=="],

packages/effect-fc-next/package.json

@@ -39,6 +39,7 @@
     "clean:modules": "rm -rf node_modules"
   },
   "devDependencies": {
+    "@effect/platform-browser": "^4.0.0-beta.85",
     "@testing-library/react": "^16.3.0",
     "jsdom": "^26.1.0",
     "vitest": "^3.2.4"

packages/effect-fc-next/src/Query.ts

@@ -1,44 +1,35 @@
-import {
-    type Cause,
-    type Context,
-    type Duration,
-    Effect,
-    Equal,
-    Fiber,
-    Option,
-    Pipeable,
-    Predicate,
-    type Scope,
-    Semaphore,
-    Stream,
-    SubscriptionRef,
-} from "effect"
-import { Subscribable } from "effect-lens"
+import { type Cause, type Context, Duration, Effect, Equal, Exit, Fiber, Option, Pipeable, Predicate, type Scope, Semaphore, Stream, SubscriptionRef } from "effect"
+import { AsyncResult } from "effect/unstable/reactivity"
+import * as Lens from "./Lens.js"
 import * as QueryClient from "./QueryClient.js"
-import * as Result from "./Result.js"
+import * as Subscribable from "./Subscribable.js"
 
 
 export const QueryTypeId: unique symbol = Symbol.for("@effect-fc/Query/Query")
 export type QueryTypeId = typeof QueryTypeId
 
-export interface Query<in out K extends Query.AnyKey, in out A, in out KE = never, in out KR = never, in out E = never, in out R = never, in out P = never>
+export interface Query<in out K extends Query.AnyKey, in out A, in out KE = never, in out KR = never, in out E = never, in out R = never>
 extends Pipeable.Pipeable {
     readonly [QueryTypeId]: QueryTypeId
+
     readonly context: Context.Context<Scope.Scope | QueryClient.QueryClient | KR | R>
     readonly key: Stream.Stream<K, KE, KR>
     readonly f: (key: K) => Effect.Effect<A, E, R>
-    readonly initialProgress: P
-    readonly staleTime: Duration.Input
+
+    readonly staleTime: Duration.Duration
     readonly refreshOnWindowFocus: boolean
+
     readonly latestKey: Subscribable.Subscribable<Option.Option<K>>
     readonly fiber: Subscribable.Subscribable<Option.Option<Fiber.Fiber<A, E>>>
-    readonly result: Subscribable.Subscribable<Result.Result<A, E, P>>
-    readonly latestFinalResult: Subscribable.Subscribable<Option.Option<Result.Final<A, E, P>>>
+    readonly result: Subscribable.Subscribable<AsyncResult.AsyncResult<A, E>>
+    readonly latestFinalResult: Subscribable.Subscribable<Option.Option<AsyncResult.Success<A, E> | AsyncResult.Failure<A, E>>>
+
     readonly run: Effect.Effect<void>
-    fetch(key: K): Effect.Effect<Result.Final<A, E, P>>
-    fetchSubscribable(key: K): Effect.Effect<Subscribable.Subscribable<Result.Result<A, E, P>>>
-    readonly refresh: Effect.Effect<Result.Final<A, E, P>, Cause.NoSuchElementError>
-    readonly refreshSubscribable: Effect.Effect<Subscribable.Subscribable<Result.Result<A, E, P>>, Cause.NoSuchElementError>
+    fetch(key: K): Effect.Effect<AsyncResult.Success<A, E> | AsyncResult.Failure<A, E>, Cause.NoSuchElementError>
+    fetchSubscribable(key: K): Effect.Effect<Subscribable.Subscribable<AsyncResult.AsyncResult<A, E>>, Cause.NoSuchElementError>
+    readonly refresh: Effect.Effect<AsyncResult.Success<A, E> | AsyncResult.Failure<A, E>, Cause.NoSuchElementError>
+    readonly refreshSubscribable: Effect.Effect<Subscribable.Subscribable<AsyncResult.AsyncResult<A, E>>, Cause.NoSuchElementError>
+
     readonly invalidateCache: Effect.Effect<void>
     invalidateCacheEntry(key: K): Effect.Effect<void>
 }
@@ -47,42 +38,43 @@ export declare namespace Query {
     export type AnyKey = readonly any[]
 }
 
-export class QueryImpl<in out K extends Query.AnyKey, in out A, in out KE = never, in out KR = never, in out E = never, in out R = never, in out P = never>
-extends Pipeable.Class implements Query<K, A, KE, KR, E, R, P> {
+export class QueryImpl<in out K extends Query.AnyKey, in out A, in out KE = never, in out KR = never, in out E = never, in out R = never>
+extends Pipeable.Class implements Query<K, A, KE, KR, E, R> {
     readonly [QueryTypeId]: QueryTypeId = QueryTypeId
-    readonly latestKey: Subscribable.Subscribable<Option.Option<K>>
-    readonly fiber: Subscribable.Subscribable<Option.Option<Fiber.Fiber<A, E>>>
-    readonly result: Subscribable.Subscribable<Result.Result<A, E, P>>
-    readonly latestFinalResult: Subscribable.Subscribable<Option.Option<Result.Final<A, E, P>>>
 
     constructor(
         readonly context: Context.Context<Scope.Scope | QueryClient.QueryClient | KR | R>,
         readonly key: Stream.Stream<K, KE, KR>,
         readonly f: (key: K) => Effect.Effect<A, E, R>,
-        readonly initialProgress: P,
-        readonly staleTime: Duration.Input,
+
+        readonly staleTime: Duration.Duration,
         readonly refreshOnWindowFocus: boolean,
-        readonly latestKeyRef: SubscriptionRef.SubscriptionRef<Option.Option<K>>,
-        readonly fiberRef: SubscriptionRef.SubscriptionRef<Option.Option<Fiber.Fiber<A, E>>>,
-        readonly resultRef: SubscriptionRef.SubscriptionRef<Result.Result<A, E, P>>,
-        readonly latestFinalResultRef: SubscriptionRef.SubscriptionRef<Option.Option<Result.Final<A, E, P>>>,
+
+        readonly latestKey: Lens.Lens<Option.Option<K>>,
+        readonly fiber: Lens.Lens<Option.Option<Fiber.Fiber<A, E>>>,
+        readonly result: Lens.Lens<AsyncResult.AsyncResult<A, E>>,
+        readonly latestFinalResult: Lens.Lens<Option.Option<AsyncResult.Success<A, E> | AsyncResult.Failure<A, E>>>,
+
         readonly runSemaphore: Semaphore.Semaphore,
     ) {
         super()
-        this.latestKey = fromSubscriptionRef(latestKeyRef)
-        this.fiber = fromSubscriptionRef(fiberRef)
-        this.result = fromSubscriptionRef(resultRef)
-        this.latestFinalResult = fromSubscriptionRef(latestFinalResultRef)
     }
 
     get run(): Effect.Effect<void> {
-        const focus = this.refreshOnWindowFocus && typeof window !== "undefined"
-            ? Stream.runForEach(Stream.fromEventListener<FocusEvent>(window, "focus"), () => this.refreshSubscribable)
-            : Effect.succeed(undefined)
         return Effect.all([
             Stream.runForEach(this.key, key => this.fetchSubscribable(key)),
-            focus,
-        ], { concurrency: "unbounded", discard: true }).pipe(
+
+            Effect.promise(() => import("@effect/platform-browser")).pipe(
+                Effect.flatMap(({ BrowserStream }) => this.refreshOnWindowFocus
+                    ? Stream.runForEach(
+                        BrowserStream.fromEventListenerWindow("focus"),
+                        () => this.refreshSubscribable,
+                    )
+                    : Effect.void
+                ),
+                Effect.catchDefect(() => Effect.void),
+            ),
+        ], { concurrency: "unbounded" }).pipe(
             Effect.ignore,
             this.runSemaphore.withPermits(1),
             Effect.provide(this.context),
@@ -90,120 +82,159 @@ extends Pipeable.Class implements Query<K, A, KE, KR, E, R, P> {
     }
 
     get interrupt(): Effect.Effect<void> {
-        return Effect.flatMap(SubscriptionRef.get(this.fiberRef), Option.match({
+        return Effect.flatMap(Lens.get(this.fiber), Option.match({
             onSome: Fiber.interrupt,
-            onNone: () => Effect.succeed(undefined),
+            onNone: () => Effect.void,
         }))
     }
 
-    fetch(key: K): Effect.Effect<Result.Final<A, E, P>> {
-        const self = this
-        return Effect.gen(function*() {
-            yield* self.interrupt
-            yield* SubscriptionRef.set(self.latestKeyRef, Option.some(key))
-            const previous = yield* SubscriptionRef.get(self.latestFinalResultRef)
-            const sub = yield* self.startCached(key, Option.isSome(previous)
-                ? Result.willFetch(previous.value) as Result.Final<A, E, P>
-                : Result.initial())
-            return yield* self.watch(key, sub)
-        }).pipe(Effect.provide(this.context))
+    fetch(key: K): Effect.Effect<
+        AsyncResult.Success<A, E> | AsyncResult.Failure<A, E>,
+        Cause.NoSuchElementError
+    > {
+        return this.interrupt.pipe(
+            Effect.andThen(Lens.set(this.latestKey, Option.some(key))),
+            Effect.andThen(this.startCached(key, AsyncResult.initial())),
+            Effect.flatMap(state => this.watch(key, state)),
+            Effect.provide(this.context),
+        )
     }
 
-    fetchSubscribable(key: K): Effect.Effect<Subscribable.Subscribable<Result.Result<A, E, P>>> {
-        const self = this
-        return Effect.gen(function*() {
-            yield* self.interrupt
-            yield* SubscriptionRef.set(self.latestKeyRef, Option.some(key))
-            const previous = yield* SubscriptionRef.get(self.latestFinalResultRef)
-            const sub = yield* self.startCached(key, Option.isSome(previous)
-                ? Result.willFetch(previous.value) as Result.Final<A, E, P>
-                : Result.initial())
-            yield* Effect.forkScoped(self.watch(key, sub))
-            return sub
-        }).pipe(Effect.provide(this.context))
+    fetchSubscribable(key: K): Effect.Effect<
+        Subscribable.Subscribable<AsyncResult.AsyncResult<A, E>>,
+        Cause.NoSuchElementError
+    > {
+        return this.interrupt.pipe(
+            Effect.andThen(Lens.set(this.latestKey, Option.some(key))),
+            Effect.andThen(this.startCached(key, AsyncResult.initial(false))),
+            Effect.tap(state => Effect.forkScoped(this.watch(key, state))),
+            Effect.provide(this.context),
+        )
     }
 
-    get refresh(): Effect.Effect<Result.Final<A, E, P>, Cause.NoSuchElementError> {
-        const self = this
-        return Effect.gen(function*() {
-            yield* self.interrupt
-            const key = yield* Effect.fromOption(yield* SubscriptionRef.get(self.latestKeyRef))
-            const previous = yield* SubscriptionRef.get(self.latestFinalResultRef)
-            const sub = yield* self.startCached(key, Option.isSome(previous)
-                ? Result.willRefresh(previous.value) as Result.Final<A, E, P>
-                : Result.initial())
-            return yield* self.watch(key, sub)
-        }).pipe(Effect.provide(this.context))
+    get refresh(): Effect.Effect<AsyncResult.Success<A, E> | AsyncResult.Failure<A, E>, Cause.NoSuchElementError> {
+        return this.interrupt.pipe(
+            Effect.andThen(Effect.Do),
+            Effect.bind("latestKey", () => Effect.flatMap(Lens.get(this.latestKey), Effect.fromOption)),
+            Effect.bind("latestFinalResult", () => Lens.get(this.latestFinalResult)),
+            Effect.bind("subscribable", ({ latestKey, latestFinalResult }) =>
+                this.startCached(latestKey, Option.getOrElse(latestFinalResult, () => AsyncResult.initial(true)))
+            ),
+            Effect.flatMap(({ latestKey, subscribable }) => this.watch(latestKey, subscribable)),
+            Effect.provide(this.context),
+        )
     }
 
-    get refreshSubscribable(): Effect.Effect<Subscribable.Subscribable<Result.Result<A, E, P>>, Cause.NoSuchElementError> {
-        const self = this
-        return Effect.gen(function*() {
-            yield* self.interrupt
-            const key = yield* Effect.fromOption(yield* SubscriptionRef.get(self.latestKeyRef))
-            const previous = yield* SubscriptionRef.get(self.latestFinalResultRef)
-            const sub = yield* self.startCached(key, Option.isSome(previous)
-                ? Result.willRefresh(previous.value) as Result.Final<A, E, P>
-                : Result.initial())
-            yield* Effect.forkScoped(self.watch(key, sub))
-            return sub
-        }).pipe(Effect.provide(this.context))
+    get refreshSubscribable(): Effect.Effect<
+        Subscribable.Subscribable<AsyncResult.AsyncResult<A, E>>,
+        Cause.NoSuchElementError
+    > {
+        return this.interrupt.pipe(
+            Effect.andThen(Effect.Do),
+            Effect.bind("latestKey", () => Effect.flatMap(Lens.get(this.latestKey), Effect.fromOption)),
+            Effect.bind("latestFinalResult", () => Lens.get(this.latestFinalResult)),
+            Effect.bind("subscribable", ({ latestKey, latestFinalResult }) =>
+                this.startCached(latestKey, Option.getOrElse(latestFinalResult, () => AsyncResult.initial(true)))
+            ),
+            Effect.tap(({ latestKey, subscribable }) => Effect.forkScoped(this.watch(latestKey, subscribable))),
+            Effect.map(({ subscribable }) => subscribable),
+            Effect.provide(this.context),
+        )
     }
 
     startCached(
         key: K,
-        initial: Result.Initial | Result.Final<A, E, P>,
-    ): Effect.Effect<Subscribable.Subscribable<Result.Result<A, E, P>>, never, Scope.Scope | QueryClient.QueryClient | R> {
+        previous: AsyncResult.AsyncResult<A, E>,
+    ): Effect.Effect<
+        Subscribable.Subscribable<AsyncResult.AsyncResult<A, E>>,
+        Cause.NoSuchElementError,
+        Scope.Scope | QueryClient.QueryClient | R
+    > {
         return Effect.flatMap(this.getCacheEntry(key), Option.match({
             onSome: entry => Effect.flatMap(
                 QueryClient.isQueryClientCacheEntryStale(entry),
                 isStale => isStale
-                    ? this.start(key, Result.willRefresh(entry.result) as Result.Final<A, E, P>)
+                    ? this.start(key, entry.result as AsyncResult.AsyncResult<A, E>)
                     : Effect.succeed(Subscribable.make({
-                        get: Effect.succeed(entry.result as Result.Result<A, E, P>),
-                        changes: Stream.make(entry.result as Result.Result<A, E, P>),
+                        get: Effect.succeed(entry.result as AsyncResult.AsyncResult<A, E>),
+                        get changes() { return Stream.make(entry.result as AsyncResult.AsyncResult<A, E>) },
                     })),
             ),
-            onNone: () => this.start(key, initial),
+            onNone: () => this.start(key, previous),
         }))
     }
 
     start(
         key: K,
-        initial: Result.Initial | Result.Final<A, E, P>,
-    ): Effect.Effect<Subscribable.Subscribable<Result.Result<A, E, P>>, never, Scope.Scope | R> {
-        const self = this
-        return Effect.gen(function*() {
-            const [sub, fiber] = yield* Result.unsafeForkEffect<A, E, R, P>(
-                Effect.onExit(self.f(key), () => Effect.flatMap(
-                    Effect.all([Effect.fiberId, SubscriptionRef.get(self.fiberRef)]),
-                    ([currentFiberId, current]) => Option.match(current, {
-                        onSome: value => Equal.equals(currentFiberId, value.id)
-                            ? SubscriptionRef.set(self.fiberRef, Option.none())
-                            : Effect.succeed(undefined),
-                        onNone: () => Effect.succeed(undefined),
+        previous: AsyncResult.AsyncResult<A, E>,
+    ): Effect.Effect<
+        Subscribable.Subscribable<AsyncResult.AsyncResult<A, E>>,
+        never,
+        Scope.Scope | R
+    > {
+        return Effect.gen({ self: this }, function*() {
+            const state = Lens.fromSubscriptionRef(yield* SubscriptionRef.make(previous))
+
+            const fiber = yield* Effect.forkScoped(Effect.andThen(
+                Lens.update(state, AsyncResult.match({
+                    onInitial: () => AsyncResult.initial(true),
+                    onSuccess: v => AsyncResult.success(v.value, {
+                        waiting: true,
                     }),
+                    onFailure: v => AsyncResult.failure(v.cause, {
+                        waiting: true,
+                        previousSuccess: v.previousSuccess,
+                    })
+                })),
+
+                Effect.onExit(this.f(key), exit => Lens.update(
+                    state,
+                    previous => Exit.match(exit, {
+                        onSuccess: v => AsyncResult.success(v),
+                        onFailure: c => AsyncResult.match(previous, {
+                            onInitial: () => AsyncResult.failure(c),
+                            onSuccess: v => AsyncResult.failure(c, {
+                                previousSuccess: Option.some(v),
+                            }),
+                            onFailure: v => AsyncResult.failure(c, {
+                                previousSuccess: v.previousSuccess,
+                            })
+                        }),
+                    }),
+                ).pipe(
+                    Effect.andThen(Effect.all([
+                        Effect.fiberId,
+                        Lens.get(this.fiber),
+                    ])),
+                    Effect.flatMap(([fiberId, fiber]) => Option.match(fiber, {
+                        onSome: v => Equal.equals(fiberId, v.id)
+                            ? Lens.set(this.fiber, Option.none())
+                            : Effect.void,
+                        onNone: () => Effect.void,
+                    })),
                 )),
-                { initial, initialProgress: self.initialProgress },
-            )
-            yield* SubscriptionRef.set(self.fiberRef, Option.some(fiber))
-            return sub
+            ))
+
+            yield* Lens.set(this.fiber, Option.some(fiber))
+            return state
         })
     }
 
     watch(
         key: K,
-        sub: Subscribable.Subscribable<Result.Result<A, E, P>>,
-    ): Effect.Effect<Result.Final<A, E, P>, never, QueryClient.QueryClient> {
-        return Effect.flatMap(sub.get, initial => Stream.runFoldEffect(
-            Stream.takeUntil(sub.changes, result => Result.isFinal(result) && !Result.hasFlag(result)),
-            () => initial,
-            (_, result) => Effect.as(SubscriptionRef.set(this.resultRef, result), result),
-        ) as Effect.Effect<Result.Final<A, E, P>>).pipe(
-            Effect.tap(result => SubscriptionRef.set(this.latestFinalResultRef, Option.some(result))),
-            Effect.tap(result => Result.isSuccess(result)
-                ? Effect.asVoid(this.setCacheEntry(key, result))
-                : Effect.succeed(undefined)),
+        state: Subscribable.Subscribable<AsyncResult.AsyncResult<A, E>>
+    ): Effect.Effect<AsyncResult.Success<A, E> | AsyncResult.Failure<A, E>, never, QueryClient.QueryClient> {
+        return state.get.pipe(
+            Effect.flatMap(initial => Stream.runFoldEffect(
+                state.changes,
+                () => initial,
+                (_, result) => Effect.as(Lens.set(this.result, result), result),
+            ) as Effect.Effect<AsyncResult.Success<A, E> | AsyncResult.Failure<A, E>>),
+            Effect.tap(result => Lens.set(this.latestFinalResult, Option.some(result))),
+            Effect.tap(result => AsyncResult.isSuccess(result)
+                ? this.setCacheEntry(key, result)
+                : Effect.void
+            ),
         )
     }
 
@@ -211,73 +242,95 @@ extends Pipeable.Class implements Query<K, A, KE, KR, E, R, P> {
         return new QueryClient.QueryClientCacheKey(key, this.f as (key: Query.AnyKey) => Effect.Effect<unknown, unknown, unknown>)
     }
 
-    getCacheEntry(key: K): Effect.Effect<Option.Option<QueryClient.QueryClientCacheEntry>, never, QueryClient.QueryClient> {
-        return Effect.flatMap(QueryClient.QueryClient, client => client.getCacheEntry(this.makeCacheKey(key)))
+    getCacheEntry(
+        key: K
+    ): Effect.Effect<Option.Option<QueryClient.QueryClientCacheEntry>, never, QueryClient.QueryClient> {
+        return Effect.andThen(
+            Effect.all([
+                Effect.succeed(this.makeCacheKey(key)),
+                QueryClient.QueryClient,
+            ]),
+            ([key, client]) => client.getCacheEntry(key),
+        )
     }
 
-    setCacheEntry(key: K, result: Result.Success<A>): Effect.Effect<QueryClient.QueryClientCacheEntry, never, QueryClient.QueryClient> {
-        return Effect.flatMap(QueryClient.QueryClient, client => client.setCacheEntry(this.makeCacheKey(key), result, this.staleTime))
+    setCacheEntry(
+        key: K,
+        result: AsyncResult.Success<A, E>,
+    ): Effect.Effect<QueryClient.QueryClientCacheEntry, never, QueryClient.QueryClient> {
+        return Effect.flatMap(
+            Effect.all([
+                Effect.succeed(this.makeCacheKey(key)),
+                QueryClient.QueryClient,
+            ]),
+            ([key, client]) => client.setCacheEntry(key, result, this.staleTime),
+        )
     }
 
     get invalidateCache(): Effect.Effect<void> {
-        return Effect.flatMap(
-            QueryClient.QueryClient,
-            client => client.invalidateCacheEntries(this.f as (key: Query.AnyKey) => Effect.Effect<unknown, unknown, unknown>),
-        ).pipe(Effect.provide(this.context))
+        return QueryClient.QueryClient.pipe(
+            Effect.andThen(client => client.invalidateCacheEntries(this.f as (key: Query.AnyKey) => Effect.Effect<unknown, unknown, unknown>)),
+            Effect.provide(this.context),
+        )
     }
 
     invalidateCacheEntry(key: K): Effect.Effect<void> {
-        return Effect.flatMap(
+        return Effect.all([
+            Effect.succeed(this.makeCacheKey(key)),
             QueryClient.QueryClient,
-            client => client.invalidateCacheEntry(this.makeCacheKey(key)),
-        ).pipe(Effect.provide(this.context))
+        ]).pipe(
+            Effect.andThen(([key, client]) => client.invalidateCacheEntry(key)),
+            Effect.provide(this.context),
+        )
     }
 }
 
+
 export const isQuery = (u: unknown): u is Query<readonly unknown[], unknown> => Predicate.hasProperty(u, QueryTypeId)
 
+
 export declare namespace make {
-    export interface Options<K extends Query.AnyKey, A, KE = never, KR = never, E = never, R = never, P = never> {
+    export interface Options<K extends Query.AnyKey, A, KE = never, KR = never, E = never, R = never> {
         readonly key: Stream.Stream<K, KE, KR>
-        readonly f: (key: NoInfer<K>) => Effect.Effect<A, E, Result.forkEffect.InputContext<R, NoInfer<P>>>
-        readonly initialProgress?: P
+        readonly f: (key: NoInfer<K>) => Effect.Effect<A, E, R>
         readonly staleTime?: Duration.Input
         readonly refreshOnWindowFocus?: boolean
     }
 }
 
-export const make = Effect.fnUntraced(function* <K extends Query.AnyKey, A, KE = never, KR = never, E = never, R = never, P = never>(
-    options: make.Options<K, A, KE, KR, E, R, P>,
+export const make = Effect.fnUntraced(function* <K extends Query.AnyKey, A, KE = never, KR = never, E = never, R = never>(
+    options: make.Options<K, A, KE, KR, E, R>
 ): Effect.fn.Return<
-    Query<K, A, KE, KR, E, Result.forkEffect.OutputContext<R, P>, P>,
-    never,
-    Scope.Scope | QueryClient.QueryClient | KR | Result.forkEffect.OutputContext<R, P>
+    Query<K, A, KE, KR, E, R>,
+    Cause.NoSuchElementError,
+    Scope.Scope | QueryClient.QueryClient | KR | R
 > {
     const client = yield* QueryClient.QueryClient
-    return new QueryImpl<K, A, KE, KR, E, Result.forkEffect.OutputContext<R, P>, P>(
-        yield* Effect.context<Scope.Scope | QueryClient.QueryClient | KR | Result.forkEffect.OutputContext<R, P>>(),
+
+    return new QueryImpl(
+        yield* Effect.context<Scope.Scope | QueryClient.QueryClient | KR | R>(),
         options.key,
-        options.f as any,
-        options.initialProgress as P,
-        options.staleTime ?? client.defaultStaleTime,
+        options.f,
+
+        options.staleTime ? yield* Effect.fromOption(Duration.fromInput(options.staleTime)) : client.defaultStaleTime,
         options.refreshOnWindowFocus ?? client.defaultRefreshOnWindowFocus,
-        yield* SubscriptionRef.make(Option.none<K>()),
-        yield* SubscriptionRef.make(Option.none<Fiber.Fiber<A, E>>()),
-        yield* SubscriptionRef.make(Result.initial<A, E, P>()),
-        yield* SubscriptionRef.make(Option.none<Result.Final<A, E, P>>()),
+
+        Lens.fromSubscriptionRef(yield* SubscriptionRef.make(Option.none<K>())),
+        Lens.fromSubscriptionRef(yield* SubscriptionRef.make(Option.none<Fiber.Fiber<A, E>>())),
+        Lens.fromSubscriptionRef(yield* SubscriptionRef.make<AsyncResult.AsyncResult<A, E>>(AsyncResult.initial())),
+        Lens.fromSubscriptionRef(yield* SubscriptionRef.make(Option.none<AsyncResult.Success<A, E> | AsyncResult.Failure<A, E>>())),
+
         yield* Semaphore.make(1),
     )
 })
 
-export const service = <K extends Query.AnyKey, A, KE = never, KR = never, E = never, R = never, P = never>(
-    options: make.Options<K, A, KE, KR, E, R, P>,
+export const service = <K extends Query.AnyKey, A, KE = never, KR = never, E = never, R = never>(
+    options: make.Options<K, A, KE, KR, E, R>
 ): Effect.Effect<
-    Query<K, A, KE, KR, E, Result.forkEffect.OutputContext<R, P>, P>,
-    never,
-    Scope.Scope | QueryClient.QueryClient | KR | Result.forkEffect.OutputContext<R, P>
-> => Effect.tap(make(options), query => Effect.asVoid(Effect.forkScoped(query.run)))
-
-const fromSubscriptionRef = <A>(ref: SubscriptionRef.SubscriptionRef<A>): Subscribable.Subscribable<A> => Subscribable.make({
-    get: SubscriptionRef.get(ref),
-    changes: SubscriptionRef.changes(ref),
-})
+    Query<K, A, KE, KR, E, R>,
+    Cause.NoSuchElementError,
+    Scope.Scope | QueryClient.QueryClient | KR | R
+> => Effect.tap(
+    make(options),
+    query => Effect.forkScoped(query.run),
+)