Thilawyn/effect-fc
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Refactor query
All checks were successful
Lint / lint (push) Successful in 12s
Details

Browse Source
This commit is contained in:
Julien Valverdé
2026-01-15 22:19:56 +01:00
parent 731eed4209
commit dad4cd60d1
2 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/effect-fc/src/Mutation.ts
View File

@@ -72,7 +72,7 @@ extends Pipeable.Class() implements Mutation<K, A, E, R, P> {
? SubscriptionRef.set(this.fiber, Option.none())
: Effect.void,
onNone: () => Effect.void,
})
}),
)),
{

56
packages/effect-fc/src/Query.ts
View File

@@ -1,4 +1,4 @@
import { type Cause, type Context, DateTime, type Duration, Effect, Equivalence, Exit, Fiber, HashMap, identity, Option, Pipeable, Predicate, type Scope, Stream, Subscribable, SubscriptionRef } from "effect"
import { type Cause, type Context, DateTime, type Duration, Effect, Equal, Equivalence, Fiber, HashMap, identity, Option, Pipeable, Predicate, type Scope, Stream, Subscribable, SubscriptionRef } from "effect"
import * as QueryClient from "./QueryClient.js"
import * as Result from "./Result.js"
@@ -67,7 +67,7 @@ extends Pipeable.Class() implements Query<K, A, E, R, P> {
? Result.willFetch(previous.value) as Result.Final<A, E, P>
: Result.initial()
)),
Effect.andThen(sub => Effect.forkScoped(this.watch(sub))),
Effect.andThen(sub => Effect.forkScoped(this.watch(key, sub))),
this.runSemaphore.withPermits(1),
)),
this.context,
@@ -89,7 +89,7 @@ extends Pipeable.Class() implements Query<K, A, E, R, P> {
? Result.willFetch(previous.value) as Result.Final<A, E, P>
: Result.initial()
)),
Effect.andThen(sub => this.watch(sub)),
Effect.andThen(sub => this.watch(key, sub)),
Effect.provide(this.context),
)
}
@@ -102,7 +102,7 @@ extends Pipeable.Class() implements Query<K, A, E, R, P> {
? Result.willFetch(previous.value) as Result.Final<A, E, P>
: Result.initial()
)),
Effect.tap(sub => Effect.forkScoped(this.watch(sub))),
Effect.tap(sub => Effect.forkScoped(this.watch(key, sub))),
Effect.provide(this.context),
)
}
@@ -112,11 +112,13 @@ extends Pipeable.Class() implements Query<K, A, E, R, P> {
Effect.andThen(Effect.Do),
Effect.bind("latestKey", () => Effect.andThen(this.latestKey, identity)),
Effect.bind("latestFinalResult", () => this.latestFinalResult),
Effect.andThen(({ latestKey, latestFinalResult }) => this.startCached(latestKey, Option.isSome(latestFinalResult)
? Result.willRefresh(latestFinalResult.value) as Result.Final<A, E, P>
: Result.initial()
)),
Effect.andThen(sub => this.watch(sub)),
Effect.bind("subscribable", ({ latestKey, latestFinalResult }) =>
this.startCached(latestKey, Option.isSome(latestFinalResult)
? Result.willRefresh(latestFinalResult.value) as Result.Final<A, E, P>
: Result.initial()
)
),
Effect.andThen(({ latestKey, subscribable }) => this.watch(latestKey, subscribable)),
Effect.provide(this.context),
)
}
@@ -129,11 +131,14 @@ extends Pipeable.Class() implements Query<K, A, E, R, P> {
Effect.andThen(Effect.Do),
Effect.bind("latestKey", () => Effect.andThen(this.latestKey, identity)),
Effect.bind("latestFinalResult", () => this.latestFinalResult),
Effect.andThen(({ latestKey, latestFinalResult }) => this.startCached(latestKey, Option.isSome(latestFinalResult)
? Result.willRefresh(latestFinalResult.value) as Result.Final<A, E, P>
: Result.initial()
)),
Effect.tap(sub => Effect.forkScoped(this.watch(sub))),
Effect.bind("subscribable", ({ latestKey, latestFinalResult }) =>
this.startCached(latestKey, Option.isSome(latestFinalResult)
? Result.willRefresh(latestFinalResult.value) as Result.Final<A, E, P>
: Result.initial()
)
),
Effect.tap(({ latestKey, subscribable }) => Effect.forkScoped(this.watch(latestKey, subscribable))),
Effect.map(({ subscribable }) => subscribable),
Effect.provide(this.context),
)
}
@@ -166,15 +171,19 @@ extends Pipeable.Class() implements Query<K, A, E, R, P> {
): Effect.Effect<
Subscribable.Subscribable<Result.Result<A, E, P>>,
never,
Scope.Scope | QueryClient.QueryClient | R
Scope.Scope | R
> {
return Result.unsafeForkEffect(
Effect.onExit(this.f(key), exit => Effect.andThen(
SubscriptionRef.set(this.fiber, Option.none()),
Exit.isSuccess(exit)
? this.updateCacheEntry(key, Result.fromExit(exit))
: Effect.void,
Effect.onExit(this.f(key), () => Effect.andThen(
Effect.all([Effect.fiberId, this.fiber]),
([currentFiberId, fiber]) => Option.match(fiber, {
onSome: v => Equal.equals(currentFiberId, v.id())
? SubscriptionRef.set(this.fiber, Option.none())
: Effect.void,
onNone: () => Effect.void,
}),
)),
{
initial,
initialProgress: this.initialProgress,
@@ -186,8 +195,9 @@ extends Pipeable.Class() implements Query<K, A, E, R, P> {
}
watch(
key: K,
sub: Subscribable.Subscribable<Result.Result<A, E, P>>
): Effect.Effect<Result.Final<A, E, P>> {
): Effect.Effect<Result.Final<A, E, P>, never, QueryClient.QueryClient> {
return sub.get.pipe(
Effect.andThen(initial => Stream.runFoldEffect(
sub.changes,
@@ -195,6 +205,10 @@ extends Pipeable.Class() implements Query<K, A, E, R, P> {
(_, result) => Effect.as(SubscriptionRef.set(this.result, result), result),
) as Effect.Effect<Result.Final<A, E, P>>),
Effect.tap(result => SubscriptionRef.set(this.latestFinalResult, Option.some(result))),
Effect.tap(result => Result.isSuccess(result)
? this.updateCacheEntry(key, result)
: Effect.void
),
)
}