fix(context): normalize Rsdoctor module relations

Author: ScriptedAlchemy

packages/context/src/rsdoctorGraph.ts

@@ -150,20 +150,35 @@ const normalizeRsdoctorModuleGraph = (artifact: RsdoctorArtifact): ObservedModul
 
   const edgeKeys = new Set<string>();
   const edges: ObservedModuleGraph['edges'] = [];
-  for (const row of Array.isArray(moduleGraph.dependencies) ? moduleGraph.dependencies : []) {
-    if (!isObject(row)) continue;
-    const usesDependencyShape = Object.hasOwn(row, 'dependency');
-    const from = getId(usesDependencyShape ? row.module : row.issuer);
-    const to = getId(usesDependencyShape ? row.dependency : row.module);
-    if (from === undefined || to === undefined) continue;
+  const addEdge = (from: string | undefined, to: string | undefined): void => {
+    if (from === undefined || to === undefined) return;
     if (!modulesById.has(from) || !modulesById.has(to)) {
       if (!issues.includes('dangling-edge')) issues.push('dangling-edge');
-      continue;
+      return;
     }
     const key = `${from}\u0000${to}`;
-    if (edgeKeys.has(key)) continue;
+    if (edgeKeys.has(key)) return;
     edgeKeys.add(key);
     edges.push({ from, to });
+  };
+  for (const row of Array.isArray(moduleGraph.dependencies) ? moduleGraph.dependencies : []) {
+    if (!isObject(row)) continue;
+    const usesDependencyShape = Object.hasOwn(row, 'dependency');
+    addEdge(
+      getId(usesDependencyShape ? row.module : row.issuer),
+      getId(usesDependencyShape ? row.dependency : row.module),
+    );
+  }
+
+  for (const row of Array.isArray(moduleGraph.modules) ? moduleGraph.modules : []) {
+    if (!isObject(row)) continue;
+    const moduleId = getId(row.id);
+    for (const importerId of Array.isArray(row.imported) ? row.imported.map(getId) : []) {
+      addEdge(importerId, moduleId);
+    }
+    for (const childId of Array.isArray(row.modules) ? row.modules.map(getId) : []) {
+      addEdge(moduleId, childId);
+    }
   }
 
   return {

packages/context/tests/rsdoctorGraph.test.ts

@@ -194,6 +194,50 @@ test('inherits chunk membership from a concatenated module container', async ()
   }
 });
 
+test('connects module importers and concatenated children for reachability', async () => {
+  const workspaceRoot = await mkdtemp(path.join(os.tmpdir(), 'rstack-rsdoctor-graph-'));
+  try {
+    await writeFile(
+      path.join(workspaceRoot, 'rsdoctor-data.json'),
+      JSON.stringify({
+        data: {
+          moduleGraph: {
+            modules: [
+              {
+                id: 1,
+                path: '/workspace/src/index.ts',
+                isEntry: true,
+                imported: [],
+                modules: [2],
+              },
+              {
+                id: 2,
+                path: '/workspace/src/feature.ts',
+                imported: [3],
+              },
+              {
+                id: 3,
+                path: '/workspace/src/consumer.ts',
+                imported: [],
+              },
+            ],
+            dependencies: [],
+          },
+        },
+      }),
+    );
+
+    const graph = await readRsdoctorModuleGraph(workspaceRoot, 'rsdoctor-data.json');
+
+    expect(graph.edges).toEqual([
+      { from: '1', to: '2' },
+      { from: '3', to: '2' },
+    ]);
+  } finally {
+    await rm(workspaceRoot, { force: true, recursive: true });
+  }
+});
+
 test('reports a missing module graph as insufficient ordinary artifact data', async () => {
   const workspaceRoot = await mkdtemp(path.join(os.tmpdir(), 'rstack-rsdoctor-graph-'));
   try {