Eager instantiate nested custom scoped subgraphs

packages/react-obsidian/src/graph/registry/GraphRegistry.ts

@@ -6,6 +6,7 @@ import { ObtainLifecycleBoundGraphException } from './ObtainLifecycleBoundGraphE
 import { getGlobal } from '../../utils/getGlobal';
 import { isString } from '../../utils/isString';
 import referenceCounter from '../../ReferenceCounter';
+import { isGraph } from '../ObjectGraph';
 
 export class GraphRegistry {
   private readonly constructorToInstance = new Map<Constructable<Graph>, Set<Graph>>();
@@ -106,9 +107,18 @@ export class GraphRegistry {
     });
   }
 
-  private getSubgraphsConstructors(graph: Graph): Constructable<Graph>[] {
-    const Graph = this.instanceToConstructor.get(graph)!;
-    return Array.from(this.graphToSubgraphs.get(Graph) ?? new Set());
+  private getSubgraphsConstructors(graph: Graph | Constructable<Graph>): Constructable<Graph>[] {
+    const Graph = isGraph(graph) ? graph : this.instanceToConstructor.get(graph as Graph)!;
+    const directSubgraphs = Array.from(this.graphToSubgraphs.get(Graph) ?? new Set<Constructable<Graph>>());
+    if (directSubgraphs.length === 0) return [];
+    return [
+      ...directSubgraphs,
+      ...new Set(
+        directSubgraphs
+          .map(subgraph => this.getSubgraphsConstructors(subgraph))
+          .flat(),
+      ),
+    ];
   }
 
   private getGraphConstructorByKey<T extends Graph>(key: string): Constructable<T> {

packages/react-obsidian/test/integration/customScopedLifecycleBoundGraphs.test.tsx

@@ -5,6 +5,7 @@ import {
   injectComponent,
   LifecycleBound,
   ObjectGraph,
+  Singleton,
 } from '../../src';
 import graphRegistry  from '../../src/graph/registry/GraphRegistry';
 
@@ -41,6 +42,11 @@ describe('custom scoped lifecycle-bound graphs', () => {
       render(<ComponentThatWronglyReliesOnCustomScopedGraph />);
     }).toThrow(/Cannot instantiate the scoped graph 'CustomScopeGraph' as a subgraph of 'UnscopedGraph' because the scopes do not match. undefined !== customScope/);
   });
+
+  it('eagerly instantiates nested scoped graphs', () => {
+    render(<ComponentThatReliesOnNestedCustomScopedGraph />);
+    expect(graphRegistry.isInstantiated(CustomScopeGraph)).toBe(true);
+  });
 });
 
 @LifecycleBound({scope: 'customScope'}) @Graph()
@@ -80,3 +86,16 @@ const ComponentThatWronglyReliesOnCustomScopedGraph = injectComponent(
   () => <>This should error</>,
   UnscopedGraph,
 );
+
+@Singleton() @Graph({subgraphs: [CustomScopeGraph]})
+class SingletonGraphWithCustomScopeSubgraph extends ObjectGraph {
+}
+
+@LifecycleBound({scope: 'customScope'}) @Graph({subgraphs: [SingletonGraphWithCustomScopeSubgraph]})
+class CustomScopedGraphWithNestedCustomScopeSubgraph extends ObjectGraph {
+}
+
+const ComponentThatReliesOnNestedCustomScopedGraph = injectComponent(
+  () => <>Hello</>,
+  CustomScopedGraphWithNestedCustomScopeSubgraph,
+);