Fix graphex cabal for multi-source-dir units

ChangeLog.md

@@ -2,6 +2,11 @@
 
 ## Unreleased changes
 
+## 0.1.2.1
+
+- Fix `graphex cabal` for units with multiple source directories.
+  - It would mistakenly treat some modules as having no file.
+
 ## 0.1.2.0
 
 - The graph edge direction has been standardized. `A -> B` means "A imports B."

dummy-sublib/test/DummyTest.hs

@@ -0,0 +1,3 @@
+module DummyTest where
+
+import DummySublibModule

package.yaml

@@ -1,5 +1,5 @@
 name:                graphex
-version:             0.1.2.0
+version:             0.1.2.1
 github:              "dustin/graphex"
 license:             BSD3
 author:              "Dustin Sallings"
@@ -63,7 +63,9 @@ default-extensions:
 
 internal-libraries:
   graphex-dummy-sublib:
-    source-dirs: dummy-sublib
+    source-dirs:
+      - dummy-sublib
+      - dummy-sublib/test
 
 executables:
   graphex:

src/Graphex/Cabal.hs

@@ -31,7 +31,8 @@ import           Data.List                                     (intersperse)
 import           Data.List.NonEmpty                            (NonEmpty)
 import           Data.Map.Strict                               (Map)
 import qualified Data.Map.Strict                               as Map
-import           Data.Maybe                                    (mapMaybe,
+import           Data.Maybe                                    (catMaybes,
+                                                                mapMaybe,
                                                                 maybeToList)
 import           Data.Semigroup.Foldable
 import qualified Data.Set                                      as Set
@@ -98,7 +99,7 @@ discoverCabalModules CabalDiscoverOpts{..} cabalFile = do
             guard $ Discovered == foldMap1 (`discoversUnit` CabalLibraryUnit name) toDiscover
             pure Module
               { name = fromString $ mconcat $ intersperse "." $ Cabal.components exMod
-              , path = ModuleFile $ sourceDirToFilePath srcDir </> Cabal.toFilePath exMod <.> ".hs"
+              , path = if exMod `elem` libBuildInfo.autogenModules then ModuleNoFile else ModuleFile $ sourceDirToFilePath srcDir </> Cabal.toFilePath exMod <.> ".hs"
               }
         , do
             Executable{..} <- executables
@@ -110,7 +111,7 @@ discoverCabalModules CabalDiscoverOpts{..} cabalFile = do
                 if otherMod == "Main"
                 then unUnqualComponentName exeName ++ "-Main"
                 else mconcat $ intersperse "." $ Cabal.components otherMod
-              , path = ModuleFile $ sourceDirToFilePath srcDir </> Cabal.toFilePath otherMod <.> ".hs"
+              , path = if otherMod `elem` buildInfo.autogenModules then ModuleNoFile else ModuleFile $ sourceDirToFilePath srcDir </> Cabal.toFilePath otherMod <.> ".hs"
               }
         , do
             TestSuite{..} <- testSuites
@@ -120,20 +121,23 @@ discoverCabalModules CabalDiscoverOpts{..} cabalFile = do
 
             pure Module
               { name = fromString $ mconcat $ intersperse "." $ Cabal.components otherMod
-              , path = ModuleFile $ sourceDirToFilePath srcDir </> Cabal.toFilePath otherMod <.> ".hs"
+              , path = if otherMod `elem` testBuildInfo.autogenModules then ModuleNoFile else ModuleFile $ sourceDirToFilePath srcDir </> Cabal.toFilePath otherMod <.> ".hs"
               }
         ]
 
-  pooledMapConcurrentlyN numJobs validateModulePath candidateModules
+  catMaybes <$> pooledMapConcurrentlyN numJobs validateModulePath candidateModules
 
-validateModulePath :: Module -> IO Module
+validateModulePath :: Module -> IO (Maybe Module)
 validateModulePath m = do
-  path <- case m.path of
+  let mkModule p = Module m.name p
+  case m.path of
     ModuleFile fp -> do
       fileExists <- doesFileExist fp
-      pure $ if fileExists then ModuleFile fp else ModuleNoFile
-    ModuleNoFile -> pure ModuleNoFile
-  pure Module {name = m.name, path = path}
+      -- If a discovered module has a filepath but doesn't exist, it means
+      -- that the unit had multiple source directories. We assume it will
+      -- exist in one of those directories.
+      pure $ if fileExists then Just $ mkModule $ ModuleFile fp else Nothing
+    ModuleNoFile -> pure $ Just $ mkModule ModuleNoFile
 
 data CabalUnitType =
     CabalLibrary

test/CabalSpec.hs

@@ -51,7 +51,10 @@ exeModules =
   ]
 
 dummySublibModules :: [Module]
-dummySublibModules = [Module "DummySublibModule" "dummy-sublib/DummySublibModule.hs"]
+dummySublibModules =
+  [ Module "DummySublibModule" "dummy-sublib/DummySublibModule.hs"
+  , Module "DummyTest" "dummy-sublib/test/DummyTest.hs"
+  ]
 
 defaultOpts :: CabalDiscoverOpts
 defaultOpts = CabalDiscoverOpts