jsonnet 0.3.0.0 → 0.3.0.1
raw patch · 20 files changed
+168/−14 lines, 20 filesdep ~basedep ~containersdep ~template-haskellPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: base, containers, template-haskell
API changes (from Hackage documentation)
Files
- jsonnet.cabal +6/−6
- src/Language/Jsonnet.hs +8/−0
- src/Language/Jsonnet/Annotate.hs +13/−2
- src/Language/Jsonnet/Check.hs +8/−1
- src/Language/Jsonnet/Common.hs +8/−0
- src/Language/Jsonnet/Core.hs +8/−0
- src/Language/Jsonnet/Desugar.hs +8/−0
- src/Language/Jsonnet/Error.hs +8/−0
- src/Language/Jsonnet/Eval.hs +10/−0
- src/Language/Jsonnet/Eval/Monad.hs +8/−1
- src/Language/Jsonnet/Parser.hs +11/−1
- src/Language/Jsonnet/Parser/SrcSpan.hs +8/−1
- src/Language/Jsonnet/Pretty.hs +8/−0
- src/Language/Jsonnet/Std/Lib.hs +8/−0
- src/Language/Jsonnet/Std/TH.hs +8/−0
- src/Language/Jsonnet/Syntax.hs +8/−0
- src/Language/Jsonnet/Syntax/Annotated.hs +8/−1
- src/Language/Jsonnet/TH.hs +8/−0
- src/Language/Jsonnet/TH/QQ.hs +8/−0
- src/Language/Jsonnet/Value.hs +8/−1
jsonnet.cabal view
@@ -1,6 +1,6 @@ cabal-version: 2.2 name: jsonnet-version: 0.3.0.0+version: 0.3.0.1 synopsis: Jsonnet implementaton in pure Haskell description: Please see the README on GitHub at <https://github.com/moleike/jsonnet-haskell#readme> homepage: https://github.com/moleike/haskell-jsonnet#readme@@ -52,13 +52,13 @@ src build-depends: aeson >= 1.5.6 && < 1.6,- base >= 4.15.0 && < 4.16,+ base >= 4.14.1 && < 5, bytestring >= 0.10.12 && < 0.11,- containers >= 0.6.4 && < 0.7,+ containers >= 0.6.2 && < 0.7, scientific >= 0.3.7 && < 0.4, hashable >= 1.3.2 && < 1.4, text >= 1.2.4 && < 1.3,- template-haskell >= 2.17.0 && < 2.18,+ template-haskell >= 2.16.0 && < 2.18, data-fix >= 0.3.1 && < 0.4, transformers-compat >= 0.6.6 && < 0.7, unordered-containers >= 0.2.14 && < 0.3,@@ -92,7 +92,7 @@ Paths_jsonnet hs-source-dirs: app- ghc-options: -O2 -threaded -rtsopts -with-rtsopts=-N+ ghc-options: -threaded -rtsopts -with-rtsopts=-N build-depends: jsonnet, aeson,@@ -111,7 +111,7 @@ Paths_jsonnet hs-source-dirs: test/golden- ghc-options: -O2 -threaded -rtsopts -with-rtsopts=-N+ ghc-options: -threaded -rtsopts -with-rtsopts=-N build-depends: base , ansi-wl-pprint
src/Language/Jsonnet.hs view
@@ -1,3 +1,11 @@+{- |+Module : Language.Jsonnet+Copyright : (c) 2020-2021 Alexandre Moreno+SPDX-License-Identifier : BSD-3-Clause OR Apache-2.0+Maintainer : Alexandre Moreno <alexmorenocano@gmail.com>+Stability : experimental+Portability : non-portable+-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE LambdaCase #-}
src/Language/Jsonnet/Annotate.hs view
@@ -1,3 +1,14 @@+{- |+Module : Language.Jsonnet.Annotate+Copyright : (c) 2020-2021 Alexandre Moreno+SPDX-License-Identifier : BSD-3-Clause OR Apache-2.0+Maintainer : Alexandre Moreno <alexmorenocano@gmail.com>+Stability : experimental+Portability : non-portable++Annotated trees, based on fixplate++-} {-# LANGUAGE PatternSynonyms #-} module Language.Jsonnet.Annotate where@@ -6,9 +17,9 @@ import Data.Fix import Data.Functor.Product --- | Annotated trees, based on fixplate type AnnF f a = Product (Const a) f +-- | Annotated fixed-point type. Equivalent to CoFree f a type Ann f a = Fix (AnnF f a) pattern AnnF f a = Pair (Const a) f@@ -25,7 +36,7 @@ attrib (Fix (AnnF _ a)) = a inherit :: Functor f => (Fix f -> a -> (b, a)) -> a -> Fix f -> Ann f b-inherit h root = go root+inherit h = go where go p s@(Fix t) = let (b, a) =
src/Language/Jsonnet/Check.hs view
@@ -1,7 +1,14 @@+{- |+Module : Language.Jsonnet.Check+Copyright : (c) 2020-2021 Alexandre Moreno+SPDX-License-Identifier : BSD-3-Clause OR Apache-2.0+Maintainer : Alexandre Moreno <alexmorenocano@gmail.com>+Stability : experimental+Portability : non-portable+-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE LambdaCase #-} --- | module Language.Jsonnet.Check where import Control.Monad.Except
src/Language/Jsonnet/Common.hs view
@@ -1,3 +1,11 @@+{- |+Module : Language.Jsonnet.Common+Copyright : (c) 2020-2021 Alexandre Moreno+SPDX-License-Identifier : BSD-3-Clause OR Apache-2.0+Maintainer : Alexandre Moreno <alexmorenocano@gmail.com>+Stability : experimental+Portability : non-portable+-} {-# LANGUAGE DefaultSignatures #-} {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveFunctor #-}
src/Language/Jsonnet/Core.hs view
@@ -1,3 +1,11 @@+{- |+Module : Language.Jsonnet.Core+Copyright : (c) 2020-2021 Alexandre Moreno+SPDX-License-Identifier : BSD-3-Clause OR Apache-2.0+Maintainer : Alexandre Moreno <alexmorenocano@gmail.com>+Stability : experimental+Portability : non-portable+-} {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE DeriveTraversable #-}
src/Language/Jsonnet/Desugar.hs view
@@ -1,3 +1,11 @@+{- |+Module : Language.Jsonnet.Desugar+Copyright : (c) 2020-2021 Alexandre Moreno+SPDX-License-Identifier : BSD-3-Clause OR Apache-2.0+Maintainer : Alexandre Moreno <alexmorenocano@gmail.com>+Stability : experimental+Portability : non-portable+-} {-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-}
src/Language/Jsonnet/Error.hs view
@@ -1,3 +1,11 @@+{- |+Module : Language.Jsonnet.Error+Copyright : (c) 2020-2021 Alexandre Moreno+SPDX-License-Identifier : BSD-3-Clause OR Apache-2.0+Maintainer : Alexandre Moreno <alexmorenocano@gmail.com>+Stability : experimental+Portability : non-portable+-} {-# LANGUAGE DeriveAnyClass #-} {-# LANGUAGE ExistentialQuantification #-} {-# LANGUAGE FlexibleInstances #-}
src/Language/Jsonnet/Eval.hs view
@@ -1,3 +1,11 @@+{- |+Module : Language.Jsonnet.Eval+Copyright : (c) 2020-2021 Alexandre Moreno+SPDX-License-Identifier : BSD-3-Clause OR Apache-2.0+Maintainer : Alexandre Moreno <alexmorenocano@gmail.com>+Stability : experimental+Portability : non-portable+-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE LambdaCase #-} {-# LANGUAGE OverloadedStrings #-}@@ -6,6 +14,8 @@ {-# LANGUAGE TupleSections #-} {-# LANGUAGE TypeApplications #-} {-# LANGUAGE UndecidableInstances #-}++{-# OPTIONS_GHC -fno-warn-orphans #-} module Language.Jsonnet.Eval where
src/Language/Jsonnet/Eval/Monad.hs view
@@ -1,9 +1,16 @@+{- |+Module : Language.Jsonnet.Eval.Monad+Copyright : (c) 2020-2021 Alexandre Moreno+SPDX-License-Identifier : BSD-3-Clause OR Apache-2.0+Maintainer : Alexandre Moreno <alexmorenocano@gmail.com>+Stability : experimental+Portability : non-portable+-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE TemplateHaskell #-} --- | module Language.Jsonnet.Eval.Monad where import Control.Lens (locally, makeLenses, view)
src/Language/Jsonnet/Parser.hs view
@@ -1,9 +1,19 @@+{- |+Module : Language.Jsonnet.Parser+Copyright : (c) 2020-2021 Alexandre Moreno+SPDX-License-Identifier : BSD-3-Clause OR Apache-2.0+Maintainer : Alexandre Moreno <alexmorenocano@gmail.com>+Stability : experimental+Portability : non-portable++Parser for Jsonnet source code.++-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE RecordWildCards #-} {-# LANGUAGE TupleSections #-} --- | Parser for Jsonnet source code. module Language.Jsonnet.Parser ( parse, resolveImports,
src/Language/Jsonnet/Parser/SrcSpan.hs view
@@ -1,10 +1,17 @@+{- |+Module : Language.Jsonnet.Parser.SrcSpan+Copyright : (c) 2020-2021 Alexandre Moreno+SPDX-License-Identifier : BSD-3-Clause OR Apache-2.0+Maintainer : Alexandre Moreno <alexmorenocano@gmail.com>+Stability : experimental+Portability : non-portable+-} {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE TemplateHaskell #-} --- | module Language.Jsonnet.Parser.SrcSpan where import Data.Data
src/Language/Jsonnet/Pretty.hs view
@@ -1,3 +1,11 @@+{- |+Module : Language.Jsonnet.Pretty+Copyright : (c) 2020-2021 Alexandre Moreno+SPDX-License-Identifier : BSD-3-Clause OR Apache-2.0+Maintainer : Alexandre Moreno <alexmorenocano@gmail.com>+Stability : experimental+Portability : non-portable+-} {-# LANGUAGE BangPatterns #-} {-# LANGUAGE LambdaCase #-} {-# LANGUAGE NamedFieldPuns #-}
src/Language/Jsonnet/Std/Lib.hs view
@@ -1,3 +1,11 @@+{- |+Module : Language.Jsonnet.Std.Lib+Copyright : (c) 2020-2021 Alexandre Moreno+SPDX-License-Identifier : BSD-3-Clause OR Apache-2.0+Maintainer : Alexandre Moreno <alexmorenocano@gmail.com>+Stability : experimental+Portability : non-portable+-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE LambdaCase #-} {-# LANGUAGE LiberalTypeSynonyms #-}
src/Language/Jsonnet/Std/TH.hs view
@@ -1,3 +1,11 @@+{- |+Module : Language.Jsonnet.Std.TH+Copyright : (c) 2020-2021 Alexandre Moreno+SPDX-License-Identifier : BSD-3-Clause OR Apache-2.0+Maintainer : Alexandre Moreno <alexmorenocano@gmail.com>+Stability : experimental+Portability : non-portable+-} {-# LANGUAGE QuasiQuotes #-} {-# LANGUAGE TemplateHaskell #-}
src/Language/Jsonnet/Syntax.hs view
@@ -1,3 +1,11 @@+{- |+Module : Language.Jsonnet.Syntax+Copyright : (c) 2020-2021 Alexandre Moreno+SPDX-License-Identifier : BSD-3-Clause OR Apache-2.0+Maintainer : Alexandre Moreno <alexmorenocano@gmail.com>+Stability : experimental+Portability : non-portable+-} {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE DeriveTraversable #-}
src/Language/Jsonnet/Syntax/Annotated.hs view
@@ -1,4 +1,11 @@--- |+{- |+Module : Language.Jsonnet.Syntax.Annotated+Copyright : (c) 2020-2021 Alexandre Moreno+SPDX-License-Identifier : BSD-3-Clause OR Apache-2.0+Maintainer : Alexandre Moreno <alexmorenocano@gmail.com>+Stability : experimental+Portability : non-portable+-} module Language.Jsonnet.Syntax.Annotated where import Data.Fix
src/Language/Jsonnet/TH.hs view
@@ -1,3 +1,11 @@+{- |+Module : Language.Jsonnet.TH+Copyright : (c) 2020-2021 Alexandre Moreno+SPDX-License-Identifier : BSD-3-Clause OR Apache-2.0+Maintainer : Alexandre Moreno <alexmorenocano@gmail.com>+Stability : experimental+Portability : non-portable+-} {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE DeriveLift #-}
src/Language/Jsonnet/TH/QQ.hs view
@@ -1,3 +1,11 @@+{- |+Module : Language.Jsonnet.TH.QQ+Copyright : (c) 2020-2021 Alexandre Moreno+SPDX-License-Identifier : BSD-3-Clause OR Apache-2.0+Maintainer : Alexandre Moreno <alexmorenocano@gmail.com>+Stability : experimental+Portability : non-portable+-} module Language.Jsonnet.TH.QQ where import qualified Data.Text as T
src/Language/Jsonnet/Value.hs view
@@ -1,3 +1,11 @@+{- |+Module : Language.Jsonnet.Value+Copyright : (c) 2020-2021 Alexandre Moreno+SPDX-License-Identifier : BSD-3-Clause OR Apache-2.0+Maintainer : Alexandre Moreno <alexmorenocano@gmail.com>+Stability : experimental+Portability : non-portable+-} {-# LANGUAGE DeriveFoldable #-} {-# LANGUAGE DeriveFunctor #-} {-# LANGUAGE DeriveGeneric #-}@@ -7,7 +15,6 @@ {-# LANGUAGE PatternSynonyms #-} {-# LANGUAGE RecordWildCards #-} --- | module Language.Jsonnet.Value where import Control.Lens (view)