Use explicit data types for cabal file entries

@manny-fp This fixes the issue. Accidentally passed in the wrong type
here:

-            (map DotCabalModule (otherModules build) ++ [DotCabalFile (modulePath exe)])
+            (map DotCabalModule (otherModules build) ++ [DotCabalMain (modulePath exe)])

Now it's fixed and the 32-unlisted-module test passes.

src/Stack/Build/Source.hs

@@ -333,12 +333,10 @@ loadLocalPackage bopts targets (name, (lpv, gpkg)) = do
         testpkg = resolvePackage testconfig gpkg
         benchpkg = resolvePackage benchconfig gpkg
     mbuildCache <- tryGetBuildCache $ lpvRoot lpv
-    (_,modFiles,otherFiles,mainFiles,extraFiles) <- getPackageFiles (packageFiles pkg) (lpvCabalFP lpv)
+    (_,compFiles,cabalFiles) <- getPackageFiles (packageFiles pkg) (lpvCabalFP lpv)
     let files =
-            mconcat (M.elems modFiles) <>
-            mconcat (M.elems otherFiles) <>
-            Set.map mainIsFile (mconcat (M.elems mainFiles)) <>
-            extraFiles
+            Set.map dotCabalGetPath (mconcat (M.elems compFiles)) <>
+            cabalFiles
     (isDirty, newBuildCache) <- checkBuildCache
         (fromMaybe Map.empty mbuildCache)
         (map toFilePath $ Set.toList files)

src/Stack/Ghci.hs

@@ -249,7 +249,7 @@ makeGhciPkgInfo sourceMap locals name cabalfp components = do
     pkg <- readPackage config cabalfp
     (componentsOpts,generalOpts) <-
         getPackageOpts (packageOpts pkg) sourceMap locals cabalfp
-    (componentsModules,componentModFiles,_,mainIsFiles,_) <-
+    (componentsModules,componentFiles,_) <-
         getPackageFiles (packageFiles pkg) cabalfp
     let filterWithinWantedComponents m =
             M.elems
@@ -270,10 +270,12 @@ makeGhciPkgInfo sourceMap locals name cabalfp components = do
         , ghciPkgModules = mconcat
               (filterWithinWantedComponents componentsModules)
         , ghciPkgModFiles = mconcat
-              (filterWithinWantedComponents componentModFiles)
-        , ghciPkgMainIs = M.map (S.map mainIsFile) mainIsFiles
+              (filterWithinWantedComponents
+                   (M.map (setMapMaybe dotCabalModulePath) componentFiles))
+        , ghciPkgMainIs = M.map (setMapMaybe dotCabalMainPath) componentFiles
         }
   where
     badForGhci :: String -> Bool
     badForGhci x =
         isPrefixOf "-O" x || elem x (words "-debug -threaded -ticky")
+    setMapMaybe f = S.fromList . mapMaybe f . S.toList