1 files changed, 29 insertions, 8 deletions
diff --git a/Omni/Bild.hs b/Omni/Bild.hs
index e8c2f09..078aac1 100644
--- a/Omni/Bild.hs
+++ b/Omni/Bild.hs
@@ -178,7 +178,8 @@ main = Cli.Plan help move test_ pure |> Cli.main
           test_bildExamples,
           test_isGitIgnored,
           test_isGitHook,
-          test_detectPythonImports
+          test_detectPythonImports,
+          test_buildHsModuleGraph
         ]
 
 test_bildBild :: Test.Tree
@@ -645,7 +646,7 @@ analyzeAll nss = do
             |> Meta.detectAll "--"
             |> \Meta.Parsed {..} ->
               detectHaskellImports mempty contentLines +> \(langdeps, srcs) -> do
-                graph <- buildHsModuleGraph namespace srcs
+                graph <- buildHsModuleGraph namespace quapath srcs
                 pure
                   <| Just
                     Target
@@ -921,6 +922,23 @@ test_detectPythonImports =
         Set.fromList ["Omni/Log.py"] @=? set
     ]
 
+test_buildHsModuleGraph :: Test.Tree
+test_buildHsModuleGraph =
+  Test.group
+    "buildHsModuleGraph"
+    [ Test.unit "includes entry point in graph" <| do
+        let ns = Namespace ["Omni", "Bild", "Example"] Namespace.Hs
+        let entryPoint = "Omni/Bild/Example.hs"
+        let deps = Set.fromList ["Alpha.hs", "Omni/Test.hs"]
+
+        result <- buildHsModuleGraph ns entryPoint deps
+        case result of
+          Nothing -> Test.assertFailure "buildHsModuleGraph returned Nothing"
+          Just graph -> do
+            let modules = Map.keys (graphModules graph)
+            Text.pack "Omni.Bild.Example" `elem` modules @=? True
+    ]
+
 type GhcPkgCacheMem = Map String (Set String)
 
 type GhcPkgCacheDisk = Map String [String]
@@ -1013,12 +1031,15 @@ ghcPkgFindModule acc m =
       /> Set.union acc
 
 -- | Build module graph for Haskell targets, returns Nothing if TH or cycles detected
-buildHsModuleGraph :: Namespace -> Set FilePath -> IO (Maybe HsModuleGraph)
-buildHsModuleGraph namespace srcs = do
+buildHsModuleGraph :: Namespace -> FilePath -> Set FilePath -> IO (Maybe HsModuleGraph)
+buildHsModuleGraph namespace entryPoint deps = do
   root <- Env.getEnv "CODEROOT"
-  nodes <- foldM (analyzeModule root) Map.empty (Set.toList srcs)
-  let hasTH = any nodeHasTH (Map.elems nodes)
-  let hasCycles = detectCycles nodes
+  -- Analyze all dependencies first
+  depNodes <- foldM (analyzeModule root) Map.empty (Set.toList deps)
+  -- Then analyze the entry point itself
+  allNodes <- analyzeModule root depNodes entryPoint
+  let hasTH = any nodeHasTH (Map.elems allNodes)
+  let hasCycles = detectCycles allNodes
   if hasTH || hasCycles
     then pure Nothing
     else
@@ -1026,7 +1047,7 @@ buildHsModuleGraph namespace srcs = do
         <| Just
           HsModuleGraph
             { graphEntry = Namespace.toHaskellModule namespace |> Text.pack,
-              graphModules = nodes
+              graphModules = allNodes
             }
   where
     analyzeModule :: FilePath -> Map ModuleName HsModuleNode -> FilePath -> IO (Map ModuleName HsModuleNode)