Refactoring

packages/effect-fc/src/hooks/Hooks/useSubscribe.ts

@@ -1,18 +1,18 @@
-import { Effect, Equivalence, pipe, type Readable, Stream, type Subscribable } from "effect"
+import { Effect, Equivalence, pipe, Stream, type Subscribable } from "effect"
 import * as React from "react"
 import { useFork } from "./useFork.js"
 import { useOnce } from "./useOnce.js"
 
 
 export const useSubscribe: {
-    <const T extends readonly (Readable.Readable<any, any, any> & Subscribable.Subscribable<any, any, any>)[]>(
+    <const T extends readonly Subscribable.Subscribable<any, any, any>[]>(
         ...elements: T
     ): Effect.Effect<
         { [K in keyof T]: Effect.Effect.Success<T[K]["get"]> | Stream.Stream.Success<T[K]["changes"]> },
         Effect.Effect.Error<T[number]["get"]> | Stream.Stream.Error<T[number]["changes"]>,
         Effect.Effect.Context<T[number]["get"]> | Stream.Stream.Context<T[number]["changes"]>
     >
-} = Effect.fnUntraced(function* <const T extends readonly (Readable.Readable<any, any, any> & Subscribable.Subscribable<any, any, any>)[]>(
+} = Effect.fnUntraced(function* <const T extends readonly Subscribable.Subscribable<any, any, any>[]>(
     ...elements: T
 ) {
     const [reactStateValue, setReactStateValue] = React.useState(yield* useOnce(() =>

packages/effect-fc/src/types/PropertyPath.ts

@@ -38,8 +38,7 @@ export type ValueFromPath<T, P extends any[]> = P extends [infer Head, ...infer
             : never
     : T
 
-export type AnyKey = string | number | symbol
-export type AnyPath = readonly AnyKey[]
+export type AnyPath = readonly PropertyKey[]
 
 
 export const unsafeGet: {

packages/effect-fc/src/types/SubscriptionSubRef.ts

@@ -1,4 +1,4 @@
-import { Chunk, Effect, Effectable, Option, Readable, Ref, Stream, Subscribable, SubscriptionRef, SynchronizedRef, type Types, type Unify } from "effect"
+import { Chunk, Effect, Effectable, Option, type Predicate, Readable, Ref, Stream, Subscribable, SubscriptionRef, SynchronizedRef, type Types, type Unify } from "effect"
 import * as PropertyPath from "./PropertyPath.js"
 
 
@@ -7,7 +7,7 @@ export type SubscriptionSubRefTypeId = typeof SubscriptionSubRefTypeId
 
 export interface SubscriptionSubRef<in out A, in out B extends SubscriptionRef.SubscriptionRef<any>>
 extends SubscriptionSubRef.Variance<A, B>, SubscriptionRef.SubscriptionRef<A> {
-    readonly parent: SubscriptionRef.SubscriptionRef<B>
+    readonly parent: B
 
     readonly [Unify.typeSymbol]?: unknown
     readonly [Unify.unifySymbol]?: SubscriptionSubRefUnify<this>
@@ -105,7 +105,7 @@ export const makeFromPath = <
     (parentValue, value) => Option.getOrThrow(PropertyPath.immutableSet(parentValue, path, value)),
 )
 
-export const makeFromChunkRef: {
+export const makeFromChunkIndex: {
     <B extends SubscriptionRef.SubscriptionRef<Chunk.NonEmptyChunk<any>>>(
         parent: B,
         index: number,
@@ -128,3 +128,30 @@ export const makeFromChunkRef: {
     parentValue => Chunk.unsafeGet(parentValue, index),
     (parentValue, value) => Chunk.replace(parentValue, index, value),
 ) as any
+
+export const makeFromChunkFindFirst: {
+    <B extends SubscriptionRef.SubscriptionRef<Chunk.NonEmptyChunk<any>>>(
+        parent: B,
+        findFirstPredicate: Predicate.Predicate<Effect.Effect.Success<B> extends Chunk.NonEmptyChunk<infer A> ? A : never>,
+    ): SubscriptionSubRef<
+        Effect.Effect.Success<B> extends Chunk.NonEmptyChunk<infer A> ? A : never,
+        B
+    >
+    <B extends SubscriptionRef.SubscriptionRef<Chunk.Chunk<any>>>(
+        parent: B,
+        findFirstPredicate: Predicate.Predicate<Effect.Effect.Success<B> extends Chunk.Chunk<infer A> ? A : never>,
+    ): SubscriptionSubRef<
+        Effect.Effect.Success<B> extends Chunk.Chunk<infer A> ? A : never,
+        B
+    >
+} = (
+    parent: SubscriptionRef.SubscriptionRef<Chunk.Chunk<never>>,
+    findFirstPredicate: Predicate.Predicate.Any,
+) => new SubscriptionSubRefImpl(
+    parent,
+    parentValue => Option.getOrThrow(Chunk.findFirst(parentValue, findFirstPredicate)),
+    (parentValue, value) => Option.getOrThrow(Option.andThen(
+        Chunk.findFirstIndex(parentValue, findFirstPredicate),
+        index => Chunk.replace(parentValue, index, value),
+    )),
+) as any