@@ -5,7 +5,6 @@ module Security.Advisories.Queries
55where
66
77import Control.Monad.IO.Class (MonadIO )
8- import Data.Text (Text )
98import Distribution.Types.Version (Version )
109import Distribution.Types.VersionRange (VersionRange )
1110import Validation (Validation (.. ))
@@ -16,22 +15,22 @@ import Security.Advisories.Parse
1615
1716type QueryResult = Validation [(FilePath , ParseAdvisoryError )] [Advisory ]
1817
19- -- | List the advisories matching a package name and a version
18+ -- | List the advisories matching a component and a version
2019listVersionAffectedBy
2120 :: MonadIO m
22- => FilePath -> Text -> Version -> m QueryResult
21+ => FilePath -> ComponentIdentifier -> Version -> m QueryResult
2322listVersionAffectedBy = listAffectedByHelper isVersionAffectedBy
2423
25- -- | List the advisories matching a package name and a version range
24+ -- | List the advisories matching a component and a version range
2625listVersionRangeAffectedBy
2726 :: (MonadIO m )
28- => FilePath -> Text -> VersionRange -> m QueryResult
27+ => FilePath -> ComponentIdentifier -> VersionRange -> m QueryResult
2928listVersionRangeAffectedBy = listAffectedByHelper isVersionRangeAffectedBy
3029
3130-- | Helper function for 'listVersionAffectedBy' and 'listVersionRangeAffectedBy'
3231listAffectedByHelper
3332 :: (MonadIO m )
34- => (ComponentIdentifier -> a -> Advisory -> Bool ) -> FilePath -> Text -> a -> m QueryResult
35- listAffectedByHelper checkAffectedBy root queryPackageName queryVersionish =
36- fmap (filter (checkAffectedBy ( Hackage queryPackageName) queryVersionish)) <$>
33+ => (ComponentIdentifier -> a -> Advisory -> Bool ) -> FilePath -> ComponentIdentifier -> a -> m QueryResult
34+ listAffectedByHelper checkAffectedBy root queryComponent queryVersionish =
35+ fmap (filter (checkAffectedBy queryComponent queryVersionish)) <$>
3736 listAdvisories root
0 commit comments