dhall-openapi 1.0.2 → 1.0.3
raw patch · 4 files changed
+58/−54 lines, 4 filesdep ~megaparsecdep ~optparse-applicativedep ~textPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: megaparsec, optparse-applicative, text
API changes (from Hackage documentation)
Files
- dhall-openapi.cabal +5/−4
- openapi-to-dhall/Main.hs +22/−19
- src/Dhall/Kubernetes/Convert.hs +18/−18
- src/Dhall/Kubernetes/Types.hs +13/−13
dhall-openapi.cabal view
@@ -1,6 +1,6 @@-Cabal-Version: >=1.10+Cabal-Version: >=1.11 Name: dhall-openapi-Version: 1.0.2+Version: 1.0.3 Homepage: https://github.com/dhall-lang/dhall-haskell/tree/master/dhall-openapi#dhall-openapi Author: Fabrizio Ferrai Maintainer: Gabriel439@gmail.com@@ -43,7 +43,8 @@ dhall , dhall-openapi , filepath >= 1.4 && < 1.5 ,- megaparsec >= 7.0 && < 9.2 ,+ -- megaparsec follows SemVer: https://github.com/mrkkrp/megaparsec/issues/469#issuecomment-927918469+ megaparsec >= 7.0 && < 10 , optparse-applicative >= 0.14.3.0 && < 0.17 , parser-combinators , prettyprinter ,@@ -76,7 +77,7 @@ Ghc-Options: -Wall Build-Depends: base >= 4.11.0.0 && < 5 ,- aeson >= 1.0.0.0 && < 1.6 ,+ aeson >= 1.0.0.0 && < 2.1 , containers >= 0.5.8.0 && < 0.7 , dhall >= 1.38.0 && < 1.41 , prettyprinter >= 1.7.0 && < 1.8 ,
openapi-to-dhall/Main.hs view
@@ -4,7 +4,10 @@ module Main (main) where import Control.Applicative.Combinators (option, sepBy1)-import Data.Aeson (decodeFileStrict, eitherDecodeFileStrict)+import Data.Aeson+ ( decodeFileStrict+ , eitherDecodeFileStrict+ ) import Data.Bifunctor (bimap) import Data.Foldable (for_) import Data.Text (Text, pack, unpack)@@ -14,45 +17,45 @@ import Numeric.Natural (Natural) import Text.Megaparsec ( Parsec+ , eof , errorBundlePretty+ , optional , parse , some- , optional , (<|>)- , eof ) import Text.Megaparsec.Char (alphaNumChar, char) -import Dhall.Kubernetes.Data (patchCyclicImports)+import Dhall.Kubernetes.Data (patchCyclicImports) import Dhall.Kubernetes.Types ( DuplicateHandler- , ModelName (..) , ModelHierarchy+ , ModelName (..) , Prefix , Swagger (..) )-import System.FilePath ((</>))+import System.FilePath ((</>)) -import qualified Data.List as List-import qualified Data.Map.Strict as Data.Map-import qualified Data.Ord as Ord-import qualified Data.Text as Text-import qualified Data.Text.IO as Text-import qualified Data.Text.Prettyprint.Doc as Pretty-import qualified Data.Text.Prettyprint.Doc.Render.Text as PrettyText-import qualified Dhall.Core as Dhall+import qualified Data.List as List+import qualified Data.Map.Strict as Data.Map+import qualified Data.Ord as Ord+import qualified Data.Text as Text+import qualified Data.Text.IO as Text+import qualified Dhall.Core as Dhall import qualified Dhall.Format-import qualified Dhall.Kubernetes.Convert as Convert-import qualified Dhall.Kubernetes.Types as Types+import qualified Dhall.Kubernetes.Convert as Convert+import qualified Dhall.Kubernetes.Types as Types import qualified Dhall.Map import qualified Dhall.Parser import qualified Dhall.Util import qualified GHC.IO.Encoding import qualified Options.Applicative+import qualified Prettyprinter as Pretty+import qualified Prettyprinter.Render.Text as PrettyText+import qualified System.Directory as Directory import qualified System.IO-import qualified System.Directory as Directory-import qualified Text.Megaparsec as Megaparsec-import qualified Text.Megaparsec.Char.Lexer as Megaparsec.Lexer+import qualified Text.Megaparsec as Megaparsec+import qualified Text.Megaparsec.Char.Lexer as Megaparsec.Lexer -- | Top-level program options data Options = Options
src/Dhall/Kubernetes/Convert.hs view
@@ -1,5 +1,5 @@-{-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE FlexibleContexts #-}+{-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE QuasiQuotes #-} module Dhall.Kubernetes.Convert@@ -11,26 +11,26 @@ , pathSplitter ) where -import Control.Applicative (empty)+import Control.Applicative (empty) import Data.Aeson-import Data.Aeson.Types (Parser, parseMaybe)-import Data.Bifunctor (first, second)-import Data.Maybe (fromMaybe, mapMaybe)-import Data.Scientific (Scientific)-import Data.Set (Set)-import Data.Text (Text)+import Data.Aeson.Types (Parser, parseMaybe)+import Data.Bifunctor (first, second)+import Data.Maybe (fromMaybe, mapMaybe)+import Data.Scientific (Scientific)+import Data.Set (Set)+import Data.Text (Text) import Dhall.Kubernetes.Types-import GHC.Generics (Generic, Rep)+import GHC.Generics (Generic, Rep) -import qualified Data.Char as Char-import qualified Data.List as List-import qualified Data.Map.Strict as Data.Map-import qualified Data.Maybe as Maybe-import qualified Data.Set as Set-import qualified Data.Sort as Sort-import qualified Data.Text as Text-import qualified Data.Tuple as Tuple-import qualified Dhall.Core as Dhall+import qualified Data.Char as Char+import qualified Data.List as List+import qualified Data.Map.Strict as Data.Map+import qualified Data.Maybe as Maybe+import qualified Data.Set as Set+import qualified Data.Sort as Sort+import qualified Data.Text as Text+import qualified Data.Tuple as Tuple+import qualified Dhall.Core as Dhall import qualified Dhall.Map import qualified Dhall.Optics
src/Dhall/Kubernetes/Types.hs view
@@ -1,19 +1,19 @@ module Dhall.Kubernetes.Types where -import qualified Data.Text as Text-import qualified Data.Vector as Vector-import qualified Dhall.Core as Dhall-import qualified Dhall.Parser as Dhall+import qualified Data.Text as Text+import qualified Data.Vector as Vector+import qualified Dhall.Core as Dhall+import qualified Dhall.Parser as Dhall -import Control.Applicative (optional)-import Control.Monad (join)-import Data.Aeson-import Data.Map (Map)-import Data.Scientific (Scientific)-import Data.Set (Set)-import Data.Text (Text)-import Data.Text.Prettyprint.Doc (Pretty)-import GHC.Generics (Generic)+import Control.Applicative (optional)+import Control.Monad (join)+import Data.Aeson+import Data.Map (Map)+import Data.Scientific (Scientific)+import Data.Set (Set)+import Data.Text (Text)+import GHC.Generics (Generic)+import Prettyprinter (Pretty) type Expr = Dhall.Expr Dhall.Src Dhall.Import