dhall-csv 1.0.0 → 1.0.1
raw patch · 8 files changed
+84/−75 lines, 8 filesdep ~prettyprinterdep ~textPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: prettyprinter, text
API changes (from Hackage documentation)
Files
- CHANGELOG.md +4/−0
- csv-to-dhall/Main.hs +11/−11
- dhall-csv.cabal +3/−3
- dhall-to-csv/Main.hs +3/−3
- src/Dhall/Csv.hs +15/−15
- src/Dhall/Csv/Util.hs +4/−4
- src/Dhall/CsvToDhall.hs +27/−27
- tasty/Main.hs +17/−12
CHANGELOG.md view
@@ -1,3 +1,7 @@+1.0.1++* [Build against `tasty-silver` 3.3](https://github.com/dhall-lang/dhall-haskell/pull/2307)+ 1.0.0 * Initial release
csv-to-dhall/Main.hs view
@@ -4,24 +4,24 @@ module Main where -import Control.Applicative (optional, (<|>))-import Control.Exception (SomeException)-import Data.Version (showVersion)+import Control.Applicative (optional, (<|>))+import Control.Exception (SomeException)+import Data.Text (Text)+import Data.Version (showVersion) import Dhall.CsvToDhall-import Dhall.Pretty (CharacterSet (..))-import Data.Text (Text)-import Options.Applicative (Parser, ParserInfo)+import Dhall.Pretty (CharacterSet (..))+import Options.Applicative (Parser, ParserInfo) import qualified Control.Exception-import qualified Data.Text.IO as Text.IO-import qualified Dhall.Csv.Util+import qualified Data.Text.IO as Text.IO import qualified Dhall.Core+import qualified Dhall.Csv.Util import qualified Dhall.Util import qualified GHC.IO.Encoding-import qualified Options.Applicative as Options-import qualified Paths_dhall_csv as Meta-import qualified System.IO as IO+import qualified Options.Applicative as Options+import qualified Paths_dhall_csv as Meta import qualified System.Exit+import qualified System.IO as IO parserInfo :: ParserInfo Options parserInfo = Options.info
dhall-csv.cabal view
@@ -1,5 +1,5 @@ Name: dhall-csv-Version: 1.0.0+Version: 1.0.1 Cabal-Version: >=1.10 Build-Type: Simple License: BSD3@@ -41,7 +41,7 @@ dhall >= 1.39.0 && < 1.41, filepath < 1.5 , optparse-applicative ,- prettyprinter >= 1.5.1 && < 1.8 ,+ prettyprinter >= 1.7.0 && < 1.8 , text >= 0.11.1.0 && < 1.3 , unordered-containers < 0.3 , vector >= 0.12 && < 0.13@@ -107,7 +107,7 @@ dhall-csv , filepath , tasty < 1.5 ,- tasty-silver < 3.3 ,+ tasty-silver < 3.4 , tasty-hunit >= 0.2 , unordered-containers , text ,
dhall-to-csv/Main.hs view
@@ -14,10 +14,10 @@ import qualified Dhall.Csv import qualified Dhall.Csv.Util import qualified GHC.IO.Encoding-import qualified Options.Applicative as Options-import qualified Paths_dhall_csv as Meta-import qualified System.IO+import qualified Options.Applicative as Options+import qualified Paths_dhall_csv as Meta import qualified System.Exit+import qualified System.IO data Options = Options
src/Dhall/Csv.hs view
@@ -1,4 +1,4 @@-{-#LANGUAGE OverloadedStrings#-}+{-# LANGUAGE OverloadedStrings #-} {-| This library exports two functions: `dhallToCsv` and `codeToValue`. The former converts a Dhall expression (with imports resolved already) into a@@ -83,29 +83,29 @@ , CompileError ) where -import Control.Exception (Exception, throwIO, displayException)-import Data.Csv (NamedRecord, ToField (..))-import Data.Either (fromRight)-import Data.Maybe (fromMaybe)-import Data.Sequence (Seq)-import Data.Text (Text)-import Data.Text.Prettyprint.Doc (Pretty)-import Data.Void (Void)-import Dhall.Core (Expr, DhallDouble (..))-import Dhall.Import (SemanticCacheMode (..))-import Dhall.Util (_ERROR)+import Control.Exception (Exception, displayException, throwIO)+import Data.Csv (NamedRecord, ToField (..))+import Data.Either (fromRight)+import Data.Maybe (fromMaybe)+import Data.Sequence (Seq)+import Data.Text (Text)+import Data.Void (Void)+import Dhall.Core (DhallDouble (..), Expr)+import Dhall.Import (SemanticCacheMode (..))+import Dhall.Util (_ERROR)+import Prettyprinter (Pretty) import qualified Data.Csv import qualified Data.Foldable import qualified Data.Text-import qualified Data.Text.Prettyprint.Doc.Render.Text as Pretty-import qualified Dhall.Core as Core+import qualified Dhall.Core as Core import qualified Dhall.Import import qualified Dhall.Map import qualified Dhall.Parser import qualified Dhall.Pretty-import qualified Dhall.TypeCheck as TypeCheck+import qualified Dhall.TypeCheck as TypeCheck import qualified Dhall.Util+import qualified Prettyprinter.Render.Text as Pretty import qualified System.FilePath {-| This is the exception type for errors that can arise when converting from
src/Dhall/Csv/Util.hs view
@@ -1,10 +1,10 @@-{-# LANGUAGE OverloadedStrings #-}+{-# LANGUAGE OverloadedStrings #-} module Dhall.Csv.Util (encodeCsvDefault, decodeCsvDefault) where -import Data.List (sort)-import Data.Text (Text)-import Data.Csv (NamedRecord, Record)+import Data.Csv (NamedRecord, Record)+import Data.List (sort)+import Data.Text (Text) import qualified Data.ByteString.Lazy as ByteString import qualified Data.ByteString.Lazy.Char8 as ByteString.Char8
src/Dhall/CsvToDhall.hs view
@@ -1,5 +1,5 @@-{-# LANGUAGE OverloadedStrings #-}-{-# LANGUAGE RecordWildCards #-}+{-# LANGUAGE OverloadedStrings #-}+{-# LANGUAGE RecordWildCards #-} {-| Convert CSV data to Dhall providing an expected Dhall type necessary to know which type will be interpreted.@@ -138,38 +138,38 @@ , CompileError(..) ) where -import Control.Applicative ((<|>))-import Control.Exception (Exception, throwIO, displayException)-import Control.Monad.Catch (MonadCatch, throwM)-import Data.Csv (NamedRecord)-import Data.Either (lefts, rights)-import Data.Either.Combinators (mapRight)-import Data.Foldable (toList)-import Data.List ((\\))-import Data.Text (Text)-import Data.Text.Encoding (decodeUtf8, decodeUtf8', encodeUtf8)-import Data.Text.Encoding.Error (UnicodeException)-import Data.Text.Prettyprint.Doc (Pretty)-import Data.Text.Read (decimal, double, signed)-import Data.Void (Void)-import Dhall.Core (Expr)-import Dhall.Src (Src)-import Dhall.Util (_ERROR)-import Options.Applicative (Parser)+import Control.Applicative ((<|>))+import Control.Exception (Exception, displayException, throwIO)+import Control.Monad.Catch (MonadCatch, throwM)+import Data.Csv (NamedRecord)+import Data.Either (lefts, rights)+import Data.Either.Combinators (mapRight)+import Data.Foldable (toList)+import Data.List ((\\))+import Data.Text (Text)+import Data.Text.Encoding (decodeUtf8, decodeUtf8', encodeUtf8)+import Data.Text.Encoding.Error (UnicodeException)+import Data.Text.Read (decimal, double, signed)+import Data.Void (Void)+import Dhall.Core (Expr)+import Dhall.Src (Src)+import Dhall.Util (_ERROR)+import Options.Applicative (Parser)+import Prettyprinter (Pretty) import qualified Data.Csv-import qualified Data.HashMap.Strict as HashMap-import qualified Data.Sequence as Sequence+import qualified Data.HashMap.Strict as HashMap+import qualified Data.Sequence as Sequence import qualified Data.Text-import qualified Data.Text.Prettyprint.Doc.Render.Text as Pretty-import qualified Dhall.Core as Core+import qualified Dhall.Core as Core import qualified Dhall.Import-import qualified Dhall.Map as Map+import qualified Dhall.Map as Map import qualified Dhall.Parser import qualified Dhall.Pretty-import qualified Dhall.TypeCheck as TypeCheck+import qualified Dhall.TypeCheck as TypeCheck import qualified Dhall.Util-import qualified Options.Applicative as O+import qualified Options.Applicative as O+import qualified Prettyprinter.Render.Text as Pretty -- ---------- -- Conversion
tasty/Main.hs view
@@ -2,25 +2,30 @@ module Main (main) where -import Data.Text (Text)-import Data.Void (Void)-import Dhall.CsvToDhall (defaultConversion, dhallFromCsv, typeCheckSchemaExpr, resolveSchemaExpr)-import Dhall.Core (Expr)-import Dhall.Src (Src)-import Test.Tasty (TestTree)-import Test.Tasty.Silver (findByExtension)-import System.FilePath (takeBaseName, replaceExtension, dropExtension)+import Data.Text (Text)+import Data.Void (Void)+import Dhall.Core (Expr)+import Dhall.CsvToDhall+ ( defaultConversion+ , dhallFromCsv+ , resolveSchemaExpr+ , typeCheckSchemaExpr+ )+import Dhall.Src (Src)+import System.FilePath (dropExtension, replaceExtension, takeBaseName)+import Test.Tasty (TestTree)+import Test.Tasty.Silver (findByExtension) import qualified Data.Csv-import qualified Data.Text as Text+import qualified Data.Text as Text import qualified Data.Text.IO-import qualified Dhall.Core as D+import qualified Dhall.Core as D import qualified Dhall.Csv-import qualified Dhall.CsvToDhall as CsvToDhall import qualified Dhall.Csv.Util+import qualified Dhall.CsvToDhall as CsvToDhall import qualified GHC.IO.Encoding import qualified Test.Tasty-import qualified Test.Tasty.Silver as Silver+import qualified Test.Tasty.Silver as Silver main :: IO ()