Fix import logic with --file for dhall-to-{json,yaml} #1191
Conversation
| @@ -951,13 +953,18 @@ handleSpecialDoubles specialDoubleMode = | |||
| codeToValue | |||
| :: Conversion | |||
| -> SpecialDoubleMode | |||
| -> Text -- ^ Describe the input for the sake of error location. | |||
| -> Maybe FilePath -- ^ The source file path. If no path is given, imports | |||
| -- are resolved relative to the current directory. | |||
There was a problem hiding this comment.
@deepfire You introduced the Text input description in dhall-lang/dhall-json#20. Is this change ok for you?
There was a problem hiding this comment.
Yeah, this change is fine
dhall/src/Dhall/Import.hs
Outdated
|
|
||
| -- | Resolve all imports within an expression, importing relative to the given | ||
| -- directory. | ||
| loadWithDir :: FilePath -> Expr Src Import -> IO (Expr Src X) |
There was a problem hiding this comment.
Would loadWithRootDirectory be a better name?
There was a problem hiding this comment.
Maybe loadRelativeTo?
| resolvedExpression <- Dhall.Import.load parsedExpression | ||
| let rootDirectory = case mFilePath of | ||
| Nothing -> "." | ||
| Just fp -> System.FilePath.takeDirectory fp |
There was a problem hiding this comment.
Note that I didn't adopt dhall's way of interpreting --file - as stdin here, as I think it's a bit redundant.
There was a problem hiding this comment.
Then we should probably change dhall to match, for consistency
dhall/src/Dhall/Import.hs
Outdated
|
|
||
| -- | Resolve all imports within an expression, importing relative to the given | ||
| -- directory. | ||
| loadWithDir :: FilePath -> Expr Src Import -> IO (Expr Src X) |
There was a problem hiding this comment.
Maybe loadRelativeTo?
| @@ -951,13 +953,18 @@ handleSpecialDoubles specialDoubleMode = | |||
| codeToValue | |||
| :: Conversion | |||
| -> SpecialDoubleMode | |||
| -> Text -- ^ Describe the input for the sake of error location. | |||
| -> Maybe FilePath -- ^ The source file path. If no path is given, imports | |||
| -- are resolved relative to the current directory. | |||
There was a problem hiding this comment.
Yeah, this change is fine
| resolvedExpression <- Dhall.Import.load parsedExpression | ||
| let rootDirectory = case mFilePath of | ||
| Nothing -> "." | ||
| Just fp -> System.FilePath.takeDirectory fp |
There was a problem hiding this comment.
Then we should probably change dhall to match, for consistency
|
AppVeyor fails due to I'd suggest clearing the cache, but this might be about the artifact deployment to GitHub?! |
sjakobi
force-pushed
the
sjakobi/1183-file-option
branch
from
a8e9cde
to
502ac78
Compare
Fixes #1183.