0.1.13 #18
@@ -8,7 +8,7 @@ import { QueryState } from "./internal/index.js"
|
|||||||
|
|
||||||
export interface QueryRunner<K extends readonly unknown[], A, E> {
|
export interface QueryRunner<K extends readonly unknown[], A, E> {
|
||||||
readonly queryKey: Stream.Stream<K>
|
readonly queryKey: Stream.Stream<K>
|
||||||
readonly latestKeyRef: SubscriptionRef.SubscriptionRef<Option.Option<K>>
|
readonly latestKeyValueRef: SubscriptionRef.SubscriptionRef<Option.Option<K>>
|
||||||
readonly stateRef: SubscriptionRef.SubscriptionRef<AsyncData.AsyncData<A, E>>
|
readonly stateRef: SubscriptionRef.SubscriptionRef<AsyncData.AsyncData<A, E>>
|
||||||
readonly fiberRef: SubscriptionRef.SubscriptionRef<Option.Option<Fiber.RuntimeFiber<
|
readonly fiberRef: SubscriptionRef.SubscriptionRef<Option.Option<Fiber.RuntimeFiber<
|
||||||
AsyncData.Success<A> | AsyncData.Failure<E>,
|
AsyncData.Success<A> | AsyncData.Failure<E>,
|
||||||
@@ -17,8 +17,8 @@ export interface QueryRunner<K extends readonly unknown[], A, E> {
|
|||||||
|
|
||||||
readonly interrupt: Effect.Effect<void>
|
readonly interrupt: Effect.Effect<void>
|
||||||
readonly forkInterrupt: Effect.Effect<Fiber.RuntimeFiber<void>>
|
readonly forkInterrupt: Effect.Effect<Fiber.RuntimeFiber<void>>
|
||||||
readonly forkFetch: Effect.Effect<readonly [
|
readonly forkFetch: (keyValue: K) => Effect.Effect<readonly [
|
||||||
fiber: Fiber.RuntimeFiber<AsyncData.Success<A> | AsyncData.Failure<E>, Cause.NoSuchElementException>,
|
fiber: Fiber.RuntimeFiber<AsyncData.Success<A> | AsyncData.Failure<E>>,
|
||||||
state: Stream.Stream<AsyncData.AsyncData<A, E>>,
|
state: Stream.Stream<AsyncData.AsyncData<A, E>>,
|
||||||
]>
|
]>
|
||||||
readonly forkRefresh: Effect.Effect<readonly [
|
readonly forkRefresh: Effect.Effect<readonly [
|
||||||
@@ -52,7 +52,7 @@ export const make = <K extends readonly unknown[], A, FallbackA, E, HandledE, R>
|
|||||||
> => Effect.gen(function*() {
|
> => Effect.gen(function*() {
|
||||||
const context = yield* Effect.context<R | QueryClient.TagClassShape<FallbackA, HandledE>>()
|
const context = yield* Effect.context<R | QueryClient.TagClassShape<FallbackA, HandledE>>()
|
||||||
|
|
||||||
const latestKeyRef = yield* SubscriptionRef.make(Option.none<K>())
|
const latestKeyValueRef = yield* SubscriptionRef.make(Option.none<K>())
|
||||||
const stateRef = yield* SubscriptionRef.make(AsyncData.noData<A | FallbackA, Exclude<E, HandledE>>())
|
const stateRef = yield* SubscriptionRef.make(AsyncData.noData<A | FallbackA, Exclude<E, HandledE>>())
|
||||||
const fiberRef = yield* SubscriptionRef.make(Option.none<Fiber.RuntimeFiber<
|
const fiberRef = yield* SubscriptionRef.make(Option.none<Fiber.RuntimeFiber<
|
||||||
AsyncData.Success<A | FallbackA> | AsyncData.Failure<Exclude<E, HandledE>>,
|
AsyncData.Success<A | FallbackA> | AsyncData.Failure<Exclude<E, HandledE>>,
|
||||||
@@ -78,20 +78,13 @@ export const make = <K extends readonly unknown[], A, FallbackA, E, HandledE, R>
|
|||||||
onNone: () => Effect.forkDaemon(Effect.void),
|
onNone: () => Effect.forkDaemon(Effect.void),
|
||||||
}))
|
}))
|
||||||
|
|
||||||
const run = Effect.Do.pipe(
|
const run = (keyValue: K) => Effect.all([QueryClient, queryStateTag]).pipe(
|
||||||
Effect.bind("state", () => queryStateTag),
|
Effect.flatMap(([client, state]) => Ref.set(latestKeyValueRef, Option.some(keyValue)).pipe(
|
||||||
Effect.bind("client", () => QueryClient),
|
Effect.andThen(query(keyValue)),
|
||||||
Effect.bind("latestKey", () => latestKeyRef.pipe(Effect.flatMap(identity))),
|
|
||||||
|
|
||||||
Effect.flatMap(({ state, client, latestKey }) => query(latestKey).pipe(
|
|
||||||
client.errorHandler.handle,
|
client.errorHandler.handle,
|
||||||
Effect.matchCauseEffect({
|
Effect.matchCauseEffect({
|
||||||
onSuccess: v => Effect.succeed(AsyncData.success(v)).pipe(
|
onSuccess: v => Effect.tap(Effect.succeed(AsyncData.success(v)), state.set),
|
||||||
Effect.tap(state.set)
|
onFailure: c => Effect.tap(Effect.succeed(AsyncData.failure(c)), state.set),
|
||||||
),
|
|
||||||
onFailure: c => Effect.succeed(AsyncData.failure(c)).pipe(
|
|
||||||
Effect.tap(state.set)
|
|
||||||
),
|
|
||||||
}),
|
}),
|
||||||
)),
|
)),
|
||||||
|
|
||||||
@@ -99,17 +92,20 @@ export const make = <K extends readonly unknown[], A, FallbackA, E, HandledE, R>
|
|||||||
Effect.provide(QueryProgress.QueryProgress.Default),
|
Effect.provide(QueryProgress.QueryProgress.Default),
|
||||||
)
|
)
|
||||||
|
|
||||||
const forkFetch = Queue.unbounded<AsyncData.AsyncData<A | FallbackA, Exclude<E, HandledE>>>().pipe(
|
const forkFetch = (keyValue: K) => Queue.unbounded<AsyncData.AsyncData<A | FallbackA, Exclude<E, HandledE>>>().pipe(
|
||||||
Effect.flatMap(stateQueue => queryStateTag.pipe(
|
Effect.flatMap(stateQueue => queryStateTag.pipe(
|
||||||
Effect.flatMap(state => interrupt.pipe(
|
Effect.flatMap(state => interrupt.pipe(
|
||||||
Effect.andThen(Effect.addFinalizer(() => Ref.set(fiberRef, Option.none()).pipe(
|
Effect.andThen(
|
||||||
Effect.andThen(Queue.shutdown(stateQueue))
|
Effect.addFinalizer(() => Effect.andThen(
|
||||||
|
Ref.set(fiberRef, Option.none()),
|
||||||
|
Queue.shutdown(stateQueue),
|
||||||
)).pipe(
|
)).pipe(
|
||||||
Effect.andThen(state.set(AsyncData.loading())),
|
Effect.andThen(state.set(AsyncData.loading())),
|
||||||
Effect.andThen(run),
|
Effect.andThen(run(keyValue)),
|
||||||
Effect.scoped,
|
Effect.scoped,
|
||||||
Effect.forkDaemon,
|
Effect.forkDaemon,
|
||||||
)),
|
)
|
||||||
|
),
|
||||||
|
|
||||||
Effect.tap(fiber => Ref.set(fiberRef, Option.some(fiber))),
|
Effect.tap(fiber => Ref.set(fiberRef, Option.some(fiber))),
|
||||||
Effect.map(fiber => [fiber, Stream.fromQueue(stateQueue)] as const),
|
Effect.map(fiber => [fiber, Stream.fromQueue(stateQueue)] as const),
|
||||||
@@ -118,8 +114,9 @@ export const make = <K extends readonly unknown[], A, FallbackA, E, HandledE, R>
|
|||||||
Effect.provide(QueryState.layer(
|
Effect.provide(QueryState.layer(
|
||||||
queryStateTag,
|
queryStateTag,
|
||||||
stateRef,
|
stateRef,
|
||||||
value => Queue.offer(stateQueue, value).pipe(
|
value => Effect.andThen(
|
||||||
Effect.andThen(Ref.set(stateRef, value))
|
Queue.offer(stateQueue, value),
|
||||||
|
Ref.set(stateRef, value),
|
||||||
),
|
),
|
||||||
)),
|
)),
|
||||||
))
|
))
|
||||||
@@ -135,14 +132,20 @@ export const make = <K extends readonly unknown[], A, FallbackA, E, HandledE, R>
|
|||||||
|
|
||||||
const forkRefresh = Queue.unbounded<AsyncData.AsyncData<A | FallbackA, Exclude<E, HandledE>>>().pipe(
|
const forkRefresh = Queue.unbounded<AsyncData.AsyncData<A | FallbackA, Exclude<E, HandledE>>>().pipe(
|
||||||
Effect.flatMap(stateQueue => interrupt.pipe(
|
Effect.flatMap(stateQueue => interrupt.pipe(
|
||||||
Effect.andThen(Effect.addFinalizer(() => Ref.set(fiberRef, Option.none()).pipe(
|
Effect.andThen(
|
||||||
Effect.andThen(Queue.shutdown(stateQueue))
|
Effect.addFinalizer(() => Effect.andThen(
|
||||||
|
Ref.set(fiberRef, Option.none()),
|
||||||
|
Queue.shutdown(stateQueue),
|
||||||
)).pipe(
|
)).pipe(
|
||||||
Effect.andThen(setInitialRefreshState),
|
Effect.andThen(setInitialRefreshState),
|
||||||
Effect.andThen(run),
|
Effect.andThen(latestKeyValueRef.pipe(
|
||||||
|
Effect.flatMap(identity),
|
||||||
|
Effect.flatMap(run),
|
||||||
|
)),
|
||||||
Effect.scoped,
|
Effect.scoped,
|
||||||
Effect.forkDaemon,
|
Effect.forkDaemon,
|
||||||
)),
|
)
|
||||||
|
),
|
||||||
|
|
||||||
Effect.tap(fiber => Ref.set(fiberRef, Option.some(fiber))),
|
Effect.tap(fiber => Ref.set(fiberRef, Option.some(fiber))),
|
||||||
Effect.map(fiber => [fiber, Stream.fromQueue(stateQueue)] as const),
|
Effect.map(fiber => [fiber, Stream.fromQueue(stateQueue)] as const),
|
||||||
@@ -150,8 +153,9 @@ export const make = <K extends readonly unknown[], A, FallbackA, E, HandledE, R>
|
|||||||
Effect.provide(QueryState.layer(
|
Effect.provide(QueryState.layer(
|
||||||
queryStateTag,
|
queryStateTag,
|
||||||
stateRef,
|
stateRef,
|
||||||
value => Queue.offer(stateQueue, value).pipe(
|
value => Effect.andThen(
|
||||||
Effect.andThen(Ref.set(stateRef, value))
|
Queue.offer(stateQueue, value),
|
||||||
|
Ref.set(stateRef, value),
|
||||||
),
|
),
|
||||||
)),
|
)),
|
||||||
))
|
))
|
||||||
@@ -159,7 +163,7 @@ export const make = <K extends readonly unknown[], A, FallbackA, E, HandledE, R>
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
queryKey: key,
|
queryKey: key,
|
||||||
latestKeyRef,
|
latestKeyValueRef,
|
||||||
stateRef,
|
stateRef,
|
||||||
fiberRef,
|
fiberRef,
|
||||||
|
|
||||||
@@ -178,16 +182,12 @@ export interface RunOptions {
|
|||||||
export const run = <K extends readonly unknown[], A, E>(
|
export const run = <K extends readonly unknown[], A, E>(
|
||||||
self: QueryRunner<K, A, E>,
|
self: QueryRunner<K, A, E>,
|
||||||
options?: RunOptions,
|
options?: RunOptions,
|
||||||
): Effect.Effect<void, Error | Cause.NoSuchElementException, Scope.Scope> => Effect.gen(function*() {
|
): Effect.Effect<void, never, Scope.Scope> => Effect.gen(function*() {
|
||||||
if (typeof window !== "undefined" && (options?.refreshOnWindowFocus ?? true))
|
if (typeof window !== "undefined" && (options?.refreshOnWindowFocus ?? true))
|
||||||
yield* Effect.forkScoped(
|
yield* Effect.forkScoped(
|
||||||
Stream.runForEach(BrowserStream.fromEventListenerWindow("focus"), () => self.forkRefresh)
|
Stream.runForEach(BrowserStream.fromEventListenerWindow("focus"), () => self.forkRefresh)
|
||||||
)
|
)
|
||||||
|
|
||||||
yield* Effect.addFinalizer(() => self.interrupt)
|
yield* Effect.addFinalizer(() => self.interrupt)
|
||||||
yield* Stream.runForEach(Stream.changes(self.queryKey), latestKey =>
|
yield* Stream.runForEach(Stream.changes(self.queryKey), latestKey => self.forkFetch(latestKey))
|
||||||
Ref.set(self.latestKeyRef, Option.some(latestKey)).pipe(
|
|
||||||
Effect.andThen(self.forkFetch)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user