Visitar URL original
Exclude headers from `dhall resolve` output by Gabriella439 · Pull Request #1603 · dhall-lang/dhall-haskell · GitHub
Skip to content

Exclude headers from dhall resolve output #1603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 1 commit into from
Dec 11, 2019
Merged

Exclude headers from dhall resolve output #1603

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 23 additions & 9 deletions dhall/src/Dhall/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,14 @@ import Data.Monoid ((<>))
import Data.Text (Text)
import Data.Text.Prettyprint.Doc (Doc, Pretty)
import Data.Void (Void)
import Dhall.Core (Expr(Annot), Import, pretty)
import Dhall.Core
( Expr(Annot)
, Import(..)
, ImportHashed(..)
, ImportType(..)
, URL(..)
, pretty
)
import Dhall.Freeze (Intent(..), Scope(..))
import Dhall.Import (Imported(..), Depends(..), SemanticCacheMode(..), _semanticCacheMode)
import Dhall.Parser (Src)
Expand Down Expand Up @@ -422,6 +429,13 @@ parserInfoOptions =
<> Options.Applicative.fullDesc
)

noHeaders :: Import -> Import
noHeaders
(Import { importHashed = ImportHashed { importType = Remote URL{ .. }, ..}, .. }) =
Import { importHashed = ImportHashed { importType = Remote URL{ headers = Nothing, .. }, .. }, .. }
noHeaders i =
i

-- | Run the command specified by the `Options` type
command :: Options -> IO ()
command (Options {..}) = do
Expand Down Expand Up @@ -561,10 +575,12 @@ command (Options {..}) = do
let dotNode (i, nodeId) =
Text.Dot.userNode
nodeId
[ ("label", Data.Text.unpack $ pretty i)
[ ("label", Data.Text.unpack $ pretty (convert i))
, ("shape", "box")
, ("style", "rounded")
]
where
convert = noHeaders . Dhall.Import.chainedImport

let dotEdge (Depends parent child) =
case (Data.Map.lookup parent importIds, Data.Map.lookup child importIds) of
Expand All @@ -580,9 +596,7 @@ command (Options {..}) = do
Resolve { resolveMode = Just ListImmediateDependencies, ..} -> do
expression <- getExpression file

mapM_ (print
. Pretty.pretty
. Dhall.Core.importHashed) expression
mapM_ (print . Pretty.pretty . noHeaders) expression

Resolve { resolveMode = Just ListTransitiveDependencies, ..} -> do
expression <- getExpression file
Expand All @@ -591,10 +605,10 @@ command (Options {..}) = do
State.execStateT (Dhall.Import.loadWith expression) (toStatus file) { _semanticCacheMode = semanticCacheMode }

mapM_ print
. fmap ( Pretty.pretty
. Dhall.Core.importType
. Dhall.Core.importHashed
. Dhall.Import.chainedImport )
. fmap ( Pretty.pretty
. noHeaders
. Dhall.Import.chainedImport
)
. reverse
. Dhall.Map.keys
$ _cache
Expand Down