Fix

Co-authored-by: Julien Valverdé <julien.valverde@mailo.com>
Reviewed-on: https://gitea:3000/Thilawyn/reffuse/pulls/18

packages/example/src/routes/tests.tsx

@@ -6,6 +6,16 @@ import { Console, Effect, Option } from "effect"
 import { useEffect, useState } from "react"
 
 
+interface Node {
+    value: string
+    left?: Leaf
+    right?: Leaf
+}
+interface Leaf {
+    node: Node
+}
+
+
 const makeUuid = Effect.provide(makeUuid4, GetRandomValues.CryptoRandom)
 
 
@@ -32,6 +42,11 @@ function RouteComponent() {
         runSync,
     ), [scopeLayer, runSync])
 
+
+    const nodeRef = R.useRef(() => Effect.succeed<Node>({ value: "prout" }))
+    const nodeValueRef = R.useSubRefFromPath(nodeRef, ["value"])
+
+
     return (
         <Flex direction="column" justify="center" align="center" gap="2">
             <Text>{uuid}</Text>

packages/reffuse/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reffuse",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "type": "module",
   "files": [
     "./README.md",

packages/reffuse/src/ReffuseNamespace.ts

@@ -426,7 +426,7 @@ export abstract class ReffuseNamespace<R> {
     ): SubscriptionSubRef.SubscriptionSubRef<PropertyPath.ValueFromPath<B, P>, B> {
         return React.useMemo(
             () => SubscriptionSubRef.makeFromPath(parent, path),
-            [parent],
+            [parent, ...path],
         )
     }
 

packages/reffuse/src/types/PropertyPath.ts

@@ -1,24 +1,29 @@
 import { Array, Function, Option, Predicate } from "effect"
 
 
-export type Paths<T> = [] | (
+type Prev = readonly [never, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-    T extends readonly any[] ? ArrayPaths<T> :
+
-    T extends object ? ObjectPaths<T> :
+export type Paths<T, D extends number = 5, Seen = never> = [] | (
+    D extends never ? [] :
+    T extends Seen ? [] :
+    T extends readonly any[] ? ArrayPaths<T, D, Seen | T> :
+    T extends object ? ObjectPaths<T, D, Seen | T> :
     never
 )
 
-export type ArrayPaths<T extends readonly any[]> = {
+export type ArrayPaths<T extends readonly any[], D extends number, Seen> = {
     [K in keyof T as K extends number ? K : never]:
         | [K]
-        | [K, ...Paths<T[K]>]
+        | [K, ...Paths<T[K], Prev[D], Seen>]
 } extends infer O
     ? O[keyof O]
     : never
 
-export type ObjectPaths<T extends object> = {
+export type ObjectPaths<T extends object, D extends number, Seen> = {
-    [K in keyof T as K extends string | number | symbol ? K : never]:
+    [K in keyof T as K extends string | number | symbol ? K : never]-?:
-        | [K]
+        NonNullable<T[K]> extends infer V
-        | [K, ...Paths<T[K]>]
+            ? [K] | [K, ...Paths<V, Prev[D], Seen>]
+            : never
 } extends infer O
     ? O[keyof O]
     : never