List dependencies in "post-order" (#1539)

Gabriella439 · mergify[bot] · commit 5f15c860b397 · 2019-11-21T16:20:48.000Z
* List dependencies in "post-order" Related to https://github.com/dhall-lang/dhall-lang/issues/823 This lists dependencies starting from the leaves and concluding with the root import, same as how `nix-store --query --requisites` does Example output: ```bash $ dhall resolve --no-cache --transitive-dependencies <<< 'https://prelude.dhall-lang.org/package.dhall' https://prelude.dhall-lang.org/Bool/and https://prelude.dhall-lang.org/Bool/build https://prelude.dhall-lang.org/Bool/even https://prelude.dhall-lang.org/Bool/fold https://prelude.dhall-lang.org/Bool/not https://prelude.dhall-lang.org/Bool/odd https://prelude.dhall-lang.org/Bool/or https://prelude.dhall-lang.org/Bool/show https://prelude.dhall-lang.org/Bool/package.dhall https://prelude.dhall-lang.org/Double/show https://prelude.dhall-lang.org/Double/package.dhall https://prelude.dhall-lang.org/Function/compose https://prelude.dhall-lang.org/Function/package.dhall https://prelude.dhall-lang.org/Integer/show https://prelude.dhall-lang.org/Integer/toDouble https://prelude.dhall-lang.org/Integer/package.dhall https://prelude.dhall-lang.org/List/all https://prelude.dhall-lang.org/List/any https://prelude.dhall-lang.org/List/build https://prelude.dhall-lang.org/List/concat https://prelude.dhall-lang.org/List/concatMap https://prelude.dhall-lang.org/List/default https://prelude.dhall-lang.org/List/empty https://prelude.dhall-lang.org/List/filter https://prelude.dhall-lang.org/List/fold https://prelude.dhall-lang.org/List/generate https://prelude.dhall-lang.org/List/head https://prelude.dhall-lang.org/List/indexed https://prelude.dhall-lang.org/List/iterate https://prelude.dhall-lang.org/List/last https://prelude.dhall-lang.org/List/length https://prelude.dhall-lang.org/List/map https://prelude.dhall-lang.org/List/null https://prelude.dhall-lang.org/List/partition https://prelude.dhall-lang.org/List/replicate https://prelude.dhall-lang.org/List/reverse https://prelude.dhall-lang.org/List/shifted https://prelude.dhall-lang.org/List/unzip https://prelude.dhall-lang.org/List/package.dhall https://prelude.dhall-lang.org/Location/Type https://prelude.dhall-lang.org/Location/package.dhall https://prelude.dhall-lang.org/Map/Type https://prelude.dhall-lang.org/Map/Entry https://prelude.dhall-lang.org/Map/empty https://prelude.dhall-lang.org/Map/keyText https://prelude.dhall-lang.org/Map/keyValue https://prelude.dhall-lang.org/Map/keys https://prelude.dhall-lang.org/Map/map https://prelude.dhall-lang.org/Map/values https://prelude.dhall-lang.org/Map/package.dhall https://prelude.dhall-lang.org/Monoid https://prelude.dhall-lang.org/Natural/build https://prelude.dhall-lang.org/Natural/enumerate https://prelude.dhall-lang.org/Natural/even https://prelude.dhall-lang.org/Natural/fold https://prelude.dhall-lang.org/Natural/isZero https://prelude.dhall-lang.org/Natural/odd https://prelude.dhall-lang.org/Natural/product https://prelude.dhall-lang.org/Natural/sum https://prelude.dhall-lang.org/Natural/show https://prelude.dhall-lang.org/Natural/toDouble https://prelude.dhall-lang.org/Natural/toInteger https://prelude.dhall-lang.org/Natural/lessThanEqual https://prelude.dhall-lang.org/Natural/greaterThanEqual https://prelude.dhall-lang.org/Natural/lessThan https://prelude.dhall-lang.org/Natural/equal https://prelude.dhall-lang.org/Natural/greaterThan https://prelude.dhall-lang.org/Natural/min https://prelude.dhall-lang.org/Natural/max https://prelude.dhall-lang.org/Optional/map https://prelude.dhall-lang.org/Natural/listMin https://prelude.dhall-lang.org/Natural/listMax https://prelude.dhall-lang.org/Natural/sort https://prelude.dhall-lang.org/Natural/subtract https://prelude.dhall-lang.org/Natural/package.dhall https://prelude.dhall-lang.org/Optional/all https://prelude.dhall-lang.org/Optional/any https://prelude.dhall-lang.org/Optional/build https://prelude.dhall-lang.org/Optional/concat https://prelude.dhall-lang.org/Optional/default https://prelude.dhall-lang.org/Optional/filter https://prelude.dhall-lang.org/Optional/fold https://prelude.dhall-lang.org/Optional/head https://prelude.dhall-lang.org/Optional/last https://prelude.dhall-lang.org/Optional/length https://prelude.dhall-lang.org/Optional/null https://prelude.dhall-lang.org/Optional/toList https://prelude.dhall-lang.org/Optional/unzip https://prelude.dhall-lang.org/Optional/package.dhall https://prelude.dhall-lang.org/JSON/Type https://prelude.dhall-lang.org/JSON/Nesting https://prelude.dhall-lang.org/JSON/Tagged https://prelude.dhall-lang.org/JSON/keyText https://prelude.dhall-lang.org/JSON/keyValue https://prelude.dhall-lang.org/JSON/string https://prelude.dhall-lang.org/JSON/number https://prelude.dhall-lang.org/JSON/object https://prelude.dhall-lang.org/JSON/array https://prelude.dhall-lang.org/JSON/bool https://prelude.dhall-lang.org/JSON/null https://prelude.dhall-lang.org/Text/concatMapSep https://prelude.dhall-lang.org/JSON/render https://prelude.dhall-lang.org/JSON/package.dhall https://prelude.dhall-lang.org/Text/concat https://prelude.dhall-lang.org/Text/concatMap https://prelude.dhall-lang.org/Text/concatSep https://prelude.dhall-lang.org/Text/default https://prelude.dhall-lang.org/Text/defaultMap https://prelude.dhall-lang.org/Text/show https://prelude.dhall-lang.org/Text/package.dhall https://prelude.dhall-lang.org/XML/Type https://prelude.dhall-lang.org/XML/attribute https://prelude.dhall-lang.org/XML/render https://prelude.dhall-lang.org/XML/element https://prelude.dhall-lang.org/XML/leaf https://prelude.dhall-lang.org/XML/text https://prelude.dhall-lang.org/XML/emptyAttributes https://prelude.dhall-lang.org/XML/package.dhall https://prelude.dhall-lang.org/package.dhall ``` * Document order in `dhall resolve --help` output ... as suggested by @sjakobi * Fix dhall-lsp-server build
diff --git a/dhall-lsp-server/src/Dhall/LSP/Backend/Dhall.hs b/dhall-lsp-server/src/Dhall/LSP/Backend/Dhall.hs
@@ -29,6 +29,7 @@ import qualified Dhall.TypeCheck as Dhall
 import qualified Data.Graph as Graph
 import qualified Data.Map.Strict as Map
 import qualified Data.Set as Set
+import qualified Dhall.Map
 import qualified Network.URI as URI
 import qualified Language.Haskell.LSP.Types as LSP.Types
 import qualified Data.Text as Text
@@ -75,19 +76,19 @@ type ImportGraph = [Dhall.Depends]
 
 -- | A cache maps Dhall imports to fully normalised expressions. By reusing
 --   caches we can speeds up diagnostics etc. significantly!
-data Cache = Cache ImportGraph (Map.Map Dhall.Chained Dhall.ImportSemantics)
+data Cache = Cache ImportGraph (Dhall.Map.Map Dhall.Chained Dhall.ImportSemantics)
 
 -- | The initial cache.
 emptyCache :: Cache
-emptyCache = Cache [] Map.empty
+emptyCache = Cache [] Dhall.Map.empty
 
 -- | Invalidate any _unhashed_ imports of the given file. Hashed imports are
 --   kept around as per
 --   https://github.com/dhall-lang/dhall-lang/blob/master/standard/imports.md.
 --   Transitively invalidates any imports depending on the changed file.
 invalidate :: FileIdentifier -> Cache -> Cache
 invalidate (FileIdentifier chained) (Cache dependencies cache) =
-  Cache dependencies' $ Map.withoutKeys cache invalidImports
+  Cache dependencies' $ Dhall.Map.withoutKeys cache invalidImports
   where
     imports = map Dhall.parent dependencies ++ map Dhall.child dependencies
 
diff --git a/dhall/src/Dhall/Import.hs b/dhall/src/Dhall/Import.hs
@@ -189,7 +189,6 @@ import qualified Data.ByteString.Lazy
 import qualified Data.CaseInsensitive
 import qualified Data.Foldable
 import qualified Data.List.NonEmpty               as NonEmpty
-import qualified Data.Map.Strict                  as Map
 import qualified Data.Text.Encoding
 import qualified Data.Text                        as Text
 import qualified Data.Text.IO
@@ -479,11 +478,12 @@ chainImport (Chained parent) child =
 loadImport :: Chained -> StateT Status IO ImportSemantics
 loadImport import_ = do
     Status {..} <- State.get
-    case Map.lookup import_ _cache of
+
+    case Dhall.Map.lookup import_ _cache of
         Just importSemantics -> return importSemantics
         Nothing -> do
             importSemantics <- loadImportWithSemanticCache import_
-            zoom cache (State.modify (Map.insert import_ importSemantics))
+            zoom cache (State.modify (Dhall.Map.insert import_ importSemantics))
             return importSemantics
 
 -- | Load an import from the 'semantic cache'. Defers to
diff --git a/dhall/src/Dhall/Import/Types.hs b/dhall/src/Dhall/Import/Types.hs
@@ -10,7 +10,7 @@ import Control.Exception (Exception)
 import Control.Monad.Trans.State.Strict (StateT)
 import Data.Dynamic
 import Data.List.NonEmpty (NonEmpty)
-import Data.Map (Map)
+import Dhall.Map (Map)
 import Data.Semigroup ((<>))
 import Data.Text.Prettyprint.Doc (Pretty(..))
 import Data.Void (Void)
@@ -35,7 +35,7 @@ import Lens.Family (LensLike')
 import System.FilePath (isRelative, splitDirectories)
 
 import qualified Dhall.Context
-import qualified Data.Map      as Map
+import qualified Dhall.Map     as Map
 import qualified Data.Text
 
 -- | A fully 'chained' import, i.e. if it contains a relative path that path is
diff --git a/dhall/src/Dhall/Main.hs b/dhall/src/Dhall/Main.hs
@@ -63,6 +63,7 @@ import qualified Dhall.Freeze
 import qualified Dhall.Import
 import qualified Dhall.Import.Types
 import qualified Dhall.Lint
+import qualified Dhall.Map
 import qualified Dhall.Tags
 import qualified Dhall.Pretty
 import qualified Dhall.Repl
@@ -307,7 +308,7 @@ parseMode =
           Options.Applicative.flag' (Just ListTransitiveDependencies)
               (   Options.Applicative.long "transitive-dependencies"
               <>  Options.Applicative.help
-                    "List transitive import dependencies"
+                    "List transitive import dependencies in post-order"
               )
         <|> pure Nothing
 
@@ -570,7 +571,8 @@ command (Options {..}) = do
                           .   Dhall.Core.importType
                           .   Dhall.Core.importHashed
                           .   Dhall.Import.chainedImport )
-                 .   Data.Map.keys
+                 .   reverse
+                 .   Dhall.Map.keys
                  $   _cache
 
         Resolve { resolveMode = Nothing, ..} -> do
diff --git a/dhall/src/Dhall/Map.hs b/dhall/src/Dhall/Map.hs
@@ -13,6 +13,7 @@ module Dhall.Map
       Map
 
       -- * Construction
+    , empty
     , singleton
     , fromList
     , fromListWithKey
@@ -33,6 +34,7 @@ module Dhall.Map
     , delete
     , filter
     , restrictKeys
+    , withoutKeys
     , mapMaybe
 
       -- * Query
@@ -161,6 +163,10 @@ instance Ord k => GHC.Exts.IsList (Map k v) where
 
     toList = Dhall.Map.toList
 
+-- | Create an empty `Map`
+empty :: Ord k => Map k v
+empty = mempty
+
 {-| Create a `Map` from a single key-value pair
 
 >>> singleton "A" 1
@@ -369,6 +375,23 @@ restrictKeys (Map m ks) s = Map m' ks'
     ks' = filterKeys (\k -> Data.Set.member k s) ks
 {-# INLINABLE restrictKeys #-}
 
+{-| Remove all keys in a @"Data.Set".'Set'@ from a 'Map'
+
+>>> withoutKeys (fromList [("A",1),("B",2)]) (Data.Set.fromList ["A"])
+fromList [("B",2)]
+-}
+withoutKeys :: Ord k => Map k a -> Data.Set.Set k -> Map k a
+withoutKeys (Map m ks) s = Map m' ks'
+  where
+#if MIN_VERSION_containers(0,5,8)
+    m' = Data.Map.withoutKeys m s
+#else
+    m' = Data.Map.filterWithKey (\k _ -> Data.Set.notMember k s) m
+#endif
+
+    ks' = filterKeys (\k -> Data.Set.notMember k s) ks
+{-# INLINABLE withoutKeys #-}
+
 {-| Transform all values in a `Map` using the supplied function, deleting the
     key if the function returns `Nothing`
 
