Query work

packages/extension-query/src/QueryExtension.ts

@@ -1,13 +1,13 @@
 import * as AsyncData from "@typed/async-data"
-import { Array, Context, Effect, ExecutionStrategy, Fiber, Layer, Ref, Schema, Stream, SubscriptionRef } from "effect"
+import { Context, Effect, Fiber, Layer, Ref, Stream, SubscriptionRef } from "effect"
 import * as React from "react"
 import { ReffuseExtension, type ReffuseHelpers } from "reffuse"
 import * as QueryRunner from "./QueryRunner.js"
 import * as QueryService from "./QueryService.js"
 
 
-export interface UseQueryProps<A, E, R> {
-    readonly key: Stream.Stream<readonly unknown[]> | readonly unknown[]
+export interface UseQueryProps<K extends readonly unknown[], A, E, R> {
+    readonly key: Stream.Stream<K>
     readonly query: () => Effect.Effect<A, E, R>
     readonly refreshOnWindowFocus?: boolean
 }
@@ -22,29 +22,22 @@ export interface UseQueryResult<A, E> {
 
 
 export const QueryExtension = ReffuseExtension.make(() => ({
-    useQuery<A, E, R>(
+    useQuery<K extends readonly unknown[], A, E, R>(
         this: ReffuseHelpers.ReffuseHelpers<R>,
-        props: UseQueryProps<A, E, R>,
+        props: UseQueryProps<K, A, E, R>,
     ): UseQueryResult<A, E> {
         const runner = this.useMemo(() => QueryRunner.make({
-            query: props.query()
-        }), [])
+            key: props.key,
+            query: props.query(),
+        }), [props.key])
 
-        const key = React.useMemo(() =>
-            (Array.isArray as (self: unknown) => self is readonly unknown[])(props.key)
-                ? props.key
-                : props.key,
-        [props.key])
-
-        this.useEffect(
-            () => Effect.addFinalizer(() => runner.forkInterrupt).pipe(
-                Effect.andThen(Ref.set(runner.queryRef, props.query())),
-                Effect.andThen(runner.forkFetch),
-            ),
-
-            [runner, ...(Array.isArray(props.key) ? props.key : [])],
-            { finalizerExecutionStrategy: ExecutionStrategy.parallel },
-        )
+        this.useFork(() => Effect.addFinalizer(() => runner.forkInterrupt).pipe(
+            Effect.andThen(Stream.runForEach(runner.key, () =>
+                Ref.set(runner.queryRef, props.query()).pipe(
+                    Effect.andThen(runner.forkFetch)
+                )
+            ))
+        ), [runner])
 
         this.useFork(() => (props.refreshOnWindowFocus ?? true)
             ? runner.refreshOnWindowFocus

packages/extension-query/src/QueryRunner.ts

@@ -3,7 +3,8 @@ import * as AsyncData from "@typed/async-data"
 import { Effect, Fiber, identity, Option, Ref, Stream, SubscriptionRef } from "effect"
 
 
-export interface QueryRunner<A, E, R> {
+export interface QueryRunner<K extends readonly unknown[], A, E, R> {
+    readonly key: Stream.Stream<K>
     readonly queryRef: SubscriptionRef.SubscriptionRef<Effect.Effect<A, E, R>>
     readonly stateRef: SubscriptionRef.SubscriptionRef<AsyncData.AsyncData<A, E>>
     readonly fiberRef: SubscriptionRef.SubscriptionRef<Option.Option<Fiber.RuntimeFiber<void>>>
@@ -16,13 +17,14 @@ export interface QueryRunner<A, E, R> {
 }
 
 
-export interface MakeProps<A, E, R> {
+export interface MakeProps<K extends readonly unknown[], A, E, R> {
+    readonly key: Stream.Stream<K>
     readonly query: Effect.Effect<A, E, R>
 }
 
-export const make = <A, E, R>(
-    props: MakeProps<A, E, R>
-): Effect.Effect<QueryRunner<A, E, R>, never, R> => Effect.gen(function*() {
+export const make = <K extends readonly unknown[], A, E, R>(
+    props: MakeProps<K, A, E, R>
+): Effect.Effect<QueryRunner<K, A, E, R>, never, R> => Effect.gen(function*() {
     const context = yield* Effect.context<R>()
 
     const queryRef = yield* SubscriptionRef.make(props.query)
@@ -112,6 +114,7 @@ export const make = <A, E, R>(
     )
 
     return {
+        key: props.key,
         queryRef,
         stateRef,
         fiberRef,

packages/extension-query/src/QueryService.ts

@@ -1,6 +1,5 @@
 import * as AsyncData from "@typed/async-data"
-import { Context, Effect, Fiber, Layer, SubscriptionRef } from "effect"
-import * as QueryRunner from "./QueryRunner.js"
+import { Effect, Fiber, SubscriptionRef } from "effect"
 
 
 export interface QueryService<A, E> {
@@ -13,20 +12,20 @@ export const Tag = <const Id extends string>(id: Id) => <
 >() => Effect.Tag(id)<Self, QueryService<A, E>>()
 
 
-export interface LayerProps<A, E, R> {
-    readonly query: Effect.Effect<A, E, R>
-}
+// export interface LayerProps<A, E, R> {
+//     readonly query: Effect.Effect<A, E, R>
+// }
 
-export const layer = <Self, Id extends string, A, E, R>(
-    tag: Context.TagClass<Self, Id, QueryService<A, E>>,
-    props: LayerProps<A, E, R>,
-): Layer.Layer<Self, never, R> => Layer.effect(tag, Effect.gen(function*() {
-    const runner = yield* QueryRunner.make({
-        query: props.query
-    })
+// export const layer = <Self, Id extends string, A, E, R>(
+//     tag: Context.TagClass<Self, Id, QueryService<A, E>>,
+//     props: LayerProps<A, E, R>,
+// ): Layer.Layer<Self, never, R> => Layer.effect(tag, Effect.gen(function*() {
+//     const runner = yield* QueryRunner.make({
+//         query: props.query
+//     })
 
-    return {
-        state: runner.stateRef,
-        refresh: runner.forkRefresh,
-    }
-}))
+//     return {
+//         state: runner.stateRef,
+//         refresh: runner.forkRefresh,
+//     }
+// }))