Use PackageName instead of comparing strings

[#4845]

Author: akshaymankar

src/Stack/Dot.hs

@@ -53,7 +53,7 @@ data DotOpts = DotOpts
     -- ^ Include dependencies on base
     , dotDependencyDepth :: !(Maybe Int)
     -- ^ Limit the depth of dependency resolution to (Just n) or continue until fixpoint
-    , dotPrune :: !(Set String)
+    , dotPrune :: !(Set PackageName)
     -- ^ Package names to prune from the graph
     , dotTargets :: [Text]
     -- ^ stack TARGETs to trace dependencies for
@@ -215,14 +215,14 @@ payloadText opts payload =
 -- unless they are in @dontPrune@
 pruneGraph :: (F.Foldable f, F.Foldable g, Eq a)
            => f PackageName
-           -> g String
+           -> g PackageName
            -> Map PackageName (Set PackageName, a)
            -> Map PackageName (Set PackageName, a)
 pruneGraph dontPrune names =
   pruneUnreachable dontPrune . Map.mapMaybeWithKey (\pkg (pkgDeps,x) ->
-    if packageNameString pkg `F.elem` names
+    if pkg `F.elem` names
       then Nothing
-      else let filtered = Set.filter (\n -> packageNameString n `F.notElem` names) pkgDeps
+      else let filtered = Set.filter (\n -> n `F.notElem` names) pkgDeps
            in if Set.null filtered && not (Set.null pkgDeps)
                 then Nothing
                 else Just (filtered,x))
@@ -342,7 +342,7 @@ printGraph dotOpts locals graph = do
   void (Map.traverseWithKey printEdges (fst <$> graph))
   liftIO $ Text.putStrLn "}"
   where filteredLocals = Set.filter (\local' ->
-          packageNameString local' `Set.notMember` dotPrune dotOpts) locals
+          local' `Set.notMember` dotPrune dotOpts) locals
 
 -- | Print the local nodes with a different style depending on options
 printLocalNodes :: (F.Foldable t, MonadIO m)

src/Stack/Options/DotParser.hs

@@ -7,6 +7,7 @@ import           Data.Char (isSpace)
 import           Data.List.Split (splitOn)
 import qualified Data.Set as Set
 import qualified Data.Text as T
+import           Distribution.Types.PackageName(PackageName, mkPackageName)
 import           Options.Applicative
 import           Options.Applicative.Builder.Extra
 import           Stack.Dot
@@ -50,8 +51,8 @@ dotOptsParser externalDefault =
         benchTargets = switch (long "bench" <>
                                help "Consider dependencies of benchmark components")
 
-        splitNames :: String -> [String]
-        splitNames = map (takeWhile (not . isSpace) . dropWhile isSpace) . splitOn ","
+        splitNames :: String -> [PackageName]
+        splitNames = map (mkPackageName . takeWhile (not . isSpace) . dropWhile isSpace) . splitOn ","
 
         globalHints = switch (long "global-hints" <>
                               help "Do not require an install GHC; instead, use a hints file for global packages")

src/test/Stack/DotSpec.hs

@@ -53,14 +53,14 @@ spec = do
 
     prop "requested packages are pruned" $ do
       let resolvedGraph = runIdentity (resolveDependencies Nothing graph stubLoader)
-          allPackages g = Set.map packageNameString (Map.keysSet g `Set.union`  fold (fmap fst g))
+          allPackages g = Map.keysSet g `Set.union`  fold (fmap fst g)
       forAll (sublistOf (Set.toList (allPackages resolvedGraph))) $ \toPrune ->
         let pruned = pruneGraph [pkgName "one", pkgName "two"] toPrune resolvedGraph
         in Set.null (allPackages pruned `Set.intersection` Set.fromList toPrune)
 
     prop "pruning removes orhpans" $ do
       let resolvedGraph = runIdentity (resolveDependencies Nothing graph stubLoader)
-          allPackages g = Set.map packageNameString (Map.keysSet g `Set.union` fold (fmap fst g))
+          allPackages g = Map.keysSet g `Set.union` fold (fmap fst g)
           orphans g = Map.filterWithKey (\k _ -> not (graphElem k g)) g
       forAll (sublistOf (Set.toList (allPackages resolvedGraph))) $ \toPrune ->
         let pruned = pruneGraph [pkgName "one", pkgName "two"] toPrune resolvedGraph