apply pr feedback

fossas · May 1, 2024 · 9f65cc9 · 9f65cc9
1 parent 07a3f19
commit 9f65cc9
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 20 deletions.
diff --git a/src/Strategy/Python/Poetry.hs b/src/Strategy/Python/Poetry.hs
@@ -46,7 +46,7 @@ import Strategy.Python.Errors (
   MissingPoetryLockFile (..),
   commitPoetryLockToVCS,
  )
-import Strategy.Python.Poetry.Common (getPoetryBuildBackend, logIgnoredDeps, pyProjectDeps, toCanonicalName, toMap)
+import Strategy.Python.Poetry.Common (getPoetryBuildBackend, logIgnoredDeps, makePackageToLockDependencyMap, pyProjectDeps, toCanonicalName)
 import Strategy.Python.Poetry.PoetryLock (PackageName (..), PoetryLock (..), PoetryLockPackage (..), PoetryMetadata (poetryMetadataLockVersion), poetryLockCodec)
 import Strategy.Python.Poetry.PyProject (PyProject (..), allPoetryProductionDeps, pyProjectCodec)
 import Types (DependencyResults (..), DiscoveredProject (..), DiscoveredProjectType (PoetryProjectType), GraphBreadth (..))
@@ -247,7 +247,7 @@ graphFromPyProjectAndLockFile pyProject poetryLock = graph
     canonicalPkgName name = PackageName . toCanonicalName $ unPackageName name
 
     mapOfDependency :: Map PackageName Dependency
-    mapOfDependency = toMap prodPkgNames pkgs
+    mapOfDependency = makePackageToLockDependencyMap prodPkgNames pkgs
 
     prodPkgNames :: [PackageName]
     prodPkgNames = PackageName <$> Map.keys (allPoetryProductionDeps pyProject)

diff --git a/src/Strategy/Python/Poetry/Common.hs b/src/Strategy/Python/Poetry/Common.hs
@@ -1,6 +1,6 @@
 module Strategy.Python.Poetry.Common (
   getPoetryBuildBackend,
-  toMap,
+  makePackageToLockDependencyMap,
   pyProjectDeps,
   logIgnoredDeps,
   toCanonicalName,
@@ -176,21 +176,20 @@ toCanonicalName :: Text -> Text
 toCanonicalName t = toLower $ replace "_" "-" (replace "." "-" t)
 
 -- | Maps poetry lock package to map of package name and associated dependency.
-toMap :: [PackageName] -> [PoetryLockPackage] -> Map.Map PackageName Dependency
-toMap prodPkgs pkgs = Map.fromList $ (\x -> (canonicalPkgName x, toDependency x)) <$> (filter supportedPoetryLockDep pkgs)
+makePackageToLockDependencyMap :: [PackageName] -> [PoetryLockPackage] -> Map.Map PackageName Dependency
+makePackageToLockDependencyMap prodPkgs pkgs = Map.fromList $ (\x -> (lockCanonicalPackageName x, toDependency x)) <$> (filter supportedPoetryLockDep pkgs)
   where
-
     canonicalPkgName :: PackageName -> PackageName
     canonicalPkgName = PackageName . toCanonicalName . unPackageName
-    
+
     lockCanonicalPackageName :: PoetryLockPackage -> PackageName
     lockCanonicalPackageName = canonicalPkgName . poetryLockPackageName
 
-    canonicalProdPkgNames :: Set [PackageName]
-    canonicalProdPkgNames = Set.fromList . map canonicalPkgName $ prodPkgs
+    canonicalProdPkgNames :: Set.Set PackageName
+    canonicalProdPkgNames = Set.fromList $ map canonicalPkgName prodPkgs
 
     isProductionDirectDep :: PoetryLockPackage -> Bool
-    isProductionDirectDep pkg = canonicalPkgName pkg `Set.member` canonicalProdPkgNames
+    isProductionDirectDep pkg = lockCanonicalPackageName pkg `Set.member` canonicalProdPkgNames
 
     toDependency :: PoetryLockPackage -> Dependency
     toDependency pkg =
@@ -199,7 +198,7 @@ toMap prodPkgs pkgs = Map.fromList $ (\x -> (canonicalPkgName x, toDependency x)
         , dependencyName = toDepName pkg
         , dependencyVersion = toDepVersion pkg
         , dependencyLocations = toDepLocs pkg
-        , dependencyEnvironments = toDepEnvironment pkg
+        , dependencyEnvironments = pkgEnvironments pkg
         , dependencyTags = Map.empty
         }
 
@@ -232,8 +231,8 @@ toMap prodPkgs pkgs = Map.fromList $ (\x -> (canonicalPkgName x, toDependency x)
           ref <- poetryLockPackageSourceReference lockPkgSrc
           if poetryLockPackageSourceType lockPkgSrc /= "legacy" then Just ref else Nothing
 
-    toDepEnvironment :: PoetryLockPackage -> Set.Set DepEnvironment
-    toDepEnvironment pkg = case poetryLockPackageCategory pkg of
+    pkgEnvironments :: PoetryLockPackage -> Set.Set DepEnvironment
+    pkgEnvironments pkg = case poetryLockPackageCategory pkg of
       -- If category is provided, use category to infer if dependency's environment
       Just category -> case category of
         "dev" -> Set.singleton EnvDevelopment

diff --git a/test/Python/Poetry/CommonSpec.hs b/test/Python/Poetry/CommonSpec.hs
@@ -7,7 +7,7 @@ import Data.Set qualified as Set
 import Data.Text (Text)
 import Data.Text.IO qualified as TIO
 import DepTypes (DepEnvironment (..), DepType (..), Dependency (..), VerConstraint (..))
-import Strategy.Python.Poetry.Common (getPoetryBuildBackend, pyProjectDeps, supportedPoetryLockDep, supportedPyProjectDep, toCanonicalName, toMap)
+import Strategy.Python.Poetry.Common (getPoetryBuildBackend, makePackageToLockDependencyMap, pyProjectDeps, supportedPoetryLockDep, supportedPyProjectDep, toCanonicalName)
 import Strategy.Python.Poetry.PoetryLock (
   ObjectVersion (..),
   PackageName (..),
@@ -180,9 +180,9 @@ spec = do
         getPoetryBuildBackend <$> Toml.decode pyProjectCodec emptyContents
           `shouldBe` Right Nothing
 
-  describe "toMap" $ do
+  describe "makePackageToLockDependencyMap" $ do
     it "should map poetry lock package to dependency" $
-      toMap
+      makePackageToLockDependencyMap
         mempty
         [ PoetryLockPackage
             { poetryLockPackageName = PackageName "pkgOne"
@@ -215,7 +215,7 @@ spec = do
 
     describe "when poetry lock dependency is from git source" $
       it "should replace poetry lock package name to git url" $
-        toMap
+        makePackageToLockDependencyMap
           mempty
           [ PoetryLockPackage
               { poetryLockPackageName = PackageName "pkgWithGitSource"
@@ -243,7 +243,7 @@ spec = do
 
     describe "when poetry lock dependency is from url source" $
       it "should replace poetry lock package name to url" $
-        toMap
+        makePackageToLockDependencyMap
           mempty
           [ PoetryLockPackage
               { poetryLockPackageName = PackageName "pkgSourcedFromUrl"
@@ -271,7 +271,7 @@ spec = do
 
     describe "when poetry lock dependency is from file source" $
       it "should replace poetry lock package name to filepath" $
-        toMap
+        makePackageToLockDependencyMap
           mempty
           [ PoetryLockPackage
               { poetryLockPackageName = PackageName "pkgSourcedFromFile"
@@ -287,7 +287,7 @@ spec = do
 
     describe "when poetry lock dependency is from secondary sources" $
       it "should include url into dependency location" $
-        toMap
+        makePackageToLockDependencyMap
           mempty
           [ PoetryLockPackage
               { poetryLockPackageName = PackageName "myprivatepkg"