on master help sign in
.gitignore+6
since splitsnapshots
unifiedsplit
@@ -1,8 +1,11 @@
1dist
1dist
2dist-newstyle
2dist-newstyle
3+.ghc.environment.*
3.cabal-sandbox/
4.cabal-sandbox/
4cabal.sandbox.config
5cabal.sandbox.config
5.stack-work/
6.stack-work/
7+.stack-work-bench/
8+*.yaml.lock
6
9
7*.o
10*.o
8*.hi
11*.hi
@@ -11,6 +14,9 @@ cabal.sandbox.config
11.\#*
14.\#*
12\#*
15\#*
13
16
17+# Emacs backup files
18+*~
19+
14benchmarks/AesonEncode
20benchmarks/AesonEncode
15
21
16tests/qc
22tests/qc
.hlint.yamlnew file+11
@@ -0,0 +1,11 @@
1+# Ignore some builtin hints
2+- ignore:
3+ name: "Reduce duplication"
4+ within:
5+ - Data.Aeson.Types.ToJSON
6+- ignore:
7+ name: "Eta reduce"
8+- ignore:
9+ name: "Use newtype instead of data"
10+ within:
11+ - Data.Aeson.Types.Internal
.travis.yml+41−14
@@ -12,31 +12,58 @@ cache:
12 - $HOME/.stack
12 - $HOME/.stack
13 - $HOME/.cabsnap
13 - $HOME/.cabsnap
14 - $HOME/.cabal/packages
14 - $HOME/.cabal/packages
15+ - $HOME/.cabal/store
15
16
16before_cache:
17before_cache:
17 - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
18 - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
18− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.tar
19+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*
20+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json
21+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache
22+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
23+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
19
24
20matrix:
25matrix:
21 include:
26 include:
22− - env: BUILD=stack CABALVER=1.22 GHCVER=7.10.3 STACK_YAML=stack-bench.yaml
27+
28+ - env: BUILD=hlint CABALVER=2.2 GHCVER=8.4.4
29+ compiler: ": #GHC 8.4.4"
30+ addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.4], sources: [hvr-ghc]}}
31+
32+ - env: BUILD=stack CABALVER=2.4 GHCVER=8.6.5 STACK_YAML=stack-bench.yaml
33+ compiler: ": #GHC 8.6.5"
34+ addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.5], sources: [hvr-ghc]}}
35+
36+ - env: BUILD=stack CABALVER=2.2 GHCVER=8.6.5 STACK_YAML=stack-ffi-unescape.yaml
37+ compiler: ": #GHC 8.6.5"
38+ addons: {apt: {packages: [cabal-install-2.2,ghc-8.6.5], sources: [hvr-ghc]}}
39+
40+ - env: BUILD=cabal2 CABALVER=3.0 GHCVER=8.8.1
41+ compiler: ": #GHC 8.8.1"
42+ addons: {apt: {packages: [cabal-install-3.0,ghc-8.8.1], sources: [hvr-ghc]}}
43+
44+ - env: BUILD=cabal CABALVER=2.4 GHCVER=8.6.5
45+ compiler: ": #GHC 8.6.5"
46+ addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.5], sources: [hvr-ghc]}}
47+
48+ - env: BUILD=cabal CABALVER=2.2 GHCVER=8.4.4
49+ compiler: ": #GHC 8.4.4"
50+ addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.4], sources: [hvr-ghc]}}
51+
52+ - env: BUILD=cabal CABALVER=2.0 GHCVER=8.2.2
53+ compiler: ": #GHC 8.2.2"
54+ addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}
55+
56+ - env: BUILD=cabal CABALVER=2.0 GHCVER=8.0.2
57+ compiler: ": #GHC 8.0.2"
58+ addons: {apt: {packages: [cabal-install-2.0,ghc-8.0.2], sources: [hvr-ghc]}}
59+
60+ - env: BUILD=cabal CABALVER=1.22 GHCVER=7.10.3
23 compiler: ": #GHC 7.10.3"
61 compiler: ": #GHC 7.10.3"
24 addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
62 addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
25− - env: BUILD=cabal CABALVER=1.18 GHCVER=7.4.2
63+
26− compiler: ": #GHC 7.4.2"
27− addons: {apt: {packages: [cabal-install-1.18,ghc-7.4.2], sources: [hvr-ghc]}}
28− - env: BUILD=cabal CABALVER=1.18 GHCVER=7.6.3
29− compiler: ": #GHC 7.6.3"
30− addons: {apt: {packages: [cabal-install-1.18,ghc-7.6.3], sources: [hvr-ghc]}}
31 - env: BUILD=cabal CABALVER=1.18 GHCVER=7.8.4
64 - env: BUILD=cabal CABALVER=1.18 GHCVER=7.8.4
32 compiler: ": #GHC 7.8.4"
65 compiler: ": #GHC 7.8.4"
33 addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
66 addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
34− - env: BUILD=cabal CABALVER=1.22 GHCVER=7.10.2
35− compiler: ": #GHC 7.10.2"
36− addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.2], sources: [hvr-ghc]}}
37− - env: BUILD=cabal CABALVER=1.24 GHCVER=8.0.1
38− compiler: ": #GHC 8.0.1"
39− addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1], sources: [hvr-ghc]}}
40
67
41before_install:
68before_install:
42 - unset CC
69 - unset CC
CONTRIBUTING.md+39−1
@@ -8,7 +8,7 @@ Changes that affect users of aeson should be mentioned in `changelog.md`. It sho
8 * When it should be used
8 * When it should be used
9 * What it supersedes
9 * What it supersedes
10
10
11−Add this entry under an `# Upcoming` header above existing releases.
11+Add this entry under an `## Upcoming` header above existing releases.
12
12
13The exact format of entries is not important as we'll go through everything before a release is made.
13The exact format of entries is not important as we'll go through everything before a release is made.
14
14
@@ -58,3 +58,41 @@ import Foo as F
58import Qux (Q(..), q)
58import Qux (Q(..), q)
59import qualified A
59import qualified A
60```
60```
61+
62+## Development Workflow (If you plan on using Stack)
63+
64+Here we outline a general workflow new contributors could adopt for a nice incremental development experience.
65+
66+The root folder consists of two stack-*.yaml config files.
67+
68+1. stack-nightly.yaml - Config file defines all the settings to build and test any changes.
69+2. stack-bench.yaml - Used to run benchmark tests.
70+3. stack-ffi-unescape.yaml - This is for replacing certain parts with a C-implementation.
71+
72+Therefore, a ghci development experience would be:
73+
74+1. `stack ghci --stack-yaml stack-nightly.yaml --test`
75+2. :r to recompile
76+3. `main` to run all tests, or `:main --pattern Foo` to run specific tests matched by pattern.
77+
78+Some discussion on this topic can also be found here [here](https://github.com/bos/aeson/issues/733)
79+
80+Of course before submitting a PR, the following steps are recommended:
81+
82+1. 'stack test --stack-yaml stack-nightly.yaml` - Run the entire suite of tests
83+2. `make hlint` - Run hlint on the source folders.
84+3. 'stack test --stack-yaml stack-bench.yaml` - Run the benchmark tests if you believe your changes could affect the benchmarks.
85+
86+## Development Workflow (If you plan on using Cabal)
87+
88+A ghci development experience would be:
89+
90+1. `cabal new-repl test:tests`
91+2. `:r` to recompile
92+3. `Main.main` to run all tests, or `:m Main; :main --pattern Foo` to run specific tests matched by pattern.
93+
94+Of course before submitting a PR, the following steps are recommended:
95+
96+1. `cabal new-test` - Run the entire suite of tests
97+2. `make hlint` - Run hlint on the source folders.
98+3. Uncomment the `benchmarks` line in `cabal.project` - Run the benchmark tests if you believe your changes could affect the benchmarks.
Data/Aeson.hs+79−7
@@ -1,3 +1,4 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
1-- |
2-- |
2-- Module: Data.Aeson
3-- Module: Data.Aeson
3-- Copyright: (c) 2011-2016 Bryan O'Sullivan
4-- Copyright: (c) 2011-2016 Bryan O'Sullivan
@@ -38,11 +39,16 @@ module Data.Aeson
38 , eitherDecode
39 , eitherDecode
39 , eitherDecode'
40 , eitherDecode'
40 , encode
41 , encode
42+ , encodeFile
41 -- ** Variants for strict bytestrings
43 -- ** Variants for strict bytestrings
42 , decodeStrict
44 , decodeStrict
45+ , decodeFileStrict
43 , decodeStrict'
46 , decodeStrict'
47+ , decodeFileStrict'
44 , eitherDecodeStrict
48 , eitherDecodeStrict
49+ , eitherDecodeFileStrict
45 , eitherDecodeStrict'
50 , eitherDecodeStrict'
51+ , eitherDecodeFileStrict'
46 -- * Core JSON types
52 -- * Core JSON types
47 , Value(..)
53 , Value(..)
48 , Encoding
54 , Encoding
@@ -57,11 +63,18 @@ module Data.Aeson
57 , fromJSON
63 , fromJSON
58 , ToJSON(..)
64 , ToJSON(..)
59 , KeyValue(..)
65 , KeyValue(..)
66+ , (<?>)
67+ , JSONPath
60 -- ** Keys for maps
68 -- ** Keys for maps
61 , ToJSONKey(..)
69 , ToJSONKey(..)
62 , ToJSONKeyFunction(..)
70 , ToJSONKeyFunction(..)
63 , FromJSONKey(..)
71 , FromJSONKey(..)
64 , FromJSONKeyFunction(..)
72 , FromJSONKeyFunction(..)
73+ -- *** Generic keys
74+ , GToJSONKey()
75+ , genericToJSONKey
76+ , GFromJSONKey()
77+ , genericFromJSONKey
65 -- ** Liftings to unary and binary type constructors
78 -- ** Liftings to unary and binary type constructors
66 , FromJSON1(..)
79 , FromJSON1(..)
67 , parseJSON1
80 , parseJSON1
@@ -76,8 +89,8 @@ module Data.Aeson
76 -- ** Generic JSON classes and options
89 -- ** Generic JSON classes and options
77 , GFromJSON(..)
90 , GFromJSON(..)
78 , FromArgs(..)
91 , FromArgs(..)
79− , GToJSON(..)
92+ , GToJSON
80− , GToEncoding(..)
93+ , GToEncoding
81 , ToArgs(..)
94 , ToArgs(..)
82 , Zero
95 , Zero
83 , One
96 , One
@@ -87,15 +100,34 @@ module Data.Aeson
87 , genericLiftToEncoding
100 , genericLiftToEncoding
88 , genericParseJSON
101 , genericParseJSON
89 , genericLiftParseJSON
102 , genericLiftParseJSON
103+ -- ** Generic and TH encoding configuration
104+ , Options
90 , defaultOptions
105 , defaultOptions
106+ -- *** Options fields
107+ -- $optionsFields
108+ , fieldLabelModifier
109+ , constructorTagModifier
110+ , allNullaryToStringTag
111+ , omitNothingFields
112+ , sumEncoding
113+ , unwrapUnaryRecords
114+ , tagSingleConstructors
115+ -- *** Options utilities
116+ , SumEncoding(..)
117+ , camelTo2
118+ , defaultTaggedObject
119+ -- ** Options for object keys
120+ , JSONKeyOptions
121+ , keyModifier
122+ , defaultJSONKeyOptions
91
123
92 -- * Inspecting @'Value's@
124 -- * Inspecting @'Value's@
93 , withObject
125 , withObject
94 , withText
126 , withText
95 , withArray
127 , withArray
96− , withNumber
97 , withScientific
128 , withScientific
98 , withBool
129 , withBool
130+ , withEmbeddedJSON
99 -- * Constructors and accessors
131 -- * Constructors and accessors
100 , Series
132 , Series
101 , pairs
133 , pairs
@@ -108,16 +140,16 @@ module Data.Aeson
108 -- * Parsing
140 -- * Parsing
109 , json
141 , json
110 , json'
142 , json'
143+ , parseIndexedJSON
111 ) where
144 ) where
112
145
113−import Prelude ()
114import Prelude.Compat
146import Prelude.Compat
115
147
116−import Data.Aeson.Types.FromJSON (ifromJSON)
148+import Data.Aeson.Types.FromJSON (ifromJSON, parseIndexedJSON)
117import Data.Aeson.Encoding (encodingToLazyByteString)
149import Data.Aeson.Encoding (encodingToLazyByteString)
118import Data.Aeson.Parser.Internal (decodeWith, decodeStrictWith, eitherDecodeWith, eitherDecodeStrictWith, jsonEOF, json, jsonEOF', json')
150import Data.Aeson.Parser.Internal (decodeWith, decodeStrictWith, eitherDecodeWith, eitherDecodeStrictWith, jsonEOF, json, jsonEOF', json')
119import Data.Aeson.Types
151import Data.Aeson.Types
120−import Data.Aeson.Types.Internal (JSONPath, formatError)
152+import Data.Aeson.Types.Internal (JSONPath, formatError, (<?>))
121import qualified Data.ByteString as B
153import qualified Data.ByteString as B
122import qualified Data.ByteString.Lazy as L
154import qualified Data.ByteString.Lazy as L
123
155
@@ -127,6 +159,10 @@ import qualified Data.ByteString.Lazy as L
127encode :: (ToJSON a) => a -> L.ByteString
159encode :: (ToJSON a) => a -> L.ByteString
128encode = encodingToLazyByteString . toEncoding
160encode = encodingToLazyByteString . toEncoding
129
161
162+-- | Efficiently serialize a JSON value as a lazy 'L.ByteString' and write it to a file.
163+encodeFile :: (ToJSON a) => FilePath -> a -> IO ()
164+encodeFile fp = L.writeFile fp . encode
165+
130-- | Efficiently deserialize a JSON value from a lazy 'L.ByteString'.
166-- | Efficiently deserialize a JSON value from a lazy 'L.ByteString'.
131-- If this fails due to incomplete or invalid input, 'Nothing' is
167-- If this fails due to incomplete or invalid input, 'Nothing' is
132-- returned.
168-- returned.
@@ -153,6 +189,18 @@ decodeStrict :: (FromJSON a) => B.ByteString -> Maybe a
153decodeStrict = decodeStrictWith jsonEOF fromJSON
189decodeStrict = decodeStrictWith jsonEOF fromJSON
154{-# INLINE decodeStrict #-}
190{-# INLINE decodeStrict #-}
155
191
192+-- | Efficiently deserialize a JSON value from a file.
193+-- If this fails due to incomplete or invalid input, 'Nothing' is
194+-- returned.
195+--
196+-- The input file's content must consist solely of a JSON document,
197+-- with no trailing data except for whitespace.
198+--
199+-- This function parses immediately, but defers conversion. See
200+-- 'json' for details.
201+decodeFileStrict :: (FromJSON a) => FilePath -> IO (Maybe a)
202+decodeFileStrict = fmap decodeStrict . B.readFile
203+
156-- | Efficiently deserialize a JSON value from a lazy 'L.ByteString'.
204-- | Efficiently deserialize a JSON value from a lazy 'L.ByteString'.
157-- If this fails due to incomplete or invalid input, 'Nothing' is
205-- If this fails due to incomplete or invalid input, 'Nothing' is
158-- returned.
206-- returned.
@@ -179,6 +227,18 @@ decodeStrict' :: (FromJSON a) => B.ByteString -> Maybe a
179decodeStrict' = decodeStrictWith jsonEOF' fromJSON
227decodeStrict' = decodeStrictWith jsonEOF' fromJSON
180{-# INLINE decodeStrict' #-}
228{-# INLINE decodeStrict' #-}
181
229
230+-- | Efficiently deserialize a JSON value from a file.
231+-- If this fails due to incomplete or invalid input, 'Nothing' is
232+-- returned.
233+--
234+-- The input file's content must consist solely of a JSON document,
235+-- with no trailing data except for whitespace.
236+--
237+-- This function parses and performs conversion immediately. See
238+-- 'json'' for details.
239+decodeFileStrict' :: (FromJSON a) => FilePath -> IO (Maybe a)
240+decodeFileStrict' = fmap decodeStrict' . B.readFile
241+
182eitherFormatError :: Either (JSONPath, String) a -> Either String a
242eitherFormatError :: Either (JSONPath, String) a -> Either String a
183eitherFormatError = either (Left . uncurry formatError) Right
243eitherFormatError = either (Left . uncurry formatError) Right
184{-# INLINE eitherFormatError #-}
244{-# INLINE eitherFormatError #-}
@@ -194,6 +254,12 @@ eitherDecodeStrict =
194 eitherFormatError . eitherDecodeStrictWith jsonEOF ifromJSON
254 eitherFormatError . eitherDecodeStrictWith jsonEOF ifromJSON
195{-# INLINE eitherDecodeStrict #-}
255{-# INLINE eitherDecodeStrict #-}
196
256
257+-- | Like 'decodeFileStrict' but returns an error message when decoding fails.
258+eitherDecodeFileStrict :: (FromJSON a) => FilePath -> IO (Either String a)
259+eitherDecodeFileStrict =
260+ fmap (eitherFormatError . eitherDecodeStrictWith jsonEOF ifromJSON) . B.readFile
261+{-# INLINE eitherDecodeFileStrict #-}
262+
197-- | Like 'decode'' but returns an error message when decoding fails.
263-- | Like 'decode'' but returns an error message when decoding fails.
198eitherDecode' :: (FromJSON a) => L.ByteString -> Either String a
264eitherDecode' :: (FromJSON a) => L.ByteString -> Either String a
199eitherDecode' = eitherFormatError . eitherDecodeWith jsonEOF' ifromJSON
265eitherDecode' = eitherFormatError . eitherDecodeWith jsonEOF' ifromJSON
@@ -205,6 +271,12 @@ eitherDecodeStrict' =
205 eitherFormatError . eitherDecodeStrictWith jsonEOF' ifromJSON
271 eitherFormatError . eitherDecodeStrictWith jsonEOF' ifromJSON
206{-# INLINE eitherDecodeStrict' #-}
272{-# INLINE eitherDecodeStrict' #-}
207
273
274+-- | Like 'decodeFileStrict'' but returns an error message when decoding fails.
275+eitherDecodeFileStrict' :: (FromJSON a) => FilePath -> IO (Either String a)
276+eitherDecodeFileStrict' =
277+ fmap (eitherFormatError . eitherDecodeStrictWith jsonEOF' ifromJSON) . B.readFile
278+{-# INLINE eitherDecodeFileStrict' #-}
279+
208-- $use
280-- $use
209--
281--
210-- This section contains basic information on the different ways to
282-- This section contains basic information on the different ways to
@@ -366,7 +438,7 @@ eitherDecodeStrict' =
366-- The 'Object' type contains JSON objects:
438-- The 'Object' type contains JSON objects:
367--
439--
368-- > λ> decode "{\"name\":\"Dave\",\"age\":2}" :: Maybe Object
440-- > λ> decode "{\"name\":\"Dave\",\"age\":2}" :: Maybe Object
369−-- > Just (fromList) [("name",String "Dave"),("age",Number 2)]
441+-- > Just (fromList [("name",String "Dave"),("age",Number 2)])
370--
442--
371-- You can extract values from it with a parser using 'parse',
443-- You can extract values from it with a parser using 'parse',
372-- 'parseEither' or, in this example, 'parseMaybe':
444-- 'parseEither' or, in this example, 'parseMaybe':
Data/Aeson/Encode.hs+2−1
@@ -1,3 +1,4 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
1-- |
2-- |
2-- Module: Data.Aeson.Encode
3-- Module: Data.Aeson.Encode
3-- Copyright: (c) 2012-2016 Bryan O'Sullivan
4-- Copyright: (c) 2012-2016 Bryan O'Sullivan
@@ -8,13 +9,13 @@
8-- Portability: portable
9-- Portability: portable
9--
10--
10-- This module is left to supply limited backwards-compatibility.
11-- This module is left to supply limited backwards-compatibility.
12+
11module Data.Aeson.Encode {-# DEPRECATED "Use Data.Aeson or Data.Aeson.Text instead" #-}
13module Data.Aeson.Encode {-# DEPRECATED "Use Data.Aeson or Data.Aeson.Text instead" #-}
12 (
14 (
13 encode
15 encode
14 , encodeToTextBuilder
16 , encodeToTextBuilder
15 ) where
17 ) where
16
18
17−import Prelude ()
18
19
19import Data.ByteString.Lazy (ByteString)
20import Data.ByteString.Lazy (ByteString)
20import Data.Text.Lazy.Builder (Builder)
21import Data.Text.Lazy.Builder (Builder)
Data/Aeson/Encoding.hs+3−1
@@ -1,8 +1,10 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
1-- |
2-- |
2--
3--
3-- Functions in this module return well-formed 'Encoding''.
4-- Functions in this module return well-formed 'Encoding''.
4-- Polymorphic variants, which return @'Encoding' a@, return a textual JSON
5-- Polymorphic variants, which return @'Encoding' a@, return a textual JSON
5-- value, so it can be used as both @'Encoding'' 'Text'@ and @'Encoding' = 'Encoding'' 'Value'@.
6-- value, so it can be used as both @'Encoding'' 'Text'@ and @'Encoding' = 'Encoding'' 'Value'@.
7+
6module Data.Aeson.Encoding
8module Data.Aeson.Encoding
7 (
9 (
8 -- * Encoding
10 -- * Encoding
@@ -14,6 +16,7 @@ module Data.Aeson.Encoding
14 , Series
16 , Series
15 , pairs
17 , pairs
16 , pair
18 , pair
19+ , pairStr
17 , pair'
20 , pair'
18 -- * Predicates
21 -- * Predicates
19 , nullEncoding
22 , nullEncoding
@@ -48,6 +51,5 @@ module Data.Aeson.Encoding
48 , value
51 , value
49 ) where
52 ) where
50
53
51−import Prelude ()
52
54
53import Data.Aeson.Encoding.Internal
55import Data.Aeson.Encoding.Internal
Data/Aeson/Encoding/Builder.hs+6−81
@@ -1,7 +1,6 @@
1{-# LANGUAGE BangPatterns #-}
1{-# LANGUAGE BangPatterns #-}
2−{-# LANGUAGE CPP #-}
2+{-# LANGUAGE NoImplicitPrelude #-}
3−{-# LANGUAGE OverloadedStrings #-}
3+{-# LANGUAGE TupleSections #-}
4−
5-- |
4-- |
6-- Module: Data.Aeson.Encoding.Builder
5-- Module: Data.Aeson.Encoding.Builder
7-- Copyright: (c) 2011 MailRank, Inc.
6-- Copyright: (c) 2011 MailRank, Inc.
@@ -37,7 +36,6 @@ module Data.Aeson.Encoding.Builder
37 , ascii5
36 , ascii5
38 ) where
37 ) where
39
38
40−import Prelude ()
41import Prelude.Compat
39import Prelude.Compat
42
40
43import Data.Aeson.Internal.Time
41import Data.Aeson.Internal.Time
@@ -46,8 +44,9 @@ import Data.ByteString.Builder as B
46import Data.ByteString.Builder.Prim as BP
44import Data.ByteString.Builder.Prim as BP
47import Data.ByteString.Builder.Scientific (scientificBuilder)
45import Data.ByteString.Builder.Scientific (scientificBuilder)
48import Data.Char (chr, ord)
46import Data.Char (chr, ord)
49−import Data.Monoid ((<>))
47+import Data.Semigroup ((<>))
50import Data.Scientific (Scientific, base10Exponent, coefficient)
48import Data.Scientific (Scientific, base10Exponent, coefficient)
49+import Data.Text.Encoding (encodeUtf8BuilderEscaped)
51import Data.Time (UTCTime(..))
50import Data.Time (UTCTime(..))
52import Data.Time.Calendar (Day(..), toGregorian)
51import Data.Time.Calendar (Day(..), toGregorian)
53import Data.Time.LocalTime
52import Data.Time.LocalTime
@@ -56,20 +55,6 @@ import qualified Data.HashMap.Strict as HMS
56import qualified Data.Text as T
55import qualified Data.Text as T
57import qualified Data.Vector as V
56import qualified Data.Vector as V
58
57
59−#if MIN_VERSION_bytestring(0,10,4)
60−import Data.Text.Encoding (encodeUtf8BuilderEscaped)
61−#else
62−import Data.Bits ((.&.))
63−import Data.Text.Internal (Text(..))
64−import Data.Text.Internal.Unsafe.Shift (shiftR)
65−import Foreign.Ptr (minusPtr, plusPtr)
66−import Foreign.Storable (poke)
67−import qualified Data.ByteString.Builder.Internal as B
68−import qualified Data.ByteString.Builder.Prim.Internal as BP
69−import qualified Data.Text.Array as A
70−import qualified Data.Text.Internal.Encoding.Utf16 as U16
71−#endif
72−
73-- | Encode a JSON value to a "Data.ByteString" 'B.Builder'.
58-- | Encode a JSON value to a "Data.ByteString" 'B.Builder'.
74--
59--
75-- Use this function if you are encoding over the wire, or need to
60-- Use this function if you are encoding over the wire, or need to
@@ -148,7 +133,7 @@ c2w c = fromIntegral (ord c)
148-- | Encode a JSON number.
133-- | Encode a JSON number.
149scientific :: Scientific -> Builder
134scientific :: Scientific -> Builder
150scientific s
135scientific s
151− | e < 0 = scientificBuilder s
136+ | e < 0 || e > 1024 = scientificBuilder s
152 | otherwise = B.integerDec (coefficient s * 10 ^ e)
137 | otherwise = B.integerDec (coefficient s * 10 ^ e)
153 where
138 where
154 e = base10Exponent s
139 e = base10Exponent s
@@ -216,7 +201,7 @@ timeOfDay64 (TOD h m s)
216 !(T mh ml) = twoDigits m
201 !(T mh ml) = twoDigits m
217 !(T sh sl) = twoDigits (fromIntegral real)
202 !(T sh sl) = twoDigits (fromIntegral real)
218 (real,frac) = s `quotRem` pico
203 (real,frac) = s `quotRem` pico
219− showFrac = (\x -> ('.', x)) >$< (BP.liftFixedToBounded BP.char7 >*< trunc12)
204+ showFrac = ('.',) >$< (BP.liftFixedToBounded BP.char7 >*< trunc12)
220 trunc12 = (`quotRem` micro) >$<
205 trunc12 = (`quotRem` micro) >$<
221 BP.condB (\(_,y) -> y == 0) (fst >$< trunc6) (digits6 >*< trunc6)
206 BP.condB (\(_,y) -> y == 0) (fst >$< trunc6) (digits6 >*< trunc6)
222 digits6 = ((`quotRem` milli) . fromIntegral) >$< (digits3 >*< digits3)
207 digits6 = ((`quotRem` milli) . fromIntegral) >$< (digits3 >*< digits3)
@@ -234,7 +219,6 @@ timeOfDay64 (TOD h m s)
234 pico = 1000000000000 -- number of picoseconds in 1 second
219 pico = 1000000000000 -- number of picoseconds in 1 second
235 micro = 1000000 -- number of microseconds in 1 second
220 micro = 1000000 -- number of microseconds in 1 second
236 milli = 1000 -- number of milliseconds in 1 second
221 milli = 1000 -- number of milliseconds in 1 second
237−{-# INLINE timeOfDay64 #-}
238
222
239timeZone :: TimeZone -> Builder
223timeZone :: TimeZone -> Builder
240timeZone (TimeZone off _ _)
224timeZone (TimeZone off _ _)
@@ -270,62 +254,3 @@ twoDigits a = T (digit hi) (digit lo)
270
254
271digit :: Int -> Char
255digit :: Int -> Char
272digit x = chr (x + 48)
256digit x = chr (x + 48)
273−
274−#if !(MIN_VERSION_bytestring(0,10,4))
275−-- | Encode text using UTF-8 encoding and escape the ASCII characters using
276−-- a 'BP.BoundedPrim'.
277−--
278−-- Use this function is to implement efficient encoders for text-based formats
279−-- like JSON or HTML.
280−{-# INLINE encodeUtf8BuilderEscaped #-}
281−-- TODO: Extend documentation with references to source code in @blaze-html@
282−-- or @aeson@ that uses this function.
283−encodeUtf8BuilderEscaped :: BP.BoundedPrim Word8 -> Text -> B.Builder
284−encodeUtf8BuilderEscaped be =
285− -- manual eta-expansion to ensure inlining works as expected
286− \txt -> B.builder (mkBuildstep txt)
287− where
288− bound = max 4 $ BP.sizeBound be
289−
290− mkBuildstep (Text arr off len) !k =
291− outerLoop off
292− where
293− iend = off + len
294−
295− outerLoop !i0 !br@(B.BufferRange op0 ope)
296− | i0 >= iend = k br
297− | outRemaining > 0 = goPartial (i0 + min outRemaining inpRemaining)
298− -- TODO: Use a loop with an integrated bound's check if outRemaining
299− -- is smaller than 8, as this will save on divisions.
300− | otherwise = return $ B.bufferFull bound op0 (outerLoop i0)
301− where
302− outRemaining = (ope `minusPtr` op0) `div` bound
303− inpRemaining = iend - i0
304−
305− goPartial !iendTmp = go i0 op0
306− where
307− go !i !op
308− | i < iendTmp = case A.unsafeIndex arr i of
309− w | w <= 0x7F ->
310− BP.runB be (fromIntegral w) op >>= go (i + 1)
311− | w <= 0x7FF -> do
312− poke8 0 $ (w `shiftR` 6) + 0xC0
313− poke8 1 $ (w .&. 0x3f) + 0x80
314− go (i + 1) (op `plusPtr` 2)
315− | 0xD800 <= w && w <= 0xDBFF -> do
316− let c = ord $ U16.chr2 w (A.unsafeIndex arr (i+1))
317− poke8 0 $ (c `shiftR` 18) + 0xF0
318− poke8 1 $ ((c `shiftR` 12) .&. 0x3F) + 0x80
319− poke8 2 $ ((c `shiftR` 6) .&. 0x3F) + 0x80
320− poke8 3 $ (c .&. 0x3F) + 0x80
321− go (i + 2) (op `plusPtr` 4)
322− | otherwise -> do
323− poke8 0 $ (w `shiftR` 12) + 0xE0
324− poke8 1 $ ((w `shiftR` 6) .&. 0x3F) + 0x80
325− poke8 2 $ (w .&. 0x3F) + 0x80
326− go (i + 1) (op `plusPtr` 3)
327− | otherwise =
328− outerLoop i (B.BufferRange op ope)
329− where
330− poke8 j v = poke (op `plusPtr` j) (fromIntegral v :: Word8)
331−#endif
Data/Aeson/Encoding/Internal.hs+9−2
@@ -1,7 +1,9 @@
1{-# LANGUAGE DeriveDataTypeable #-}
1{-# LANGUAGE DeriveDataTypeable #-}
2{-# LANGUAGE EmptyDataDecls #-}
2{-# LANGUAGE EmptyDataDecls #-}
3+{-# LANGUAGE NoImplicitPrelude #-}
3{-# LANGUAGE OverloadedStrings #-}
4{-# LANGUAGE OverloadedStrings #-}
4{-# LANGUAGE RankNTypes #-}
5{-# LANGUAGE RankNTypes #-}
6+
5module Data.Aeson.Encoding.Internal
7module Data.Aeson.Encoding.Internal
6 (
8 (
7 -- * Encoding
9 -- * Encoding
@@ -13,6 +15,7 @@ module Data.Aeson.Encoding.Internal
13 , Series (..)
15 , Series (..)
14 , pairs
16 , pairs
15 , pair
17 , pair
18+ , pairStr
16 , pair'
19 , pair'
17 -- * Predicates
20 -- * Predicates
18 , nullEncoding
21 , nullEncoding
@@ -54,7 +57,6 @@ module Data.Aeson.Encoding.Internal
54 , comma, colon, openBracket, closeBracket, openCurly, closeCurly
57 , comma, colon, openBracket, closeBracket, openCurly, closeCurly
55 ) where
58 ) where
56
59
57−import Prelude ()
58import Prelude.Compat
60import Prelude.Compat
59
61
60import Data.Aeson.Types.Internal (Value)
62import Data.Aeson.Types.Internal (Value)
@@ -80,7 +82,7 @@ newtype Encoding' tag = Encoding {
80 -- ^ Acquire the underlying bytestring builder.
82 -- ^ Acquire the underlying bytestring builder.
81 } deriving (Typeable)
83 } deriving (Typeable)
82
84
83−-- | Often used synonnym for 'Encoding''.
85+-- | Often used synonym for 'Encoding''.
84type Encoding = Encoding' Value
86type Encoding = Encoding' Value
85
87
86-- | Make Encoding from Builder.
88-- | Make Encoding from Builder.
@@ -124,6 +126,11 @@ data Series = Empty
124
126
125pair :: Text -> Encoding -> Series
127pair :: Text -> Encoding -> Series
126pair name val = pair' (text name) val
128pair name val = pair' (text name) val
129+{-# INLINE pair #-}
130+
131+pairStr :: String -> Encoding -> Series
132+pairStr name val = pair' (string name) val
133+{-# INLINE pairStr #-}
127
134
128pair' :: Encoding' Text -> Encoding -> Series
135pair' :: Encoding' Text -> Encoding -> Series
129pair' name val = Value $ retagEncoding $ retagEncoding name >< colon >< val
136pair' name val = Value $ retagEncoding $ retagEncoding name >< colon >< val
Data/Aeson/Internal.hs+1−1
@@ -1,3 +1,4 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
1-- |
2-- |
2-- Module: Data.Aeson.Internal
3-- Module: Data.Aeson.Internal
3-- Copyright: (c) 2015-2016 Bryan O'Sullivan
4-- Copyright: (c) 2015-2016 Bryan O'Sullivan
@@ -22,7 +23,6 @@ module Data.Aeson.Internal
22 , iparse
23 , iparse
23 ) where
24 ) where
24
25
25−import Prelude ()
26
26
27import Data.Aeson.Types.Internal
27import Data.Aeson.Types.Internal
28import Data.Aeson.Types.FromJSON (ifromJSON)
28import Data.Aeson.Types.FromJSON (ifromJSON)
Data/Aeson/Internal/Functions.hs+1−1
@@ -1,3 +1,4 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
1-- |
2-- |
2-- Module: Data.Aeson.Functions
3-- Module: Data.Aeson.Functions
3-- Copyright: (c) 2011-2016 Bryan O'Sullivan
4-- Copyright: (c) 2011-2016 Bryan O'Sullivan
@@ -14,7 +15,6 @@ module Data.Aeson.Internal.Functions
14 , mapKey
15 , mapKey
15 ) where
16 ) where
16
17
17−import Prelude ()
18import Prelude.Compat
18import Prelude.Compat
19
19
20import Data.Hashable (Hashable)
20import Data.Hashable (Hashable)
Data/Aeson/Internal/Time.hs+1−41
@@ -17,44 +17,4 @@ module Data.Aeson.Internal.Time
17 , toTimeOfDay64
17 , toTimeOfDay64
18 ) where
18 ) where
19
19
20−import Prelude ()
20+import Data.Attoparsec.Time.Internal
21−import Prelude.Compat
22−
23−import Data.Fixed (Pico)
24−import Data.Int (Int64)
25−import Data.Time
26−import Unsafe.Coerce (unsafeCoerce)
27−
28−#if MIN_VERSION_base(4,7,0)
29−
30−import Data.Fixed (Fixed(MkFixed))
31−
32−toPico :: Integer -> Pico
33−toPico = MkFixed
34−
35−fromPico :: Pico -> Integer
36−fromPico (MkFixed i) = i
37−
38−#else
39−
40−toPico :: Integer -> Pico
41−toPico = unsafeCoerce
42−
43−fromPico :: Pico -> Integer
44−fromPico = unsafeCoerce
45−
46−#endif
47−
48−-- | Like TimeOfDay, but using a fixed-width integer for seconds.
49−data TimeOfDay64 = TOD {-# UNPACK #-} !Int
50− {-# UNPACK #-} !Int
51− {-# UNPACK #-} !Int64
52−
53−diffTimeOfDay64 :: DiffTime -> TimeOfDay64
54−diffTimeOfDay64 t = TOD (fromIntegral h) (fromIntegral m) s
55− where (h,mp) = fromIntegral pico `quotRem` 3600000000000000
56− (m,s) = mp `quotRem` 60000000000000
57− pico = unsafeCoerce t :: Integer
58−
59−toTimeOfDay64 :: TimeOfDay -> TimeOfDay64
60−toTimeOfDay64 (TimeOfDay h m s) = TOD h m (fromIntegral (fromPico s))
Data/Aeson/Parser.hs+13−4
@@ -1,5 +1,4 @@
1−{-# LANGUAGE OverloadedStrings #-}
1+{-# LANGUAGE NoImplicitPrelude #-}
2−
3-- |
2-- |
4-- Module: Data.Aeson.Parser
3-- Module: Data.Aeson.Parser
5-- Copyright: (c) 2012-2016 Bryan O'Sullivan
4-- Copyright: (c) 2012-2016 Bryan O'Sullivan
@@ -35,10 +34,21 @@ module Data.Aeson.Parser
35 json
34 json
36 , value
35 , value
37 , jstring
36 , jstring
37+ , scientific
38+ -- ** Handling objects with duplicate keys
39+ , jsonWith
40+ , jsonLast
41+ , jsonAccum
42+ , jsonNoDup
38 -- * Strict parsers
43 -- * Strict parsers
39 -- $strict
44 -- $strict
40 , json'
45 , json'
41 , value'
46 , value'
47+ -- ** Handling objects with duplicate keys
48+ , jsonWith'
49+ , jsonLast'
50+ , jsonAccum'
51+ , jsonNoDup'
42 -- * Decoding without FromJSON instances
52 -- * Decoding without FromJSON instances
43 , decodeWith
53 , decodeWith
44 , decodeStrictWith
54 , decodeStrictWith
@@ -46,9 +56,8 @@ module Data.Aeson.Parser
46 , eitherDecodeStrictWith
56 , eitherDecodeStrictWith
47 ) where
57 ) where
48
58
49−import Prelude ()
50
59
51−import Data.Aeson.Parser.Internal (decodeStrictWith, decodeWith, eitherDecodeStrictWith, eitherDecodeWith, json, json', jstring, value, value')
60+import Data.Aeson.Parser.Internal
52
61
53-- $lazy
62-- $lazy
54--
63--
Data/Aeson/Parser/Internal.hs+253−63
@@ -1,10 +1,14 @@
1{-# LANGUAGE BangPatterns #-}
1{-# LANGUAGE BangPatterns #-}
2{-# LANGUAGE CPP #-}
2{-# LANGUAGE CPP #-}
3+{-# LANGUAGE NoImplicitPrelude #-}
3{-# LANGUAGE OverloadedStrings #-}
4{-# LANGUAGE OverloadedStrings #-}
4#if MIN_VERSION_ghc_prim(0,3,1)
5#if MIN_VERSION_ghc_prim(0,3,1)
5{-# LANGUAGE MagicHash #-}
6{-# LANGUAGE MagicHash #-}
6#endif
7#endif
7−
8+#if __GLASGOW_HASKELL__ <= 710 && __GLASGOW_HASKELL__ >= 706
9+-- Work around a compiler bug
10+{-# OPTIONS_GHC -fsimpl-tick-factor=200 #-}
11+#endif
8-- |
12-- |
9-- Module: Data.Aeson.Parser.Internal
13-- Module: Data.Aeson.Parser.Internal
10-- Copyright: (c) 2011-2016 Bryan O'Sullivan
14-- Copyright: (c) 2011-2016 Bryan O'Sullivan
@@ -21,28 +25,43 @@ module Data.Aeson.Parser.Internal
21 (
25 (
22 -- * Lazy parsers
26 -- * Lazy parsers
23 json, jsonEOF
27 json, jsonEOF
28+ , jsonWith
29+ , jsonLast
30+ , jsonAccum
31+ , jsonNoDup
24 , value
32 , value
25 , jstring
33 , jstring
34+ , jstring_
35+ , scientific
26 -- * Strict parsers
36 -- * Strict parsers
27 , json', jsonEOF'
37 , json', jsonEOF'
38+ , jsonWith'
39+ , jsonLast'
40+ , jsonAccum'
41+ , jsonNoDup'
28 , value'
42 , value'
29 -- * Helpers
43 -- * Helpers
30 , decodeWith
44 , decodeWith
31 , decodeStrictWith
45 , decodeStrictWith
32 , eitherDecodeWith
46 , eitherDecodeWith
33 , eitherDecodeStrictWith
47 , eitherDecodeStrictWith
48+ -- ** Handling objects with duplicate keys
49+ , fromListAccum
50+ , parseListNoDup
34 ) where
51 ) where
35
52
36−import Prelude ()
37import Prelude.Compat
53import Prelude.Compat
38
54
39import Control.Applicative ((<|>))
55import Control.Applicative ((<|>))
40import Control.Monad (void, when)
56import Control.Monad (void, when)
41−import Data.Aeson.Types.Internal (IResult(..), JSONPath, Result(..), Value(..))
57+import Data.Aeson.Types.Internal (IResult(..), JSONPath, Object, Result(..), Value(..))
42import Data.Attoparsec.ByteString.Char8 (Parser, char, decimal, endOfInput, isDigit_w8, signed, string)
58import Data.Attoparsec.ByteString.Char8 (Parser, char, decimal, endOfInput, isDigit_w8, signed, string)
59+import Data.Function (fix)
60+import Data.Functor.Compat (($>))
43import Data.Scientific (Scientific)
61import Data.Scientific (Scientific)
44import Data.Text (Text)
62import Data.Text (Text)
63+import Data.Vector (Vector)
45−import Data.Vector as Vector (Vector, empty, fromListN, reverse)
64+import qualified Data.Vector as Vector (empty, fromList, fromListN, reverse)
46import qualified Data.Attoparsec.ByteString as A
65import qualified Data.Attoparsec.ByteString as A
47import qualified Data.Attoparsec.Lazy as L
66import qualified Data.Attoparsec.Lazy as L
48import qualified Data.ByteString as B
67import qualified Data.ByteString as B
@@ -53,8 +72,9 @@ import qualified Data.Scientific as Sci
53import Data.Aeson.Parser.Unescape (unescapeText)
72import Data.Aeson.Parser.Unescape (unescapeText)
54
73
55#if MIN_VERSION_ghc_prim(0,3,1)
74#if MIN_VERSION_ghc_prim(0,3,1)
56−import GHC.Base (Int#, (==#), isTrue#, word2Int#)
75+import GHC.Base (Int#, (==#), isTrue#, word2Int#, orI#, andI#)
57import GHC.Word (Word8(W8#))
76import GHC.Word (Word8(W8#))
77+import qualified Data.Text.Encoding as TE
58#endif
78#endif
59
79
60#define BACKSLASH 92
80#define BACKSLASH 92
@@ -73,7 +93,7 @@ import GHC.Word (Word8(W8#))
73#define C_n 110
93#define C_n 110
74#define C_t 116
94#define C_t 116
75
95
76−-- | Parse a top-level JSON value.
96+-- | Parse any JSON value.
77--
97--
78-- The conversion of a parsed value to a Haskell value is deferred
98-- The conversion of a parsed value to a Haskell value is deferred
79-- until the Haskell value is needed. This may improve performance if
99-- until the Haskell value is needed. This may improve performance if
@@ -83,10 +103,15 @@ import GHC.Word (Word8(W8#))
83-- This function is an alias for 'value'. In aeson 0.8 and earlier, it
103-- This function is an alias for 'value'. In aeson 0.8 and earlier, it
84-- parsed only object or array types, in conformance with the
104-- parsed only object or array types, in conformance with the
85-- now-obsolete RFC 4627.
105-- now-obsolete RFC 4627.
106+--
107+-- ==== Warning
108+--
109+-- If an object contains duplicate keys, only the first one will be kept.
110+-- For a more flexible alternative, see 'jsonWith'.
86json :: Parser Value
111json :: Parser Value
87json = value
112json = value
88
113
89−-- | Parse a top-level JSON value.
114+-- | Parse any JSON value.
90--
115--
91-- This is a strict version of 'json' which avoids building up thunks
116-- This is a strict version of 'json' which avoids building up thunks
92-- during parsing; it performs all conversions immediately. Prefer
117-- during parsing; it performs all conversions immediately. Prefer
@@ -95,23 +120,35 @@ json = value
95-- This function is an alias for 'value''. In aeson 0.8 and earlier, it
120-- This function is an alias for 'value''. In aeson 0.8 and earlier, it
96-- parsed only object or array types, in conformance with the
121-- parsed only object or array types, in conformance with the
97-- now-obsolete RFC 4627.
122-- now-obsolete RFC 4627.
123+--
124+-- ==== Warning
125+--
126+-- If an object contains duplicate keys, only the first one will be kept.
127+-- For a more flexible alternative, see 'jsonWith''.
98json' :: Parser Value
128json' :: Parser Value
99json' = value'
129json' = value'
100
130
101−object_ :: Parser Value
131+-- Open recursion: object_, object_', array_, array_' are parameterized by the
102−object_ = {-# SCC "object_" #-} Object <$> objectValues jstring value
132+-- toplevel Value parser to be called recursively, to keep the parameter
133+-- mkObject outside of the recursive loop for proper inlining.
103
134
104−object_' :: Parser Value
135+object_ :: ([(Text, Value)] -> Either String Object) -> Parser Value -> Parser Value
136+object_ mkObject val = {-# SCC "object_" #-} Object <$> objectValues mkObject jstring val
137+{-# INLINE object_ #-}
138+
139+object_' :: ([(Text, Value)] -> Either String Object) -> Parser Value -> Parser Value
105−object_' = {-# SCC "object_'" #-} do
140+object_' mkObject val' = {-# SCC "object_'" #-} do
106− !vals <- objectValues jstring' value'
141+ !vals <- objectValues mkObject jstring' val'
107 return (Object vals)
142 return (Object vals)
108 where
143 where
109 jstring' = do
144 jstring' = do
110 !s <- jstring
145 !s <- jstring
111 return s
146 return s
147+{-# INLINE object_' #-}
112
148
149+objectValues :: ([(Text, Value)] -> Either String Object)
113−objectValues :: Parser Text -> Parser Value -> Parser (H.HashMap Text Value)
150+ -> Parser Text -> Parser Value -> Parser (H.HashMap Text Value)
114−objectValues str val = do
151+objectValues mkObject str val = do
115 skipSpace
152 skipSpace
116 w <- A.peekWord8'
153 w <- A.peekWord8'
117 if w == CLOSE_CURLY
154 if w == CLOSE_CURLY
@@ -121,22 +158,26 @@ objectValues str val = do
121 -- Why use acc pattern here, you may ask? because 'H.fromList' use 'unsafeInsert'
158 -- Why use acc pattern here, you may ask? because 'H.fromList' use 'unsafeInsert'
122 -- and it's much faster because it's doing in place update to the 'HashMap'!
159 -- and it's much faster because it's doing in place update to the 'HashMap'!
123 loop acc = do
160 loop acc = do
124− k <- str <* skipSpace <* char ':'
161+ k <- (str A.<?> "object key") <* skipSpace <* (char ':' A.<?> "':'")
125− v <- val <* skipSpace
162+ v <- (val A.<?> "object value") <* skipSpace
126− ch <- A.satisfy $ \w -> w == COMMA || w == CLOSE_CURLY
163+ ch <- A.satisfy (\w -> w == COMMA || w == CLOSE_CURLY) A.<?> "',' or '}'"
127 let acc' = (k, v) : acc
164 let acc' = (k, v) : acc
128 if ch == COMMA
165 if ch == COMMA
129 then skipSpace >> loop acc'
166 then skipSpace >> loop acc'
130− else return (H.fromList acc')
167+ else case mkObject acc' of
168+ Left err -> fail err
169+ Right obj -> pure obj
131{-# INLINE objectValues #-}
170{-# INLINE objectValues #-}
132
171
133−array_ :: Parser Value
172+array_ :: Parser Value -> Parser Value
134−array_ = {-# SCC "array_" #-} Array <$> arrayValues value
173+array_ val = {-# SCC "array_" #-} Array <$> arrayValues val
174+{-# INLINE array_ #-}
135
175
136−array_' :: Parser Value
176+array_' :: Parser Value -> Parser Value
137−array_' = {-# SCC "array_'" #-} do
177+array_' val = {-# SCC "array_'" #-} do
138− !vals <- arrayValues value'
178+ !vals <- arrayValues val
139 return (Array vals)
179 return (Array vals)
180+{-# INLINE array_' #-}
140
181
141arrayValues :: Parser Value -> Parser (Vector Value)
182arrayValues :: Parser Value -> Parser (Vector Value)
142arrayValues val = do
183arrayValues val = do
@@ -147,57 +188,133 @@ arrayValues val = do
147 else loop [] 1
188 else loop [] 1
148 where
189 where
149 loop acc !len = do
190 loop acc !len = do
150− v <- val <* skipSpace
191+ v <- (val A.<?> "json list value") <* skipSpace
151− ch <- A.satisfy $ \w -> w == COMMA || w == CLOSE_SQUARE
192+ ch <- A.satisfy (\w -> w == COMMA || w == CLOSE_SQUARE) A.<?> "',' or ']'"
152 if ch == COMMA
193 if ch == COMMA
153 then skipSpace >> loop (v:acc) (len+1)
194 then skipSpace >> loop (v:acc) (len+1)
154 else return (Vector.reverse (Vector.fromListN len (v:acc)))
195 else return (Vector.reverse (Vector.fromListN len (v:acc)))
155{-# INLINE arrayValues #-}
196{-# INLINE arrayValues #-}
156
197
157−-- | Parse any JSON value. You should usually 'json' in preference to
198+-- | Parse any JSON value. Synonym of 'json'.
158−-- this function, as this function relaxes the object-or-array
159−-- requirement of RFC 4627.
160−--
161−-- In particular, be careful in using this function if you think your
162−-- code might interoperate with Javascript. A na&#xef;ve Javascript
163−-- library that parses JSON data using @eval@ is vulnerable to attack
164−-- unless the encoded data represents an object or an array. JSON
165−-- implementations in other languages conform to that same restriction
166−-- to preserve interoperability and security.
167value :: Parser Value
199value :: Parser Value
168−value = do
200+value = jsonWith (pure . H.fromList)
201+
202+-- | Parse any JSON value.
203+--
204+-- This parser is parameterized by a function to construct an 'Object'
205+-- from a raw list of key-value pairs, where duplicates are preserved.
206+-- The pairs appear in __reverse order__ from the source.
207+--
208+-- ==== __Examples__
209+--
210+-- 'json' keeps only the first occurence of each key, using 'HashMap.Lazy.fromList'.
211+--
212+-- @
213+-- 'json' = 'jsonWith' ('Right' '.' 'H.fromList')
214+-- @
215+--
216+-- 'jsonLast' keeps the last occurence of each key, using
217+-- @'HashMap.Lazy.fromListWith' ('const' 'id')@.
218+--
219+-- @
220+-- 'jsonLast' = 'jsonWith' ('Right' '.' 'HashMap.Lazy.fromListWith' ('const' 'id'))
221+-- @
222+--
223+-- 'jsonAccum' keeps wraps all values in arrays to keep duplicates, using
224+-- 'fromListAccum'.
225+--
226+-- @
227+-- 'jsonAccum' = 'jsonWith' ('Right' . 'fromListAccum')
228+-- @
229+--
230+-- 'jsonNoDup' fails if any object contains duplicate keys, using 'parseListNoDup'.
231+--
232+-- @
233+-- 'jsonNoDup' = 'jsonWith' 'parseListNoDup'
234+-- @
235+jsonWith :: ([(Text, Value)] -> Either String Object) -> Parser Value
236+jsonWith mkObject = fix $ \value_ -> do
169 skipSpace
237 skipSpace
170 w <- A.peekWord8'
238 w <- A.peekWord8'
171 case w of
239 case w of
172 DOUBLE_QUOTE -> A.anyWord8 *> (String <$> jstring_)
240 DOUBLE_QUOTE -> A.anyWord8 *> (String <$> jstring_)
173− OPEN_CURLY -> A.anyWord8 *> object_
241+ OPEN_CURLY -> A.anyWord8 *> object_ mkObject value_
174− OPEN_SQUARE -> A.anyWord8 *> array_
242+ OPEN_SQUARE -> A.anyWord8 *> array_ value_
175− C_f -> string "false" *> pure (Bool False)
243+ C_f -> string "false" $> Bool False
176− C_t -> string "true" *> pure (Bool True)
244+ C_t -> string "true" $> Bool True
177− C_n -> string "null" *> pure Null
245+ C_n -> string "null" $> Null
178 _ | w >= 48 && w <= 57 || w == 45
246 _ | w >= 48 && w <= 57 || w == 45
179 -> Number <$> scientific
247 -> Number <$> scientific
180 | otherwise -> fail "not a valid json value"
248 | otherwise -> fail "not a valid json value"
249+{-# INLINE jsonWith #-}
250+
251+-- | Variant of 'json' which keeps only the last occurence of every key.
252+jsonLast :: Parser Value
253+jsonLast = jsonWith (Right . H.fromListWith (const id))
254+
255+-- | Variant of 'json' wrapping all object mappings in 'Array' to preserve
256+-- key-value pairs with the same keys.
257+jsonAccum :: Parser Value
258+jsonAccum = jsonWith (Right . fromListAccum)
181
259
260+-- | Variant of 'json' which fails if any object contains duplicate keys.
261+jsonNoDup :: Parser Value
262+jsonNoDup = jsonWith parseListNoDup
263+
264+-- | @'fromListAccum' kvs@ is an object mapping keys to arrays containing all
265+-- associated values from the original list @kvs@.
266+--
267+-- >>> fromListAccum [("apple", Bool True), ("apple", Bool False), ("orange", Bool False)]
268+-- fromList [("apple", [Bool False, Bool True]), ("orange", [Bool False])]
269+fromListAccum :: [(Text, Value)] -> Object
270+fromListAccum =
271+ fmap (Array . Vector.fromList . ($ [])) . H.fromListWith (.) . (fmap . fmap) (:)
272+
273+-- | @'fromListNoDup' kvs@ fails if @kvs@ contains duplicate keys.
274+parseListNoDup :: [(Text, Value)] -> Either String Object
275+parseListNoDup =
276+ H.traverseWithKey unwrap . H.fromListWith (\_ _ -> Nothing) . (fmap . fmap) Just
277+ where
278+ unwrap k Nothing = Left $ "found duplicate key: " ++ show k
279+ unwrap _ (Just v) = Right v
280+
182−-- | Strict version of 'value'. See also 'json''.
281+-- | Strict version of 'value'. Synonym of 'json''.
183value' :: Parser Value
282value' :: Parser Value
184−value' = do
283+value' = jsonWith' (pure . H.fromList)
284+
285+-- | Strict version of 'jsonWith'.
286+jsonWith' :: ([(Text, Value)] -> Either String Object) -> Parser Value
287+jsonWith' mkObject = fix $ \value_ -> do
185 skipSpace
288 skipSpace
186 w <- A.peekWord8'
289 w <- A.peekWord8'
187 case w of
290 case w of
188 DOUBLE_QUOTE -> do
291 DOUBLE_QUOTE -> do
189 !s <- A.anyWord8 *> jstring_
292 !s <- A.anyWord8 *> jstring_
190 return (String s)
293 return (String s)
191− OPEN_CURLY -> A.anyWord8 *> object_'
294+ OPEN_CURLY -> A.anyWord8 *> object_' mkObject value_
192− OPEN_SQUARE -> A.anyWord8 *> array_'
295+ OPEN_SQUARE -> A.anyWord8 *> array_' value_
193− C_f -> string "false" *> pure (Bool False)
296+ C_f -> string "false" $> Bool False
194− C_t -> string "true" *> pure (Bool True)
297+ C_t -> string "true" $> Bool True
195− C_n -> string "null" *> pure Null
298+ C_n -> string "null" $> Null
196 _ | w >= 48 && w <= 57 || w == 45
299 _ | w >= 48 && w <= 57 || w == 45
197 -> do
300 -> do
198 !n <- scientific
301 !n <- scientific
199 return (Number n)
302 return (Number n)
200 | otherwise -> fail "not a valid json value"
303 | otherwise -> fail "not a valid json value"
304+{-# INLINE jsonWith' #-}
305+
306+-- | Variant of 'json'' which keeps only the last occurence of every key.
307+jsonLast' :: Parser Value
308+jsonLast' = jsonWith' (pure . H.fromListWith (const id))
309+
310+-- | Variant of 'json'' wrapping all object mappings in 'Array' to preserve
311+-- key-value pairs with the same keys.
312+jsonAccum' :: Parser Value
313+jsonAccum' = jsonWith' (pure . fromListAccum)
314+
315+-- | Variant of 'json'' which fails if any object contains duplicate keys.
316+jsonNoDup' :: Parser Value
317+jsonNoDup' = jsonWith' parseListNoDup
201
318
202-- | Parse a quoted JSON string.
319-- | Parse a quoted JSON string.
203jstring :: Parser Text
320jstring :: Parser Text
@@ -207,21 +324,39 @@ jstring = A.word8 DOUBLE_QUOTE *> jstring_
207jstring_ :: Parser Text
324jstring_ :: Parser Text
208{-# INLINE jstring_ #-}
325{-# INLINE jstring_ #-}
209jstring_ = {-# SCC "jstring_" #-} do
326jstring_ = {-# SCC "jstring_" #-} do
327+#if MIN_VERSION_ghc_prim(0,3,1)
328+ (s, S _ escaped) <- A.runScanner startState go <* A.anyWord8
329+ -- We escape only if there are
330+ -- non-ascii (over 7bit) characters or backslash present.
331+ --
332+ -- Note: if/when text will have fast ascii -> text conversion
333+ -- (e.g. uses utf8 encoding) we can have further speedup.
334+ if isTrue# escaped
335+ then case unescapeText s of
336+ Right r -> return r
337+ Left err -> fail $ show err
338+ else return (TE.decodeUtf8 s)
339+ where
340+ startState = S 0# 0#
341+ go (S skip escaped) (W8# c)
342+ | isTrue# skip = Just (S 0# escaped')
343+ | isTrue# (w ==# 34#) = Nothing -- double quote
344+ | otherwise = Just (S skip' escaped')
345+ where
346+ w = word2Int# c
347+ skip' = w ==# 92# -- backslash
348+ escaped' = escaped
349+ `orI#` (w `andI#` 0x80# ==# 0x80#) -- c >= 0x80
350+ `orI#` skip'
351+ `orI#` (w `andI#` 0x1f# ==# w) -- c < 0x20
352+
353+data S = S Int# Int#
354+#else
210 s <- A.scan startState go <* A.anyWord8
355 s <- A.scan startState go <* A.anyWord8
211 case unescapeText s of
356 case unescapeText s of
212 Right r -> return r
357 Right r -> return r
213 Left err -> fail $ show err
358 Left err -> fail $ show err
214 where
359 where
215−#if MIN_VERSION_ghc_prim(0,3,1)
216− startState = S 0#
217− go (S a) (W8# c)
218− | isTrue# a = Just (S 0#)
219− | isTrue# (word2Int# c ==# 34#) = Nothing -- double quote
220− | otherwise = let a' = word2Int# c ==# 92# -- backslash
221− in Just (S a')
222−
223−data S = S Int#
224−#else
225 startState = False
360 startState = False
226 go a c
361 go a c
227 | a = Just False
362 | a = Just False
@@ -255,7 +390,12 @@ eitherDecodeWith p to s =
255 L.Done _ v -> case to v of
390 L.Done _ v -> case to v of
256 ISuccess a -> Right a
391 ISuccess a -> Right a
257 IError path msg -> Left (path, msg)
392 IError path msg -> Left (path, msg)
258− L.Fail _ _ msg -> Left ([], msg)
393+ L.Fail _ ctx msg -> Left ([], buildMsg ctx msg)
394+ where
395+ buildMsg :: [String] -> String -> String
396+ buildMsg [] msg = msg
397+ buildMsg (expectation:_) msg =
398+ msg ++ ". Expecting " ++ expectation
259{-# INLINE eitherDecodeWith #-}
399{-# INLINE eitherDecodeWith #-}
260
400
261eitherDecodeStrictWith :: Parser Value -> (Value -> IResult a) -> B.ByteString
401eitherDecodeStrictWith :: Parser Value -> (Value -> IResult a) -> B.ByteString
@@ -308,14 +448,13 @@ data SP = SP !Integer {-# UNPACK #-}!Int
308
448
309decimal0 :: Parser Integer
449decimal0 :: Parser Integer
310decimal0 = do
450decimal0 = do
311− let step a w = a * 10 + fromIntegral (w - zero)
312− zero = 48
451+ let zero = 48
313 digits <- A.takeWhile1 isDigit_w8
452 digits <- A.takeWhile1 isDigit_w8
314 if B.length digits > 1 && B.unsafeHead digits == zero
453 if B.length digits > 1 && B.unsafeHead digits == zero
315 then fail "leading zero"
454 then fail "leading zero"
316− else return (B.foldl' step 0 digits)
455+ else return (bsToInteger digits)
317
456
318−{-# INLINE scientific #-}
457+-- | Parse a JSON number.
319scientific :: Parser Scientific
458scientific :: Parser Scientific
320scientific = do
459scientific = do
321 let minus = 45
460 let minus = 45
@@ -345,3 +484,54 @@ scientific = do
345 (A.satisfy (\ex -> ex == littleE || ex == bigE) *>
484 (A.satisfy (\ex -> ex == littleE || ex == bigE) *>
346 fmap (Sci.scientific signedCoeff . (e +)) (signed decimal)) <|>
485 fmap (Sci.scientific signedCoeff . (e +)) (signed decimal)) <|>
347 return (Sci.scientific signedCoeff e)
486 return (Sci.scientific signedCoeff e)
487+{-# INLINE scientific #-}
488+
489+------------------ Copy-pasted and adapted from base ------------------------
490+
491+bsToInteger :: B.ByteString -> Integer
492+bsToInteger bs
493+ | l > 40 = valInteger 10 l [ fromIntegral (w - 48) | w <- B.unpack bs ]
494+ | otherwise = bsToIntegerSimple bs
495+ where
496+ l = B.length bs
497+
498+bsToIntegerSimple :: B.ByteString -> Integer
499+bsToIntegerSimple = B.foldl' step 0 where
500+ step a b = a * 10 + fromIntegral (b - 48) -- 48 = '0'
501+
502+-- A sub-quadratic algorithm for Integer. Pairs of adjacent radix b
503+-- digits are combined into a single radix b^2 digit. This process is
504+-- repeated until we are left with a single digit. This algorithm
505+-- performs well only on large inputs, so we use the simple algorithm
506+-- for smaller inputs.
507+valInteger :: Integer -> Int -> [Integer] -> Integer
508+valInteger = go
509+ where
510+ go :: Integer -> Int -> [Integer] -> Integer
511+ go _ _ [] = 0
512+ go _ _ [d] = d
513+ go b l ds
514+ | l > 40 = b' `seq` go b' l' (combine b ds')
515+ | otherwise = valSimple b ds
516+ where
517+ -- ensure that we have an even number of digits
518+ -- before we call combine:
519+ ds' = if even l then ds else 0 : ds
520+ b' = b * b
521+ l' = (l + 1) `quot` 2
522+
523+ combine b (d1 : d2 : ds) = d `seq` (d : combine b ds)
524+ where
525+ d = d1 * b + d2
526+ combine _ [] = []
527+ combine _ [_] = errorWithoutStackTrace "this should not happen"
528+
529+-- The following algorithm is only linear for types whose Num operations
530+-- are in constant time.
531+valSimple :: Integer -> [Integer] -> Integer
532+valSimple base = go 0
533+ where
534+ go r [] = r
535+ go r (d : ds) = r' `seq` go r' ds
536+ where
537+ r' = r * base + fromIntegral d
Data/Aeson/Parser/Time.hs+18−103
@@ -1,15 +1,4 @@
1−{-# LANGUAGE BangPatterns #-}
1+{-# LANGUAGE NoImplicitPrelude #-}
2−{-# LANGUAGE ScopedTypeVariables #-}
3−
4−-- |
5−-- Module: Data.Aeson.Parser.Time
6−-- Copyright: (c) 2015-2016 Bryan O'Sullivan
7−-- License: BSD3
8−-- Maintainer: Bryan O'Sullivan <bos@serpentine.com>
9−-- Stability: experimental
10−-- Portability: portable
11−--
12−-- Parsers for parsing dates and times.
13
2
14module Data.Aeson.Parser.Time
3module Data.Aeson.Parser.Time
15 (
4 (
@@ -22,123 +11,51 @@ module Data.Aeson.Parser.Time
22 , zonedTime
11 , zonedTime
23 ) where
12 ) where
24
13
25−import Prelude ()
26import Prelude.Compat
14import Prelude.Compat
27
15
28−import Control.Applicative ((<|>))
29−import Control.Monad (void, when)
30−import Data.Aeson.Internal.Time (toPico)
31−import Data.Attoparsec.Text as A
16+import Data.Attoparsec.Text (Parser)
32−import Data.Bits ((.&.))
33−import Data.Char (isDigit, ord)
34−import Data.Fixed (Pico)
35−import Data.Int (Int64)
36−import Data.Maybe (fromMaybe)
37import Data.Text (Text)
17import Data.Text (Text)
38−import Data.Time.Calendar (Day, fromGregorianValid)
18+import Data.Time.Calendar (Day)
39import Data.Time.Clock (UTCTime(..))
19import Data.Time.Clock (UTCTime(..))
40import qualified Data.Aeson.Types.Internal as Aeson
20import qualified Data.Aeson.Types.Internal as Aeson
41−import qualified Data.Text as T
21+import qualified Data.Attoparsec.Text as A
22+import qualified Data.Attoparsec.Time as T
42import qualified Data.Time.LocalTime as Local
23import qualified Data.Time.LocalTime as Local
43
24
44-- | Run an attoparsec parser as an aeson parser.
25-- | Run an attoparsec parser as an aeson parser.
45run :: Parser a -> Text -> Aeson.Parser a
26run :: Parser a -> Text -> Aeson.Parser a
46−run p t = case A.parseOnly (p <* endOfInput) t of
27+run p t = case A.parseOnly (p <* A.endOfInput) t of
47 Left err -> fail $ "could not parse date: " ++ err
28 Left err -> fail $ "could not parse date: " ++ err
48 Right r -> return r
29 Right r -> return r
49
30
50-- | Parse a date of the form @[+,-]YYYY-MM-DD@.
31-- | Parse a date of the form @[+,-]YYYY-MM-DD@.
51day :: Parser Day
32day :: Parser Day
52−day = do
33+day = T.day
53− absOrNeg <- negate <$ char '-' <|> id <$ char '+' <|> pure id
34+{-# INLINE day #-}
54− y <- decimal <* char '-'
55− m <- twoDigits <* char '-'
56− d <- twoDigits
57− maybe (fail "invalid date") return (fromGregorianValid (absOrNeg y) m d)
58−
59−-- | Parse a two-digit integer (e.g. day of month, hour).
60−twoDigits :: Parser Int
61−twoDigits = do
62− a <- digit
63− b <- digit
64− let c2d c = ord c .&. 15
65− return $! c2d a * 10 + c2d b
66
35
67-- | Parse a time of the form @HH:MM[:SS[.SSS]]@.
36-- | Parse a time of the form @HH:MM[:SS[.SSS]]@.
68timeOfDay :: Parser Local.TimeOfDay
37timeOfDay :: Parser Local.TimeOfDay
69−timeOfDay = do
38+timeOfDay = T.timeOfDay
70− h <- twoDigits
39+{-# INLINE timeOfDay #-}
71− m <- char ':' *> twoDigits
72− s <- option 0 (char ':' *> seconds)
73− if h < 24 && m < 60 && s < 61
74− then return (Local.TimeOfDay h m s)
75− else fail "invalid time"
76−
77−data T = T {-# UNPACK #-} !Int {-# UNPACK #-} !Int64
78−
79−-- | Parse a count of seconds, with the integer part being two digits
80−-- long.
81−seconds :: Parser Pico
82−seconds = do
83− real <- twoDigits
84− mc <- peekChar
85− case mc of
86− Just '.' -> do
87− t <- anyChar *> takeWhile1 isDigit
88− return $! parsePicos real t
89− _ -> return $! fromIntegral real
90− where
91− parsePicos a0 t = toPico (fromIntegral (t' * 10^n))
92− where T n t' = T.foldl' step (T 12 (fromIntegral a0)) t
93− step ma@(T m a) c
94− | m <= 0 = ma
95− | otherwise = T (m-1) (10 * a + fromIntegral (ord c) .&. 15)
96
40
97-- | Parse a time zone, and return 'Nothing' if the offset from UTC is
41-- | Parse a time zone, and return 'Nothing' if the offset from UTC is
98-- zero. (This makes some speedups possible.)
42-- zero. (This makes some speedups possible.)
99timeZone :: Parser (Maybe Local.TimeZone)
43timeZone :: Parser (Maybe Local.TimeZone)
100−timeZone = do
44+timeZone = T.timeZone
101− let maybeSkip c = do ch <- peekChar'; when (ch == c) (void anyChar)
45+{-# INLINE timeZone #-}
102− maybeSkip ' '
103− ch <- satisfy $ \c -> c == 'Z' || c == '+' || c == '-'
104− if ch == 'Z'
105− then return Nothing
106− else do
107− h <- twoDigits
108− mm <- peekChar
109− m <- case mm of
110− Just ':' -> anyChar *> twoDigits
111− Just d | isDigit d -> twoDigits
112− _ -> return 0
113− let off | ch == '-' = negate off0
114− | otherwise = off0
115− off0 = h * 60 + m
116− case undefined of
117− _ | off == 0 ->
118− return Nothing
119− | off < -720 || off > 840 || m > 59 ->
120− fail "invalid time zone offset"
121− | otherwise ->
122− let !tz = Local.minutesToTimeZone off
123− in return (Just tz)
124
46
125-- | Parse a date and time, of the form @YYYY-MM-DD HH:MM[:SS[.SSS]]@.
47-- | Parse a date and time, of the form @YYYY-MM-DD HH:MM[:SS[.SSS]]@.
126-- The space may be replaced with a @T@. The number of seconds is optional
48-- The space may be replaced with a @T@. The number of seconds is optional
127-- and may be followed by a fractional component.
49-- and may be followed by a fractional component.
128localTime :: Parser Local.LocalTime
50localTime :: Parser Local.LocalTime
129−localTime = Local.LocalTime <$> day <* daySep <*> timeOfDay
51+localTime = T.localTime
130− where daySep = satisfy (\c -> c == 'T' || c == ' ')
52+{-# INLINE localTime #-}
131
53
132-- | Behaves as 'zonedTime', but converts any time zone offset into a
54-- | Behaves as 'zonedTime', but converts any time zone offset into a
133-- UTC time.
55-- UTC time.
134utcTime :: Parser UTCTime
56utcTime :: Parser UTCTime
135−utcTime = do
57+utcTime = T.utcTime
136− lt@(Local.LocalTime d t) <- localTime
58+{-# INLINE utcTime #-}
137− mtz <- timeZone
138− case mtz of
139− Nothing -> let !tt = Local.timeOfDayToTime t
140− in return (UTCTime d tt)
141− Just tz -> return $! Local.localTimeToUTC tz lt
142
59
143-- | Parse a date with time zone info. Acceptable formats:
60-- | Parse a date with time zone info. Acceptable formats:
144--
61--
@@ -152,7 +69,5 @@ utcTime = do
152-- two digits are hours, the @:@ is optional and the second two digits
69-- two digits are hours, the @:@ is optional and the second two digits
153-- (also optional) are minutes.
70-- (also optional) are minutes.
154zonedTime :: Parser Local.ZonedTime
71zonedTime :: Parser Local.ZonedTime
155−zonedTime = Local.ZonedTime <$> localTime <*> (fromMaybe utc <$> timeZone)
72+zonedTime = T.zonedTime
156−
73+{-# INLINE zonedTime #-}
157−utc :: Local.TimeZone
158−utc = Local.TimeZone 0 False ""
Data/Aeson/QQ/Simple.hsnew file+25
@@ -0,0 +1,25 @@
1+-- | Like "Data.Aeson.QQ" but without interpolation.
2+module Data.Aeson.QQ.Simple (aesonQQ) where
3+
4+import Data.Aeson
5+import qualified Data.Text as T
6+import qualified Data.Text.Encoding as TE
7+import Language.Haskell.TH
8+import Language.Haskell.TH.Quote
9+import Language.Haskell.TH.Syntax (Lift (..))
10+import Prelude ()
11+import Prelude.Compat
12+
13+aesonQQ :: QuasiQuoter
14+aesonQQ = QuasiQuoter
15+ { quoteExp = aesonExp
16+ , quotePat = const $ error "No quotePat defined for jsonQQ"
17+ , quoteType = const $ error "No quoteType defined for jsonQQ"
18+ , quoteDec = const $ error "No quoteDec defined for jsonQQ"
19+ }
20+
21+aesonExp :: String -> ExpQ
22+aesonExp txt =
23+ case eitherDecodeStrict $ TE.encodeUtf8 $ T.pack txt of
24+ Left err -> error $ "Error in aesonExp: " ++ show err
25+ Right val -> lift (val :: Value)
Data/Aeson/TH.hs+445−896
@@ -85,7 +85,6 @@ $('deriveJSON' 'defaultOptions' ''(,,,))
85@
85@
86
86
87-}
87-}
88−
89module Data.Aeson.TH
88module Data.Aeson.TH
90 (
89 (
91 -- * Encoding configuration
90 -- * Encoding configuration
@@ -117,49 +116,42 @@ module Data.Aeson.TH
117 , mkLiftParseJSON2
116 , mkLiftParseJSON2
118 ) where
117 ) where
119
118
120−import Prelude ()
119+import Prelude.Compat
121−import Prelude.Compat hiding (exp)
122
120
123import Control.Applicative ((<|>))
121import Control.Applicative ((<|>))
124−import Data.Aeson (Object, (.=), (.:), FromJSON(..), FromJSON1(..), FromJSON2(..), ToJSON(..), ToJSON1(..), ToJSON2(..))
122+import Data.Aeson (Object, (.:), FromJSON(..), FromJSON1(..), FromJSON2(..), ToJSON(..), ToJSON1(..), ToJSON2(..))
125import Data.Aeson.Types (Options(..), Parser, SumEncoding(..), Value(..), defaultOptions, defaultTaggedObject)
123import Data.Aeson.Types (Options(..), Parser, SumEncoding(..), Value(..), defaultOptions, defaultTaggedObject)
126−import Data.Aeson.Types.Internal ((<?>), Pair, JSONPathElement(Key))
124+import Data.Aeson.Types.Internal ((<?>), JSONPathElement(Key))
127import Data.Aeson.Types.FromJSON (parseOptionalFieldWith)
125import Data.Aeson.Types.FromJSON (parseOptionalFieldWith)
126+import Data.Aeson.Types.ToJSON (fromPairs, pair)
128import Control.Monad (liftM2, unless, when)
127import Control.Monad (liftM2, unless, when)
129import Data.Foldable (foldr')
128import Data.Foldable (foldr')
130#if MIN_VERSION_template_haskell(2,8,0) && !MIN_VERSION_template_haskell(2,10,0)
129#if MIN_VERSION_template_haskell(2,8,0) && !MIN_VERSION_template_haskell(2,10,0)
131import Data.List (nub)
130import Data.List (nub)
132#endif
131#endif
133−import Data.List (find, foldl', genericLength , intercalate , intersperse, partition, union)
132+import Data.List (foldl', genericLength, intercalate, partition, union)
134import Data.List.NonEmpty ((<|), NonEmpty((:|)))
133import Data.List.NonEmpty ((<|), NonEmpty((:|)))
135import Data.Map (Map)
134import Data.Map (Map)
136import Data.Maybe (catMaybes, fromMaybe, mapMaybe)
135import Data.Maybe (catMaybes, fromMaybe, mapMaybe)
136+import qualified Data.Monoid as Monoid
137import Data.Set (Set)
137import Data.Set (Set)
138−#if MIN_VERSION_template_haskell(2,8,0)
139import Language.Haskell.TH hiding (Arity)
138import Language.Haskell.TH hiding (Arity)
140−#else
141−import Language.Haskell.TH
142−#endif
143−import Language.Haskell.TH.Syntax (VarStrictType)
139+import Language.Haskell.TH.Datatype
144−#if MIN_VERSION_template_haskell(2,7,0) && !(MIN_VERSION_template_haskell(2,8,0))
145−import Language.Haskell.TH.Lib (starK)
146−#endif
147#if MIN_VERSION_template_haskell(2,8,0) && !(MIN_VERSION_template_haskell(2,10,0))
140#if MIN_VERSION_template_haskell(2,8,0) && !(MIN_VERSION_template_haskell(2,10,0))
148import Language.Haskell.TH.Syntax (mkNameG_tc)
141import Language.Haskell.TH.Syntax (mkNameG_tc)
149#endif
142#endif
150import Text.Printf (printf)
143import Text.Printf (printf)
151−import qualified Data.Aeson as A
152import qualified Data.Aeson.Encoding.Internal as E
144import qualified Data.Aeson.Encoding.Internal as E
153import qualified Data.Foldable as F (all)
145import qualified Data.Foldable as F (all)
154−import qualified Data.HashMap.Strict as H (lookup, toList)
146+import qualified Data.HashMap.Strict as H (difference, fromList, keys, lookup, toList)
155−import qualified Data.List.NonEmpty as NE (drop, length, reverse, splitAt)
147+import qualified Data.List.NonEmpty as NE (length, reverse)
156−import qualified Data.Map as M (fromList, findWithDefault, keys, lookup , singleton, size)
148+import qualified Data.Map as M (fromList, keys, lookup , singleton, size)
149+import qualified Data.Semigroup as Semigroup (Option(..))
157import qualified Data.Set as Set (empty, insert, member)
150import qualified Data.Set as Set (empty, insert, member)
158import qualified Data.Text as T (Text, pack, unpack)
151import qualified Data.Text as T (Text, pack, unpack)
159−import qualified Data.Vector as V (unsafeIndex, null, length, create, fromList)
152+import qualified Data.Vector as V (unsafeIndex, null, length, create, empty)
160import qualified Data.Vector.Mutable as VM (unsafeNew, unsafeWrite)
153import qualified Data.Vector.Mutable as VM (unsafeNew, unsafeWrite)
161
154
162−
163--------------------------------------------------------------------------------
155--------------------------------------------------------------------------------
164-- Convenience
156-- Convenience
165--------------------------------------------------------------------------------
157--------------------------------------------------------------------------------
@@ -253,8 +245,8 @@ deriveToJSONCommon :: JSONClass
253 -> Name
245 -> Name
254 -- ^ Name of the type for which to generate an instance.
246 -- ^ Name of the type for which to generate an instance.
255 -> Q [Dec]
247 -> Q [Dec]
256−deriveToJSONCommon = deriveJSONClass [ (ToJSON, \jc _ -> consToValue jc)
248+deriveToJSONCommon = deriveJSONClass [ (ToJSON, \jc _ -> consToValue Value jc)
257− , (ToEncoding, \jc _ -> consToEncoding jc)
249+ , (ToEncoding, \jc _ -> consToValue Encoding jc)
258 ]
250 ]
259
251
260-- | Generates a lambda expression which encodes the given data type or
252-- | Generates a lambda expression which encodes the given data type or
@@ -284,7 +276,7 @@ mkToJSONCommon :: JSONClass -- ^ Which class's method is being derived.
284 -> Options -- ^ Encoding options.
276 -> Options -- ^ Encoding options.
285 -> Name -- ^ Name of the encoded type.
277 -> Name -- ^ Name of the encoded type.
286 -> Q Exp
278 -> Q Exp
287−mkToJSONCommon = mkFunCommon (\jc _ -> consToValue jc)
279+mkToJSONCommon = mkFunCommon (\jc _ -> consToValue Value jc)
288
280
289-- | Generates a lambda expression which encodes the given data type or
281-- | Generates a lambda expression which encodes the given data type or
290-- data family instance constructor as a JSON string.
282-- data family instance constructor as a JSON string.
@@ -313,413 +305,272 @@ mkToEncodingCommon :: JSONClass -- ^ Which class's method is being derived.
313 -> Options -- ^ Encoding options.
305 -> Options -- ^ Encoding options.
314 -> Name -- ^ Name of the encoded type.
306 -> Name -- ^ Name of the encoded type.
315 -> Q Exp
307 -> Q Exp
316−mkToEncodingCommon = mkFunCommon (\jc _ -> consToEncoding jc)
308+mkToEncodingCommon = mkFunCommon (\jc _ -> consToValue Encoding jc)
317
309
318-- | Helper function used by both 'deriveToJSON' and 'mkToJSON'. Generates
310-- | Helper function used by both 'deriveToJSON' and 'mkToJSON'. Generates
319−-- code to generate a 'Value' of a number of constructors. All constructors
311+-- code to generate a 'Value' or 'Encoding' of a number of constructors. All
320−-- must be from the same type.
312+-- constructors must be from the same type.
313+consToValue :: ToJSONFun
314+ -- ^ The method ('toJSON' or 'toEncoding') being derived.
321−consToValue :: JSONClass
315+ -> JSONClass
322 -- ^ The ToJSON variant being derived.
316 -- ^ The ToJSON variant being derived.
323 -> Options
317 -> Options
324 -- ^ Encoding options.
318 -- ^ Encoding options.
325− -> [Con]
319+ -> [Type]
320+ -- ^ The types from the data type/data family instance declaration
321+ -> [ConstructorInfo]
326 -- ^ Constructors for which to generate JSON generating code.
322 -- ^ Constructors for which to generate JSON generating code.
327 -> Q Exp
323 -> Q Exp
328
324
329−consToValue _ _ [] = error $ "Data.Aeson.TH.consToValue: "
325+consToValue _ _ _ _ [] = error $ "Data.Aeson.TH.consToValue: "
330− ++ "Not a single constructor given!"
326+ ++ "Not a single constructor given!"
331
327
332−consToValue jc opts cons = do
328+consToValue target jc opts instTys cons = do
333 value <- newName "value"
329 value <- newName "value"
334 tjs <- newNameList "_tj" $ arityInt jc
330 tjs <- newNameList "_tj" $ arityInt jc
335 tjls <- newNameList "_tjl" $ arityInt jc
331 tjls <- newNameList "_tjl" $ arityInt jc
336 let zippedTJs = zip tjs tjls
332 let zippedTJs = zip tjs tjls
337 interleavedTJs = interleave tjs tjls
333 interleavedTJs = interleave tjs tjls
334+ lastTyVars = map varTToName $ drop (length instTys - arityInt jc) instTys
335+ tvMap = M.fromList $ zip lastTyVars zippedTJs
338 lamE (map varP $ interleavedTJs ++ [value]) $
336 lamE (map varP $ interleavedTJs ++ [value]) $
339− caseE (varE value) (matches zippedTJs)
337+ caseE (varE value) (matches tvMap)
340 where
338 where
341− matches tjs = case cons of
339+ matches tvMap = case cons of
342 -- A single constructor is directly encoded. The constructor itself may be
340 -- A single constructor is directly encoded. The constructor itself may be
343 -- forgotten.
341 -- forgotten.
344− [con] -> [argsToValue jc tjs opts False con]
342+ [con] | not (tagSingleConstructors opts) -> [argsToValue target jc tvMap opts False con]
345 _ | allNullaryToStringTag opts && all isNullary cons ->
343 _ | allNullaryToStringTag opts && all isNullary cons ->
346− [ match (conP conName []) (normalB $ conStr opts conName) []
344+ [ match (conP conName []) (normalB $ conStr target opts conName) []
347 | con <- cons
345 | con <- cons
348− , let conName = getConName con
346+ , let conName = constructorName con
349 ]
347 ]
350− | otherwise -> [argsToValue jc tjs opts True con | con <- cons]
348+ | otherwise -> [argsToValue target jc tvMap opts True con | con <- cons]
351
349
350+-- | Name of the constructor as a quoted 'Value' or 'Encoding'.
352−conStr :: Options -> Name -> Q Exp
351+conStr :: ToJSONFun -> Options -> Name -> Q Exp
353−conStr opts = appE [|String|] . conTxt opts
352+conStr Value opts = appE [|String|] . conTxt opts
353+conStr Encoding opts = appE [|E.text|] . conTxt opts
354
354
355+-- | Name of the constructor as a quoted 'Text'.
355conTxt :: Options -> Name -> Q Exp
356conTxt :: Options -> Name -> Q Exp
356−conTxt opts = appE [|T.pack|] . conStringE opts
357+conTxt opts = appE [|T.pack|] . stringE . conString opts
357−
358−conStringE :: Options -> Name -> Q Exp
359−conStringE opts = stringE . constructorTagModifier opts . nameBase
360−
361−-- | Helper function used by both 'deriveToJSON' and 'mkToEncoding'. Generates
362−-- code to write out a value for a number of constructors. All constructors
363−-- must be from the same type.
364−consToEncoding :: JSONClass
365− -- ^ The ToJSON variant being derived.
366− -> Options
367− -- ^ Encoding options.
368− -> [Con]
369− -- ^ Constructors for which to generate JSON generating code.
370− -> Q Exp
371−
372−consToEncoding _ _ [] = error $ "Data.Aeson.TH.consToEncoding: "
373− ++ "Not a single constructor given!"
374−
375−consToEncoding jc opts cons = do
376− value <- newName "value"
377− tes <- newNameList "_te" $ arityInt jc
378− tels <- newNameList "_tel" $ arityInt jc
379− let zippedTEs = zip tes tels
380− interleavedTEs = interleave tes tels
381− lamE (map varP $ interleavedTEs ++ [value]) $
382− caseE (varE value) (matches zippedTEs)
383− where
384− matches tes = case cons of
385− -- A single constructor is directly encoded. The constructor itself may be
386− -- forgotten.
387− [con] -> [argsToEncoding jc tes opts False con]
388− -- Encode just the name of the constructor of a sum type iff all the
389− -- constructors are nullary.
390− _ | allNullaryToStringTag opts && all isNullary cons ->
391− [ match (conP conName [])
392− (normalB $ encStr opts conName) []
393− | con <- cons
394− , let conName = getConName con
395− ]
396− | otherwise -> [argsToEncoding jc tes opts True con | con <- cons]
397
358
359+-- | Name of the constructor.
398−encStr :: Options -> Name -> Q Exp
360+conString :: Options -> Name -> String
399−encStr opts = appE [|E.text|] . conTxt opts
361+conString opts = constructorTagModifier opts . nameBase
400
362
401-- | If constructor is nullary.
363-- | If constructor is nullary.
402−isNullary :: Con -> Bool
364+isNullary :: ConstructorInfo -> Bool
403−isNullary (NormalC _ []) = True
365+isNullary ConstructorInfo { constructorVariant = NormalConstructor
366+ , constructorFields = tys } = null tys
404isNullary _ = False
367isNullary _ = False
405
368
406−sumToValue :: Options -> Bool -> Name -> Q Exp -> Q Exp
369+-- | Wrap fields of a non-record constructor. See 'sumToValue'.
370+opaqueSumToValue :: ToJSONFun -> Options -> Bool -> Bool -> Name -> ExpQ -> ExpQ
371+opaqueSumToValue target opts multiCons nullary conName value =
372+ sumToValue target opts multiCons nullary conName
373+ value
374+ pairs
375+ where
376+ pairs contentsFieldName = pairE contentsFieldName value
377+
378+-- | Wrap fields of a record constructor. See 'sumToValue'.
379+recordSumToValue :: ToJSONFun -> Options -> Bool -> Bool -> Name -> ExpQ -> ExpQ
380+recordSumToValue target opts multiCons nullary conName pairs =
407−sumToValue opts multiCons conName exp
381+ sumToValue target opts multiCons nullary conName
382+ (fromPairsE pairs)
383+ (const pairs)
384+
385+-- | Wrap fields of a constructor.
386+sumToValue
387+ :: ToJSONFun
388+ -- ^ The method being derived.
389+ -> Options
390+ -- ^ Deriving options.
391+ -> Bool
392+ -- ^ Does this type have multiple constructors.
393+ -> Bool
394+ -- ^ Is this constructor nullary.
395+ -> Name
396+ -- ^ Constructor name.
397+ -> ExpQ
398+ -- ^ Fields of the constructor as a 'Value' or 'Encoding'.
399+ -> (String -> ExpQ)
400+ -- ^ Representation of an 'Object' fragment used for the 'TaggedObject'
401+ -- variant; of type @[(Text,Value)]@ or @[Encoding]@, depending on the method
402+ -- being derived.
403+ --
404+ -- - For non-records, produces a pair @"contentsFieldName":value@,
405+ -- given a @contentsFieldName@ as an argument. See 'opaqueSumToValue'.
406+ -- - For records, produces the list of pairs corresponding to fields of the
407+ -- encoded value (ignores the argument). See 'recordSumToValue'.
408+ -> ExpQ
409+sumToValue target opts multiCons nullary conName value pairs
408 | multiCons =
410 | multiCons =
409 case sumEncoding opts of
411 case sumEncoding opts of
410 TwoElemArray ->
412 TwoElemArray ->
411− [|Array|] `appE` ([|V.fromList|] `appE` listE [conStr opts conName, exp])
413+ array target [conStr target opts conName, value]
412 TaggedObject{tagFieldName, contentsFieldName} ->
414 TaggedObject{tagFieldName, contentsFieldName} ->
413− [|A.object|] `appE` listE
415+ -- TODO: Maybe throw an error in case
414− [ infixApp [|T.pack tagFieldName|] [|(.=)|] (conStr opts conName)
416+ -- tagFieldName overwrites a field in pairs.
417+ let tag = pairE tagFieldName (conStr target opts conName)
415− , infixApp [|T.pack contentsFieldName|] [|(.=)|] exp
418+ content = pairs contentsFieldName
416− ]
419+ in fromPairsE $
420+ if nullary then tag else infixApp tag [|(Monoid.<>)|] content
417 ObjectWithSingleField ->
421 ObjectWithSingleField ->
418− [|A.object|] `appE` listE
422+ objectE [(conString opts conName, value)]
419− [ infixApp (conTxt opts conName) [|(.=)|] exp
423+ UntaggedValue | nullary -> conStr target opts conName
420− ]
421− UntaggedValue -> exp
424+ UntaggedValue -> value
422− | otherwise = exp
425+ | otherwise = value
423−
424−nullarySumToValue :: Options -> Bool -> Name -> Q Exp
425−nullarySumToValue opts multiCons conName =
426− case sumEncoding opts of
427− TaggedObject{tagFieldName} ->
428− [|A.object|] `appE` listE
429− [ infixApp [|T.pack tagFieldName|] [|(.=)|] (conStr opts conName)
430− ]
431− UntaggedValue -> conStr opts conName
432− _ -> sumToValue opts multiCons conName [e|toJSON ([] :: [()])|]
433
426
434-- | Generates code to generate the JSON encoding of a single constructor.
427-- | Generates code to generate the JSON encoding of a single constructor.
435−argsToValue :: JSONClass -> [(Name, Name)] -> Options -> Bool -> Con -> Q Match
428+argsToValue :: ToJSONFun -> JSONClass -> TyVarMap -> Options -> Bool -> ConstructorInfo -> Q Match
436−-- Nullary constructors. Generates code that explicitly matches against the
437−-- constructor even though it doesn't contain data. This is useful to prevent
438−-- type errors.
439−argsToValue jc tjs opts multiCons (NormalC conName []) = do
440− ([], _) <- reifyConTys jc tjs conName
441− match (conP conName [])
442− (normalB (nullarySumToValue opts multiCons conName))
443− []
444
429
445-- Polyadic constructors with special case for unary constructors.
430-- Polyadic constructors with special case for unary constructors.
446−argsToValue jc tjs opts multiCons (NormalC conName ts) = do
431+argsToValue target jc tvMap opts multiCons
447− (argTys, tvMap) <- reifyConTys jc tjs conName
432+ ConstructorInfo { constructorName = conName
433+ , constructorVariant = NormalConstructor
434+ , constructorFields = argTys } = do
435+ argTys' <- mapM resolveTypeSynonyms argTys
448− let len = length ts
436+ let len = length argTys'
449 args <- newNameList "arg" len
437 args <- newNameList "arg" len
450− js <- case [ dispatchToJSON jc conName tvMap argTy
438+ let js = case [ dispatchToJSON target jc conName tvMap argTy
451− `appE` varE arg
439+ `appE` varE arg
452− | (arg, argTy) <- zip args argTys
440+ | (arg, argTy) <- zip args argTys'
453− ] of
441+ ] of
454− -- Single argument is directly converted.
442+ -- Single argument is directly converted.
455− [e] -> return e
443+ [e] -> e
456− -- Multiple arguments are converted to a JSON array.
444+ -- Zero and multiple arguments are converted to a JSON array.
457− es -> do
445+ es -> array target es
458− mv <- newName "mv"
446+
459− let newMV = bindS (varP mv)
460− ([|VM.unsafeNew|] `appE`
461− litE (integerL $ fromIntegral len))
462− stmts = [ noBindS $
463− [|VM.unsafeWrite|] `appE`
464− varE mv `appE`
465− litE (integerL ix) `appE`
466− e
467− | (ix, e) <- zip [(0::Integer)..] es
468− ]
469− ret = noBindS $ [|return|] `appE` varE mv
470− return $ [|Array|] `appE`
471− (varE 'V.create `appE`
472− doE (newMV:stmts++[ret]))
473 match (conP conName $ map varP args)
447 match (conP conName $ map varP args)
474− (normalB $ sumToValue opts multiCons conName js)
448+ (normalB $ opaqueSumToValue target opts multiCons (null argTys') conName js)
475 []
449 []
476
450
477-- Records.
451-- Records.
452+argsToValue target jc tvMap opts multiCons
453+ info@ConstructorInfo { constructorName = conName
454+ , constructorVariant = RecordConstructor fields
455+ , constructorFields = argTys } =
478−argsToValue jc tjs opts multiCons (RecC conName ts) = case (unwrapUnaryRecords opts, not multiCons, ts) of
456+ case (unwrapUnaryRecords opts, not multiCons, argTys) of
479− (True,True,[(_,st,ty)]) -> argsToValue jc tjs opts multiCons (NormalC conName [(st,ty)])
457+ (True,True,[_]) -> argsToValue target jc tvMap opts multiCons
458+ (info{constructorVariant = NormalConstructor})
480− _ -> do
459+ _ -> do
481− (argTys, tvMap) <- reifyConTys jc tjs conName
460+ argTys' <- mapM resolveTypeSynonyms argTys
482− args <- newNameList "arg" $ length ts
461+ args <- newNameList "arg" $ length argTys'
483− let exp = [|A.object|] `appE` pairs
484−
485− pairs | omitNothingFields opts = infixApp maybeFields
462+ let pairs | omitNothingFields opts = infixApp maybeFields
486− [|(++)|]
463+ [|(Monoid.<>)|]
487− restFields
464+ restFields
488− | otherwise = listE $ map toPair argCons
465+ | otherwise = mconcatE (map pureToPair argCons)
489−
466+
490− argCons = zip3 args argTys ts
467+ argCons = zip3 (map varE args) argTys' fields
491−
468+
492− maybeFields = [|catMaybes|] `appE` listE (map maybeToPair maybes)
469+ maybeFields = mconcatE (map maybeToPair maybes)
493−
470+
494− restFields = listE $ map toPair rest
471+ restFields = mconcatE (map pureToPair rest)
495−
472+
496− (maybes, rest) = partition isMaybe argCons
473+ (maybes0, rest0) = partition isMaybe argCons
497−
474+ (options, rest) = partition isOption rest0
498− maybeToPair (arg, argTy, (field, _, _)) =
475+ maybes = maybes0 ++ map optionToMaybe options
499− infixApp ([|keyValuePairWith|]
476+
500− `appE` dispatchToJSON jc conName tvMap argTy
477+ maybeToPair = toPairLifted True
501− `appE` toFieldName field)
478+ pureToPair = toPairLifted False
502− [|(<$>)|]
479+
503− (varE arg)
504−
505− toPair (arg, argTy, (field, _, _)) =
480+ toPairLifted lifted (arg, argTy, field) =
506− [|keyValuePairWith|]
507− `appE` dispatchToJSON jc conName tvMap argTy
481+ let toValue = dispatchToJSON target jc conName tvMap argTy
508− `appE` toFieldName field
482+ fieldName = fieldLabel opts field
509− `appE` varE arg
483+ e arg' = pairE fieldName (toValue `appE` arg')
510−
484+ in if lifted
511− toFieldName field = [|T.pack|] `appE` fieldLabelExp opts field
485+ then do
512−
486+ x <- newName "x"
487+ [|maybe mempty|] `appE` lam1E (varP x) (e (varE x)) `appE` arg
488+ else e arg
489+
513− match (conP conName $ map varP args)
490+ match (conP conName $ map varP args)
514− ( normalB
491+ (normalB $ recordSumToValue target opts multiCons (null argTys) conName pairs)
515− $ if multiCons
516− then case sumEncoding opts of
517− TwoElemArray -> [|toJSON|] `appE` tupE [conStr opts conName, exp]
518− TaggedObject{tagFieldName} ->
519− [|A.object|] `appE`
520− -- TODO: Maybe throw an error in case
521− -- tagFieldName overwrites a field in pairs.
522− infixApp (infixApp [|T.pack tagFieldName|]
523− [|(.=)|]
524− (conStr opts conName))
525− [|(:)|]
526− pairs
527− ObjectWithSingleField ->
528− [|A.object|] `appE` listE
529− [ infixApp (conTxt opts conName) [|(.=)|] exp ]
530− UntaggedValue -> exp
531− else exp
532− ) []
492+ []
533
493
534-- Infix constructors.
494-- Infix constructors.
535−argsToValue jc tjs opts multiCons (InfixC _ conName _) = do
495+argsToValue target jc tvMap opts multiCons
536− ([alTy, arTy], tvMap) <- reifyConTys jc tjs conName
496+ ConstructorInfo { constructorName = conName
497+ , constructorVariant = InfixConstructor
498+ , constructorFields = argTys } = do
499+ [alTy, arTy] <- mapM resolveTypeSynonyms argTys
537 al <- newName "argL"
500 al <- newName "argL"
538 ar <- newName "argR"
501 ar <- newName "argR"
539 match (infixP (varP al) conName (varP ar))
502 match (infixP (varP al) conName (varP ar))
540 ( normalB
503 ( normalB
541− $ sumToValue opts multiCons conName
504+ $ opaqueSumToValue target opts multiCons False conName
505+ $ array target
542− $ [|toJSON|] `appE` listE [ dispatchToJSON jc conName tvMap aTy
506+ [ dispatchToJSON target jc conName tvMap aTy
543− `appE` varE a
507+ `appE` varE a
544− | (a, aTy) <- [(al,alTy), (ar,arTy)]
508+ | (a, aTy) <- [(al,alTy), (ar,arTy)]
545− ]
509+ ]
546 )
510 )
547 []
511 []
548−-- Existentially quantified constructors.
549−argsToValue jc tjs opts multiCons (ForallC _ _ con) =
550− argsToValue jc tjs opts multiCons con
551
512
552−#if MIN_VERSION_template_haskell(2,11,0)
513+isMaybe :: (a, Type, b) -> Bool
553−-- GADTs.
514+isMaybe (_, AppT (ConT t) _, _) = t == ''Maybe
554−argsToValue jc tjs opts multiCons (GadtC conNames ts _) =
515+isMaybe _ = False
555− argsToValue jc tjs opts multiCons $ NormalC (head conNames) ts
556
516
557−argsToValue jc tjs opts multiCons (RecGadtC conNames ts _) =
517+isOption :: (a, Type, b) -> Bool
558− argsToValue jc tjs opts multiCons $ RecC (head conNames) ts
518+isOption (_, AppT (ConT t) _, _) = t == ''Semigroup.Option
559−#endif
519+isOption _ = False
560
520
561−isMaybe :: (a, b, (c, d, Type)) -> Bool
521+optionToMaybe :: (ExpQ, b, c) -> (ExpQ, b, c)
562−isMaybe (_, _, (_, _, AppT (ConT t) _)) = t == ''Maybe
522+optionToMaybe (a, b, c) = ([|Semigroup.getOption|] `appE` a, b, c)
563−isMaybe _ = False
564
523
565(<^>) :: ExpQ -> ExpQ -> ExpQ
524(<^>) :: ExpQ -> ExpQ -> ExpQ
566(<^>) a b = infixApp a [|(E.><)|] b
525(<^>) a b = infixApp a [|(E.><)|] b
567infixr 6 <^>
526infixr 6 <^>
568
527
569−(<:>) :: ExpQ -> ExpQ -> ExpQ
570−(<:>) a b = a <^> [|E.colon|] <^> b
571−infixr 5 <:>
572−
573(<%>) :: ExpQ -> ExpQ -> ExpQ
528(<%>) :: ExpQ -> ExpQ -> ExpQ
574(<%>) a b = a <^> [|E.comma|] <^> b
529(<%>) a b = a <^> [|E.comma|] <^> b
575infixr 4 <%>
530infixr 4 <%>
576
531
577−array :: ExpQ -> ExpQ
532+-- | Wrap a list of quoted 'Value's in a quoted 'Array' (of type 'Value').
578−array exp = [|E.wrapArray|] `appE` exp
533+array :: ToJSONFun -> [ExpQ] -> ExpQ
579−
534+array Encoding [] = [|E.emptyArray_|]
580−object :: ExpQ -> ExpQ
535+array Value [] = [|Array V.empty|]
581−object exp = [|E.wrapObject|] `appE` exp
536+array Encoding es = [|E.wrapArray|] `appE` foldr1 (<%>) es
582−
537+array Value es = do
583−sumToEncoding :: Options -> Bool -> Name -> Q Exp -> Q Exp
538+ mv <- newName "mv"
584−sumToEncoding opts multiCons conName exp
539+ let newMV = bindS (varP mv)
585− | multiCons =
540+ ([|VM.unsafeNew|] `appE`
586− let fexp = exp in
541+ litE (integerL $ fromIntegral (length es)))
587− case sumEncoding opts of
542+ stmts = [ noBindS $
588− TwoElemArray ->
543+ [|VM.unsafeWrite|] `appE`
589− array (encStr opts conName <%> fexp)
544+ varE mv `appE`
590− TaggedObject{tagFieldName, contentsFieldName} ->
545+ litE (integerL ix) `appE`
591− object $
546+ e
592− ([|E.text (T.pack tagFieldName)|] <:> encStr opts conName) <%>
547+ | (ix, e) <- zip [(0::Integer)..] es
593− ([|E.text (T.pack contentsFieldName)|] <:> fexp)
548+ ]
594− ObjectWithSingleField ->
549+ ret = noBindS $ [|return|] `appE` varE mv
595− object (encStr opts conName <:> fexp)
550+ [|Array|] `appE`
596− UntaggedValue -> exp
551+ (varE 'V.create `appE`
597− | otherwise = exp
552+ doE (newMV:stmts++[ret]))
598−
599−nullarySumToEncoding :: Options -> Bool -> Name -> Q Exp
600−nullarySumToEncoding opts multiCons conName =
601− case sumEncoding opts of
602− TaggedObject{tagFieldName} ->
603− object $
604− [|E.text (T.pack tagFieldName)|] <:> encStr opts conName
605− UntaggedValue -> encStr opts conName
606− _ -> sumToEncoding opts multiCons conName [e|toEncoding ([] :: [()])|]
607−
608−-- | Generates code to generate the JSON encoding of a single constructor.
609−argsToEncoding :: JSONClass -> [(Name, Name)] -> Options -> Bool -> Con -> Q Match
610−-- Nullary constructors. Generates code that explicitly matches against the
611−-- constructor even though it doesn't contain data. This is useful to prevent
612−-- type errors.
613−argsToEncoding jc tes opts multiCons (NormalC conName []) = do
614− ([], _) <- reifyConTys jc tes conName
615− match (conP conName [])
616− (normalB (nullarySumToEncoding opts multiCons conName))
617− []
618−
619−-- Polyadic constructors with special case for unary constructors.
620−argsToEncoding jc tes opts multiCons (NormalC conName ts) = do
621− (argTys, tvMap) <- reifyConTys jc tes conName
622− let len = length ts
623− args <- newNameList "arg" len
624− js <- case zip args argTys of
625− -- Single argument is directly converted.
626− [(e,eTy)] -> return (dispatchToEncoding jc conName tvMap eTy
627− `appE` varE e)
628− -- Multiple arguments are converted to a JSON array.
629− es ->
630− return (array (foldr1 (<%>) [ dispatchToEncoding jc conName tvMap xTy
631− `appE` varE x
632− | (x,xTy) <- es
633− ]))
634− match (conP conName $ map varP args)
635− (normalB $ sumToEncoding opts multiCons conName js)
636− []
637
553
638−-- Records.
554+-- | Wrap an associative list of keys and quoted values in a quoted 'Object'.
639−argsToEncoding jc tes opts multiCons (RecC conName ts) = case (unwrapUnaryRecords opts, not multiCons, ts) of
555+objectE :: [(String, ExpQ)] -> ExpQ
640− (True,True,[(_,st,ty)]) -> argsToEncoding jc tes opts multiCons (NormalC conName [(st,ty)])
556+objectE = fromPairsE . mconcatE . fmap (uncurry pairE)
641− _ -> do
642− args <- newNameList "arg" $ length ts
643− (argTys, tvMap) <- reifyConTys jc tes conName
644− let exp = object objBody
645−
646− objBody = [|E.econcat|] `appE`
647− ([|intersperse E.comma|] `appE` pairs)
648− pairs | omitNothingFields opts = infixApp maybeFields
649− [|(++)|]
650− restFields
651− | otherwise = listE (map toPair argCons)
652−
653− argCons = zip3 args argTys ts
654−
655− maybeFields = [|catMaybes|] `appE` listE (map maybeToPair maybes)
656−
657− restFields = listE (map toPair rest)
658−
659− (maybes, rest) = partition isMaybe argCons
660−
661− maybeToPair (arg, argTy, (field, _, _)) =
662− infixApp
663− (infixApp
664− (infixE
665− (Just $ toFieldName field <^> [|E.colon|])
666− [|(E.><)|]
667− Nothing)
668− [|(.)|]
669− (dispatchToEncoding jc conName tvMap argTy))
670− [|(<$>)|]
671− (varE arg)
672−
673− toPair (arg, argTy, (field, _, _)) =
674− toFieldName field
675− <:> dispatchToEncoding jc conName tvMap argTy
676− `appE` varE arg
677−
678− toFieldName field = [|E.text|] `appE`
679− ([|T.pack|] `appE` fieldLabelExp opts field)
680
557
681− match (conP conName $ map varP args)
558+-- | 'mconcat' a list of fixed length.
682− ( normalB
559+--
683− $ if multiCons
560+-- > mconcatE [ [|x|], [|y|], [|z|] ] = [| x <> (y <> z) |]
684− then case sumEncoding opts of
561+mconcatE :: [ExpQ] -> ExpQ
685− TwoElemArray -> array $
562+mconcatE [] = [|Monoid.mempty|]
686− encStr opts conName <%> exp
563+mconcatE [x] = x
687− TaggedObject{tagFieldName} -> object $
564+mconcatE (x : xs) = infixApp x [|(Monoid.<>)|] (mconcatE xs)
688− ([|E.text (T.pack tagFieldName)|] <:>
689− encStr opts conName) <%>
690− objBody
691− ObjectWithSingleField -> object $
692− encStr opts conName <:> exp
693− UntaggedValue -> exp
694− else exp
695− ) []
696−
697−-- Infix constructors.
698−argsToEncoding jc tes opts multiCons (InfixC _ conName _) = do
699− al <- newName "argL"
700− ar <- newName "argR"
701− ([alTy,arTy], tvMap) <- reifyConTys jc tes conName
702− match (infixP (varP al) conName (varP ar))
703− ( normalB
704− $ sumToEncoding opts multiCons conName
705− $ array (foldr1 (<%>) [ dispatchToEncoding jc conName tvMap aTy
706− `appE` varE a
707− | (a,aTy) <- [(al,alTy), (ar,arTy)]
708− ])
709− )
710− []
711−-- Existentially quantified constructors.
712−argsToEncoding jc tes opts multiCons (ForallC _ _ con) =
713− argsToEncoding jc tes opts multiCons con
714
565
715−#if MIN_VERSION_template_haskell(2,11,0)
566+fromPairsE :: ExpQ -> ExpQ
716−-- GADTs.
567+fromPairsE = ([|fromPairs|] `appE`)
717−argsToEncoding jc tes opts multiCons (GadtC conNames ts _) =
718− argsToEncoding jc tes opts multiCons $ NormalC (head conNames) ts
719
568
720−argsToEncoding jc tes opts multiCons (RecGadtC conNames ts _) =
569+-- | Create (an encoding of) a key-value pair.
721− argsToEncoding jc tes opts multiCons $ RecC (head conNames) ts
570+--
722−#endif
571+-- > pairE "k" [|v|] = [|pair "k" v|]
572+pairE :: String -> ExpQ -> ExpQ
573+pairE k v = [|pair k|] `appE` v
723
574
724--------------------------------------------------------------------------------
575--------------------------------------------------------------------------------
725-- FromJSON
576-- FromJSON
@@ -803,31 +654,41 @@ consFromJSON :: JSONClass
803 -- ^ Name of the type to which the constructors belong.
654 -- ^ Name of the type to which the constructors belong.
804 -> Options
655 -> Options
805 -- ^ Encoding options
656 -- ^ Encoding options
806− -> [Con]
657+ -> [Type]
658+ -- ^ The types from the data type/data family instance declaration
659+ -> [ConstructorInfo]
807 -- ^ Constructors for which to generate JSON parsing code.
660 -- ^ Constructors for which to generate JSON parsing code.
808 -> Q Exp
661 -> Q Exp
809
662
810−consFromJSON _ _ _ [] = error $ "Data.Aeson.TH.consFromJSON: "
663+consFromJSON _ _ _ _ [] = error $ "Data.Aeson.TH.consFromJSON: "
811− ++ "Not a single constructor given!"
664+ ++ "Not a single constructor given!"
812
665
813−consFromJSON jc tName opts cons = do
666+consFromJSON jc tName opts instTys cons = do
814 value <- newName "value"
667 value <- newName "value"
815 pjs <- newNameList "_pj" $ arityInt jc
668 pjs <- newNameList "_pj" $ arityInt jc
816 pjls <- newNameList "_pjl" $ arityInt jc
669 pjls <- newNameList "_pjl" $ arityInt jc
817 let zippedPJs = zip pjs pjls
670 let zippedPJs = zip pjs pjls
818 interleavedPJs = interleave pjs pjls
671 interleavedPJs = interleave pjs pjls
672+ lastTyVars = map varTToName $ drop (length instTys - arityInt jc) instTys
673+ tvMap = M.fromList $ zip lastTyVars zippedPJs
819− lamE (map varP $ interleavedPJs ++ [value]) $ lamExpr value zippedPJs
674+ lamE (map varP $ interleavedPJs ++ [value]) $ lamExpr value tvMap
820
675
821 where
676 where
677+ checkExi tvMap con = checkExistentialContext jc tvMap
678+ (constructorContext con)
679+ (constructorName con)
680+
822− lamExpr value pjs = case cons of
681+ lamExpr value tvMap = case cons of
682+ [con]
683+ | not (tagSingleConstructors opts)
823− [con] -> parseArgs jc pjs tName opts con (Right value)
684+ -> checkExi tvMap con $ parseArgs jc tvMap tName opts con (Right value)
824 _ | sumEncoding opts == UntaggedValue
685 _ | sumEncoding opts == UntaggedValue
825− -> parseUntaggedValue pjs cons value
686+ -> parseUntaggedValue tvMap cons value
826 | otherwise
687 | otherwise
827 -> caseE (varE value) $
688 -> caseE (varE value) $
828 if allNullaryToStringTag opts && all isNullary cons
689 if allNullaryToStringTag opts && all isNullary cons
829 then allNullaryMatches
690 then allNullaryMatches
830− else mixedMatches pjs
691+ else mixedMatches tvMap
831
692
832 allNullaryMatches =
693 allNullaryMatches =
833 [ do txt <- newName "txt"
694 [ do txt <- newName "txt"
@@ -836,12 +697,11 @@ consFromJSON jc tName opts cons = do
836 [ liftM2 (,) (normalG $
697 [ liftM2 (,) (normalG $
837 infixApp (varE txt)
698 infixApp (varE txt)
838 [|(==)|]
699 [|(==)|]
839− ([|T.pack|] `appE`
840− conStringE opts conName)
700+ (conTxt opts conName)
841 )
701 )
842 ([|pure|] `appE` conE conName)
702 ([|pure|] `appE` conE conName)
843 | con <- cons
703 | con <- cons
844− , let conName = getConName con
704+ , let conName = constructorName con
845 ]
705 ]
846 ++
706 ++
847 [ liftM2 (,)
707 [ liftM2 (,)
@@ -862,13 +722,13 @@ consFromJSON jc tName opts cons = do
862 []
722 []
863 ]
723 ]
864
724
865− mixedMatches pjs =
725+ mixedMatches tvMap =
866 case sumEncoding opts of
726 case sumEncoding opts of
867 TaggedObject {tagFieldName, contentsFieldName} ->
727 TaggedObject {tagFieldName, contentsFieldName} ->
868− parseObject $ parseTaggedObject pjs tagFieldName contentsFieldName
728+ parseObject $ parseTaggedObject tvMap tagFieldName contentsFieldName
869 UntaggedValue -> error "UntaggedValue: Should be handled already"
729 UntaggedValue -> error "UntaggedValue: Should be handled already"
870 ObjectWithSingleField ->
730 ObjectWithSingleField ->
871− parseObject $ parseObjectWithSingleField pjs
731+ parseObject $ parseObjectWithSingleField tvMap
872 TwoElemArray ->
732 TwoElemArray ->
873 [ do arr <- newName "array"
733 [ do arr <- newName "array"
874 match (conP 'Array [varP arr])
734 match (conP 'Array [varP arr])
@@ -876,7 +736,7 @@ consFromJSON jc tName opts cons = do
876 [ liftM2 (,) (normalG $ infixApp ([|V.length|] `appE` varE arr)
736 [ liftM2 (,) (normalG $ infixApp ([|V.length|] `appE` varE arr)
877 [|(==)|]
737 [|(==)|]
878 (litE $ integerL 2))
738 (litE $ integerL 2))
879− (parse2ElemArray pjs arr)
739+ (parse2ElemArray tvMap arr)
880 , liftM2 (,) (normalG [|otherwise|])
740 , liftM2 (,) (normalG [|otherwise|])
881 ([|not2ElemArray|]
741 ([|not2ElemArray|]
882 `appE` litE (stringL $ show tName)
742 `appE` litE (stringL $ show tName)
@@ -907,25 +767,29 @@ consFromJSON jc tName opts cons = do
907 []
767 []
908 ]
768 ]
909
769
910− parseTaggedObject pjs typFieldName valFieldName obj = do
770+ parseTaggedObject tvMap typFieldName valFieldName obj = do
911 conKey <- newName "conKey"
771 conKey <- newName "conKey"
912 doE [ bindS (varP conKey)
772 doE [ bindS (varP conKey)
913 (infixApp (varE obj)
773 (infixApp (varE obj)
914 [|(.:)|]
774 [|(.:)|]
915 ([|T.pack|] `appE` stringE typFieldName))
775 ([|T.pack|] `appE` stringE typFieldName))
916− , noBindS $ parseContents pjs conKey (Left (valFieldName, obj)) 'conNotFoundFailTaggedObject
776+ , noBindS $ parseContents tvMap conKey (Left (valFieldName, obj)) 'conNotFoundFailTaggedObject
917 ]
777 ]
918
778
919− parseUntaggedValue pjs cons' conVal =
779+ parseUntaggedValue tvMap cons' conVal =
920 foldr1 (\e e' -> infixApp e [|(<|>)|] e')
780 foldr1 (\e e' -> infixApp e [|(<|>)|] e')
921− (map (\x -> parseValue pjs x conVal) cons')
781+ (map (\x -> parseValue tvMap x conVal) cons')
922
782
923− parseValue _pjs (NormalC conName []) conVal = do
783+ parseValue _tvMap
784+ ConstructorInfo { constructorName = conName
785+ , constructorVariant = NormalConstructor
786+ , constructorFields = [] }
787+ conVal = do
924 str <- newName "str"
788 str <- newName "str"
925 caseE (varE conVal)
789 caseE (varE conVal)
926 [ match (conP 'String [varP str])
790 [ match (conP 'String [varP str])
927 (guardedB
791 (guardedB
928− [ liftM2 (,) (normalG $ infixApp (varE str) [|(==)|] ([|T.pack|] `appE` conStringE opts conName)
792+ [ liftM2 (,) (normalG $ infixApp (varE str) [|(==)|] (conTxt opts conName)
929 )
793 )
930 ([|pure|] `appE` conE conName)
794 ([|pure|] `appE` conE conName)
931 ]
795 ]
@@ -933,11 +797,11 @@ consFromJSON jc tName opts cons = do
933 []
797 []
934 , matchFailed tName conName "String"
798 , matchFailed tName conName "String"
935 ]
799 ]
936− parseValue pjs con conVal =
800+ parseValue tvMap con conVal =
937− parseArgs jc pjs tName opts con (Right conVal)
801+ checkExi tvMap con $ parseArgs jc tvMap tName opts con (Right conVal)
938
802
939
803
940− parse2ElemArray pjs arr = do
804+ parse2ElemArray tvMap arr = do
941 conKey <- newName "conKey"
805 conKey <- newName "conKey"
942 conVal <- newName "conVal"
806 conVal <- newName "conVal"
943 let letIx n ix =
807 let letIx n ix =
@@ -952,7 +816,7 @@ consFromJSON jc tName opts cons = do
952 (caseE (varE conKey)
816 (caseE (varE conKey)
953 [ do txt <- newName "txt"
817 [ do txt <- newName "txt"
954 match (conP 'String [varP txt])
818 match (conP 'String [varP txt])
955− (normalB $ parseContents pjs
819+ (normalB $ parseContents tvMap
956 txt
820 txt
957 (Right conVal)
821 (Right conVal)
958 'conNotFoundFail2ElemArray
822 'conNotFoundFail2ElemArray
@@ -969,12 +833,12 @@ consFromJSON jc tName opts cons = do
969 ]
833 ]
970 )
834 )
971
835
972− parseObjectWithSingleField pjs obj = do
836+ parseObjectWithSingleField tvMap obj = do
973 conKey <- newName "conKey"
837 conKey <- newName "conKey"
974 conVal <- newName "conVal"
838 conVal <- newName "conVal"
975 caseE ([e|H.toList|] `appE` varE obj)
839 caseE ([e|H.toList|] `appE` varE obj)
976 [ match (listP [tupP [varP conKey, varP conVal]])
840 [ match (listP [tupP [varP conKey, varP conVal]])
977− (normalB $ parseContents pjs conKey (Right conVal) 'conNotFoundFailObjectSingleField)
841+ (normalB $ parseContents tvMap conKey (Right conVal) 'conNotFoundFailObjectSingleField)
978 []
842 []
979 , do other <- newName "other"
843 , do other <- newName "other"
980 match (varP other)
844 match (varP other)
@@ -985,7 +849,7 @@ consFromJSON jc tName opts cons = do
985 []
849 []
986 ]
850 ]
987
851
988− parseContents pjs conKey contents errorFun =
852+ parseContents tvMap conKey contents errorFun =
989 caseE (varE conKey)
853 caseE (varE conKey)
990 [ match wildP
854 [ match wildP
991 ( guardedB $
855 ( guardedB $
@@ -993,7 +857,8 @@ consFromJSON jc tName opts cons = do
993 [|(==)|]
857 [|(==)|]
994 ([|T.pack|] `appE`
858 ([|T.pack|] `appE`
995 conNameExp opts con)
859 conNameExp opts con)
860+ e <- checkExi tvMap con $
996− e <- parseArgs jc pjs tName opts con contents
861+ parseArgs jc tvMap tName opts con contents
997 return (g, e)
862 return (g, e)
998 | con <- cons
863 | con <- cons
999 ]
864 ]
@@ -1006,7 +871,7 @@ consFromJSON jc tName opts cons = do
1006 . stringL
871 . stringL
1007 . constructorTagModifier opts
872 . constructorTagModifier opts
1008 . nameBase
873 . nameBase
1009− . getConName
874+ . constructorName
1010 ) cons
875 ) cons
1011 )
876 )
1012 `appE` ([|T.unpack|] `appE` varE conKey)
877 `appE` ([|T.unpack|] `appE` varE conKey)
@@ -1055,22 +920,42 @@ parseRecord :: JSONClass
1055 -> Options
920 -> Options
1056 -> Name
921 -> Name
1057 -> Name
922 -> Name
1058− -> [VarStrictType]
923+ -> [Name]
1059 -> Name
924 -> Name
925+ -> Bool
1060 -> ExpQ
926 -> ExpQ
1061−parseRecord jc tvMap argTys opts tName conName ts obj =
927+parseRecord jc tvMap argTys opts tName conName fields obj inTaggedObject =
928+ (if rejectUnknownFields opts
929+ then infixApp checkUnknownRecords [|(>>)|]
930+ else id) $
1062 foldl' (\a b -> infixApp a [|(<*>)|] b)
931 foldl' (\a b -> infixApp a [|(<*>)|] b)
1063 (infixApp (conE conName) [|(<$>)|] x)
932 (infixApp (conE conName) [|(<$>)|] x)
1064 xs
933 xs
1065 where
934 where
935+ tagFieldNameAppender =
936+ if inTaggedObject then (tagFieldName (sumEncoding opts) :) else id
937+ knownFields = appE [|H.fromList|] $ listE $
938+ map (\knownName -> tupE [appE [|T.pack|] $ litE $ stringL knownName, [|()|]]) $
939+ tagFieldNameAppender $ map nameBase fields
940+ checkUnknownRecords =
941+ caseE (appE [|H.keys|] $ infixApp (varE obj) [|H.difference|] knownFields)
942+ [ match (listP []) (normalB [|return ()|]) []
943+ , newName "unknownFields" >>=
944+ \unknownFields -> match (varP unknownFields)
945+ (normalB $ appE [|fail|] $ infixApp
946+ (litE (stringL "Unknown fields: "))
947+ [|(++)|]
948+ (appE [|show|] (varE unknownFields)))
949+ []
950+ ]
1066 x:xs = [ [|lookupField|]
951 x:xs = [ [|lookupField|]
1067 `appE` dispatchParseJSON jc conName tvMap argTy
952 `appE` dispatchParseJSON jc conName tvMap argTy
1068 `appE` litE (stringL $ show tName)
953 `appE` litE (stringL $ show tName)
1069 `appE` litE (stringL $ constructorTagModifier opts $ nameBase conName)
954 `appE` litE (stringL $ constructorTagModifier opts $ nameBase conName)
1070 `appE` varE obj
955 `appE` varE obj
1071− `appE` ( [|T.pack|] `appE` fieldLabelExp opts field
956+ `appE` ( [|T.pack|] `appE` stringE (fieldLabel opts field)
1072 )
957 )
1073− | ((field, _, _), argTy) <- zip ts argTys
958+ | (field, argTy) <- zip fields argTys
1074 ]
959 ]
1075
960
1076getValField :: Name -> String -> [MatchQ] -> Q Exp
961getValField :: Name -> String -> [MatchQ] -> Q Exp
@@ -1089,67 +974,82 @@ matchCases (Right valName) = caseE (varE valName)
1089
974
1090-- | Generates code to parse the JSON encoding of a single constructor.
975-- | Generates code to parse the JSON encoding of a single constructor.
1091parseArgs :: JSONClass -- ^ The FromJSON variant being derived.
976parseArgs :: JSONClass -- ^ The FromJSON variant being derived.
977+ -> TyVarMap -- ^ Maps the last type variables to their decoding
1092− -> [(Name, Name)] -- ^ The names of the encoding/decoding function arguments.
978+ -- function arguments.
1093 -> Name -- ^ Name of the type to which the constructor belongs.
979 -> Name -- ^ Name of the type to which the constructor belongs.
1094 -> Options -- ^ Encoding options.
980 -> Options -- ^ Encoding options.
1095− -> Con -- ^ Constructor for which to generate JSON parsing code.
981+ -> ConstructorInfo -- ^ Constructor for which to generate JSON parsing code.
1096 -> Either (String, Name) Name -- ^ Left (valFieldName, objName) or
982 -> Either (String, Name) Name -- ^ Left (valFieldName, objName) or
1097 -- Right valName
983 -- Right valName
1098 -> Q Exp
984 -> Q Exp
1099-- Nullary constructors.
985-- Nullary constructors.
1100−parseArgs jc pjs _ _ (NormalC conName []) (Left _) = do
986+parseArgs _ _ _ _
1101− ([], _) <- reifyConTys jc pjs conName
987+ ConstructorInfo { constructorName = conName
988+ , constructorVariant = NormalConstructor
989+ , constructorFields = [] }
990+ (Left _) =
1102− [|pure|] `appE` conE conName
991+ [|pure|] `appE` conE conName
1103−parseArgs jc pjs tName _ (NormalC conName []) (Right valName) = do
992+parseArgs _ _ tName _
1104− ([], _) <- reifyConTys jc pjs conName
993+ ConstructorInfo { constructorName = conName
994+ , constructorVariant = NormalConstructor
995+ , constructorFields = [] }
996+ (Right valName) =
1105− caseE (varE valName) $ parseNullaryMatches tName conName
997+ caseE (varE valName) $ parseNullaryMatches tName conName
1106
998
1107-- Unary constructors.
999-- Unary constructors.
1108−parseArgs jc pjs _ _ (NormalC conName [_]) contents = do
1000+parseArgs jc tvMap _ _
1109− ([argTy], tvMap) <- reifyConTys jc pjs conName
1001+ ConstructorInfo { constructorName = conName
1002+ , constructorVariant = NormalConstructor
1003+ , constructorFields = [argTy] }
1004+ contents = do
1005+ argTy' <- resolveTypeSynonyms argTy
1110− matchCases contents $ parseUnaryMatches jc tvMap argTy conName
1006+ matchCases contents $ parseUnaryMatches jc tvMap argTy' conName
1111
1007
1112-- Polyadic constructors.
1008-- Polyadic constructors.
1113−parseArgs jc pjs tName _ (NormalC conName ts) contents = do
1009+parseArgs jc tvMap tName _
1114− (argTys, tvMap) <- reifyConTys jc pjs conName
1010+ ConstructorInfo { constructorName = conName
1011+ , constructorVariant = NormalConstructor
1012+ , constructorFields = argTys }
1013+ contents = do
1014+ argTys' <- mapM resolveTypeSynonyms argTys
1115− let len = genericLength ts
1015+ let len = genericLength argTys'
1116− matchCases contents $ parseProduct jc tvMap argTys tName conName len
1016+ matchCases contents $ parseProduct jc tvMap argTys' tName conName len
1117
1017
1118-- Records.
1018-- Records.
1119−parseArgs jc pjs tName opts (RecC conName ts) (Left (_, obj)) = do
1019+parseArgs jc tvMap tName opts
1120− (argTys, tvMap) <- reifyConTys jc pjs conName
1020+ ConstructorInfo { constructorName = conName
1021+ , constructorVariant = RecordConstructor fields
1022+ , constructorFields = argTys }
1023+ (Left (_, obj)) = do
1024+ argTys' <- mapM resolveTypeSynonyms argTys
1121− parseRecord jc tvMap argTys opts tName conName ts obj
1025+ parseRecord jc tvMap argTys' opts tName conName fields obj True
1026+parseArgs jc tvMap tName opts
1027+ info@ConstructorInfo { constructorName = conName
1028+ , constructorVariant = RecordConstructor fields
1029+ , constructorFields = argTys }
1030+ (Right valName) =
1122−parseArgs jc pjs tName opts (RecC conName ts) (Right valName) = case (unwrapUnaryRecords opts,ts) of
1031+ case (unwrapUnaryRecords opts,argTys) of
1123− (True,[(_,st,ty)])-> parseArgs jc pjs tName opts (NormalC conName [(st,ty)]) (Right valName)
1032+ (True,[_])-> parseArgs jc tvMap tName opts
1033+ (info{constructorVariant = NormalConstructor})
1034+ (Right valName)
1124− _ -> do
1035+ _ -> do
1125− obj <- newName "recObj"
1036+ obj <- newName "recObj"
1126− (argTys, tvMap) <- reifyConTys jc pjs conName
1037+ argTys' <- mapM resolveTypeSynonyms argTys
1127− caseE (varE valName)
1038+ caseE (varE valName)
1128− [ match (conP 'Object [varP obj]) (normalB $
1039+ [ match (conP 'Object [varP obj]) (normalB $
1129− parseRecord jc tvMap argTys opts tName conName ts obj) []
1040+ parseRecord jc tvMap argTys' opts tName conName fields obj False) []
1130− , matchFailed tName conName "Object"
1041+ , matchFailed tName conName "Object"
1131− ]
1042+ ]
1132
1043
1133-- Infix constructors. Apart from syntax these are the same as
1044-- Infix constructors. Apart from syntax these are the same as
1134-- polyadic constructors.
1045-- polyadic constructors.
1135−parseArgs jc pjs tName _ (InfixC _ conName _) contents = do
1046+parseArgs jc tvMap tName _
1136− (argTys, tvMap) <- reifyConTys jc pjs conName
1047+ ConstructorInfo { constructorName = conName
1048+ , constructorVariant = InfixConstructor
1049+ , constructorFields = argTys }
1050+ contents = do
1051+ argTys' <- mapM resolveTypeSynonyms argTys
1137− matchCases contents $ parseProduct jc tvMap argTys tName conName 2
1052+ matchCases contents $ parseProduct jc tvMap argTys' tName conName 2
1138−
1139−-- Existentially quantified constructors. We ignore the quantifiers
1140−-- and proceed with the contained constructor.
1141−parseArgs jc pjs tName opts (ForallC _ _ con) contents =
1142− parseArgs jc pjs tName opts con contents
1143−
1144−#if MIN_VERSION_template_haskell(2,11,0)
1145−-- GADTs. We ignore the refined return type and proceed as if it were a
1146−-- NormalC or RecC.
1147−parseArgs jc pjs tName opts (GadtC conNames ts _) contents =
1148− parseArgs jc pjs tName opts (NormalC (head conNames) ts) contents
1149−
1150−parseArgs jc pjs tName opts (RecGadtC conNames ts _) contents =
1151− parseArgs jc pjs tName opts (RecC (head conNames) ts) contents
1152−#endif
1153
1053
1154-- | Generates code to parse the JSON encoding of an n-ary
1054-- | Generates code to parse the JSON encoding of an n-ary
1155-- constructor.
1055-- constructor.
@@ -1226,6 +1126,11 @@ instance OVERLAPPABLE_ LookupField a where
1226instance INCOHERENT_ LookupField (Maybe a) where
1126instance INCOHERENT_ LookupField (Maybe a) where
1227 lookupField pj _ _ = parseOptionalFieldWith pj
1127 lookupField pj _ _ = parseOptionalFieldWith pj
1228
1128
1129+instance INCOHERENT_ LookupField (Semigroup.Option a) where
1130+ lookupField pj tName rec obj key =
1131+ fmap Semigroup.Option
1132+ (lookupField (fmap Semigroup.getOption . pj) tName rec obj key)
1133+
1229lookupFieldWith :: (Value -> Parser a) -> String -> String
1134lookupFieldWith :: (Value -> Parser a) -> String -> String
1230 -> Object -> T.Text -> Parser a
1135 -> Object -> T.Text -> Parser a
1231lookupFieldWith pj tName rec obj key =
1136lookupFieldWith pj tName rec obj key =
@@ -1233,9 +1138,6 @@ lookupFieldWith pj tName rec obj key =
1233 Nothing -> unknownFieldFail tName rec (T.unpack key)
1138 Nothing -> unknownFieldFail tName rec (T.unpack key)
1234 Just v -> pj v <?> Key key
1139 Just v -> pj v <?> Key key
1235
1140
1236−keyValuePairWith :: (v -> Value) -> T.Text -> v -> Pair
1237−keyValuePairWith tj name value = (name, tj value)
1238−
1239unknownFieldFail :: String -> String -> String -> Parser fail
1141unknownFieldFail :: String -> String -> String -> Parser fail
1240unknownFieldFail tName rec key =
1142unknownFieldFail tName rec key =
1241 fail $ printf "When parsing the record %s of type %s the key %s was not present."
1143 fail $ printf "When parsing the record %s of type %s the key %s was not present."
@@ -1304,7 +1206,8 @@ deriveJSONBoth dtj dfj opts name =
1304 liftM2 (++) (dtj opts name) (dfj opts name)
1206 liftM2 (++) (dtj opts name) (dfj opts name)
1305
1207
1306-- | Functionality common to @deriveToJSON(1)(2)@ and @deriveFromJSON(1)(2)@.
1208-- | Functionality common to @deriveToJSON(1)(2)@ and @deriveFromJSON(1)(2)@.
1307−deriveJSONClass :: [(JSONFun, JSONClass -> Name -> Options -> [Con] -> Q Exp)]
1209+deriveJSONClass :: [(JSONFun, JSONClass -> Name -> Options -> [Type]
1210+ -> [ConstructorInfo] -> Q Exp)]
1308 -- ^ The class methods and the functions which derive them.
1211 -- ^ The class methods and the functions which derive them.
1309 -> JSONClass
1212 -> JSONClass
1310 -- ^ The class for which to generate an instance.
1213 -- ^ The class for which to generate an instance.
@@ -1314,27 +1217,34 @@ deriveJSONClass :: [(JSONFun, JSONClass -> Name -> Options -> [Con] -> Q Exp)]
1314 -- ^ Name of the type for which to generate a class instance
1217 -- ^ Name of the type for which to generate a class instance
1315 -- declaration.
1218 -- declaration.
1316 -> Q [Dec]
1219 -> Q [Dec]
1317−deriveJSONClass consFuns jc opts name =
1220+deriveJSONClass consFuns jc opts name = do
1318− withType name $ \name' ctxt tvbs cons mbTys ->
1221+ info <- reifyDatatype name
1319− (:[]) <$> fromCons name' ctxt tvbs cons mbTys
1222+ case info of
1320− where
1223+ DatatypeInfo { datatypeContext = ctxt
1321− fromCons :: Name -> Cxt -> [TyVarBndr] -> [Con] -> Maybe [Type] -> Q Dec
1224+ , datatypeName = parentName
1322− fromCons name' ctxt tvbs cons mbTys = do
1225+#if MIN_VERSION_th_abstraction(0,3,0)
1226+ , datatypeInstTypes = instTys
1227+#else
1228+ , datatypeVars = instTys
1229+#endif
1230+ , datatypeVariant = variant
1231+ , datatypeCons = cons
1232+ } -> do
1323 (instanceCxt, instanceType)
1233 (instanceCxt, instanceType)
1324− <- buildTypeInstance name' jc ctxt tvbs mbTys
1234+ <- buildTypeInstance parentName jc ctxt instTys variant
1325− instanceD (return instanceCxt)
1235+ (:[]) <$> instanceD (return instanceCxt)
1326− (return instanceType)
1236+ (return instanceType)
1327− (methodDecs name' cons)
1237+ (methodDecs parentName instTys cons)
1328−
1238+ where
1329− methodDecs :: Name -> [Con] -> [Q Dec]
1239+ methodDecs :: Name -> [Type] -> [ConstructorInfo] -> [Q Dec]
1330− methodDecs name' cons = flip map consFuns $ \(jf, jfMaker) ->
1240+ methodDecs parentName instTys cons = flip map consFuns $ \(jf, jfMaker) ->
1331 funD (jsonFunValName jf (arity jc))
1241 funD (jsonFunValName jf (arity jc))
1332 [ clause []
1242 [ clause []
1333− (normalB $ jfMaker jc name' opts cons)
1243+ (normalB $ jfMaker jc parentName opts instTys cons)
1334 []
1244 []
1335 ]
1245 ]
1336
1246
1337−mkFunCommon :: (JSONClass -> Name -> Options -> [Con] -> Q Exp)
1247+mkFunCommon :: (JSONClass -> Name -> Options -> [Type] -> [ConstructorInfo] -> Q Exp)
1338 -- ^ The function which derives the expression.
1248 -- ^ The function which derives the expression.
1339 -> JSONClass
1249 -> JSONClass
1340 -- ^ Which class's method is being derived.
1250 -- ^ Which class's method is being derived.
@@ -1343,15 +1253,24 @@ mkFunCommon :: (JSONClass -> Name -> Options -> [Con] -> Q Exp)
1343 -> Name
1253 -> Name
1344 -- ^ Name of the encoded type.
1254 -- ^ Name of the encoded type.
1345 -> Q Exp
1255 -> Q Exp
1346−mkFunCommon consFun jc opts name = withType name fromCons
1256+mkFunCommon consFun jc opts name = do
1347− where
1257+ info <- reifyDatatype name
1348− fromCons :: Name -> Cxt -> [TyVarBndr] -> [Con] -> Maybe [Type] -> Q Exp
1258+ case info of
1349− fromCons name' ctxt tvbs cons mbTys = do
1259+ DatatypeInfo { datatypeContext = ctxt
1260+ , datatypeName = parentName
1261+#if MIN_VERSION_th_abstraction(0,3,0)
1262+ , datatypeInstTypes = instTys
1263+#else
1264+ , datatypeVars = instTys
1265+#endif
1266+ , datatypeVariant = variant
1267+ , datatypeCons = cons
1268+ } -> do
1350− -- We force buildTypeInstance here since it performs some checks for whether
1269+ -- We force buildTypeInstance here since it performs some checks for whether
1351− -- or not the provided datatype's kind matches the derived method's
1270+ -- or not the provided datatype's kind matches the derived method's
1352− -- typeclass, and produces errors if it can't.
1271+ -- typeclass, and produces errors if it can't.
1353− !_ <- buildTypeInstance name' jc ctxt tvbs mbTys
1272+ !_ <- buildTypeInstance parentName jc ctxt instTys variant
1354− consFun jc name' opts cons
1273+ consFun jc parentName opts instTys cons
1355
1274
1356dispatchFunByType :: JSONClass
1275dispatchFunByType :: JSONClass
1357 -> JSONFun
1276 -> JSONFun
@@ -1396,200 +1315,37 @@ dispatchFunByType jc jf conName tvMap list ty = do
1396 (interleave rhsArgs rhsArgs)
1315 (interleave rhsArgs rhsArgs)
1397 else varE $ jsonFunValOrListName list jf Arity0
1316 else varE $ jsonFunValOrListName list jf Arity0
1398
1317
1318+dispatchToJSON
1319+ :: ToJSONFun -> JSONClass -> Name -> TyVarMap -> Type -> Q Exp
1320+dispatchToJSON target jc n tvMap =
1321+ dispatchFunByType jc (targetToJSONFun target) n tvMap False
1322+
1399−dispatchToJSON, dispatchToEncoding, dispatchParseJSON
1323+dispatchParseJSON
1400 :: JSONClass -> Name -> TyVarMap -> Type -> Q Exp
1324 :: JSONClass -> Name -> TyVarMap -> Type -> Q Exp
1401−dispatchToJSON jc n tvMap = dispatchFunByType jc ToJSON n tvMap False
1402−dispatchToEncoding jc n tvMap = dispatchFunByType jc ToEncoding n tvMap False
1403dispatchParseJSON jc n tvMap = dispatchFunByType jc ParseJSON n tvMap False
1325dispatchParseJSON jc n tvMap = dispatchFunByType jc ParseJSON n tvMap False
1404
1326
1405--------------------------------------------------------------------------------
1327--------------------------------------------------------------------------------
1406-- Utility functions
1328-- Utility functions
1407--------------------------------------------------------------------------------
1329--------------------------------------------------------------------------------
1408
1330
1409−-- | Boilerplate for top level splices.
1331+-- For the given Types, generate an instance context and head.
1410−--
1411−-- The given 'Name' must meet one of two criteria:
1412−--
1413−-- 1. It must be the name of a type constructor of a plain data type or newtype.
1414−-- 2. It must be the name of a data family instance or newtype instance constructor.
1415−
1416−-- Any other value will result in an exception.
1417−withType :: Name
1418− -> (Name -> Cxt -> [TyVarBndr] -> [Con] -> Maybe [Type] -> Q a)
1419− -- ^ Function that generates the actual code. Will be applied
1420− -- to the datatype/data family 'Name', datatype context, type
1421− -- variable binders and constructors extracted from the given
1422− -- 'Name'. If the 'Name' is from a data family instance
1423− -- constructor, it will also have its instantiated types;
1424− -- otherwise, it will be 'Nothing'.
1425− -> Q a
1426− -- ^ Resulting value in the 'Q'uasi monad.
1427−withType name f = do
1428− info <- reify name
1429− case info of
1430− TyConI dec ->
1431− case dec of
1432−#if MIN_VERSION_template_haskell(2,11,0)
1433− DataD ctxt _ tvbs _ cons _ -> f name ctxt tvbs cons Nothing
1434− NewtypeD ctxt _ tvbs _ con _ -> f name ctxt tvbs [con] Nothing
1435−#else
1436− DataD ctxt _ tvbs cons _ -> f name ctxt tvbs cons Nothing
1437− NewtypeD ctxt _ tvbs con _ -> f name ctxt tvbs [con] Nothing
1438−#endif
1439− other -> fail $ ns ++ "Unsupported type: " ++ show other
1440−#if MIN_VERSION_template_haskell(2,11,0)
1441− DataConI _ _ parentName -> do
1442−#else
1443− DataConI _ _ parentName _ -> do
1444−#endif
1445− parentInfo <- reify parentName
1446− case parentInfo of
1447−#if MIN_VERSION_template_haskell(2,11,0)
1448− FamilyI (DataFamilyD _ tvbs _) decs ->
1449−#else
1450− FamilyI (FamilyD DataFam _ tvbs _) decs ->
1451−#endif
1452− let instDec = flip find decs $ \dec -> case dec of
1453−#if MIN_VERSION_template_haskell(2,11,0)
1454− DataInstD _ _ _ _ cons _ -> any ((name ==) . getConName) cons
1455− NewtypeInstD _ _ _ _ con _ -> name == getConName con
1456−#else
1457− DataInstD _ _ _ cons _ -> any ((name ==) . getConName) cons
1458− NewtypeInstD _ _ _ con _ -> name == getConName con
1459−#endif
1460− _ -> error $ ns ++ "Must be a data or newtype instance."
1461− in case instDec of
1462−#if MIN_VERSION_template_haskell(2,11,0)
1463− Just (DataInstD ctxt _ instTys _ cons _) -> f parentName ctxt tvbs cons $ Just instTys
1464− Just (NewtypeInstD ctxt _ instTys _ con _) -> f parentName ctxt tvbs [con] $ Just instTys
1465−#else
1466− Just (DataInstD ctxt _ instTys cons _) -> f parentName ctxt tvbs cons $ Just instTys
1467− Just (NewtypeInstD ctxt _ instTys con _) -> f parentName ctxt tvbs [con] $ Just instTys
1468−#endif
1469− _ -> fail $ ns ++
1470− "Could not find data or newtype instance constructor."
1471− _ -> fail $ ns ++ "Data constructor " ++ show name ++
1472− " is not from a data family instance constructor."
1473−#if MIN_VERSION_template_haskell(2,11,0)
1474− FamilyI DataFamilyD{} _ ->
1475−#else
1476− FamilyI (FamilyD DataFam _ _ _) _ ->
1477−#endif
1478− fail $ ns ++
1479− "Cannot use a data family name. Use a data family instance constructor instead."
1480− _ -> fail $ ns ++ "I need the name of a plain data type constructor, "
1481− ++ "or a data family instance constructor."
1482− where
1483− ns :: String
1484− ns = "Data.Aeson.TH.withType: "
1485−
1486−-- | Infer the context and instance head needed for a FromJSON or ToJSON instance.
1487buildTypeInstance :: Name
1332buildTypeInstance :: Name
1488 -- ^ The type constructor or data family name
1333 -- ^ The type constructor or data family name
1489 -> JSONClass
1334 -> JSONClass
1490 -- ^ The typeclass to derive
1335 -- ^ The typeclass to derive
1491 -> Cxt
1336 -> Cxt
1492 -- ^ The datatype context
1337 -- ^ The datatype context
1493− -> [TyVarBndr]
1338+ -> [Type]
1494− -- ^ The type variables from the data type/data family declaration
1339+ -- ^ The types to instantiate the instance with
1495− -> Maybe [Type]
1340+ -> DatatypeVariant
1496− -- ^ 'Just' the types used to instantiate a data family instance,
1341+ -- ^ Are we dealing with a data family instance or not
1497− -- or 'Nothing' if it's a plain data type
1498 -> Q (Cxt, Type)
1342 -> Q (Cxt, Type)
1499− -- ^ The resulting 'Cxt' and 'Type' to use in a class instance
1500−-- Plain data type/newtype case
1501−buildTypeInstance tyConName jc dataCxt tvbs Nothing =
1502− let varTys :: [Type]
1503− varTys = map tvbToType tvbs
1504− in buildTypeInstanceFromTys tyConName jc dataCxt varTys False
1505−-- Data family instance case
1506−--
1507−-- The CPP is present to work around a couple of annoying old GHC bugs.
1508−-- See Note [Polykinded data families in Template Haskell]
1509−buildTypeInstance dataFamName jc dataCxt tvbs (Just instTysAndKinds) = do
1510−#if !(MIN_VERSION_template_haskell(2,8,0)) || MIN_VERSION_template_haskell(2,10,0)
1511− let instTys :: [Type]
1512− instTys = zipWith stealKindForType tvbs instTysAndKinds
1513−#else
1514− let kindVarNames :: [Name]
1515− kindVarNames = nub $ concatMap (tyVarNamesOfType . tvbKind) tvbs
1516−
1517− numKindVars :: Int
1518− numKindVars = length kindVarNames
1519−
1520− givenKinds, givenKinds' :: [Kind]
1521− givenTys :: [Type]
1522− (givenKinds, givenTys) = splitAt numKindVars instTysAndKinds
1523− givenKinds' = map sanitizeStars givenKinds
1524−
1525− -- A GHC 7.6-specific bug requires us to replace all occurrences of
1526− -- (ConT GHC.Prim.*) with StarT, or else Template Haskell will reject it.
1527− -- Luckily, (ConT GHC.Prim.*) only seems to occur in this one spot.
1528− sanitizeStars :: Kind -> Kind
1529− sanitizeStars = go
1530− where
1531− go :: Kind -> Kind
1532− go (AppT t1 t2) = AppT (go t1) (go t2)
1533− go (SigT t k) = SigT (go t) (go k)
1534− go (ConT n) | n == starKindName = StarT
1535− go t = t
1536−
1537− -- It's quite awkward to import * from GHC.Prim, so we'll just
1538− -- hack our way around it.
1539− starKindName :: Name
1540− starKindName = mkNameG_tc "ghc-prim" "GHC.Prim" "*"
1541−
1542− -- If we run this code with GHC 7.8, we might have to generate extra type
1543− -- variables to compensate for any type variables that Template Haskell
1544− -- eta-reduced away.
1545− -- See Note [Polykinded data families in Template Haskell]
1546− xTypeNames <- newNameList "tExtra" (length tvbs - length givenTys)
1547−
1548− let xTys :: [Type]
1549− xTys = map VarT xTypeNames
1550− -- ^ Because these type variables were eta-reduced away, we can only
1551− -- determine their kind by using stealKindForType. Therefore, we mark
1552− -- them as VarT to ensure they will be given an explicit kind annotation
1553− -- (and so the kind inference machinery has the right information).
1554−
1555− substNamesWithKinds :: [(Name, Kind)] -> Type -> Type
1556− substNamesWithKinds nks t = foldr' (uncurry substNameWithKind) t nks
1557−
1558− -- The types from the data family instance might not have explicit kind
1559− -- annotations, which the kind machinery needs to work correctly. To
1560− -- compensate, we use stealKindForType to explicitly annotate any
1561− -- types without kind annotations.
1562− instTys :: [Type]
1563− instTys = map (substNamesWithKinds (zip kindVarNames givenKinds'))
1564− -- Note that due to a GHC 7.8-specific bug
1565− -- (see Note [Polykinded data families in Template Haskell]),
1566− -- there may be more kind variable names than there are kinds
1567− -- to substitute. But this is OK! If a kind is eta-reduced, it
1568− -- means that is was not instantiated to something more specific,
1569− -- so we need not substitute it. Using stealKindForType will
1570− -- grab the correct kind.
1571− $ zipWith stealKindForType tvbs (givenTys ++ xTys)
1572−#endif
1573− buildTypeInstanceFromTys dataFamName jc dataCxt instTys True
1574−
1575−-- For the given Types, generate an instance context and head.
1576−buildTypeInstanceFromTys :: Name
1577− -- ^ The type constructor or data family name
1578− -> JSONClass
1579− -- ^ The typeclass to derive
1580− -> Cxt
1581− -- ^ The datatype context
1582− -> [Type]
1583− -- ^ The types to instantiate the instance with
1584− -> Bool
1585− -- ^ True if it's a data family, False otherwise
1586− -> Q (Cxt, Type)
1587−buildTypeInstanceFromTys tyConName jc dataCxt varTysOrig isDataFamily = do
1343+buildTypeInstance tyConName jc dataCxt varTysOrig variant = do
1588 -- Make sure to expand through type/kind synonyms! Otherwise, the
1344 -- Make sure to expand through type/kind synonyms! Otherwise, the
1589 -- eta-reduction check might get tripped up over type variables in a
1345 -- eta-reduction check might get tripped up over type variables in a
1590 -- synonym that are actually dropped.
1346 -- synonym that are actually dropped.
1591 -- (See GHC Trac #11416 for a scenario where this actually happened.)
1347 -- (See GHC Trac #11416 for a scenario where this actually happened.)
1592− varTysExp <- mapM expandSyn varTysOrig
1348+ varTysExp <- mapM resolveTypeSynonyms varTysOrig
1593
1349
1594 let remainingLength :: Int
1350 let remainingLength :: Int
1595 remainingLength = length varTysOrig - arityInt jc
1351 remainingLength = length varTysOrig - arityInt jc
@@ -1619,7 +1375,7 @@ buildTypeInstanceFromTys tyConName jc dataCxt varTysOrig isDataFamily = do
1619 -- All of the type variables mentioned in the dropped types
1375 -- All of the type variables mentioned in the dropped types
1620 -- (post-synonym expansion)
1376 -- (post-synonym expansion)
1621 droppedTyVarNames :: [Name]
1377 droppedTyVarNames :: [Name]
1622− droppedTyVarNames = concatMap tyVarNamesOfType droppedTysExpSubst
1378+ droppedTyVarNames = freeVariables droppedTysExpSubst
1623
1379
1624 -- If any of the dropped types were polykinded, ensure that they are of kind *
1380 -- If any of the dropped types were polykinded, ensure that they are of kind *
1625 -- after substituting * for the dropped kind variables. If not, throw an error.
1381 -- after substituting * for the dropped kind variables. If not, throw an error.
@@ -1657,9 +1413,16 @@ buildTypeInstanceFromTys tyConName jc dataCxt varTysOrig isDataFamily = do
1657 -- instance C (Fam [Char])
1413 -- instance C (Fam [Char])
1658 remainingTysOrigSubst :: [Type]
1414 remainingTysOrigSubst :: [Type]
1659 remainingTysOrigSubst =
1415 remainingTysOrigSubst =
1660− map (substNamesWithKindStar (union droppedKindVarNames kvNames'))
1416+ map (substNamesWithKindStar (droppedKindVarNames `union` kvNames'))
1661 $ take remainingLength varTysOrig
1417 $ take remainingLength varTysOrig
1662
1418
1419+ isDataFamily :: Bool
1420+ isDataFamily = case variant of
1421+ Datatype -> False
1422+ Newtype -> False
1423+ DataInstance -> True
1424+ NewtypeInstance -> True
1425+
1663 remainingTysOrigSubst' :: [Type]
1426 remainingTysOrigSubst' :: [Type]
1664 -- See Note [Kind signatures in derived instances] for an explanation
1427 -- See Note [Kind signatures in derived instances] for an explanation
1665 -- of the isDataFamily check.
1428 -- of the isDataFamily check.
@@ -1713,55 +1476,6 @@ deriveConstraint jc t
1713 jcConstraint = jsonClassName . JSONClass (direction jc)
1476 jcConstraint = jsonClassName . JSONClass (direction jc)
1714
1477
1715{-
1478{-
1716−Note [Polykinded data families in Template Haskell]
1717−~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1718−
1719−In order to come up with the correct instance context and head for an instance, e.g.,
1720−
1721− instance C a => C (Data a) where ...
1722−
1723−We need to know the exact types and kinds used to instantiate the instance. For
1724−plain old datatypes, this is simple: every type must be a type variable, and
1725−Template Haskell reliably tells us the type variables and their kinds.
1726−
1727−Doing the same for data families proves to be much harder for three reasons:
1728−
1729−1. On any version of Template Haskell, it may not tell you what an instantiated
1730− type's kind is. For instance, in the following data family instance:
1731−
1732− data family Fam (f :: * -> *) (a :: *)
1733− data instance Fam f a
1734−
1735− Then if we use TH's reify function, it would tell us the TyVarBndrs of the
1736− data family declaration are:
1737−
1738− [KindedTV f (AppT (AppT ArrowT StarT) StarT),KindedTV a StarT]
1739−
1740− and the instantiated types of the data family instance are:
1741−
1742− [VarT f1,VarT a1]
1743−
1744− We can't just pass [VarT f1,VarT a1] to buildTypeInstanceFromTys, since we
1745− have no way of knowing their kinds. Luckily, the TyVarBndrs tell us what the
1746− kind is in case an instantiated type isn't a SigT, so we use the stealKindForType
1747− function to ensure all of the instantiated types are SigTs before passing them
1748− to buildTypeInstanceFromTys.
1749−2. On GHC 7.6 and 7.8, a bug is present in which Template Haskell lists all of
1750− the specified kinds of a data family instance efore any of the instantiated
1751− types. Fortunately, this is easy to deal with: you simply count the number of
1752− distinct kind variables in the data family declaration, take that many elements
1753− from the front of the Types list of the data family instance, substitute the
1754− kind variables with their respective instantiated kinds (which you took earlier),
1755− and proceed as normal.
1756−3. On GHC 7.8, an even uglier bug is present (GHC Trac #9692) in which Template
1757− Haskell might not even list all of the Types of a data family instance, since
1758− they are eta-reduced away! And yes, kinds can be eta-reduced too.
1759−
1760− The simplest workaround is to count how many instantiated types are missing from
1761− the list and generate extra type variables to use in their place. Luckily, we
1762− needn't worry much if its kind was eta-reduced away, since using stealKindForType
1763− will get it back.
1764−
1765Note [Kind signatures in derived instances]
1479Note [Kind signatures in derived instances]
1766~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1480~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1767
1481
@@ -1839,50 +1553,14 @@ things we can do to make instance contexts that work for 80% of use cases:
1839 and perform kind substitution as in the other cases.
1553 and perform kind substitution as in the other cases.
1840-}
1554-}
1841
1555
1842−-- Determines the types of a constructor's arguments as well as the last type
1556+checkExistentialContext :: JSONClass -> TyVarMap -> Cxt -> Name
1843−-- parameters (mapped to their encoding/decoding functions), expanding through
1557+ -> Q a -> Q a
1844−-- any type synonyms.
1558+checkExistentialContext jc tvMap ctxt conName q =
1845−--
1846−-- The type parameters are determined on a constructor-by-constructor basis since
1847−-- they may be refined to be particular types in a GADT.
1848−reifyConTys :: JSONClass
1849− -> [(Name, Name)]
1850− -> Name
1851− -> Q ([Type], TyVarMap)
1852−reifyConTys jc tpjs conName = do
1853− info <- reify conName
1854− (ctxt, uncTy) <- case info of
1855− DataConI _ ty _
1856−#if !(MIN_VERSION_template_haskell(2,11,0))
1857− _
1858−#endif
1859− -> fmap uncurryTy (expandSyn ty)
1860− _ -> error "Must be a data constructor"
1861− let (argTys, [resTy]) = NE.splitAt (NE.length uncTy - 1) uncTy
1862− unapResTy = unapplyTy resTy
1863− -- If one of the last type variables is refined to a particular type
1864− -- (i.e., not truly polymorphic), we mark it with Nothing and filter
1865− -- it out later, since we only apply encoding/decoding functions to
1866− -- arguments of a type that it (1) one of the last type variables,
1867− -- and (2) of a truly polymorphic type.
1868− jArity = arityInt jc
1869− mbTvNames = map varTToNameMaybe $
1870− NE.drop (NE.length unapResTy - jArity) unapResTy
1871− -- We use M.fromList to ensure that if there are any duplicate type
1872− -- variables (as can happen in a GADT), the rightmost type variable gets
1873− -- associated with the show function.
1874− --
1875− -- See Note [Matching functions with GADT type variables]
1876− tvMap = M.fromList
1877− . catMaybes -- Drop refined types
1878− $ zipWith (\mbTvName tpj ->
1879− fmap (\tvName -> (tvName, tpj)) mbTvName)
1880− mbTvNames tpjs
1881− if (any (`predMentionsName` M.keys tvMap) ctxt
1559+ if (any (`predMentionsName` M.keys tvMap) ctxt
1882− || M.size tvMap < jArity)
1560+ || M.size tvMap < arityInt jc)
1883− && not (allowExQuant jc)
1561+ && not (allowExQuant jc)
1884− then existentialContextError conName
1562+ then existentialContextError conName
1885− else return (argTys, tvMap)
1563+ else q
1886
1564
1887{-
1565{-
1888Note [Matching functions with GADT type variables]
1566Note [Matching functions with GADT type variables]
@@ -1922,69 +1600,22 @@ Both.
1922-- are the function arguments of types (b -> Value) and ([b] -> Value).
1600-- are the function arguments of types (b -> Value) and ([b] -> Value).
1923type TyVarMap = Map Name (Name, Name)
1601type TyVarMap = Map Name (Name, Name)
1924
1602
1925−-- | If a VarT is missing an explicit kind signature, steal it from a TyVarBndr.
1926−stealKindForType :: TyVarBndr -> Type -> Type
1927−stealKindForType tvb t@VarT{} = SigT t (tvbKind tvb)
1928−stealKindForType _ t = t
1929−
1930−-- | Extracts the kind from a type variable binder.
1931−tvbKind :: TyVarBndr -> Kind
1932−#if MIN_VERSION_template_haskell(2,8,0)
1933−tvbKind (PlainTV _ ) = StarT
1934−#else
1935−tvbKind (PlainTV _ ) = StarK
1936−#endif
1937−tvbKind (KindedTV _ k) = k
1938−
1939−tvbToType :: TyVarBndr -> Type
1940−tvbToType (PlainTV n) = VarT n
1941−tvbToType (KindedTV n k) = SigT (VarT n) k
1942−
1943-- | Returns True if a Type has kind *.
1603-- | Returns True if a Type has kind *.
1944hasKindStar :: Type -> Bool
1604hasKindStar :: Type -> Bool
1945hasKindStar VarT{} = True
1605hasKindStar VarT{} = True
1946−#if MIN_VERSION_template_haskell(2,8,0)
1947hasKindStar (SigT _ StarT) = True
1606hasKindStar (SigT _ StarT) = True
1948−#else
1949−hasKindStar (SigT _ StarK) = True
1950−#endif
1951hasKindStar _ = False
1607hasKindStar _ = False
1952
1608
1953-- Returns True is a kind is equal to *, or if it is a kind variable.
1609-- Returns True is a kind is equal to *, or if it is a kind variable.
1954isStarOrVar :: Kind -> Bool
1610isStarOrVar :: Kind -> Bool
1955−#if MIN_VERSION_template_haskell(2,8,0)
1956isStarOrVar StarT = True
1611isStarOrVar StarT = True
1957isStarOrVar VarT{} = True
1612isStarOrVar VarT{} = True
1958−#else
1959−isStarOrVar StarK = True
1960−#endif
1961isStarOrVar _ = False
1613isStarOrVar _ = False
1962
1614
1963-- Generate a list of fresh names with a common prefix, and numbered suffixes.
1615-- Generate a list of fresh names with a common prefix, and numbered suffixes.
1964newNameList :: String -> Int -> Q [Name]
1616newNameList :: String -> Int -> Q [Name]
1965newNameList prefix len = mapM newName [prefix ++ show n | n <- [1..len]]
1617newNameList prefix len = mapM newName [prefix ++ show n | n <- [1..len]]
1966
1618
1967−-- Gets all of the type/kind variable names mentioned somewhere in a Type.
1968−tyVarNamesOfType :: Type -> [Name]
1969−tyVarNamesOfType = go
1970− where
1971− go :: Type -> [Name]
1972− go (AppT t1 t2) = go t1 ++ go t2
1973− go (SigT t _k) = go t
1974−#if MIN_VERSION_template_haskell(2,8,0)
1975− ++ go _k
1976−#endif
1977− go (VarT n) = [n]
1978− go _ = []
1979−
1980−-- | Gets all of the type/kind variable names mentioned somewhere in a Kind.
1981−tyVarNamesOfKind :: Kind -> [Name]
1982−#if MIN_VERSION_template_haskell(2,8,0)
1983−tyVarNamesOfKind = tyVarNamesOfType
1984−#else
1985−tyVarNamesOfKind _ = [] -- There are no kind variables
1986−#endif
1987−
1988-- | @hasKindVarChain n kind@ Checks if @kind@ is of the form
1619-- | @hasKindVarChain n kind@ Checks if @kind@ is of the form
1989-- k_0 -> k_1 -> ... -> k_(n-1), where k0, k1, ..., and k_(n-1) can be * or
1620-- k_0 -> k_1 -> ... -> k_(n-1), where k0, k1, ..., and k_(n-1) can be * or
1990-- kind variables.
1621-- kind variables.
@@ -1992,7 +1623,7 @@ hasKindVarChain :: Int -> Type -> Maybe [Name]
1992hasKindVarChain kindArrows t =
1623hasKindVarChain kindArrows t =
1993 let uk = uncurryKind (tyKind t)
1624 let uk = uncurryKind (tyKind t)
1994 in if (NE.length uk - 1 == kindArrows) && F.all isStarOrVar uk
1625 in if (NE.length uk - 1 == kindArrows) && F.all isStarOrVar uk
1995− then Just (concatMap tyVarNamesOfKind uk)
1626+ then Just (concatMap freeVariables uk)
1996 else Nothing
1627 else Nothing
1997
1628
1998-- | If a Type is a SigT, returns its kind signature. Otherwise, return *.
1629-- | If a Type is a SigT, returns its kind signature. Otherwise, return *.
@@ -2012,17 +1643,6 @@ varTToNameMaybe _ = Nothing
2012varTToName :: Type -> Name
1643varTToName :: Type -> Name
2013varTToName = fromMaybe (error "Not a type variable!") . varTToNameMaybe
1644varTToName = fromMaybe (error "Not a type variable!") . varTToNameMaybe
2014
1645
2015−-- | Extracts the name from a constructor.
2016−getConName :: Con -> Name
2017−getConName (NormalC name _) = name
2018−getConName (RecC name _) = name
2019−getConName (InfixC _ name _) = name
2020−getConName (ForallC _ _ con) = getConName con
2021−#if MIN_VERSION_template_haskell(2,11,0)
2022−getConName (GadtC names _ _) = head names
2023−getConName (RecGadtC names _ _) = head names
2024−#endif
2025−
2026interleave :: [a] -> [a] -> [a]
1646interleave :: [a] -> [a] -> [a]
2027interleave (a1:a1s) (a2:a2s) = a1:a2:interleave a1s a2s
1647interleave (a1:a1s) (a2:a2s) = a1:a2:interleave a1s a2s
2028interleave _ _ = []
1648interleave _ _ = []
@@ -2047,9 +1667,7 @@ isTyFamily (ConT n) = do
2047#else
1667#else
2048 FamilyI (FamilyD TypeFam _ _ _) _ -> True
1668 FamilyI (FamilyD TypeFam _ _ _) _ -> True
2049#endif
1669#endif
2050−#if MIN_VERSION_template_haskell(2,9,0)
2051 FamilyI ClosedTypeFamilyD{} _ -> True
1670 FamilyI ClosedTypeFamilyD{} _ -> True
2052−#endif
2053 _ -> False
1671 _ -> False
2054isTyFamily _ = return False
1672isTyFamily _ = return False
2055
1673
@@ -2077,9 +1695,7 @@ mentionsName = go
2077 go :: Type -> [Name] -> Bool
1695 go :: Type -> [Name] -> Bool
2078 go (AppT t1 t2) names = go t1 names || go t2 names
1696 go (AppT t1 t2) names = go t1 names || go t2 names
2079 go (SigT t _k) names = go t names
1697 go (SigT t _k) names = go t names
2080−#if MIN_VERSION_template_haskell(2,8,0)
2081 || go _k names
1698 || go _k names
2082−#endif
2083 go (VarT n) names = n `elem` names
1699 go (VarT n) names = n `elem` names
2084 go _ _ = False
1700 go _ _ = False
2085
1701
@@ -2135,37 +1751,28 @@ uncurryTy t = ([], t :| [])
2135
1751
2136-- | Like uncurryType, except on a kind level.
1752-- | Like uncurryType, except on a kind level.
2137uncurryKind :: Kind -> NonEmpty Kind
1753uncurryKind :: Kind -> NonEmpty Kind
2138−#if MIN_VERSION_template_haskell(2,8,0)
2139uncurryKind = snd . uncurryTy
1754uncurryKind = snd . uncurryTy
2140−#else
2141−uncurryKind (ArrowK k1 k2) = k1 <| uncurryKind k2
2142−uncurryKind k = k :| []
2143−#endif
2144
1755
2145createKindChain :: Int -> Kind
1756createKindChain :: Int -> Kind
2146createKindChain = go starK
1757createKindChain = go starK
2147 where
1758 where
2148 go :: Kind -> Int -> Kind
1759 go :: Kind -> Int -> Kind
2149− go k !0 = k
1760+ go k 0 = k
2150−#if MIN_VERSION_template_haskell(2,8,0)
2151 go k !n = go (AppT (AppT ArrowT StarT) k) (n - 1)
1761 go k !n = go (AppT (AppT ArrowT StarT) k) (n - 1)
2152−#else
2153− go k !n = go (ArrowK StarK k) (n - 1)
2154−#endif
2155
1762
2156-- | Makes a string literal expression from a constructor's name.
1763-- | Makes a string literal expression from a constructor's name.
2157−conNameExp :: Options -> Con -> Q Exp
1764+conNameExp :: Options -> ConstructorInfo -> Q Exp
2158conNameExp opts = litE
1765conNameExp opts = litE
2159 . stringL
1766 . stringL
2160 . constructorTagModifier opts
1767 . constructorTagModifier opts
2161 . nameBase
1768 . nameBase
2162− . getConName
1769+ . constructorName
2163
1770
2164−-- | Creates a string literal expression from a record field label.
1771+-- | Extracts a record field label.
2165−fieldLabelExp :: Options -- ^ Encoding options
1772+fieldLabel :: Options -- ^ Encoding options
2166− -> Name
1773+ -> Name
2167− -> Q Exp
1774+ -> String
2168−fieldLabelExp opts = litE . stringL . fieldLabelModifier opts . nameBase
1775+fieldLabel opts = fieldLabelModifier opts . nameBase
2169
1776
2170-- | The name of the outermost 'Value' constructor.
1777-- | The name of the outermost 'Value' constructor.
2171valueConName :: Value -> String
1778valueConName :: Value -> String
@@ -2204,76 +1811,14 @@ canEtaReduce remaining dropped =
2204-- Expanding type synonyms
1811-- Expanding type synonyms
2205-------------------------------------------------------------------------------
1812-------------------------------------------------------------------------------
2206
1813
2207−-- | Expands all type synonyms in a type. Written by Dan Rosén in the
1814+applySubstitutionKind :: Map Name Kind -> Type -> Type
2208−-- @genifunctors@ package (licensed under BSD3).
1815+applySubstitutionKind = applySubstitution
2209−expandSyn :: Type -> Q Type
2210−expandSyn (ForallT tvs ctx t) = ForallT tvs ctx <$> expandSyn t
2211−expandSyn t@AppT{} = expandSynApp t []
2212−expandSyn t@ConT{} = expandSynApp t []
2213−expandSyn (SigT t k) = do t' <- expandSyn t
2214− k' <- expandSynKind k
2215− return (SigT t' k')
2216−expandSyn t = return t
2217−
2218−expandSynKind :: Kind -> Q Kind
2219−#if MIN_VERSION_template_haskell(2,8,0)
2220−expandSynKind = expandSyn
2221−#else
2222−expandSynKind = return -- There are no kind synonyms to deal with
2223−#endif
2224−
2225−expandSynApp :: Type -> [Type] -> Q Type
2226−expandSynApp (AppT t1 t2) ts = do
2227− t2' <- expandSyn t2
2228− expandSynApp t1 (t2':ts)
2229−expandSynApp (ConT n) ts | nameBase n == "[]" = return $ foldl' AppT ListT ts
2230−expandSynApp t@(ConT n) ts = do
2231− info <- reify n
2232− case info of
2233− TyConI (TySynD _ tvs rhs) ->
2234− let (ts', ts'') = splitAt (length tvs) ts
2235− subs = mkSubst tvs ts'
2236− rhs' = substType subs rhs
2237− in expandSynApp rhs' ts''
2238− _ -> return $ foldl' AppT t ts
2239−expandSynApp t ts = do
2240− t' <- expandSyn t
2241− return $ foldl' AppT t' ts
2242−
2243−type TypeSubst = Map Name Type
2244−type KindSubst = Map Name Kind
2245−
2246−mkSubst :: [TyVarBndr] -> [Type] -> TypeSubst
2247−mkSubst vs ts =
2248− let vs' = map un vs
2249− un (PlainTV v) = v
2250− un (KindedTV v _) = v
2251− in M.fromList $ zip vs' ts
2252−
2253−substType :: TypeSubst -> Type -> Type
2254−substType subs (ForallT v c t) = ForallT v c $ substType subs t
2255−substType subs t@(VarT n) = M.findWithDefault t n subs
2256−substType subs (AppT t1 t2) = AppT (substType subs t1) (substType subs t2)
2257−substType subs (SigT t k) = SigT (substType subs t)
2258−#if MIN_VERSION_template_haskell(2,8,0)
2259− (substType subs k)
2260−#else
2261− k
2262−#endif
2263−substType _ t = t
2264−
2265−substKind :: KindSubst -> Type -> Type
2266−#if MIN_VERSION_template_haskell(2,8,0)
2267−substKind = substType
2268−#else
2269−substKind _ t = t -- There are no kind variables!
2270−#endif
2271
1816
2272substNameWithKind :: Name -> Kind -> Type -> Type
1817substNameWithKind :: Name -> Kind -> Type -> Type
2273−substNameWithKind n k = substKind (M.singleton n k)
1818+substNameWithKind n k = applySubstitutionKind (M.singleton n k)
2274
1819
2275substNamesWithKindStar :: [Name] -> Type -> Type
1820substNamesWithKindStar :: [Name] -> Type -> Type
2276−substNamesWithKindStar ns t = foldr' (flip substNameWithKind starK) t ns
1821+substNamesWithKindStar ns t = foldr' (`substNameWithKind` starK) t ns
2277
1822
2278-------------------------------------------------------------------------------
1823-------------------------------------------------------------------------------
2279-- Error messages
1824-- Error messages
@@ -2356,6 +1901,13 @@ data Direction = To | From
2356-- | A representation of which typeclass method is being spliced in.
1901-- | A representation of which typeclass method is being spliced in.
2357data JSONFun = ToJSON | ToEncoding | ParseJSON
1902data JSONFun = ToJSON | ToEncoding | ParseJSON
2358
1903
1904+-- | A refinement of JSONFun to [ToJSON, ToEncoding].
1905+data ToJSONFun = Value | Encoding
1906+
1907+targetToJSONFun :: ToJSONFun -> JSONFun
1908+targetToJSONFun Value = ToJSON
1909+targetToJSONFun Encoding = ToEncoding
1910+
2359-- | A representation of which typeclass is being derived.
1911-- | A representation of which typeclass is being derived.
2360data JSONClass = JSONClass { direction :: Direction, arity :: Arity }
1912data JSONClass = JSONClass { direction :: Direction, arity :: Arity }
2361
1913
@@ -2422,13 +1974,10 @@ data StarKindStatus = NotKindStar
2422
1974
2423-- | Does a Type have kind * or k (for some kind variable k)?
1975-- | Does a Type have kind * or k (for some kind variable k)?
2424canRealizeKindStar :: Type -> StarKindStatus
1976canRealizeKindStar :: Type -> StarKindStatus
2425−canRealizeKindStar t
1977+canRealizeKindStar t = case t of
2426− | hasKindStar t = KindStar
1978+ _ | hasKindStar t -> KindStar
2427− | otherwise = case t of
2428−#if MIN_VERSION_template_haskell(2,8,0)
2429− SigT _ (VarT k) -> IsKindVar k
1979+ SigT _ (VarT k) -> IsKindVar k
2430−#endif
2431− _ -> NotKindStar
1980+ _ -> NotKindStar
2432
1981
2433-- | Returns 'Just' the kind variable 'Name' of a 'StarKindStatus' if it exists.
1982-- | Returns 'Just' the kind variable 'Name' of a 'StarKindStatus' if it exists.
2434-- Otherwise, returns 'Nothing'.
1983-- Otherwise, returns 'Nothing'.
Data/Aeson/Text.hs+5−4
@@ -1,4 +1,5 @@
1{-# LANGUAGE BangPatterns #-}
1{-# LANGUAGE BangPatterns #-}
2+{-# LANGUAGE NoImplicitPrelude #-}
2{-# LANGUAGE OverloadedStrings #-}
3{-# LANGUAGE OverloadedStrings #-}
3-- |
4-- |
4-- Module: Data.Aeson.Text
5-- Module: Data.Aeson.Text
@@ -14,18 +15,18 @@
14--
15--
15-- You can use the conversions to 'Builder's when embedding JSON messages as
16-- You can use the conversions to 'Builder's when embedding JSON messages as
16-- parts of a protocol.
17-- parts of a protocol.
18+
17module Data.Aeson.Text
19module Data.Aeson.Text
18 (
20 (
19 encodeToLazyText
21 encodeToLazyText
20 , encodeToTextBuilder
22 , encodeToTextBuilder
21 ) where
23 ) where
22
24
23−import Prelude ()
24import Prelude.Compat
25import Prelude.Compat
25
26
26import Data.Aeson.Types (Value(..), ToJSON(..))
27import Data.Aeson.Types (Value(..), ToJSON(..))
27import Data.Aeson.Encoding (encodingToLazyByteString)
28import Data.Aeson.Encoding (encodingToLazyByteString)
28−import Data.Monoid ((<>))
29+import Data.Semigroup ((<>))
29import Data.Scientific (FPFormat(..), Scientific, base10Exponent)
30import Data.Scientific (FPFormat(..), Scientific, base10Exponent)
30import Data.Text.Lazy.Builder
31import Data.Text.Lazy.Builder
31import Data.Text.Lazy.Builder.Scientific (formatScientificBuilder)
32import Data.Text.Lazy.Builder.Scientific (formatScientificBuilder)
@@ -46,8 +47,8 @@ encodeToLazyText = LT.decodeUtf8 . encodingToLazyByteString . toEncoding
46-- embedded efficiently in a text-based protocol.
47-- embedded efficiently in a text-based protocol.
47--
48--
48-- If you are going to immediately encode straight to a
49-- If you are going to immediately encode straight to a
49−-- 'L.ByteString', it is more efficient to use 'encodeToBuilder'
50+-- 'L.ByteString', it is more efficient to use 'encode' (lazy ByteString)
50−-- instead.
51+-- or @'fromEncoding' . 'toEncoding'@ (ByteString.Builder) instead.
51--
52--
52-- /Note:/ Uses 'toJSON'
53-- /Note:/ Uses 'toJSON'
53encodeToTextBuilder :: ToJSON a => a -> Builder
54encodeToTextBuilder :: ToJSON a => a -> Builder
Data/Aeson/Types.hs+43−5
@@ -1,3 +1,4 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
1-- |
2-- |
2-- Module: Data.Aeson.Types
3-- Module: Data.Aeson.Types
3-- Copyright: (c) 2011-2016 Bryan O'Sullivan
4-- Copyright: (c) 2011-2016 Bryan O'Sullivan
@@ -25,6 +26,7 @@ module Data.Aeson.Types
25 -- * Convenience types and functions
26 -- * Convenience types and functions
26 , DotNetTime(..)
27 , DotNetTime(..)
27 , typeMismatch
28 , typeMismatch
29+ , unexpected
28 -- * Type conversion
30 -- * Type conversion
29 , Parser
31 , Parser
30 , Result(..)
32 , Result(..)
@@ -36,6 +38,9 @@ module Data.Aeson.Types
36 , ToJSON(..)
38 , ToJSON(..)
37 , KeyValue(..)
39 , KeyValue(..)
38 , modifyFailure
40 , modifyFailure
41+ , prependFailure
42+ , parserThrowError
43+ , parserCatchError
39
44
40 -- ** Keys for maps
45 -- ** Keys for maps
41 , ToJSONKey(..)
46 , ToJSONKey(..)
@@ -48,6 +53,12 @@ module Data.Aeson.Types
48 , coerceFromJSONKeyFunction
53 , coerceFromJSONKeyFunction
49 , mapFromJSONKeyFunction
54 , mapFromJSONKeyFunction
50
55
56+ -- *** Generic keys
57+ , GToJSONKey()
58+ , genericToJSONKey
59+ , GFromJSONKey()
60+ , genericFromJSONKey
61+
51 -- ** Liftings to unary and binary type constructors
62 -- ** Liftings to unary and binary type constructors
52 , FromJSON1(..)
63 , FromJSON1(..)
53 , parseJSON1
64 , parseJSON1
@@ -63,8 +74,8 @@ module Data.Aeson.Types
63 -- ** Generic JSON classes
74 -- ** Generic JSON classes
64 , GFromJSON(..)
75 , GFromJSON(..)
65 , FromArgs(..)
76 , FromArgs(..)
66− , GToJSON(..)
77+ , GToJSON
67− , GToEncoding(..)
78+ , GToEncoding
68 , ToArgs(..)
79 , ToArgs(..)
69 , Zero
80 , Zero
70 , One
81 , One
@@ -79,9 +90,9 @@ module Data.Aeson.Types
79 , withObject
90 , withObject
80 , withText
91 , withText
81 , withArray
92 , withArray
82− , withNumber
83 , withScientific
93 , withScientific
84 , withBool
94 , withBool
95+ , withEmbeddedJSON
85
96
86 , pairs
97 , pairs
87 , foldable
98 , foldable
@@ -102,15 +113,39 @@ module Data.Aeson.Types
102 , listParser
113 , listParser
103
114
104 -- * Generic and TH encoding configuration
115 -- * Generic and TH encoding configuration
105− , Options(..)
116+ , Options
117+
118+ -- ** Options fields
119+ -- $optionsFields
120+ , fieldLabelModifier
121+ , constructorTagModifier
122+ , allNullaryToStringTag
123+ , omitNothingFields
124+ , sumEncoding
125+ , unwrapUnaryRecords
126+ , tagSingleConstructors
127+ , rejectUnknownFields
128+
129+ -- ** Options utilities
106 , SumEncoding(..)
130 , SumEncoding(..)
107 , camelTo
131 , camelTo
108 , camelTo2
132 , camelTo2
109 , defaultOptions
133 , defaultOptions
110 , defaultTaggedObject
134 , defaultTaggedObject
135+
136+ -- ** Options for object keys
137+ , JSONKeyOptions
138+ , keyModifier
139+ , defaultJSONKeyOptions
140+
141+ -- * Parsing context
142+ , (<?>)
143+ , JSONPath
144+ , JSONPathElement(..)
145+ , formatPath
146+ , formatRelativePath
111 ) where
147 ) where
112
148
113−import Prelude ()
114import Prelude.Compat
149import Prelude.Compat
115
150
116import Data.Aeson.Encoding (Encoding, unsafeToEncoding, fromEncoding, Series, pairs)
151import Data.Aeson.Encoding (Encoding, unsafeToEncoding, fromEncoding, Series, pairs)
@@ -122,3 +157,6 @@ import Data.Foldable (toList)
122foldable :: (Foldable t, ToJSON a) => t a -> Encoding
157foldable :: (Foldable t, ToJSON a) => t a -> Encoding
123foldable = toEncoding . toList
158foldable = toEncoding . toList
124{-# INLINE foldable #-}
159{-# INLINE foldable #-}
160+
161+-- $optionsFields
162+-- The functions here are in fact record fields of the 'Options' type.
Data/Aeson/Types/Class.hs+18−6
@@ -1,10 +1,11 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2+{-# LANGUAGE ConstraintKinds #-}
2{-# LANGUAGE FlexibleContexts #-}
3{-# LANGUAGE FlexibleContexts #-}
3{-# LANGUAGE FlexibleInstances #-}
4{-# LANGUAGE FlexibleInstances #-}
4{-# LANGUAGE GADTs #-}
5{-# LANGUAGE GADTs #-}
5{-# LANGUAGE MultiParamTypeClasses #-}
6{-# LANGUAGE MultiParamTypeClasses #-}
7+{-# LANGUAGE NoImplicitPrelude #-}
6{-# LANGUAGE ScopedTypeVariables #-}
8{-# LANGUAGE ScopedTypeVariables #-}
7−{-# LANGUAGE TypeSynonymInstances #-}
8
9
9-- |
10-- |
10-- Module: Data.Aeson.Types.Class
11-- Module: Data.Aeson.Types.Class
@@ -36,8 +37,8 @@ module Data.Aeson.Types.Class
36 -- * Generic JSON classes
37 -- * Generic JSON classes
37 , GFromJSON(..)
38 , GFromJSON(..)
38 , FromArgs(..)
39 , FromArgs(..)
39− , GToJSON(..)
40+ , GToJSON
40− , GToEncoding(..)
41+ , GToEncoding
41 , ToArgs(..)
42 , ToArgs(..)
42 , Zero
43 , Zero
43 , One
44 , One
@@ -57,6 +58,11 @@ module Data.Aeson.Types.Class
57 , fromJSONKeyCoerce
58 , fromJSONKeyCoerce
58 , coerceFromJSONKeyFunction
59 , coerceFromJSONKeyFunction
59 , mapFromJSONKeyFunction
60 , mapFromJSONKeyFunction
61+ -- ** Generic keys
62+ , GToJSONKey()
63+ , genericToJSONKey
64+ , GFromJSONKey()
65+ , genericFromJSONKey
60 -- * Object key-value pairs
66 -- * Object key-value pairs
61 , KeyValue(..)
67 , KeyValue(..)
62
68
@@ -69,14 +75,15 @@ module Data.Aeson.Types.Class
69 , withObject
75 , withObject
70 , withText
76 , withText
71 , withArray
77 , withArray
72− , withNumber
73 , withScientific
78 , withScientific
74 , withBool
79 , withBool
80+ , withEmbeddedJSON
75
81
76 -- * Functions
82 -- * Functions
77 , fromJSON
83 , fromJSON
78 , ifromJSON
84 , ifromJSON
79 , typeMismatch
85 , typeMismatch
86+ , unexpected
80 , parseField
87 , parseField
81 , parseFieldMaybe
88 , parseFieldMaybe
82 , parseFieldMaybe'
89 , parseFieldMaybe'
@@ -90,8 +97,13 @@ module Data.Aeson.Types.Class
90 , (.!=)
97 , (.!=)
91 ) where
98 ) where
92
99
93−import Prelude ()
94
100
95import Data.Aeson.Types.FromJSON
101import Data.Aeson.Types.FromJSON
96import Data.Aeson.Types.Generic (One, Zero)
102import Data.Aeson.Types.Generic (One, Zero)
97−import Data.Aeson.Types.ToJSON
103+import Data.Aeson.Types.ToJSON hiding (GToJSON)
104+import qualified Data.Aeson.Types.ToJSON as ToJSON
105+import Data.Aeson.Types.Internal (Value)
106+import Data.Aeson.Encoding (Encoding)
107+
108+type GToJSON = ToJSON.GToJSON Value
109+type GToEncoding = ToJSON.GToJSON Encoding
Data/Aeson/Types/FromJSON.hs+891−440
@@ -5,19 +5,16 @@
5{-# LANGUAGE FlexibleInstances #-}
5{-# LANGUAGE FlexibleInstances #-}
6{-# LANGUAGE GADTs #-}
6{-# LANGUAGE GADTs #-}
7{-# LANGUAGE MultiParamTypeClasses #-}
7{-# LANGUAGE MultiParamTypeClasses #-}
8−{-# LANGUAGE NamedFieldPuns #-}
8+{-# LANGUAGE NoImplicitPrelude #-}
9{-# LANGUAGE OverloadedStrings #-}
9{-# LANGUAGE OverloadedStrings #-}
10+{-# LANGUAGE PolyKinds #-}
10{-# LANGUAGE RecordWildCards #-}
11{-# LANGUAGE RecordWildCards #-}
11{-# LANGUAGE ScopedTypeVariables #-}
12{-# LANGUAGE ScopedTypeVariables #-}
12{-# LANGUAGE TypeOperators #-}
13{-# LANGUAGE TypeOperators #-}
13−{-# LANGUAGE TypeSynonymInstances #-}
14+{-# LANGUAGE TupleSections #-}
14{-# LANGUAGE UndecidableInstances #-}
15{-# LANGUAGE UndecidableInstances #-}
15{-# LANGUAGE ViewPatterns #-}
16{-# LANGUAGE ViewPatterns #-}
16
17
17−#if __GLASGOW_HASKELL__ >= 706
18−{-# LANGUAGE PolyKinds #-}
19−#endif
20−
21#include "incoherent-compat.h"
18#include "incoherent-compat.h"
22#include "overlapping-compat.h"
19#include "overlapping-compat.h"
23
20
@@ -45,6 +42,9 @@ module Data.Aeson.Types.FromJSON
45 , coerceFromJSONKeyFunction
42 , coerceFromJSONKeyFunction
46 , mapFromJSONKeyFunction
43 , mapFromJSONKeyFunction
47
44
45+ , GFromJSONKey()
46+ , genericFromJSONKey
47+
48 -- * List functions
48 -- * List functions
49 , listParser
49 , listParser
50
50
@@ -52,20 +52,22 @@ module Data.Aeson.Types.FromJSON
52 , withObject
52 , withObject
53 , withText
53 , withText
54 , withArray
54 , withArray
55− , withNumber
56 , withScientific
55 , withScientific
57 , withBool
56 , withBool
57+ , withEmbeddedJSON
58
58
59 -- * Functions
59 -- * Functions
60 , fromJSON
60 , fromJSON
61 , ifromJSON
61 , ifromJSON
62 , typeMismatch
62 , typeMismatch
63+ , unexpected
63 , parseField
64 , parseField
64 , parseFieldMaybe
65 , parseFieldMaybe
65 , parseFieldMaybe'
66 , parseFieldMaybe'
66 , explicitParseField
67 , explicitParseField
67 , explicitParseFieldMaybe
68 , explicitParseFieldMaybe
68 , explicitParseFieldMaybe'
69 , explicitParseFieldMaybe'
70+ , parseIndexedJSON
69 -- ** Operators
71 -- ** Operators
70 , (.:)
72 , (.:)
71 , (.:?)
73 , (.:?)
@@ -76,17 +78,16 @@ module Data.Aeson.Types.FromJSON
76 , parseOptionalFieldWith
78 , parseOptionalFieldWith
77 ) where
79 ) where
78
80
79−import Prelude ()
80import Prelude.Compat
81import Prelude.Compat
81
82
82−import Control.Applicative ((<|>), Const(..))
83+import Control.Applicative ((<|>), Const(..), liftA2)
83−import Control.Monad ((<=<), zipWithM)
84+import Control.Monad (zipWithM)
84import Data.Aeson.Internal.Functions (mapKey)
85import Data.Aeson.Internal.Functions (mapKey)
86+import Data.Aeson.Parser.Internal (eitherDecodeWith, jsonEOF)
85import Data.Aeson.Types.Generic
87import Data.Aeson.Types.Generic
86import Data.Aeson.Types.Internal
88import Data.Aeson.Types.Internal
87−import Data.Attoparsec.Number (Number(..))
88import Data.Bits (unsafeShiftR)
89import Data.Bits (unsafeShiftR)
89−import Data.Fixed (Fixed, HasResolution)
90+import Data.Fixed (Fixed, HasResolution (resolution), Nano)
90import Data.Functor.Compose (Compose(..))
91import Data.Functor.Compose (Compose(..))
91import Data.Functor.Identity (Identity(..))
92import Data.Functor.Identity (Identity(..))
92import Data.Functor.Product (Product(..))
93import Data.Functor.Product (Product(..))
@@ -95,26 +96,31 @@ import Data.Hashable (Hashable(..))
95import Data.Int (Int16, Int32, Int64, Int8)
96import Data.Int (Int16, Int32, Int64, Int8)
96import Data.List.NonEmpty (NonEmpty(..))
97import Data.List.NonEmpty (NonEmpty(..))
97import Data.Maybe (fromMaybe)
98import Data.Maybe (fromMaybe)
98−import Data.Monoid ((<>))
99+import Data.Semigroup ((<>))
99import Data.Proxy (Proxy(..))
100import Data.Proxy (Proxy(..))
100import Data.Ratio ((%), Ratio)
101import Data.Ratio ((%), Ratio)
101−import Data.Scientific (Scientific)
102+import Data.Scientific (Scientific, base10Exponent)
102import Data.Tagged (Tagged(..))
103import Data.Tagged (Tagged(..))
103import Data.Text (Text, pack, unpack)
104import Data.Text (Text, pack, unpack)
104−import Data.Time (Day, LocalTime, NominalDiffTime, TimeOfDay, UTCTime, ZonedTime)
105+import Data.Time (Day, DiffTime, LocalTime, NominalDiffTime, TimeOfDay, UTCTime, ZonedTime)
105−import Data.Time.Format (parseTime)
106+import Data.Time.Calendar.Compat (CalendarDiffDays (..), DayOfWeek (..))
107+import Data.Time.LocalTime.Compat (CalendarDiffTime (..))
108+import Data.Time.Clock.System.Compat (SystemTime (..))
106−import Data.Time.Locale.Compat (defaultTimeLocale)
109+import Data.Time.Format.Compat (parseTimeM, defaultTimeLocale)
107import Data.Traversable as Tr (sequence)
110import Data.Traversable as Tr (sequence)
108import Data.Vector (Vector)
111import Data.Vector (Vector)
109import Data.Version (Version, parseVersion)
112import Data.Version (Version, parseVersion)
113+import Data.Void (Void)
110import Data.Word (Word16, Word32, Word64, Word8)
114import Data.Word (Word16, Word32, Word64, Word8)
111import Foreign.Storable (Storable)
115import Foreign.Storable (Storable)
116+import Foreign.C.Types (CTime (..))
112import GHC.Generics
117import GHC.Generics
113import Numeric.Natural (Natural)
118import Numeric.Natural (Natural)
114import Text.ParserCombinators.ReadP (readP_to_S)
119import Text.ParserCombinators.ReadP (readP_to_S)
115import Unsafe.Coerce (unsafeCoerce)
120import Unsafe.Coerce (unsafeCoerce)
116import qualified Data.Aeson.Parser.Time as Time
121import qualified Data.Aeson.Parser.Time as Time
117import qualified Data.Attoparsec.ByteString.Char8 as A (endOfInput, parseOnly, scientific)
122import qualified Data.Attoparsec.ByteString.Char8 as A (endOfInput, parseOnly, scientific)
123+import qualified Data.ByteString.Lazy as L
118import qualified Data.DList as DList
124import qualified Data.DList as DList
119import qualified Data.HashMap.Strict as H
125import qualified Data.HashMap.Strict as H
120import qualified Data.HashSet as HashSet
126import qualified Data.HashSet as HashSet
@@ -137,18 +143,20 @@ import qualified Data.Vector.Primitive as VP
137import qualified Data.Vector.Storable as VS
143import qualified Data.Vector.Storable as VS
138import qualified Data.Vector.Unboxed as VU
144import qualified Data.Vector.Unboxed as VU
139
145
140−#ifndef HAS_COERCIBLE
146+import qualified GHC.Exts as Exts
141−#define HAS_COERCIBLE (__GLASGOW_HASKELL__ >= 707)
147+import qualified Data.Primitive.Array as PM
148+import qualified Data.Primitive.SmallArray as PM
149+import qualified Data.Primitive.Types as PM
150+
151+#if MIN_VERSION_primitive(0,6,4)
152+#if !MIN_VERSION_primitive(0,7,0)
153+import qualified Data.Primitive.UnliftedArray as PM
142#endif
154#endif
155+import qualified Data.Primitive.PrimArray as PM
156+#endif
157+
143
158
144−#if HAS_COERCIBLE
145import Data.Coerce (Coercible, coerce)
159import Data.Coerce (Coercible, coerce)
146−coerce' :: Coercible a b => a -> b
147−coerce' = coerce
148−#else
149−coerce' :: a -> b
150−coerce' = unsafeCoerce
151−#endif
152
160
153parseIndexedJSON :: (Value -> Parser a) -> Int -> Value -> Parser a
161parseIndexedJSON :: (Value -> Parser a) -> Int -> Value -> Parser a
154parseIndexedJSON p idx value = p value <?> Index idx
162parseIndexedJSON p idx value = p value <?> Index idx
@@ -157,7 +165,7 @@ parseIndexedJSON p idx value = p value <?> Index idx
157parseIndexedJSONPair :: (Value -> Parser a) -> (Value -> Parser b) -> Int -> Value -> Parser (a, b)
165parseIndexedJSONPair :: (Value -> Parser a) -> (Value -> Parser b) -> Int -> Value -> Parser (a, b)
158parseIndexedJSONPair keyParser valParser idx value = p value <?> Index idx
166parseIndexedJSONPair keyParser valParser idx value = p value <?> Index idx
159 where
167 where
160− p = withArray "(k,v)" $ \ab ->
168+ p = withArray "(k, v)" $ \ab ->
161 let n = V.length ab
169 let n = V.length ab
162 in if n == 2
170 in if n == 2
163 then (,) <$> parseJSONElemAtIndex keyParser 0 ab
171 then (,) <$> parseJSONElemAtIndex keyParser 0 ab
@@ -169,43 +177,34 @@ parseIndexedJSONPair keyParser valParser idx value = p value <?> Index idx
169parseJSONElemAtIndex :: (Value -> Parser a) -> Int -> V.Vector Value -> Parser a
177parseJSONElemAtIndex :: (Value -> Parser a) -> Int -> V.Vector Value -> Parser a
170parseJSONElemAtIndex p idx ary = p (V.unsafeIndex ary idx) <?> Index idx
178parseJSONElemAtIndex p idx ary = p (V.unsafeIndex ary idx) <?> Index idx
171
179
172−scientificToNumber :: Scientific -> Number
173−scientificToNumber s
174− | e < 0 = D $ Scientific.toRealFloat s
175− | otherwise = I $ c * 10 ^ e
176− where
177− e = Scientific.base10Exponent s
178− c = Scientific.coefficient s
179−{-# INLINE scientificToNumber #-}
180−
181parseRealFloat :: RealFloat a => String -> Value -> Parser a
180parseRealFloat :: RealFloat a => String -> Value -> Parser a
182−parseRealFloat _ (Number s) = pure $ Scientific.toRealFloat s
181+parseRealFloat _ (Number s) = pure $ Scientific.toRealFloat s
183−parseRealFloat _ Null = pure (0/0)
182+parseRealFloat _ Null = pure (0/0)
184−parseRealFloat expected v = typeMismatch expected v
183+parseRealFloat name v = prependContext name (unexpected v)
185{-# INLINE parseRealFloat #-}
184{-# INLINE parseRealFloat #-}
186
185
187−parseIntegralFromScientific :: forall a. Integral a => String -> Scientific -> Parser a
186+parseIntegralFromScientific :: forall a. Integral a => Scientific -> Parser a
188−parseIntegralFromScientific expected s =
187+parseIntegralFromScientific s =
189 case Scientific.floatingOrInteger s :: Either Double a of
188 case Scientific.floatingOrInteger s :: Either Double a of
190 Right x -> pure x
189 Right x -> pure x
191− Left _ -> fail $ "Floating number specified for " ++ expected ++ ": " ++ show s
190+ Left _ -> fail $ "unexpected floating number " ++ show s
192{-# INLINE parseIntegralFromScientific #-}
191{-# INLINE parseIntegralFromScientific #-}
193
192
194parseIntegral :: Integral a => String -> Value -> Parser a
193parseIntegral :: Integral a => String -> Value -> Parser a
195−parseIntegral expected =
194+parseIntegral name =
196− withScientific expected $ parseIntegralFromScientific expected
195+ prependContext name . withBoundedScientific' parseIntegralFromScientific
197{-# INLINE parseIntegral #-}
196{-# INLINE parseIntegral #-}
198
197
199−parseBoundedIntegralFromScientific :: (Bounded a, Integral a) => String -> Scientific -> Parser a
198+parseBoundedIntegralFromScientific :: (Bounded a, Integral a) => Scientific -> Parser a
200−parseBoundedIntegralFromScientific expected s = maybe
199+parseBoundedIntegralFromScientific s = maybe
201− (fail $ expected ++ " is either floating or will cause over or underflow: " ++ show s)
200+ (fail $ "value is either floating or will cause over or underflow " ++ show s)
202 pure
201 pure
203 (Scientific.toBoundedInteger s)
202 (Scientific.toBoundedInteger s)
204{-# INLINE parseBoundedIntegralFromScientific #-}
203{-# INLINE parseBoundedIntegralFromScientific #-}
205
204
206parseBoundedIntegral :: (Bounded a, Integral a) => String -> Value -> Parser a
205parseBoundedIntegral :: (Bounded a, Integral a) => String -> Value -> Parser a
207−parseBoundedIntegral expected =
206+parseBoundedIntegral name =
208− withScientific expected $ parseBoundedIntegralFromScientific expected
207+ prependContext name . withScientific' parseBoundedIntegralFromScientific
209{-# INLINE parseBoundedIntegral #-}
208{-# INLINE parseBoundedIntegral #-}
210
209
211parseScientificText :: Text -> Parser Scientific
210parseScientificText :: Text -> Parser Scientific
@@ -215,13 +214,20 @@ parseScientificText
215 . T.encodeUtf8
214 . T.encodeUtf8
216
215
217parseIntegralText :: Integral a => String -> Text -> Parser a
216parseIntegralText :: Integral a => String -> Text -> Parser a
218−parseIntegralText expected t =
217+parseIntegralText name t =
218+ prependContext name $
219+ parseScientificText t
220+ >>= rejectLargeExponent
219− parseScientificText t >>= parseIntegralFromScientific expected
221+ >>= parseIntegralFromScientific
222+ where
223+ rejectLargeExponent :: Scientific -> Parser Scientific
224+ rejectLargeExponent s = withBoundedScientific' pure (Number s)
220{-# INLINE parseIntegralText #-}
225{-# INLINE parseIntegralText #-}
221
226
222parseBoundedIntegralText :: (Bounded a, Integral a) => String -> Text -> Parser a
227parseBoundedIntegralText :: (Bounded a, Integral a) => String -> Text -> Parser a
223−parseBoundedIntegralText expected t =
228+parseBoundedIntegralText name t =
229+ prependContext name $
224− parseScientificText t >>= parseBoundedIntegralFromScientific expected
230+ parseScientificText t >>= parseBoundedIntegralFromScientific
225
231
226parseOptionalFieldWith :: (Value -> Parser (Maybe a))
232parseOptionalFieldWith :: (Value -> Parser (Maybe a))
227 -> Object -> Text -> Parser (Maybe a)
233 -> Object -> Text -> Parser (Maybe a)
@@ -281,14 +287,21 @@ genericLiftParseJSON opts pj pjl = fmap to1 . gParseJSON opts (From1Args pj pjl)
281--
287--
282-- The basic ways to signal a failed conversion are as follows:
288-- The basic ways to signal a failed conversion are as follows:
283--
289--
284−-- * 'empty' and 'mzero' work, but are terse and uninformative
290+-- * 'fail' yields a custom error message: it is the recommended way of
291+-- reporting a failure;
285--
292--
286−-- * 'fail' yields a custom error message
293+-- * 'Control.Applicative.empty' (or 'Control.Monad.mzero') is uninformative:
294+-- use it when the error is meant to be caught by some @('<|>')@;
287--
295--
288−-- * 'typeMismatch' produces an informative message for cases when the
296+-- * 'typeMismatch' can be used to report a failure when the encountered value
289−-- value encountered is not of the expected type
297+-- is not of the expected JSON type; 'unexpected' is an appropriate alternative
298+-- when more than one type may be expected, or to keep the expected type
299+-- implicit.
290--
300--
301+-- 'prependFailure' (or 'modifyFailure') add more information to a parser's
302+-- error messages.
303+--
291−-- An example type and instance using 'typeMismatch':
304+-- An example type and instance using 'typeMismatch' and 'prependFailure':
292--
305--
293-- @
306-- @
294-- \-- Allow ourselves to write 'Text' literals.
307-- \-- Allow ourselves to write 'Text' literals.
@@ -296,27 +309,29 @@ genericLiftParseJSON opts pj pjl = fmap to1 . gParseJSON opts (From1Args pj pjl)
296--
309--
297-- data Coord = Coord { x :: Double, y :: Double }
310-- data Coord = Coord { x :: Double, y :: Double }
298--
311--
299−-- instance FromJSON Coord where
312+-- instance 'FromJSON' Coord where
300−-- parseJSON ('Object' v) = Coord
313+-- 'parseJSON' ('Object' v) = Coord
301−-- '<$>' v '.:' \"x\"
314+-- '<$>' v '.:' \"x\"
302-- '<*>' v '.:' \"y\"
315-- '<*>' v '.:' \"y\"
303--
316--
304-- \-- We do not expect a non-'Object' value here.
317-- \-- We do not expect a non-'Object' value here.
305−-- \-- We could use 'mzero' to fail, but 'typeMismatch'
318+-- \-- We could use 'Control.Applicative.empty' to fail, but 'typeMismatch'
306-- \-- gives a much more informative error message.
319-- \-- gives a much more informative error message.
320+-- 'parseJSON' invalid =
321+-- 'prependFailure' "parsing Coord failed, "
307−-- parseJSON invalid = 'typeMismatch' \"Coord\" invalid
322+-- ('typeMismatch' \"Object\" invalid)
308-- @
323-- @
309--
324--
310-- For this common case of only being concerned with a single
325-- For this common case of only being concerned with a single
311−-- type of JSON value, the functions @withObject@, @withNumber@, etc.
326+-- type of JSON value, the functions 'withObject', 'withScientific', etc.
312-- are provided. Their use is to be preferred when possible, since
327-- are provided. Their use is to be preferred when possible, since
313−-- they are more terse. Using @withObject@, we can rewrite the above instance
328+-- they are more terse. Using 'withObject', we can rewrite the above instance
314-- (assuming the same language extension and data type) as:
329-- (assuming the same language extension and data type) as:
315--
330--
316-- @
331-- @
317−-- instance FromJSON Coord where
332+-- instance 'FromJSON' Coord where
318−-- parseJSON = withObject \"Coord\" $ \v -> Coord
333+-- 'parseJSON' = 'withObject' \"Coord\" $ \\v -> Coord
319−-- '<$>' v '.:' \"x\"
334+-- '<$>' v '.:' \"x\"
320-- '<*>' v '.:' \"y\"
335-- '<*>' v '.:' \"y\"
321-- @
336-- @
322--
337--
@@ -325,7 +340,7 @@ genericLiftParseJSON opts pj pjl = fmap to1 . gParseJSON opts (From1Args pj pjl)
325--
340--
326-- * "Data.Aeson.TH" provides Template Haskell functions which will derive an
341-- * "Data.Aeson.TH" provides Template Haskell functions which will derive an
327-- instance at compile time. The generated instance is optimized for your type
342-- instance at compile time. The generated instance is optimized for your type
328−-- so will probably be more efficient than the following two options:
343+-- so it will probably be more efficient than the following option.
329--
344--
330-- * The compiler can provide a default generic implementation for
345-- * The compiler can provide a default generic implementation for
331-- 'parseJSON'.
346-- 'parseJSON'.
@@ -343,18 +358,21 @@ genericLiftParseJSON opts pj pjl = fmap to1 . gParseJSON opts (From1Args pj pjl)
343--
358--
344-- data Coord = Coord { x :: Double, y :: Double } deriving 'Generic'
359-- data Coord = Coord { x :: Double, y :: Double } deriving 'Generic'
345--
360--
346−-- instance FromJSON Coord
361+-- instance 'FromJSON' Coord
347-- @
362-- @
348--
363--
349−-- If @DefaultSignatures@ doesn't give exactly the results you want,
364+-- The default implementation will be equivalent to
365+-- @parseJSON = 'genericParseJSON' 'defaultOptions'@; if you need different
350−-- you can customize the generic decoding with only a tiny amount of
366+-- options, you can customize the generic decoding by defining:
351−-- effort, using 'genericParseJSON' with your preferred 'Options':
352--
367--
353-- @
368-- @
369+-- customOptions = 'defaultOptions'
370+-- { 'fieldLabelModifier' = 'map' 'Data.Char.toUpper'
371+-- }
372+--
354−-- instance FromJSON Coord where
373+-- instance 'FromJSON' Coord where
355−-- parseJSON = 'genericParseJSON' 'defaultOptions'
374+-- 'parseJSON' = 'genericParseJSON' customOptions
356-- @
375-- @
357−
358class FromJSON a where
376class FromJSON a where
359 parseJSON :: Value -> Parser a
377 parseJSON :: Value -> Parser a
360
378
@@ -362,13 +380,11 @@ class FromJSON a where
362 parseJSON = genericParseJSON defaultOptions
380 parseJSON = genericParseJSON defaultOptions
363
381
364 parseJSONList :: Value -> Parser [a]
382 parseJSONList :: Value -> Parser [a]
365− parseJSONList (Array a)
383+ parseJSONList = withArray "[]" $ \a ->
366− = zipWithM (parseIndexedJSON parseJSON) [0..]
384+ zipWithM (parseIndexedJSON parseJSON) [0..]
367 . V.toList
385 . V.toList
368 $ a
386 $ a
369
387
370− parseJSONList v = typeMismatch "[a]" v
371−
372-------------------------------------------------------------------------------
388-------------------------------------------------------------------------------
373-- Classes and types for map keys
389-- Classes and types for map keys
374-------------------------------------------------------------------------------
390-------------------------------------------------------------------------------
@@ -380,6 +396,16 @@ class FromJSON a where
380-- > newtype SomeId = SomeId { getSomeId :: Text }
396-- > newtype SomeId = SomeId { getSomeId :: Text }
381-- > deriving (Eq,Ord,Hashable,FromJSONKey)
397-- > deriving (Eq,Ord,Hashable,FromJSONKey)
382--
398--
399+-- If you have a sum of nullary constructors, you may use the generic
400+-- implementation:
401+--
402+-- @
403+-- data Color = Red | Green | Blue
404+-- deriving Generic
405+--
406+-- instance 'FromJSONKey' Color where
407+-- 'fromJSONKey' = 'genericFromJSONKey' 'defaultJSONKeyOptions'
408+-- @
383class FromJSONKey a where
409class FromJSONKey a where
384 -- | Strategy for parsing the key of a map-like container.
410 -- | Strategy for parsing the key of a map-like container.
385 fromJSONKey :: FromJSONKeyFunction a
411 fromJSONKey :: FromJSONKeyFunction a
@@ -402,11 +428,7 @@ class FromJSONKey a where
402-- At the moment this type is intentionally not exported. 'FromJSONKeyFunction'
428-- At the moment this type is intentionally not exported. 'FromJSONKeyFunction'
403-- can be inspected, but cannot be constructed.
429-- can be inspected, but cannot be constructed.
404data CoerceText a where
430data CoerceText a where
405−#if HAS_COERCIBLE
406 CoerceText :: Coercible Text a => CoerceText a
431 CoerceText :: Coercible Text a => CoerceText a
407−#else
408− CoerceText :: CoerceText a
409−#endif
410
432
411-- | This type is related to 'ToJSONKeyFunction'. If 'FromJSONKeyValue' is used in the
433-- | This type is related to 'ToJSONKeyFunction'. If 'FromJSONKeyValue' is used in the
412-- 'FromJSONKey' instance, then 'ToJSONKeyValue' should be used in the 'ToJSONKey'
434-- 'FromJSONKey' instance, then 'ToJSONKeyValue' should be used in the 'ToJSONKey'
@@ -426,7 +448,7 @@ data FromJSONKeyFunction a
426
448
427-- | Only law abiding up to interpretation
449-- | Only law abiding up to interpretation
428instance Functor FromJSONKeyFunction where
450instance Functor FromJSONKeyFunction where
429− fmap h (FromJSONKeyCoerce CoerceText) = FromJSONKeyText (h . coerce')
451+ fmap h (FromJSONKeyCoerce CoerceText) = FromJSONKeyText (h . coerce)
430 fmap h (FromJSONKeyText f) = FromJSONKeyText (h . f)
452 fmap h (FromJSONKeyText f) = FromJSONKeyText (h . f)
431 fmap h (FromJSONKeyTextParser f) = FromJSONKeyTextParser (fmap h . f)
453 fmap h (FromJSONKeyTextParser f) = FromJSONKeyTextParser (fmap h . f)
432 fmap h (FromJSONKeyValue f) = FromJSONKeyValue (fmap h . f)
454 fmap h (FromJSONKeyValue f) = FromJSONKeyValue (fmap h . f)
@@ -440,9 +462,7 @@ instance Functor FromJSONKeyFunction where
440--
462--
441-- On pre GHC 7.8 this is unconstrainted function.
463-- On pre GHC 7.8 this is unconstrainted function.
442fromJSONKeyCoerce ::
464fromJSONKeyCoerce ::
443−#if HAS_COERCIBLE
444 Coercible Text a =>
465 Coercible Text a =>
445−#endif
446 FromJSONKeyFunction a
466 FromJSONKeyFunction a
447fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText
467fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText
448
468
@@ -450,60 +470,91 @@ fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText
450--
470--
451-- See note on 'fromJSONKeyCoerce'.
471-- See note on 'fromJSONKeyCoerce'.
452coerceFromJSONKeyFunction ::
472coerceFromJSONKeyFunction ::
453−#if HAS_COERCIBLE
454 Coercible a b =>
473 Coercible a b =>
455−#endif
456 FromJSONKeyFunction a -> FromJSONKeyFunction b
474 FromJSONKeyFunction a -> FromJSONKeyFunction b
457−#if HAS_COERCIBLE
458coerceFromJSONKeyFunction = coerce
475coerceFromJSONKeyFunction = coerce
459−#else
460−coerceFromJSONKeyFunction (FromJSONKeyCoerce CoerceText) = FromJSONKeyCoerce CoerceText
461−coerceFromJSONKeyFunction (FromJSONKeyText f) = FromJSONKeyText (coerce' . f)
462−coerceFromJSONKeyFunction (FromJSONKeyTextParser f) = FromJSONKeyTextParser (fmap coerce' . f)
463−coerceFromJSONKeyFunction (FromJSONKeyValue f) = FromJSONKeyValue (fmap coerce' . f)
464−#endif
465
476
466{-# RULES
477{-# RULES
467 "FromJSONKeyCoerce: fmap id" forall (x :: FromJSONKeyFunction a).
478 "FromJSONKeyCoerce: fmap id" forall (x :: FromJSONKeyFunction a).
468 fmap id x = x
479 fmap id x = x
469 #-}
480 #-}
470−#if HAS_COERCIBLE
471{-# RULES
481{-# RULES
472 "FromJSONKeyCoerce: fmap coerce" forall x .
482 "FromJSONKeyCoerce: fmap coerce" forall x .
473 fmap coerce x = coerceFromJSONKeyFunction x
483 fmap coerce x = coerceFromJSONKeyFunction x
474 #-}
484 #-}
475−#endif
476
485
477-- | Same as 'fmap'. Provided for the consistency with 'ToJSONKeyFunction'.
486-- | Same as 'fmap'. Provided for the consistency with 'ToJSONKeyFunction'.
478mapFromJSONKeyFunction :: (a -> b) -> FromJSONKeyFunction a -> FromJSONKeyFunction b
487mapFromJSONKeyFunction :: (a -> b) -> FromJSONKeyFunction a -> FromJSONKeyFunction b
479mapFromJSONKeyFunction = fmap
488mapFromJSONKeyFunction = fmap
480
489
490+-- | 'fromJSONKey' for 'Generic' types.
491+-- These types must be sums of nullary constructors, whose names will be used
492+-- as keys for JSON objects.
493+--
494+-- See also 'genericToJSONKey'.
495+--
496+-- === __Example__
497+--
498+-- @
499+-- data Color = Red | Green | Blue
500+-- deriving 'Generic'
501+--
502+-- instance 'FromJSONKey' Color where
503+-- 'fromJSONKey' = 'genericFromJSONKey' 'defaultJSONKeyOptions'
504+-- @
505+genericFromJSONKey :: forall a. (Generic a, GFromJSONKey (Rep a))
506+ => JSONKeyOptions
507+ -> FromJSONKeyFunction a
508+genericFromJSONKey opts = FromJSONKeyTextParser $ \t ->
509+ case parseSumFromString (keyModifier opts) t of
510+ Nothing -> fail $
511+ "invalid key " ++ show t ++ ", expected one of " ++ show cnames
512+ Just k -> pure (to k)
513+ where
514+ cnames = unTagged2 (constructorTags (keyModifier opts) :: Tagged2 (Rep a) [String])
515+
516+class (ConstructorNames f, SumFromString f) => GFromJSONKey f where
517+instance (ConstructorNames f, SumFromString f) => GFromJSONKey f where
518+
481-------------------------------------------------------------------------------
519-------------------------------------------------------------------------------
482-- Functions needed for documentation
520-- Functions needed for documentation
483-------------------------------------------------------------------------------
521-------------------------------------------------------------------------------
484
522
485-- | Fail parsing due to a type mismatch, with a descriptive message.
523-- | Fail parsing due to a type mismatch, with a descriptive message.
486--
524--
487−-- Example usage:
525+-- The following wrappers should generally be prefered:
526+-- 'withObject', 'withArray', 'withText', 'withBool'.
488--
527--
489−-- @
528+-- ==== Error message example
490−-- instance FromJSON Coord where
529+--
491−-- parseJSON ('Object' v) = {- type matches, life is good -}
530+-- > typeMismatch "Object" (String "oops")
492−-- parseJSON wat = 'typeMismatch' \"Coord\" wat
531+-- > -- Error: "expected Object, but encountered String"
493−-- @
494−typeMismatch :: String -- ^ The name of the type you are trying to parse.
532+typeMismatch :: String -- ^ The name of the JSON type being parsed
533+ -- (@\"Object\"@, @\"Array\"@, @\"String\"@, @\"Number\"@,
534+ -- @\"Boolean\"@, or @\"Null\"@).
495 -> Value -- ^ The actual value encountered.
535 -> Value -- ^ The actual value encountered.
496 -> Parser a
536 -> Parser a
497typeMismatch expected actual =
537typeMismatch expected actual =
498− fail $ "expected " ++ expected ++ ", encountered " ++ name
538+ fail $ "expected " ++ expected ++ ", but encountered " ++ typeOf actual
499− where
539+
540+-- | Fail parsing due to a type mismatch, when the expected types are implicit.
541+--
542+-- ==== Error message example
543+--
544+-- > unexpected (String "oops")
545+-- > -- Error: "unexpected String"
546+unexpected :: Value -> Parser a
547+unexpected actual = fail $ "unexpected " ++ typeOf actual
548+
549+-- | JSON type of a value, name of the head constructor.
550+typeOf :: Value -> String
500− name = case actual of
551+typeOf v = case v of
501− Object _ -> "Object"
552+ Object _ -> "Object"
502− Array _ -> "Array"
553+ Array _ -> "Array"
503− String _ -> "String"
554+ String _ -> "String"
504− Number _ -> "Number"
555+ Number _ -> "Number"
505− Bool _ -> "Boolean"
556+ Bool _ -> "Boolean"
506− Null -> "Null"
557+ Null -> "Null"
507
558
508-------------------------------------------------------------------------------
559-------------------------------------------------------------------------------
509-- Lifings of FromJSON and ToJSON to unary and binary type constructors
560-- Lifings of FromJSON and ToJSON to unary and binary type constructors
@@ -516,7 +567,7 @@ typeMismatch expected actual =
516--
567--
517-- * "Data.Aeson.TH" provides Template Haskell functions which will derive an
568-- * "Data.Aeson.TH" provides Template Haskell functions which will derive an
518-- instance at compile time. The generated instance is optimized for your type
569-- instance at compile time. The generated instance is optimized for your type
519−-- so will probably be more efficient than the following two options:
570+-- so it will probably be more efficient than the following option.
520--
571--
521-- * The compiler can provide a default generic implementation for
572-- * The compiler can provide a default generic implementation for
522-- 'liftParseJSON'.
573-- 'liftParseJSON'.
@@ -534,16 +585,20 @@ typeMismatch expected actual =
534--
585--
535-- data Pair a b = Pair { pairFst :: a, pairSnd :: b } deriving 'Generic1'
586-- data Pair a b = Pair { pairFst :: a, pairSnd :: b } deriving 'Generic1'
536--
587--
537−-- instance FromJSON a => FromJSON1 (Pair a)
588+-- instance 'FromJSON' a => 'FromJSON1' (Pair a)
538-- @
589-- @
539--
590--
540−-- If @DefaultSignatures@ doesn't give exactly the results you want,
591+-- If the default implementation doesn't give exactly the results you want,
541-- you can customize the generic decoding with only a tiny amount of
592-- you can customize the generic decoding with only a tiny amount of
542-- effort, using 'genericLiftParseJSON' with your preferred 'Options':
593-- effort, using 'genericLiftParseJSON' with your preferred 'Options':
543--
594--
544-- @
595-- @
596+-- customOptions = 'defaultOptions'
597+-- { 'fieldLabelModifier' = 'map' 'Data.Char.toUpper'
598+-- }
599+--
545−-- instance FromJSON a => FromJSON1 (Pair a) where
600+-- instance 'FromJSON' a => 'FromJSON1' (Pair a) where
546−-- liftParseJSON = 'genericLiftParseJSON' 'defaultOptions'
601+-- 'liftParseJSON' = 'genericLiftParseJSON' customOptions
547-- @
602-- @
548class FromJSON1 f where
603class FromJSON1 f where
549 liftParseJSON :: (Value -> Parser a) -> (Value -> Parser [a]) -> Value -> Parser (f a)
604 liftParseJSON :: (Value -> Parser a) -> (Value -> Parser [a]) -> Value -> Parser (f a)
@@ -580,9 +635,8 @@ class FromJSON2 f where
580 -> (Value -> Parser b)
635 -> (Value -> Parser b)
581 -> (Value -> Parser [b])
636 -> (Value -> Parser [b])
582 -> Value -> Parser [f a b]
637 -> Value -> Parser [f a b]
583− liftParseJSONList2 fa ga fb gb v = case v of
638+ liftParseJSONList2 fa ga fb gb = withArray "[]" $ \vals ->
584− Array vals -> fmap V.toList (V.mapM (liftParseJSON2 fa ga fb gb) vals)
639+ fmap V.toList (V.mapM (liftParseJSON2 fa ga fb gb) vals)
585− _ -> typeMismatch "[a]" v
586
640
587-- | Lift the standard 'parseJSON' function through the type constructor.
641-- | Lift the standard 'parseJSON' function through the type constructor.
588parseJSON2 :: (FromJSON2 f, FromJSON a, FromJSON b) => Value -> Parser (f a b)
642parseJSON2 :: (FromJSON2 f, FromJSON a, FromJSON b) => Value -> Parser (f a b)
@@ -596,7 +650,7 @@ parseJSON2 = liftParseJSON2 parseJSON parseJSONList parseJSON parseJSONList
596-- | Helper function to use with 'liftParseJSON'. See 'Data.Aeson.ToJSON.listEncoding'.
650-- | Helper function to use with 'liftParseJSON'. See 'Data.Aeson.ToJSON.listEncoding'.
597listParser :: (Value -> Parser a) -> Value -> Parser [a]
651listParser :: (Value -> Parser a) -> Value -> Parser [a]
598listParser f (Array xs) = fmap V.toList (V.mapM f xs)
652listParser f (Array xs) = fmap V.toList (V.mapM f xs)
599−listParser _ v = typeMismatch "[a]" v
653+listParser _ v = typeMismatch "Array" v
600{-# INLINE listParser #-}
654{-# INLINE listParser #-}
601
655
602-------------------------------------------------------------------------------
656-------------------------------------------------------------------------------
@@ -614,48 +668,139 @@ instance (FromJSON a) => FromJSON [a] where
614-- Functions
668-- Functions
615-------------------------------------------------------------------------------
669-------------------------------------------------------------------------------
616
670
671+-- | Add context to a failure message, indicating the name of the structure
672+-- being parsed.
673+--
674+-- > prependContext "MyType" (fail "[error message]")
675+-- > -- Error: "parsing MyType failed, [error message]"
676+prependContext :: String -> Parser a -> Parser a
677+prependContext name = prependFailure ("parsing " ++ name ++ " failed, ")
678+
617−-- | @withObject expected f value@ applies @f@ to the 'Object' when @value@ is an @Object@
679+-- | @'withObject' name f value@ applies @f@ to the 'Object' when @value@
618−-- and fails using @'typeMismatch' expected@ otherwise.
680+-- is an 'Data.Aeson.Object' and fails otherwise.
681+--
682+-- ==== Error message example
683+--
684+-- > withObject "MyType" f (String "oops")
685+-- > -- Error: "parsing MyType failed, expected Object, but encountered String"
619withObject :: String -> (Object -> Parser a) -> Value -> Parser a
686withObject :: String -> (Object -> Parser a) -> Value -> Parser a
620−withObject _ f (Object obj) = f obj
687+withObject _ f (Object obj) = f obj
621−withObject expected _ v = typeMismatch expected v
688+withObject name _ v = prependContext name (typeMismatch "Object" v)
622{-# INLINE withObject #-}
689{-# INLINE withObject #-}
623
690
624−-- | @withText expected f value@ applies @f@ to the 'Text' when @value@ is a @String@
691+-- | @'withText' name f value@ applies @f@ to the 'Text' when @value@ is a
625−-- and fails using @'typeMismatch' expected@ otherwise.
692+-- 'Data.Aeson.String' and fails otherwise.
693+--
694+-- ==== Error message example
695+--
696+-- > withText "MyType" f Null
697+-- > -- Error: "parsing MyType failed, expected String, but encountered Null"
626withText :: String -> (Text -> Parser a) -> Value -> Parser a
698withText :: String -> (Text -> Parser a) -> Value -> Parser a
627−withText _ f (String txt) = f txt
699+withText _ f (String txt) = f txt
628−withText expected _ v = typeMismatch expected v
700+withText name _ v = prependContext name (typeMismatch "String" v)
629{-# INLINE withText #-}
701{-# INLINE withText #-}
630
702
631−-- | @withArray expected f value@ applies @f@ to the 'Array' when @value@ is an @Array@
703+-- | @'withArray' expected f value@ applies @f@ to the 'Array' when @value@ is
632−-- and fails using @'typeMismatch' expected@ otherwise.
704+-- an 'Data.Aeson.Array' and fails otherwise.
705+--
706+-- ==== Error message example
707+--
708+-- > withArray "MyType" f (String "oops")
709+-- > -- Error: "parsing MyType failed, expected Array, but encountered String"
633withArray :: String -> (Array -> Parser a) -> Value -> Parser a
710withArray :: String -> (Array -> Parser a) -> Value -> Parser a
634−withArray _ f (Array arr) = f arr
711+withArray _ f (Array arr) = f arr
635−withArray expected _ v = typeMismatch expected v
712+withArray name _ v = prependContext name (typeMismatch "Array" v)
636{-# INLINE withArray #-}
713{-# INLINE withArray #-}
637
714
638−-- | @withNumber expected f value@ applies @f@ to the 'Number' when @value@ is a 'Number'.
639−-- and fails using @'typeMismatch' expected@ otherwise.
640−withNumber :: String -> (Number -> Parser a) -> Value -> Parser a
641−withNumber expected f = withScientific expected (f . scientificToNumber)
642−{-# INLINE withNumber #-}
643−{-# DEPRECATED withNumber "Use withScientific instead" #-}
644−
645−-- | @withScientific expected f value@ applies @f@ to the 'Scientific' number when @value@ is a 'Number'.
715+-- | @'withScientific' name f value@ applies @f@ to the 'Scientific' number
646−-- and fails using @'typeMismatch' expected@ otherwise.
716+-- when @value@ is a 'Data.Aeson.Number' and fails using 'typeMismatch'
717+-- otherwise.
718+--
719+-- /Warning/: If you are converting from a scientific to an unbounded
720+-- type such as 'Integer' you may want to add a restriction on the
721+-- size of the exponent (see 'withBoundedScientific') to prevent
722+-- malicious input from filling up the memory of the target system.
723+--
724+-- ==== Error message example
725+--
726+-- > withScientific "MyType" f (String "oops")
727+-- > -- Error: "parsing MyType failed, expected Number, but encountered String"
647withScientific :: String -> (Scientific -> Parser a) -> Value -> Parser a
728withScientific :: String -> (Scientific -> Parser a) -> Value -> Parser a
648−withScientific _ f (Number scientific) = f scientific
729+withScientific _ f (Number scientific) = f scientific
649−withScientific expected _ v = typeMismatch expected v
730+withScientific name _ v = prependContext name (typeMismatch "Number" v)
650{-# INLINE withScientific #-}
731{-# INLINE withScientific #-}
651
732
652−-- | @withBool expected f value@ applies @f@ to the 'Bool' when @value@ is a @Bool@
733+-- | A variant of 'withScientific' which doesn't use 'prependContext', so that
734+-- such context can be added separately in a way that also applies when the
735+-- continuation @f :: Scientific -> Parser a@ fails.
736+--
737+-- /Warning/: If you are converting from a scientific to an unbounded
738+-- type such as 'Integer' you may want to add a restriction on the
739+-- size of the exponent (see 'withBoundedScientific') to prevent
740+-- malicious input from filling up the memory of the target system.
741+--
742+-- ==== Error message examples
743+--
744+-- > withScientific' f (String "oops")
745+-- > -- Error: "unexpected String"
746+-- >
747+-- > prependContext "MyType" (withScientific' f (String "oops"))
748+-- > -- Error: "parsing MyType failed, unexpected String"
749+withScientific' :: (Scientific -> Parser a) -> Value -> Parser a
750+withScientific' f v = case v of
751+ Number n -> f n
752+ _ -> typeMismatch "Number" v
753+{-# INLINE withScientific' #-}
754+
755+-- | @'withBoundedScientific' name f value@ applies @f@ to the 'Scientific' number
756+-- when @value@ is a 'Number' with exponent less than or equal to 1024.
757+withBoundedScientific :: String -> (Scientific -> Parser a) -> Value -> Parser a
758+withBoundedScientific name f v = withBoundedScientific_ (prependContext name) f v
759+{-# INLINE withBoundedScientific #-}
760+
761+-- | A variant of 'withBoundedScientific' which doesn't use 'prependContext',
762+-- so that such context can be added separately in a way that also applies
763+-- when the continuation @f :: Scientific -> Parser a@ fails.
764+withBoundedScientific' :: (Scientific -> Parser a) -> Value -> Parser a
765+withBoundedScientific' f v = withBoundedScientific_ id f v
766+{-# INLINE withBoundedScientific' #-}
767+
768+-- | A variant of 'withBoundedScientific_' parameterized by a function to apply
769+-- to the 'Parser' in case of failure.
770+withBoundedScientific_ :: (Parser a -> Parser a) -> (Scientific -> Parser a) -> Value -> Parser a
771+withBoundedScientific_ whenFail f (Number scientific) =
772+ if exp10 > 1024
773+ then whenFail (fail msg)
774+ else f scientific
775+ where
776+ exp10 = base10Exponent scientific
777+ msg = "found a number with exponent " ++ show exp10 ++ ", but it must not be greater than 1024"
778+withBoundedScientific_ whenFail _ v =
779+ whenFail (typeMismatch "Number" v)
780+{-# INLINE withBoundedScientific_ #-}
781+
782+-- | @'withBool' expected f value@ applies @f@ to the 'Bool' when @value@ is a
653−-- and fails using @'typeMismatch' expected@ otherwise.
783+-- 'Boolean' and fails otherwise.
784+--
785+-- ==== Error message example
786+--
787+-- > withBool "MyType" f (String "oops")
788+-- > -- Error: "parsing MyType failed, expected Boolean, but encountered String"
654withBool :: String -> (Bool -> Parser a) -> Value -> Parser a
789withBool :: String -> (Bool -> Parser a) -> Value -> Parser a
655−withBool _ f (Bool arr) = f arr
790+withBool _ f (Bool arr) = f arr
656−withBool expected _ v = typeMismatch expected v
791+withBool name _ v = prependContext name (typeMismatch "Boolean" v)
657{-# INLINE withBool #-}
792{-# INLINE withBool #-}
658
793
794+-- | Decode a nested JSON-encoded string.
795+withEmbeddedJSON :: String -> (Value -> Parser a) -> Value -> Parser a
796+withEmbeddedJSON _ innerParser (String txt) =
797+ either fail innerParser $ eitherDecode (L.fromStrict $ T.encodeUtf8 txt)
798+ where
799+ eitherDecode = eitherFormatError . eitherDecodeWith jsonEOF ifromJSON
800+ eitherFormatError = either (Left . uncurry formatError) Right
801+withEmbeddedJSON name _ v = prependContext name (typeMismatch "String" v)
802+{-# INLINE withEmbeddedJSON #-}
803+
659-- | Convert a value from JSON, failing if the types do not match.
804-- | Convert a value from JSON, failing if the types do not match.
660fromJSON :: (FromJSON a) => Value -> Result a
805fromJSON :: (FromJSON a) => Value -> Result a
661fromJSON = parse parseJSON
806fromJSON = parse parseJSON
@@ -718,7 +863,7 @@ parseFieldMaybe' = (.:!)
718-- E.g. @'explicitParseField' 'parseJSON1' :: ('FromJSON1' f, 'FromJSON' a) -> 'Object' -> 'Text' -> 'Parser' (f a)@
863-- E.g. @'explicitParseField' 'parseJSON1' :: ('FromJSON1' f, 'FromJSON' a) -> 'Object' -> 'Text' -> 'Parser' (f a)@
719explicitParseField :: (Value -> Parser a) -> Object -> Text -> Parser a
864explicitParseField :: (Value -> Parser a) -> Object -> Text -> Parser a
720explicitParseField p obj key = case H.lookup key obj of
865explicitParseField p obj key = case H.lookup key obj of
721− Nothing -> fail $ "key " ++ show key ++ " not present"
866+ Nothing -> fail $ "key " ++ show key ++ " not found"
722 Just v -> p v <?> Key key
867 Just v -> p v <?> Key key
723{-# INLINE explicitParseField #-}
868{-# INLINE explicitParseField #-}
724
869
@@ -758,11 +903,47 @@ pmval .!= val = fromMaybe val <$> pmval
758-- Generic parseJSON
903-- Generic parseJSON
759-------------------------------------------------------------------------------
904-------------------------------------------------------------------------------
760
905
906+instance GFromJSON arity V1 where
907+ -- Whereof we cannot format, thereof we cannot parse:
908+ gParseJSON _ _ _ = fail "Attempted to parse empty type"
909+
910+
761instance OVERLAPPABLE_ (GFromJSON arity a) => GFromJSON arity (M1 i c a) where
911instance OVERLAPPABLE_ (GFromJSON arity a) => GFromJSON arity (M1 i c a) where
762 -- Meta-information, which is not handled elsewhere, is just added to the
912 -- Meta-information, which is not handled elsewhere, is just added to the
763 -- parsed value:
913 -- parsed value:
764 gParseJSON opts fargs = fmap M1 . gParseJSON opts fargs
914 gParseJSON opts fargs = fmap M1 . gParseJSON opts fargs
765
915
916+-- Information for error messages
917+
918+type TypeName = String
919+type ConName = String
920+
921+-- | Add the name of the type being parsed to a parser's error messages.
922+contextType :: TypeName -> Parser a -> Parser a
923+contextType = prependContext
924+
925+-- | Add the tagKey that will be looked up while building an ADT
926+-- | Produce the error equivalent to
927+-- | Left "Error in $: parsing T failed, expected an object with keys "tag" and
928+-- | "contents", where "tag" i-- |s associated to one of ["Foo", "Bar"],
929+-- | The parser returned error was: could not find key "tag"
930+contextTag :: Text -> [String] -> Parser a -> Parser a
931+contextTag tagKey cnames = prependFailure
932+ ("expected Object with key \"" ++ unpack tagKey ++ "\"" ++
933+ " containing one of " ++ show cnames ++ ", ")
934+
935+-- | Add the name of the constructor being parsed to a parser's error messages.
936+contextCons :: ConName -> TypeName -> Parser a -> Parser a
937+contextCons cname tname = prependContext (showCons cname tname)
938+
939+-- | Render a constructor as @\"MyType(MyConstructor)\"@.
940+showCons :: ConName -> TypeName -> String
941+showCons cname tname = tname ++ "(" ++ cname ++ ")"
942+
943+--------------------------------------------------------------------------------
944+
945+-- Parsing single fields
946+
766instance (FromJSON a) => GFromJSON arity (K1 i a) where
947instance (FromJSON a) => GFromJSON arity (K1 i a) where
767 -- Constant values are decoded using their FromJSON instance:
948 -- Constant values are decoded using their FromJSON instance:
768 gParseJSON _opts _ = fmap K1 . parseJSON
949 gParseJSON _opts _ = fmap K1 . parseJSON
@@ -777,326 +958,499 @@ instance (FromJSON1 f) => GFromJSON One (Rec1 f) where
777 -- FromJSON1 instance:
958 -- FromJSON1 instance:
778 gParseJSON _opts (From1Args pj pjl) = fmap Rec1 . liftParseJSON pj pjl
959 gParseJSON _opts (From1Args pj pjl) = fmap Rec1 . liftParseJSON pj pjl
779
960
780−instance GFromJSON arity U1 where
781− -- Empty constructors are expected to be encoded as an empty array:
782− gParseJSON _opts _ v
783− | isEmptyArray v = pure U1
784− | otherwise = typeMismatch "unit constructor (U1)" v
785−
786−instance (ConsFromJSON arity a) => GFromJSON arity (C1 c a) where
787− -- Constructors need to be decoded differently depending on whether they're
788− -- a record or not. This distinction is made by consParseJSON:
789− gParseJSON opts fargs = fmap M1 . consParseJSON opts fargs
790−
791−instance ( FromProduct arity a, FromProduct arity b
792− , ProductSize a, ProductSize b
793− ) => GFromJSON arity (a :*: b) where
794− -- Products are expected to be encoded to an array. Here we check whether we
795− -- got an array of the same size as the product, then parse each of the
796− -- product's elements using parseProduct:
797− gParseJSON opts fargs = withArray "product (:*:)" $ \arr ->
798− let lenArray = V.length arr
799− lenProduct = (unTagged2 :: Tagged2 (a :*: b) Int -> Int)
800− productSize in
801− if lenArray == lenProduct
802− then parseProduct opts fargs arr 0 lenProduct
803− else fail $ "When expecting a product of " ++ show lenProduct ++
804− " values, encountered an Array of " ++ show lenArray ++
805− " elements instead"
806−
807−instance ( AllNullary (a :+: b) allNullary
808− , ParseSum arity (a :+: b) allNullary
809− ) => GFromJSON arity (a :+: b) where
810− -- If all constructors of a sum datatype are nullary and the
811− -- 'allNullaryToStringTag' option is set they are expected to be
812− -- encoded as strings. This distinction is made by 'parseSum':
813− gParseJSON opts fargs =
814− (unTagged :: Tagged allNullary (Parser ((a :+: b) d)) ->
815− Parser ((a :+: b) d))
816− . parseSum opts fargs
817−
818instance (FromJSON1 f, GFromJSON One g) => GFromJSON One (f :.: g) where
961instance (FromJSON1 f, GFromJSON One g) => GFromJSON One (f :.: g) where
819 -- If an occurrence of the last type parameter is nested inside two
962 -- If an occurrence of the last type parameter is nested inside two
820 -- composed types, it is decoded by using the outermost type's FromJSON1
963 -- composed types, it is decoded by using the outermost type's FromJSON1
821 -- instance to generically decode the innermost type:
964 -- instance to generically decode the innermost type:
822 gParseJSON opts fargs =
965 gParseJSON opts fargs =
823− let gpj = gParseJSON opts fargs in
966+ let gpj = gParseJSON opts fargs in
824− fmap Comp1 . liftParseJSON gpj (listParser gpj)
967+ fmap Comp1 . liftParseJSON gpj (listParser gpj)
968+
969+--------------------------------------------------------------------------------
970+
971+instance (GFromJSON' arity a, Datatype d) => GFromJSON arity (D1 d a) where
972+ -- Meta-information, which is not handled elsewhere, is just added to the
973+ -- parsed value:
974+ gParseJSON opts fargs = fmap M1 . gParseJSON' (tname :* opts :* fargs)
975+ where
976+ tname = moduleName proxy ++ "." ++ datatypeName proxy
977+ proxy = undefined :: M1 _i d _f _p
978+
979+-- | 'GFromJSON', after unwrapping the 'D1' constructor, now carrying the data
980+-- type's name.
981+class GFromJSON' arity f where
982+ gParseJSON' :: TypeName :* Options :* FromArgs arity a
983+ -> Value
984+ -> Parser (f a)
985+
986+-- | Single constructor.
987+instance ( ConsFromJSON arity a
988+ , AllNullary (C1 c a) allNullary
989+ , ParseSum arity (C1 c a) allNullary
990+ , Constructor c
991+ ) => GFromJSON' arity (C1 c a) where
992+ -- The option 'tagSingleConstructors' determines whether to wrap
993+ -- a single-constructor type.
994+ gParseJSON' p@(_ :* opts :* _)
995+ | tagSingleConstructors opts
996+ = (unTagged :: Tagged allNullary (Parser (C1 c a p)) -> Parser (C1 c a p))
997+ . parseSum p
998+ | otherwise = fmap M1 . consParseJSON (cname :* p)
999+ where
1000+ cname = conName (undefined :: M1 _i c _f _p)
1001+
1002+-- | Multiple constructors.
1003+instance ( AllNullary (a :+: b) allNullary
1004+ , ParseSum arity (a :+: b) allNullary
1005+ ) => GFromJSON' arity (a :+: b) where
1006+ -- If all constructors of a sum datatype are nullary and the
1007+ -- 'allNullaryToStringTag' option is set they are expected to be
1008+ -- encoded as strings. This distinction is made by 'parseSum':
1009+ gParseJSON' p =
1010+ (unTagged :: Tagged allNullary (Parser ((a :+: b) _d)) ->
1011+ Parser ((a :+: b) _d))
1012+ . parseSum p
825
1013
826--------------------------------------------------------------------------------
1014--------------------------------------------------------------------------------
827
1015
828class ParseSum arity f allNullary where
1016class ParseSum arity f allNullary where
829− parseSum :: Options -> FromArgs arity a
1017+ parseSum :: TypeName :* Options :* FromArgs arity a
1018+ -> Value
830− -> Value -> Tagged allNullary (Parser (f a))
1019+ -> Tagged allNullary (Parser (f a))
831−
1020+
1021+instance ( ConstructorNames f
832−instance ( SumFromString (a :+: b)
1022+ , SumFromString f
833− , FromPair arity (a :+: b)
1023+ , FromPair arity f
834− , FromTaggedObject arity (a :+: b)
1024+ , FromTaggedObject arity f
835− , FromUntaggedValue arity (a :+: b)
1025+ , FromUntaggedValue arity f
836− ) => ParseSum arity (a :+: b) True where
1026+ ) => ParseSum arity f True where
837− parseSum opts fargs
1027+ parseSum p@(tname :* opts :* _)
838− | allNullaryToStringTag opts = Tagged . parseAllNullarySum opts
1028+ | allNullaryToStringTag opts = Tagged . parseAllNullarySum tname opts
839− | otherwise = Tagged . parseNonAllNullarySum opts fargs
1029+ | otherwise = Tagged . parseNonAllNullarySum p
840−
1030+
1031+instance ( ConstructorNames f
841−instance ( FromPair arity (a :+: b)
1032+ , FromPair arity f
842− , FromTaggedObject arity (a :+: b)
1033+ , FromTaggedObject arity f
843− , FromUntaggedValue arity (a :+: b)
1034+ , FromUntaggedValue arity f
844− ) => ParseSum arity (a :+: b) False where
1035+ ) => ParseSum arity f False where
845− parseSum opts fargs = Tagged . parseNonAllNullarySum opts fargs
1036+ parseSum p = Tagged . parseNonAllNullarySum p
846
1037
847--------------------------------------------------------------------------------
1038--------------------------------------------------------------------------------
848
1039
849−parseAllNullarySum :: SumFromString f => Options -> Value -> Parser (f a)
1040+parseAllNullarySum :: (SumFromString f, ConstructorNames f)
1041+ => TypeName -> Options -> Value -> Parser (f a)
850−parseAllNullarySum opts = withText "Text" $ \key ->
1042+parseAllNullarySum tname opts =
1043+ withText tname $ \tag ->
851− maybe (notFound key) return $
1044+ maybe (badTag tag) return $
852− parseSumFromString opts key
1045+ parseSumFromString modifier tag
1046+ where
1047+ badTag tag = failWithCTags tname modifier $ \cnames ->
1048+ "expected one of the tags " ++ show cnames ++
1049+ ", but found tag " ++ show tag
1050+ modifier = constructorTagModifier opts
1051+
1052+-- | Fail with an informative error message about a mismatched tag.
1053+-- The error message is parameterized by the list of expected tags,
1054+-- to be inferred from the result type of the parser.
1055+failWithCTags
1056+ :: forall f a t. ConstructorNames f
1057+ => TypeName -> (String -> t) -> ([t] -> String) -> Parser (f a)
1058+failWithCTags tname modifier f =
1059+ contextType tname . fail $ f cnames
1060+ where
1061+ cnames = unTagged2 (constructorTags modifier :: Tagged2 f [t])
853
1062
854class SumFromString f where
1063class SumFromString f where
855− parseSumFromString :: Options -> Text -> Maybe (f a)
1064+ parseSumFromString :: (String -> String) -> Text -> Maybe (f a)
856
1065
857instance (SumFromString a, SumFromString b) => SumFromString (a :+: b) where
1066instance (SumFromString a, SumFromString b) => SumFromString (a :+: b) where
858 parseSumFromString opts key = (L1 <$> parseSumFromString opts key) <|>
1067 parseSumFromString opts key = (L1 <$> parseSumFromString opts key) <|>
859 (R1 <$> parseSumFromString opts key)
1068 (R1 <$> parseSumFromString opts key)
860
1069
861instance (Constructor c) => SumFromString (C1 c U1) where
1070instance (Constructor c) => SumFromString (C1 c U1) where
862− parseSumFromString opts key | key == name = Just $ M1 U1
1071+ parseSumFromString modifier key
1072+ | key == name = Just $ M1 U1
863− | otherwise = Nothing
1073+ | otherwise = Nothing
864− where
1074+ where
865− name = pack $ constructorTagModifier opts $
866− conName (undefined :: t c U1 p)
1075+ name = pack $ modifier $ conName (undefined :: M1 _i c _f _p)
867
1076
868−--------------------------------------------------------------------------------
1077+-- For genericFromJSONKey
1078+instance SumFromString a => SumFromString (D1 d a) where
1079+ parseSumFromString modifier key = M1 <$> parseSumFromString modifier key
869
1080
1081+-- | List of all constructor tags.
1082+constructorTags :: ConstructorNames a => (String -> t) -> Tagged2 a [t]
1083+constructorTags modifier =
1084+ fmap DList.toList (constructorNames' modifier)
1085+
1086+-- | List of all constructor names of an ADT, after a given conversion
1087+-- function. (Better inlining.)
1088+class ConstructorNames a where
1089+ constructorNames' :: (String -> t) -> Tagged2 a (DList.DList t)
1090+
1091+instance (ConstructorNames a, ConstructorNames b) => ConstructorNames (a :+: b) where
1092+ constructorNames' = liftA2 append constructorNames' constructorNames'
1093+ where
1094+ append
1095+ :: Tagged2 a (DList.DList t)
1096+ -> Tagged2 b (DList.DList t)
1097+ -> Tagged2 (a :+: b) (DList.DList t)
1098+ append (Tagged2 xs) (Tagged2 ys) = Tagged2 (DList.append xs ys)
1099+
1100+instance Constructor c => ConstructorNames (C1 c a) where
1101+ constructorNames' f = Tagged2 (pure (f cname))
1102+ where
1103+ cname = conName (undefined :: M1 _i c _f _p)
1104+
1105+-- For genericFromJSONKey
1106+instance ConstructorNames a => ConstructorNames (D1 d a) where
1107+ constructorNames' = retag . constructorNames'
1108+ where
1109+ retag :: Tagged2 a u -> Tagged2 (D1 d a) u
1110+ retag (Tagged2 x) = Tagged2 x
1111+
1112+--------------------------------------------------------------------------------
870−parseNonAllNullarySum :: ( FromPair arity (a :+: b)
1113+parseNonAllNullarySum :: forall f c arity.
1114+ ( FromPair arity f
871− , FromTaggedObject arity (a :+: b)
1115+ , FromTaggedObject arity f
872− , FromUntaggedValue arity (a :+: b)
1116+ , FromUntaggedValue arity f
1117+ , ConstructorNames f
873− ) => Options -> FromArgs arity c
1118+ ) => TypeName :* Options :* FromArgs arity c
874− -> Value -> Parser ((a :+: b) c)
1119+ -> Value -> Parser (f c)
875−parseNonAllNullarySum opts fargs =
1120+parseNonAllNullarySum p@(tname :* opts :* _) =
876 case sumEncoding opts of
1121 case sumEncoding opts of
877 TaggedObject{..} ->
1122 TaggedObject{..} ->
878− withObject "Object" $ \obj -> do
1123+ withObject tname $ \obj -> do
879− tag <- obj .: pack tagFieldName
1124+ tag <- contextType tname . contextTag tagKey cnames_ $ obj .: tagKey
880− fromMaybe (notFound tag) $
1125+ fromMaybe (badTag tag <?> Key tagKey) $
881− parseFromTaggedObject opts fargs contentsFieldName obj tag
1126+ parseFromTaggedObject (tag :* contentsFieldName :* p) obj
1127+ where
1128+ tagKey = pack tagFieldName
1129+ badTag tag = failWith_ $ \cnames ->
1130+ "expected tag field to be one of " ++ show cnames ++
1131+ ", but found tag " ++ show tag
1132+ cnames_ = unTagged2 (constructorTags (constructorTagModifier opts) :: Tagged2 f [String])
882
1133
883 ObjectWithSingleField ->
1134 ObjectWithSingleField ->
884− withObject "Object" $ \obj ->
885− case H.toList obj of
1135+ withObject tname $ \obj -> case H.toList obj of
886− [pair@(tag, _)] -> fromMaybe (notFound tag) $
1136+ [(tag, v)] -> maybe (badTag tag) (<?> Key tag) $
887− parsePair opts fargs pair
1137+ parsePair (tag :* p) v
888− _ -> fail "Object doesn't have a single field"
1138+ _ -> contextType tname . fail $
1139+ "expected an Object with a single pair, but found " ++
1140+ show (H.size obj) ++ " pairs"
1141+ where
1142+ badTag tag = failWith_ $ \cnames ->
1143+ "expected an Object with a single pair where the tag is one of " ++
1144+ show cnames ++ ", but found tag " ++ show tag
889
1145
890 TwoElemArray ->
1146 TwoElemArray ->
891− withArray "Array" $ \arr ->
1147+ withArray tname $ \arr -> case V.length arr of
892− if V.length arr == 2
1148+ 2 | String tag <- V.unsafeIndex arr 0 ->
893− then case V.unsafeIndex arr 0 of
1149+ maybe (badTag tag <?> Index 0) (<?> Index 1) $
894− String tag -> fromMaybe (notFound tag) $
895− parsePair opts fargs (tag, V.unsafeIndex arr 1)
1150+ parsePair (tag :* p) (V.unsafeIndex arr 1)
1151+ | otherwise ->
1152+ contextType tname $
896− _ -> fail "First element is not a String"
1153+ fail "tag element is not a String" <?> Index 0
897− else fail "Array doesn't have 2 elements"
1154+ len -> contextType tname . fail $
1155+ "expected a 2-element Array, but encountered an Array of length " ++
1156+ show len
1157+ where
1158+ badTag tag = failWith_ $ \cnames ->
1159+ "expected tag of the 2-element Array to be one of " ++
1160+ show cnames ++ ", but found tag " ++ show tag
898
1161
899− UntaggedValue -> parseUntaggedValue opts fargs
1162+ UntaggedValue -> parseUntaggedValue p
1163+ where
1164+ failWith_ = failWithCTags tname (constructorTagModifier opts)
900
1165
901--------------------------------------------------------------------------------
1166--------------------------------------------------------------------------------
902
1167
903class FromTaggedObject arity f where
1168class FromTaggedObject arity f where
1169+ -- The first two components of the parameter tuple are: the constructor tag
1170+ -- to match against, and the contents field name.
904− parseFromTaggedObject :: Options -> FromArgs arity a
1171+ parseFromTaggedObject
1172+ :: Text :* String :* TypeName :* Options :* FromArgs arity a
905− -> String -> Object
1173+ -> Object
906− -> Text -> Maybe (Parser (f a))
1174+ -> Maybe (Parser (f a))
907
1175
908instance ( FromTaggedObject arity a, FromTaggedObject arity b) =>
1176instance ( FromTaggedObject arity a, FromTaggedObject arity b) =>
909 FromTaggedObject arity (a :+: b) where
1177 FromTaggedObject arity (a :+: b) where
910− parseFromTaggedObject opts fargs contentsFieldName obj tag =
1178+ parseFromTaggedObject p obj =
911− (fmap L1 <$> parseFromTaggedObject opts fargs contentsFieldName obj tag) <|>
1179+ (fmap L1 <$> parseFromTaggedObject p obj) <|>
912− (fmap R1 <$> parseFromTaggedObject opts fargs contentsFieldName obj tag)
1180+ (fmap R1 <$> parseFromTaggedObject p obj)
913
1181
1182+instance ( IsRecord f isRecord
914−instance ( FromTaggedObject' arity f
1183+ , FromTaggedObject' arity f isRecord
915 , Constructor c
1184 , Constructor c
916 ) => FromTaggedObject arity (C1 c f) where
1185 ) => FromTaggedObject arity (C1 c f) where
917− parseFromTaggedObject opts fargs contentsFieldName obj tag
1186+ parseFromTaggedObject (tag :* contentsFieldName :* p@(_ :* opts :* _))
1187+ | tag == tag'
1188+ = Just . fmap M1 .
1189+ (unTagged :: Tagged isRecord (Parser (f a)) -> Parser (f a)) .
918− | tag == name = Just $ M1 <$> parseFromTaggedObject'
1190+ parseFromTaggedObject' (contentsFieldName :* cname :* p)
919− opts fargs contentsFieldName obj
920− | otherwise = Nothing
1191+ | otherwise = const Nothing
921− where
1192+ where
922− name = pack $ constructorTagModifier opts $
1193+ tag' = pack $ constructorTagModifier opts cname
923− conName (undefined :: t c f p)
1194+ cname = conName (undefined :: M1 _i c _f _p)
924
1195
925--------------------------------------------------------------------------------
1196--------------------------------------------------------------------------------
926
1197
927−class FromTaggedObject' arity f where
1198+class FromTaggedObject' arity f isRecord where
928− parseFromTaggedObject' :: Options -> FromArgs arity a -> String
1199+ -- The first component of the parameter tuple is the contents field name.
929− -> Object -> Parser (f a)
1200+ parseFromTaggedObject'
930−
931−class FromTaggedObject'' arity f isRecord where
932− parseFromTaggedObject'' :: Options -> FromArgs arity a -> String
1201+ :: String :* ConName :* TypeName :* Options :* FromArgs arity a
933− -> Object -> Tagged isRecord (Parser (f a))
1202+ -> Object -> Tagged isRecord (Parser (f a))
934−
1203+
935−instance ( IsRecord f isRecord
936− , FromTaggedObject'' arity f isRecord
937− ) => FromTaggedObject' arity f where
1204+instance (RecordFromJSON arity f, FieldNames f) => FromTaggedObject' arity f True where
938− parseFromTaggedObject' opts fargs contentsFieldName =
1205+ -- Records are unpacked in the tagged object
939− (unTagged :: Tagged isRecord (Parser (f a)) -> Parser (f a)) .
940− parseFromTaggedObject'' opts fargs contentsFieldName
1206+ parseFromTaggedObject' (_ :* p) = Tagged . recordParseJSON (True :* p)
941−
1207+
942−instance (FromRecord arity f) => FromTaggedObject'' arity f True where
943− parseFromTaggedObject'' opts fargs _ =
944− Tagged . parseRecord opts fargs Nothing
945−
946−instance (GFromJSON arity f) => FromTaggedObject'' arity f False where
1208+instance (ConsFromJSON arity f) => FromTaggedObject' arity f False where
1209+ -- Nonnullary nonrecords are encoded in the contents field
947− parseFromTaggedObject'' opts fargs contentsFieldName = Tagged .
1210+ parseFromTaggedObject' p obj = Tagged $ do
1211+ contents <- contextCons cname tname (obj .: key)
1212+ consParseJSON p' contents <?> Key key
1213+ where
948− (gParseJSON opts fargs <=< (.: pack contentsFieldName))
1214+ key = pack contentsFieldName
1215+ contentsFieldName :* p'@(cname :* tname :* _) = p
949
1216
950−instance OVERLAPPING_ FromTaggedObject'' arity U1 False where
1217+instance OVERLAPPING_ FromTaggedObject' arity U1 False where
1218+ -- Nullary constructors don't need a contents field
951− parseFromTaggedObject'' _ _ _ _ = Tagged (pure U1)
1219+ parseFromTaggedObject' _ _ = Tagged (pure U1)
952
1220
953--------------------------------------------------------------------------------
1221--------------------------------------------------------------------------------
954
1222
1223+-- | Constructors need to be decoded differently depending on whether they're
1224+-- a record or not. This distinction is made by 'ConsParseJSON'.
955class ConsFromJSON arity f where
1225class ConsFromJSON arity f where
1226+ consParseJSON
956− consParseJSON :: Options -> FromArgs arity a
1227+ :: ConName :* TypeName :* Options :* FromArgs arity a
957− -> Value -> Parser (f a)
1228+ -> Value -> Parser (f a)
958
1229
959class ConsFromJSON' arity f isRecord where
1230class ConsFromJSON' arity f isRecord where
1231+ consParseJSON'
960− consParseJSON' :: Options -> FromArgs arity a
1232+ :: ConName :* TypeName :* Options :* FromArgs arity a
961− -> Maybe Text -- ^ A dummy label
962− -- (Nothing to use proper label)
963− -> Value -> Tagged isRecord (Parser (f a))
1233+ -> Value -> Tagged isRecord (Parser (f a))
964
1234
965instance ( IsRecord f isRecord
1235instance ( IsRecord f isRecord
966 , ConsFromJSON' arity f isRecord
1236 , ConsFromJSON' arity f isRecord
967 ) => ConsFromJSON arity f where
1237 ) => ConsFromJSON arity f where
968− consParseJSON opts fargs v = let
1238+ consParseJSON p =
1239+ (unTagged :: Tagged isRecord (Parser (f a)) -> Parser (f a))
1240+ . consParseJSON' p
1241+
1242+instance OVERLAPPING_
1243+ ( GFromJSON arity a, RecordFromJSON arity (S1 s a)
1244+ ) => ConsFromJSON' arity (S1 s a) True where
1245+ consParseJSON' p@(cname :* tname :* opts :* fargs)
969− (v2,lab) = case (unwrapUnaryRecords opts,isUnary (undefined :: f a)) of
1246+ | unwrapUnaryRecords opts = Tagged . fmap M1 . gParseJSON opts fargs
970− -- use a dummy object with a dummy label
1247+ | otherwise = Tagged . withObject (showCons cname tname) (recordParseJSON (False :* p))
971− (True,True) -> (object [(pack "dummy",v)], Just $ pack "dummy")
1248+
972− _ ->(v,Nothing)
1249+instance RecordFromJSON arity f => ConsFromJSON' arity f True where
973− in (unTagged :: Tagged isRecord (Parser (f a)) -> Parser (f a))
1250+ consParseJSON' p@(cname :* tname :* _) =
974− $ consParseJSON' opts fargs lab v2
1251+ Tagged . withObject (showCons cname tname) (recordParseJSON (False :* p))
975
1252
1253+instance OVERLAPPING_
1254+ ConsFromJSON' arity U1 False where
1255+ -- Empty constructors are expected to be encoded as an empty array:
1256+ consParseJSON' (cname :* tname :* _) v =
1257+ Tagged . contextCons cname tname $ case v of
1258+ Array a | V.null a -> pure U1
1259+ | otherwise -> fail_ a
1260+ _ -> typeMismatch "Array" v
1261+ where
1262+ fail_ a = fail $
1263+ "expected an empty Array, but encountered an Array of length " ++
1264+ show (V.length a)
976
1265
1266+instance OVERLAPPING_
977−instance (FromRecord arity f) => ConsFromJSON' arity f True where
1267+ GFromJSON arity f => ConsFromJSON' arity (S1 s f) False where
978− consParseJSON' opts fargs mlab = Tagged . withObject "record (:*:)"
1268+ consParseJSON' (_ :* _ :* opts :* fargs) =
979− (parseRecord opts fargs mlab)
1269+ Tagged . fmap M1 . gParseJSON opts fargs
980
1270
1271+instance (ProductFromJSON arity f, ProductSize f
981−instance (GFromJSON arity f) => ConsFromJSON' arity f False where
1272+ ) => ConsFromJSON' arity f False where
982− consParseJSON' opts fargs _ = Tagged . gParseJSON opts fargs
1273+ consParseJSON' p = Tagged . productParseJSON0 p
983
1274
984--------------------------------------------------------------------------------
1275--------------------------------------------------------------------------------
985
1276
986−class FromRecord arity f where
1277+class FieldNames f where
987− parseRecord :: Options -> FromArgs arity a
1278+ fieldNames :: f a -> [Text] -> [Text]
988− -> Maybe Text -- ^ A dummy label
989− -- (Nothing to use proper label)
990− -> Object -> Parser (f a)
991
1279
992−instance ( FromRecord arity a
1280+instance (FieldNames a, FieldNames b) => FieldNames (a :*: b) where
993− , FromRecord arity b
1281+ fieldNames _ =
994− ) => FromRecord arity (a :*: b) where
1282+ fieldNames (undefined :: a x) .
995− parseRecord opts fargs _ obj =
1283+ fieldNames (undefined :: b y)
996− (:*:) <$> parseRecord opts fargs Nothing obj
997− <*> parseRecord opts fargs Nothing obj
998
1284
999−instance OVERLAPPABLE_ (Selector s, GFromJSON arity a) =>
1285+instance (Selector s) => FieldNames (S1 s f) where
1000− FromRecord arity (S1 s a) where
1286+ fieldNames _ = (pack (selName (undefined :: M1 _i s _f _p)) :)
1001− parseRecord opts fargs lab =
1287+
1002− (<?> Key label) . gParseJSON opts fargs <=< (.: label)
1288+class RecordFromJSON arity f where
1289+ recordParseJSON
1290+ :: Bool :* ConName :* TypeName :* Options :* FromArgs arity a
1291+ -> Object -> Parser (f a)
1292+
1293+instance ( FieldNames f
1294+ , RecordFromJSON' arity f
1295+ ) => RecordFromJSON arity f where
1296+ recordParseJSON (fromTaggedSum :* p@(cname :* tname :* opts :* _)) =
1297+ \obj -> checkUnknown obj >> recordParseJSON' p obj
1003 where
1298 where
1004− label = fromMaybe defLabel lab
1299+ knownFields :: H.HashMap Text ()
1300+ knownFields = H.fromList $ map (,()) $
1301+ fieldNames (undefined :: f a)
1302+ [pack (tagFieldName (sumEncoding opts)) | fromTaggedSum]
1303+ checkUnknown =
1304+ if not (rejectUnknownFields opts)
1305+ then \_ -> return ()
1306+ else \obj -> case H.keys (H.difference obj knownFields) of
1307+ [] -> return ()
1308+ unknownFields -> contextCons cname tname $
1309+ fail ("unknown fields: " ++ show unknownFields)
1310+
1311+class RecordFromJSON' arity f where
1312+ recordParseJSON'
1313+ :: ConName :* TypeName :* Options :* FromArgs arity a
1314+ -> Object -> Parser (f a)
1315+
1316+instance ( RecordFromJSON' arity a
1317+ , RecordFromJSON' arity b
1318+ ) => RecordFromJSON' arity (a :*: b) where
1319+ recordParseJSON' p obj =
1320+ (:*:) <$> recordParseJSON' p obj
1321+ <*> recordParseJSON' p obj
1322+
1323+instance OVERLAPPABLE_ (Selector s, GFromJSON arity a) =>
1324+ RecordFromJSON' arity (S1 s a) where
1325+ recordParseJSON' (cname :* tname :* opts :* fargs) obj = do
1326+ fv <- contextCons cname tname (obj .: label)
1327+ M1 <$> gParseJSON opts fargs fv <?> Key label
1328+ where
1005− defLabel = pack . fieldLabelModifier opts $
1329+ label = pack $ fieldLabelModifier opts sname
1006− selName (undefined :: t s a p)
1330+ sname = selName (undefined :: M1 _i s _f _p)
1007
1331
1008instance INCOHERENT_ (Selector s, FromJSON a) =>
1332instance INCOHERENT_ (Selector s, FromJSON a) =>
1009− FromRecord arity (S1 s (K1 i (Maybe a))) where
1333+ RecordFromJSON' arity (S1 s (K1 i (Maybe a))) where
1010− parseRecord _ _ (Just lab) obj = (M1 . K1) <$> obj .:? lab
1334+ recordParseJSON' (_ :* _ :* opts :* _) obj = M1 . K1 <$> obj .:? pack label
1011− parseRecord opts _ Nothing obj = (M1 . K1) <$> obj .:? pack label
1012− where
1335+ where
1013− label = fieldLabelModifier opts $
1336+ label = fieldLabelModifier opts sname
1014− selName (undefined :: t s (K1 i (Maybe a)) p)
1337+ sname = selName (undefined :: M1 _i s _f _p)
1338+
1339+-- Parse an Option like a Maybe.
1340+instance INCOHERENT_ (Selector s, FromJSON a) =>
1341+ RecordFromJSON' arity (S1 s (K1 i (Semigroup.Option a))) where
1342+ recordParseJSON' p obj = wrap <$> recordParseJSON' p obj
1343+ where
1344+ wrap :: S1 s (K1 i (Maybe a)) p -> S1 s (K1 i (Semigroup.Option a)) p
1345+ wrap (M1 (K1 a)) = M1 (K1 (Semigroup.Option a))
1015
1346
1016--------------------------------------------------------------------------------
1347--------------------------------------------------------------------------------
1017
1348
1349+productParseJSON0
1350+ :: forall f arity a. (ProductFromJSON arity f, ProductSize f)
1351+ => ConName :* TypeName :* Options :* FromArgs arity a
1352+ -> Value -> Parser (f a)
1353+ -- Products are expected to be encoded to an array. Here we check whether we
1354+ -- got an array of the same size as the product, then parse each of the
1355+ -- product's elements using productParseJSON:
1356+productParseJSON0 p@(cname :* tname :* _ :* _) =
1357+ withArray (showCons cname tname) $ \arr ->
1358+ let lenArray = V.length arr
1359+ lenProduct = (unTagged2 :: Tagged2 f Int -> Int)
1360+ productSize in
1361+ if lenArray == lenProduct
1362+ then productParseJSON p arr 0 lenProduct
1363+ else contextCons cname tname $
1364+ fail $ "expected an Array of length " ++ show lenProduct ++
1365+ ", but encountered an Array of length " ++ show lenArray
1366+
1367+--
1368+
1018−class FromProduct arity f where
1369+class ProductFromJSON arity f where
1019− parseProduct :: Options -> FromArgs arity a
1370+ productParseJSON :: ConName :* TypeName :* Options :* FromArgs arity a
1020 -> Array -> Int -> Int
1371 -> Array -> Int -> Int
1021 -> Parser (f a)
1372 -> Parser (f a)
1022
1373
1023−instance ( FromProduct arity a
1374+instance ( ProductFromJSON arity a
1024− , FromProduct arity b
1375+ , ProductFromJSON arity b
1025− ) => FromProduct arity (a :*: b) where
1376+ ) => ProductFromJSON arity (a :*: b) where
1026− parseProduct opts fargs arr ix len =
1377+ productParseJSON p arr ix len =
1027− (:*:) <$> parseProduct opts fargs arr ix lenL
1378+ (:*:) <$> productParseJSON p arr ix lenL
1028− <*> parseProduct opts fargs arr ixR lenR
1379+ <*> productParseJSON p arr ixR lenR
1029 where
1380 where
1030 lenL = len `unsafeShiftR` 1
1381 lenL = len `unsafeShiftR` 1
1031 ixR = ix + lenL
1382 ixR = ix + lenL
1032 lenR = len - lenL
1383 lenR = len - lenL
1033
1384
1034−instance (GFromJSON arity a) => FromProduct arity (S1 s a) where
1385+instance (GFromJSON arity a) => ProductFromJSON arity (S1 s a) where
1035− parseProduct opts fargs arr ix _ =
1386+ productParseJSON (_ :* _ :* opts :* fargs) arr ix _ =
1036− gParseJSON opts fargs $ V.unsafeIndex arr ix
1387+ M1 <$> gParseJSON opts fargs (V.unsafeIndex arr ix) <?> Index ix
1037
1388
1038--------------------------------------------------------------------------------
1389--------------------------------------------------------------------------------
1039
1390
1040class FromPair arity f where
1391class FromPair arity f where
1392+ -- The first component of the parameter tuple is the tag to match.
1041− parsePair :: Options -> FromArgs arity a
1393+ parsePair :: Text :* TypeName :* Options :* FromArgs arity a
1394+ -> Value
1042− -> Pair -> Maybe (Parser (f a))
1395+ -> Maybe (Parser (f a))
1043
1396
1044instance ( FromPair arity a
1397instance ( FromPair arity a
1045 , FromPair arity b
1398 , FromPair arity b
1046 ) => FromPair arity (a :+: b) where
1399 ) => FromPair arity (a :+: b) where
1400+ parsePair p pair =
1047− parsePair opts fargs pair = (fmap L1 <$> parsePair opts fargs pair) <|>
1401+ (fmap L1 <$> parsePair p pair) <|>
1048− (fmap R1 <$> parsePair opts fargs pair)
1402+ (fmap R1 <$> parsePair p pair)
1049
1403
1050instance ( Constructor c
1404instance ( Constructor c
1051− , GFromJSON arity a
1052 , ConsFromJSON arity a
1405 , ConsFromJSON arity a
1053 ) => FromPair arity (C1 c a) where
1406 ) => FromPair arity (C1 c a) where
1054− parsePair opts fargs (tag, value)
1407+ parsePair (tag :* p@(_ :* opts :* _)) v
1055− | tag == tag' = Just $ gParseJSON opts fargs value
1408+ | tag == tag' = Just $ M1 <$> consParseJSON (cname :* p) v
1056 | otherwise = Nothing
1409 | otherwise = Nothing
1057− where
1410+ where
1058− tag' = pack $ constructorTagModifier opts $
1411+ tag' = pack $ constructorTagModifier opts cname
1059− conName (undefined :: t c a p)
1412+ cname = conName (undefined :: M1 _i c _a _p)
1060
1413
1061--------------------------------------------------------------------------------
1414--------------------------------------------------------------------------------
1062
1415
1063class FromUntaggedValue arity f where
1416class FromUntaggedValue arity f where
1064− parseUntaggedValue :: Options -> FromArgs arity a
1417+ parseUntaggedValue :: TypeName :* Options :* FromArgs arity a
1418+ -> Value
1065− -> Value -> Parser (f a)
1419+ -> Parser (f a)
1066
1420
1067instance
1421instance
1068 ( FromUntaggedValue arity a
1422 ( FromUntaggedValue arity a
1069 , FromUntaggedValue arity b
1423 , FromUntaggedValue arity b
1070 ) => FromUntaggedValue arity (a :+: b)
1424 ) => FromUntaggedValue arity (a :+: b)
1071 where
1425 where
1072− parseUntaggedValue opts fargs value =
1426+ parseUntaggedValue p value =
1073− L1 <$> parseUntaggedValue opts fargs value <|>
1427+ L1 <$> parseUntaggedValue p value <|>
1074− R1 <$> parseUntaggedValue opts fargs value
1428+ R1 <$> parseUntaggedValue p value
1075
1429
1076instance OVERLAPPABLE_
1430instance OVERLAPPABLE_
1077− ( GFromJSON arity a
1431+ ( ConsFromJSON arity a
1078− , ConsFromJSON arity a
1432+ , Constructor c
1079 ) => FromUntaggedValue arity (C1 c a)
1433 ) => FromUntaggedValue arity (C1 c a)
1080 where
1434 where
1081− parseUntaggedValue = gParseJSON
1435+ parseUntaggedValue p = fmap M1 . consParseJSON (cname :* p)
1436+ where
1437+ cname = conName (undefined :: M1 _i c _f _p)
1082
1438
1083instance OVERLAPPING_
1439instance OVERLAPPING_
1084 ( Constructor c )
1440 ( Constructor c )
1085 => FromUntaggedValue arity (C1 c U1)
1441 => FromUntaggedValue arity (C1 c U1)
1086 where
1442 where
1087− parseUntaggedValue opts _ (String s)
1443+ parseUntaggedValue (tname :* opts :* _) v =
1088− | s == pack (constructorTagModifier opts (conName (undefined :: t c U1 p))) =
1444+ contextCons cname tname $ case v of
1445+ String tag
1089− pure $ M1 U1
1446+ | tag == tag' -> pure $ M1 U1
1090− | otherwise =
1447+ | otherwise -> fail_ tag
1091− fail $ "Invalid tag: " ++ unpack s
1448+ _ -> typeMismatch "String" v
1092− parseUntaggedValue _ _ v = typeMismatch (conName (undefined :: t c U1 p)) v
1449+ where
1093−
1450+ tag' = pack $ constructorTagModifier opts cname
1094−
1451+ cname = conName (undefined :: M1 _i c _f _p)
1095−--------------------------------------------------------------------------------
1452+ fail_ tag = fail $
1096−
1453+ "expected tag " ++ show tag' ++ ", but found tag " ++ show tag
1097−notFound :: Text -> Parser a
1098−notFound key = fail $ "The key \"" ++ unpack key ++ "\" was not found"
1099−{-# INLINE notFound #-}
1100
1454
1101-------------------------------------------------------------------------------
1455-------------------------------------------------------------------------------
1102-- Instances
1456-- Instances
@@ -1154,17 +1508,20 @@ instance (FromJSON a, FromJSON b) => FromJSON (Either a b) where
1154 parseJSON = parseJSON2
1508 parseJSON = parseJSON2
1155 {-# INLINE parseJSON #-}
1509 {-# INLINE parseJSON #-}
1156
1510
1157−
1511+instance FromJSON Void where
1512+ parseJSON _ = fail "Cannot parse Void"
1513+ {-# INLINE parseJSON #-}
1158
1514
1159instance FromJSON Bool where
1515instance FromJSON Bool where
1160− parseJSON = withBool "Bool" pure
1516+ parseJSON (Bool b) = pure b
1517+ parseJSON v = typeMismatch "Bool" v
1161 {-# INLINE parseJSON #-}
1518 {-# INLINE parseJSON #-}
1162
1519
1163instance FromJSONKey Bool where
1520instance FromJSONKey Bool where
1164 fromJSONKey = FromJSONKeyTextParser $ \t -> case t of
1521 fromJSONKey = FromJSONKeyTextParser $ \t -> case t of
1165 "true" -> pure True
1522 "true" -> pure True
1166 "false" -> pure False
1523 "false" -> pure False
1167− _ -> fail $ "Cannot parse key into Bool: " ++ T.unpack t
1524+ _ -> fail $ "cannot parse key " ++ show t ++ " into Bool"
1168
1525
1169instance FromJSON Ordering where
1526instance FromJSON Ordering where
1170 parseJSON = withText "Ordering" $ \s ->
1527 parseJSON = withText "Ordering" $ \s ->
@@ -1172,25 +1529,30 @@ instance FromJSON Ordering where
1172 "LT" -> return LT
1529 "LT" -> return LT
1173 "EQ" -> return EQ
1530 "EQ" -> return EQ
1174 "GT" -> return GT
1531 "GT" -> return GT
1532+ _ -> fail $ "parsing Ordering failed, unexpected " ++ show s ++
1175− _ -> fail "Parsing Ordering value failed: expected \"LT\", \"EQ\", or \"GT\""
1533+ " (expected \"LT\", \"EQ\", or \"GT\")"
1176
1534
1177instance FromJSON () where
1535instance FromJSON () where
1178 parseJSON = withArray "()" $ \v ->
1536 parseJSON = withArray "()" $ \v ->
1179 if V.null v
1537 if V.null v
1180 then pure ()
1538 then pure ()
1181− else fail "Expected an empty array"
1539+ else prependContext "()" $ fail "expected an empty array"
1182 {-# INLINE parseJSON #-}
1540 {-# INLINE parseJSON #-}
1183
1541
1184instance FromJSON Char where
1542instance FromJSON Char where
1185− parseJSON = withText "Char" $ \t ->
1543+ parseJSON = withText "Char" parseChar
1186− if T.compareLength t 1 == EQ
1187− then pure $ T.head t
1188− else fail "Expected a string of length 1"
1189 {-# INLINE parseJSON #-}
1544 {-# INLINE parseJSON #-}
1190
1545
1191− parseJSONList = withText "String" $ pure . T.unpack
1546+ parseJSONList (String s) = pure (T.unpack s)
1547+ parseJSONList v = typeMismatch "String" v
1192 {-# INLINE parseJSONList #-}
1548 {-# INLINE parseJSONList #-}
1193
1549
1550+parseChar :: Text -> Parser Char
1551+parseChar t =
1552+ if T.compareLength t 1 == EQ
1553+ then pure $ T.head t
1554+ else prependContext "Char" $ fail "expected a string of length 1"
1555+
1194instance FromJSON Double where
1556instance FromJSON Double where
1195 parseJSON = parseRealFloat "Double"
1557 parseJSON = parseRealFloat "Double"
1196 {-# INLINE parseJSON #-}
1558 {-# INLINE parseJSON #-}
@@ -1202,12 +1564,6 @@ instance FromJSONKey Double where
1202 "-Infinity" -> pure (negate 1/0)
1564 "-Infinity" -> pure (negate 1/0)
1203 _ -> Scientific.toRealFloat <$> parseScientificText t
1565 _ -> Scientific.toRealFloat <$> parseScientificText t
1204
1566
1205−instance FromJSON Number where
1206− parseJSON (Number s) = pure $ scientificToNumber s
1207− parseJSON Null = pure (D (0/0))
1208− parseJSON v = typeMismatch "Number" v
1209− {-# INLINE parseJSON #-}
1210−
1211instance FromJSON Float where
1567instance FromJSON Float where
1212 parseJSON = parseRealFloat "Float"
1568 parseJSON = parseRealFloat "Float"
1213 {-# INLINE parseJSON #-}
1569 {-# INLINE parseJSON #-}
@@ -1220,17 +1576,30 @@ instance FromJSONKey Float where
1220 _ -> Scientific.toRealFloat <$> parseScientificText t
1576 _ -> Scientific.toRealFloat <$> parseScientificText t
1221
1577
1222instance (FromJSON a, Integral a) => FromJSON (Ratio a) where
1578instance (FromJSON a, Integral a) => FromJSON (Ratio a) where
1579+ parseJSON (Number x)
1580+ | exp10 <= 1024
1581+ , exp10 >= -1024 = return $! realToFrac x
1582+ | otherwise = prependContext "Ratio" $ fail msg
1583+ where
1584+ exp10 = base10Exponent x
1585+ msg = "found a number with exponent " ++ show exp10
1586+ ++ ", but it must not be greater than 1024 or less than -1024"
1587+ parseJSON o = objParser o
1588+ where
1223− parseJSON = withObject "Rational" $ \obj ->
1589+ objParser = withObject "Rational" $ \obj -> do
1224− (%) <$> obj .: "numerator"
1590+ numerator <- obj .: "numerator"
1591+ denominator <- obj .: "denominator"
1592+ if denominator == 0
1593+ then fail "Ratio denominator was 0"
1225− <*> obj .: "denominator"
1594+ else pure $ numerator % denominator
1226− {-# INLINE parseJSON #-}
1595+ {-# INLINE parseJSON #-}
1227−
1596+
1228−-- | /WARNING:/ Only parse fixed-precision numbers from trusted input
1597+-- | This instance includes a bounds check to prevent maliciously
1229−-- since an attacker could easily fill up the memory of the target
1598+-- large inputs to fill up the memory of the target system. You can
1230−-- system by specifying a scientific number with a big exponent like
1599+-- newtype 'Scientific' and provide your own instance using
1231−-- @1e1000000000@.
1600+-- 'withScientific' if you want to allow larger inputs.
1232instance HasResolution a => FromJSON (Fixed a) where
1601instance HasResolution a => FromJSON (Fixed a) where
1233− parseJSON = withScientific "Fixed" $ pure . realToFrac
1602+ parseJSON = prependContext "Fixed" . withBoundedScientific' (pure . realToFrac)
1234 {-# INLINE parseJSON #-}
1603 {-# INLINE parseJSON #-}
1235
1604
1236instance FromJSON Int where
1605instance FromJSON Int where
@@ -1240,10 +1609,10 @@ instance FromJSON Int where
1240instance FromJSONKey Int where
1609instance FromJSONKey Int where
1241 fromJSONKey = FromJSONKeyTextParser $ parseBoundedIntegralText "Int"
1610 fromJSONKey = FromJSONKeyTextParser $ parseBoundedIntegralText "Int"
1242
1611
1243−-- | /WARNING:/ Only parse Integers from trusted input since an
1612+-- | This instance includes a bounds check to prevent maliciously
1244−-- attacker could easily fill up the memory of the target system by
1613+-- large inputs to fill up the memory of the target system. You can
1245−-- specifying a scientific number with a big exponent like
1614+-- newtype 'Scientific' and provide your own instance using
1246−-- @1e1000000000@.
1615+-- 'withScientific' if you want to allow larger inputs.
1247instance FromJSON Integer where
1616instance FromJSON Integer where
1248 parseJSON = parseIntegral "Integer"
1617 parseJSON = parseIntegral "Integer"
1249 {-# INLINE parseJSON #-}
1618 {-# INLINE parseJSON #-}
@@ -1252,16 +1621,21 @@ instance FromJSONKey Integer where
1252 fromJSONKey = FromJSONKeyTextParser $ parseIntegralText "Integer"
1621 fromJSONKey = FromJSONKeyTextParser $ parseIntegralText "Integer"
1253
1622
1254instance FromJSON Natural where
1623instance FromJSON Natural where
1255− parseJSON = withScientific "Natural" $ \s ->
1624+ parseJSON value = do
1256− if Scientific.coefficient s < 0
1625+ integer <- parseIntegral "Natural" value
1257− then fail $ "Expected a Natural number but got the negative number: " <> show s
1626+ parseNatural integer
1258− else pure $ truncate s
1259
1627
1260instance FromJSONKey Natural where
1628instance FromJSONKey Natural where
1261− fromJSONKey = FromJSONKeyTextParser $ \t -> parseScientificText t >>= \s ->
1629+ fromJSONKey = FromJSONKeyTextParser $ \text -> do
1262− if Scientific.coefficient s < 0
1630+ integer <- parseIntegralText "Natural" text
1631+ parseNatural integer
1632+
1633+parseNatural :: Integer -> Parser Natural
1634+parseNatural integer =
1635+ if integer < 0 then
1263− then fail $ "Expected a Natural number but got the negative number: " <> show s
1636+ fail $ "parsing Natural failed, unexpected negative number " <> show integer
1264− else pure $ truncate s
1637+ else
1638+ pure $ fromIntegral integer
1265
1639
1266instance FromJSON Int8 where
1640instance FromJSON Int8 where
1267 parseJSON = parseBoundedIntegral "Int8"
1641 parseJSON = parseBoundedIntegral "Int8"
@@ -1326,6 +1700,9 @@ instance FromJSON Word64 where
1326instance FromJSONKey Word64 where
1700instance FromJSONKey Word64 where
1327 fromJSONKey = FromJSONKeyTextParser $ parseBoundedIntegralText "Word64"
1701 fromJSONKey = FromJSONKeyTextParser $ parseBoundedIntegralText "Word64"
1328
1702
1703+instance FromJSON CTime where
1704+ parseJSON = fmap CTime . parseJSON
1705+ {-# INLINE parseJSON #-}
1329
1706
1330instance FromJSON Text where
1707instance FromJSON Text where
1331 parseJSON = withText "Text" pure
1708 parseJSON = withText "Text" pure
@@ -1355,17 +1732,17 @@ parseVersionText = go . readP_to_S parseVersion . unpack
1355 where
1732 where
1356 go [(v,[])] = return v
1733 go [(v,[])] = return v
1357 go (_ : xs) = go xs
1734 go (_ : xs) = go xs
1358− go _ = fail "could not parse Version"
1735+ go _ = fail "parsing Version failed"
1359
1736
1360-------------------------------------------------------------------------------
1737-------------------------------------------------------------------------------
1361-- semigroups NonEmpty
1738-- semigroups NonEmpty
1362-------------------------------------------------------------------------------
1739-------------------------------------------------------------------------------
1363
1740
1364instance FromJSON1 NonEmpty where
1741instance FromJSON1 NonEmpty where
1365− liftParseJSON p _ = withArray "NonEmpty a" $
1742+ liftParseJSON p _ = withArray "NonEmpty" $
1366 (>>= ne) . Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1743 (>>= ne) . Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1367 where
1744 where
1368− ne [] = fail "Expected a NonEmpty but got an empty list"
1745+ ne [] = fail "parsing NonEmpty failed, unexpected empty list"
1369 ne (x:xs) = pure (x :| xs)
1746 ne (x:xs) = pure (x :| xs)
1370 {-# INLINE liftParseJSON #-}
1747 {-# INLINE liftParseJSON #-}
1371
1748
@@ -1386,7 +1763,7 @@ instance FromJSON Scientific where
1386-------------------------------------------------------------------------------
1763-------------------------------------------------------------------------------
1387
1764
1388instance FromJSON1 DList.DList where
1765instance FromJSON1 DList.DList where
1389− liftParseJSON p _ = withArray "DList a" $
1766+ liftParseJSON p _ = withArray "DList" $
1390 fmap DList.fromList .
1767 fmap DList.fromList .
1391 Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1768 Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1392 {-# INLINE liftParseJSON #-}
1769 {-# INLINE liftParseJSON #-}
@@ -1463,7 +1840,7 @@ instance (FromJSON1 f, FromJSON1 g) => FromJSON1 (Sum f g) where
1463 inr = "InR"
1840 inr = "InR"
1464
1841
1465 liftParseJSON _ _ _ = fail $
1842 liftParseJSON _ _ _ = fail $
1466− "expected an object with a single property " ++
1843+ "parsing Sum failed, expected an object with a single property " ++
1467 "where the property key should be either " ++
1844 "where the property key should be either " ++
1468 "\"InL\" or \"InR\""
1845 "\"InL\" or \"InR\""
1469 {-# INLINE liftParseJSON #-}
1846 {-# INLINE liftParseJSON #-}
@@ -1477,7 +1854,7 @@ instance (FromJSON1 f, FromJSON1 g, FromJSON a) => FromJSON (Sum f g a) where
1477-------------------------------------------------------------------------------
1854-------------------------------------------------------------------------------
1478
1855
1479instance FromJSON1 Seq.Seq where
1856instance FromJSON1 Seq.Seq where
1480− liftParseJSON p _ = withArray "Seq a" $
1857+ liftParseJSON p _ = withArray "Seq" $
1481 fmap Seq.fromList .
1858 fmap Seq.fromList .
1482 Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1859 Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1483 {-# INLINE liftParseJSON #-}
1860 {-# INLINE liftParseJSON #-}
@@ -1511,15 +1888,15 @@ instance FromJSON a => FromJSON (IntMap.IntMap a) where
1511
1888
1512instance (FromJSONKey k, Ord k) => FromJSON1 (M.Map k) where
1889instance (FromJSONKey k, Ord k) => FromJSON1 (M.Map k) where
1513 liftParseJSON p _ = case fromJSONKey of
1890 liftParseJSON p _ = case fromJSONKey of
1514− FromJSONKeyCoerce _-> withObject "Map k v" $
1891+ FromJSONKeyCoerce _ -> withObject "Map" $
1515 fmap (H.foldrWithKey (M.insert . unsafeCoerce) M.empty) . H.traverseWithKey (\k v -> p v <?> Key k)
1892 fmap (H.foldrWithKey (M.insert . unsafeCoerce) M.empty) . H.traverseWithKey (\k v -> p v <?> Key k)
1516− FromJSONKeyText f -> withObject "Map k v" $
1893+ FromJSONKeyText f -> withObject "Map" $
1517 fmap (H.foldrWithKey (M.insert . f) M.empty) . H.traverseWithKey (\k v -> p v <?> Key k)
1894 fmap (H.foldrWithKey (M.insert . f) M.empty) . H.traverseWithKey (\k v -> p v <?> Key k)
1518− FromJSONKeyTextParser f -> withObject "Map k v" $
1895+ FromJSONKeyTextParser f -> withObject "Map" $
1519 H.foldrWithKey (\k v m -> M.insert <$> f k <?> Key k <*> p v <?> Key k <*> m) (pure M.empty)
1896 H.foldrWithKey (\k v m -> M.insert <$> f k <?> Key k <*> p v <?> Key k <*> m) (pure M.empty)
1520− FromJSONKeyValue f -> withArray "Map k v" $ \arr ->
1897+ FromJSONKeyValue f -> withArray "Map" $ \arr ->
1521− M.fromList <$> (Tr.sequence .
1898+ fmap M.fromList . Tr.sequence .
1522− zipWith (parseIndexedJSONPair f p) [0..] . V.toList $ arr)
1899+ zipWith (parseIndexedJSONPair f p) [0..] . V.toList $ arr
1523 {-# INLINE liftParseJSON #-}
1900 {-# INLINE liftParseJSON #-}
1524
1901
1525instance (FromJSONKey k, Ord k, FromJSON v) => FromJSON (M.Map k v) where
1902instance (FromJSONKey k, Ord k, FromJSON v) => FromJSON (M.Map k v) where
@@ -1545,18 +1922,18 @@ instance (FromJSON v) => FromJSON (Tree.Tree v) where
1545
1922
1546instance FromJSON UUID.UUID where
1923instance FromJSON UUID.UUID where
1547 parseJSON = withText "UUID" $
1924 parseJSON = withText "UUID" $
1548− maybe (fail "Invalid UUID") pure . UUID.fromText
1925+ maybe (fail "invalid UUID") pure . UUID.fromText
1549
1926
1550instance FromJSONKey UUID.UUID where
1927instance FromJSONKey UUID.UUID where
1551 fromJSONKey = FromJSONKeyTextParser $
1928 fromJSONKey = FromJSONKeyTextParser $
1552− maybe (fail "Invalid UUID") pure . UUID.fromText
1929+ maybe (fail "invalid UUID") pure . UUID.fromText
1553
1930
1554-------------------------------------------------------------------------------
1931-------------------------------------------------------------------------------
1555-- vector
1932-- vector
1556-------------------------------------------------------------------------------
1933-------------------------------------------------------------------------------
1557
1934
1558instance FromJSON1 Vector where
1935instance FromJSON1 Vector where
1559− liftParseJSON p _ = withArray "Vector a" $
1936+ liftParseJSON p _ = withArray "Vector" $
1560 V.mapM (uncurry $ parseIndexedJSON p) . V.indexed
1937 V.mapM (uncurry $ parseIndexedJSON p) . V.indexed
1561 {-# INLINE liftParseJSON #-}
1938 {-# INLINE liftParseJSON #-}
1562
1939
@@ -1570,14 +1947,14 @@ vectorParseJSON s = withArray s $ fmap V.convert . V.mapM (uncurry $ parseIndexe
1570{-# INLINE vectorParseJSON #-}
1947{-# INLINE vectorParseJSON #-}
1571
1948
1572instance (Storable a, FromJSON a) => FromJSON (VS.Vector a) where
1949instance (Storable a, FromJSON a) => FromJSON (VS.Vector a) where
1573− parseJSON = vectorParseJSON "Data.Vector.Storable.Vector a"
1950+ parseJSON = vectorParseJSON "Data.Vector.Storable.Vector"
1574
1951
1575instance (VP.Prim a, FromJSON a) => FromJSON (VP.Vector a) where
1952instance (VP.Prim a, FromJSON a) => FromJSON (VP.Vector a) where
1576− parseJSON = vectorParseJSON "Data.Vector.Primitive.Vector a"
1953+ parseJSON = vectorParseJSON "Data.Vector.Primitive.Vector"
1577 {-# INLINE parseJSON #-}
1954 {-# INLINE parseJSON #-}
1578
1955
1579instance (VG.Vector VU.Vector a, FromJSON a) => FromJSON (VU.Vector a) where
1956instance (VG.Vector VU.Vector a, FromJSON a) => FromJSON (VU.Vector a) where
1580− parseJSON = vectorParseJSON "Data.Vector.Unboxed.Vector a"
1957+ parseJSON = vectorParseJSON "Data.Vector.Unboxed.Vector"
1581 {-# INLINE parseJSON #-}
1958 {-# INLINE parseJSON #-}
1582
1959
1583-------------------------------------------------------------------------------
1960-------------------------------------------------------------------------------
@@ -1591,15 +1968,15 @@ instance (Eq a, Hashable a, FromJSON a) => FromJSON (HashSet.HashSet a) where
1591
1968
1592instance (FromJSONKey k, Eq k, Hashable k) => FromJSON1 (H.HashMap k) where
1969instance (FromJSONKey k, Eq k, Hashable k) => FromJSON1 (H.HashMap k) where
1593 liftParseJSON p _ = case fromJSONKey of
1970 liftParseJSON p _ = case fromJSONKey of
1594− FromJSONKeyCoerce _ -> withObject "HashMap ~Text v" $
1971+ FromJSONKeyCoerce _ -> withObject "HashMap ~Text" $
1595 uc . H.traverseWithKey (\k v -> p v <?> Key k)
1972 uc . H.traverseWithKey (\k v -> p v <?> Key k)
1596− FromJSONKeyText f -> withObject "HashMap k v" $
1973+ FromJSONKeyText f -> withObject "HashMap" $
1597 fmap (mapKey f) . H.traverseWithKey (\k v -> p v <?> Key k)
1974 fmap (mapKey f) . H.traverseWithKey (\k v -> p v <?> Key k)
1598− FromJSONKeyTextParser f -> withObject "HashMap k v" $
1975+ FromJSONKeyTextParser f -> withObject "HashMap" $
1599 H.foldrWithKey (\k v m -> H.insert <$> f k <?> Key k <*> p v <?> Key k <*> m) (pure H.empty)
1976 H.foldrWithKey (\k v m -> H.insert <$> f k <?> Key k <*> p v <?> Key k <*> m) (pure H.empty)
1600− FromJSONKeyValue f -> withArray "Map k v" $ \arr ->
1977+ FromJSONKeyValue f -> withArray "Map" $ \arr ->
1601− H.fromList <$> (Tr.sequence .
1978+ fmap H.fromList . Tr.sequence .
1602− zipWith (parseIndexedJSONPair f p) [0..] . V.toList $ arr)
1979+ zipWith (parseIndexedJSONPair f p) [0..] . V.toList $ arr
1603 where
1980 where
1604 uc :: Parser (H.HashMap Text v) -> Parser (H.HashMap k v)
1981 uc :: Parser (H.HashMap Text v) -> Parser (H.HashMap k v)
1605 uc = unsafeCoerce
1982 uc = unsafeCoerce
@@ -1620,11 +1997,33 @@ instance FromJSON DotNetTime where
1620 parseJSON = withText "DotNetTime" $ \t ->
1997 parseJSON = withText "DotNetTime" $ \t ->
1621 let (s,m) = T.splitAt (T.length t - 5) t
1998 let (s,m) = T.splitAt (T.length t - 5) t
1622 t' = T.concat [s,".",m]
1999 t' = T.concat [s,".",m]
1623− in case parseTime defaultTimeLocale "/Date(%s%Q)/" (unpack t') of
2000+ in case parseTimeM True defaultTimeLocale "/Date(%s%Q)/" (unpack t') of
1624 Just d -> pure (DotNetTime d)
2001 Just d -> pure (DotNetTime d)
1625 _ -> fail "could not parse .NET time"
2002 _ -> fail "could not parse .NET time"
1626 {-# INLINE parseJSON #-}
2003 {-# INLINE parseJSON #-}
1627
2004
2005+-------------------------------------------------------------------------------
2006+-- primitive
2007+-------------------------------------------------------------------------------
2008+
2009+instance FromJSON a => FromJSON (PM.Array a) where
2010+ -- note: we could do better than this if vector exposed the data
2011+ -- constructor in Data.Vector.
2012+ parseJSON = fmap Exts.fromList . parseJSON
2013+
2014+instance FromJSON a => FromJSON (PM.SmallArray a) where
2015+ parseJSON = fmap Exts.fromList . parseJSON
2016+
2017+#if MIN_VERSION_primitive(0,6,4)
2018+instance (PM.Prim a,FromJSON a) => FromJSON (PM.PrimArray a) where
2019+ parseJSON = fmap Exts.fromList . parseJSON
2020+
2021+#if !MIN_VERSION_primitive(0,7,0)
2022+instance (PM.PrimUnlifted a,FromJSON a) => FromJSON (PM.UnliftedArray a) where
2023+ parseJSON = fmap Exts.fromList . parseJSON
2024+#endif
2025+#endif
2026+
1628-------------------------------------------------------------------------------
2027-------------------------------------------------------------------------------
1629-- time
2028-- time
1630-------------------------------------------------------------------------------
2029-------------------------------------------------------------------------------
@@ -1650,6 +2049,17 @@ instance FromJSONKey LocalTime where
1650 fromJSONKey = FromJSONKeyTextParser (Time.run Time.localTime)
2049 fromJSONKey = FromJSONKeyTextParser (Time.run Time.localTime)
1651
2050
1652
2051
2052+-- | Supported string formats:
2053+--
2054+-- @YYYY-MM-DD HH:MM Z@
2055+-- @YYYY-MM-DD HH:MM:SS Z@
2056+-- @YYYY-MM-DD HH:MM:SS.SSS Z@
2057+--
2058+-- The first space may instead be a @T@, and the second space is
2059+-- optional. The @Z@ represents UTC. The @Z@ may be replaced with a
2060+-- time zone offset of the form @+0000@ or @-08:00@, where the first
2061+-- two digits are hours, the @:@ is optional and the second two digits
2062+-- (also optional) are minutes.
1653instance FromJSON ZonedTime where
2063instance FromJSON ZonedTime where
1654 parseJSON = withText "ZonedTime" (Time.run Time.zonedTime)
2064 parseJSON = withText "ZonedTime" (Time.run Time.zonedTime)
1655
2065
@@ -1664,14 +2074,57 @@ instance FromJSONKey UTCTime where
1664 fromJSONKey = FromJSONKeyTextParser (Time.run Time.utcTime)
2074 fromJSONKey = FromJSONKeyTextParser (Time.run Time.utcTime)
1665
2075
1666
2076
1667−-- | /WARNING:/ Only parse lengths of time from trusted input
2077+-- | This instance includes a bounds check to prevent maliciously
1668−-- since an attacker could easily fill up the memory of the target
2078+-- large inputs to fill up the memory of the target system. You can
1669−-- system by specifying a scientific number with a big exponent like
2079+-- newtype 'Scientific' and provide your own instance using
1670−-- @1e1000000000@.
2080+-- 'withScientific' if you want to allow larger inputs.
1671instance FromJSON NominalDiffTime where
2081instance FromJSON NominalDiffTime where
1672− parseJSON = withScientific "NominalDiffTime" $ pure . realToFrac
2082+ parseJSON = withBoundedScientific "NominalDiffTime" $ pure . realToFrac
2083+ {-# INLINE parseJSON #-}
2084+
2085+
2086+-- | This instance includes a bounds check to prevent maliciously
2087+-- large inputs to fill up the memory of the target system. You can
2088+-- newtype 'Scientific' and provide your own instance using
2089+-- 'withScientific' if you want to allow larger inputs.
2090+instance FromJSON DiffTime where
2091+ parseJSON = withBoundedScientific "DiffTime" $ pure . realToFrac
1673 {-# INLINE parseJSON #-}
2092 {-# INLINE parseJSON #-}
1674
2093
2094+instance FromJSON SystemTime where
2095+ parseJSON v = prependContext "SystemTime" $ do
2096+ n <- parseJSON v
2097+ let n' = floor (n * fromInteger (resolution n) :: Nano)
2098+ let (secs, nano) = n' `divMod` resolution n
2099+ return (MkSystemTime (fromInteger secs) (fromInteger nano))
2100+
2101+instance FromJSON CalendarDiffTime where
2102+ parseJSON = withObject "CalendarDiffTime" $ \obj -> CalendarDiffTime
2103+ <$> obj .: "months"
2104+ <*> obj .: "time"
2105+
2106+instance FromJSON CalendarDiffDays where
2107+ parseJSON = withObject "CalendarDiffDays" $ \obj -> CalendarDiffDays
2108+ <$> obj .: "months"
2109+ <*> obj .: "days"
2110+
2111+instance FromJSON DayOfWeek where
2112+ parseJSON = withText "DaysOfWeek" parseDayOfWeek
2113+
2114+parseDayOfWeek :: T.Text -> Parser DayOfWeek
2115+parseDayOfWeek t = case T.toLower t of
2116+ "monday" -> return Monday
2117+ "tuesday" -> return Tuesday
2118+ "wednesday" -> return Wednesday
2119+ "thursday" -> return Thursday
2120+ "friday" -> return Friday
2121+ "saturday" -> return Saturday
2122+ "sunday" -> return Sunday
2123+ _ -> fail "Invalid week day"
2124+
2125+instance FromJSONKey DayOfWeek where
2126+ fromJSONKey = FromJSONKeyTextParser parseDayOfWeek
2127+
1675-------------------------------------------------------------------------------
2128-------------------------------------------------------------------------------
1676-- base Monoid/Semigroup
2129-- base Monoid/Semigroup
1677-------------------------------------------------------------------------------
2130-------------------------------------------------------------------------------
@@ -1792,14 +2245,15 @@ instance FromJSON a => FromJSON (Semigroup.Option a) where
1792
2245
1793instance FromJSON1 Proxy where
2246instance FromJSON1 Proxy where
1794 {-# INLINE liftParseJSON #-}
2247 {-# INLINE liftParseJSON #-}
1795− liftParseJSON _ _ Null = pure Proxy
2248+ liftParseJSON _ _ = fromNull "Proxy" Proxy
1796− liftParseJSON _ _ v = typeMismatch "Proxy" v
1797
2249
1798instance FromJSON (Proxy a) where
2250instance FromJSON (Proxy a) where
1799 {-# INLINE parseJSON #-}
2251 {-# INLINE parseJSON #-}
1800− parseJSON Null = pure Proxy
2252+ parseJSON = fromNull "Proxy" Proxy
1801− parseJSON v = typeMismatch "Proxy" v
1802
2253
2254+fromNull :: String -> a -> Value -> Parser a
2255+fromNull _ a Null = pure a
2256+fromNull c _ v = prependContext c (typeMismatch "Null" v)
1803
2257
1804instance FromJSON2 Tagged where
2258instance FromJSON2 Tagged where
1805 liftParseJSON2 _ _ p _ = fmap Tagged . p
2259 liftParseJSON2 _ _ p _ = fmap Tagged . p
@@ -1826,10 +2280,7 @@ instance (FromJSON a, FromJSON b, FromJSON c) => FromJSONKey (a,b,c)
1826instance (FromJSON a, FromJSON b, FromJSON c, FromJSON d) => FromJSONKey (a,b,c,d)
2280instance (FromJSON a, FromJSON b, FromJSON c, FromJSON d) => FromJSONKey (a,b,c,d)
1827
2281
1828instance FromJSONKey Char where
2282instance FromJSONKey Char where
1829− fromJSONKey = FromJSONKeyTextParser $ \t ->
2283+ fromJSONKey = FromJSONKeyTextParser parseChar
1830− if T.length t == 1
1831− then return (T.index t 0)
1832− else typeMismatch "Expected Char but String didn't contain exactly one character" (String t)
1833 fromJSONKeyList = FromJSONKeyText T.unpack
2284 fromJSONKeyList = FromJSONKeyText T.unpack
1834
2285
1835instance (FromJSONKey a, FromJSON a) => FromJSONKey [a] where
2286instance (FromJSONKey a, FromJSON a) => FromJSONKey [a] where
Data/Aeson/Types/Generic.hs+12−8
@@ -1,10 +1,11 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2{-# LANGUAGE DataKinds #-}
2{-# LANGUAGE DataKinds #-}
3+{-# LANGUAGE DeriveFunctor #-}
3{-# LANGUAGE EmptyDataDecls #-}
4{-# LANGUAGE EmptyDataDecls #-}
4{-# LANGUAGE FlexibleInstances #-}
5{-# LANGUAGE FlexibleInstances #-}
5{-# LANGUAGE FunctionalDependencies #-}
6{-# LANGUAGE FunctionalDependencies #-}
6{-# LANGUAGE KindSignatures #-}
7{-# LANGUAGE KindSignatures #-}
7−{-# LANGUAGE MultiParamTypeClasses #-}
8+{-# LANGUAGE NoImplicitPrelude #-}
8{-# LANGUAGE ScopedTypeVariables #-}
9{-# LANGUAGE ScopedTypeVariables #-}
9{-# LANGUAGE TypeOperators #-}
10{-# LANGUAGE TypeOperators #-}
10{-# LANGUAGE UndecidableInstances #-}
11{-# LANGUAGE UndecidableInstances #-}
@@ -25,7 +26,7 @@
25
26
26module Data.Aeson.Types.Generic
27module Data.Aeson.Types.Generic
27 (
28 (
28− IsRecord(..)
29+ IsRecord
29 , AllNullary
30 , AllNullary
30 , Tagged2(..)
31 , Tagged2(..)
31 , True
32 , True
@@ -34,9 +35,9 @@ module Data.Aeson.Types.Generic
34 , Zero
35 , Zero
35 , One
36 , One
36 , ProductSize(..)
37 , ProductSize(..)
38+ , (:*)(..)
37 ) where
39 ) where
38
40
39−import Prelude ()
40import Prelude.Compat
41import Prelude.Compat
41
42
42import GHC.Generics
43import GHC.Generics
@@ -44,12 +45,8 @@ import GHC.Generics
44--------------------------------------------------------------------------------
45--------------------------------------------------------------------------------
45
46
46class IsRecord (f :: * -> *) isRecord | f -> isRecord
47class IsRecord (f :: * -> *) isRecord | f -> isRecord
47− where
48− isUnary :: f a -> Bool
49− isUnary = const True
50
48
51instance (IsRecord f isRecord) => IsRecord (f :*: g) isRecord
49instance (IsRecord f isRecord) => IsRecord (f :*: g) isRecord
52− where isUnary = const False
53#if MIN_VERSION_base(4,9,0)
50#if MIN_VERSION_base(4,9,0)
54instance OVERLAPPING_ IsRecord (M1 S ('MetaSel 'Nothing u ss ds) f) False
51instance OVERLAPPING_ IsRecord (M1 S ('MetaSel 'Nothing u ss ds) f) False
55#else
52#else
@@ -61,7 +58,6 @@ instance IsRecord Par1 True
61instance IsRecord (Rec1 f) True
58instance IsRecord (Rec1 f) True
62instance IsRecord (f :.: g) True
59instance IsRecord (f :.: g) True
63instance IsRecord U1 False
60instance IsRecord U1 False
64− where isUnary = const False
65
61
66--------------------------------------------------------------------------------
62--------------------------------------------------------------------------------
67
63
@@ -80,6 +76,7 @@ instance AllNullary (Rec1 f) False
80instance AllNullary U1 True
76instance AllNullary U1 True
81
77
82newtype Tagged2 (s :: * -> *) b = Tagged2 {unTagged2 :: b}
78newtype Tagged2 (s :: * -> *) b = Tagged2 {unTagged2 :: b}
79+ deriving Functor
83
80
84--------------------------------------------------------------------------------
81--------------------------------------------------------------------------------
85
82
@@ -112,3 +109,10 @@ instance (ProductSize a, ProductSize b) => ProductSize (a :*: b) where
112
109
113instance ProductSize (S1 s a) where
110instance ProductSize (S1 s a) where
114 productSize = Tagged2 1
111 productSize = Tagged2 1
112+
113+--------------------------------------------------------------------------------
114+
115+-- | Simple extensible tuple type to simplify passing around many parameters.
116+data a :* b = a :* b
117+
118+infixr 1 :*
Data/Aeson/Types/Internal.hs+175−26
@@ -1,8 +1,9 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2{-# LANGUAGE DeriveDataTypeable #-}
2{-# LANGUAGE DeriveDataTypeable #-}
3+{-# LANGUAGE DeriveGeneric #-}
3{-# LANGUAGE GeneralizedNewtypeDeriving #-}
4{-# LANGUAGE GeneralizedNewtypeDeriving #-}
5+{-# LANGUAGE NoImplicitPrelude #-}
4{-# LANGUAGE Rank2Types #-}
6{-# LANGUAGE Rank2Types #-}
5−{-# LANGUAGE RecordWildCards #-}
6#if __GLASGOW_HASKELL__ >= 800
7#if __GLASGOW_HASKELL__ >= 800
7-- a) THQ works on cross-compilers and unregisterised GHCs
8-- a) THQ works on cross-compilers and unregisterised GHCs
8-- b) may make compilation faster as no dynamic loading is ever needed (not sure about this)
9-- b) may make compilation faster as no dynamic loading is ever needed (not sure about this)
@@ -44,16 +45,33 @@ module Data.Aeson.Types.Internal
44 , parseEither
45 , parseEither
45 , parseMaybe
46 , parseMaybe
46 , modifyFailure
47 , modifyFailure
48+ , prependFailure
49+ , parserThrowError
50+ , parserCatchError
47 , formatError
51 , formatError
52+ , formatPath
53+ , formatRelativePath
48 , (<?>)
54 , (<?>)
49 -- * Constructors and accessors
55 -- * Constructors and accessors
50 , object
56 , object
51
57
52 -- * Generic and TH encoding configuration
58 -- * Generic and TH encoding configuration
53− , Options(..)
59+ , Options(
60+ fieldLabelModifier
61+ , constructorTagModifier
62+ , allNullaryToStringTag
63+ , omitNothingFields
64+ , sumEncoding
65+ , unwrapUnaryRecords
66+ , tagSingleConstructors
67+ , rejectUnknownFields
68+ )
69+
54 , SumEncoding(..)
70 , SumEncoding(..)
71+ , JSONKeyOptions(keyModifier)
55 , defaultOptions
72 , defaultOptions
56 , defaultTaggedObject
73 , defaultTaggedObject
74+ , defaultJSONKeyOptions
57
75
58 -- * Used for changing CamelCase names into something else.
76 -- * Used for changing CamelCase names into something else.
59 , camelTo
77 , camelTo
@@ -63,7 +81,6 @@ module Data.Aeson.Types.Internal
63 , DotNetTime(..)
81 , DotNetTime(..)
64 ) where
82 ) where
65
83
66−import Prelude ()
67import Prelude.Compat
84import Prelude.Compat
68
85
69import Control.Applicative (Alternative(..))
86import Control.Applicative (Alternative(..))
@@ -75,6 +92,7 @@ import Data.Data (Data)
75import Data.Foldable (foldl')
92import Data.Foldable (foldl')
76import Data.HashMap.Strict (HashMap)
93import Data.HashMap.Strict (HashMap)
77import Data.Hashable (Hashable(..))
94import Data.Hashable (Hashable(..))
95+import Data.List (intercalate)
78import Data.Scientific (Scientific)
96import Data.Scientific (Scientific)
79import Data.Semigroup (Semigroup((<>)))
97import Data.Semigroup (Semigroup((<>)))
80import Data.String (IsString(..))
98import Data.String (IsString(..))
@@ -83,6 +101,8 @@ import Data.Time (UTCTime)
83import Data.Time.Format (FormatTime)
101import Data.Time.Format (FormatTime)
84import Data.Typeable (Typeable)
102import Data.Typeable (Typeable)
85import Data.Vector (Vector)
103import Data.Vector (Vector)
104+import GHC.Generics (Generic)
105+import qualified Control.Monad as Monad
86import qualified Control.Monad.Fail as Fail
106import qualified Control.Monad.Fail as Fail
87import qualified Data.HashMap.Strict as H
107import qualified Data.HashMap.Strict as H
88import qualified Data.Scientific as S
108import qualified Data.Scientific as S
@@ -101,7 +121,7 @@ data JSONPathElement = Key Text
101 | Index {-# UNPACK #-} !Int
121 | Index {-# UNPACK #-} !Int
102 -- ^ JSON path element of an index into an
122 -- ^ JSON path element of an index into an
103 -- array, \"array[index]\".
123 -- array, \"array[index]\".
104− deriving (Eq, Show, Typeable)
124+ deriving (Eq, Show, Typeable, Ord)
105type JSONPath = [JSONPathElement]
125type JSONPath = [JSONPathElement]
106
126
107-- | The internal result of running a 'Parser'.
127-- | The internal result of running a 'Parser'.
@@ -136,7 +156,7 @@ instance Functor Result where
136 fmap _ (Error err) = Error err
156 fmap _ (Error err) = Error err
137 {-# INLINE fmap #-}
157 {-# INLINE fmap #-}
138
158
139−instance Monad IResult where
159+instance Monad.Monad IResult where
140 return = pure
160 return = pure
141 {-# INLINE return #-}
161 {-# INLINE return #-}
142
162
@@ -144,14 +164,16 @@ instance Monad IResult where
144 IError path err >>= _ = IError path err
164 IError path err >>= _ = IError path err
145 {-# INLINE (>>=) #-}
165 {-# INLINE (>>=) #-}
146
166
167+#if !(MIN_VERSION_base(4,13,0))
147 fail = Fail.fail
168 fail = Fail.fail
148 {-# INLINE fail #-}
169 {-# INLINE fail #-}
170+#endif
149
171
150instance Fail.MonadFail IResult where
172instance Fail.MonadFail IResult where
151 fail err = IError [] err
173 fail err = IError [] err
152 {-# INLINE fail #-}
174 {-# INLINE fail #-}
153
175
154−instance Monad Result where
176+instance Monad.Monad Result where
155 return = pure
177 return = pure
156 {-# INLINE return #-}
178 {-# INLINE return #-}
157
179
@@ -159,8 +181,10 @@ instance Monad Result where
159 Error err >>= _ = Error err
181 Error err >>= _ = Error err
160 {-# INLINE (>>=) #-}
182 {-# INLINE (>>=) #-}
161
183
184+#if !(MIN_VERSION_base(4,13,0))
162 fail = Fail.fail
185 fail = Fail.fail
163 {-# INLINE fail #-}
186 {-# INLINE fail #-}
187+#endif
164
188
165instance Fail.MonadFail Result where
189instance Fail.MonadFail Result where
166 fail err = Error err
190 fail err = Error err
@@ -257,7 +281,9 @@ type Failure f r = JSONPath -> String -> f r
257-- | Success continuation.
281-- | Success continuation.
258type Success a f r = a -> f r
282type Success a f r = a -> f r
259
283
260−-- | A JSON parser.
284+-- | A JSON parser. N.B. This might not fit your usual understanding of
285+-- "parser". Instead you might like to think of 'Parser' as a "parse result",
286+-- i.e. a parser to which the input has already been applied.
261newtype Parser a = Parser {
287newtype Parser a = Parser {
262 runParser :: forall f r.
288 runParser :: forall f r.
263 JSONPath
289 JSONPath
@@ -266,14 +292,17 @@ newtype Parser a = Parser {
266 -> f r
292 -> f r
267 }
293 }
268
294
269−instance Monad Parser where
295+instance Monad.Monad Parser where
270 m >>= g = Parser $ \path kf ks -> let ks' a = runParser (g a) path kf ks
296 m >>= g = Parser $ \path kf ks -> let ks' a = runParser (g a) path kf ks
271 in runParser m path kf ks'
297 in runParser m path kf ks'
272 {-# INLINE (>>=) #-}
298 {-# INLINE (>>=) #-}
273 return = pure
299 return = pure
274 {-# INLINE return #-}
300 {-# INLINE return #-}
301+
302+#if !(MIN_VERSION_base(4,13,0))
275 fail = Fail.fail
303 fail = Fail.fail
276 {-# INLINE fail #-}
304 {-# INLINE fail #-}
305+#endif
277
306
278instance Fail.MonadFail Parser where
307instance Fail.MonadFail Parser where
279 fail msg = Parser $ \path kf _ks -> kf (reverse path) msg
308 fail msg = Parser $ \path kf _ks -> kf (reverse path) msg
@@ -316,8 +345,7 @@ instance Monoid (Parser a) where
316apP :: Parser (a -> b) -> Parser a -> Parser b
345apP :: Parser (a -> b) -> Parser a -> Parser b
317apP d e = do
346apP d e = do
318 b <- d
347 b <- d
319− a <- e
348+ b <$> e
320− return (b a)
321{-# INLINE apP #-}
349{-# INLINE apP #-}
322
350
323-- | A JSON \"object\" (key\/value map).
351-- | A JSON \"object\" (key\/value map).
@@ -333,7 +361,7 @@ data Value = Object !Object
333 | Number !Scientific
361 | Number !Scientific
334 | Bool !Bool
362 | Bool !Bool
335 | Null
363 | Null
336− deriving (Eq, Read, Show, Typeable, Data)
364+ deriving (Eq, Read, Show, Typeable, Data, Generic)
337
365
338-- | A newtype wrapper for 'UTCTime' that uses the same non-standard
366-- | A newtype wrapper for 'UTCTime' that uses the same non-standard
339-- serialization format as Microsoft .NET, whose
367-- serialization format as Microsoft .NET, whose
@@ -433,7 +461,17 @@ parseEither m v = runParser (m v) [] onError Right
433-- | Annotate an error message with a
461-- | Annotate an error message with a
434-- <http://goessner.net/articles/JsonPath/ JSONPath> error location.
462-- <http://goessner.net/articles/JsonPath/ JSONPath> error location.
435formatError :: JSONPath -> String -> String
463formatError :: JSONPath -> String -> String
436−formatError path msg = "Error in " ++ format "$" path ++ ": " ++ msg
464+formatError path msg = "Error in " ++ formatPath path ++ ": " ++ msg
465+
466+-- | Format a <http://goessner.net/articles/JsonPath/ JSONPath> as a 'String',
467+-- representing the root object as @$@.
468+formatPath :: JSONPath -> String
469+formatPath path = "$" ++ formatRelativePath path
470+
471+-- | Format a <http://goessner.net/articles/JsonPath/ JSONPath> as a 'String'
472+-- which represents the path relative to some root object.
473+formatRelativePath :: JSONPath -> String
474+formatRelativePath path = format "" path
437 where
475 where
438 format :: String -> JSONPath -> String
476 format :: String -> JSONPath -> String
439 format pfx [] = pfx
477 format pfx [] = pfx
@@ -496,13 +534,40 @@ p <?> pathElem = Parser $ \path kf ks -> runParser p (pathElem:path) kf ks
496--
534--
497-- Since 0.6.2.0
535-- Since 0.6.2.0
498modifyFailure :: (String -> String) -> Parser a -> Parser a
536modifyFailure :: (String -> String) -> Parser a -> Parser a
499−modifyFailure f (Parser p) = Parser $ \path kf ks -> p path (\p' m -> kf p' (f m)) ks
537+modifyFailure f (Parser p) = Parser $ \path kf ks ->
538+ p path (\p' m -> kf p' (f m)) ks
539+
540+-- | If the inner 'Parser' failed, prepend the given string to the failure
541+-- message.
542+--
543+-- @
544+-- 'prependFailure' s = 'modifyFailure' (s '++')
545+-- @
546+prependFailure :: String -> Parser a -> Parser a
547+prependFailure = modifyFailure . (++)
548+
549+-- | Throw a parser error with an additional path.
550+--
551+-- @since 1.2.1.0
552+parserThrowError :: JSONPath -> String -> Parser a
553+parserThrowError path' msg = Parser $ \path kf _ks ->
554+ kf (reverse path ++ path') msg
555+
556+-- | A handler function to handle previous errors and return to normal execution.
557+--
558+-- @since 1.2.1.0
559+parserCatchError :: Parser a -> (JSONPath -> String -> Parser a) -> Parser a
560+parserCatchError (Parser p) handler = Parser $ \path kf ks ->
561+ p path (\e msg -> runParser (handler e msg) path kf ks) ks
500
562
501--------------------------------------------------------------------------------
563--------------------------------------------------------------------------------
502-- Generic and TH encoding configuration
564-- Generic and TH encoding configuration
503--------------------------------------------------------------------------------
565--------------------------------------------------------------------------------
504
566
505-- | Options that specify how to encode\/decode your datatype to\/from JSON.
567-- | Options that specify how to encode\/decode your datatype to\/from JSON.
568+--
569+-- Options can be set using record syntax on 'defaultOptions' with the fields
570+-- below.
506data Options = Options
571data Options = Options
507 { fieldLabelModifier :: String -> String
572 { fieldLabelModifier :: String -> String
508 -- ^ Function applied to field labels.
573 -- ^ Function applied to field labels.
@@ -519,24 +584,67 @@ data Options = Options
519 -- ^ If 'True' record fields with a 'Nothing' value will be
584 -- ^ If 'True' record fields with a 'Nothing' value will be
520 -- omitted from the resulting object. If 'False' the resulting
585 -- omitted from the resulting object. If 'False' the resulting
521 -- object will include those fields mapping to @null@.
586 -- object will include those fields mapping to @null@.
587+ --
588+ -- === Note
589+ --
590+ -- Setting 'omitNothingFields' to 'True' only affects fields which are of
591+ -- type 'Maybe' /uniformly/ in the 'ToJSON' or 'FromJSON' instance. In
592+ -- particular, if the type of a field is declared as a type variable, it
593+ -- will not be omitted from the JSON object, unless the field is
594+ -- specialized upfront in the instance.
595+ --
596+ -- ==== __Example__
597+ --
598+ -- The generic instance for the following type @Fruit@ depends on whether
599+ -- the instance head is @Fruit a@ or @Fruit (Maybe a)@.
600+ --
601+ -- @
602+ -- data Fruit a =
603+ -- { apples :: a -- A field whose type is a type variable.
604+ -- , oranges :: 'Maybe' Int
605+ -- }
606+ --
607+ -- options :: 'Options'
608+ -- options = 'defaultOptions' { 'omitNothingFields' = 'True' }
609+ --
610+ -- -- apples required, oranges optional
611+ -- -- Even if 'Data.Aeson.fromJSON' is then specialized to (Fruit ('Maybe' a)).
612+ -- instance 'Data.Aeson.FromJSON' a => 'Data.Aeson.FromJSON' (Fruit a) where
613+ -- 'Data.Aeson.fromJSON' = 'Data.Aeson.genericFromJSON' options
614+ --
615+ -- -- apples optional, oranges optional
616+ -- -- In this instance, the field apples is uniformly of type ('Maybe' a).
617+ -- instance 'Data.Aeson.FromJSON' a => 'Data.Aeson.FromJSON' (Fruit ('Maybe' a)) where
618+ -- 'Data.Aeson.fromJSON' = 'Data.Aeson.genericFromJSON' options
619+ -- @
522 , sumEncoding :: SumEncoding
620 , sumEncoding :: SumEncoding
523 -- ^ Specifies how to encode constructors of a sum datatype.
621 -- ^ Specifies how to encode constructors of a sum datatype.
524 , unwrapUnaryRecords :: Bool
622 , unwrapUnaryRecords :: Bool
525 -- ^ Hide the field name when a record constructor has only one
623 -- ^ Hide the field name when a record constructor has only one
526 -- field, like a newtype.
624 -- field, like a newtype.
625+ , tagSingleConstructors :: Bool
626+ -- ^ Encode types with a single constructor as sums,
627+ -- so that `allNullaryToStringTag` and `sumEncoding` apply.
628+ , rejectUnknownFields :: Bool
629+ -- ^ Applies only to 'Data.Aeson.FromJSON' instances. If a field appears in
630+ -- the parsed object map, but does not appear in the target object, parsing
631+ -- will fail, with an error message indicating which fields were unknown.
527 }
632 }
528
633
529instance Show Options where
634instance Show Options where
530− show Options{..} = "Options {" ++
635+ show (Options f c a o s u t r) =
636+ "Options {"
637+ ++ intercalate ", "
531− "fieldLabelModifier =~ " ++
638+ [ "fieldLabelModifier =~ " ++ show (f "exampleField")
532− show (fieldLabelModifier "exampleField") ++ ", " ++
533− "constructorTagModifier =~ " ++
639+ , "constructorTagModifier =~ " ++ show (c "ExampleConstructor")
534− show (constructorTagModifier "ExampleConstructor") ++ ", " ++
535− "allNullaryToStringTag = " ++ show allNullaryToStringTag ++ ", " ++
640+ , "allNullaryToStringTag = " ++ show a
536− "omitNothingFields = " ++ show omitNothingFields ++ ", " ++
641+ , "omitNothingFields = " ++ show o
537− "sumEncoding = " ++ show sumEncoding ++ ", " ++
642+ , "sumEncoding = " ++ show s
538− "unwrapUnaryRecords = " ++ show unwrapUnaryRecords ++
643+ , "unwrapUnaryRecords = " ++ show u
644+ , "tagSingleConstructors = " ++ show t
645+ , "rejectUnknownFields = " ++ show r
646+ ]
539− "}"
647+ ++ "}"
540
648
541-- | Specifies how to encode constructors of a sum datatype.
649-- | Specifies how to encode constructors of a sum datatype.
542data SumEncoding =
650data SumEncoding =
@@ -554,18 +662,18 @@ data SumEncoding =
554 -- the 'contentsFieldName' field.
662 -- the 'contentsFieldName' field.
555 | UntaggedValue
663 | UntaggedValue
556 -- ^ Constructor names won't be encoded. Instead only the contents of the
664 -- ^ Constructor names won't be encoded. Instead only the contents of the
557− -- constructor will be encoded as if the type had single constructor. JSON
665+ -- constructor will be encoded as if the type had a single constructor. JSON
558 -- encodings have to be disjoint for decoding to work properly.
666 -- encodings have to be disjoint for decoding to work properly.
559 --
667 --
560 -- When decoding, constructors are tried in the order of definition. If some
668 -- When decoding, constructors are tried in the order of definition. If some
561 -- encodings overlap, the first one defined will succeed.
669 -- encodings overlap, the first one defined will succeed.
562 --
670 --
563− -- /Note:/ Nullary constructors are encoded as the string (using
671+ -- /Note:/ Nullary constructors are encoded as strings (using
564 -- 'constructorTagModifier'). Having a nullary constructor alongside a
672 -- 'constructorTagModifier'). Having a nullary constructor alongside a
565 -- single field constructor that encodes to a string leads to ambiguity.
673 -- single field constructor that encodes to a string leads to ambiguity.
566 --
674 --
567 -- /Note:/ Only the last error is kept when decoding, so in the case of
675 -- /Note:/ Only the last error is kept when decoding, so in the case of
568− -- mailformed JSON, only an error for the last constructor will be reported.
676+ -- malformed JSON, only an error for the last constructor will be reported.
569 | ObjectWithSingleField
677 | ObjectWithSingleField
570 -- ^ A constructor will be encoded to an object with a single
678 -- ^ A constructor will be encoded to an object with a single
571 -- field named after the constructor tag (modified by the
679 -- field named after the constructor tag (modified by the
@@ -578,6 +686,33 @@ data SumEncoding =
578 -- contents of the constructor.
686 -- contents of the constructor.
579 deriving (Eq, Show)
687 deriving (Eq, Show)
580
688
689+-- | Options for encoding keys with 'Data.Aeson.Types.genericFromJSONKey' and
690+-- 'Data.Aeson.Types.genericToJSONKey'.
691+data JSONKeyOptions = JSONKeyOptions
692+ { keyModifier :: String -> String
693+ -- ^ Function applied to keys. Its result is what goes into the encoded
694+ -- 'Value'.
695+ --
696+ -- === __Example__
697+ --
698+ -- The following instances encode the constructor @Bar@ to lower-case keys
699+ -- @\"bar\"@.
700+ --
701+ -- @
702+ -- data Foo = Bar
703+ -- deriving 'Generic'
704+ --
705+ -- opts :: 'JSONKeyOptions'
706+ -- opts = 'defaultJSONKeyOptions' { 'keyModifier' = 'toLower' }
707+ --
708+ -- instance 'ToJSONKey' Foo where
709+ -- 'toJSONKey' = 'genericToJSONKey' opts
710+ --
711+ -- instance 'FromJSONKey' Foo where
712+ -- 'fromJSONKey' = 'genericFromJSONKey' opts
713+ -- @
714+ }
715+
581-- | Default encoding 'Options':
716-- | Default encoding 'Options':
582--
717--
583-- @
718-- @
@@ -588,6 +723,8 @@ data SumEncoding =
588-- , 'omitNothingFields' = False
723-- , 'omitNothingFields' = False
589-- , 'sumEncoding' = 'defaultTaggedObject'
724-- , 'sumEncoding' = 'defaultTaggedObject'
590-- , 'unwrapUnaryRecords' = False
725-- , 'unwrapUnaryRecords' = False
726+-- , 'tagSingleConstructors' = False
727+-- , 'rejectUnknownFields' = False
591-- }
728-- }
592-- @
729-- @
593defaultOptions :: Options
730defaultOptions :: Options
@@ -598,6 +735,8 @@ defaultOptions = Options
598 , omitNothingFields = False
735 , omitNothingFields = False
599 , sumEncoding = defaultTaggedObject
736 , sumEncoding = defaultTaggedObject
600 , unwrapUnaryRecords = False
737 , unwrapUnaryRecords = False
738+ , tagSingleConstructors = False
739+ , rejectUnknownFields = False
601 }
740 }
602
741
603-- | Default 'TaggedObject' 'SumEncoding' options:
742-- | Default 'TaggedObject' 'SumEncoding' options:
@@ -614,6 +753,16 @@ defaultTaggedObject = TaggedObject
614 , contentsFieldName = "contents"
753 , contentsFieldName = "contents"
615 }
754 }
616
755
756+-- | Default 'JSONKeyOptions':
757+--
758+-- @
759+-- defaultJSONKeyOptions = 'JSONKeyOptions'
760+-- { 'keyModifier' = 'id'
761+-- }
762+-- @
763+defaultJSONKeyOptions :: JSONKeyOptions
764+defaultJSONKeyOptions = JSONKeyOptions id
765+
617-- | Converts from CamelCase to another lower case, interspersing
766-- | Converts from CamelCase to another lower case, interspersing
618-- the character between all capital letters and their previous
767-- the character between all capital letters and their previous
619-- entries, except those capital letters that appear together,
768-- entries, except those capital letters that appear together,
Data/Aeson/Types/ToJSON.hs+587−532
@@ -1,25 +1,21 @@
1−{-# LANGUAGE BangPatterns #-}
2{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
3−{-# LANGUAGE DataKinds #-}
4{-# LANGUAGE DefaultSignatures #-}
2{-# LANGUAGE DefaultSignatures #-}
3+{-# LANGUAGE EmptyDataDecls #-}
5{-# LANGUAGE FlexibleContexts #-}
4{-# LANGUAGE FlexibleContexts #-}
6{-# LANGUAGE FlexibleInstances #-}
5{-# LANGUAGE FlexibleInstances #-}
6+{-# LANGUAGE FunctionalDependencies #-}
7{-# LANGUAGE GADTs #-}
7{-# LANGUAGE GADTs #-}
8−{-# LANGUAGE MultiParamTypeClasses #-}
8+{-# LANGUAGE NoImplicitPrelude #-}
9−{-# LANGUAGE NamedFieldPuns #-}
10{-# LANGUAGE OverloadedStrings #-}
9{-# LANGUAGE OverloadedStrings #-}
11{-# LANGUAGE PatternGuards #-}
10{-# LANGUAGE PatternGuards #-}
11+{-# LANGUAGE PolyKinds #-}
12{-# LANGUAGE RecordWildCards #-}
12{-# LANGUAGE RecordWildCards #-}
13{-# LANGUAGE ScopedTypeVariables #-}
13{-# LANGUAGE ScopedTypeVariables #-}
14{-# LANGUAGE TypeOperators #-}
14{-# LANGUAGE TypeOperators #-}
15−{-# LANGUAGE TypeSynonymInstances #-}
16{-# LANGUAGE UndecidableInstances #-}
15{-# LANGUAGE UndecidableInstances #-}
17
16
18−#if __GLASGOW_HASKELL__ >= 706
19−{-# LANGUAGE PolyKinds #-}
20−#endif
21−
22#include "overlapping-compat.h"
17#include "overlapping-compat.h"
18+#include "incoherent-compat.h"
23
19
24-- TODO: Drop this when we remove support for Data.Attoparsec.Number
20-- TODO: Drop this when we remove support for Data.Attoparsec.Number
25{-# OPTIONS_GHC -fno-warn-deprecations #-}
21{-# OPTIONS_GHC -fno-warn-deprecations #-}
@@ -37,7 +33,6 @@ module Data.Aeson.Types.ToJSON
37 , toEncoding2
33 , toEncoding2
38 -- * Generic JSON classes
34 -- * Generic JSON classes
39 , GToJSON(..)
35 , GToJSON(..)
40− , GToEncoding(..)
41 , ToArgs(..)
36 , ToArgs(..)
42 , genericToJSON
37 , genericToJSON
43 , genericToEncoding
38 , genericToEncoding
@@ -48,54 +43,63 @@ module Data.Aeson.Types.ToJSON
48 , ToJSONKeyFunction(..)
43 , ToJSONKeyFunction(..)
49 , toJSONKeyText
44 , toJSONKeyText
50 , contramapToJSONKeyFunction
45 , contramapToJSONKeyFunction
46+
47+ , GToJSONKey()
48+ , genericToJSONKey
49+
51 -- * Object key-value pairs
50 -- * Object key-value pairs
52 , KeyValue(..)
51 , KeyValue(..)
52+ , KeyValuePair(..)
53+ , FromPairs(..)
53 -- * Functions needed for documentation
54 -- * Functions needed for documentation
54 -- * Encoding functions
55 -- * Encoding functions
55 , listEncoding
56 , listEncoding
56 , listValue
57 , listValue
57 ) where
58 ) where
58
59
59−import Prelude ()
60import Prelude.Compat
60import Prelude.Compat
61
61
62import Control.Applicative (Const(..))
62import Control.Applicative (Const(..))
63import Control.Monad.ST (ST)
63import Control.Monad.ST (ST)
64import Data.Aeson.Encoding (Encoding, Encoding', Series, dict, emptyArray_)
64import Data.Aeson.Encoding (Encoding, Encoding', Series, dict, emptyArray_)
65−import Data.Aeson.Encoding.Internal ((>*<), (><))
65+import Data.Aeson.Encoding.Internal ((>*<))
66import Data.Aeson.Internal.Functions (mapHashKeyVal, mapKeyVal)
66import Data.Aeson.Internal.Functions (mapHashKeyVal, mapKeyVal)
67−import Data.Aeson.Types.Generic (AllNullary, False, IsRecord(..), One, ProductSize, Tagged2(..), True, Zero, productSize)
67+import Data.Aeson.Types.Generic (AllNullary, False, IsRecord, One, ProductSize, Tagged2(..), True, Zero, productSize)
68import Data.Aeson.Types.Internal
68import Data.Aeson.Types.Internal
69import Data.Attoparsec.Number (Number(..))
69import Data.Attoparsec.Number (Number(..))
70import Data.Bits (unsafeShiftR)
70import Data.Bits (unsafeShiftR)
71import Data.DList (DList)
71import Data.DList (DList)
72−import Data.Fixed (Fixed, HasResolution)
72+import Data.Fixed (Fixed, HasResolution, Nano)
73import Data.Foldable (toList)
73import Data.Foldable (toList)
74import Data.Functor.Compose (Compose(..))
74import Data.Functor.Compose (Compose(..))
75+import Data.Functor.Contravariant (Contravariant (..))
75import Data.Functor.Identity (Identity(..))
76import Data.Functor.Identity (Identity(..))
76import Data.Functor.Product (Product(..))
77import Data.Functor.Product (Product(..))
77import Data.Functor.Sum (Sum(..))
78import Data.Functor.Sum (Sum(..))
78import Data.Int (Int16, Int32, Int64, Int8)
79import Data.Int (Int16, Int32, Int64, Int8)
79import Data.List (intersperse)
80import Data.List (intersperse)
80import Data.List.NonEmpty (NonEmpty(..))
81import Data.List.NonEmpty (NonEmpty(..))
81−import Data.Monoid ((<>))
82+import Data.Semigroup ((<>))
82import Data.Proxy (Proxy(..))
83import Data.Proxy (Proxy(..))
83import Data.Ratio (Ratio, denominator, numerator)
84import Data.Ratio (Ratio, denominator, numerator)
84import Data.Scientific (Scientific)
85import Data.Scientific (Scientific)
85import Data.Tagged (Tagged(..))
86import Data.Tagged (Tagged(..))
86import Data.Text (Text, pack)
87import Data.Text (Text, pack)
87−import Data.Time (Day, LocalTime, NominalDiffTime, TimeOfDay, UTCTime, ZonedTime)
88+import Data.Time (Day, DiffTime, LocalTime, NominalDiffTime, TimeOfDay, UTCTime, ZonedTime)
89+import Data.Time.Calendar.Compat (CalendarDiffDays (..), DayOfWeek (..))
90+import Data.Time.LocalTime.Compat (CalendarDiffTime (..))
91+import Data.Time.Clock.System.Compat (SystemTime (..))
88−import Data.Time.Format (FormatTime, formatTime)
92+import Data.Time.Format.Compat (FormatTime, formatTime, defaultTimeLocale)
89−import Data.Time.Locale.Compat (defaultTimeLocale)
90import Data.Vector (Vector)
93import Data.Vector (Vector)
91import Data.Version (Version, showVersion)
94import Data.Version (Version, showVersion)
95+import Data.Void (Void, absurd)
92import Data.Word (Word16, Word32, Word64, Word8)
96import Data.Word (Word16, Word32, Word64, Word8)
93import Foreign.Storable (Storable)
97import Foreign.Storable (Storable)
98+import Foreign.C.Types (CTime (..))
94import GHC.Generics
99import GHC.Generics
95import Numeric.Natural (Natural)
100import Numeric.Natural (Natural)
96import qualified Data.Aeson.Encoding as E
101import qualified Data.Aeson.Encoding as E
97−import qualified Data.Aeson.Encoding.Internal as E (InArray, colon, comma, econcat, empty, retagEncoding, wrapObject)
102+import qualified Data.Aeson.Encoding.Internal as E (InArray, comma, econcat, retagEncoding)
98−import qualified Data.ByteString as S
99import qualified Data.ByteString.Lazy as L
103import qualified Data.ByteString.Lazy as L
100import qualified Data.DList as DList
104import qualified Data.DList as DList
101import qualified Data.HashMap.Strict as H
105import qualified Data.HashMap.Strict as H
@@ -124,12 +128,16 @@ import qualified Data.Vector.Unboxed as VU
124import qualified Data.Aeson.Encoding.Builder as EB
128import qualified Data.Aeson.Encoding.Builder as EB
125import qualified Data.ByteString.Builder as B
129import qualified Data.ByteString.Builder as B
126
130
127−#if !(MIN_VERSION_bytestring(0,10,0))
131+import qualified GHC.Exts as Exts
128−import Foreign.ForeignPtr (withForeignPtr)
132+import qualified Data.Primitive.Array as PM
129−import Foreign.Marshal.Utils (copyBytes)
133+import qualified Data.Primitive.SmallArray as PM
130−import Foreign.Ptr (plusPtr)
134+import qualified Data.Primitive.Types as PM
131−import qualified Data.ByteString.Internal as S
135+
136+#if MIN_VERSION_primitive(0,6,4)
137+#if !MIN_VERSION_primitive(0,7,0)
138+import qualified Data.Primitive.UnliftedArray as PM
139+#endif
132−import qualified Data.ByteString.Lazy.Internal as L
140+import qualified Data.Primitive.PrimArray as PM
133#endif
141#endif
134
142
135toJSONPair :: (a -> Value) -> (b -> Value) -> (a, b) -> Value
143toJSONPair :: (a -> Value) -> (b -> Value) -> (a, b) -> Value
@@ -148,19 +156,16 @@ realFloatToJSON d
148
156
149-- | Class of generic representation types that can be converted to
157-- | Class of generic representation types that can be converted to
150-- JSON.
158-- JSON.
151−class GToJSON arity f where
159+class GToJSON enc arity f where
152 -- | This method (applied to 'defaultOptions') is used as the
160 -- | This method (applied to 'defaultOptions') is used as the
153− -- default generic implementation of 'toJSON' (if the @arity@ is 'Zero')
161+ -- default generic implementation of 'toJSON'
162+ -- (with @enc ~ 'Value'@ and @arity ~ 'Zero'@)
154− -- or 'liftToJSON' (if the @arity@ is 'One').
163+ -- and 'liftToJSON' (if the @arity@ is 'One').
155− gToJSON :: Options -> ToArgs Value arity a -> f a -> Value
164+ --
156−
157−-- | Class of generic representation types that can be converted to
158−-- a JSON 'Encoding'.
159−class GToEncoding arity f where
160− -- | This method (applied to 'defaultOptions') can be used as the
161− -- default generic implementation of 'toEncoding' (if the @arity@ is 'Zero')
165+ -- It also provides a generic implementation of 'toEncoding'
166+ -- (with @enc ~ 'Encoding'@ and @arity ~ 'Zero'@)
162− -- or 'liftToEncoding' (if the @arity@ is 'One').
167+ -- and 'liftToEncoding' (if the @arity@ is 'One').
163− gToEncoding :: Options -> ToArgs Encoding arity a -> f a -> Encoding
168+ gToJSON :: Options -> ToArgs enc arity a -> f a -> enc
164
169
165-- | A 'ToArgs' value either stores nothing (for 'ToJSON') or it stores the two
170-- | A 'ToArgs' value either stores nothing (for 'ToJSON') or it stores the two
166-- function arguments that encode occurrences of the type parameter (for
171-- function arguments that encode occurrences of the type parameter (for
@@ -172,14 +177,14 @@ data ToArgs res arity a where
172-- | A configurable generic JSON creator. This function applied to
177-- | A configurable generic JSON creator. This function applied to
173-- 'defaultOptions' is used as the default for 'toJSON' when the type
178-- 'defaultOptions' is used as the default for 'toJSON' when the type
174-- is an instance of 'Generic'.
179-- is an instance of 'Generic'.
175−genericToJSON :: (Generic a, GToJSON Zero (Rep a))
180+genericToJSON :: (Generic a, GToJSON Value Zero (Rep a))
176 => Options -> a -> Value
181 => Options -> a -> Value
177genericToJSON opts = gToJSON opts NoToArgs . from
182genericToJSON opts = gToJSON opts NoToArgs . from
178
183
179-- | A configurable generic JSON creator. This function applied to
184-- | A configurable generic JSON creator. This function applied to
180-- 'defaultOptions' is used as the default for 'liftToJSON' when the type
185-- 'defaultOptions' is used as the default for 'liftToJSON' when the type
181-- is an instance of 'Generic1'.
186-- is an instance of 'Generic1'.
182−genericLiftToJSON :: (Generic1 f, GToJSON One (Rep1 f))
187+genericLiftToJSON :: (Generic1 f, GToJSON Value One (Rep1 f))
183 => Options -> (a -> Value) -> ([a] -> Value)
188 => Options -> (a -> Value) -> ([a] -> Value)
184 -> f a -> Value
189 -> f a -> Value
185genericLiftToJSON opts tj tjl = gToJSON opts (To1Args tj tjl) . from1
190genericLiftToJSON opts tj tjl = gToJSON opts (To1Args tj tjl) . from1
@@ -187,17 +192,17 @@ genericLiftToJSON opts tj tjl = gToJSON opts (To1Args tj tjl) . from1
187-- | A configurable generic JSON encoder. This function applied to
192-- | A configurable generic JSON encoder. This function applied to
188-- 'defaultOptions' is used as the default for 'toEncoding' when the type
193-- 'defaultOptions' is used as the default for 'toEncoding' when the type
189-- is an instance of 'Generic'.
194-- is an instance of 'Generic'.
190−genericToEncoding :: (Generic a, GToEncoding Zero (Rep a))
195+genericToEncoding :: (Generic a, GToJSON Encoding Zero (Rep a))
191 => Options -> a -> Encoding
196 => Options -> a -> Encoding
192−genericToEncoding opts = gToEncoding opts NoToArgs . from
197+genericToEncoding opts = gToJSON opts NoToArgs . from
193
198
194-- | A configurable generic JSON encoder. This function applied to
199-- | A configurable generic JSON encoder. This function applied to
195-- 'defaultOptions' is used as the default for 'liftToEncoding' when the type
200-- 'defaultOptions' is used as the default for 'liftToEncoding' when the type
196-- is an instance of 'Generic1'.
201-- is an instance of 'Generic1'.
197−genericLiftToEncoding :: (Generic1 f, GToEncoding One (Rep1 f))
202+genericLiftToEncoding :: (Generic1 f, GToJSON Encoding One (Rep1 f))
198 => Options -> (a -> Encoding) -> ([a] -> Encoding)
203 => Options -> (a -> Encoding) -> ([a] -> Encoding)
199 -> f a -> Encoding
204 -> f a -> Encoding
200−genericLiftToEncoding opts te tel = gToEncoding opts (To1Args te tel) . from1
205+genericLiftToEncoding opts te tel = gToJSON opts (To1Args te tel) . from1
201
206
202-------------------------------------------------------------------------------
207-------------------------------------------------------------------------------
203-- Class
208-- Class
@@ -205,6 +210,9 @@ genericLiftToEncoding opts te tel = gToEncoding opts (To1Args te tel) . from1
205
210
206-- | A type that can be converted to JSON.
211-- | A type that can be converted to JSON.
207--
212--
213+-- Instances in general /must/ specify 'toJSON' and /should/ (but don't need
214+-- to) specify 'toEncoding'.
215+--
208-- An example type and instance:
216-- An example type and instance:
209--
217--
210-- @
218-- @
@@ -213,10 +221,10 @@ genericLiftToEncoding opts te tel = gToEncoding opts (To1Args te tel) . from1
213--
221--
214-- data Coord = Coord { x :: Double, y :: Double }
222-- data Coord = Coord { x :: Double, y :: Double }
215--
223--
216−-- instance ToJSON Coord where
224+-- instance 'ToJSON' Coord where
217−-- toJSON (Coord x y) = 'object' [\"x\" '.=' x, \"y\" '.=' y]
225+-- 'toJSON' (Coord x y) = 'object' [\"x\" '.=' x, \"y\" '.=' y]
218--
226--
219−-- toEncoding (Coord x y) = 'pairs' (\"x\" '.=' x '<>' \"y\" '.=' y)
227+-- 'toEncoding' (Coord x y) = 'pairs' (\"x\" '.=' x '<>' \"y\" '.=' y)
220-- @
228-- @
221--
229--
222-- Instead of manually writing your 'ToJSON' instance, there are two options
230-- Instead of manually writing your 'ToJSON' instance, there are two options
@@ -224,17 +232,15 @@ genericLiftToEncoding opts te tel = gToEncoding opts (To1Args te tel) . from1
224--
232--
225-- * "Data.Aeson.TH" provides Template Haskell functions which will derive an
233-- * "Data.Aeson.TH" provides Template Haskell functions which will derive an
226-- instance at compile time. The generated instance is optimized for your type
234-- instance at compile time. The generated instance is optimized for your type
227−-- so will probably be more efficient than the following two options:
235+-- so it will probably be more efficient than the following option.
228--
236--
229-- * The compiler can provide a default generic implementation for
237-- * The compiler can provide a default generic implementation for
230-- 'toJSON'.
238-- 'toJSON'.
231--
239--
232-- To use the second, simply add a @deriving 'Generic'@ clause to your
240-- To use the second, simply add a @deriving 'Generic'@ clause to your
233−-- datatype and declare a 'ToJSON' instance for your datatype without giving
241+-- datatype and declare a 'ToJSON' instance. If you require nothing other than
234−-- definitions for 'toJSON' or 'toEncoding'.
242+-- 'defaultOptions', it is sufficient to write (and this is the only
235−--
243+-- alternative where the default 'toJSON' implementation is sufficient):
236−-- For example, the previous example can be simplified to a more
237−-- minimal instance:
238--
244--
239-- @
245-- @
240-- {-\# LANGUAGE DeriveGeneric \#-}
246-- {-\# LANGUAGE DeriveGeneric \#-}
@@ -243,35 +249,46 @@ genericLiftToEncoding opts te tel = gToEncoding opts (To1Args te tel) . from1
243--
249--
244-- data Coord = Coord { x :: Double, y :: Double } deriving 'Generic'
250-- data Coord = Coord { x :: Double, y :: Double } deriving 'Generic'
245--
251--
246−-- instance ToJSON Coord where
252+-- instance 'ToJSON' Coord where
247−-- toEncoding = 'genericToEncoding' 'defaultOptions'
253+-- 'toEncoding' = 'genericToEncoding' 'defaultOptions'
248-- @
254-- @
249--
255--
250−-- Why do we provide an implementation for 'toEncoding' here? The
256+-- If on the other hand you wish to customize the generic decoding, you have
251−-- 'toEncoding' function is a relatively new addition to this class.
257+-- to implement both methods:
252−-- To allow users of older versions of this library to upgrade without
253−-- having to edit all of their instances or encounter surprising
254−-- incompatibilities, the default implementation of 'toEncoding' uses
255−-- 'toJSON'. This produces correct results, but since it performs an
256−-- intermediate conversion to a 'Value', it will be less efficient
257−-- than directly emitting an 'Encoding'. Our one-liner definition of
258−-- 'toEncoding' above bypasses the intermediate 'Value'.
259−--
260−-- If @DefaultSignatures@ doesn't give exactly the results you want,
261−-- you can customize the generic encoding with only a tiny amount of
262−-- effort, using 'genericToJSON' and 'genericToEncoding' with your
263−-- preferred 'Options':
264--
258--
265-- @
259-- @
260+-- customOptions = 'defaultOptions'
261+-- { 'fieldLabelModifier' = 'map' 'Data.Char.toUpper'
262+-- }
263+--
266−-- instance ToJSON Coord where
264+-- instance 'ToJSON' Coord where
267−-- toJSON = 'genericToJSON' 'defaultOptions'
265+-- 'toJSON' = 'genericToJSON' customOptions
268−-- toEncoding = 'genericToEncoding' 'defaultOptions'
266+-- 'toEncoding' = 'genericToEncoding' customOptions
269-- @
267-- @
268+--
269+-- Previous versions of this library only had the 'toJSON' method. Adding
270+-- 'toEncoding' had two reasons:
271+--
272+-- 1. toEncoding is more efficient for the common case that the output of
273+-- 'toJSON' is directly serialized to a @ByteString@.
274+-- Further, expressing either method in terms of the other would be
275+-- non-optimal.
276+--
277+-- 2. The choice of defaults allows a smooth transition for existing users:
278+-- Existing instances that do not define 'toEncoding' still
279+-- compile and have the correct semantics. This is ensured by making
280+-- the default implementation of 'toEncoding' use 'toJSON'. This produces
281+-- correct results, but since it performs an intermediate conversion to a
282+-- 'Value', it will be less efficient than directly emitting an 'Encoding'.
283+-- (this also means that specifying nothing more than
284+-- @instance ToJSON Coord@ would be sufficient as a generically decoding
285+-- instance, but there probably exists no good reason to not specify
286+-- 'toEncoding' in new instances.)
270class ToJSON a where
287class ToJSON a where
271 -- | Convert a Haskell value to a JSON-friendly intermediate type.
288 -- | Convert a Haskell value to a JSON-friendly intermediate type.
272 toJSON :: a -> Value
289 toJSON :: a -> Value
273
290
274− default toJSON :: (Generic a, GToJSON Zero (Rep a)) => a -> Value
291+ default toJSON :: (Generic a, GToJSON Value Zero (Rep a)) => a -> Value
275 toJSON = genericToJSON defaultOptions
292 toJSON = genericToJSON defaultOptions
276
293
277 -- | Encode a Haskell value as JSON.
294 -- | Encode a Haskell value as JSON.
@@ -288,8 +305,8 @@ class ToJSON a where
288 -- extension, and then have GHC generate a method body as follows.
305 -- extension, and then have GHC generate a method body as follows.
289 --
306 --
290 -- @
307 -- @
291− -- instance ToJSON Coord where
308+ -- instance 'ToJSON' Coord where
292− -- toEncoding = 'genericToEncoding' 'defaultOptions'
309+ -- 'toEncoding' = 'genericToEncoding' 'defaultOptions'
293 -- @
310 -- @
294
311
295 toEncoding :: a -> Encoding
312 toEncoding :: a -> Encoding
@@ -321,6 +338,13 @@ instance KeyValue Pair where
321 name .= value = (name, toJSON value)
338 name .= value = (name, toJSON value)
322 {-# INLINE (.=) #-}
339 {-# INLINE (.=) #-}
323
340
341+-- | Constructs a singleton 'H.HashMap'. For calling functions that
342+-- demand an 'Object' for constructing objects. To be used in
343+-- conjunction with 'mconcat'. Prefer to use 'object' where possible.
344+instance KeyValue Object where
345+ name .= value = H.singleton name (toJSON value)
346+ {-# INLINE (.=) #-}
347+
324-------------------------------------------------------------------------------
348-------------------------------------------------------------------------------
325-- Classes and types for map keys
349-- Classes and types for map keys
326-------------------------------------------------------------------------------
350-------------------------------------------------------------------------------
@@ -378,7 +402,7 @@ instance KeyValue Pair where
378-- newtype wrapper around 'Text'. The recommended approach is to use
402-- newtype wrapper around 'Text'. The recommended approach is to use
379-- generalized newtype deriving:
403-- generalized newtype deriving:
380--
404--
381−-- > newtype RecordId = RecordId { getRecordId :: Text}
405+-- > newtype RecordId = RecordId { getRecordId :: Text }
382-- > deriving (Eq,Ord,ToJSONKey)
406-- > deriving (Eq,Ord,ToJSONKey)
383--
407--
384-- Then we may write:
408-- Then we may write:
@@ -393,8 +417,18 @@ instance KeyValue Pair where
393--
417--
394-- It is possible to get the 'ToJSONKey' instance for free as we did
418-- It is possible to get the 'ToJSONKey' instance for free as we did
395-- with 'Foo'. However, in this case, we have a natural way to go to
419-- with 'Foo'. However, in this case, we have a natural way to go to
396−-- and from 'Text' that does not require any escape sequences. So, in
420+-- and from 'Text' that does not require any escape sequences. So
397−-- this example, 'ToJSONKeyText' will be used instead of 'ToJSONKeyValue'.
421+-- 'ToJSONKeyText' can be used instead of 'ToJSONKeyValue' to encode maps
422+-- as objects instead of arrays of pairs. This instance may be
423+-- implemented using generics as follows:
424+--
425+-- @
426+-- instance 'ToJSONKey' Color where
427+-- 'toJSONKey' = 'genericToJSONKey' 'defaultJSONKeyOptions'
428+-- @
429+--
430+-- === __Low-level implementations__
431+--
398-- The 'Show' instance can be used to help write 'ToJSONKey':
432-- The 'Show' instance can be used to help write 'ToJSONKey':
399--
433--
400-- > instance ToJSONKey Color where
434-- > instance ToJSONKey Color where
@@ -469,16 +503,42 @@ toJSONKeyTextEnc e = ToJSONKeyText tot e
469 -- TODO: dropAround is also used in stringEncoding, which is unfortunate atm
503 -- TODO: dropAround is also used in stringEncoding, which is unfortunate atm
470 tot = T.dropAround (== '"')
504 tot = T.dropAround (== '"')
471 . T.decodeLatin1
505 . T.decodeLatin1
472− . lazyToStrictByteString
506+ . L.toStrict
473 . E.encodingToLazyByteString
507 . E.encodingToLazyByteString
474 . e
508 . e
475
509
510+instance Contravariant ToJSONKeyFunction where
511+ contramap = contramapToJSONKeyFunction
512+
476-- | Contravariant map, as 'ToJSONKeyFunction' is a contravariant functor.
513-- | Contravariant map, as 'ToJSONKeyFunction' is a contravariant functor.
477contramapToJSONKeyFunction :: (b -> a) -> ToJSONKeyFunction a -> ToJSONKeyFunction b
514contramapToJSONKeyFunction :: (b -> a) -> ToJSONKeyFunction a -> ToJSONKeyFunction b
478contramapToJSONKeyFunction h x = case x of
515contramapToJSONKeyFunction h x = case x of
479 ToJSONKeyText f g -> ToJSONKeyText (f . h) (g . h)
516 ToJSONKeyText f g -> ToJSONKeyText (f . h) (g . h)
480 ToJSONKeyValue f g -> ToJSONKeyValue (f . h) (g . h)
517 ToJSONKeyValue f g -> ToJSONKeyValue (f . h) (g . h)
481
518
519+-- 'toJSONKey' for 'Generic' types.
520+-- Deriving is supported for enumeration types, i.e. the sums of nullary
521+-- constructors. The names of constructors will be used as keys for JSON
522+-- objects.
523+--
524+-- See also 'genericFromJSONKey'.
525+--
526+-- === __Example__
527+--
528+-- @
529+-- data Color = Red | Green | Blue
530+-- deriving 'Generic'
531+--
532+-- instance 'ToJSONKey' Color where
533+-- 'toJSONKey' = 'genericToJSONKey' 'defaultJSONKeyOptions'
534+-- @
535+genericToJSONKey :: (Generic a, GToJSONKey (Rep a))
536+ => JSONKeyOptions -> ToJSONKeyFunction a
537+genericToJSONKey opts = toJSONKeyText (pack . keyModifier opts . getConName . from)
538+
539+class GetConName f => GToJSONKey f
540+instance GetConName f => GToJSONKey f
541+
482-------------------------------------------------------------------------------
542-------------------------------------------------------------------------------
483-- Lifings of FromJSON and ToJSON to unary and binary type constructors
543-- Lifings of FromJSON and ToJSON to unary and binary type constructors
484-------------------------------------------------------------------------------
544-------------------------------------------------------------------------------
@@ -491,7 +551,7 @@ contramapToJSONKeyFunction h x = case x of
491--
551--
492-- * "Data.Aeson.TH" provides Template Haskell functions which will derive an
552-- * "Data.Aeson.TH" provides Template Haskell functions which will derive an
493-- instance at compile time. The generated instance is optimized for your type
553-- instance at compile time. The generated instance is optimized for your type
494−-- so will probably be more efficient than the following two options:
554+-- so it will probably be more efficient than the following option.
495--
555--
496-- * The compiler can provide a default generic implementation for
556-- * The compiler can provide a default generic implementation for
497-- 'toJSON1'.
557-- 'toJSON1'.
@@ -509,23 +569,29 @@ contramapToJSONKeyFunction h x = case x of
509--
569--
510-- data Pair = Pair { pairFst :: a, pairSnd :: b } deriving 'Generic1'
570-- data Pair = Pair { pairFst :: a, pairSnd :: b } deriving 'Generic1'
511--
571--
512−-- instance ToJSON a => ToJSON1 (Pair a)
572+-- instance 'ToJSON' a => 'ToJSON1' (Pair a)
513-- @
573-- @
514--
574--
515−-- If @DefaultSignatures@ doesn't give exactly the results you want,
575+-- If the default implementation doesn't give exactly the results you want,
516-- you can customize the generic encoding with only a tiny amount of
576-- you can customize the generic encoding with only a tiny amount of
517-- effort, using 'genericLiftToJSON' and 'genericLiftToEncoding' with
577-- effort, using 'genericLiftToJSON' and 'genericLiftToEncoding' with
518-- your preferred 'Options':
578-- your preferred 'Options':
519--
579--
520-- @
580-- @
581+-- customOptions = 'defaultOptions'
582+-- { 'fieldLabelModifier' = 'map' 'Data.Char.toUpper'
583+-- }
584+--
521−-- instance ToJSON a => ToJSON1 (Pair a) where
585+-- instance 'ToJSON' a => 'ToJSON1' (Pair a) where
522−-- liftToJSON = 'genericLiftToJSON' 'defaultOptions'
586+-- 'liftToJSON' = 'genericLiftToJSON' customOptions
523−-- liftToEncoding = 'genericLiftToEncoding' 'defaultOptions'
587+-- 'liftToEncoding' = 'genericLiftToEncoding' customOptions
524-- @
588-- @
589+--
590+-- See also 'ToJSON'.
525class ToJSON1 f where
591class ToJSON1 f where
526 liftToJSON :: (a -> Value) -> ([a] -> Value) -> f a -> Value
592 liftToJSON :: (a -> Value) -> ([a] -> Value) -> f a -> Value
527
593
528− default liftToJSON :: (Generic1 f, GToJSON One (Rep1 f))
594+ default liftToJSON :: (Generic1 f, GToJSON Value One (Rep1 f))
529 => (a -> Value) -> ([a] -> Value) -> f a -> Value
595 => (a -> Value) -> ([a] -> Value) -> f a -> Value
530 liftToJSON = genericLiftToJSON defaultOptions
596 liftToJSON = genericLiftToJSON defaultOptions
531
597
@@ -534,7 +600,7 @@ class ToJSON1 f where
534
600
535 liftToEncoding :: (a -> Encoding) -> ([a] -> Encoding) -> f a -> Encoding
601 liftToEncoding :: (a -> Encoding) -> ([a] -> Encoding) -> f a -> Encoding
536
602
537− default liftToEncoding :: (Generic1 f, GToEncoding One (Rep1 f))
603+ default liftToEncoding :: (Generic1 f, GToJSON Encoding One (Rep1 f))
538 => (a -> Encoding) -> ([a] -> Encoding)
604 => (a -> Encoding) -> ([a] -> Encoding)
539 -> f a -> Encoding
605 -> f a -> Encoding
540 liftToEncoding = genericLiftToEncoding defaultOptions
606 liftToEncoding = genericLiftToEncoding defaultOptions
@@ -588,7 +654,7 @@ toEncoding2 = liftToEncoding2 toEncoding toEncodingList toEncoding toEncodingLis
588-- @
654-- @
589-- newtype F a = F [a]
655-- newtype F a = F [a]
590--
656--
591−-- -- This instance encodes String as an array of chars
657+-- -- This instance encodes 'String' as an array of chars
592-- instance 'ToJSON1' F where
658-- instance 'ToJSON1' F where
593-- 'liftToJSON' tj _ (F xs) = 'liftToJSON' tj ('listValue' tj) xs
659-- 'liftToJSON' tj _ (F xs) = 'liftToJSON' tj ('listValue' tj) xs
594-- 'liftToEncoding' te _ (F xs) = 'liftToEncoding' te ('listEncoding' te) xs
660-- 'liftToEncoding' te _ (F xs) = 'liftToEncoding' te ('listEncoding' te) xs
@@ -634,39 +700,80 @@ instance (ToJSON a) => ToJSON [a] where
634-- Generic toJSON / toEncoding
700-- Generic toJSON / toEncoding
635-------------------------------------------------------------------------------
701-------------------------------------------------------------------------------
636
702
637−--------------------------------------------------------------------------------
638−-- Generic toJSON
639−
640−instance OVERLAPPABLE_ (GToJSON arity a) => GToJSON arity (M1 i c a) where
703+instance OVERLAPPABLE_ (GToJSON enc arity a) => GToJSON enc arity (M1 i c a) where
641 -- Meta-information, which is not handled elsewhere, is ignored:
704 -- Meta-information, which is not handled elsewhere, is ignored:
642 gToJSON opts targs = gToJSON opts targs . unM1
705 gToJSON opts targs = gToJSON opts targs . unM1
706+ {-# INLINE gToJSON #-}
643
707
644−instance (ToJSON a) => GToJSON arity (K1 i a) where
708+instance GToJSON enc One Par1 where
645− -- Constant values are encoded using their ToJSON instance:
646− gToJSON _opts _ = toJSON . unK1
647−
648−instance GToJSON One Par1 where
649 -- Direct occurrences of the last type parameter are encoded with the
709 -- Direct occurrences of the last type parameter are encoded with the
650 -- function passed in as an argument:
710 -- function passed in as an argument:
651 gToJSON _opts (To1Args tj _) = tj . unPar1
711 gToJSON _opts (To1Args tj _) = tj . unPar1
712+ {-# INLINE gToJSON #-}
713+
714+instance ( ConsToJSON enc arity a
715+ , AllNullary (C1 c a) allNullary
716+ , SumToJSON enc arity (C1 c a) allNullary
717+ ) => GToJSON enc arity (D1 d (C1 c a)) where
718+ -- The option 'tagSingleConstructors' determines whether to wrap
719+ -- a single-constructor type.
720+ gToJSON opts targs
721+ | tagSingleConstructors opts = (unTagged :: Tagged allNullary enc -> enc)
722+ . sumToJSON opts targs
723+ . unM1
724+ | otherwise = consToJSON opts targs . unM1 . unM1
725+ {-# INLINE gToJSON #-}
726+
727+instance (ConsToJSON enc arity a) => GToJSON enc arity (C1 c a) where
728+ -- Constructors need to be encoded differently depending on whether they're
729+ -- a record or not. This distinction is made by 'consToJSON':
730+ gToJSON opts targs = consToJSON opts targs . unM1
731+ {-# INLINE gToJSON #-}
652
732
733+instance ( AllNullary (a :+: b) allNullary
734+ , SumToJSON enc arity (a :+: b) allNullary
735+ ) => GToJSON enc arity (a :+: b)
736+ where
737+ -- If all constructors of a sum datatype are nullary and the
738+ -- 'allNullaryToStringTag' option is set they are encoded to
739+ -- strings. This distinction is made by 'sumToJSON':
740+ gToJSON opts targs = (unTagged :: Tagged allNullary enc -> enc)
741+ . sumToJSON opts targs
742+ {-# INLINE gToJSON #-}
743+
744+--------------------------------------------------------------------------------
745+-- Generic toJSON
746+
747+-- Note: Refactoring 'ToJSON a' to 'ToJSON enc a' (and 'ToJSON1' similarly) is
748+-- possible but makes error messages a bit harder to understand for missing
749+-- instances.
750+
751+instance GToJSON Value arity V1 where
752+ -- Empty values do not exist, which makes the job of formatting them
753+ -- rather easy:
754+ gToJSON _ _ x = x `seq` error "case: V1"
755+ {-# INLINE gToJSON #-}
756+
757+instance ToJSON a => GToJSON Value arity (K1 i a) where
758+ -- Constant values are encoded using their ToJSON instance:
759+ gToJSON _opts _ = toJSON . unK1
760+ {-# INLINE gToJSON #-}
761+
653−instance (ToJSON1 f) => GToJSON One (Rec1 f) where
762+instance ToJSON1 f => GToJSON Value One (Rec1 f) where
654 -- Recursive occurrences of the last type parameter are encoded using their
763 -- Recursive occurrences of the last type parameter are encoded using their
655 -- ToJSON1 instance:
764 -- ToJSON1 instance:
656 gToJSON _opts (To1Args tj tjl) = liftToJSON tj tjl . unRec1
765 gToJSON _opts (To1Args tj tjl) = liftToJSON tj tjl . unRec1
766+ {-# INLINE gToJSON #-}
657
767
658−instance GToJSON arity U1 where
768+instance GToJSON Value arity U1 where
659 -- Empty constructors are encoded to an empty array:
769 -- Empty constructors are encoded to an empty array:
660 gToJSON _opts _ _ = emptyArray
770 gToJSON _opts _ _ = emptyArray
661−
771+ {-# INLINE gToJSON #-}
662−instance (ConsToJSON arity a) => GToJSON arity (C1 c a) where
663− -- Constructors need to be encoded differently depending on whether they're
664− -- a record or not. This distinction is made by 'consToJSON':
665− gToJSON opts targs = consToJSON opts targs . unM1
666
772
667instance ( WriteProduct arity a, WriteProduct arity b
773instance ( WriteProduct arity a, WriteProduct arity b
668 , ProductSize a, ProductSize b
774 , ProductSize a, ProductSize b
669− ) => GToJSON arity (a :*: b) where
775+ ) => GToJSON Value arity (a :*: b)
776+ where
670 -- Products are encoded to an array. Here we allocate a mutable vector of
777 -- Products are encoded to an array. Here we allocate a mutable vector of
671 -- the same size as the product and write the product's elements to it using
778 -- the same size as the product and write the product's elements to it using
672 -- 'writeProduct':
779 -- 'writeProduct':
@@ -678,237 +785,175 @@ instance ( WriteProduct arity a, WriteProduct arity b
678 where
785 where
679 lenProduct = (unTagged2 :: Tagged2 (a :*: b) Int -> Int)
786 lenProduct = (unTagged2 :: Tagged2 (a :*: b) Int -> Int)
680 productSize
787 productSize
788+ {-# INLINE gToJSON #-}
681
789
682−instance ( AllNullary (a :+: b) allNullary
790+instance ( ToJSON1 f
683− , SumToJSON arity (a :+: b) allNullary
791+ , GToJSON Value One g
684− ) => GToJSON arity (a :+: b) where
792+ ) => GToJSON Value One (f :.: g)
685− -- If all constructors of a sum datatype are nullary and the
793+ where
686− -- 'allNullaryToStringTag' option is set they are encoded to
687− -- strings. This distinction is made by 'sumToJSON':
688− gToJSON opts targs = (unTagged :: Tagged allNullary Value -> Value)
689− . sumToJSON opts targs
690−
691−instance (ToJSON1 f, GToJSON One g) => GToJSON One (f :.: g) where
692 -- If an occurrence of the last type parameter is nested inside two
794 -- If an occurrence of the last type parameter is nested inside two
693 -- composed types, it is encoded by using the outermost type's ToJSON1
795 -- composed types, it is encoded by using the outermost type's ToJSON1
694 -- instance to generically encode the innermost type:
796 -- instance to generically encode the innermost type:
695 gToJSON opts targs =
797 gToJSON opts targs =
696 let gtj = gToJSON opts targs in
798 let gtj = gToJSON opts targs in
697 liftToJSON gtj (listValue gtj) . unComp1
799 liftToJSON gtj (listValue gtj) . unComp1
800+ {-# INLINE gToJSON #-}
698
801
699--------------------------------------------------------------------------------
802--------------------------------------------------------------------------------
700-- Generic toEncoding
803-- Generic toEncoding
701
804
702−instance OVERLAPPABLE_ (GToEncoding arity a) => GToEncoding arity (M1 i c a) where
703− -- Meta-information, which is not handled elsewhere, is ignored:
704− gToEncoding opts targs = gToEncoding opts targs . unM1
705−
706−instance (ToJSON a) => GToEncoding arity (K1 i a) where
805+instance ToJSON a => GToJSON Encoding arity (K1 i a) where
707 -- Constant values are encoded using their ToJSON instance:
806 -- Constant values are encoded using their ToJSON instance:
708− gToEncoding _opts _ = toEncoding . unK1
807+ gToJSON _opts _ = toEncoding . unK1
709−
808+ {-# INLINE gToJSON #-}
710−instance GToEncoding One Par1 where
711− -- Direct occurrences of the last type parameter are encoded with the
712− -- function passed in as an argument:
713− gToEncoding _opts (To1Args te _) = te . unPar1
714
809
715−instance (ToJSON1 f) => GToEncoding One (Rec1 f) where
810+instance ToJSON1 f => GToJSON Encoding One (Rec1 f) where
716 -- Recursive occurrences of the last type parameter are encoded using their
811 -- Recursive occurrences of the last type parameter are encoded using their
717 -- ToEncoding1 instance:
812 -- ToEncoding1 instance:
718− gToEncoding _opts (To1Args te tel) = liftToEncoding te tel . unRec1
813+ gToJSON _opts (To1Args te tel) = liftToEncoding te tel . unRec1
814+ {-# INLINE gToJSON #-}
719
815
720−instance GToEncoding arity U1 where
816+instance GToJSON Encoding arity U1 where
721 -- Empty constructors are encoded to an empty array:
817 -- Empty constructors are encoded to an empty array:
722− gToEncoding _opts _ _ = E.emptyArray_
818+ gToJSON _opts _ _ = E.emptyArray_
723−
819+ {-# INLINE gToJSON #-}
724−instance (ConsToEncoding arity a) => GToEncoding arity (C1 c a) where
725− -- Constructors need to be encoded differently depending on whether they're
726− -- a record or not. This distinction is made by 'consToEncoding':
727− gToEncoding opts targs = consToEncoding opts targs . unM1
728
820
729instance ( EncodeProduct arity a
821instance ( EncodeProduct arity a
730 , EncodeProduct arity b
822 , EncodeProduct arity b
731− ) => GToEncoding arity (a :*: b) where
823+ ) => GToJSON Encoding arity (a :*: b)
824+ where
732 -- Products are encoded to an array. Here we allocate a mutable vector of
825 -- Products are encoded to an array. Here we allocate a mutable vector of
733 -- the same size as the product and write the product's elements to it using
826 -- the same size as the product and write the product's elements to it using
734 -- 'encodeProduct':
827 -- 'encodeProduct':
735− gToEncoding opts targs p = E.list E.retagEncoding [encodeProduct opts targs p]
828+ gToJSON opts targs p = E.list E.retagEncoding [encodeProduct opts targs p]
736−
829+ {-# INLINE gToJSON #-}
737−instance ( AllNullary (a :+: b) allNullary
738− , SumToEncoding arity (a :+: b) allNullary
739− ) => GToEncoding arity (a :+: b) where
740− -- If all constructors of a sum datatype are nullary and the
741− -- 'allNullaryToStringTag' option is set they are encoded to
742− -- strings. This distinction is made by 'sumToEncoding':
743− gToEncoding opts targs
744− = (unTagged :: Tagged allNullary Encoding -> Encoding)
745− . sumToEncoding opts targs
746
830
747−instance (ToJSON1 f, GToEncoding One g) => GToEncoding One (f :.: g) where
831+instance ( ToJSON1 f
832+ , GToJSON Encoding One g
833+ ) => GToJSON Encoding One (f :.: g)
834+ where
748 -- If an occurrence of the last type parameter is nested inside two
835 -- If an occurrence of the last type parameter is nested inside two
749 -- composed types, it is encoded by using the outermost type's ToJSON1
836 -- composed types, it is encoded by using the outermost type's ToJSON1
750 -- instance to generically encode the innermost type:
837 -- instance to generically encode the innermost type:
751− gToEncoding opts targs =
838+ gToJSON opts targs =
752− let gte = gToEncoding opts targs in
839+ let gte = gToJSON opts targs in
753 liftToEncoding gte (listEncoding gte) . unComp1
840 liftToEncoding gte (listEncoding gte) . unComp1
841+ {-# INLINE gToJSON #-}
754
842
755--------------------------------------------------------------------------------
843--------------------------------------------------------------------------------
756
844
757−class SumToJSON arity f allNullary where
845+class SumToJSON enc arity f allNullary where
758− sumToJSON :: Options -> ToArgs Value arity a
846+ sumToJSON :: Options -> ToArgs enc arity a
759− -> f a -> Tagged allNullary Value
847+ -> f a -> Tagged allNullary enc
760−
848+
761−instance ( GetConName f
849+instance ( GetConName f
762− , TaggedObjectPairs arity f
850+ , FromString enc
763− , ObjectWithSingleFieldObj arity f
851+ , TaggedObject enc arity f
764− , TwoElemArrayObj arity f
852+ , SumToJSON' ObjectWithSingleField enc arity f
765− , UntaggedValueObj arity f
853+ , SumToJSON' TwoElemArray enc arity f
854+ , SumToJSON' UntaggedValue enc arity f
766− ) => SumToJSON arity f True where
855+ ) => SumToJSON enc arity f True
856+ where
767 sumToJSON opts targs
857 sumToJSON opts targs
768− | allNullaryToStringTag opts = Tagged . String . pack
858+ | allNullaryToStringTag opts = Tagged . fromString
769 . constructorTagModifier opts . getConName
859 . constructorTagModifier opts . getConName
770 | otherwise = Tagged . nonAllNullarySumToJSON opts targs
860 | otherwise = Tagged . nonAllNullarySumToJSON opts targs
771
861
772−instance ( TwoElemArrayObj arity f
862+instance ( TaggedObject enc arity f
773− , TaggedObjectPairs arity f
863+ , SumToJSON' ObjectWithSingleField enc arity f
774− , ObjectWithSingleFieldObj arity f
864+ , SumToJSON' TwoElemArray enc arity f
775− , UntaggedValueObj arity f
865+ , SumToJSON' UntaggedValue enc arity f
776− ) => SumToJSON arity f False where
866+ ) => SumToJSON enc arity f False
867+ where
777 sumToJSON opts targs = Tagged . nonAllNullarySumToJSON opts targs
868 sumToJSON opts targs = Tagged . nonAllNullarySumToJSON opts targs
778
869
779−nonAllNullarySumToJSON :: ( TwoElemArrayObj arity f
870+nonAllNullarySumToJSON :: ( TaggedObject enc arity f
780− , TaggedObjectPairs arity f
871+ , SumToJSON' ObjectWithSingleField enc arity f
781− , ObjectWithSingleFieldObj arity f
872+ , SumToJSON' TwoElemArray enc arity f
782− , UntaggedValueObj arity f
873+ , SumToJSON' UntaggedValue enc arity f
783− ) => Options -> ToArgs Value arity a
874+ ) => Options -> ToArgs enc arity a
784− -> f a -> Value
875+ -> f a -> enc
785nonAllNullarySumToJSON opts targs =
876nonAllNullarySumToJSON opts targs =
786 case sumEncoding opts of
877 case sumEncoding opts of
787− TaggedObject{..} ->
788− object . taggedObjectPairs opts targs tagFieldName contentsFieldName
789− ObjectWithSingleField -> Object . objectWithSingleFieldObj opts targs
790− TwoElemArray -> Array . twoElemArrayObj opts targs
791− UntaggedValue -> untaggedValueObj opts targs
792
878
793−--------------------------------------------------------------------------------
794−
795−class SumToEncoding arity f allNullary where
796− sumToEncoding :: Options -> ToArgs Encoding arity a
797− -> f a -> Tagged allNullary Encoding
798−
799−instance ( GetConName f
800− , TaggedObjectEnc arity f
801− , ObjectWithSingleFieldEnc arity f
802− , TwoElemArrayEnc arity f
803− , UntaggedValueEnc arity f
804− ) => SumToEncoding arity f True where
805− sumToEncoding opts targs
806− | allNullaryToStringTag opts = Tagged . toEncoding .
807− constructorTagModifier opts . getConName
808− | otherwise = Tagged . nonAllNullarySumToEncoding opts targs
809−
810−instance ( TwoElemArrayEnc arity f
811− , TaggedObjectEnc arity f
812− , ObjectWithSingleFieldEnc arity f
813− , UntaggedValueEnc arity f
814− ) => SumToEncoding arity f False where
815− sumToEncoding opts targs = Tagged . nonAllNullarySumToEncoding opts targs
816−
817−nonAllNullarySumToEncoding :: ( TwoElemArrayEnc arity f
818− , TaggedObjectEnc arity f
819− , ObjectWithSingleFieldEnc arity f
820− , UntaggedValueEnc arity f
821− ) => Options -> ToArgs Encoding arity a
822− -> f a -> Encoding
823−nonAllNullarySumToEncoding opts targs =
824− case sumEncoding opts of
825 TaggedObject{..} ->
879 TaggedObject{..} ->
826− taggedObjectEnc opts targs tagFieldName contentsFieldName
880+ taggedObject opts targs tagFieldName contentsFieldName
827− ObjectWithSingleField -> objectWithSingleFieldEnc opts targs
828− TwoElemArray -> twoElemArrayEnc opts targs
829− UntaggedValue -> untaggedValueEnc opts targs
830
881
831−--------------------------------------------------------------------------------
882+ ObjectWithSingleField ->
883+ (unTagged :: Tagged ObjectWithSingleField enc -> enc)
884+ . sumToJSON' opts targs
832
885
833−class TaggedObjectPairs arity f where
886+ TwoElemArray ->
834− taggedObjectPairs :: Options -> ToArgs Value arity a
887+ (unTagged :: Tagged TwoElemArray enc -> enc)
835− -> String -> String
888+ . sumToJSON' opts targs
836− -> f a -> [Pair]
889+
837−
890+ UntaggedValue ->
838−instance ( TaggedObjectPairs arity a
839− , TaggedObjectPairs arity b
840− ) => TaggedObjectPairs arity (a :+: b) where
841− taggedObjectPairs opts targs tagFieldName contentsFieldName (L1 x) =
842− taggedObjectPairs opts targs tagFieldName contentsFieldName x
843− taggedObjectPairs opts targs tagFieldName contentsFieldName (R1 x) =
844− taggedObjectPairs opts targs tagFieldName contentsFieldName x
845−
846−instance ( IsRecord a isRecord
847− , TaggedObjectPairs' arity a isRecord
848− , Constructor c
849− ) => TaggedObjectPairs arity (C1 c a) where
850− taggedObjectPairs opts targs tagFieldName contentsFieldName =
851− (pack tagFieldName .= constructorTagModifier opts
852− (conName (undefined :: t c a p)) :) .
853− (unTagged :: Tagged isRecord [Pair] -> [Pair]) .
891+ (unTagged :: Tagged UntaggedValue enc -> enc)
854− taggedObjectPairs' opts targs contentsFieldName . unM1
892+ . sumToJSON' opts targs
855
893
856−class TaggedObjectPairs' arity f isRecord where
894+--------------------------------------------------------------------------------
857− taggedObjectPairs' :: Options -> ToArgs Value arity a
858− -> String -> f a -> Tagged isRecord [Pair]
859
895
860−instance OVERLAPPING_ TaggedObjectPairs' arity U1 False where
896+class FromString enc where
861− taggedObjectPairs' _ _ _ _ = Tagged []
897+ fromString :: String -> enc
862
898
863−instance (RecordToPairs arity f) => TaggedObjectPairs' arity f True where
899+instance FromString Encoding where
864− taggedObjectPairs' opts targs _ =
900+ fromString = toEncoding
865− Tagged . toList . recordToPairs opts targs
866
901
867−instance (GToJSON arity f) => TaggedObjectPairs' arity f False where
902+instance FromString Value where
868− taggedObjectPairs' opts targs contentsFieldName =
903+ fromString = String . pack
869− Tagged . (:[]) . (pack contentsFieldName .=) . gToJSON opts targs
870
904
871--------------------------------------------------------------------------------
905--------------------------------------------------------------------------------
872
906
873−class TaggedObjectEnc arity f where
907+class TaggedObject enc arity f where
874− taggedObjectEnc :: Options -> ToArgs Encoding arity a
908+ taggedObject :: Options -> ToArgs enc arity a
875− -> String -> String
909+ -> String -> String
876− -> f a -> Encoding
910+ -> f a -> enc
877−
911+
878−instance ( TaggedObjectEnc arity a
912+instance ( TaggedObject enc arity a
879− , TaggedObjectEnc arity b
913+ , TaggedObject enc arity b
880− ) => TaggedObjectEnc arity (a :+: b) where
914+ ) => TaggedObject enc arity (a :+: b)
915+ where
881− taggedObjectEnc opts targs tagFieldName contentsFieldName (L1 x) =
916+ taggedObject opts targs tagFieldName contentsFieldName (L1 x) =
882− taggedObjectEnc opts targs tagFieldName contentsFieldName x
917+ taggedObject opts targs tagFieldName contentsFieldName x
883− taggedObjectEnc opts targs tagFieldName contentsFieldName (R1 x) =
918+ taggedObject opts targs tagFieldName contentsFieldName (R1 x) =
884− taggedObjectEnc opts targs tagFieldName contentsFieldName x
919+ taggedObject opts targs tagFieldName contentsFieldName x
885−
920+
886−instance ( IsRecord a isRecord
921+instance ( IsRecord a isRecord
887− , TaggedObjectEnc' arity a isRecord
922+ , TaggedObject' enc pairs arity a isRecord
923+ , FromPairs enc pairs
924+ , FromString enc
925+ , KeyValuePair enc pairs
888 , Constructor c
926 , Constructor c
889− ) => TaggedObjectEnc arity (C1 c a) where
927+ ) => TaggedObject enc arity (C1 c a)
928+ where
890− taggedObjectEnc opts targs tagFieldName contentsFieldName v = E.pairs (E.pair key val)
929+ taggedObject opts targs tagFieldName contentsFieldName =
930+ fromPairs . mappend tag . contents
891 where
931 where
892− key :: Text
893− key = pack tagFieldName
932+ tag = tagFieldName `pair`
894− val = toEncoding (constructorTagModifier opts (conName (undefined :: t c a p)))
933+ (fromString (constructorTagModifier opts (conName (undefined :: t c a p)))
934+ :: enc)
935+ contents =
936+ (unTagged :: Tagged isRecord pairs -> pairs) .
895− >< ((unTagged :: Tagged isRecord Encoding -> Encoding) . taggedObjectEnc' opts targs contentsFieldName . unM1 $ v)
937+ taggedObject' opts targs contentsFieldName . unM1
896−
938+
897−class TaggedObjectEnc' arity f isRecord where
939+class TaggedObject' enc pairs arity f isRecord where
898− taggedObjectEnc' :: Options -> ToArgs Encoding arity a
940+ taggedObject' :: Options -> ToArgs enc arity a
899− -> String -> f a -> Tagged isRecord Encoding
941+ -> String -> f a -> Tagged isRecord pairs
900−
942+
901−instance OVERLAPPING_ TaggedObjectEnc' arity U1 False where
943+instance ( GToJSON enc arity f
902− taggedObjectEnc' _ _ _ _ = Tagged E.empty
944+ , KeyValuePair enc pairs
945+ ) => TaggedObject' enc pairs arity f False
946+ where
947+ taggedObject' opts targs contentsFieldName =
948+ Tagged . (contentsFieldName `pair`) . gToJSON opts targs
903
949
904−instance (RecordToEncoding arity f) => TaggedObjectEnc' arity f True where
950+instance OVERLAPPING_ Monoid pairs => TaggedObject' enc pairs arity U1 False where
905− taggedObjectEnc' opts targs _ = Tagged . (E.comma ><) . fst
951+ taggedObject' _ _ _ _ = Tagged mempty
906− . recordToEncoding opts targs
907
952
908−instance (GToEncoding arity f) => TaggedObjectEnc' arity f False where
953+instance ( RecordToPairs enc pairs arity f
909− taggedObjectEnc' opts targs contentsFieldName =
954+ ) => TaggedObject' enc pairs arity f True
910− Tagged . (\z -> E.comma >< toEncoding contentsFieldName >< E.colon >< z) .
955+ where
911− gToEncoding opts targs
956+ taggedObject' opts targs _ = Tagged . recordToPairs opts targs
912
957
913--------------------------------------------------------------------------------
958--------------------------------------------------------------------------------
914
959
@@ -923,23 +968,38 @@ instance (GetConName a, GetConName b) => GetConName (a :+: b) where
923instance (Constructor c) => GetConName (C1 c a) where
968instance (Constructor c) => GetConName (C1 c a) where
924 getConName = conName
969 getConName = conName
925
970
971+-- For genericToJSONKey
972+instance GetConName a => GetConName (D1 d a) where
973+ getConName (M1 x) = getConName x
974+
926--------------------------------------------------------------------------------
975--------------------------------------------------------------------------------
927
976
928−class TwoElemArrayObj arity f where
977+-- Reflection of SumEncoding variants
929− twoElemArrayObj :: Options -> ToArgs Value arity a
930− -> f a -> V.Vector Value
931
978
932−instance ( TwoElemArrayObj arity a
979+data ObjectWithSingleField
933− , TwoElemArrayObj arity b
980+data TwoElemArray
934− ) => TwoElemArrayObj arity (a :+: b) where
981+data UntaggedValue
935− twoElemArrayObj opts targs (L1 x) = twoElemArrayObj opts targs x
936− twoElemArrayObj opts targs (R1 x) = twoElemArrayObj opts targs x
937
982
983+--------------------------------------------------------------------------------
984+
985+class SumToJSON' s enc arity f where
986+ sumToJSON' :: Options -> ToArgs enc arity a
987+ -> f a -> Tagged s enc
988+
989+instance ( SumToJSON' s enc arity a
990+ , SumToJSON' s enc arity b
991+ ) => SumToJSON' s enc arity (a :+: b)
992+ where
993+ sumToJSON' opts targs (L1 x) = sumToJSON' opts targs x
994+ sumToJSON' opts targs (R1 x) = sumToJSON' opts targs x
995+
996+--------------------------------------------------------------------------------
997+
938−instance ( GToJSON arity a
998+instance ( GToJSON Value arity a
939− , ConsToJSON arity a
999+ , ConsToJSON Value arity a
940 , Constructor c
1000 , Constructor c
941− ) => TwoElemArrayObj arity (C1 c a) where
1001+ ) => SumToJSON' TwoElemArray Value arity (C1 c a) where
942− twoElemArrayObj opts targs x = V.create $ do
1002+ sumToJSON' opts targs x = Tagged $ Array $ V.create $ do
943 mv <- VM.unsafeNew 2
1003 mv <- VM.unsafeNew 2
944 VM.unsafeWrite mv 0 $ String $ pack $ constructorTagModifier opts
1004 VM.unsafeWrite mv 0 $ String $ pack $ constructorTagModifier opts
945 $ conName (undefined :: t c a p)
1005 $ conName (undefined :: t c a p)
@@ -948,149 +1008,121 @@ instance ( GToJSON arity a
948
1008
949--------------------------------------------------------------------------------
1009--------------------------------------------------------------------------------
950
1010
951−class TwoElemArrayEnc arity f where
952− twoElemArrayEnc :: Options -> ToArgs Encoding arity a
953− -> f a -> Encoding
954−
955−instance ( TwoElemArrayEnc arity a
1011+instance ( GToJSON Encoding arity a
956− , TwoElemArrayEnc arity b
1012+ , ConsToJSON Encoding arity a
957− ) => TwoElemArrayEnc arity (a :+: b) where
958− twoElemArrayEnc opts targs (L1 x) = twoElemArrayEnc opts targs x
959− twoElemArrayEnc opts targs (R1 x) = twoElemArrayEnc opts targs x
960−
961−instance ( GToEncoding arity a
962− , ConsToEncoding arity a
963 , Constructor c
1013 , Constructor c
964− ) => TwoElemArrayEnc arity (C1 c a) where
1014+ ) => SumToJSON' TwoElemArray Encoding arity (C1 c a)
1015+ where
965− twoElemArrayEnc opts targs x = E.list id
1016+ sumToJSON' opts targs x = Tagged $ E.list id
966 [ toEncoding (constructorTagModifier opts (conName (undefined :: t c a p)))
1017 [ toEncoding (constructorTagModifier opts (conName (undefined :: t c a p)))
967− , gToEncoding opts targs x
1018+ , gToJSON opts targs x
968 ]
1019 ]
969
1020
970--------------------------------------------------------------------------------
1021--------------------------------------------------------------------------------
971
1022
972−class ConsToJSON arity f where
1023+class ConsToJSON enc arity f where
973− consToJSON :: Options -> ToArgs Value arity a
1024+ consToJSON :: Options -> ToArgs enc arity a
974− -> f a -> Value
1025+ -> f a -> enc
975
1026
976−class ConsToJSON' arity f isRecord where
1027+class ConsToJSON' enc arity f isRecord where
977− consToJSON' :: Options -> ToArgs Value arity a
1028+ consToJSON' :: Options -> ToArgs enc arity a
978− -> Bool -- ^ Are we a record with one field?
979− -> f a -> Tagged isRecord Value
1029+ -> f a -> Tagged isRecord enc
980
1030
981−instance ( IsRecord f isRecord
1031+instance ( IsRecord f isRecord
982− , ConsToJSON' arity f isRecord
1032+ , ConsToJSON' enc arity f isRecord
983− ) => ConsToJSON arity f where
1033+ ) => ConsToJSON enc arity f
1034+ where
984 consToJSON opts targs =
1035 consToJSON opts targs =
985− (unTagged :: Tagged isRecord Value -> Value)
1036+ (unTagged :: Tagged isRecord enc -> enc)
986− . consToJSON' opts targs (isUnary (undefined :: f a))
1037+ . consToJSON' opts targs
987−
1038+ {-# INLINE consToJSON #-}
988−instance (RecordToPairs arity f) => ConsToJSON' arity f True where
989− consToJSON' opts targs isUn f = let
990− vals = toList $ recordToPairs opts targs f
991− in case (unwrapUnaryRecords opts,isUn,vals) of
992− (True,True,[(_,val)]) -> Tagged val
993− _ -> Tagged $ object vals
994−
995−instance GToJSON arity f => ConsToJSON' arity f False where
996− consToJSON' opts targs _ = Tagged . gToJSON opts targs
997−
998−--------------------------------------------------------------------------------
999−
1000−class ConsToEncoding arity f where
1001− consToEncoding :: Options -> ToArgs Encoding arity a
1002− -> f a -> Encoding
1003
1039
1004−class ConsToEncoding' arity f isRecord where
1040+instance OVERLAPPING_
1005− consToEncoding' :: Options -> ToArgs Encoding arity a
1041+ ( RecordToPairs enc pairs arity (S1 s f)
1006− -> Bool -- ^ Are we a record with one field?
1042+ , FromPairs enc pairs
1007− -> f a -> Tagged isRecord Encoding
1043+ , GToJSON enc arity f
1044+ ) => ConsToJSON' enc arity (S1 s f) True
1045+ where
1046+ consToJSON' opts targs
1047+ | unwrapUnaryRecords opts = Tagged . gToJSON opts targs
1048+ | otherwise = Tagged . fromPairs . recordToPairs opts targs
1049+ {-# INLINE consToJSON' #-}
1050+
1051+instance ( RecordToPairs enc pairs arity f
1052+ , FromPairs enc pairs
1053+ ) => ConsToJSON' enc arity f True
1054+ where
1055+ consToJSON' opts targs = Tagged . fromPairs . recordToPairs opts targs
1056+ {-# INLINE consToJSON' #-}
1008
1057
1009−instance ( IsRecord f isRecord
1058+instance GToJSON enc arity f => ConsToJSON' enc arity f False where
1010− , ConsToEncoding' arity f isRecord
1011− ) => ConsToEncoding arity f where
1012− consToEncoding opts targs =
1013− (unTagged :: Tagged isRecord Encoding -> Encoding)
1014− . consToEncoding' opts targs (isUnary (undefined :: f a))
1015−
1016−instance (RecordToEncoding arity f) => ConsToEncoding' arity f True where
1017− consToEncoding' opts targs isUn x =
1018− let (enc, mbVal) = recordToEncoding opts targs x
1019− in case (unwrapUnaryRecords opts, isUn, mbVal) of
1020− (True, True, Just val) -> Tagged val
1021− _ -> Tagged $ E.wrapObject enc
1022−
1023−instance GToEncoding arity f => ConsToEncoding' arity f False where
1024− consToEncoding' opts targs _ = Tagged . gToEncoding opts targs
1059+ consToJSON' opts targs = Tagged . gToJSON opts targs
1060+ {-# INLINE consToJSON' #-}
1025
1061
1026--------------------------------------------------------------------------------
1062--------------------------------------------------------------------------------
1027
1063
1028−class RecordToPairs arity f where
1064+class RecordToPairs enc pairs arity f where
1065+ -- 1st element: whole thing
1066+ -- 2nd element: in case the record has only 1 field, just the value
1067+ -- of the field (without the key); 'Nothing' otherwise
1029− recordToPairs :: Options -> ToArgs Value arity a
1068+ recordToPairs :: Options -> ToArgs enc arity a
1030− -> f a -> DList Pair
1069+ -> f a -> pairs
1031−
1032−instance ( RecordToPairs arity a
1033− , RecordToPairs arity b
1034− ) => RecordToPairs arity (a :*: b) where
1035− recordToPairs opts targs (a :*: b) = recordToPairs opts targs a <>
1036− recordToPairs opts targs b
1037
1070
1071+instance ( Monoid pairs
1072+ , RecordToPairs enc pairs arity a
1073+ , RecordToPairs enc pairs arity b
1074+ ) => RecordToPairs enc pairs arity (a :*: b)
1075+ where
1076+ recordToPairs opts (targs :: ToArgs enc arity p) (a :*: b) =
1077+ pairsOf a `mappend` pairsOf b
1078+ where
1079+ pairsOf :: (RecordToPairs enc pairs arity f) => f p -> pairs
1080+ pairsOf = recordToPairs opts targs
1081+ {-# INLINE recordToPairs #-}
1082+
1083+instance ( Selector s
1084+ , GToJSON enc arity a
1085+ , KeyValuePair enc pairs
1038−instance (Selector s, GToJSON arity a) => RecordToPairs arity (S1 s a) where
1086+ ) => RecordToPairs enc pairs arity (S1 s a)
1087+ where
1039 recordToPairs = fieldToPair
1088 recordToPairs = fieldToPair
1040−
1089+ {-# INLINE recordToPairs #-}
1090+
1091+instance INCOHERENT_
1041−instance OVERLAPPING_ (Selector s, ToJSON a) =>
1092+ ( Selector s
1093+ , GToJSON enc arity (K1 i (Maybe a))
1094+ , KeyValuePair enc pairs
1095+ , Monoid pairs
1042− RecordToPairs arity (S1 s (K1 i (Maybe a))) where
1096+ ) => RecordToPairs enc pairs arity (S1 s (K1 i (Maybe a)))
1097+ where
1043 recordToPairs opts _ (M1 k1) | omitNothingFields opts
1098 recordToPairs opts _ (M1 k1) | omitNothingFields opts
1044− , K1 Nothing <- k1 = DList.empty
1099+ , K1 Nothing <- k1 = mempty
1045 recordToPairs opts targs m1 = fieldToPair opts targs m1
1100 recordToPairs opts targs m1 = fieldToPair opts targs m1
1046−
1101+ {-# INLINE recordToPairs #-}
1047−fieldToPair :: (Selector s, GToJSON arity a)
1102+
1048− => Options -> ToArgs Value arity p
1103+instance INCOHERENT_
1049− -> S1 s a p -> DList Pair
1104+ ( Selector s
1050−fieldToPair opts targs m1 = pure ( pack $ fieldLabelModifier opts $ selName m1
1105+ , GToJSON enc arity (K1 i (Maybe a))
1051− , gToJSON opts targs (unM1 m1)
1106+ , KeyValuePair enc pairs
1052− )
1107+ , Monoid pairs
1053−
1108+ ) => RecordToPairs enc pairs arity (S1 s (K1 i (Semigroup.Option a)))
1054−--------------------------------------------------------------------------------
1109+ where
1055−
1110+ recordToPairs opts targs = recordToPairs opts targs . unwrap
1056−class RecordToEncoding arity f where
1111+ where
1057− -- 1st element: whole thing
1112+ unwrap :: S1 s (K1 i (Semigroup.Option a)) p -> S1 s (K1 i (Maybe a)) p
1058− -- 2nd element: in case the record has only 1 field, just the value
1113+ unwrap (M1 (K1 (Semigroup.Option a))) = M1 (K1 a)
1059− -- of the field (without the key); 'Nothing' otherwise
1114+ {-# INLINE recordToPairs #-}
1060− recordToEncoding :: Options -> ToArgs Encoding arity a
1115+
1061− -> f a -> (Encoding, Maybe Encoding)
1116+fieldToPair :: (Selector s
1062−
1117+ , GToJSON enc arity a
1063−instance ( RecordToEncoding arity a
1118+ , KeyValuePair enc pairs)
1064− , RecordToEncoding arity b
1065− ) => RecordToEncoding arity (a :*: b) where
1066− recordToEncoding opts targs (a :*: b) | omitNothingFields opts =
1067− (E.econcat $ intersperse E.comma $
1068− filter (not . E.nullEncoding)
1069− [ fst (recordToEncoding opts targs a)
1070− , fst (recordToEncoding opts targs b) ]
1071− , Nothing)
1072− recordToEncoding opts targs (a :*: b) =
1073− (fst (recordToEncoding opts targs a) >< E.comma ><
1074− fst (recordToEncoding opts targs b),
1075− Nothing)
1076−
1077−
1078−instance (Selector s, GToEncoding arity a) => RecordToEncoding arity (S1 s a) where
1079− recordToEncoding = fieldToEncoding
1080−
1081−instance OVERLAPPING_ (Selector s, ToJSON a) =>
1082− RecordToEncoding arity (S1 s (K1 i (Maybe a))) where
1083− recordToEncoding opts _ (M1 k1) | omitNothingFields opts
1084− , K1 Nothing <- k1 = (E.empty, Nothing)
1085− recordToEncoding opts targs m1 = fieldToEncoding opts targs m1
1086−
1087−fieldToEncoding :: (Selector s, GToEncoding arity a)
1088− => Options -> ToArgs Encoding arity p
1119+ => Options -> ToArgs enc arity p
1089− -> S1 s a p -> (Encoding, Maybe Encoding)
1120+ -> S1 s a p -> pairs
1090−fieldToEncoding opts targs m1 =
1121+fieldToPair opts targs m1 =
1091− let keyBuilder = toEncoding (fieldLabelModifier opts $ selName m1)
1122+ let key = fieldLabelModifier opts (selName m1)
1092− valueBuilder = gToEncoding opts targs (unM1 m1)
1123+ value = gToJSON opts targs (unM1 m1)
1093− in (keyBuilder >< E.colon >< valueBuilder, Just valueBuilder)
1124+ in key `pair` value
1125+{-# INLINE fieldToPair #-}
1094
1126
1095--------------------------------------------------------------------------------
1127--------------------------------------------------------------------------------
1096
1128
@@ -1113,10 +1145,12 @@ instance ( WriteProduct arity a
1113 lenL = len `unsafeShiftR` 1
1145 lenL = len `unsafeShiftR` 1
1114 lenR = len - lenL
1146 lenR = len - lenL
1115 ixR = ix + lenL
1147 ixR = ix + lenL
1148+ {-# INLINE writeProduct #-}
1116
1149
1117−instance OVERLAPPABLE_ (GToJSON arity a) => WriteProduct arity a where
1150+instance OVERLAPPABLE_ (GToJSON Value arity a) => WriteProduct arity a where
1118 writeProduct opts targs mv ix _ =
1151 writeProduct opts targs mv ix _ =
1119 VM.unsafeWrite mv ix . gToJSON opts targs
1152 VM.unsafeWrite mv ix . gToJSON opts targs
1153+ {-# INLINE writeProduct #-}
1120
1154
1121--------------------------------------------------------------------------------
1155--------------------------------------------------------------------------------
1122
1156
@@ -1134,110 +1168,41 @@ instance ( EncodeProduct arity a
1134 encodeProduct opts targs (a :*: b) =
1168 encodeProduct opts targs (a :*: b) =
1135 encodeProduct opts targs a >*<
1169 encodeProduct opts targs a >*<
1136 encodeProduct opts targs b
1170 encodeProduct opts targs b
1171+ {-# INLINE encodeProduct #-}
1137
1172
1138−instance OVERLAPPABLE_ (GToEncoding arity a) => EncodeProduct arity a where
1173+instance OVERLAPPABLE_ (GToJSON Encoding arity a) => EncodeProduct arity a where
1139− encodeProduct opts targs a = E.retagEncoding $ gToEncoding opts targs a
1174+ encodeProduct opts targs a = E.retagEncoding $ gToJSON opts targs a
1175+ {-# INLINE encodeProduct #-}
1140
1176
1141--------------------------------------------------------------------------------
1177--------------------------------------------------------------------------------
1142
1178
1143−class ObjectWithSingleFieldObj arity f where
1144− objectWithSingleFieldObj :: Options -> ToArgs Value arity a
1145− -> f a -> Object
1146−
1147−instance ( ObjectWithSingleFieldObj arity a
1148− , ObjectWithSingleFieldObj arity b
1149− ) => ObjectWithSingleFieldObj arity (a :+: b) where
1150− objectWithSingleFieldObj opts targs (L1 x) =
1151− objectWithSingleFieldObj opts targs x
1152− objectWithSingleFieldObj opts targs (R1 x) =
1153− objectWithSingleFieldObj opts targs x
1154−
1155−instance ( GToJSON arity a
1179+instance ( GToJSON enc arity a
1156− , ConsToJSON arity a
1180+ , ConsToJSON enc arity a
1181+ , FromPairs enc pairs
1182+ , KeyValuePair enc pairs
1157 , Constructor c
1183 , Constructor c
1158− ) => ObjectWithSingleFieldObj arity (C1 c a) where
1184+ ) => SumToJSON' ObjectWithSingleField enc arity (C1 c a)
1159− objectWithSingleFieldObj opts targs = H.singleton typ . gToJSON opts targs
1185+ where
1186+ sumToJSON' opts targs =
1187+ Tagged . fromPairs . (typ `pair`) . gToJSON opts targs
1160 where
1188 where
1161− typ = pack $ constructorTagModifier opts $
1189+ typ = constructorTagModifier opts $
1162 conName (undefined :: t c a p)
1190 conName (undefined :: t c a p)
1163
1191
1164--------------------------------------------------------------------------------
1192--------------------------------------------------------------------------------
1165
1193
1166−class ObjectWithSingleFieldEnc arity f where
1167− objectWithSingleFieldEnc :: Options -> ToArgs Encoding arity a
1168− -> f a -> Encoding
1169−
1170−instance ( ObjectWithSingleFieldEnc arity a
1171− , ObjectWithSingleFieldEnc arity b
1172− ) => ObjectWithSingleFieldEnc arity (a :+: b) where
1173− objectWithSingleFieldEnc opts targs (L1 x) =
1174− objectWithSingleFieldEnc opts targs x
1175− objectWithSingleFieldEnc opts targs (R1 x) =
1176− objectWithSingleFieldEnc opts targs x
1177−
1178−instance ( GToEncoding arity a
1179− , ConsToEncoding arity a
1180− , Constructor c
1181− ) => ObjectWithSingleFieldEnc arity (C1 c a) where
1182− objectWithSingleFieldEnc opts targs v = E.pairs (E.pair key val)
1183− where
1184− key :: Text
1185− key = pack (constructorTagModifier opts (conName (undefined :: t c a p)))
1186− val :: Encoding' Value
1187− val = gToEncoding opts targs v
1188−
1189−--------------------------------------------------------------------------------
1190−
1191−class UntaggedValueObj arity f where
1192− untaggedValueObj :: Options -> ToArgs Value arity a
1193− -> f a -> Value
1194−
1195−instance
1196− ( UntaggedValueObj arity a
1197− , UntaggedValueObj arity b
1198− ) => UntaggedValueObj arity (a :+: b)
1199− where
1200− untaggedValueObj opts targs (L1 x) = untaggedValueObj opts targs x
1201− untaggedValueObj opts targs (R1 x) = untaggedValueObj opts targs x
1202−
1203instance OVERLAPPABLE_
1194instance OVERLAPPABLE_
1204− ( GToJSON arity a
1205− , ConsToJSON arity a
1195+ ( ConsToJSON enc arity a
1206− ) => UntaggedValueObj arity (C1 c a) where
1196+ ) => SumToJSON' UntaggedValue enc arity (C1 c a)
1207− untaggedValueObj = gToJSON
1208−
1209−instance OVERLAPPING_
1210− ( Constructor c )
1211− => UntaggedValueObj arity (C1 c U1)
1212 where
1197 where
1213− untaggedValueObj opts _ _ = toJSON $
1198+ sumToJSON' opts targs = Tagged . gToJSON opts targs
1214− constructorTagModifier opts $ conName (undefined :: t c U1 p)
1215−
1216−--------------------------------------------------------------------------------
1217−
1218−class UntaggedValueEnc arity f where
1219− untaggedValueEnc :: Options -> ToArgs Encoding arity a
1220− -> f a -> Encoding
1221−instance
1222− ( UntaggedValueEnc arity a
1223− , UntaggedValueEnc arity b
1224− ) => UntaggedValueEnc arity (a :+: b)
1225− where
1226− untaggedValueEnc opts targs (L1 x) = untaggedValueEnc opts targs x
1227− untaggedValueEnc opts targs (R1 x) = untaggedValueEnc opts targs x
1228−
1229−instance OVERLAPPABLE_
1230− ( GToEncoding arity a
1231− , ConsToEncoding arity a
1232− ) => UntaggedValueEnc arity (C1 c a)
1233− where
1234− untaggedValueEnc = gToEncoding
1235
1199
1236instance OVERLAPPING_
1200instance OVERLAPPING_
1237− ( Constructor c )
1201+ ( Constructor c
1238− => UntaggedValueEnc arity (C1 c U1)
1202+ , FromString enc
1203+ ) => SumToJSON' UntaggedValue enc arity (C1 c U1)
1239 where
1204 where
1240− untaggedValueEnc opts _ _ = toEncoding $
1205+ sumToJSON' opts _ _ = Tagged . fromString $
1241 constructorTagModifier opts $ conName (undefined :: t c U1 p)
1206 constructorTagModifier opts $ conName (undefined :: t c U1 p)
1242
1207
1243-------------------------------------------------------------------------------
1208-------------------------------------------------------------------------------
@@ -1311,6 +1276,13 @@ instance (ToJSON a, ToJSON b) => ToJSON (Either a b) where
1311 toEncoding = toEncoding2
1276 toEncoding = toEncoding2
1312 {-# INLINE toEncoding #-}
1277 {-# INLINE toEncoding #-}
1313
1278
1279+instance ToJSON Void where
1280+ toJSON = absurd
1281+ {-# INLINE toJSON #-}
1282+
1283+ toEncoding = absurd
1284+ {-# INLINE toEncoding #-}
1285+
1314
1286
1315instance ToJSON Bool where
1287instance ToJSON Bool where
1316 toJSON = Bool
1288 toJSON = Bool
@@ -1496,7 +1468,6 @@ instance ToJSONKey Int64 where
1496 toJSONKey = toJSONKeyTextEnc E.int64Text
1468 toJSONKey = toJSONKeyTextEnc E.int64Text
1497 {-# INLINE toJSONKey #-}
1469 {-# INLINE toJSONKey #-}
1498
1470
1499−
1500instance ToJSON Word where
1471instance ToJSON Word where
1501 toJSON = Number . fromIntegral
1472 toJSON = Number . fromIntegral
1502 {-# INLINE toJSON #-}
1473 {-# INLINE toJSON #-}
@@ -1556,6 +1527,12 @@ instance ToJSONKey Word64 where
1556 toJSONKey = toJSONKeyTextEnc E.word64Text
1527 toJSONKey = toJSONKeyTextEnc E.word64Text
1557 {-# INLINE toJSONKey #-}
1528 {-# INLINE toJSONKey #-}
1558
1529
1530+instance ToJSON CTime where
1531+ toJSON (CTime i) = toJSON i
1532+ {-# INLINE toJSON #-}
1533+
1534+ toEncoding (CTime i) = toEncoding i
1535+ {-# INLINE toEncoding #-}
1559
1536
1560instance ToJSON Text where
1537instance ToJSON Text where
1561 toJSON = String
1538 toJSON = String
@@ -1989,6 +1966,32 @@ dotNetTime (DotNetTime t) = secs ++ formatMillis t ++ ")/"
1989formatMillis :: (FormatTime t) => t -> String
1966formatMillis :: (FormatTime t) => t -> String
1990formatMillis = take 3 . formatTime defaultTimeLocale "%q"
1967formatMillis = take 3 . formatTime defaultTimeLocale "%q"
1991
1968
1969+-------------------------------------------------------------------------------
1970+-- primitive
1971+-------------------------------------------------------------------------------
1972+
1973+instance ToJSON a => ToJSON (PM.Array a) where
1974+ -- note: we could do better than this if vector exposed the data
1975+ -- constructor in Data.Vector.
1976+ toJSON = toJSON . Exts.toList
1977+ toEncoding = toEncoding . Exts.toList
1978+
1979+instance ToJSON a => ToJSON (PM.SmallArray a) where
1980+ toJSON = toJSON . Exts.toList
1981+ toEncoding = toEncoding . Exts.toList
1982+
1983+#if (MIN_VERSION_primitive(0,6,4))
1984+instance (PM.Prim a,ToJSON a) => ToJSON (PM.PrimArray a) where
1985+ toJSON = toJSON . Exts.toList
1986+ toEncoding = toEncoding . Exts.toList
1987+
1988+#if !MIN_VERSION_primitive(0,7,0)
1989+instance (PM.PrimUnlifted a,ToJSON a) => ToJSON (PM.UnliftedArray a) where
1990+ toJSON = toJSON . Exts.toList
1991+ toEncoding = toEncoding . Exts.toList
1992+#endif
1993+#endif
1994+
1992-------------------------------------------------------------------------------
1995-------------------------------------------------------------------------------
1993-- time
1996-- time
1994-------------------------------------------------------------------------------
1997-------------------------------------------------------------------------------
@@ -2037,10 +2040,11 @@ stringEncoding :: Encoding' Text -> Value
2037stringEncoding = String
2040stringEncoding = String
2038 . T.dropAround (== '"')
2041 . T.dropAround (== '"')
2039 . T.decodeLatin1
2042 . T.decodeLatin1
2040− . lazyToStrictByteString
2043+ . L.toStrict
2041 . E.encodingToLazyByteString
2044 . E.encodingToLazyByteString
2042{-# INLINE stringEncoding #-}
2045{-# INLINE stringEncoding #-}
2043
2046
2047+
2044instance ToJSON NominalDiffTime where
2048instance ToJSON NominalDiffTime where
2045 toJSON = Number . realToFrac
2049 toJSON = Number . realToFrac
2046 {-# INLINE toJSON #-}
2050 {-# INLINE toJSON #-}
@@ -2048,6 +2052,58 @@ instance ToJSON NominalDiffTime where
2048 toEncoding = E.scientific . realToFrac
2052 toEncoding = E.scientific . realToFrac
2049 {-# INLINE toEncoding #-}
2053 {-# INLINE toEncoding #-}
2050
2054
2055+
2056+instance ToJSON DiffTime where
2057+ toJSON = Number . realToFrac
2058+ {-# INLINE toJSON #-}
2059+
2060+ toEncoding = E.scientific . realToFrac
2061+ {-# INLINE toEncoding #-}
2062+
2063+-- | Encoded as number
2064+instance ToJSON SystemTime where
2065+ toJSON (MkSystemTime secs nsecs) =
2066+ toJSON (fromIntegral secs + fromIntegral nsecs / 1000000000 :: Nano)
2067+ toEncoding (MkSystemTime secs nsecs) =
2068+ toEncoding (fromIntegral secs + fromIntegral nsecs / 1000000000 :: Nano)
2069+
2070+instance ToJSON CalendarDiffTime where
2071+ toJSON (CalendarDiffTime m nt) = object
2072+ [ "months" .= m
2073+ , "time" .= nt
2074+ ]
2075+ toEncoding (CalendarDiffTime m nt) = E.pairs
2076+ ("months" .= m <> "time" .= nt)
2077+
2078+instance ToJSON CalendarDiffDays where
2079+ toJSON (CalendarDiffDays m d) = object
2080+ [ "months" .= m
2081+ , "days" .= d
2082+ ]
2083+ toEncoding (CalendarDiffDays m d) = E.pairs
2084+ ("months" .= m <> "days" .= d)
2085+
2086+instance ToJSON DayOfWeek where
2087+ toJSON Monday = "monday"
2088+ toJSON Tuesday = "tuesday"
2089+ toJSON Wednesday = "wednesday"
2090+ toJSON Thursday = "thursday"
2091+ toJSON Friday = "friday"
2092+ toJSON Saturday = "saturday"
2093+ toJSON Sunday = "sunday"
2094+
2095+toEncodingDayOfWeek :: DayOfWeek -> E.Encoding' Text
2096+toEncodingDayOfWeek Monday = E.unsafeToEncoding "\"monday\""
2097+toEncodingDayOfWeek Tuesday = E.unsafeToEncoding "\"tuesday\""
2098+toEncodingDayOfWeek Wednesday = E.unsafeToEncoding "\"wednesday\""
2099+toEncodingDayOfWeek Thursday = E.unsafeToEncoding "\"thursday\""
2100+toEncodingDayOfWeek Friday = E.unsafeToEncoding "\"friday\""
2101+toEncodingDayOfWeek Saturday = E.unsafeToEncoding "\"saturday\""
2102+toEncodingDayOfWeek Sunday = E.unsafeToEncoding "\"sunday\""
2103+
2104+instance ToJSONKey DayOfWeek where
2105+ toJSONKey = toJSONKeyTextEnc toEncodingDayOfWeek
2106+
2051-------------------------------------------------------------------------------
2107-------------------------------------------------------------------------------
2052-- base Monoid/Semigroup
2108-- base Monoid/Semigroup
2053-------------------------------------------------------------------------------
2109-------------------------------------------------------------------------------
@@ -2791,27 +2847,26 @@ instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f, ToJSON g,
2791 toEncoding = toEncoding2
2847 toEncoding = toEncoding2
2792 {-# INLINE toEncoding #-}
2848 {-# INLINE toEncoding #-}
2793
2849
2794−-------------------------------------------------------------------------------
2850+--------------------------------------------------------------------------------
2795−-- pre-bytestring-0.10 compatibility
2796−-------------------------------------------------------------------------------
2797
2851
2798−{-# INLINE lazyToStrictByteString #-}
2852+-- | Wrap a list of pairs as an object.
2799−lazyToStrictByteString :: L.ByteString -> S.ByteString
2853+class Monoid pairs => FromPairs enc pairs | enc -> pairs where
2800−#if MIN_VERSION_bytestring(0,10,0)
2854+ fromPairs :: pairs -> enc
2801−lazyToStrictByteString = L.toStrict
2802−#else
2803−lazyToStrictByteString = packChunks
2804
2855
2805−-- packChunks is taken from the blaze-builder package.
2856+instance (a ~ Value) => FromPairs (Encoding' a) Series where
2857+ fromPairs = E.pairs
2806
2858
2807−-- | Pack the chunks of a lazy bytestring into a single strict bytestring.
2859+instance FromPairs Value (DList Pair) where
2808−packChunks :: L.ByteString -> S.ByteString
2860+ fromPairs = object . toList
2809−packChunks lbs =
2861+
2810− S.unsafeCreate (fromIntegral $ L.length lbs) (copyChunks lbs)
2862+-- | Like 'KeyValue' but the value is already converted to JSON
2811− where
2863+-- ('Value' or 'Encoding'), and the result actually represents lists of pairs
2812− copyChunks !L.Empty !_pf = return ()
2864+-- so it can be readily concatenated.
2813− copyChunks !(L.Chunk (S.PS fpbuf o l) lbs') !pf = do
2865+class Monoid kv => KeyValuePair v kv where
2814− withForeignPtr fpbuf $ \pbuf ->
2866+ pair :: String -> v -> kv
2815− copyBytes pf (pbuf `plusPtr` o) l
2867+
2816− copyChunks lbs' (pf `plusPtr` l)
2868+instance (v ~ Value) => KeyValuePair v (DList Pair) where
2817−#endif
2869+ pair k v = DList.singleton (pack k .= v)
2870+
2871+instance (e ~ Encoding) => KeyValuePair e Series where
2872+ pair = E.pairStr
Makefilenew file+2
@@ -0,0 +1,2 @@
1+lint:
2+ ./run-hlint.sh --cpp-include include/ --cpp-file travis/cabal_macros.h Data/ attoparsec-iso8601/ benchmarks/ examples/ ffi/ pure/ tests/
README.markdown+1−2
@@ -24,5 +24,4 @@ See what's changed in recent (and upcoming) releases:
24
24
25# Authors
25# Authors
26
26
27−This library is written and maintained by Bryan O'Sullivan,
27+This library was originally written by Bryan O'Sullivan.
28−<bos@serpentine.com>.
aeson.cabal+72−56
@@ -1,5 +1,5 @@
1name: aeson
1name: aeson
2−version: 1.1.0.0
2+version: 1.4.6.0
3license: BSD3
3license: BSD3
4license-file: LICENSE
4license-file: LICENSE
5category: Text, Web, JSON
5category: Text, Web, JSON
@@ -21,23 +21,10 @@ description:
21 To get started, see the documentation for the @Data.Aeson@ module
21 To get started, see the documentation for the @Data.Aeson@ module
22 below.
22 below.
23 .
23 .
24− Parsing performance on a late 2013 MacBook Pro (2.6GHz Core i7),
25− running 64-bit GHC 7.10.1, for mostly-English tweets from Twitter's
26− JSON search API:
27− .
28− * 6.4 KB payloads, English: 7570 msg\/sec (47.6 MB\/sec)
29− .
30− * 14.6 KB payloads, Japanese: 3261 msg\/sec (46.6 MB\/sec)
31− .
32− Encoding performance on the same machine and data:
33− .
34− * 6.4 KB payloads, English: 22738 msg\/sec (142.9 MB\/sec)
35− .
36− * 14.6 KB payloads, Japanese: 15911 msg\/sec (227.4 MB\/sec)
37− .
38 (A note on naming: in Greek mythology, Aeson was the father of Jason.)
24 (A note on naming: in Greek mythology, Aeson was the father of Jason.)
39
25
40extra-source-files:
26extra-source-files:
27+ *.yaml
41 README.markdown
28 README.markdown
42 benchmarks/*.cabal
29 benchmarks/*.cabal
43 benchmarks/*.hs
30 benchmarks/*.hs
@@ -55,6 +42,7 @@ extra-source-files:
55 include/*.h
42 include/*.h
56 tests/JSONTestSuite/test_parsing/*.json
43 tests/JSONTestSuite/test_parsing/*.json
57 tests/JSONTestSuite/test_transform/*.json
44 tests/JSONTestSuite/test_transform/*.json
45+ tests/golden/*.expected
58 pure/Data/Aeson/Parser/*.hs
46 pure/Data/Aeson/Parser/*.hs
59
47
60flag developer
48flag developer
@@ -73,13 +61,13 @@ flag bytestring-builder
73 manual: False
61 manual: False
74
62
75flag cffi
63flag cffi
76− description: Controls whether to include c-ffi bits or pure haskell
64+ description: Controls whether to include c-ffi bits or pure haskell. Default to False for security.
77− default: True
65+ default: False
78 manual: True
66 manual: True
79
67
80library
68library
81 default-language: Haskell2010
69 default-language: Haskell2010
82− hs-source-dirs: .
70+ hs-source-dirs: . attoparsec-iso8601/
83
71
84 exposed-modules:
72 exposed-modules:
85 Data.Aeson
73 Data.Aeson
@@ -88,10 +76,12 @@ library
88 Data.Aeson.Text
76 Data.Aeson.Text
89 Data.Aeson.Types
77 Data.Aeson.Types
90 Data.Aeson.TH
78 Data.Aeson.TH
79+ Data.Aeson.QQ.Simple
91
80
92 Data.Aeson.Encoding.Internal
81 Data.Aeson.Encoding.Internal
93 Data.Aeson.Internal
82 Data.Aeson.Internal
94 Data.Aeson.Internal.Time
83 Data.Aeson.Internal.Time
84+ Data.Aeson.Parser.Internal
95
85
96 -- Deprecated modules
86 -- Deprecated modules
97 exposed-modules:
87 exposed-modules:
@@ -100,7 +90,6 @@ library
100 other-modules:
90 other-modules:
101 Data.Aeson.Encoding.Builder
91 Data.Aeson.Encoding.Builder
102 Data.Aeson.Internal.Functions
92 Data.Aeson.Internal.Functions
103− Data.Aeson.Parser.Internal
104 Data.Aeson.Parser.Unescape
93 Data.Aeson.Parser.Unescape
105 Data.Aeson.Parser.Time
94 Data.Aeson.Parser.Time
106 Data.Aeson.Types.FromJSON
95 Data.Aeson.Types.FromJSON
@@ -108,43 +97,62 @@ library
108 Data.Aeson.Types.ToJSON
97 Data.Aeson.Types.ToJSON
109 Data.Aeson.Types.Class
98 Data.Aeson.Types.Class
110 Data.Aeson.Types.Internal
99 Data.Aeson.Types.Internal
100+ Data.Attoparsec.Time
101+ Data.Attoparsec.Time.Internal
111
102
103+ -- GHC bundled libs
112 build-depends:
104 build-depends:
113− attoparsec >= 0.13.0.1,
105+ base >= 4.7.0.0 && < 5,
114− base >= 4.5 && < 5,
106+ bytestring >= 0.10.4.0 && < 0.11,
115− base-compat >= 0.9.1 && < 0.10,
116− containers >= 0.2.4.1,
107+ containers >= 0.5.5.1 && < 0.7,
117− deepseq >= 1.3,
108+ deepseq >= 1.3.0.0 && < 1.5,
118− dlist >= 0.2,
119− ghc-prim >= 0.2,
109+ ghc-prim >= 0.2 && < 0.6,
120− hashable >= 1.1.2.0,
121− scientific >= 0.3.4.7 && < 0.4,
122− tagged >=0.8.3 && <0.9,
123− template-haskell >= 2.7,
110+ template-haskell >= 2.9.0.0 && < 2.16,
124− text >= 1.1.1.0,
111+ text >= 1.2.3.0 && < 1.3,
125− time >= 1.1.1.4,
112+ time >= 1.4 && < 1.10
126− time-locale-compat >= 0.1.1 && < 0.2,
127− unordered-containers >= 0.2.5.0,
128− uuid-types >= 1.0.3 && <1.1,
129− vector >= 0.8
130
113
131− if flag(bytestring-builder)
114+ if impl(ghc >= 8.0)
132− build-depends: bytestring >= 0.9 && < 0.10.4,
115+ build-depends: bytestring >= 0.10.8.1
133− bytestring-builder >= 0.10.4 && < 1
116+
134− else
117+ -- Compat
118+ build-depends:
119+ base-compat >= 0.9.1 && < 0.12,
120+ time-compat >= 1.9.2.2 && < 1.10
121+
122+ if !impl(ghc >= 8.6)
135− build-depends: bytestring >= 0.10.4
123+ build-depends:
124+ contravariant >=1.4.1 && <1.6
136
125
137 if !impl(ghc >= 8.0)
126 if !impl(ghc >= 8.0)
138 -- `Data.Semigroup` and `Control.Monad.Fail` and `Control.Monad.IO.Class` are available in base only since GHC 8.0 / base 4.9
127 -- `Data.Semigroup` and `Control.Monad.Fail` and `Control.Monad.IO.Class` are available in base only since GHC 8.0 / base 4.9
139 build-depends:
128 build-depends:
140− semigroups >= 0.18.2 && < 0.19,
129+ semigroups >= 0.18.5 && < 0.20,
141− transformers >= 0.2.2.0,
130+ transformers >= 0.3.0.0 && < 0.6,
142− transformers-compat >= 0.3,
131+ transformers-compat >= 0.6.2 && < 0.7,
143 fail == 4.9.*
132 fail == 4.9.*
144
133
145 if !impl(ghc >= 7.10)
134 if !impl(ghc >= 7.10)
146 -- `Numeric.Natural` is available in base only since GHC 7.10 / base 4.8
135 -- `Numeric.Natural` is available in base only since GHC 7.10 / base 4.8
147− build-depends: nats >= 1 && < 1.2
136+ build-depends: nats >= 1.1.1 && < 1.2,
137+ void >= 0.7.2 && < 0.8
138+
139+ -- cannot use latest version
140+ build-depends:
141+ unordered-containers >= 0.2.8.0 && < 0.3,
142+
143+ -- not in LTS-12.10
144+ tagged >= 0.8.5 && < 0.9,
145+ primitive >= 0.6.3.0 && < 0.8
146+
147+ -- Other dependencies
148+ build-depends:
149+ attoparsec >= 0.13.2.2 && < 0.14,
150+ dlist >= 0.8.0.4 && < 0.9,
151+ hashable >= 1.2.7.0 && < 1.4,
152+ scientific >= 0.3.6.2 && < 0.4,
153+ th-abstraction >= 0.2.8.0 && < 0.4,
154+ uuid-types >= 1.0.3 && < 1.1,
155+ vector >= 0.12.0.1 && < 0.13
148
156
149 ghc-options: -Wall
157 ghc-options: -Wall
150
158
@@ -187,42 +195,49 @@ test-suite tests
187 Functions
195 Functions
188 Instances
196 Instances
189 Options
197 Options
198+ PropUtils
190 Properties
199 Properties
200+ PropertyGeneric
201+ PropertyKeys
202+ PropertyRoundTrip
203+ PropertyRTFunctors
204+ PropertyTH
191 SerializationFormatSpec
205 SerializationFormatSpec
192 Types
206 Types
193 UnitTests
207 UnitTests
194 UnitTests.NullaryConstructors
208 UnitTests.NullaryConstructors
195
209
196 build-depends:
210 build-depends:
197− HUnit,
198− QuickCheck >= 2.8 && <2.9.3,
211+ QuickCheck >= 2.10.0.1 && < 2.14,
199 aeson,
212 aeson,
200 integer-logarithms >= 1 && <1.1,
213 integer-logarithms >= 1 && <1.1,
201 attoparsec,
214 attoparsec,
202 base,
215 base,
203 base-compat,
216 base-compat,
204− base-orphans >= 0.5.3 && <0.6,
217+ base-orphans >= 0.5.3 && <0.9,
205 base16-bytestring,
218 base16-bytestring,
206 containers,
219 containers,
207 directory,
220 directory,
208 dlist,
221 dlist,
222+ Diff >= 0.4 && < 0.5,
209 filepath,
223 filepath,
210− generic-deriving >= 1.10 && < 1.12,
224+ generic-deriving >= 1.10 && < 1.14,
211 ghc-prim >= 0.2,
225 ghc-prim >= 0.2,
212 hashable >= 1.2.4.0,
226 hashable >= 1.2.4.0,
213 scientific,
227 scientific,
214 tagged,
228 tagged,
215 template-haskell,
229 template-haskell,
216− test-framework,
230+ tasty,
217− test-framework-hunit,
231+ tasty-golden,
218− test-framework-quickcheck2,
232+ tasty-hunit,
233+ tasty-quickcheck,
219 text,
234 text,
220 time,
235 time,
221− time-locale-compat,
236+ time-compat,
222 unordered-containers,
237 unordered-containers,
223 uuid-types,
238 uuid-types,
224 vector,
239 vector,
225− quickcheck-instances >=0.3.12
240+ quickcheck-instances >= 0.3.21 && <0.4
226
241
227 if flag(bytestring-builder)
242 if flag(bytestring-builder)
228 build-depends: bytestring >= 0.9 && < 0.10.4,
243 build-depends: bytestring >= 0.9 && < 0.10.4,
@@ -232,12 +247,13 @@ test-suite tests
232
247
233 if !impl(ghc >= 8.0)
248 if !impl(ghc >= 8.0)
234 build-depends:
249 build-depends:
235− semigroups >= 0.18.2 && < 0.19,
250+ semigroups >= 0.18.2 && < 0.20,
236 transformers >= 0.2.2.0,
251 transformers >= 0.2.2.0,
237 transformers-compat >= 0.3
252 transformers-compat >= 0.3
238
253
239 if !impl(ghc >= 7.10)
254 if !impl(ghc >= 7.10)
240− build-depends: nats >=1 && <1.2
255+ build-depends: nats >=1 && <1.2,
256+ void >=0.7.2 && <0.8
241
257
242 if impl(ghc >= 7.8)
258 if impl(ghc >= 7.8)
243 build-depends: hashable-time >= 0.2 && <0.3
259 build-depends: hashable-time >= 0.2 && <0.3
attoparsec-iso8601/Data/Attoparsec/Time.hsnew file+148
@@ -0,0 +1,148 @@
1+{-# LANGUAGE BangPatterns #-}
2+{-# LANGUAGE NoImplicitPrelude #-}
3+{-# LANGUAGE ScopedTypeVariables #-}
4+-- |
5+-- Module: Data.Aeson.Parser.Time
6+-- Copyright: (c) 2015-2016 Bryan O'Sullivan
7+-- License: BSD3
8+-- Maintainer: Bryan O'Sullivan <bos@serpentine.com>
9+-- Stability: experimental
10+-- Portability: portable
11+--
12+-- Parsers for parsing dates and times.
13+
14+module Data.Attoparsec.Time
15+ (
16+ day
17+ , localTime
18+ , timeOfDay
19+ , timeZone
20+ , utcTime
21+ , zonedTime
22+ ) where
23+
24+import Prelude.Compat
25+
26+import Control.Applicative ((<|>))
27+import Control.Monad (void, when)
28+import Data.Attoparsec.Text as A
29+import Data.Attoparsec.Time.Internal (toPico)
30+import Data.Bits ((.&.))
31+import Data.Char (isDigit, ord)
32+import Data.Fixed (Pico)
33+import Data.Int (Int64)
34+import Data.Maybe (fromMaybe)
35+import Data.Time.Calendar (Day, fromGregorianValid)
36+import Data.Time.Clock (UTCTime(..))
37+import qualified Data.Text as T
38+import qualified Data.Time.LocalTime as Local
39+
40+-- | Parse a date of the form @[+,-]YYYY-MM-DD@.
41+day :: Parser Day
42+day = do
43+ absOrNeg <- negate <$ char '-' <|> id <$ char '+' <|> pure id
44+ y <- (decimal <* char '-') <|> fail "date must be of form [+,-]YYYY-MM-DD"
45+ m <- (twoDigits <* char '-') <|> fail "date must be of form [+,-]YYYY-MM-DD"
46+ d <- twoDigits <|> fail "date must be of form [+,-]YYYY-MM-DD"
47+ maybe (fail "invalid date") return (fromGregorianValid (absOrNeg y) m d)
48+
49+-- | Parse a two-digit integer (e.g. day of month, hour).
50+twoDigits :: Parser Int
51+twoDigits = do
52+ a <- digit
53+ b <- digit
54+ let c2d c = ord c .&. 15
55+ return $! c2d a * 10 + c2d b
56+
57+-- | Parse a time of the form @HH:MM[:SS[.SSS]]@.
58+timeOfDay :: Parser Local.TimeOfDay
59+timeOfDay = do
60+ h <- twoDigits
61+ m <- char ':' *> twoDigits
62+ s <- option 0 (char ':' *> seconds)
63+ if h < 24 && m < 60 && s < 61
64+ then return (Local.TimeOfDay h m s)
65+ else fail "invalid time"
66+
67+data T = T {-# UNPACK #-} !Int {-# UNPACK #-} !Int64
68+
69+-- | Parse a count of seconds, with the integer part being two digits
70+-- long.
71+seconds :: Parser Pico
72+seconds = do
73+ real <- twoDigits
74+ mc <- peekChar
75+ case mc of
76+ Just '.' -> do
77+ t <- anyChar *> takeWhile1 isDigit
78+ return $! parsePicos real t
79+ _ -> return $! fromIntegral real
80+ where
81+ parsePicos a0 t = toPico (fromIntegral (t' * 10^n))
82+ where T n t' = T.foldl' step (T 12 (fromIntegral a0)) t
83+ step ma@(T m a) c
84+ | m <= 0 = ma
85+ | otherwise = T (m-1) (10 * a + fromIntegral (ord c) .&. 15)
86+
87+-- | Parse a time zone, and return 'Nothing' if the offset from UTC is
88+-- zero. (This makes some speedups possible.)
89+timeZone :: Parser (Maybe Local.TimeZone)
90+timeZone = do
91+ let maybeSkip c = do ch <- peekChar'; when (ch == c) (void anyChar)
92+ maybeSkip ' '
93+ ch <- satisfy $ \c -> c == 'Z' || c == '+' || c == '-'
94+ if ch == 'Z'
95+ then return Nothing
96+ else do
97+ h <- twoDigits
98+ mm <- peekChar
99+ m <- case mm of
100+ Just ':' -> anyChar *> twoDigits
101+ Just d | isDigit d -> twoDigits
102+ _ -> return 0
103+ let off | ch == '-' = negate off0
104+ | otherwise = off0
105+ off0 = h * 60 + m
106+ case undefined of
107+ _ | off == 0 ->
108+ return Nothing
109+ | off < -720 || off > 840 || m > 59 ->
110+ fail "invalid time zone offset"
111+ | otherwise ->
112+ let !tz = Local.minutesToTimeZone off
113+ in return (Just tz)
114+
115+-- | Parse a date and time, of the form @YYYY-MM-DD HH:MM[:SS[.SSS]]@.
116+-- The space may be replaced with a @T@. The number of seconds is optional
117+-- and may be followed by a fractional component.
118+localTime :: Parser Local.LocalTime
119+localTime = Local.LocalTime <$> day <* daySep <*> timeOfDay
120+ where daySep = satisfy (\c -> c == 'T' || c == ' ')
121+
122+-- | Behaves as 'zonedTime', but converts any time zone offset into a
123+-- UTC time.
124+utcTime :: Parser UTCTime
125+utcTime = do
126+ lt@(Local.LocalTime d t) <- localTime
127+ mtz <- timeZone
128+ case mtz of
129+ Nothing -> let !tt = Local.timeOfDayToTime t
130+ in return (UTCTime d tt)
131+ Just tz -> return $! Local.localTimeToUTC tz lt
132+
133+-- | Parse a date with time zone info. Acceptable formats:
134+--
135+-- @YYYY-MM-DD HH:MM Z@
136+-- @YYYY-MM-DD HH:MM:SS Z@
137+-- @YYYY-MM-DD HH:MM:SS.SSS Z@
138+--
139+-- The first space may instead be a @T@, and the second space is
140+-- optional. The @Z@ represents UTC. The @Z@ may be replaced with a
141+-- time zone offset of the form @+0000@ or @-08:00@, where the first
142+-- two digits are hours, the @:@ is optional and the second two digits
143+-- (also optional) are minutes.
144+zonedTime :: Parser Local.ZonedTime
145+zonedTime = Local.ZonedTime <$> localTime <*> (fromMaybe utc <$> timeZone)
146+
147+utc :: Local.TimeZone
148+utc = Local.TimeZone 0 False ""
attoparsec-iso8601/Data/Attoparsec/Time/Internal.hsnew file+64
@@ -0,0 +1,64 @@
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE NoImplicitPrelude #-}
3+-- |
4+-- Module: Data.Aeson.Internal.Time
5+-- Copyright: (c) 2015-2016 Bryan O'Sullivan
6+-- License: BSD3
7+-- Maintainer: Bryan O'Sullivan <bos@serpentine.com>
8+-- Stability: experimental
9+-- Portability: portable
10+
11+module Data.Attoparsec.Time.Internal
12+ (
13+ TimeOfDay64(..)
14+ , fromPico
15+ , toPico
16+ , diffTimeOfDay64
17+ , toTimeOfDay64
18+ ) where
19+
20+import Prelude.Compat
21+
22+import Data.Int (Int64)
23+import Data.Time
24+import Unsafe.Coerce (unsafeCoerce)
25+
26+#if MIN_VERSION_time(1,6,0)
27+
28+import Data.Time.Clock (diffTimeToPicoseconds)
29+
30+#endif
31+
32+import Data.Fixed (Pico, Fixed(MkFixed))
33+
34+#if !MIN_VERSION_time(1,6,0)
35+
36+diffTimeToPicoseconds :: DiffTime -> Integer
37+diffTimeToPicoseconds = unsafeCoerce
38+
39+#endif
40+
41+toPico :: Integer -> Pico
42+toPico = MkFixed
43+
44+fromPico :: Pico -> Integer
45+fromPico (MkFixed i) = i
46+
47+-- | Like TimeOfDay, but using a fixed-width integer for seconds.
48+data TimeOfDay64 = TOD {-# UNPACK #-} !Int
49+ {-# UNPACK #-} !Int
50+ {-# UNPACK #-} !Int64
51+
52+posixDayLength :: DiffTime
53+posixDayLength = 86400
54+
55+diffTimeOfDay64 :: DiffTime -> TimeOfDay64
56+diffTimeOfDay64 t
57+ | t >= posixDayLength = TOD 23 59 (60000000000000 + pico (t - posixDayLength))
58+ | otherwise = TOD (fromIntegral h) (fromIntegral m) s
59+ where (h,mp) = pico t `quotRem` 3600000000000000
60+ (m,s) = mp `quotRem` 60000000000000
61+ pico = fromIntegral . diffTimeToPicoseconds
62+
63+toTimeOfDay64 :: TimeOfDay -> TimeOfDay64
64+toTimeOfDay64 (TimeOfDay h m s) = TOD h m (fromIntegral (fromPico s))
attoparsec-iso8601/LICENSEnew file+30
@@ -0,0 +1,30 @@
1+Copyright (c) 2011, MailRank, Inc.
2+
3+All rights reserved.
4+
5+Redistribution and use in source and binary forms, with or without
6+modification, are permitted provided that the following conditions
7+are met:
8+
9+1. Redistributions of source code must retain the above copyright
10+ notice, this list of conditions and the following disclaimer.
11+
12+2. Redistributions in binary form must reproduce the above copyright
13+ notice, this list of conditions and the following disclaimer in the
14+ documentation and/or other materials provided with the distribution.
15+
16+3. Neither the name of the author nor the names of his contributors
17+ may be used to endorse or promote products derived from this software
18+ without specific prior written permission.
19+
20+THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND ANY EXPRESS
21+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
22+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
23+DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
24+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
28+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
29+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30+POSSIBILITY OF SUCH DAMAGE.
attoparsec-iso8601/README.mdnew file+19
@@ -0,0 +1,19 @@
1+Parsing of ISO 8601 dates.
2+
3+This package is used to parse dates in aeson. It is split into a
4+separate package to be shared by other projects that want to parse
5+dates like aeson does.
6+
7+For now, this project is located in the aeson repository and aeson
8+itself uses the source of this package without pulling in the package
9+as a dependency.
10+
11+## Stability
12+
13+Since aeson depends on this package we want to be very careful about
14+changing the format.
15+
16+There may be breaking changes if we find that the format is
17+incorrectly too lenient. We consider widening of the allowed input a
18+non-breaking addition since all previously valid input will still
19+parse correctly.
attoparsec-iso8601/attoparsec-iso8601.cabalnew file+55
@@ -0,0 +1,55 @@
1+name: attoparsec-iso8601
2+version: 1.0.1.0
3+synopsis: Parsing of ISO 8601 dates, originally from aeson.
4+description: Parsing of ISO 8601 dates, originally from aeson.
5+license: BSD3
6+license-file: LICENSE
7+category: Parsing
8+copyright: (c) 2011-2016 Bryan O'Sullivan
9+ (c) 2011 MailRank, Inc.
10+author: Bryan O'Sullivan <bos@serpentine.com>
11+maintainer: Adam Bergmark <adam@bergmark.nl>
12+stability: experimental
13+cabal-version: >=1.10
14+homepage: https://github.com/bos/aeson
15+bug-reports: https://github.com/bos/aeson/issues
16+build-type: Simple
17+extra-source-files:
18+ README.md
19+
20+flag developer
21+ description: operate in developer mode
22+ default: False
23+ manual: True
24+
25+flag fast
26+ description: compile without optimizations
27+ default: False
28+ manual: True
29+
30+library
31+ hs-source-dirs: .
32+ default-language: Haskell2010
33+ ghc-options: -Wall
34+ exposed-modules:
35+ Data.Attoparsec.Time.Internal
36+ Data.Attoparsec.Time
37+ build-depends:
38+ attoparsec >= 0.13.0.1,
39+ base >= 4.7 && < 5,
40+ base-compat >= 0.9.1 && < 0.12,
41+ text >= 1.1.1.0,
42+ time >= 1.1.1.4
43+
44+ if flag(fast)
45+ ghc-options: -O0
46+ else
47+ ghc-options: -O2
48+
49+ if flag(developer)
50+ ghc-options: -Werror
51+ ghc-prof-options: -auto-all
52+
53+source-repository head
54+ type: git
55+ location: git://github.com/bos/aeson.git
attoparsec-iso8601/changelog.mdnew file+5
@@ -0,0 +1,5 @@
1+For the latest version of this document, please see [https://github.com/bos/aeson/blob/master/attoparsec-iso8601/changelog.md](https://github.com/bos/aeson/blob/master/attoparsec-iso8601/changelog.md).
2+
3+### 1.0.1.0
4+
5+* Fixes handling of `UTCTime` wrt. leap seconds , thanks to Adam Schønemann
benchmarks/AesonCompareAutoInstances.hsdeleted−229
@@ -1,229 +0,0 @@
1−{-# LANGUAGE DeriveDataTypeable #-}
2−{-# LANGUAGE DeriveGeneric #-}
3−{-# LANGUAGE TemplateHaskell #-}
4−
5−module Main (main) where
6−
7−import Prelude ()
8−import Prelude.Compat
9−
10−import Control.DeepSeq (NFData, rnf, deepseq)
11−import Criterion.Main hiding (defaultOptions)
12−import Data.Aeson.Encode
13−import Data.Aeson.TH
14−import Data.Aeson.Types
15−import Data.Data (Data)
16−import Data.Typeable (Typeable)
17−import GHC.Generics (Generic)
18−import Options
19−import qualified Data.Aeson.Generic as G (fromJSON, toJSON)
20−
21−--------------------------------------------------------------------------------
22−
23−data D a = Nullary
24− | Unary Int
25− | Product String Char a
26− | Record { testOne :: Double
27− , testTwo :: Bool
28− , testThree :: D a
29− }
30− deriving (Show, Eq, Data, Typeable)
31−
32−deriveJSON opts ''D
33−
34−instance NFData a => NFData (D a) where
35− rnf Nullary = ()
36− rnf (Unary n) = rnf n
37− rnf (Product s c x) = s `deepseq` c `deepseq` rnf x
38− rnf (Record d b y) = d `deepseq` b `deepseq` rnf y
39−
40−type T = D (D (D ()))
41−
42−d :: T
43−d = Record
44− { testOne = 1234.56789
45− , testTwo = True
46− , testThree = Product "Hello World!" 'a' $
47− Record
48− { testOne = 9876.54321
49− , testTwo = False
50− , testThree = Product "Yeehaa!!!" '\n' Nullary
51− }
52− }
53−
54−--------------------------------------------------------------------------------
55−
56−data D' a = Nullary'
57− | Unary' Int
58− | Product' String Char a
59− | Record' { testOne' :: Double
60− , testTwo' :: Bool
61− , testThree' :: D' a
62− }
63− deriving (Show, Eq, Generic, Data, Typeable)
64−
65−instance ToJSON a => ToJSON (D' a) where
66− toJSON = genericToJSON opts
67−
68−instance FromJSON a => FromJSON (D' a) where
69− parseJSON = genericParseJSON opts
70−
71−instance NFData a => NFData (D' a) where
72− rnf Nullary' = ()
73− rnf (Unary' n) = rnf n
74− rnf (Product' s c x) = s `deepseq` c `deepseq` rnf x
75− rnf (Record' d b y) = d `deepseq` b `deepseq` rnf y
76−
77−type T' = D' (D' (D' ()))
78−
79−d' :: T'
80−d' = Record'
81− { testOne' = 1234.56789
82− , testTwo' = True
83− , testThree' = Product' "Hello World!" 'a' $
84− Record'
85− { testOne' = 9876.54321
86− , testTwo' = False
87− , testThree' = Product' "Yeehaa!!!" '\n' Nullary'
88− }
89− }
90−
91−--------------------------------------------------------------------------------
92−
93−data BigRecord = BigRecord
94− { field01 :: !Int, field02 :: !Int, field03 :: !Int, field04 :: !Int, field05 :: !Int
95− , field06 :: !Int, field07 :: !Int, field08 :: !Int, field09 :: !Int, field10 :: !Int
96− , field11 :: !Int, field12 :: !Int, field13 :: !Int, field14 :: !Int, field15 :: !Int
97− , field16 :: !Int, field17 :: !Int, field18 :: !Int, field19 :: !Int, field20 :: !Int
98− , field21 :: !Int, field22 :: !Int, field23 :: !Int, field24 :: !Int, field25 :: !Int
99− } deriving (Show, Eq, Generic, Data, Typeable)
100−
101−instance NFData BigRecord
102−
103−bigRecord = BigRecord 1 2 3 4 5
104− 6 7 8 9 10
105− 11 12 13 14 15
106− 16 17 18 19 20
107− 21 22 23 24 25
108−
109−gBigRecordToJSON :: BigRecord -> Value
110−gBigRecordToJSON = genericToJSON opts
111−
112−gBigRecordFromJSON :: Value -> Result BigRecord
113−gBigRecordFromJSON = parse $ genericParseJSON opts
114−
115−thBigRecordToJSON :: BigRecord -> Value
116−thBigRecordToJSON = $(mkToJSON opts ''BigRecord)
117−
118−thBigRecordFromJSON :: Value -> Result BigRecord
119−thBigRecordFromJSON = parse $(mkParseJSON opts ''BigRecord)
120−
121−--------------------------------------------------------------------------------
122−
123−data BigProduct = BigProduct
124− !Int !Int !Int !Int !Int
125− !Int !Int !Int !Int !Int
126− !Int !Int !Int !Int !Int
127− !Int !Int !Int !Int !Int
128− !Int !Int !Int !Int !Int
129− deriving (Show, Eq, Generic, Data, Typeable)
130−
131−instance NFData BigProduct
132−
133−bigProduct = BigProduct 1 2 3 4 5
134− 6 7 8 9 10
135− 11 12 13 14 15
136− 16 17 18 19 20
137− 21 22 23 24 25
138−
139−gBigProductToJSON :: BigProduct -> Value
140−gBigProductToJSON = genericToJSON opts
141−
142−gBigProductFromJSON :: Value -> Result BigProduct
143−gBigProductFromJSON = parse $ genericParseJSON opts
144−
145−thBigProductToJSON :: BigProduct -> Value
146−thBigProductToJSON = $(mkToJSON opts ''BigProduct)
147−
148−thBigProductFromJSON :: Value -> Result BigProduct
149−thBigProductFromJSON = parse $(mkParseJSON opts ''BigProduct)
150−
151−--------------------------------------------------------------------------------
152−
153−data BigSum = F01 | F02 | F03 | F04 | F05
154− | F06 | F07 | F08 | F09 | F10
155− | F11 | F12 | F13 | F14 | F15
156− | F16 | F17 | F18 | F19 | F20
157− | F21 | F22 | F23 | F24 | F25
158− deriving (Show, Eq, Generic, Data, Typeable)
159−
160−instance NFData BigSum
161−
162−bigSum = F25
163−
164−gBigSumToJSON :: BigSum -> Value
165−gBigSumToJSON = genericToJSON opts
166−
167−gBigSumFromJSON :: Value -> Result BigSum
168−gBigSumFromJSON = parse $ genericParseJSON opts
169−
170−thBigSumToJSON :: BigSum -> Value
171−thBigSumToJSON = $(mkToJSON opts ''BigSum)
172−
173−thBigSumFromJSON :: Value -> Result BigSum
174−thBigSumFromJSON = parse $(mkParseJSON opts ''BigSum)
175−
176−--------------------------------------------------------------------------------
177−
178−type FJ a = Value -> Result a
179−
180−main :: IO ()
181−main = defaultMain
182− [ let v = toJSON d
183− in (d, d', v) `deepseq`
184− bgroup "D"
185− [ group "toJSON" (nf toJSON d)
186− (nf G.toJSON d)
187− (nf toJSON d')
188− , group "fromJSON" (nf ( fromJSON :: FJ T ) v)
189− (nf (G.fromJSON :: FJ T ) v)
190− (nf ( fromJSON :: FJ T') v)
191− ]
192− , let v = thBigRecordToJSON bigRecord
193− in bigRecord `deepseq` v `deepseq`
194− bgroup "BigRecord"
195− [ group "toJSON" (nf thBigRecordToJSON bigRecord)
196− (nf G.toJSON bigRecord)
197− (nf gBigRecordToJSON bigRecord)
198− , group "fromJSON" (nf (thBigRecordFromJSON :: FJ BigRecord) v)
199− (nf (G.fromJSON :: FJ BigRecord) v)
200− (nf (gBigRecordFromJSON :: FJ BigRecord) v)
201− ]
202− , let v = thBigProductToJSON bigProduct
203− in bigProduct `deepseq` v `deepseq`
204− bgroup "BigProduct"
205− [ group "toJSON" (nf thBigProductToJSON bigProduct)
206− (nf G.toJSON bigProduct)
207− (nf gBigProductToJSON bigProduct)
208− , group "fromJSON" (nf (thBigProductFromJSON :: FJ BigProduct) v)
209− (nf (G.fromJSON :: FJ BigProduct) v)
210− (nf (gBigProductFromJSON :: FJ BigProduct) v)
211− ]
212− , let v = thBigSumToJSON bigSum
213− in bigSum `deepseq` v `deepseq`
214− bgroup "BigSum"
215− [ group "toJSON" (nf thBigSumToJSON bigSum)
216− (nf G.toJSON bigSum)
217− (nf gBigSumToJSON bigSum)
218− , group "fromJSON" (nf (thBigSumFromJSON :: FJ BigSum) v)
219− (nf (G.fromJSON :: FJ BigSum) v)
220− (nf (gBigSumFromJSON :: FJ BigSum) v)
221− ]
222− ]
223−
224−group n th syb gen = bcompare
225− [ bgroup n [ bench "th" th
226− , bench "syb" syb
227− , bench "generic" gen
228− ]
229− ]
benchmarks/AesonEncode.hs+4−5
@@ -1,14 +1,13 @@
1{-# LANGUAGE BangPatterns #-}
1{-# LANGUAGE BangPatterns #-}
2+{-# LANGUAGE NoImplicitPrelude #-}
2{-# LANGUAGE OverloadedStrings #-}
3{-# LANGUAGE OverloadedStrings #-}
3
4
4module Main (main) where
5module Main (main) where
5
6
6−import Prelude ()
7import Prelude.Compat
7import Prelude.Compat
8
8
9import Control.DeepSeq
9import Control.DeepSeq
10−import Control.Exception
10+import Control.Monad (forM_)
11−import Control.Monad
12import Data.Aeson
11import Data.Aeson
13import Data.Attoparsec.ByteString (IResult(..), parseWith)
12import Data.Attoparsec.ByteString (IResult(..), parseWith)
14import Data.Char (isDigit)
13import Data.Char (isDigit)
@@ -25,7 +24,7 @@ main = do
25 (c:a) -> (c,a)
24 (c:a) -> (c,a)
26 [] -> error "Unexpected empty list"
25 [] -> error "Unexpected empty list"
27 let count = read cnt :: Int
26 let count = read cnt :: Int
28− forM_ args $ \arg -> bracket (openFile arg ReadMode) hClose $ \h -> do
27+ forM_ args $ \arg -> withFile arg ReadMode $ \h -> do
29 putStrLn $ arg ++ ":"
28 putStrLn $ arg ++ ":"
30 let refill = B.hGet h 16384
29 let refill = B.hGet h 16384
31 result0 <- parseWith refill json =<< refill
30 result0 <- parseWith refill json =<< refill
@@ -35,7 +34,7 @@ main = do
35 start <- getCurrentTime
34 start <- getCurrentTime
36 let loop !n r
35 let loop !n r
37 | n >= count = return ()
36 | n >= count = return ()
38− | otherwise = {-# SCC "loop" #-} do
37+ | otherwise = {-# SCC "loop" #-}
39 rnf (encode r) `seq` loop (n+1) r
38 rnf (encode r) `seq` loop (n+1) r
40 loop 0 r0
39 loop 0 r0
41 delta <- flip diffUTCTime start `fmap` getCurrentTime
40 delta <- flip diffUTCTime start `fmap` getCurrentTime
benchmarks/AesonFoldable.hs+14−42
@@ -1,16 +1,14 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
1{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE OverloadedStrings #-}
2−{-# LANGUAGE PackageImports #-}
3
3
4module Main (main) where
4module Main (main) where
5
5
6import Criterion.Main
6import Criterion.Main
7
7
8−import Prelude ()
9import Prelude.Compat
8import Prelude.Compat
10
9
11import Data.Foldable (toList)
10import Data.Foldable (toList)
12−import qualified "aeson" Data.Aeson as A
11+import qualified Data.Aeson as A
13−import qualified "aeson-benchmarks" Data.Aeson as B
14import qualified Data.Sequence as S
12import qualified Data.Sequence as S
15import qualified Data.Vector as V
13import qualified Data.Vector as V
16import qualified Data.Vector.Unboxed as U
14import qualified Data.Vector.Unboxed as U
@@ -21,10 +19,6 @@ import qualified Data.Vector.Unboxed as U
21
19
22newtype L f = L { getL :: f Int }
20newtype L f = L { getL :: f Int }
23
21
24−instance Foldable f => B.ToJSON (L f) where
25− toJSON = error "do not use this"
26− toEncoding = B.toEncoding . toList . getL
27−
28instance Foldable f => A.ToJSON (L f) where
22instance Foldable f => A.ToJSON (L f) where
29 toJSON = error "do not use this"
23 toJSON = error "do not use this"
30 toEncoding = A.toEncoding . toList . getL
24 toEncoding = A.toEncoding . toList . getL
@@ -35,10 +29,6 @@ instance Foldable f => A.ToJSON (L f) where
35
29
36newtype F f = F { getF :: f Int }
30newtype F f = F { getF :: f Int }
37
31
38−instance Foldable f => B.ToJSON (F f) where
39− toJSON = error "do not use this"
40− toEncoding = B.foldable . getF
41−
42instance Foldable f => A.ToJSON (F f) where
32instance Foldable f => A.ToJSON (F f) where
43 toJSON = error "do not use this"
33 toJSON = error "do not use this"
44 toEncoding = A.foldable . getF
34 toEncoding = A.foldable . getF
@@ -63,52 +53,34 @@ valueUVector = U.fromList valueList
63-- Main
53-- Main
64-------------------------------------------------------------------------------
54-------------------------------------------------------------------------------
65
55
66−benchEncodeA
56+benchEncode
67 :: A.ToJSON a
57 :: A.ToJSON a
68 => String
58 => String
69 -> a
59 -> a
70 -> Benchmark
60 -> Benchmark
71−benchEncodeA name val
61+benchEncode name val
72 = bench ("A " ++ name) $ nf A.encode val
62 = bench ("A " ++ name) $ nf A.encode val
73
63
74−benchEncodeB
75− :: B.ToJSON a
76− => String
77− -> a
78− -> Benchmark
79−benchEncodeB name val
80− = bench ("B " ++ name) $ nf B.encode val
81−
82main :: IO ()
64main :: IO ()
83main = defaultMain
65main = defaultMain
84 [ bgroup "encode"
66 [ bgroup "encode"
85 [ bgroup "List"
67 [ bgroup "List"
86− [ benchEncodeB "-" valueList
87− , benchEncodeB "L" $ L valueList
88− , benchEncodeB "F" $ F valueList
89− , benchEncodeA "-" valueList
68+ [ benchEncode "-" valueList
90− , benchEncodeA "L" $ L valueList
69+ , benchEncode "L" $ L valueList
91− , benchEncodeA "F" $ F valueList
70+ , benchEncode "F" $ F valueList
92 ]
71 ]
93 , bgroup "Seq"
72 , bgroup "Seq"
94− [ benchEncodeB "-" valueSeq
95− , benchEncodeB "L" $ L valueSeq
96− , benchEncodeB "F" $ F valueSeq
97− , benchEncodeA "-" valueSeq
73+ [ benchEncode "-" valueSeq
98− , benchEncodeA "L" $ L valueSeq
74+ , benchEncode "L" $ L valueSeq
99− , benchEncodeA "F" $ F valueSeq
75+ , benchEncode "F" $ F valueSeq
100 ]
76 ]
101 , bgroup "Vector"
77 , bgroup "Vector"
102− [ benchEncodeB "-" valueVector
103− , benchEncodeB "L" $ L valueVector
104− , benchEncodeB "F" $ F valueVector
105− , benchEncodeA "-" valueVector
78+ [ benchEncode "-" valueVector
106− , benchEncodeA "L" $ L valueVector
79+ , benchEncode "L" $ L valueVector
107− , benchEncodeA "F" $ F valueVector
80+ , benchEncode "F" $ F valueVector
108 ]
81 ]
109 , bgroup "Vector.Unboxed"
82 , bgroup "Vector.Unboxed"
110− [ benchEncodeB "-" valueUVector
111− , benchEncodeA "-" valueUVector
83+ [ benchEncode "-" valueUVector
112 ]
84 ]
113 ]
85 ]
114 ]
86 ]
benchmarks/AesonMap.hs+39−56
@@ -1,13 +1,11 @@
1{-# LANGUAGE FlexibleContexts #-}
1{-# LANGUAGE FlexibleContexts #-}
2−{-# LANGUAGE OverloadedStrings #-}
2+{-# LANGUAGE NoImplicitPrelude #-}
3−{-# LANGUAGE PackageImports #-}
4{-# LANGUAGE RankNTypes #-}
3{-# LANGUAGE RankNTypes #-}
5
4
6{-# OPTIONS_GHC -fno-warn-orphans #-}
5{-# OPTIONS_GHC -fno-warn-orphans #-}
7
6
8module Main (main) where
7module Main (main) where
9
8
10−import Prelude ()
11import Prelude.Compat
9import Prelude.Compat
12
10
13import Control.DeepSeq
11import Control.DeepSeq
@@ -15,9 +13,8 @@ import Criterion.Main
15import Data.Hashable
13import Data.Hashable
16import Data.Proxy (Proxy (..))
14import Data.Proxy (Proxy (..))
17import Data.Tagged (Tagged (..))
15import Data.Tagged (Tagged (..))
18−import qualified "aeson" Data.Aeson as A
16+import Data.Aeson
19−import qualified "aeson-benchmarks" Data.Aeson as B
20−import qualified "aeson-benchmarks" Data.Aeson.Types as B (fromJSONKeyCoerce)
17+import Data.Aeson.Types (fromJSONKeyCoerce)
21import qualified Data.ByteString.Lazy as LBS
18import qualified Data.ByteString.Lazy as LBS
22import qualified Data.HashMap.Strict as HM
19import qualified Data.HashMap.Strict as HM
23import qualified Data.Map as M
20import qualified Data.Map as M
@@ -47,10 +44,10 @@ instance NFData T1 where
47instance Hashable T1 where
44instance Hashable T1 where
48 hashWithSalt salt (T1 t) = hashWithSalt salt t
45 hashWithSalt salt (T1 t) = hashWithSalt salt t
49
46
50−instance B.FromJSON T1 where
47+instance FromJSON T1 where
51− parseJSON = B.withText "T1" $ pure . T1
48+ parseJSON = withText "T1" $ pure . T1
52−instance B.FromJSONKey T1 where
49+instance FromJSONKey T1 where
53− fromJSONKey = B.FromJSONKeyText T1
50+ fromJSONKey = FromJSONKeyText T1
54
51
55-------------------------------------------------------------------------------
52-------------------------------------------------------------------------------
56-- Coerce
53-- Coerce
@@ -64,10 +61,10 @@ instance NFData T2 where
64instance Hashable T2 where
61instance Hashable T2 where
65 hashWithSalt salt (T2 t) = hashWithSalt salt t
62 hashWithSalt salt (T2 t) = hashWithSalt salt t
66
63
67−instance B.FromJSON T2 where
64+instance FromJSON T2 where
68− parseJSON = B.withText "T2" $ pure . T2
65+ parseJSON = withText "T2" $ pure . T2
69−instance B.FromJSONKey T2 where
66+instance FromJSONKey T2 where
70− fromJSONKey = B.fromJSONKeyCoerce
67+ fromJSONKey = fromJSONKeyCoerce
71
68
72-------------------------------------------------------------------------------
69-------------------------------------------------------------------------------
73-- TextParser
70-- TextParser
@@ -81,10 +78,10 @@ instance NFData T3 where
81instance Hashable T3 where
78instance Hashable T3 where
82 hashWithSalt salt (T3 t) = hashWithSalt salt t
79 hashWithSalt salt (T3 t) = hashWithSalt salt t
83
80
84−instance B.FromJSON T3 where
81+instance FromJSON T3 where
85− parseJSON = B.withText "T3" $ pure . T3
82+ parseJSON = withText "T3" $ pure . T3
86−instance B.FromJSONKey T3 where
83+instance FromJSONKey T3 where
87− fromJSONKey = B.FromJSONKeyTextParser (pure . T3)
84+ fromJSONKey = FromJSONKeyTextParser (pure . T3)
88
85
89-------------------------------------------------------------------------------
86-------------------------------------------------------------------------------
90-- Values
87-- Values
@@ -97,40 +94,30 @@ value1000 = value 1000
97value10000 = value 10000
94value10000 = value 10000
98
95
99encodedValue10 :: LBS.ByteString
96encodedValue10 :: LBS.ByteString
100−encodedValue10 = B.encode $ value10
97+encodedValue10 = encode value10
101
98
102encodedValue100 :: LBS.ByteString
99encodedValue100 :: LBS.ByteString
103−encodedValue100 = B.encode $ value100
100+encodedValue100 = encode value100
104
101
105encodedValue1000 :: LBS.ByteString
102encodedValue1000 :: LBS.ByteString
106−encodedValue1000 = B.encode $ value1000
103+encodedValue1000 = encode value1000
107
104
108encodedValue10000 :: LBS.ByteString
105encodedValue10000 :: LBS.ByteString
109−encodedValue10000 = B.encode $ value10000
106+encodedValue10000 = encode value10000
110
107
111-------------------------------------------------------------------------------
108-------------------------------------------------------------------------------
112-- Helpers
109-- Helpers
113-------------------------------------------------------------------------------
110-------------------------------------------------------------------------------
114
111
115−decodeHMB
112+decodeHM
116− :: (B.FromJSONKey k, Eq k, Hashable k)
113+ :: (FromJSON (HM.HashMap k T.Text), Eq k, Hashable k)
117 => Proxy k -> LBS.ByteString -> Maybe (HM.HashMap k T.Text)
114 => Proxy k -> LBS.ByteString -> Maybe (HM.HashMap k T.Text)
118−decodeHMB _ = B.decode
115+decodeHM _ = decode
119
116
120−decodeHMA
117+decodeMap
121− :: (A.FromJSON (HM.HashMap k T.Text), Eq k, Hashable k)
122− => Proxy k -> LBS.ByteString -> Maybe (HM.HashMap k T.Text)
123−decodeHMA _ = A.decode
124−
125−decodeMapB
126− :: (B.FromJSONKey k, Ord k)
127− => Proxy k -> LBS.ByteString -> Maybe (M.Map k T.Text)
128−decodeMapB _ = B.decode
129−
130−decodeMapA
131− :: (A.FromJSON (M.Map k T.Text), Ord k)
118+ :: (FromJSON (M.Map k T.Text), Ord k)
132 => Proxy k -> LBS.ByteString -> Maybe (M.Map k T.Text)
119 => Proxy k -> LBS.ByteString -> Maybe (M.Map k T.Text)
133−decodeMapA _ = A.decode
120+decodeMap _ = decode
134
121
135proxyText :: Proxy T.Text
122proxyText :: Proxy T.Text
136proxyText = Proxy
123proxyText = Proxy
@@ -156,15 +143,14 @@ benchDecodeHM
156 -> LBS.ByteString
143 -> LBS.ByteString
157 -> Benchmark
144 -> Benchmark
158benchDecodeHM name val = bgroup name
145benchDecodeHM name val = bgroup name
159− [ bench "Text" $ nf (decodeHMB proxyText) val
146+ [ bench "Text" $ nf (decodeHM proxyText) val
160− , bench "Identity" $ nf (decodeHMB proxyT1) val
147+ , bench "Identity" $ nf (decodeHM proxyT1) val
161− , bench "Coerce" $ nf (decodeHMB proxyT2) val
148+ , bench "Coerce" $ nf (decodeHM proxyT2) val
162− , bench "Parser" $ nf (decodeHMB proxyT3) val
149+ , bench "Parser" $ nf (decodeHM proxyT3) val
163− , bench "aeson-0.11" $ nf (decodeHMA proxyText) val
164− , bench "Tagged Text" $ nf (decodeHMB $ proxyTagged proxyText) val
150+ , bench "Tagged Text" $ nf (decodeHM $ proxyTagged proxyText) val
165− , bench "Tagged Identity" $ nf (decodeHMB $ proxyTagged proxyT1) val
151+ , bench "Tagged Identity" $ nf (decodeHM $ proxyTagged proxyT1) val
166− , bench "Tagged Coerce" $ nf (decodeHMB $ proxyTagged proxyT2) val
152+ , bench "Tagged Coerce" $ nf (decodeHM $ proxyTagged proxyT2) val
167− , bench "Tagged Parser" $ nf (decodeHMB $ proxyTagged proxyT3) val
153+ , bench "Tagged Parser" $ nf (decodeHM $ proxyTagged proxyT3) val
168 ]
154 ]
169
155
170benchDecodeMap
156benchDecodeMap
@@ -172,11 +158,10 @@ benchDecodeMap
172 -> LBS.ByteString
158 -> LBS.ByteString
173 -> Benchmark
159 -> Benchmark
174benchDecodeMap name val = bgroup name
160benchDecodeMap name val = bgroup name
175− [ bench "Text" $ nf (decodeMapB proxyText) val
161+ [ bench "Text" $ nf (decodeMap proxyText) val
176− , bench "Identity" $ nf (decodeMapB proxyT1) val
162+ , bench "Identity" $ nf (decodeMap proxyT1) val
177− , bench "Coerce" $ nf (decodeMapB proxyT2) val
163+ , bench "Coerce" $ nf (decodeMap proxyT2) val
178− , bench "Parser" $ nf (decodeMapB proxyT3) val
164+ , bench "Parser" $ nf (decodeMap proxyT3) val
179− , bench "aeson-0.11" $ nf (decodeMapA proxyText) val
180 ]
165 ]
181
166
182benchEncodeHM
167benchEncodeHM
@@ -184,8 +169,7 @@ benchEncodeHM
184 -> HM.HashMap T.Text T.Text
169 -> HM.HashMap T.Text T.Text
185 -> Benchmark
170 -> Benchmark
186benchEncodeHM name val = bgroup name
171benchEncodeHM name val = bgroup name
187− [ bench "Text" $ nf B.encode val
172+ [ bench "Text" $ nf encode val
188− , bench "aeson-0.11" $ nf A.encode val
189 ]
173 ]
190
174
191benchEncodeMap
175benchEncodeMap
@@ -193,8 +177,7 @@ benchEncodeMap
193 -> HM.HashMap T.Text T.Text
177 -> HM.HashMap T.Text T.Text
194 -> Benchmark
178 -> Benchmark
195benchEncodeMap name val = bgroup name
179benchEncodeMap name val = bgroup name
196− [ bench "Text" $ nf B.encode val'
180+ [ bench "Text" $ nf encode val'
197− , bench "aeson-0.11" $ nf A.encode val'
198 ]
181 ]
199 where
182 where
200 val' :: M.Map T.Text T.Text
183 val' :: M.Map T.Text T.Text
benchmarks/AesonParse.hs+3−5
@@ -1,14 +1,12 @@
1{-# LANGUAGE BangPatterns #-}
1{-# LANGUAGE BangPatterns #-}
2+{-# LANGUAGE NoImplicitPrelude #-}
2{-# LANGUAGE OverloadedStrings #-}
3{-# LANGUAGE OverloadedStrings #-}
3−{-# LANGUAGE PackageImports #-}
4
4
5module Main (main) where
5module Main (main) where
6
6
7−import Prelude ()
8import Prelude.Compat
7import Prelude.Compat
9
8
10−import "aeson-benchmarks" Data.Aeson
9+import Data.Aeson
11−import Control.Exception
12import Control.Monad
10import Control.Monad
13import Data.Attoparsec.ByteString (IResult(..), parseWith)
11import Data.Attoparsec.ByteString (IResult(..), parseWith)
14import Data.Time.Clock
12import Data.Time.Clock
@@ -21,7 +19,7 @@ main = do
21 (bs:cnt:args) <- getArgs
19 (bs:cnt:args) <- getArgs
22 let count = read cnt :: Int
20 let count = read cnt :: Int
23 blkSize = read bs
21 blkSize = read bs
24− forM_ args $ \arg -> bracket (openFile arg ReadMode) hClose $ \h -> do
22+ forM_ args $ \arg -> withFile arg ReadMode $ \h -> do
25 putStrLn $ arg ++ ":"
23 putStrLn $ arg ++ ":"
26 start <- getCurrentTime
24 start <- getCurrentTime
27 let loop !good !bad
25 let loop !good !bad
benchmarks/AesonTuples.hs+1−2
@@ -1,8 +1,7 @@
1−module Main where
1+{-# LANGUAGE NoImplicitPrelude #-}
2
2
3module Main (main) where
3module Main (main) where
4
4
5−import Prelude ()
6import Prelude.Compat
5import Prelude.Compat
7
6
8import Control.DeepSeq (deepseq)
7import Control.DeepSeq (deepseq)
benchmarks/Auto/G/BigProduct.hsnew file+33
@@ -0,0 +1,33 @@
1+{-# LANGUAGE DeriveGeneric #-}
2+
3+module Auto.G.BigProduct where
4+
5+import Control.DeepSeq
6+import Data.Aeson
7+import GHC.Generics (Generic)
8+import Options
9+
10+data BigProduct = BigProduct
11+ !Int !Int !Int !Int !Int
12+ !Int !Int !Int !Int !Int
13+ !Int !Int !Int !Int !Int
14+ !Int !Int !Int !Int !Int
15+ !Int !Int !Int !Int !Int
16+ deriving (Show, Eq, Generic)
17+
18+instance NFData BigProduct where
19+ rnf a = a `seq` ()
20+
21+instance ToJSON BigProduct where
22+ toJSON = genericToJSON opts
23+ toEncoding = genericToEncoding opts
24+
25+instance FromJSON BigProduct where
26+ parseJSON = genericParseJSON opts
27+
28+bigProduct :: BigProduct
29+bigProduct = BigProduct 1 2 3 4 5
30+ 6 7 8 9 10
31+ 11 12 13 14 15
32+ 16 17 18 19 20
33+ 21 22 23 24 25
benchmarks/Auto/G/BigRecord.hsnew file+33
@@ -0,0 +1,33 @@
1+{-# LANGUAGE DeriveGeneric #-}
2+
3+module Auto.G.BigRecord where
4+
5+import Control.DeepSeq
6+import Data.Aeson
7+import GHC.Generics (Generic)
8+import Options
9+
10+data BigRecord = BigRecord
11+ { field01 :: !Int, field02 :: !Int, field03 :: !Int, field04 :: !Int, field05 :: !Int
12+ , field06 :: !Int, field07 :: !Int, field08 :: !Int, field09 :: !Int, field10 :: !Int
13+ , field11 :: !Int, field12 :: !Int, field13 :: !Int, field14 :: !Int, field15 :: !Int
14+ , field16 :: !Int, field17 :: !Int, field18 :: !Int, field19 :: !Int, field20 :: !Int
15+ , field21 :: !Int, field22 :: !Int, field23 :: !Int, field24 :: !Int, field25 :: !Int
16+ } deriving (Show, Eq, Generic)
17+
18+instance NFData BigRecord where
19+ rnf a = a `seq` ()
20+
21+instance ToJSON BigRecord where
22+ toJSON = genericToJSON opts
23+ toEncoding = genericToEncoding opts
24+
25+instance FromJSON BigRecord where
26+ parseJSON = genericParseJSON opts
27+
28+bigRecord :: BigRecord
29+bigRecord = BigRecord 1 2 3 4 5
30+ 6 7 8 9 10
31+ 11 12 13 14 15
32+ 16 17 18 19 20
33+ 21 22 23 24 25
benchmarks/Auto/G/BigSum.hsnew file+28
@@ -0,0 +1,28 @@
1+{-# LANGUAGE DeriveGeneric #-}
2+
3+module Auto.G.BigSum where
4+
5+import Control.DeepSeq
6+import Data.Aeson
7+import GHC.Generics (Generic)
8+import Options
9+
10+data BigSum = F01 | F02 | F03 | F04 | F05
11+ | F06 | F07 | F08 | F09 | F10
12+ | F11 | F12 | F13 | F14 | F15
13+ | F16 | F17 | F18 | F19 | F20
14+ | F21 | F22 | F23 | F24 | F25
15+ deriving (Show, Eq, Generic)
16+
17+instance NFData BigSum where
18+ rnf a = a `seq` ()
19+
20+instance ToJSON BigSum where
21+ toJSON = genericToJSON opts
22+ toEncoding = genericToEncoding opts
23+
24+instance FromJSON BigSum where
25+ parseJSON = genericParseJSON opts
26+
27+bigSum :: BigSum
28+bigSum = F25
benchmarks/Auto/G/D.hsnew file+44
@@ -0,0 +1,44 @@
1+{-# LANGUAGE DeriveGeneric #-}
2+
3+module Auto.G.D where
4+
5+import Control.DeepSeq
6+import Data.Aeson
7+import GHC.Generics (Generic)
8+import Options
9+
10+data D a = Nullary
11+ | Unary Int
12+ | Product String Char a
13+ | Record { testOne :: Double
14+ , testTwo :: Bool
15+ , testThree :: D a
16+ }
17+ deriving (Show, Eq, Generic)
18+
19+instance NFData a => NFData (D a) where
20+ rnf Nullary = ()
21+ rnf (Unary n) = rnf n
22+ rnf (Product s c x) = s `deepseq` c `deepseq` rnf x
23+ rnf (Record a b y) = a `deepseq` b `deepseq` rnf y
24+
25+instance ToJSON a => ToJSON (D a) where
26+ toJSON = genericToJSON opts
27+ toEncoding = genericToEncoding opts
28+
29+instance FromJSON a => FromJSON (D a) where
30+ parseJSON = genericParseJSON opts
31+
32+type T = D (D (D ()))
33+
34+d :: T
35+d = Record
36+ { testOne = 1234.56789
37+ , testTwo = True
38+ , testThree = Product "Hello World!" 'a'
39+ Record
40+ { testOne = 9876.54321
41+ , testTwo = False
42+ , testThree = Product "Yeehaa!!!" '\n' Nullary
43+ }
44+ }
benchmarks/Auto/T/BigProduct.hsnew file+27
@@ -0,0 +1,27 @@
1+{-# LANGUAGE TemplateHaskell #-}
2+
3+module Auto.T.BigProduct where
4+
5+import Control.DeepSeq
6+import Data.Aeson.TH
7+import Options
8+
9+data BigProduct = BigProduct
10+ !Int !Int !Int !Int !Int
11+ !Int !Int !Int !Int !Int
12+ !Int !Int !Int !Int !Int
13+ !Int !Int !Int !Int !Int
14+ !Int !Int !Int !Int !Int
15+ deriving (Show, Eq)
16+
17+instance NFData BigProduct where
18+ rnf a = a `seq` ()
19+
20+deriveJSON opts ''BigProduct
21+
22+bigProduct :: BigProduct
23+bigProduct = BigProduct 1 2 3 4 5
24+ 6 7 8 9 10
25+ 11 12 13 14 15
26+ 16 17 18 19 20
27+ 21 22 23 24 25
benchmarks/Auto/T/BigRecord.hsnew file+27
@@ -0,0 +1,27 @@
1+{-# LANGUAGE TemplateHaskell #-}
2+
3+module Auto.T.BigRecord where
4+
5+import Control.DeepSeq
6+import Data.Aeson.TH
7+import Options
8+
9+data BigRecord = BigRecord
10+ { field01 :: !Int, field02 :: !Int, field03 :: !Int, field04 :: !Int, field05 :: !Int
11+ , field06 :: !Int, field07 :: !Int, field08 :: !Int, field09 :: !Int, field10 :: !Int
12+ , field11 :: !Int, field12 :: !Int, field13 :: !Int, field14 :: !Int, field15 :: !Int
13+ , field16 :: !Int, field17 :: !Int, field18 :: !Int, field19 :: !Int, field20 :: !Int
14+ , field21 :: !Int, field22 :: !Int, field23 :: !Int, field24 :: !Int, field25 :: !Int
15+ } deriving (Show, Eq)
16+
17+instance NFData BigRecord where
18+ rnf a = a `seq` ()
19+
20+deriveJSON opts ''BigRecord
21+
22+bigRecord :: BigRecord
23+bigRecord = BigRecord 1 2 3 4 5
24+ 6 7 8 9 10
25+ 11 12 13 14 15
26+ 16 17 18 19 20
27+ 21 22 23 24 25
benchmarks/Auto/T/BigSum.hsnew file+22
@@ -0,0 +1,22 @@
1+{-# LANGUAGE TemplateHaskell #-}
2+
3+module Auto.T.BigSum where
4+
5+import Control.DeepSeq
6+import Data.Aeson.TH
7+import Options
8+
9+data BigSum = F01 | F02 | F03 | F04 | F05
10+ | F06 | F07 | F08 | F09 | F10
11+ | F11 | F12 | F13 | F14 | F15
12+ | F16 | F17 | F18 | F19 | F20
13+ | F21 | F22 | F23 | F24 | F25
14+ deriving (Show, Eq)
15+
16+instance NFData BigSum where
17+ rnf a = a `seq` ()
18+
19+deriveJSON opts ''BigSum
20+
21+bigSum :: BigSum
22+bigSum = F25
benchmarks/Auto/T/D.hsnew file+38
@@ -0,0 +1,38 @@
1+{-# LANGUAGE TemplateHaskell #-}
2+
3+module Auto.T.D where
4+
5+import Control.DeepSeq
6+import Data.Aeson.TH
7+import Options
8+
9+data D a = Nullary
10+ | Unary Int
11+ | Product String Char a
12+ | Record { testOne :: Double
13+ , testTwo :: Bool
14+ , testThree :: D a
15+ }
16+ deriving (Show, Eq)
17+
18+instance NFData a => NFData (D a) where
19+ rnf Nullary = ()
20+ rnf (Unary n) = rnf n
21+ rnf (Product s c x) = s `deepseq` c `deepseq` rnf x
22+ rnf (Record a b y) = a `deepseq` b `deepseq` rnf y
23+
24+deriveJSON opts ''D
25+
26+type T = D (D (D ()))
27+
28+d :: T
29+d = Record
30+ { testOne = 1234.56789
31+ , testTwo = True
32+ , testThree = Product "Hello World!" 'a'
33+ Record
34+ { testOne = 9876.54321
35+ , testTwo = False
36+ , testThree = Product "Yeehaa!!!" '\n' Nullary
37+ }
38+ }
benchmarks/AutoCompare.hsnew file+73
@@ -0,0 +1,73 @@
1+{-# LANGUAGE RankNTypes #-}
2+{-# LANGUAGE ScopedTypeVariables #-}
3+
4+module Main (main) where
5+
6+import Control.DeepSeq
7+import Control.Monad
8+import Criterion.Main
9+import Data.Aeson
10+
11+import qualified Auto.T.D as T
12+import qualified Auto.T.BigRecord as T
13+import qualified Auto.T.BigProduct as T
14+import qualified Auto.T.BigSum as T
15+import qualified Auto.G.D as G
16+import qualified Auto.G.BigRecord as G
17+import qualified Auto.G.BigProduct as G
18+import qualified Auto.G.BigSum as G
19+
20+--------------------------------------------------------------------------------
21+
22+runBench :: IO ()
23+runBench = defaultMain
24+ [ compareBench "D" T.d G.d
25+ , compareBench "BigRecord" T.bigRecord G.bigRecord
26+ , compareBench "BigProduct" T.bigProduct G.bigProduct
27+ , compareBench "BigSum" T.bigSum G.bigSum
28+ ]
29+
30+group :: String -> Benchmarkable -> Benchmarkable -> Benchmark
31+group n th gen = bgroup n [ bench "th" th
32+ , bench "generic" gen
33+ ]
34+
35+compareBench
36+ :: forall a b
37+ . (ToJSON a, FromJSON a, NFData a, ToJSON b, FromJSON b, NFData b)
38+ => String -> a -> b -> Benchmark
39+compareBench name a b = v `deepseq` bgroup name
40+ [ group "toJSON" (nf toJSON a)
41+ (nf toJSON b)
42+ , group "encode" (nf encode a)
43+ (nf encode b)
44+ , group "fromJSON" (nf (fromJSON :: Value -> Result a) v)
45+ (nf (fromJSON :: Value -> Result b) v)
46+ ] where
47+ v = toJSON a -- == toJSON b
48+
49+sanityCheck :: IO ()
50+sanityCheck = do
51+ check T.d
52+ check G.d
53+ check T.bigRecord
54+ check G.bigRecord
55+ check T.bigProduct
56+ check G.bigProduct
57+ check T.bigSum
58+ check G.bigSum
59+
60+check :: (Show a, Eq a, FromJSON a, ToJSON a)
61+ => a -> IO ()
62+check x = do
63+ unless (Success x == (fromJSON . toJSON) x) $ fail $ "toJSON: " ++ show x
64+ unless (Success x == (decode_ . encode) x) $ fail $ "encode: " ++ show x
65+ where
66+ decode_ s = case decode s of
67+ Just v -> fromJSON v
68+ Nothing -> fail ""
69+
70+main :: IO ()
71+main = do
72+ sanityCheck
73+ runBench
benchmarks/Compare.hs+10−5
@@ -1,22 +1,25 @@
1−{-# LANGUAGE PackageImports #-}
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE NoImplicitPrelude #-}
2{-# LANGUAGE ScopedTypeVariables #-}
3{-# LANGUAGE ScopedTypeVariables #-}
3
4
4module Main (main) where
5module Main (main) where
5
6
6−import Prelude ()
7import Prelude.Compat
7import Prelude.Compat
8
8
9import Compare.BufferBuilder ()
9import Compare.BufferBuilder ()
10−import Compare.JsonBuilder ()
11import Criterion.Main
10import Criterion.Main
12import Data.BufferBuilder.Json
11import Data.BufferBuilder.Json
13−import Data.Json.Builder
14import Twitter
12import Twitter
15import Twitter.Manual ()
13import Twitter.Manual ()
16import Typed.Common
14import Typed.Common
17−import qualified "aeson-benchmarks" Data.Aeson as Aeson
15+import qualified Data.Aeson as Aeson
18import qualified Compare.JsonBench as JsonBench
16import qualified Compare.JsonBench as JsonBench
19
17
18+#ifdef MIN_VERSION_json_builder
19+import Data.Json.Builder
20+import Compare.JsonBuilder ()
21+#endif
22+
20main :: IO ()
23main :: IO ()
21main =
24main =
22 defaultMain [
25 defaultMain [
@@ -24,7 +27,9 @@ main =
24 bgroup "twitter" [
27 bgroup "twitter" [
25 bench "aeson" $ nf Aeson.encode twtr
28 bench "aeson" $ nf Aeson.encode twtr
26 , bench "buffer-builder" $ nf encodeJson twtr
29 , bench "buffer-builder" $ nf encodeJson twtr
30+#ifdef MIN_VERSION_json_builder
27 , bench "json-builder" $ nf toJsonLBS twtr
31 , bench "json-builder" $ nf toJsonLBS twtr
32+#endif
28 ]
33 ]
29 , JsonBench.benchmarks
34 , JsonBench.benchmarks
30 ]
35 ]
benchmarks/Compare/BufferBuilder.hs+2−3
@@ -1,3 +1,4 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
1{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE RecordWildCards #-}
3{-# LANGUAGE RecordWildCards #-}
3
4
@@ -6,13 +7,11 @@
6
7
7module Compare.BufferBuilder () where
8module Compare.BufferBuilder () where
8
9
9−import Prelude ()
10+import Prelude.Compat hiding ((<>))
10−import Prelude.Compat
11
11
12import Data.BufferBuilder.Json
12import Data.BufferBuilder.Json
13import Data.Int (Int64)
13import Data.Int (Int64)
14import Data.Monoid ((<>))
14import Data.Monoid ((<>))
15−import Prelude hiding (id)
16import Twitter
15import Twitter
17import qualified Data.BufferBuilder.Utf8 as UB
16import qualified Data.BufferBuilder.Utf8 as UB
18
17
benchmarks/Compare/JsonBench.hs+18−10
@@ -1,18 +1,18 @@
1−-- Adapted from a buffer-builder benchmark:
1+{-# LANGUAGE CPP #-}
2−--
3−-- https://github.com/chadaustin/buffer-builder/blob/master/test.json
4−
5{-# LANGUAGE BangPatterns #-}
2{-# LANGUAGE BangPatterns #-}
6−{-# LANGUAGE GeneralizedNewtypeDeriving #-}
7{-# LANGUAGE MagicHash #-}
3{-# LANGUAGE MagicHash #-}
4+{-# LANGUAGE NoImplicitPrelude #-}
8{-# LANGUAGE OverloadedStrings #-}
5{-# LANGUAGE OverloadedStrings #-}
9{-# LANGUAGE RecordWildCards #-}
6{-# LANGUAGE RecordWildCards #-}
10{-# LANGUAGE ScopedTypeVariables #-}
7{-# LANGUAGE ScopedTypeVariables #-}
11
8
9+-- Adapted from a buffer-builder benchmark:
10+--
11+-- https://github.com/chadaustin/buffer-builder/blob/master/test.json
12+
12module Compare.JsonBench (benchmarks) where
13module Compare.JsonBench (benchmarks) where
13
14
14−import Prelude ()
15+import Prelude.Compat hiding ((<>))
15−import Prelude.Compat
16
16
17import Control.DeepSeq (NFData(..))
17import Control.DeepSeq (NFData(..))
18import Criterion
18import Criterion
@@ -20,9 +20,13 @@ import Data.Aeson ((.:))
20import Data.Monoid ((<>))
20import Data.Monoid ((<>))
21import Data.Text (Text)
21import Data.Text (Text)
22import Typed.Common (load)
22import Typed.Common (load)
23+import qualified Control.Monad.Fail as Fail
23import qualified Data.Aeson as Aeson
24import qualified Data.Aeson as Aeson
24import qualified Data.BufferBuilder.Json as Json
25import qualified Data.BufferBuilder.Json as Json
26+
27+#ifdef MIN_VERSION_json_builder
25import qualified Data.Json.Builder as JB
28import qualified Data.Json.Builder as JB
29+#endif
26
30
27data EyeColor = Green | Blue | Brown
31data EyeColor = Green | Blue | Brown
28 deriving (Eq, Show)
32 deriving (Eq, Show)
@@ -65,10 +69,10 @@ instance NFData Gender where rnf !_ = ()
65instance NFData Fruit where rnf !_ = ()
69instance NFData Fruit where rnf !_ = ()
66
70
67instance NFData Friend where
71instance NFData Friend where
68− rnf Friend {..} = (rnf fId) `seq` (rnf fName) `seq` ()
72+ rnf Friend {..} = rnf fId `seq` rnf fName
69
73
70instance NFData User where
74instance NFData User where
71− rnf User {..} = (rnf uId) `seq` (rnf uIndex) `seq` (rnf uGuid) `seq` (rnf uIsActive) `seq` (rnf uBalance) `seq` (rnf uPicture) `seq` (rnf uAge) `seq` (rnf uEyeColor) `seq` (rnf uName) `seq` (rnf uGender) `seq` (rnf uCompany) `seq` (rnf uEmail) `seq` (rnf uPhone) `seq` (rnf uAddress) `seq` (rnf uAbout) `seq` (rnf uRegistered) `seq` (rnf uLatitude) `seq` (rnf uLongitude) `seq` (rnf uTags) `seq` (rnf uFriends) `seq` (rnf uGreeting) `seq` (rnf uFavouriteFruit) `seq` ()
75+ rnf User {..} = rnf uId `seq` rnf uIndex `seq` rnf uGuid `seq` rnf uIsActive `seq` rnf uBalance `seq` rnf uPicture `seq` rnf uAge `seq` rnf uEyeColor `seq` rnf uName `seq` rnf uGender `seq` rnf uCompany `seq` rnf uEmail `seq` rnf uPhone `seq` rnf uAddress `seq` rnf uAbout `seq` rnf uRegistered `seq` rnf uLatitude `seq` rnf uLongitude `seq` rnf uTags `seq` rnf uFriends `seq` rnf uGreeting `seq` rnf uFavouriteFruit
72
76
73eyeColorTable :: [(Text, EyeColor)]
77eyeColorTable :: [(Text, EyeColor)]
74eyeColorTable = [("brown", Brown), ("green", Green), ("blue", Blue)]
78eyeColorTable = [("brown", Brown), ("green", Green), ("blue", Blue)]
@@ -79,7 +83,7 @@ genderTable = [("male", Male), ("female", Female)]
79fruitTable :: [(Text, Fruit)]
83fruitTable :: [(Text, Fruit)]
80fruitTable = [("apple", Apple), ("strawberry", Strawberry), ("banana", Banana)]
84fruitTable = [("apple", Apple), ("strawberry", Strawberry), ("banana", Banana)]
81
85
82−enumFromJson :: Monad m => String -> [(Text, enum)] -> (json -> m Text) -> json -> m enum
86+enumFromJson :: Fail.MonadFail m => String -> [(Text, enum)] -> (json -> m Text) -> json -> m enum
83enumFromJson enumName table extract v = do
87enumFromJson enumName table extract v = do
84 s <- extract v
88 s <- extract v
85 case lookup s table of
89 case lookup s table of
@@ -269,6 +273,7 @@ instance Json.ToJson User where
269 <> "greeting"# Json..=# uGreeting
273 <> "greeting"# Json..=# uGreeting
270 <> "favoriteFruit"# Json..=# uFavouriteFruit
274 <> "favoriteFruit"# Json..=# uFavouriteFruit
271
275
276+#ifdef MIN_VERSION_json_builder
272---- json-builder instances ----
277---- json-builder instances ----
273
278
274instance JB.Value EyeColor where
279instance JB.Value EyeColor where
@@ -320,6 +325,7 @@ instance JB.Value User where
320 <> t "friends" `JB.row` uFriends
325 <> t "friends" `JB.row` uFriends
321 <> t "greeting" `JB.row` uGreeting
326 <> t "greeting" `JB.row` uGreeting
322 <> t "favoriteFruit" `JB.row` uFavouriteFruit
327 <> t "favoriteFruit" `JB.row` uFavouriteFruit
328+#endif
323
329
324benchmarks :: Benchmark
330benchmarks :: Benchmark
325benchmarks = env (load "json-data/buffer-builder.json") $
331benchmarks = env (load "json-data/buffer-builder.json") $
@@ -327,5 +333,7 @@ benchmarks = env (load "json-data/buffer-builder.json") $
327 bgroup "json-bench" [
333 bgroup "json-bench" [
328 bench "aeson" $ nf Aeson.encode parsedUserList
334 bench "aeson" $ nf Aeson.encode parsedUserList
329 , bench "buffer-builder" $ nf Json.encodeJson parsedUserList
335 , bench "buffer-builder" $ nf Json.encodeJson parsedUserList
336+#ifdef MIN_VERSION_json_builder
330 , bench "json-builder" $ nf JB.toJsonLBS parsedUserList
337 , bench "json-builder" $ nf JB.toJsonLBS parsedUserList
338+#endif
331 ]
339 ]
benchmarks/Compare/JsonBuilder.hs+2−3
@@ -1,3 +1,4 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
1{-# LANGUAGE RecordWildCards #-}
2{-# LANGUAGE RecordWildCards #-}
2
3
3{-# OPTIONS_GHC -fno-warn-name-shadowing #-}
4{-# OPTIONS_GHC -fno-warn-name-shadowing #-}
@@ -5,12 +6,10 @@
5
6
6module Compare.JsonBuilder () where
7module Compare.JsonBuilder () where
7
8
8−import Prelude ()
9+import Prelude.Compat hiding ((<>))
9−import Prelude.Compat
10
10
11import Data.Json.Builder
11import Data.Json.Builder
12import Data.Monoid ((<>))
12import Data.Monoid ((<>))
13−import Prelude hiding (id)
14import Twitter
13import Twitter
15
14
16instance JsObject Metadata where
15instance JsObject Metadata where
benchmarks/CompareWithJSON.hs+33−21
@@ -1,16 +1,20 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
1{-# OPTIONS_GHC -fno-warn-orphans #-}
3{-# OPTIONS_GHC -fno-warn-orphans #-}
2
4
3module Main (main) where
5module Main (main) where
4
6
5−import Prelude ()
6import Prelude.Compat
7import Prelude.Compat
7
8
8import Blaze.ByteString.Builder (toLazyByteString)
9import Blaze.ByteString.Builder (toLazyByteString)
9import Blaze.ByteString.Builder.Char.Utf8 (fromString)
10import Blaze.ByteString.Builder.Char.Utf8 (fromString)
10import Control.DeepSeq (NFData(rnf))
11import Control.DeepSeq (NFData(rnf))
11import Criterion.Main
12import Criterion.Main
13+import Data.Maybe (fromMaybe)
12import qualified Data.Aeson as A
14import qualified Data.Aeson as A
13import qualified Data.Aeson.Text as A
15import qualified Data.Aeson.Text as A
16+import qualified Data.Aeson.Parser.Internal as I
17+import qualified Data.ByteString as BS
14import qualified Data.ByteString.Lazy as BL
18import qualified Data.ByteString.Lazy as BL
15import qualified Data.Text.Lazy as TL
19import qualified Data.Text.Lazy as TL
16import qualified Data.Text.Lazy.Builder as TLB
20import qualified Data.Text.Lazy.Builder as TLB
@@ -23,7 +27,7 @@ instance (NFData v) => NFData (J.JSObject v) where
23instance NFData J.JSValue where
27instance NFData J.JSValue where
24 rnf J.JSNull = ()
28 rnf J.JSNull = ()
25 rnf (J.JSBool b) = rnf b
29 rnf (J.JSBool b) = rnf b
26− rnf (J.JSRational a b) = rnf a `seq` rnf b `seq` ()
30+ rnf (J.JSRational a b) = rnf a `seq` rnf b
27 rnf (J.JSString s) = rnf (J.fromJSString s)
31 rnf (J.JSString s) = rnf (J.fromJSString s)
28 rnf (J.JSArray lst) = rnf lst
32 rnf (J.JSArray lst) = rnf lst
29 rnf (J.JSObject o) = rnf o
33 rnf (J.JSObject o) = rnf o
@@ -34,15 +38,18 @@ decodeJ s =
34 J.Ok v -> v
38 J.Ok v -> v
35 J.Error _ -> error "fail to parse via JSON"
39 J.Error _ -> error "fail to parse via JSON"
36
40
37−decodeA :: BL.ByteString -> A.Value
41+decode :: BL.ByteString -> A.Value
38−decodeA s = case A.decode s of
42+decode s = fromMaybe (error "fail to parse via Aeson") $ A.decode s
39− Just v -> v
43+
44+decode' :: BL.ByteString -> A.Value
45+decode' s = fromMaybe (error "fail to parse via Aeson") $ A.decode' s
46+
47+decodeS :: BS.ByteString -> A.Value
40− Nothing -> error "fail to parse via Aeson"
48+decodeS s = fromMaybe (error "fail to parse via Aeson") $ A.decodeStrict' s
41
49
42−decodeA' :: BL.ByteString -> A.Value
50+decodeIP :: BL.ByteString -> A.Value
43−decodeA' s = case A.decode' s of
44− Just v -> v
45− Nothing -> error "fail to parse via Aeson"
51+decodeIP s = fromMaybe (error "fail to parse via Parser.decodeWith") $
52+ I.decodeWith I.jsonEOF A.fromJSON s
46
53
47encodeJ :: J.JSValue -> BL.ByteString
54encodeJ :: J.JSValue -> BL.ByteString
48encodeJ = toLazyByteString . fromString . J.encode
55encodeJ = toLazyByteString . fromString . J.encode
@@ -58,32 +65,37 @@ main = do
58 let enFile = "json-data/twitter100.json"
65 let enFile = "json-data/twitter100.json"
59 jpFile = "json-data/jp100.json"
66 jpFile = "json-data/jp100.json"
60 enA <- BL.readFile enFile
67 enA <- BL.readFile enFile
68+ enS <- BS.readFile enFile
61 enJ <- readFile enFile
69 enJ <- readFile enFile
62 jpA <- BL.readFile jpFile
70 jpA <- BL.readFile jpFile
71+ jpS <- BS.readFile jpFile
63 jpJ <- readFile jpFile
72 jpJ <- readFile jpFile
64 defaultMain [
73 defaultMain [
65 bgroup "decode" [
74 bgroup "decode" [
66 bgroup "en" [
75 bgroup "en" [
67− bench "aeson/lazy" $ nf decodeA enA
76+ bench "aeson/lazy" $ nf decode enA
68− , bench "aeson/strict" $ nf decodeA' enA
77+ , bench "aeson/strict" $ nf decode' enA
78+ , bench "aeson/stricter" $ nf decodeS enS
79+ , bench "aeson/parser" $ nf decodeIP enA
69− , bench "json" $ nf decodeJ enJ
80+ , bench "json" $ nf decodeJ enJ
70 ]
81 ]
71 , bgroup "jp" [
82 , bgroup "jp" [
72− bench "aeson" $ nf decodeA jpA
83+ bench "aeson" $ nf decode jpA
84+ , bench "aeson/stricter" $ nf decodeS jpS
73− , bench "json" $ nf decodeJ jpJ
85+ , bench "json" $ nf decodeJ jpJ
74 ]
86 ]
75 ]
87 ]
76 , bgroup "encode" [
88 , bgroup "encode" [
77 bgroup "en" [
89 bgroup "en" [
78− bench "aeson-to-bytestring" $ nf A.encode (decodeA enA)
90+ bench "aeson-to-bytestring" $ nf A.encode (decode enA)
79− , bench "aeson-via-text-to-bytestring" $ nf encodeViaText (decodeA enA)
91+ , bench "aeson-via-text-to-bytestring" $ nf encodeViaText (decode enA)
80− , bench "aeson-to-text" $ nf encodeToText (decodeA enA)
92+ , bench "aeson-to-text" $ nf encodeToText (decode enA)
81 , bench "json" $ nf encodeJ (decodeJ enJ)
93 , bench "json" $ nf encodeJ (decodeJ enJ)
82 ]
94 ]
83 , bgroup "jp" [
95 , bgroup "jp" [
84− bench "aeson-to-bytestring" $ nf A.encode (decodeA jpA)
96+ bench "aeson-to-bytestring" $ nf A.encode (decode jpA)
85− , bench "aeson-via-text-to-bytestring" $ nf encodeViaText (decodeA jpA)
97+ , bench "aeson-via-text-to-bytestring" $ nf encodeViaText (decode jpA)
86− , bench "aeson-to-text" $ nf encodeToText (decodeA jpA)
98+ , bench "aeson-to-text" $ nf encodeToText (decode jpA)
87 , bench "json" $ nf encodeJ (decodeJ jpJ)
99 , bench "json" $ nf encodeJ (decodeJ jpJ)
88 ]
100 ]
89 ]
101 ]
benchmarks/Dates.hs+10−9
@@ -1,6 +1,7 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
1module Main (main) where
3module Main (main) where
2
4
3−import Prelude ()
4import Prelude.Compat
5import Prelude.Compat
5
6
6import Criterion.Main
7import Criterion.Main
@@ -22,22 +23,22 @@ main = do
22 defaultMain [
23 defaultMain [
23 bgroup "decode" [
24 bgroup "decode" [
24 bgroup "UTCTime" [
25 bgroup "UTCTime" [
25− env file1 $ \ ~bs -> bench "whole" $ nf utcTime bs
26+ env file1 $ \bs -> bench "whole" $ nf utcTime bs
26− , env file2 $ \ ~bs -> bench "fractional" $ nf utcTime bs
27+ , env file2 $ \bs -> bench "fractional" $ nf utcTime bs
27 ]
28 ]
28 , bgroup "ZonedTime" [
29 , bgroup "ZonedTime" [
29− env file1 $ \ ~bs -> bench "whole" $ nf zTime bs
30+ env file1 $ \bs -> bench "whole" $ nf zTime bs
30− , env file2 $ \ ~bs -> bench "fractional" $ nf zTime bs
31+ , env file2 $ \bs -> bench "fractional" $ nf zTime bs
31 ]
32 ]
32 ]
33 ]
33 , bgroup "encode" [
34 , bgroup "encode" [
34 bgroup "UTCTime" [
35 bgroup "UTCTime" [
35− env (utcTime <$> file1) $ \ ~ts -> bench "whole" $ nf encode ts
36+ env (utcTime <$> file1) $ \ts -> bench "whole" $ nf encode ts
36− , env (utcTime <$> file2) $ \ ~ts -> bench "fractional" $ nf encode ts
37+ , env (utcTime <$> file2) $ \ts -> bench "fractional" $ nf encode ts
37 ]
38 ]
38 , bgroup "ZonedTime" [
39 , bgroup "ZonedTime" [
39− env (zTime <$> file1) $ \ ~ts -> bench "whole" $ nf encode ts
40+ env (zTime <$> file1) $ \ts -> bench "whole" $ nf encode ts
40− , env (zTime <$> file2) $ \ ~ts -> bench "fractional" $ nf encode ts
41+ , env (zTime <$> file2) $ \ts -> bench "fractional" $ nf encode ts
41 ]
42 ]
42 ]
43 ]
43 ]
44 ]
benchmarks/Escape.hsnew file+32
@@ -0,0 +1,32 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
2+{-# LANGUAGE ScopedTypeVariables #-}
3+
4+{-# OPTIONS_GHC -fno-warn-name-shadowing #-}
5+
6+module Main (main) where
7+
8+import Prelude.Compat
9+
10+import Criterion.Main
11+import qualified Data.Aeson.Parser.UnescapeFFI as FFI
12+import qualified Data.Aeson.Parser.UnescapePure as Pure
13+
14+import qualified Data.ByteString.Char8 as BS
15+import System.Environment (getArgs, withArgs)
16+
17+main :: IO ()
18+main = do
19+ args_ <- getArgs
20+ let (args, p, n) =
21+ case args_ of
22+ "--pattern" : p : args_ -> k p args_
23+ _ -> k "\\\"" args_
24+ k p args_ =
25+ case args_ of
26+ "--repeat" : n : args_ -> (args_, p, read n)
27+ args_ -> (args_, p, 10000)
28+ input = BS.concat $ replicate n $ BS.pack p
29+ withArgs args $ defaultMain
30+ [ bench "ffi" $ whnf FFI.unescapeText input
31+ , bench "pure" $ whnf Pure.unescapeText input
32+ ]
benchmarks/Issue673.hsnew file+165
@@ -0,0 +1,165 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
2+{-# LANGUAGE OverloadedStrings #-}
3+
4+module Main (
5+ main,
6+ input17,
7+ input32,
8+ input64,
9+ input128,
10+ input256,
11+ input2048,
12+ input4096,
13+ input8192,
14+ input16384,
15+ ) where
16+
17+import Criterion.Main
18+import Prelude.Compat
19+import Data.Int (Int64)
20+import Data.Scientific (Scientific)
21+import Data.Semigroup ((<>))
22+import Data.Aeson.Parser (scientific)
23+
24+import qualified Data.Attoparsec.ByteString.Lazy as AttoL
25+import qualified Data.Attoparsec.ByteString.Char8 as Atto8
26+import qualified Data.Aeson as A
27+import qualified Data.ByteString as BS
28+import qualified Data.ByteString.Lazy as LBS
29+import qualified Data.ByteString.Lazy.Char8 as LBS8
30+
31+decodeInt :: LBS.ByteString -> Maybe Int
32+decodeInt = A.decode
33+
34+decodeString :: LBS.ByteString -> Maybe String
35+decodeString = A.decode
36+
37+decodeScientific :: LBS.ByteString -> Maybe Scientific
38+decodeScientific = A.decode
39+
40+decodeViaRead :: LBS.ByteString -> Integer
41+decodeViaRead = read . LBS8.unpack
42+
43+decodeAtto :: LBS.ByteString -> Maybe Scientific
44+decodeAtto
45+ = parseOnly (scientific <* AttoL.endOfInput)
46+ where
47+ parseOnly p lbs = case AttoL.parse p lbs of
48+ AttoL.Done _ r -> Just r
49+ AttoL.Fail {} -> Nothing
50+
51+decodeAtto8 :: LBS.ByteString -> Maybe Scientific
52+decodeAtto8
53+ = parseOnly (Atto8.scientific <* AttoL.endOfInput)
54+ where
55+ parseOnly p lbs = case AttoL.parse p lbs of
56+ AttoL.Done _ r -> Just r
57+ AttoL.Fail {} -> Nothing
58+
59+generate :: Int64 -> LBS.ByteString
60+generate n = LBS8.replicate n '1'
61+
62+input17 :: LBS.ByteString
63+input17 = generate 17
64+
65+input32 :: LBS.ByteString
66+input32 = generate 32
67+
68+input64 :: LBS.ByteString
69+input64 = generate 64
70+
71+input128 :: LBS.ByteString
72+input128 = generate 128
73+
74+input256 :: LBS.ByteString
75+input256 = generate 256
76+
77+input2048 :: LBS.ByteString
78+input2048 = generate 2048
79+
80+input4096 :: LBS.ByteString
81+input4096 = generate 4096
82+
83+input8192 :: LBS.ByteString
84+input8192 = generate 8192
85+
86+input16384 :: LBS.ByteString
87+input16384 = generate 16384
88+
89+
90+main :: IO ()
91+main = defaultMain
92+ -- works on 64bit
93+ [ benchPair "17" input17
94+ -- , benchPair "32" input32
95+ -- , benchPair "64" input64
96+ -- , benchPair "128" input128
97+ -- , benchPair "256" input256
98+ , benchPair "2048" input2048
99+ , benchPair "4096" input4096
100+ , benchPair "8192" input8192
101+ , benchPair "16384" input16384
102+ ]
103+ where
104+ benchPair name input = bgroup name
105+ [ bench "Int" $ whnf decodeInt input
106+ , bench "Simple" $ whnf bsToIntegerSimple (LBS.toStrict input)
107+ , bench "Optim" $ whnf bsToInteger (LBS.toStrict input)
108+ , bench "Read" $ whnf decodeViaRead input
109+ , bench "Scientific" $ whnf decodeScientific input
110+ , bench "parserA" $ whnf decodeAtto input
111+ , bench "parserS" $ whnf decodeAtto8 input
112+ , bench "String" $ whnf decodeString $ "\"" <> input <> "\""
113+ ]
114+
115+-------------------------------------------------------------------------------
116+-- better fromInteger
117+-------------------------------------------------------------------------------
118+
119+bsToInteger :: BS.ByteString -> Integer
120+bsToInteger bs
121+ | l > 40 = valInteger 10 l [ fromIntegral (w - 48) | w <- BS.unpack bs ]
122+ | otherwise = bsToIntegerSimple bs
123+ where
124+ l = BS.length bs
125+
126+bsToIntegerSimple :: BS.ByteString -> Integer
127+bsToIntegerSimple = BS.foldl' step 0 where
128+ step a b = a * 10 + fromIntegral (b - 48) -- 48 = '0'
129+
130+-- A sub-quadratic algorithm for Integer. Pairs of adjacent radix b
131+-- digits are combined into a single radix b^2 digit. This process is
132+-- repeated until we are left with a single digit. This algorithm
133+-- performs well only on large inputs, so we use the simple algorithm
134+-- for smaller inputs.
135+valInteger :: Integer -> Int -> [Integer] -> Integer
136+valInteger = go
137+ where
138+ go :: Integer -> Int -> [Integer] -> Integer
139+ go _ _ [] = 0
140+ go _ _ [d] = d
141+ go b l ds
142+ | l > 40 = b' `seq` go b' l' (combine b ds')
143+ | otherwise = valSimple b ds
144+ where
145+ -- ensure that we have an even number of digits
146+ -- before we call combine:
147+ ds' = if even l then ds else 0 : ds
148+ b' = b * b
149+ l' = (l + 1) `quot` 2
150+
151+ combine b (d1 : d2 : ds) = d `seq` (d : combine b ds)
152+ where
153+ d = d1 * b + d2
154+ combine _ [] = []
155+ combine _ [_] = errorWithoutStackTrace "this should not happen"
156+
157+-- The following algorithm is only linear for types whose Num operations
158+-- are in constant time.
159+valSimple :: Integer -> [Integer] -> Integer
160+valSimple base = go 0
161+ where
162+ go r [] = r
163+ go r (d : ds) = r' `seq` go r' ds
164+ where
165+ r' = r * base + fromIntegral d
benchmarks/JsonParse.hs+3−2
@@ -1,10 +1,11 @@
1{-# LANGUAGE BangPatterns #-}
1{-# LANGUAGE BangPatterns #-}
2+{-# LANGUAGE NoImplicitPrelude #-}
2{-# LANGUAGE ScopedTypeVariables #-}
3{-# LANGUAGE ScopedTypeVariables #-}
4+
3{-# OPTIONS_GHC -fno-warn-orphans #-}
5{-# OPTIONS_GHC -fno-warn-orphans #-}
4
6
5module Main (main) where
7module Main (main) where
6
8
7−import Prelude ()
8import Prelude.Compat
9import Prelude.Compat
9
10
10import Control.DeepSeq
11import Control.DeepSeq
@@ -16,7 +17,7 @@ import Text.JSON
16instance NFData JSValue where
17instance NFData JSValue where
17 rnf JSNull = ()
18 rnf JSNull = ()
18 rnf (JSBool b) = rnf b
19 rnf (JSBool b) = rnf b
19− rnf (JSRational b r) = rnf b `seq` rnf r `seq` ()
20+ rnf (JSRational b r) = rnf b `seq` rnf r
20 rnf (JSString s) = rnf (fromJSString s)
21 rnf (JSString s) = rnf (fromJSString s)
21 rnf (JSArray vs) = rnf vs
22 rnf (JSArray vs) = rnf vs
22 rnf (JSObject kvs) = rnf (fromJSObject kvs)
23 rnf (JSObject kvs) = rnf (fromJSObject kvs)
benchmarks/Micro.hs+8−6
@@ -1,11 +1,13 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
1module Main (main) where
3module Main (main) where
2
4
3−import Prelude ()
4import Prelude.Compat
5import Prelude.Compat
5
6
6import Criterion.Main
7import Criterion.Main
7−import qualified Data.Aeson.Encoding.Builder as AB
8+
8−import qualified Data.ByteString.Builder as B
9+-- Encoding is a newtype wrapper around Builder
10+import Data.Aeson.Encoding (text, string, encodingToLazyByteString)
9import qualified Data.Text as T
11import qualified Data.Text as T
10
12
11main :: IO ()
13main :: IO ()
@@ -13,8 +15,8 @@ main = do
13 let txt = "append (append b (primBounded w1 x1)) (primBounded w2 x2)"
15 let txt = "append (append b (primBounded w1 x1)) (primBounded w2 x2)"
14 defaultMain [
16 defaultMain [
15 bgroup "string" [
17 bgroup "string" [
16− bench "text" $ nf (B.toLazyByteString . AB.text) (T.pack txt)
18+ bench "text" $ nf (encodingToLazyByteString . text) (T.pack txt)
17− , bench "string direct" $ nf (B.toLazyByteString . AB.string) txt
19+ , bench "string direct" $ nf (encodingToLazyByteString . string) txt
18− , bench "string via text" $ nf (B.toLazyByteString . AB.text . T.pack) txt
20+ , bench "string via text" $ nf (encodingToLazyByteString . text . T.pack) txt
19 ]
21 ]
20 ]
22 ]
benchmarks/Options.hs+1−4
@@ -1,7 +1,4 @@
1−module Options () where
1+module Options (opts) where
2−
3−import Prelude ()
4−import Prelude.Compat
5
2
6import Data.Aeson.Types
3import Data.Aeson.Types
7
4
benchmarks/ReadFile.hs+2−2
@@ -1,9 +1,9 @@
1{-# LANGUAGE BangPatterns #-}
1{-# LANGUAGE BangPatterns #-}
2+{-# LANGUAGE NoImplicitPrelude #-}
2{-# LANGUAGE OverloadedStrings #-}
3{-# LANGUAGE OverloadedStrings #-}
3
4
4module Main (main) where
5module Main (main) where
5
6
6−import Prelude ()
7import Prelude.Compat
7import Prelude.Compat
8
8
9import Control.DeepSeq
9import Control.DeepSeq
@@ -20,7 +20,7 @@ import qualified Data.ByteString as B
20main = do
20main = do
21 (cnt:args) <- getArgs
21 (cnt:args) <- getArgs
22 let count = read cnt :: Int
22 let count = read cnt :: Int
23− forM_ args $ \arg -> bracket (openFile arg ReadMode) hClose $ \h -> do
23+ forM_ args $ \arg -> withFile arg ReadMode $ \h -> do
24 putStrLn $ arg ++ ":"
24 putStrLn $ arg ++ ":"
25 start <- getCurrentTime
25 start <- getCurrentTime
26 let loop !n
26 let loop !n
benchmarks/Typed.hs+5−1
@@ -1,6 +1,7 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
1module Main (main) where
3module Main (main) where
2
4
3−import Prelude ()
4import Prelude.Compat
5import Prelude.Compat
5
6
6import Criterion.Main
7import Criterion.Main
@@ -13,4 +14,7 @@ main = defaultMain [
13 Generic.benchmarks
14 Generic.benchmarks
14 , Manual.benchmarks
15 , Manual.benchmarks
15 , TH.benchmarks
16 , TH.benchmarks
17+ , Generic.decodeBenchmarks
18+ , Manual.decodeBenchmarks
19+ , TH.decodeBenchmarks
16 ]
20 ]
benchmarks/Typed/Common.hs+1−8
@@ -1,23 +1,16 @@
1−{-# LANGUAGE CPP #-}
1+{-# LANGUAGE NoImplicitPrelude #-}
2−{-# LANGUAGE PackageImports #-}
3
2
4{-# OPTIONS_GHC -fno-warn-unused-imports #-}
3{-# OPTIONS_GHC -fno-warn-unused-imports #-}
5
4
6module Typed.Common (load) where
5module Typed.Common (load) where
7
6
8−import Prelude ()
9import Prelude.Compat
7import Prelude.Compat
10
8
11import Data.ByteString.Lazy as L
9import Data.ByteString.Lazy as L
12import System.Exit
10import System.Exit
13import System.IO
11import System.IO
14
12
15−#ifndef HAS_BOTH_AESON_AND_BENCHMARKS
16import Data.Aeson hiding (Result)
13import Data.Aeson hiding (Result)
17−#else
18−import "aeson" Data.Aeson hiding (Result)
19−import qualified "aeson-benchmarks" Data.Aeson as B
20−#endif
21
14
22load :: FromJSON a => FilePath -> IO a
15load :: FromJSON a => FilePath -> IO a
23load fileName = do
16load fileName = do
benchmarks/Typed/Generic.hs+27−25
@@ -1,42 +1,44 @@
1−{-# LANGUAGE PackageImports #-}
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
2−module Typed.Generic (benchmarks) where
3+module Typed.Generic (benchmarks, decodeBenchmarks) where
3
4
4−import Prelude ()
5import Prelude.Compat
5import Prelude.Compat
6
6
7−import "aeson" Data.Aeson hiding (Result)
7+import Data.Aeson hiding (Result)
8import Criterion
8import Criterion
9import Data.ByteString.Lazy as L
9import Data.ByteString.Lazy as L
10−import Twitter.TH
10+import Twitter.Generic
11import Typed.Common
11import Typed.Common
12−import qualified "aeson-benchmarks" Data.Aeson as B
13−
14−encodeDirectA :: Result -> L.ByteString
15−encodeDirectA = encode
16
12
17−encodeViaValueA :: Result -> L.ByteString
13+encodeDirect :: Result -> L.ByteString
18−encodeViaValueA = encode . toJSON
14+encodeDirect = encode
19
15
20−encodeDirectB :: Result -> L.ByteString
21−encodeDirectB = B.encode
22−
23−encodeViaValueB :: Result -> L.ByteString
16+encodeViaValue :: Result -> L.ByteString
24−encodeViaValueB = B.encode . B.toJSON
17+encodeViaValue = encode . toJSON
25
18
26benchmarks :: Benchmark
19benchmarks :: Benchmark
27benchmarks =
20benchmarks =
28 env ((,) <$> load "json-data/twitter100.json" <*> load "json-data/jp100.json") $ \ ~(twitter100, jp100) ->
21 env ((,) <$> load "json-data/twitter100.json" <*> load "json-data/jp100.json") $ \ ~(twitter100, jp100) ->
29− bgroup "generic" [
22+ bgroup "encodeGeneric" [
30 bgroup "direct" [
23 bgroup "direct" [
31− bench "twitter100" $ nf encodeDirectB twitter100
24+ bench "twitter100" $ nf encodeDirect twitter100
32− , bench "jp100" $ nf encodeDirectB jp100
33− , bench "twitter100 baseline" $ nf encodeDirectA twitter100
34− , bench "jp100 baseline" $ nf encodeDirectA jp100
25+ , bench "jp100" $ nf encodeDirect jp100
35 ]
26 ]
36 , bgroup "viaValue" [
27 , bgroup "viaValue" [
37− bench "twitter100" $ nf encodeViaValueB twitter100
28+ bench "twitter100" $ nf encodeViaValue twitter100
38− , bench "jp100" $ nf encodeViaValueB jp100
29+ , bench "jp100" $ nf encodeViaValue jp100
39− , bench "twitter100 baseline" $ nf encodeViaValueA twitter100
30+ ]
31+ ]
32+
33+decodeDirect :: L.ByteString -> Maybe Result
34+decodeDirect = decode
35+
36+decodeBenchmarks :: Benchmark
37+decodeBenchmarks =
38+ env ((,) <$> L.readFile "json-data/twitter100.json" <*> L.readFile "json-data/jp100.json") $ \ ~(twitter100, jp100) ->
39+ bgroup "decodeGeneric"
40+ [ bgroup "direct"
41+ [ bench "twitter100" $ nf decodeDirect twitter100
40− , bench "jp100 baseline" $ nf encodeViaValueA jp100
42+ , bench "jp100" $ nf decodeDirect jp100
41 ]
43 ]
42 ]
44 ]
benchmarks/Typed/Manual.hs+26−24
@@ -1,42 +1,44 @@
1−{-# LANGUAGE PackageImports #-}
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
2−module Typed.Manual (benchmarks) where
3+module Typed.Manual (benchmarks, decodeBenchmarks) where
3
4
4−import Prelude ()
5import Prelude.Compat
5import Prelude.Compat
6
6
7−import "aeson" Data.Aeson hiding (Result)
7+import Data.Aeson hiding (Result)
8import Criterion
8import Criterion
9import Data.ByteString.Lazy as L
9import Data.ByteString.Lazy as L
10import Twitter.Manual
10import Twitter.Manual
11import Typed.Common
11import Typed.Common
12−import qualified "aeson-benchmarks" Data.Aeson as B
13−
14−encodeDirectA :: Result -> L.ByteString
15−encodeDirectA = encode
16
12
17−encodeViaValueA :: Result -> L.ByteString
13+encodeDirect :: Result -> L.ByteString
18−encodeViaValueA = encode . toJSON
14+encodeDirect = encode
19
15
20−encodeDirectB :: Result -> L.ByteString
21−encodeDirectB = B.encode
22−
23−encodeViaValueB :: Result -> L.ByteString
16+encodeViaValue :: Result -> L.ByteString
24−encodeViaValueB = B.encode . B.toJSON
17+encodeViaValue = encode . toJSON
25
18
26benchmarks :: Benchmark
19benchmarks :: Benchmark
27benchmarks =
20benchmarks =
28 env ((,) <$> load "json-data/twitter100.json" <*> load "json-data/jp100.json") $ \ ~(twitter100, jp100) ->
21 env ((,) <$> load "json-data/twitter100.json" <*> load "json-data/jp100.json") $ \ ~(twitter100, jp100) ->
29− bgroup "manual" [
22+ bgroup "encodeManual" [
30 bgroup "direct" [
23 bgroup "direct" [
31− bench "twitter100" $ nf encodeDirectB twitter100
24+ bench "twitter100" $ nf encodeDirect twitter100
32− , bench "jp100" $ nf encodeDirectB jp100
33− , bench "twitter100 baseline" $ nf encodeDirectA twitter100
34− , bench "jp100 baseline" $ nf encodeDirectA jp100
25+ , bench "jp100" $ nf encodeDirect jp100
35 ]
26 ]
36 , bgroup "viaValue" [
27 , bgroup "viaValue" [
37− bench "twitter100" $ nf encodeViaValueB twitter100
28+ bench "twitter100" $ nf encodeViaValue twitter100
38− , bench "jp100" $ nf encodeViaValueB jp100
29+ , bench "jp100" $ nf encodeViaValue jp100
39− , bench "twitter100 baseline" $ nf encodeViaValueA twitter100
30+ ]
31+ ]
32+
33+decodeDirect :: L.ByteString -> Maybe Result
34+decodeDirect = decode
35+
36+decodeBenchmarks :: Benchmark
37+decodeBenchmarks =
38+ env ((,) <$> L.readFile "json-data/twitter100.json" <*> L.readFile "json-data/jp100.json") $ \ ~(twitter100, jp100) ->
39+ bgroup "decodeManual"
40+ [ bgroup "direct"
41+ [ bench "twitter100" $ nf decodeDirect twitter100
40− , bench "jp100 baseline" $ nf encodeViaValueA jp100
42+ , bench "jp100" $ nf decodeDirect jp100
41 ]
43 ]
42 ]
44 ]
benchmarks/Typed/TH.hs+26−24
@@ -1,42 +1,44 @@
1−{-# LANGUAGE PackageImports #-}
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
2−module Typed.TH (benchmarks) where
3+module Typed.TH (benchmarks, decodeBenchmarks) where
3
4
4−import Prelude ()
5import Prelude.Compat
5import Prelude.Compat
6
6
7−import "aeson" Data.Aeson hiding (Result)
7+import Data.Aeson hiding (Result)
8import Criterion
8import Criterion
9import Data.ByteString.Lazy as L
9import Data.ByteString.Lazy as L
10import Twitter.TH
10import Twitter.TH
11import Typed.Common
11import Typed.Common
12−import qualified "aeson-benchmarks" Data.Aeson as B
13−
14−encodeDirectA :: Result -> L.ByteString
15−encodeDirectA = encode
16
12
17−encodeViaValueA :: Result -> L.ByteString
13+encodeDirect :: Result -> L.ByteString
18−encodeViaValueA = encode . toJSON
14+encodeDirect = encode
19
15
20−encodeDirectB :: Result -> L.ByteString
21−encodeDirectB = B.encode
22−
23−encodeViaValueB :: Result -> L.ByteString
16+encodeViaValue :: Result -> L.ByteString
24−encodeViaValueB = B.encode . B.toJSON
17+encodeViaValue = encode . toJSON
25
18
26benchmarks :: Benchmark
19benchmarks :: Benchmark
27benchmarks =
20benchmarks =
28 env ((,) <$> load "json-data/twitter100.json" <*> load "json-data/jp100.json") $ \ ~(twitter100, jp100) ->
21 env ((,) <$> load "json-data/twitter100.json" <*> load "json-data/jp100.json") $ \ ~(twitter100, jp100) ->
29− bgroup "th" [
22+ bgroup "encodeTH" [
30 bgroup "direct" [
23 bgroup "direct" [
31− bench "twitter100" $ nf encodeDirectB twitter100
24+ bench "twitter100" $ nf encodeDirect twitter100
32− , bench "jp100" $ nf encodeDirectB jp100
33− , bench "twitter100 baseline" $ nf encodeDirectA twitter100
34− , bench "jp100 baseline" $ nf encodeDirectA jp100
25+ , bench "jp100" $ nf encodeDirect jp100
35 ]
26 ]
36 , bgroup "viaValue" [
27 , bgroup "viaValue" [
37− bench "twitter100" $ nf encodeViaValueA twitter100
28+ bench "twitter100" $ nf encodeViaValue twitter100
38− , bench "jp100" $ nf encodeViaValueA jp100
29+ , bench "jp100" $ nf encodeViaValue jp100
39− , bench "twitter100 baseline" $ nf encodeViaValueB twitter100
30+ ]
31+ ]
32+
33+decodeDirect :: L.ByteString -> Maybe Result
34+decodeDirect = decode
35+
36+decodeBenchmarks :: Benchmark
37+decodeBenchmarks =
38+ env ((,) <$> L.readFile "json-data/twitter100.json" <*> L.readFile "json-data/jp100.json") $ \ ~(twitter100, jp100) ->
39+ bgroup "decodeTH"
40+ [ bgroup "direct"
41+ [ bench "twitter100" $ nf decodeDirect twitter100
40− , bench "jp100 baseline" $ nf encodeViaValueB jp100
42+ , bench "jp100" $ nf decodeDirect jp100
41 ]
43 ]
42 ]
44 ]
benchmarks/aeson-benchmarks.cabal+183−62
@@ -1,60 +1,21 @@
1name: aeson-benchmarks
1name: aeson-benchmarks
2version: 0
2version: 0
3build-type: Simple
3build-type: Simple
4−
5−cabal-version: >=1.8
4+cabal-version: >=1.10
6
5
7flag bytestring-builder
6flag bytestring-builder
8 description: Depend on the bytestring-builder package for backwards compatibility.
7 description: Depend on the bytestring-builder package for backwards compatibility.
9 default: False
8 default: False
10 manual: False
9 manual: False
11
10
12−library
11+flag local-aeson
13− hs-source-dirs: .. .
12+ description: Build the local version of aeson, to avoid rebuilding aeson's
14− c-sources: ../cbits/unescape_string.c
13+ reverse dependencies for benchmarking (statistics, criterion).
15− exposed-modules:
14+ default: True
16− Data.Aeson
15+ manual: True
17− Data.Aeson.Encoding
18− Data.Aeson.Encoding.Builder
19− Data.Aeson.Encoding.Internal
20− Data.Aeson.Internal
21− Data.Aeson.Internal.Functions
22− Data.Aeson.Internal.Time
23− Data.Aeson.Parser
24− Data.Aeson.Parser.Internal
25− Data.Aeson.Parser.Time
26− Data.Aeson.Parser.Unescape
27− Data.Aeson.TH
28− Data.Aeson.Text
29− Data.Aeson.Types
30− Data.Aeson.Types.Class
31− Data.Aeson.Types.FromJSON
32− Data.Aeson.Types.Generic
33− Data.Aeson.Types.Internal
34− Data.Aeson.Types.ToJSON
35
16
36− build-depends:
17+library
37− attoparsec >= 0.13.0.1,
18+ default-language: Haskell2010
38− base == 4.*,
39− base-compat >= 0.9.1 && <0.10,
40− time-locale-compat >=0.1.1 && <0.2,
41− containers,
42− deepseq,
43− dlist >= 0.2,
44− fail == 4.9.*,
45− ghc-prim >= 0.2,
46− hashable >= 1.1.2.0,
47− mtl,
48− scientific >= 0.3.4.7 && < 0.4,
49− syb,
50− tagged >=0.8.3 && <0.9,
51− template-haskell >= 2.4,
52− text >= 1.1.1.0,
53− time,
54− transformers,
55− unordered-containers >= 0.2.3.0,
56− uuid-types >= 1.0.3 && <1.1,
57− vector >= 0.7.1
58
19
59 if flag(bytestring-builder)
20 if flag(bytestring-builder)
60 build-depends: bytestring >= 0.9 && < 0.10.4,
21 build-depends: bytestring >= 0.9 && < 0.10.4,
@@ -62,22 +23,142 @@ library
62 else
23 else
63 build-depends: bytestring >= 0.10.4
24 build-depends: bytestring >= 0.10.4
64
25
26+ if flag(local-aeson)
27+
28+ hs-source-dirs: .. ../ffi ../pure ../attoparsec-iso8601
29+ c-sources: ../cbits/unescape_string.c
30+ build-depends:
31+ attoparsec,
32+ base,
33+ base-compat,
34+ containers,
35+ deepseq,
36+ dlist,
37+ fail,
38+ ghc-prim,
39+ hashable,
40+ mtl,
41+ primitive,
42+ scientific,
43+ syb,
44+ tagged,
45+ template-haskell,
46+ text,
47+ th-abstraction,
48+ time-compat,
49+ time,
50+ transformers,
51+ unordered-containers,
52+ uuid-types,
53+ vector
54+
65− if impl(ghc >=7.8)
55+ if !impl(ghc >= 8.6)
66− cpp-options: -DHAS_COERCIBLE
56+ build-depends: contravariant
57+
58+ if !impl(ghc >= 8.0)
59+ -- `Data.Semigroup` is available in base only since GHC 8.0 / base 4.9
60+ build-depends: semigroups,
61+ transformers-compat
67
62
68− if !impl(ghc >= 8.0)
63+ if !impl(ghc >= 7.10)
69− -- `Data.Semigroup` is available in base only since GHC 8.0 / base 4.9
64+ -- `Numeric.Natural` is available in base only since GHC 7.10 / base 4.8
70− build-depends: semigroups >= 0.18.2 && < 0.19
65+ build-depends: nats,
66+ void
71
67
72− include-dirs: ../include
68+ include-dirs: ../include
73
69
74− ghc-options: -O2 -Wall
70+ ghc-options: -O2 -Wall
75− cpp-options: -DGENERICS
71+ cpp-options: -DGENERICS
72+
73+ exposed-modules:
74+ Data.Aeson
75+ Data.Aeson.Encoding
76+ Data.Aeson.Encoding.Builder
77+ Data.Aeson.Encoding.Internal
78+ Data.Aeson.Internal
79+ Data.Aeson.Internal.Functions
80+ Data.Aeson.Internal.Time
81+ Data.Aeson.Parser
82+ Data.Aeson.Parser.Internal
83+ Data.Aeson.Parser.Time
84+ Data.Aeson.Parser.Unescape
85+ Data.Aeson.Parser.UnescapeFFI
86+ Data.Aeson.Parser.UnescapePure
87+ Data.Aeson.TH
88+ Data.Aeson.Text
89+ Data.Aeson.Types
90+ Data.Aeson.Types.Class
91+ Data.Aeson.Types.FromJSON
92+ Data.Aeson.Types.Generic
93+ Data.Aeson.Types.Internal
94+ Data.Aeson.Types.ToJSON
95+ Data.Attoparsec.Time
96+ Data.Attoparsec.Time.Internal
97+
98+ else
99+
100+ build-depends: aeson
101+
102+ reexported-modules:
103+ Data.Aeson,
104+ Data.Aeson.Encoding,
105+ Data.Aeson.Parser.Internal,
106+ Data.Aeson.Text,
107+ Data.Aeson.TH,
108+ Data.Aeson.Types
109+
110+executable aeson-benchmark-auto-compare
111+ default-language: Haskell2010
112+ main-is: AutoCompare.hs
113+ hs-source-dirs: .
114+ ghc-options: -Wall -O2 -rtsopts
115+ other-modules:
116+ Auto.T.D
117+ Auto.T.BigRecord
118+ Auto.T.BigProduct
119+ Auto.T.BigSum
120+ Auto.G.D
121+ Auto.G.BigRecord
122+ Auto.G.BigProduct
123+ Auto.G.BigSum
124+ Options
125+ build-depends:
126+ aeson-benchmarks,
127+ base,
128+ criterion,
129+ deepseq,
130+ template-haskell
131+
132+executable aeson-benchmark-escape
133+ default-language: Haskell2010
134+ main-is: Escape.hs
135+ hs-source-dirs: ../examples .
136+ ghc-options: -Wall -O2 -rtsopts
137+ if flag(local-aeson)
138+ build-depends:
139+ aeson-benchmarks,
140+ base,
141+ base-compat,
142+ bytestring,
143+ criterion >= 1.0,
144+ deepseq,
145+ ghc-prim,
146+ text
147+ else
148+ -- Disabled because of inaccessible internals
149+ buildable: False
76
150
77executable aeson-benchmark-compare
151executable aeson-benchmark-compare
152+ default-language: Haskell2010
78 main-is: Compare.hs
153 main-is: Compare.hs
79 hs-source-dirs: ../examples .
154 hs-source-dirs: ../examples .
80 ghc-options: -Wall -O2 -rtsopts
155 ghc-options: -Wall -O2 -rtsopts
156+ other-modules:
157+ Compare.BufferBuilder
158+ Compare.JsonBench
159+ Twitter
160+ Twitter.Manual
161+ Typed.Common
81 build-depends:
162 build-depends:
82 aeson-benchmarks,
163 aeson-benchmarks,
83 base,
164 base,
@@ -87,10 +168,19 @@ executable aeson-benchmark-compare
87 criterion >= 1.0,
168 criterion >= 1.0,
88 deepseq,
169 deepseq,
89 ghc-prim,
170 ghc-prim,
90− json-builder,
91 text
171 text
92
172
173+ if impl(ghc < 8.4)
174+ other-modules:
175+ Compare.JsonBuilder
176+ build-depends:
177+ json-builder
178+ if impl(ghc < 8.0)
179+ build-depends:
180+ semigroups
181+
93executable aeson-benchmark-micro
182executable aeson-benchmark-micro
183+ default-language: Haskell2010
94 main-is: Micro.hs
184 main-is: Micro.hs
95 hs-source-dirs: ../examples .
185 hs-source-dirs: ../examples .
96 ghc-options: -Wall -O2 -rtsopts
186 ghc-options: -Wall -O2 -rtsopts
@@ -105,14 +195,21 @@ executable aeson-benchmark-micro
105 text
195 text
106
196
107executable aeson-benchmark-typed
197executable aeson-benchmark-typed
198+ default-language: Haskell2010
108 main-is: Typed.hs
199 main-is: Typed.hs
109 hs-source-dirs: ../examples .
200 hs-source-dirs: ../examples .
110 ghc-options: -Wall -O2 -rtsopts
201 ghc-options: -Wall -O2 -rtsopts
111− -- We must help ourself in situations when there is both
202+ other-modules:
112− -- aeson and aeson-benchmakrs
203+ Twitter
113− cpp-options: -DHAS_BOTH_AESON_AND_BENCHMARKS
204+ Twitter.Generic
205+ Twitter.Manual
206+ Twitter.Options
207+ Twitter.TH
208+ Typed.Common
209+ Typed.Generic
210+ Typed.Manual
211+ Typed.TH
114 build-depends:
212 build-depends:
115− aeson,
116 aeson-benchmarks,
213 aeson-benchmarks,
117 base,
214 base,
118 base-compat,
215 base-compat,
@@ -127,8 +224,11 @@ executable aeson-benchmark-typed
127 bytestring-builder >= 0.10.4 && < 1
224 bytestring-builder >= 0.10.4 && < 1
128 else
225 else
129 build-depends: bytestring >= 0.10.4
226 build-depends: bytestring >= 0.10.4
227+ if impl(ghc < 8.0)
228+ build-depends: semigroups
130
229
131executable aeson-benchmark-compare-with-json
230executable aeson-benchmark-compare-with-json
231+ default-language: Haskell2010
132 main-is: CompareWithJSON.hs
232 main-is: CompareWithJSON.hs
133 ghc-options: -Wall -O2 -rtsopts
233 ghc-options: -Wall -O2 -rtsopts
134 build-depends:
234 build-depends:
@@ -143,6 +243,7 @@ executable aeson-benchmark-compare-with-json
143 text
243 text
144
244
145executable aeson-benchmark-aeson-encode
245executable aeson-benchmark-aeson-encode
246+ default-language: Haskell2010
146 main-is: AesonEncode.hs
247 main-is: AesonEncode.hs
147 ghc-options: -Wall -O2 -rtsopts
248 ghc-options: -Wall -O2 -rtsopts
148 build-depends:
249 build-depends:
@@ -155,6 +256,7 @@ executable aeson-benchmark-aeson-encode
155 time
256 time
156
257
157executable aeson-benchmark-aeson-parse
258executable aeson-benchmark-aeson-parse
259+ default-language: Haskell2010
158 main-is: AesonParse.hs
260 main-is: AesonParse.hs
159 ghc-options: -Wall -O2 -rtsopts
261 ghc-options: -Wall -O2 -rtsopts
160 build-depends:
262 build-depends:
@@ -166,6 +268,7 @@ executable aeson-benchmark-aeson-parse
166 time
268 time
167
269
168executable aeson-benchmark-json-parse
270executable aeson-benchmark-json-parse
271+ default-language: Haskell2010
169 main-is: JsonParse.hs
272 main-is: JsonParse.hs
170 ghc-options: -Wall -O2 -rtsopts
273 ghc-options: -Wall -O2 -rtsopts
171 build-depends:
274 build-depends:
@@ -176,6 +279,7 @@ executable aeson-benchmark-json-parse
176 time
279 time
177
280
178executable aeson-benchmark-dates
281executable aeson-benchmark-dates
282+ default-language: Haskell2010
179 main-is: Dates.hs
283 main-is: Dates.hs
180 ghc-options: -Wall -O2 -rtsopts
284 ghc-options: -Wall -O2 -rtsopts
181 build-depends:
285 build-depends:
@@ -187,12 +291,14 @@ executable aeson-benchmark-dates
187 aeson-benchmarks,
291 aeson-benchmarks,
188 text,
292 text,
189 time
293 time
294+ if impl(ghc >= 8.2)
295+ ghc-options: -Wno-simplifiable-class-constraints
190
296
191executable aeson-benchmark-map
297executable aeson-benchmark-map
298+ default-language: Haskell2010
192 main-is: AesonMap.hs
299 main-is: AesonMap.hs
193 ghc-options: -Wall -O2 -rtsopts
300 ghc-options: -Wall -O2 -rtsopts
194 build-depends:
301 build-depends:
195− aeson,
196 aeson-benchmarks,
302 aeson-benchmarks,
197 base,
303 base,
198 base-compat,
304 base-compat,
@@ -206,10 +312,10 @@ executable aeson-benchmark-map
206 unordered-containers
312 unordered-containers
207
313
208executable aeson-benchmark-foldable
314executable aeson-benchmark-foldable
315+ default-language: Haskell2010
209 main-is: AesonFoldable.hs
316 main-is: AesonFoldable.hs
210 ghc-options: -Wall -O2 -rtsopts
317 ghc-options: -Wall -O2 -rtsopts
211 build-depends:
318 build-depends:
212− aeson,
213 aeson-benchmarks,
319 aeson-benchmarks,
214 base,
320 base,
215 base-compat,
321 base-compat,
@@ -222,3 +328,18 @@ executable aeson-benchmark-foldable
222 text,
328 text,
223 unordered-containers,
329 unordered-containers,
224 vector
330 vector
331+
332+executable aeson-issue-673
333+ default-language: Haskell2010
334+ main-is: Issue673.hs
335+ ghc-options: -Wall -O1 -rtsopts
336+ build-depends:
337+ aeson-benchmarks,
338+ attoparsec,
339+ base,
340+ bytestring,
341+ scientific,
342+ base-compat,
343+ criterion >= 1.0
344+ if impl(ghc < 8.0)
345+ build-depends: semigroups
cabal.projectnew file+5
@@ -0,0 +1,5 @@
1+with-compiler: ghc
2+packages: .
3+packages: attoparsec-iso8601
4+-- packages: benchmarks
5+tests: true
changelog.md+186−1
@@ -1,6 +1,191 @@
1For the latest version of this document, please see [https://github.com/bos/aeson/blob/master/changelog.md](https://github.com/bos/aeson/blob/master/changelog.md).
1For the latest version of this document, please see [https://github.com/bos/aeson/blob/master/changelog.md](https://github.com/bos/aeson/blob/master/changelog.md).
2
2
3+### upcoming
4+
5+* `FromJSON` instance of `Ratio a` now parses numbers in addtion to
6+ standard `{numerator=..., denumerator=...}` encoding.
7+
8+### 1.4.6.0
9+
10+* Provide a clearer error message when a required tagKey for a constructor is missing, thanks to Guru Devanla.
11+ The error message now looks like this: `Error in $: parsing Types.SomeType failed, expected Object with key "tag" containing one of ["nullary","unary","product","record","list"], key "tag" not found`
12+
13+* Add `formatPath` and `formatRelativePath` functions to turn a `JSONPath` into a `String`, thanks to Robbie McMichael
14+
15+
16+### 1.4.5.0
17+
18+* Expose `(<?>)`, `JSONPath` and `JSONPathElement(..)` from `Data.Aeson.Types`. Previously only available through internal modules. Thanks to Luke Clifton.
19+
20+* Support for base-compat 0.11, thanks to Ryan Scott.
21+
22+* Travis build for GHC 8.8, thanks to Oleg Grenrus.
23+
24+### 1.4.4.0
25+
26+**New features**:
27+
28+* Adds a parameterized parser `jsonWith` that can be used to choose how to handle duplicate keys in objects, thanks to Xia Li-Yao.
29+
30+* Add generic implementations of `FromJSONKey` and `ToJSONKey`, thanks to Xia Li-Yao. Example:
31+
32+```haskell
33+data Foo = Bar
34+ deriving Generic
35+
36+opts :: JSONKeyOptions
37+opts = defaultJSONKeyOptions { keyModifier = toLower }
38+
39+instance ToJSONKey Foo where
40+ toJSONKey = genericToJSONKey opts
41+
42+instance FromJSONKey Foo where
43+ fromJSONKey = genericFromJSONKey opts
44+```
45+
46+**Minor**:
47+* aeson now uses `time-compat` instead of `time-locale-compat`, thanks to Oleg Grenrus.
48+* Prepare for `MonadFail` breakages in GHC 8.8, thanks to Oleg Grenrus.
49+* Require `bytestring >= 0.10.8.1` for newer GHCs to avoid build failures, thanks to Oleg Grenrus.
50+* Support `primitive 0.7.*`, thanks to Adam Bergmark.
51+* Allow `semigroups 0.19.*` and `hashable 1.3.*`, thanks to Oleg Grenrus.
52+* Fix a typo in the error message when parsing `NonEmpty`, thanks to Colin Woodbury.
53+* Document surprising behavior when using `omitNothingFields` with type variables, thanks to Xia Li-Yao.
54+
55+**Internal changes**:
56+* Code cleanup by Oleg Grenrus
57+* Fix dependencies of the benchmarks on older GHC's, thanks to Xia Li-Yao.
58+
59+### 1.4.3.0
60+* Improve error messages for FromJSON in existing instances and GHC Generic implementation. Thanks to Xia Li-Yao & Igor Pashev.
61+* Tweak error-reporting combinators and their documentation. Thanks to Xia Li-Yao.
62+ * `typeMismatch` is now about comparing JSON types (i.e., the expected and actual names of the Value constructor).
63+ * `withObject` and other `with*` combinators now also mention the JSON types they expect
64+ * New `unexpected` and `prependFailure` combinators.
65+* Add `Contravariant` `ToJSONKeyFunction` instance. Thanks to Oleg Grenrus.
66+* Add `KeyValue` instance for `Object`. Thanks to Robert Hensing.
67+* Improve performance when parsing certain large numbers, thanks to Oleg Grenrus.
68+* Add `Data.Aeson.QQ.Simple` - A limited version of aeson-qq. Thanks to Oleg Grenrus.
69+* Exposes internal helper functions like `<?>`, `JSONPath`, and `parseIndexedJSON` from `Data.Aeson` module. Thanks to Abid Uzair.
70+* Better error messages when there are syntax errors parsing objects and arrays. Thanks to Fintan Halpenny.
71+* Support building with `th-abstraction-0.3.0.0` or later. Thanks to Ryan Scott.
72+
73+### 1.4.2.0
74+
75+* Add `Data.Aeson.QQ.Simple` which is a simpler version of the `aeson-qq` package, it does not support interpolation, thanks to Oleg Grenrus.
76+* Add `Contravariant ToJSONKeyFunction` instance, thanks to Oleg Grenrus.
77+* Add `KeyValue Object` instance, thanks to Robert Hensing
78+* Improved performance when parsing large numbers, thanks to Oleg Grenrus.
79+
80+### 1.4.1.0
81+
82+* Optimizations of generics, thanks to Rémy Oudompheng, here are some numbers for GHC 8.4:
83+ * Compilation time: G/BigProduct.hs is 25% faster, G/BigRecord.hs is 2x faster.
84+ * Runtime performance: BigRecord/toJSON/generic and BigProduct/encode/generic are more than 2x faster.
85+* Added To/FromJSON instances for `Void` and Generics's `V1`, thanks to Will Yager
86+* Added To/FromJSON instances for `primitive`'s `Array`, `SmallArray`, `PrimArray` and `UnliftedArray`, thanks to Andrew Thad.
87+* Fixes handling of `UTCTime` wrt. leap seconds , thanks to Adam Schønemann
88+* Warning and documentation fixes thanks to tom-bop, Gabor Greif, Ian Jeffries, and Mateusz Curyło.
89+
90+## 1.4.0.0
91+
92+This release introduces bounds on the size of `Scientific` numbers when they are converted to other arbitrary precision types that do not represent them efficiently in memory.
93+
94+This means that trying to decode a number such as `1e1000000000` into an `Integer` will now fail instead of using a lot of memory. If you need to represent large numbers you can add a newtype (preferably over `Scientific`) and providing a parser using `withScientific`.
95+
96+The following instances are affected by this:
97+* `FromJSON Natural`
98+* `FromJSONKey Natural`
99+* `FromJSON Integer`
100+* `FromJSONKey Integer`
101+* `FromJSON NominalDiffTime`
102+
103+For the same reasons the following instances & functions have been removed:
104+* Remove `FromJSON Data.Attoparsec.Number` instance. Note that `Data.Attoparsec.Number` is deprecated.
105+* Remove deprecated `withNumber`, use `withScientific` instead.
106+
107+Finally, encoding integral values with large exponents now uses scientific notation, this saves space for large numbers.
108+
109+#### 1.3.1.1
110+
111+* Catch 0 denominators when parsing Ratio
112+
113+### 1.3.1.0
114+
115+* Fix bug in generically derived `FromJSON` instances that are using `unwrapUnaryRecords`, thanks to Xia Li-yao
116+* Allow base-compat 0.10.*, thanks to Oleg Grenrus
117+
118+## 1.3.0.0
119+
120+Breaking changes:
121+* `GKeyValue` has been renamed to `KeyValuePair`, thanks to Xia Li-yao
122+* Removed unused `FromJSON` constraint in `withEmbeddedJson`, thanks to Tristan Seligmann
123+
124+Other improvements:
125+* Optimizations of TH toEncoding, thanks to Xia Li-yao
126+* Optimizations of hex decoding when using the default/pure unescape implementation, thanks to Xia Li-yao
127+* Improved error message on `Day` parse failures, thanks to Gershom Bazerman
128+* Add `encodeFile` as well as `decodeFile*` variants, thanks to Markus Hauck
129+* Documentation fixes, thanks to Lennart Spitzner
130+* CPP cleanup, thanks to Ryan Scott
131+
132+### 1.2.4.0
133+
134+* Add `Ord` instance for `JSONPathElement`, thanks to Simon Hengel.
135+
136+
137+### 1.2.3.0
138+
139+* Added `withEmbeddedJSON` to help parse JSON embedded inside a JSON string, thanks to Jesse Kempf.
140+* Memory usage improvements to the default (pure) parser, thanks to Jonathan Paugh. Also thanks to Neil Mitchell & Oleg Grenrus for contributing a benchmark.
141+* `omitNothingFields` now works for the `Option` newtype, thanks to Xia Li-yao.
142+* Some documentation fixes, thanks to Jonathan Paug & Philippe Crama.
143+
144+### 1.2.2.0
145+
146+* Add `FromJSON` and `ToJSON` instances for
147+ * `DiffTime`, thanks to Víctor López Juan.
148+ * `CTime`, thanks to Daniel Díaz.
149+* Fix handling of fractions when parsing Natural, thanks to Yuriy Syrovetskiy.
150+* Change text in error messages for Integral types to make them follow the common pattern, thanks to Yuriy Syrovetskiy.
151+* Add missing `INCOHERENT` pragma for `RecordToPair`, thanks to Xia Li-yao.
152+* Everything related to `Options` is now exported from `Data.Aeson`, thanks to Xia Li-yao.
153+* Optimizations to not escape text in clear cases, thanks to Oleg Grenrus.
154+* Some documentation fixes, thanks to Phil de Joux & Xia Li-yao.
155+
156+### 1.2.1.0
157+
158+* Add `parserThrowError` and `parserCatchError` combinators, thanks to Oleg Grenrus.
159+
160+* Add `Generic` instance for `Value`, thanks to Xia Li-yao.
161+
162+* Fix a mistake in the 1.2.0.0 changelog, the `cffi` flag is disabled by default! Thanks to dbaynard.
163+
164+## 1.2.0.0
165+
166+* `tagSingleConstructors`, an option to encode single-constructor types as tagged sums was added to `Options`. It is disabled by default for backward compatibility.
167+
168+* The `cffi` flag is now turned off (`False`) by default, this means C FFI code is no longer used by default. You can flip the flag to get C implementation.
169+
170+* The `Options` constructor is no longer exposed to prevent new options from being breaking changes, use `defaultOptions` instead.
171+
172+* The contents of `GToJSON` and `GToEncoding` are no longer exposed.
173+
174+* Some INLINE pragmas were removed to avoid GHC running out of simplifier ticks.
175+
176+### 1.1.2.0
177+
178+* Fix an accidental change in the format of `deriveJSON`. Thanks to Xia Li-yao!
179+
180+* Documentation improvements regarding `ToJSON`, `FromJSON`, and `SumEncoding`. Thanks to Xia Li-yao and Lennart Spitzner!
181+
182+### 1.1.1.0
183+
184+* Added a pure implementation of the C FFI code, the C FFI code. If you wish to use the pure haskell version set the `cffi` flag to `False`. This should make aeson compile when C isn't available, such as for GHCJS. Thanks to James Parker & Marcin Tolysz!
185+
186+* Using the `fast` flag can no longer cause a test case to fail. As far as we know this didn't affect any users of the library itself. Thanks to Xia Li-yao!
187+
3−# 1.1.0.0
188+## 1.1.0.0
4
189
5* Added instances for `UUID`.
190* Added instances for `UUID`.
6
191
examples/Generic.hs+1−1
@@ -6,11 +6,11 @@
6-- automatically derive the Generic class for us.
6-- automatically derive the Generic class for us.
7
7
8{-# LANGUAGE DeriveGeneric #-}
8{-# LANGUAGE DeriveGeneric #-}
9+{-# LANGUAGE NoImplicitPrelude #-}
9{-# LANGUAGE OverloadedStrings #-}
10{-# LANGUAGE OverloadedStrings #-}
10
11
11module Main (main) where
12module Main (main) where
12
13
13−import Prelude ()
14import Prelude.Compat
14import Prelude.Compat
15
15
16import Data.Aeson (FromJSON, ToJSON, decode, encode)
16import Data.Aeson (FromJSON, ToJSON, decode, encode)
examples/Simplest.hs+1−1
@@ -1,9 +1,9 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
1{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE RecordWildCards #-}
3{-# LANGUAGE RecordWildCards #-}
3
4
4module Main (main) where
5module Main (main) where
5
6
6−import Prelude ()
7import Prelude.Compat
7import Prelude.Compat
8
8
9import Control.Applicative (empty)
9import Control.Applicative (empty)
examples/TemplateHaskell.hs+1−1
@@ -1,12 +1,12 @@
1-- We can use Template Haskell (TH) to generate instances of the
1-- We can use Template Haskell (TH) to generate instances of the
2-- FromJSON and ToJSON classes automatically. This is the fastest way
2-- FromJSON and ToJSON classes automatically. This is the fastest way
3-- to add JSON support for a type.
3-- to add JSON support for a type.
4+{-# LANGUAGE NoImplicitPrelude #-}
4{-# LANGUAGE OverloadedStrings #-}
5{-# LANGUAGE OverloadedStrings #-}
5{-# LANGUAGE TemplateHaskell #-}
6{-# LANGUAGE TemplateHaskell #-}
6
7
7module Main (main) where
8module Main (main) where
8
9
9−import Prelude ()
10import Prelude.Compat
10import Prelude.Compat
11
11
12import Data.Aeson (decode, encode)
12import Data.Aeson (decode, encode)
examples/Twitter.hs+4−2
@@ -10,6 +10,7 @@
10
10
11{-# LANGUAGE DeriveDataTypeable #-}
11{-# LANGUAGE DeriveDataTypeable #-}
12{-# LANGUAGE DeriveGeneric #-}
12{-# LANGUAGE DeriveGeneric #-}
13+{-# LANGUAGE NoImplicitPrelude #-}
13
14
14module Twitter
15module Twitter
15 (
16 (
@@ -19,7 +20,6 @@ module Twitter
19 , Result(..)
20 , Result(..)
20 ) where
21 ) where
21
22
22−import Prelude ()
23import Prelude.Compat
23import Prelude.Compat
24
24
25import Control.DeepSeq
25import Control.DeepSeq
@@ -27,7 +27,9 @@ import Data.Data (Typeable, Data)
27import Data.Int (Int64)
27import Data.Int (Int64)
28import Data.Text (Text)
28import Data.Text (Text)
29import GHC.Generics (Generic)
29import GHC.Generics (Generic)
30−import Prelude hiding (id)
30+
31+{-# ANN module "Hlint: ignore Use camelCase" #-}
32+{-# ANN module "Hlint: ignore Use newtype instead of data" #-}
31
33
32data Metadata = Metadata {
34data Metadata = Metadata {
33 result_type :: Text
35 result_type :: Text
examples/Twitter/Generic.hs+31−37
@@ -1,6 +1,7 @@
1-- Use GHC generics to automatically generate good instances.
1-- Use GHC generics to automatically generate good instances.
2+
2−{-# LANGUAGE CPP #-}
3+{-# LANGUAGE NoImplicitPrelude #-}
3−{-# LANGUAGE PackageImports #-}
4+
4{-# OPTIONS_GHC -fno-warn-orphans #-}
5{-# OPTIONS_GHC -fno-warn-orphans #-}
5
6
6module Twitter.Generic
7module Twitter.Generic
@@ -11,40 +12,33 @@ module Twitter.Generic
11 , Result(..)
12 , Result(..)
12 ) where
13 ) where
13
14
14−import Prelude ()
15+import Prelude.Compat ()
15−import Prelude.Compat
16
16
17import Twitter
17import Twitter
18−
18+import Twitter.Options
19−#ifndef HAS_BOTH_AESON_AND_BENCHMARKS
19+
20−import Data.Aeson (ToJSON, FromJSON)
20+import Data.Aeson (ToJSON (..), FromJSON (..), genericToJSON, genericToEncoding, genericParseJSON)
21−#else
21+
22−import "aeson" Data.Aeson (ToJSON, FromJSON)
22+instance ToJSON Metadata where
23−import qualified "aeson-benchmarks" Data.Aeson as B
23+ toJSON = genericToJSON twitterOptions
24−#endif
24+ toEncoding = genericToEncoding twitterOptions
25−
26−instance ToJSON Metadata
25+instance FromJSON Metadata where
27−instance FromJSON Metadata
26+ parseJSON = genericParseJSON twitterOptions
28−
27+
29−instance ToJSON Geo
28+instance ToJSON Geo where
30−instance FromJSON Geo
29+ toJSON = genericToJSON twitterOptions
31−
30+ toEncoding = genericToEncoding twitterOptions
32−instance ToJSON Story
33−instance FromJSON Story
31+instance FromJSON Geo where
34−
32+ parseJSON = genericParseJSON twitterOptions
33+
35−instance ToJSON Result
34+instance ToJSON Story where
36−instance FromJSON Result
35+ toJSON = genericToJSON twitterOptions
37−
36+ toEncoding = genericToEncoding twitterOptions
38−#ifdef HAS_BOTH_AESON_AND_BENCHMARKS
39−instance B.ToJSON Metadata
40−instance B.FromJSON Metadata
37+instance FromJSON Story where
41−
38+ parseJSON = genericParseJSON twitterOptions
42−instance B.ToJSON Geo
39+
43−instance B.FromJSON Geo
44−
45−instance B.ToJSON Story
40+instance ToJSON Result where
46−instance B.FromJSON Story
41+ toJSON = genericToJSON twitterOptions
47−
42+ toEncoding = genericToEncoding twitterOptions
48−instance B.ToJSON Result
49−instance B.FromJSON Result
43+instance FromJSON Result where
50−#endif
44+ parseJSON = genericParseJSON twitterOptions
examples/Twitter/Manual.hs+3−136
@@ -1,9 +1,8 @@
1-- Manually write instances.
1-- Manually write instances.
2−
3−{-# LANGUAGE CPP #-}
2+{-# LANGUAGE NoImplicitPrelude #-}
4−{-# LANGUAGE PackageImports #-}
5{-# LANGUAGE OverloadedStrings #-}
3{-# LANGUAGE OverloadedStrings #-}
6{-# LANGUAGE RecordWildCards #-}
4{-# LANGUAGE RecordWildCards #-}
5+
7{-# OPTIONS_GHC -fno-warn-orphans #-}
6{-# OPTIONS_GHC -fno-warn-orphans #-}
8
7
9module Twitter.Manual
8module Twitter.Manual
@@ -14,20 +13,13 @@ module Twitter.Manual
14 , Result(..)
13 , Result(..)
15 ) where
14 ) where
16
15
17−import Prelude ()
18import Prelude.Compat
16import Prelude.Compat
19
17
20import Control.Applicative
18import Control.Applicative
21−import Data.Monoid ((<>))
19+import Data.Semigroup ((<>))
22−import Prelude hiding (id)
23import Twitter
20import Twitter
24
21
25−#ifndef HAS_BOTH_AESON_AND_BENCHMARKS
26import Data.Aeson hiding (Result)
22import Data.Aeson hiding (Result)
27−#else
28−import "aeson" Data.Aeson hiding (Result)
29−import qualified "aeson-benchmarks" Data.Aeson as B
30−#endif
31
23
32instance ToJSON Metadata where
24instance ToJSON Metadata where
33
25
@@ -152,128 +144,3 @@ instance FromJSON Result where
152 <*> v .: "max_id_str"
144 <*> v .: "max_id_str"
153 <*> v .: "query"
145 <*> v .: "query"
154 parseJSON _ = empty
146 parseJSON _ = empty
155−
156−#ifdef HAS_BOTH_AESON_AND_BENCHMARKS
157−instance B.ToJSON Metadata where
158− toJSON Metadata{..} = B.object [
159− "result_type" B..= result_type
160− ]
161−
162− toEncoding Metadata{..} = B.pairs $
163− "result_type" B..= result_type
164−
165−instance B.FromJSON Metadata where
166− parseJSON (B.Object v) = Metadata <$> v B..: "result_type"
167− parseJSON _ = empty
168−
169−instance B.ToJSON Geo where
170− toJSON Geo{..} = B.object [
171− "type_" B..= type_
172− , "coordinates" B..= coordinates
173− ]
174−
175− toEncoding Geo{..} = B.pairs $
176− "type_" B..= type_
177− <> "coordinates" B..= coordinates
178−
179−instance B.FromJSON Geo where
180− parseJSON (B.Object v) = Geo <$>
181− v B..: "type_"
182− <*> v B..: "coordinates"
183− parseJSON _ = empty
184−
185−instance B.ToJSON Story where
186− toJSON Story{..} = B.object [
187− "from_user_id_str" B..= from_user_id_str
188− , "profile_image_url" B..= profile_image_url
189− , "created_at" B..= created_at
190− , "from_user" B..= from_user
191− , "id_str" B..= id_str
192− , "metadata" B..= metadata
193− , "to_user_id" B..= to_user_id
194− , "text" B..= text
195− , "id" B..= id_
196− , "from_user_id" B..= from_user_id
197− , "geo" B..= geo
198− , "iso_language_code" B..= iso_language_code
199− , "to_user_id_str" B..= to_user_id_str
200− , "source" B..= source
201− ]
202−
203− toEncoding Story{..} = B.pairs $
204− "from_user_id_str" B..= from_user_id_str
205− <> "profile_image_url" B..= profile_image_url
206− <> "created_at" B..= created_at
207− <> "from_user" B..= from_user
208− <> "id_str" B..= id_str
209− <> "metadata" B..= metadata
210− <> "to_user_id" B..= to_user_id
211− <> "text" B..= text
212− <> "id" B..= id_
213− <> "from_user_id" B..= from_user_id
214− <> "geo" B..= geo
215− <> "iso_language_code" B..= iso_language_code
216− <> "to_user_id_str" B..= to_user_id_str
217− <> "source" B..= source
218−
219−instance B.FromJSON Story where
220− parseJSON (B.Object v) = Story <$>
221− v B..: "from_user_id_str"
222− <*> v B..: "profile_image_url"
223− <*> v B..: "created_at"
224− <*> v B..: "from_user"
225− <*> v B..: "id_str"
226− <*> v B..: "metadata"
227− <*> v B..: "to_user_id"
228− <*> v B..: "text"
229− <*> v B..: "id"
230− <*> v B..: "from_user_id"
231− <*> v B..: "geo"
232− <*> v B..: "iso_language_code"
233− <*> v B..: "to_user_id_str"
234− <*> v B..: "source"
235− parseJSON _ = empty
236−
237−instance B.ToJSON Result where
238− toJSON Result{..} = B.object [
239− "results" B..= results
240− , "max_id" B..= max_id
241− , "since_id" B..= since_id
242− , "refresh_url" B..= refresh_url
243− , "next_page" B..= next_page
244− , "results_per_page" B..= results_per_page
245− , "page" B..= page
246− , "completed_in" B..= completed_in
247− , "since_id_str" B..= since_id_str
248− , "max_id_str" B..= max_id_str
249− , "query" B..= query
250− ]
251−
252− toEncoding Result{..} = B.pairs $
253− "results" B..= results
254− <> "max_id" B..= max_id
255− <> "since_id" B..= since_id
256− <> "refresh_url" B..= refresh_url
257− <> "next_page" B..= next_page
258− <> "results_per_page" B..= results_per_page
259− <> "page" B..= page
260− <> "completed_in" B..= completed_in
261− <> "since_id_str" B..= since_id_str
262− <> "max_id_str" B..= max_id_str
263− <> "query" B..= query
264−
265−instance B.FromJSON Result where
266− parseJSON (B.Object v) = Result <$>
267− v B..: "results"
268− <*> v B..: "max_id"
269− <*> v B..: "since_id"
270− <*> v B..: "refresh_url"
271− <*> v B..: "next_page"
272− <*> v B..: "results_per_page"
273− <*> v B..: "page"
274− <*> v B..: "completed_in"
275− <*> v B..: "since_id_str"
276− <*> v B..: "max_id_str"
277− <*> v B..: "query"
278− parseJSON _ = empty
279−#endif
examples/Twitter/Options.hsnew file+10
@@ -0,0 +1,10 @@
1+module Twitter.Options (module Twitter.Options) where
2+
3+import Data.Aeson
4+
5+twitterOptions :: Options
6+twitterOptions = defaultOptions
7+ { fieldLabelModifier = \x -> case x of
8+ "id_" -> "id"
9+ _ -> x
10+ }
examples/Twitter/TH.hs+7−19
@@ -1,8 +1,8 @@
1-- Use Template Haskell to generate good instances.
1-- Use Template Haskell to generate good instances.
2
2
3−{-# LANGUAGE CPP #-}
3+{-# LANGUAGE NoImplicitPrelude #-}
4−{-# LANGUAGE PackageImports #-}
5{-# LANGUAGE TemplateHaskell #-}
4{-# LANGUAGE TemplateHaskell #-}
5+
6{-# OPTIONS_GHC -fno-warn-orphans #-}
6{-# OPTIONS_GHC -fno-warn-orphans #-}
7
7
8module Twitter.TH
8module Twitter.TH
@@ -13,25 +13,13 @@ module Twitter.TH
13 , Result(..)
13 , Result(..)
14 ) where
14 ) where
15
15
16−import Prelude ()
17
16
18import Twitter
17import Twitter
18+import Twitter.Options
19
19
20−#ifndef HAS_BOTH_AESON_AND_BENCHMARKS
21import Data.Aeson.TH
20import Data.Aeson.TH
22−#else
23−import "aeson" Data.Aeson.TH
24−import qualified "aeson-benchmarks" Data.Aeson.TH as B
25−#endif
26−
27−$(deriveJSON defaultOptions ''Metadata)
28−$(deriveJSON defaultOptions ''Geo)
29−$(deriveJSON defaultOptions ''Story)
30−$(deriveJSON defaultOptions ''Result)
31
21
32−#ifdef HAS_BOTH_AESON_AND_BENCHMARKS
33−$(B.deriveJSON B.defaultOptions ''Metadata)
22+$(deriveJSON twitterOptions ''Metadata)
34−$(B.deriveJSON B.defaultOptions ''Geo)
23+$(deriveJSON twitterOptions ''Geo)
35−$(B.deriveJSON B.defaultOptions ''Story)
24+$(deriveJSON twitterOptions ''Story)
36−$(B.deriveJSON B.defaultOptions ''Result)
25+$(deriveJSON twitterOptions ''Result)
37−#endif
ffi/Data/Aeson/Parser/UnescapeFFI.hs+1−1
@@ -10,7 +10,7 @@ module Data.Aeson.Parser.UnescapeFFI
10import Control.Exception (evaluate, throw, try)
10import Control.Exception (evaluate, throw, try)
11import Control.Monad.ST.Unsafe (unsafeIOToST, unsafeSTToIO)
11import Control.Monad.ST.Unsafe (unsafeIOToST, unsafeSTToIO)
12import Data.ByteString as B
12import Data.ByteString as B
13−import Data.ByteString.Internal as B hiding (c2w)
13+import Data.ByteString.Internal as B
14import Data.Text.Encoding.Error (UnicodeException (..))
14import Data.Text.Encoding.Error (UnicodeException (..))
15import Data.Text.Internal (Text (..))
15import Data.Text.Internal (Text (..))
16import Data.Text.Internal.Private (runText)
16import Data.Text.Internal.Private (runText)
pure/Data/Aeson/Parser/UnescapePure.hs+31−49
@@ -1,3 +1,10 @@
1+-- WARNING: This file is security sensitive as it uses unsafeWrite which does
2+-- not check bounds. Any changes should be made with care and we would love to
3+-- get informed about them, just cc us in any PR targetting this file: @eskimor @jprider63
4+-- We would be happy to review the changes!
5+
6+-- The security check at the end (pos > length) only works if pos grows
7+-- monotonously, if this condition does not hold, the check is flawed.
1module Data.Aeson.Parser.UnescapePure
8module Data.Aeson.Parser.UnescapePure
2 (
9 (
3 unescapeText
10 unescapeText
@@ -52,23 +59,23 @@ setByte1 point word = point .|. fromIntegral (word .&. 0x3f)
52{-# INLINE setByte1 #-}
59{-# INLINE setByte1 #-}
53
60
54setByte2 :: (Num a, Bits b, Bits a, Integral b) => a -> b -> a
61setByte2 :: (Num a, Bits b, Bits a, Integral b) => a -> b -> a
55−setByte2 point word = point .|. ((fromIntegral $ word .&. 0x3f) `shiftL` 6)
62+setByte2 point word = point .|. (fromIntegral (word .&. 0x3f) `shiftL` 6)
56{-# INLINE setByte2 #-}
63{-# INLINE setByte2 #-}
57
64
58setByte2Top :: (Num a, Bits b, Bits a, Integral b) => a -> b -> a
65setByte2Top :: (Num a, Bits b, Bits a, Integral b) => a -> b -> a
59−setByte2Top point word = point .|. ((fromIntegral $ word .&. 0x1f) `shiftL` 6)
66+setByte2Top point word = point .|. (fromIntegral (word .&. 0x1f) `shiftL` 6)
60{-# INLINE setByte2Top #-}
67{-# INLINE setByte2Top #-}
61
68
62setByte3 :: (Num a, Bits b, Bits a, Integral b) => a -> b -> a
69setByte3 :: (Num a, Bits b, Bits a, Integral b) => a -> b -> a
63−setByte3 point word = point .|. ((fromIntegral $ word .&. 0x3f) `shiftL` 12)
70+setByte3 point word = point .|. (fromIntegral (word .&. 0x3f) `shiftL` 12)
64{-# INLINE setByte3 #-}
71{-# INLINE setByte3 #-}
65
72
66setByte3Top :: (Num a, Bits b, Bits a, Integral b) => a -> b -> a
73setByte3Top :: (Num a, Bits b, Bits a, Integral b) => a -> b -> a
67−setByte3Top point word = point .|. ((fromIntegral $ word .&. 0xf) `shiftL` 12)
74+setByte3Top point word = point .|. (fromIntegral (word .&. 0xf) `shiftL` 12)
68{-# INLINE setByte3Top #-}
75{-# INLINE setByte3Top #-}
69
76
70setByte4 :: (Num a, Bits b, Bits a, Integral b) => a -> b -> a
77setByte4 :: (Num a, Bits b, Bits a, Integral b) => a -> b -> a
71−setByte4 point word = point .|. ((fromIntegral $ word .&. 0x7) `shiftL` 18)
78+setByte4 point word = point .|. (fromIntegral (word .&. 0x7) `shiftL` 18)
72{-# INLINE setByte4 #-}
79{-# INLINE setByte4 #-}
73
80
74decode :: Utf -> Word32 -> Word8 -> (Utf, Word32)
81decode :: Utf -> Word32 -> Word8 -> (Utf, Word32)
@@ -112,41 +119,21 @@ decode UtfTail1 point word = case word of
112 w | 0x80 <= w && w <= 0xbf -> (UtfGround, setByte1 point word)
119 w | 0x80 <= w && w <= 0xbf -> (UtfGround, setByte1 point word)
113 _ -> throwDecodeError
120 _ -> throwDecodeError
114
121
115−{-# INLINE decode #-}
116−
117decodeHex :: Word8 -> Word16
122decodeHex :: Word8 -> Word16
118−decodeHex 48 = 0 -- '0'
123+decodeHex x
119−decodeHex 49 = 1 -- '1'
124+ | 48 <= x && x <= 57 = fromIntegral x - 48 -- 0-9
120−decodeHex 50 = 2 -- '2'
125+ | 65 <= x && x <= 70 = fromIntegral x - 55 -- A-F
121−decodeHex 51 = 3 -- '3'
126+ | 97 <= x && x <= 102 = fromIntegral x - 87 -- a-f
122−decodeHex 52 = 4 -- '4'
123−decodeHex 53 = 5 -- '5'
124−decodeHex 54 = 6 -- '6'
125−decodeHex 55 = 7 -- '7'
126−decodeHex 56 = 8 -- '8'
127−decodeHex 57 = 9 -- '9'
128−decodeHex 65 = 10 -- 'A'
129−decodeHex 97 = 10 -- 'a'
130−decodeHex 66 = 11 -- 'B'
131−decodeHex 98 = 11 -- 'b'
132−decodeHex 67 = 12 -- 'C'
133−decodeHex 99 = 12 -- 'c'
134−decodeHex 68 = 13 -- 'D'
135−decodeHex 100 = 13 -- 'd'
136−decodeHex 69 = 14 -- 'E'
137−decodeHex 101 = 14 -- 'e'
138−decodeHex 70 = 15 -- 'F'
139−decodeHex 102 = 15 -- 'f'
140−decodeHex _ = throwDecodeError
127+ | otherwise = throwDecodeError
141−{-# INLINE decodeHex #-}
142
128
143unescapeText' :: ByteString -> Text
129unescapeText' :: ByteString -> Text
144unescapeText' bs = runText $ \done -> do
130unescapeText' bs = runText $ \done -> do
145 dest <- A.new len
131 dest <- A.new len
146− (pos, finalState) <- B.foldl' (f' dest) (return (0, StateNone)) bs
147
132
148− -- Check final state.
133+ (pos, finalState) <- loop dest (0, StateNone) 0
134+
135+ -- Check final state. Currently pos gets only increased over time, so this check should catch overflows.
149− when ( finalState /= StateNone)
136+ when ( finalState /= StateNone || pos > len)
150 throwDecodeError
137 throwDecodeError
151
138
152 done dest pos -- TODO: pos, pos-1??? XXX
139 done dest pos -- TODO: pos, pos-1??? XXX
@@ -165,11 +152,12 @@ unescapeText' bs = runText $ \done -> do
165 (st', p) ->
152 (st', p) ->
166 return (pos, StateUtf st' p)
153 return (pos, StateUtf st' p)
167
154
168− {-# INLINE runUtf #-}
155+ loop :: A.MArray s -> (Int, State) -> Int -> ST s (Int, State)
169−
156+ loop _ ps i | i >= len = return ps
157+ loop dest ps i = do
158+ let c = B.index bs i -- JP: We can use unsafe index once we prove bounds with Liquid Haskell.
170− f' dest m c = m >>= \s -> f dest s c
159+ ps' <- f dest ps c
171−
160+ loop dest ps' $ i+1
172− {-# INLINE f' #-}
173
161
174 -- No pending state.
162 -- No pending state.
175 f dest (pos, StateNone) c = runUtf dest pos UtfGround 0 c
163 f dest (pos, StateNone) c = runUtf dest pos UtfGround 0 c
@@ -207,12 +195,12 @@ unescapeText' bs = runText $ \done -> do
207 let u = w' .|. w in
195 let u = w' .|. w in
208
196
209 -- Get next state based on surrogates.
197 -- Get next state based on surrogates.
210− let st =
198+ let st
211− if u >= 0xd800 && u <= 0xdbff then -- High surrogate.
199+ | u >= 0xd800 && u <= 0xdbff = -- High surrogate.
212 StateS0
200 StateS0
213− else if u >= 0xdc00 && u <= 0xdfff then -- Low surrogate.
201+ | u >= 0xdc00 && u <= 0xdfff = -- Low surrogate.
214 throwDecodeError
202 throwDecodeError
215− else
203+ | otherwise =
216 StateNone
204 StateNone
217 in
205 in
218 writeAndReturn dest pos u st
206 writeAndReturn dest pos u st
@@ -246,10 +234,6 @@ unescapeText' bs = runText $ \done -> do
246 else
234 else
247 writeAndReturn dest pos u StateNone
235 writeAndReturn dest pos u StateNone
248
236
249− {-# INLINE f #-}
250−
251−{-# INLINE unescapeText' #-}
252−
253write :: A.MArray s -> Int -> Word16 -> ST s ()
237write :: A.MArray s -> Int -> Word16 -> ST s ()
254write dest pos char =
238write dest pos char =
255 A.unsafeWrite dest pos char
239 A.unsafeWrite dest pos char
@@ -265,8 +249,6 @@ throwDecodeError :: a
265throwDecodeError =
249throwDecodeError =
266 let desc = "Data.Text.Internal.Encoding.decodeUtf8: Invalid UTF-8 stream" in
250 let desc = "Data.Text.Internal.Encoding.decodeUtf8: Invalid UTF-8 stream" in
267 throw (DecodeError desc Nothing)
251 throw (DecodeError desc Nothing)
268−{-# INLINE throwDecodeError #-}
269
252
270unescapeText :: ByteString -> Either UnicodeException Text
253unescapeText :: ByteString -> Either UnicodeException Text
271unescapeText = unsafeDupablePerformIO . try . evaluate . unescapeText'
254unescapeText = unsafeDupablePerformIO . try . evaluate . unescapeText'
272−{-# INLINE unescapeText #-}
run-hlint.shnew file+7
@@ -0,0 +1,7 @@
1+#!/bin/bash
2+
3+if hash hlint 2>/dev/null; then
4+ hlint "$@"
5+else
6+ ./hlint.sh "$@"
7+fi
stack-bench.yaml+10−7
@@ -1,9 +1,12 @@
1−resolver: lts-6.5
1+resolver: nightly-2019-09-21
2+# We use aeson in the snapshot to
3+# - avoid recompilation of criterion
4+# - compare against it
5+# - '.'
6+#
7+# Also we use separate working directory to avoid "unregistering aeson"
8+# caused recompilations
9+work-dir: .stack-work-bench
2packages:
10packages:
3- benchmarks
11- benchmarks
4−extra-deps:
12+extra-deps: []
5−- semigroups-0.18.2
6−- integer-logarithms-1
7−flags:
8− semigroups:
9− bytestring-builder: false
stack-lts7.yaml → stack-ffi-unescape.yamlrenamed+4−3
@@ -1,8 +1,9 @@
1−resolver: lts-7.19
1+resolver: nightly-2019-09-21
2packages:
2packages:
3- '.'
3- '.'
4−extra-deps:
5−- integer-logarithms-1
6flags:
4flags:
7 aeson:
5 aeson:
8 fast: true
6 fast: true
7+ cffi: true
8+extra-deps:
9+- Diff-0.4.0
stack-lts12.yamlnew file+15
@@ -0,0 +1,15 @@
1+resolver: lts-12.26
2+packages:
3+- '.'
4+- attoparsec-iso8601
5+flags:
6+ aeson:
7+ fast: true
8+ cffi: true
9+extra-deps:
10+- base-orphans-0.8.1
11+- hashable-time-0.2.0.1
12+- QuickCheck-2.13.1
13+- quickcheck-instances-0.3.21
14+- splitmix-0.0.2
15+- time-compat-1.9.2.2
stack-lts6.yamldeleted−11
@@ -1,11 +0,0 @@
1−resolver: lts-6.30
2−packages:
3−- '.'
4−extra-deps:
5−- semigroups-0.18.2
6−- integer-logarithms-1
7−flags:
8− aeson:
9− fast: true
10− semigroups:
11− bytestring-builder: false
stack-lts8.yamldeleted−6
@@ -1,6 +0,0 @@
1−resolver: lts-8.1
2−packages:
3−- '.'
4−flags:
5− aeson:
6− fast: true
stack-nightly.yaml+6−3
@@ -1,8 +1,11 @@
1−resolver: nightly-2017-02-29
1+resolver: nightly-2019-10-14
2packages:
2packages:
3- '.'
3- '.'
4−extra-deps:
4+- attoparsec-iso8601
5−- integer-logarithms-1
6flags:
5flags:
7 aeson:
6 aeson:
8 fast: true
7 fast: true
8+ attoparsec-iso8601:
9+ fast: true
10+extra-deps:
11+- generic-deriving-1.12.4
stack-pure-unescape.yamldeleted−7
@@ -1,7 +0,0 @@
1−resolver: lts-8.1
2−packages:
3−- '.'
4−flags:
5− aeson:
6− fast: true
7− cffi: false
tests/DataFamilies/Encoders.hs+2−2
@@ -1,10 +1,10 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2{-# LANGUAGE GADTs #-}
2{-# LANGUAGE GADTs #-}
3+{-# LANGUAGE NoImplicitPrelude #-}
3{-# LANGUAGE TemplateHaskell #-}
4{-# LANGUAGE TemplateHaskell #-}
4
5
5−module DataFamilies.Encoders where
6+module DataFamilies.Encoders (module DataFamilies.Encoders) where
6
7
7−import Prelude ()
8import Prelude.Compat
8import Prelude.Compat
9
9
10import Data.Aeson.TH
10import Data.Aeson.TH
tests/DataFamilies/Instances.hs+2−1
@@ -1,12 +1,13 @@
1{-# LANGUAGE FlexibleInstances #-}
1{-# LANGUAGE FlexibleInstances #-}
2{-# LANGUAGE GADTs #-}
2{-# LANGUAGE GADTs #-}
3+{-# LANGUAGE NoImplicitPrelude #-}
3{-# LANGUAGE TemplateHaskell #-}
4{-# LANGUAGE TemplateHaskell #-}
4{-# LANGUAGE TypeFamilies #-}
5{-# LANGUAGE TypeFamilies #-}
6+
5{-# OPTIONS_GHC -fno-warn-orphans #-}
7{-# OPTIONS_GHC -fno-warn-orphans #-}
6
8
7module DataFamilies.Instances () where
9module DataFamilies.Instances () where
8
10
9−import Prelude ()
10import Prelude.Compat
11import Prelude.Compat
11
12
12import Data.Aeson.TH
13import Data.Aeson.TH
tests/DataFamilies/Properties.hs+6−5
@@ -1,20 +1,21 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2+{-# LANGUAGE NoImplicitPrelude #-}
2
3
3module DataFamilies.Properties (tests) where
4module DataFamilies.Properties (tests) where
4
5
5−import Prelude ()
6import Prelude.Compat
6import Prelude.Compat
7
7
8import DataFamilies.Encoders
8import DataFamilies.Encoders
9import DataFamilies.Instances ()
9import DataFamilies.Instances ()
10−import Properties hiding (tests)
10+import PropUtils
11
11
12+
12−import Test.Framework (Test, testGroup)
13+import Test.Tasty (TestTree, testGroup)
13−import Test.Framework.Providers.QuickCheck2 (testProperty)
14+import Test.Tasty.QuickCheck (testProperty)
14
15
15--------------------------------------------------------------------------------
16--------------------------------------------------------------------------------
16
17
17−tests :: Test
18+tests :: TestTree
18tests = testGroup "data families" [
19tests = testGroup "data families" [
19 testGroup "template-haskell" [
20 testGroup "template-haskell" [
20 testGroup "toJSON" [
21 testGroup "toJSON" [
tests/DataFamilies/Types.hs+2−2
@@ -4,13 +4,13 @@
4{-# LANGUAGE FlexibleInstances #-}
4{-# LANGUAGE FlexibleInstances #-}
5{-# LANGUAGE GADTs #-}
5{-# LANGUAGE GADTs #-}
6{-# LANGUAGE GeneralizedNewtypeDeriving #-}
6{-# LANGUAGE GeneralizedNewtypeDeriving #-}
7+{-# LANGUAGE NoImplicitPrelude #-}
7{-# LANGUAGE StandaloneDeriving #-}
8{-# LANGUAGE StandaloneDeriving #-}
8{-# LANGUAGE TemplateHaskell #-}
9{-# LANGUAGE TemplateHaskell #-}
9{-# LANGUAGE TypeFamilies #-}
10{-# LANGUAGE TypeFamilies #-}
10
11
11−module DataFamilies.Types where
12+module DataFamilies.Types (module DataFamilies.Types) where
12
13
13−import Prelude ()
14import Prelude.Compat
14import Prelude.Compat
15
15
16import Generics.Deriving.TH (deriveAll0)
16import Generics.Deriving.TH (deriveAll0)
tests/Encoders.hs+123−8
@@ -1,11 +1,12 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2{-# LANGUAGE GADTs #-}
2{-# LANGUAGE GADTs #-}
3+{-# LANGUAGE NoImplicitPrelude #-}
3{-# LANGUAGE TemplateHaskell #-}
4{-# LANGUAGE TemplateHaskell #-}
4
5
5−module Encoders where
6+module Encoders (module Encoders) where
6
7
7−import Prelude ()
8import Prelude.Compat
8import Prelude.Compat
9+import Data.Text (Text)
9
10
10import Data.Aeson.TH
11import Data.Aeson.TH
11import Data.Aeson.Types
12import Data.Aeson.Types
@@ -96,6 +97,18 @@ gNullaryToEncodingObjectWithSingleField = genericToEncoding optsObjectWithSingle
96gNullaryParseJSONObjectWithSingleField :: Value -> Parser Nullary
97gNullaryParseJSONObjectWithSingleField :: Value -> Parser Nullary
97gNullaryParseJSONObjectWithSingleField = genericParseJSON optsObjectWithSingleField
98gNullaryParseJSONObjectWithSingleField = genericParseJSON optsObjectWithSingleField
98
99
100+keyOptions :: JSONKeyOptions
101+keyOptions = defaultJSONKeyOptions { keyModifier = ('k' :) }
102+
103+gNullaryToJSONKey :: Nullary -> Either String Text
104+gNullaryToJSONKey x = case genericToJSONKey keyOptions of
105+ ToJSONKeyText p _ -> Right (p x)
106+ _ -> Left "Should be a ToJSONKeyText"
107+
108+gNullaryFromJSONKey :: Text -> Parser Nullary
109+gNullaryFromJSONKey t = case genericFromJSONKey keyOptions of
110+ FromJSONKeyTextParser p -> p t
111+ _ -> fail "Not a TextParser"
99
112
100--------------------------------------------------------------------------------
113--------------------------------------------------------------------------------
101-- SomeType encoders/decoders
114-- SomeType encoders/decoders
@@ -175,7 +188,6 @@ gSomeTypeToEncoding2ElemArray = genericToEncoding opts2ElemArray
175gSomeTypeParseJSON2ElemArray :: Value -> Parser (SomeType Int)
188gSomeTypeParseJSON2ElemArray :: Value -> Parser (SomeType Int)
176gSomeTypeParseJSON2ElemArray = genericParseJSON opts2ElemArray
189gSomeTypeParseJSON2ElemArray = genericParseJSON opts2ElemArray
177
190
178−#if __GLASGOW_HASKELL__ >= 706
179gSomeTypeLiftToEncoding2ElemArray :: LiftToEncoding SomeType a
191gSomeTypeLiftToEncoding2ElemArray :: LiftToEncoding SomeType a
180gSomeTypeLiftToEncoding2ElemArray = genericLiftToEncoding opts2ElemArray
192gSomeTypeLiftToEncoding2ElemArray = genericLiftToEncoding opts2ElemArray
181
193
@@ -184,7 +196,6 @@ gSomeTypeLiftToJSON2ElemArray = genericLiftToJSON opts2ElemArray
184
196
185gSomeTypeLiftParseJSON2ElemArray :: LiftParseJSON SomeType a
197gSomeTypeLiftParseJSON2ElemArray :: LiftParseJSON SomeType a
186gSomeTypeLiftParseJSON2ElemArray = genericLiftParseJSON opts2ElemArray
198gSomeTypeLiftParseJSON2ElemArray = genericLiftParseJSON opts2ElemArray
187−#endif
188
199
189
200
190gSomeTypeToJSONTaggedObject :: SomeType Int -> Value
201gSomeTypeToJSONTaggedObject :: SomeType Int -> Value
@@ -196,7 +207,6 @@ gSomeTypeToEncodingTaggedObject = genericToEncoding optsTaggedObject
196gSomeTypeParseJSONTaggedObject :: Value -> Parser (SomeType Int)
207gSomeTypeParseJSONTaggedObject :: Value -> Parser (SomeType Int)
197gSomeTypeParseJSONTaggedObject = genericParseJSON optsTaggedObject
208gSomeTypeParseJSONTaggedObject = genericParseJSON optsTaggedObject
198
209
199−#if __GLASGOW_HASKELL__ >= 706
200gSomeTypeLiftToEncodingTaggedObject :: LiftToEncoding SomeType a
210gSomeTypeLiftToEncodingTaggedObject :: LiftToEncoding SomeType a
201gSomeTypeLiftToEncodingTaggedObject = genericLiftToEncoding optsTaggedObject
211gSomeTypeLiftToEncodingTaggedObject = genericLiftToEncoding optsTaggedObject
202
212
@@ -205,7 +215,6 @@ gSomeTypeLiftToJSONTaggedObject = genericLiftToJSON optsTaggedObject
205
215
206gSomeTypeLiftParseJSONTaggedObject :: LiftParseJSON SomeType a
216gSomeTypeLiftParseJSONTaggedObject :: LiftParseJSON SomeType a
207gSomeTypeLiftParseJSONTaggedObject = genericLiftParseJSON optsTaggedObject
217gSomeTypeLiftParseJSONTaggedObject = genericLiftParseJSON optsTaggedObject
208−#endif
209
218
210
219
211gSomeTypeToJSONObjectWithSingleField :: SomeType Int -> Value
220gSomeTypeToJSONObjectWithSingleField :: SomeType Int -> Value
@@ -217,7 +226,6 @@ gSomeTypeToEncodingObjectWithSingleField = genericToEncoding optsObjectWithSingl
217gSomeTypeParseJSONObjectWithSingleField :: Value -> Parser (SomeType Int)
226gSomeTypeParseJSONObjectWithSingleField :: Value -> Parser (SomeType Int)
218gSomeTypeParseJSONObjectWithSingleField = genericParseJSON optsObjectWithSingleField
227gSomeTypeParseJSONObjectWithSingleField = genericParseJSON optsObjectWithSingleField
219
228
220−#if __GLASGOW_HASKELL__ >= 706
221gSomeTypeLiftToEncodingObjectWithSingleField :: LiftToEncoding SomeType a
229gSomeTypeLiftToEncodingObjectWithSingleField :: LiftToEncoding SomeType a
222gSomeTypeLiftToEncodingObjectWithSingleField = genericLiftToEncoding optsObjectWithSingleField
230gSomeTypeLiftToEncodingObjectWithSingleField = genericLiftToEncoding optsObjectWithSingleField
223
231
@@ -226,7 +234,6 @@ gSomeTypeLiftToJSONObjectWithSingleField = genericLiftToJSON optsObjectWithSingl
226
234
227gSomeTypeLiftParseJSONObjectWithSingleField :: LiftParseJSON SomeType a
235gSomeTypeLiftParseJSONObjectWithSingleField :: LiftParseJSON SomeType a
228gSomeTypeLiftParseJSONObjectWithSingleField = genericLiftParseJSON optsObjectWithSingleField
236gSomeTypeLiftParseJSONObjectWithSingleField = genericLiftParseJSON optsObjectWithSingleField
229−#endif
230
237
231
238
232gSomeTypeToJSONOmitNothingFields :: SomeType Int -> Value
239gSomeTypeToJSONOmitNothingFields :: SomeType Int -> Value
@@ -235,6 +242,58 @@ gSomeTypeToJSONOmitNothingFields = genericToJSON optsOmitNothingFields
235gSomeTypeToEncodingOmitNothingFields :: SomeType Int -> Encoding
242gSomeTypeToEncodingOmitNothingFields :: SomeType Int -> Encoding
236gSomeTypeToEncodingOmitNothingFields = genericToEncoding optsOmitNothingFields
243gSomeTypeToEncodingOmitNothingFields = genericToEncoding optsOmitNothingFields
237
244
245+
246+thSomeTypeParseJSONRejectUnknownFields :: Value -> Parser (SomeType Int)
247+thSomeTypeParseJSONRejectUnknownFields = $(mkParseJSON optsRejectUnknownFields ''SomeType)
248+
249+gSomeTypeParseJSONRejectUnknownFields :: Value -> Parser (SomeType Int)
250+gSomeTypeParseJSONRejectUnknownFields = genericParseJSON optsRejectUnknownFields
251+
252+
253+--------------------------------------------------------------------------------
254+-- Foo decoders
255+--------------------------------------------------------------------------------
256+
257+thFooParseJSONRejectUnknownFields :: Value -> Parser Foo
258+thFooParseJSONRejectUnknownFields = $(mkParseJSON optsRejectUnknownFields ''Foo)
259+
260+gFooParseJSONRejectUnknownFields :: Value -> Parser Foo
261+gFooParseJSONRejectUnknownFields = genericParseJSON optsRejectUnknownFields
262+
263+
264+thFooParseJSONRejectUnknownFieldsTagged :: Value -> Parser Foo
265+thFooParseJSONRejectUnknownFieldsTagged = $(mkParseJSON optsRejectUnknownFieldsTagged ''Foo)
266+
267+gFooParseJSONRejectUnknownFieldsTagged :: Value -> Parser Foo
268+gFooParseJSONRejectUnknownFieldsTagged = genericParseJSON optsRejectUnknownFieldsTagged
269+
270+
271+--------------------------------------------------------------------------------
272+-- Option fields
273+--------------------------------------------------------------------------------
274+
275+thOptionFieldToJSON :: OptionField -> Value
276+thOptionFieldToJSON = $(mkToJSON optsOptionField 'OptionField)
277+
278+thOptionFieldToEncoding :: OptionField -> Encoding
279+thOptionFieldToEncoding = $(mkToEncoding optsOptionField 'OptionField)
280+
281+thOptionFieldParseJSON :: Value -> Parser OptionField
282+thOptionFieldParseJSON = $(mkParseJSON optsOptionField 'OptionField)
283+
284+gOptionFieldToJSON :: OptionField -> Value
285+gOptionFieldToJSON = genericToJSON optsOptionField
286+
287+gOptionFieldToEncoding :: OptionField -> Encoding
288+gOptionFieldToEncoding = genericToEncoding optsOptionField
289+
290+gOptionFieldParseJSON :: Value -> Parser OptionField
291+gOptionFieldParseJSON = genericParseJSON optsOptionField
292+
293+thMaybeFieldToJSON :: MaybeField -> Value
294+thMaybeFieldToJSON = $(mkToJSON optsOptionField 'MaybeField)
295+
296+
238--------------------------------------------------------------------------------
297--------------------------------------------------------------------------------
239-- IncoherentInstancesNeeded
298-- IncoherentInstancesNeeded
240--------------------------------------------------------------------------------
299--------------------------------------------------------------------------------
@@ -252,6 +311,11 @@ incoherentInstancesNeededParseJSONString :: FromJSON a => Value -> Parser (Incoh
252incoherentInstancesNeededParseJSONString = case () of
311incoherentInstancesNeededParseJSONString = case () of
253 _ | True -> $(mkParseJSON defaultOptions ''IncoherentInstancesNeeded)
312 _ | True -> $(mkParseJSON defaultOptions ''IncoherentInstancesNeeded)
254 | False -> genericParseJSON defaultOptions
313 | False -> genericParseJSON defaultOptions
314+
315+incoherentInstancesNeededToJSON :: ToJSON a => IncoherentInstancesNeeded a -> Value
316+incoherentInstancesNeededToJSON = case () of
317+ _ | True -> $(mkToJSON defaultOptions ''IncoherentInstancesNeeded)
318+ | False -> genericToJSON defaultOptions
255#endif
319#endif
256
320
257-------------------------------------------------------------------------------
321-------------------------------------------------------------------------------
@@ -341,3 +405,54 @@ thGADTToEncodingDefault = $(mkToEncoding defaultOptions ''GADT)
341
405
342thGADTParseJSONDefault :: Value -> Parser (GADT String)
406thGADTParseJSONDefault :: Value -> Parser (GADT String)
343thGADTParseJSONDefault = $(mkParseJSON defaultOptions ''GADT)
407thGADTParseJSONDefault = $(mkParseJSON defaultOptions ''GADT)
408+
409+--------------------------------------------------------------------------------
410+-- OneConstructor encoders/decoders
411+--------------------------------------------------------------------------------
412+
413+thOneConstructorToJSONDefault :: OneConstructor -> Value
414+thOneConstructorToJSONDefault = $(mkToJSON defaultOptions ''OneConstructor)
415+
416+thOneConstructorToEncodingDefault :: OneConstructor -> Encoding
417+thOneConstructorToEncodingDefault = $(mkToEncoding defaultOptions ''OneConstructor)
418+
419+thOneConstructorParseJSONDefault :: Value -> Parser OneConstructor
420+thOneConstructorParseJSONDefault = $(mkParseJSON defaultOptions ''OneConstructor)
421+
422+thOneConstructorToJSONTagged :: OneConstructor -> Value
423+thOneConstructorToJSONTagged = $(mkToJSON optsTagSingleConstructors ''OneConstructor)
424+
425+thOneConstructorToEncodingTagged :: OneConstructor -> Encoding
426+thOneConstructorToEncodingTagged = $(mkToEncoding optsTagSingleConstructors ''OneConstructor)
427+
428+thOneConstructorParseJSONTagged :: Value -> Parser OneConstructor
429+thOneConstructorParseJSONTagged = $(mkParseJSON optsTagSingleConstructors ''OneConstructor)
430+
431+
432+gOneConstructorToJSONDefault :: OneConstructor -> Value
433+gOneConstructorToJSONDefault = genericToJSON defaultOptions
434+
435+gOneConstructorToEncodingDefault :: OneConstructor -> Encoding
436+gOneConstructorToEncodingDefault = genericToEncoding defaultOptions
437+
438+gOneConstructorParseJSONDefault :: Value -> Parser OneConstructor
439+gOneConstructorParseJSONDefault = genericParseJSON defaultOptions
440+
441+gOneConstructorToJSONTagged :: OneConstructor -> Value
442+gOneConstructorToJSONTagged = genericToJSON optsTagSingleConstructors
443+
444+gOneConstructorToEncodingTagged :: OneConstructor -> Encoding
445+gOneConstructorToEncodingTagged = genericToEncoding optsTagSingleConstructors
446+
447+gOneConstructorParseJSONTagged :: Value -> Parser OneConstructor
448+gOneConstructorParseJSONTagged = genericParseJSON optsTagSingleConstructors
449+
450+--------------------------------------------------------------------------------
451+-- Product2 encoders/decoders
452+--------------------------------------------------------------------------------
453+
454+thProduct2ParseJSON :: Value -> Parser (Product2 Int Bool)
455+thProduct2ParseJSON = $(mkParseJSON defaultOptions ''Product2)
456+
457+gProduct2ParseJSON :: Value -> Parser (Product2 Int Bool)
458+gProduct2ParseJSON = genericParseJSON defaultOptions
tests/ErrorMessages.hs+208−41
@@ -1,3 +1,4 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
1{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE ScopedTypeVariables #-}
3{-# LANGUAGE ScopedTypeVariables #-}
3
4
@@ -6,52 +7,218 @@ module ErrorMessages
6 tests
7 tests
7 ) where
8 ) where
8
9
9−import Prelude ()
10import Prelude.Compat
10import Prelude.Compat
11
11
12−import Data.Aeson (FromJSON(..), eitherDecode)
12+import Data.Aeson (FromJSON(..), Value, json)
13+import Data.Aeson.Types (Parser)
14+import Data.Aeson.Parser (eitherDecodeWith)
15+import Data.Aeson.Internal (formatError, iparse)
16+import Data.Algorithm.Diff (PolyDiff (..), getGroupedDiff)
13import Data.Proxy (Proxy(..))
17import Data.Proxy (Proxy(..))
18+import Data.Semigroup ((<>))
19+import Data.Sequence (Seq)
14import Instances ()
20import Instances ()
15−import Test.Framework (Test)
21+import Numeric.Natural (Natural)
16−import Test.Framework.Providers.HUnit (testCase)
22+import Test.Tasty (TestTree, TestName)
17−import Test.HUnit (Assertion, assertFailure, assertEqual)
23+import Test.Tasty.Golden.Advanced (goldenTest)
18import qualified Data.ByteString.Lazy.Char8 as L
24import qualified Data.ByteString.Lazy.Char8 as L
19import qualified Data.HashMap.Strict as HM
25import qualified Data.HashMap.Strict as HM
20
26
27+import Encoders
28+import Types
29+
21−tests :: [Test]
30+tests :: [TestTree]
22tests =
31tests =
23− [
32+ [ aesonGoldenTest "simple" "tests/golden/simple.expected" output
24− testCase "Int" int
33+ , aesonGoldenTest "generic" "tests/golden/generic.expected" (outputGeneric G)
25− , testCase "String" string
26− , testCase "HashMap" hashMap
27− ]
34+ ]
28−
35+
29−int :: Assertion
36+output :: Output
30−int = do
37+output = concat
31− let t = test (Proxy :: Proxy Int)
38+ [ testFor "Int" (Proxy :: Proxy Int)
32− t "\"\"" $ expected "Int" "String"
39+ [ "\"\""
33− t "[]" $ expected "Int" "Array"
40+ , "[]"
34− t "{}" $ expected "Int" "Object"
41+ , "{}"
35− t "null" $ expected "Int" "Null"
42+ , "null"
36−
43+ ]
37−string :: Assertion
44+
38−string = do
45+ , testFor "Integer" (Proxy :: Proxy Integer)
46+ [ "44.44"
47+ ]
48+
49+ , testFor "Natural" (Proxy :: Proxy Natural)
50+ [ "44.44"
51+ , "-50"
52+ ]
53+
39− let t = test (Proxy :: Proxy String)
54+ , testFor "String" (Proxy :: Proxy String)
40− t "1" $ expected "String" "Number"
55+ [ "1"
41− t "[]" $ expected "String" "Array"
56+ , "[]"
42− t "{}" $ expected "String" "Object"
57+ , "{}"
43− t "null" $ expected "String" "Null"
58+ , "null"
44−
59+ ]
45−hashMap :: Assertion
60+
46−hashMap = do
47− let t = test (Proxy :: Proxy (HM.HashMap String Int))
61+ , testFor "HashMap" (Proxy :: Proxy (HM.HashMap String Int))
48− t "\"\"" $ expected "HashMap k v" "String"
62+ [ "\"\""
49− t "[]" $ expected "HashMap k v" "Array"
63+ , "[]"
50−
64+ ]
51−expected :: String -> String -> String
65+
52−expected ex enc = "Error in $: expected " ++ ex ++ ", encountered " ++ enc
66+ -- issue #356
53−
67+ , testFor "Either" (Proxy :: Proxy (Int, Either (Int, Bool) ()))
68+ [ "[1,{\"Left\":[2,3]}]"
69+ ]
70+
71+ -- issue #358
72+ , testFor "Seq" (Proxy :: Proxy (Seq Int))
73+ [ "[0,1,true]"
74+ ]
75+ ]
76+
77+data Choice = TH | G
78+
79+outputGeneric :: Choice -> Output
80+outputGeneric choice = concat
81+ [ testWith "OneConstructor"
82+ (select
83+ thOneConstructorParseJSONDefault
84+ gOneConstructorParseJSONDefault)
85+ [ "\"X\""
86+ , "[0]"
87+ ]
88+
89+ , testWith "Nullary"
90+ (select
91+ thNullaryParseJSONString
92+ gNullaryParseJSONString)
93+ [ "\"X\""
94+ , "[]"
95+ ]
96+
97+ , testWithSomeType "SomeType (tagged)"
98+ (select
99+ thSomeTypeParseJSONTaggedObject
100+ gSomeTypeParseJSONTaggedObject)
101+ [ "{\"tag\": \"unary\", \"contents\": true}"
102+ , "{\"tag\": \"unary\"}"
103+ , "{\"tag\": \"record\"}"
104+ , "{\"tag\": \"record\", \"testone\": true, \"testtwo\": null, \"testthree\": null}"
105+ , "{\"tag\": \"X\"}"
106+ , "{}"
107+ , "[]"
108+ ]
109+
110+ , testWithSomeType "SomeType (single-field)"
111+ (select
112+ thSomeTypeParseJSONObjectWithSingleField
113+ gSomeTypeParseJSONObjectWithSingleField)
114+ [ "{\"unary\": {}}"
115+ , "{\"unary\": []}"
116+ , "{\"X\": []}"
117+ , "{\"record\": {}, \"W\":{}}"
118+ , "{}"
119+ , "[]"
120+ , "{\"unary\""
121+ , "{\"unary\":"
122+ , "{\"unary\":1"
123+ ]
124+
125+ , testWithSomeType "SomeType (two-element array)"
126+ (select
127+ thSomeTypeParseJSON2ElemArray
128+ gSomeTypeParseJSON2ElemArray)
129+ [ "[\"unary\", true]"
130+ , "[\"record\", null]"
131+ , "[\"X\", 0]"
132+ , "[null, 0]"
133+ , "[]"
134+ , "{}"
135+ , "[1"
136+ , "[1,"
137+ ]
138+
139+ , testWithSomeType "SomeType (reject unknown fields)"
140+ (select
141+ thSomeTypeParseJSONRejectUnknownFields
142+ gSomeTypeParseJSONRejectUnknownFields)
143+ [ "{\"tag\": \"record\", \"testOne\": 1.0, \"testZero\": 1}"
144+ , "{\"testZero\": 1}"
145+ , "{\"tag\": \"record\", \"testone\": true, \"testtwo\": null, \"testthree\": null}"
146+ ]
147+
148+ , testWithFoo "Foo (reject unknown fields)"
149+ (select
150+ thFooParseJSONRejectUnknownFields
151+ gFooParseJSONRejectUnknownFields)
152+ [ "{\"tag\": \"foo\"}"
153+ ]
154+
155+ , testWithFoo "Foo (reject unknown fields, tagged single)"
156+ (select
157+ thFooParseJSONRejectUnknownFieldsTagged
158+ gFooParseJSONRejectUnknownFieldsTagged)
159+ [ "{\"tag\": \"foo\", \"unknownField\": 0}"
160+ ]
161+
162+ , testWith "EitherTextInt"
163+ (select
164+ thEitherTextIntParseJSONUntaggedValue
165+ gEitherTextIntParseJSONUntaggedValue)
166+ [ "\"X\""
167+ , "[]"
168+ ]
169+
170+ , testWith "Product2 Int Bool"
171+ (select
172+ thProduct2ParseJSON
173+ gProduct2ParseJSON)
174+ [ "[1, null]"
175+ , "[]"
176+ , "{}"
177+ ]
178+ ]
179+ where
180+ select a b = case choice of
181+ TH -> a
182+ G -> b
183+
184+-- Test infrastructure
185+
186+type Output = [String]
187+
188+outputLine :: String -> Output
189+outputLine = pure
190+
191+aesonGoldenTest :: TestName -> FilePath -> Output -> TestTree
192+aesonGoldenTest name ref out = goldenTest name (L.readFile ref) act cmp upd
193+ where
194+ act = pure (L.pack (unlines out))
195+ upd = L.writeFile ref
196+ cmp x y | x == y = return Nothing
197+ cmp x y = return $ Just $ unlines $
198+ concatMap f (getGroupedDiff (L.lines x) (L.lines y))
199+ where
200+ f (First xs) = map (cons3 '-' . L.unpack) xs
201+ f (Second ys) = map (cons3 '+' . L.unpack) ys
202+ -- we print unchanged lines too. It shouldn't be a problem while we have
203+ -- reasonably small examples
204+ f (Both xs _) = map (cons3 ' ' . L.unpack) xs
205+ -- we add three characters, so the changed lines are easier to spot
206+ cons3 c cs = c : c : c : ' ' : cs
207+
208+testWith :: Show a => String -> (Value -> Parser a) -> [L.ByteString] -> Output
209+testWith name parser ts =
210+ outputLine name <>
211+ foldMap (\s ->
212+ case eitherDecodeWith json (iparse parser) s of
213+ Left err -> outputLine $ uncurry formatError err
214+ Right a -> outputLine $ show a) ts
215+
54−test :: forall a proxy . (FromJSON a, Show a) => proxy a -> L.ByteString -> String -> Assertion
216+testFor :: forall a proxy. (FromJSON a, Show a)
55−test _ v msg = case eitherDecode v of
217+ => String -> proxy a -> [L.ByteString] -> Output
56− Left e -> assertEqual "Invalid error message" msg e
218+testFor name _ = testWith name (parseJSON :: Value -> Parser a)
57− Right (x :: a) -> assertFailure $ "Expected parsing to fail but it suceeded with: " ++ show x
219+
220+testWithSomeType :: String -> (Value -> Parser (SomeType Int)) -> [L.ByteString] -> Output
221+testWithSomeType = testWith
222+
223+testWithFoo :: String -> (Value -> Parser Foo) -> [L.ByteString] -> Output
224+testWithFoo = testWith
tests/Functions.hs+2−1
@@ -1,10 +1,11 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
1module Functions
3module Functions
2 (
4 (
3 approxEq
5 approxEq
4 , approxEqWith
6 , approxEqWith
5 ) where
7 ) where
6
8
7−import Prelude ()
8import Prelude.Compat
9import Prelude.Compat
9
10
10approxEq :: (Fractional a, Ord a) => a -> a -> Bool
11approxEq :: (Fractional a, Ord a) => a -> a -> Bool
tests/Instances.hs+7−70
@@ -1,25 +1,19 @@
1−{-# LANGUAGE CPP #-}
2{-# LANGUAGE FlexibleContexts #-}
1{-# LANGUAGE FlexibleContexts #-}
3{-# LANGUAGE FlexibleInstances #-}
2{-# LANGUAGE FlexibleInstances #-}
3+{-# LANGUAGE NoImplicitPrelude #-}
4{-# LANGUAGE OverloadedStrings #-}
4{-# LANGUAGE OverloadedStrings #-}
5{-# LANGUAGE RecordWildCards #-}
5{-# LANGUAGE RecordWildCards #-}
6−{-# LANGUAGE StandaloneDeriving #-}
6+
7{-# OPTIONS_GHC -fno-warn-orphans #-}
7{-# OPTIONS_GHC -fno-warn-orphans #-}
8
8
9module Instances () where
9module Instances () where
10
10
11−import Prelude ()
12import Prelude.Compat
11import Prelude.Compat
13
12
14import Control.Applicative (empty)
13import Control.Applicative (empty)
15import Control.Monad
14import Control.Monad
16import Data.Aeson.Types
15import Data.Aeson.Types
17import Data.Function (on)
16import Data.Function (on)
18−import Data.Functor.Compose (Compose (..))
19−import Data.Functor.Identity (Identity (..))
20−import Data.Hashable (Hashable (..))
21−import Data.Proxy (Proxy(..))
22−import Data.Tagged (Tagged(..))
23import Data.Time (ZonedTime(..), TimeZone(..))
17import Data.Time (ZonedTime(..), TimeZone(..))
24import Data.Time.Clock (UTCTime(..))
18import Data.Time.Clock (UTCTime(..))
25import Functions
19import Functions
@@ -27,30 +21,15 @@ import Test.QuickCheck (Arbitrary(..), elements, oneof)
27import Types
21import Types
28import qualified Data.DList as DList
22import qualified Data.DList as DList
29import qualified Data.HashMap.Strict as HM
23import qualified Data.HashMap.Strict as HM
30−import qualified Data.UUID.Types as UUID
31−
32−#if !MIN_VERSION_QuickCheck(2,9,0)
33−import Control.Applicative (Const(..))
34−import Data.List.NonEmpty (NonEmpty(..))
35−import Data.Functor.Identity (Identity (..))
36−import Data.Version
37−import Test.QuickCheck (getNonNegative, listOf1, resize)
38−#endif
39
24
40import Data.Orphans ()
25import Data.Orphans ()
41import Test.QuickCheck.Instances ()
26import Test.QuickCheck.Instances ()
42−#if MIN_VERSION_base(4,7,0)
43import Data.Hashable.Time ()
27import Data.Hashable.Time ()
44−#endif
45−
46−#if !MIN_VERSION_base(4,8,0) && !MIN_VERSION_QuickCheck(2,8,3)
47−import Numeric.Natural
48−#endif
49
28
50-- "System" types.
29-- "System" types.
51
30
52instance Arbitrary DotNetTime where
31instance Arbitrary DotNetTime where
53− arbitrary = DotNetTime `liftM` arbitrary
32+ arbitrary = DotNetTime `fmap` arbitrary
54 shrink = map DotNetTime . shrink . fromDotNetTime
33 shrink = map DotNetTime . shrink . fromDotNetTime
55
34
56-- | Compare timezone part only on 'timeZoneMinutes'
35-- | Compare timezone part only on 'timeZoneMinutes'
@@ -174,57 +153,15 @@ instance Arbitrary EitherTextInt where
174instance Arbitrary (GADT String) where
153instance Arbitrary (GADT String) where
175 arbitrary = GADT <$> arbitrary
154 arbitrary = GADT <$> arbitrary
176
155
156+instance Arbitrary OptionField where
157+ arbitrary = OptionField <$> arbitrary
158+
159+
177instance ApproxEq Char where
160instance ApproxEq Char where
178 (=~) = (==)
161 (=~) = (==)
179
162
180instance (ApproxEq a) => ApproxEq [a] where
163instance (ApproxEq a) => ApproxEq [a] where
181 a =~ b = length a == length b && all (uncurry (=~)) (zip a b)
164 a =~ b = length a == length b && all (uncurry (=~)) (zip a b)
182
165
183−-- Version tags are deprecated, so we avoid using them in the Arbitrary
184−-- instance. However, the recommended constructor 'makeVersion' is not
185−-- exported by "Data.Version" until base-4.8.0.0. For previous versions,
186−-- a definition is given below.
187−
188−
189−#if !MIN_VERSION_base(4,8,0) && !MIN_VERSION_QuickCheck(2,8,3)
190−instance Arbitrary Natural where
191− arbitrary = fromInteger . abs <$> arbitrary
192−#endif
193−
194−instance Arbitrary (Proxy a) where
195− arbitrary = pure Proxy
196−
197−instance Arbitrary b => Arbitrary (Tagged a b) where
198− arbitrary = Tagged <$> arbitrary
199−
200instance Arbitrary a => Arbitrary (DList.DList a) where
166instance Arbitrary a => Arbitrary (DList.DList a) where
201 arbitrary = DList.fromList <$> arbitrary
167 arbitrary = DList.fromList <$> arbitrary
202−
203−instance Arbitrary (f (g a)) => Arbitrary (Compose f g a) where
204− arbitrary = Compose <$> arbitrary
205−
206−#if !MIN_VERSION_QuickCheck(2,9,0)
207−instance Arbitrary a => Arbitrary (Const a b) where
208− arbitrary = Const <$> arbitrary
209−
210−instance Arbitrary a => Arbitrary (NonEmpty a) where
211− arbitrary = (:|) <$> arbitrary <*> arbitrary
212−
213−instance Arbitrary Version where
214− arbitrary = makeVersion . fmap getNonNegative <$> resize 4 (listOf1 arbitrary)
215−
216−#if !MIN_VERSION_base(4,8,0)
217−makeVersion :: [Int] -> Version
218−makeVersion b = Version b []
219−#endif
220−
221−instance Arbitrary a => Arbitrary (Identity a) where
222− arbitrary = Identity <$> arbitrary
223−#endif
224−
225−instance Arbitrary UUID.UUID where
226− arbitrary = UUID.fromWords
227− <$> arbitrary
228− <*> arbitrary
229− <*> arbitrary
230− <*> arbitrary
tests/JSONTestSuite/parsers/test_haskell-aeson/src/Main.hs+1−1
@@ -1,6 +1,6 @@
1{-# LANGUAGE ScopedTypeVariables #-}
1{-# LANGUAGE ScopedTypeVariables #-}
2
2
3−module Main where
3+module Main (main) where
4
4
5import qualified Data.Aeson as Aeson
5import qualified Data.Aeson as Aeson
6import qualified Data.ByteString as Bytes
6import qualified Data.ByteString as Bytes
tests/JSONTestSuite/parsers/test_haskell-aeson/testaeson.cabal+5−3
@@ -1,6 +1,8 @@
1−-- This file has been generated from package.yaml by hpack version 0.14.0.
1+-- This file has been generated from package.yaml by hpack version 0.28.2.
2--
2--
3-- see: https://github.com/sol/hpack
3-- see: https://github.com/sol/hpack
4+--
5+-- hash: 716ef4c3e64849526f097b85ed05015e0072c2e2afcc1f91e58d8bea68b123b2
4
6
5name: testaeson
7name: testaeson
6version: 0.0.0
8version: 0.0.0
@@ -12,8 +14,8 @@ executable testaeson
12 hs-source-dirs:
14 hs-source-dirs:
13 src
15 src
14 build-depends:
16 build-depends:
17+ aeson
15− base >= 4.7 && < 5
18+ , base >=4.7 && <5
16− , aeson
17 , base-prelude
19 , base-prelude
18 , bytestring
20 , bytestring
19 default-language: Haskell2010
21 default-language: Haskell2010
tests/JSONTestSuite/test_parsing/n_structure_<.>.json → tests/JSONTestSuite/test_parsing/n_structure_..jsonrenamed

The content is the same.

tests/JSONTestSuite/test_parsing/n_structure_<null>.json → tests/JSONTestSuite/test_parsing/n_structure_null.jsonrenamed

The content is the same.

tests/Options.hs+26−2
@@ -1,6 +1,7 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
1−module Options where
3+module Options (module Options) where
2
4
3−import Prelude ()
4import Prelude.Compat
5import Prelude.Compat
5
6
6import Data.Aeson.Types
7import Data.Aeson.Types
@@ -42,3 +43,26 @@ optsUntaggedValue :: Options
42optsUntaggedValue = optsDefault
43optsUntaggedValue = optsDefault
43 { sumEncoding = UntaggedValue
44 { sumEncoding = UntaggedValue
44 }
45 }
46+
47+optsTagSingleConstructors :: Options
48+optsTagSingleConstructors = optsDefault
49+ { tagSingleConstructors = True
50+ , allNullaryToStringTag = False
51+ }
52+
53+optsOptionField :: Options
54+optsOptionField = optsDefault
55+ { fieldLabelModifier = const "field"
56+ , omitNothingFields = True
57+ }
58+
59+optsRejectUnknownFields :: Options
60+optsRejectUnknownFields = optsDefault
61+ { rejectUnknownFields = True
62+ }
63+
64+optsRejectUnknownFieldsTagged :: Options
65+optsRejectUnknownFieldsTagged = optsDefault
66+ { rejectUnknownFields = True
67+ , tagSingleConstructors = True
68+ }
tests/PropUtils.hsnew file+208
@@ -0,0 +1,208 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
2+{-# LANGUAGE OverloadedStrings #-}
3+{-# LANGUAGE RankNTypes #-}
4+
5+module PropUtils (module PropUtils) where
6+
7+import Prelude.Compat
8+
9+import Data.Aeson (eitherDecode, encode)
10+import Data.Aeson.Encoding (encodingToLazyByteString)
11+import Data.Aeson.Internal (IResult(..), formatError, ifromJSON, iparse)
12+import qualified Data.Aeson.Internal as I
13+import Data.Aeson.Parser (value)
14+import Data.Aeson.Types
15+import Data.HashMap.Strict (HashMap)
16+import Data.Hashable (Hashable)
17+import Data.Int (Int8)
18+import Data.Map (Map)
19+import Data.Time (ZonedTime)
20+import Encoders
21+import Instances ()
22+import Test.QuickCheck (Arbitrary(..), Property, Testable, (===), (.&&.), counterexample)
23+import Types
24+import qualified Data.Attoparsec.Lazy as L
25+import qualified Data.ByteString.Lazy.Char8 as L
26+import qualified Data.HashMap.Strict as H
27+import qualified Data.Map as Map
28+import qualified Data.Text as T
29+import qualified Data.Vector as V
30+
31+
32+encodeDouble :: Double -> Double -> Property
33+encodeDouble num denom
34+ | isInfinite d || isNaN d = encode d === "null"
35+ | otherwise = (read . L.unpack . encode) d === d
36+ where d = num / denom
37+
38+encodeInteger :: Integer -> Property
39+encodeInteger i = encode i === L.pack (show i)
40+
41+toParseJSON :: (Eq a, Show a) =>
42+ (Value -> Parser a) -> (a -> Value) -> a -> Property
43+toParseJSON parsejson tojson x =
44+ case iparse parsejson . tojson $ x of
45+ IError path msg -> failure "parse" (formatError path msg) x
46+ ISuccess x' -> x === x'
47+
48+toParseJSON1
49+ :: (Eq (f Int), Show (f Int))
50+ => (forall a. LiftParseJSON f a)
51+ -> (forall a. LiftToJSON f a)
52+ -> f Int
53+ -> Property
54+toParseJSON1 parsejson1 tojson1 = toParseJSON parsejson tojson
55+ where
56+ parsejson = parsejson1 parseJSON (listParser parseJSON)
57+ tojson = tojson1 toJSON (listValue toJSON)
58+
59+roundTripEnc :: (FromJSON a, ToJSON a, Show a) =>
60+ (a -> a -> Property) -> a -> a -> Property
61+roundTripEnc eq _ i =
62+ case fmap ifromJSON . L.parse value . encode $ i of
63+ L.Done _ (ISuccess v) -> v `eq` i
64+ L.Done _ (IError path err) -> failure "fromJSON" (formatError path err) i
65+ L.Fail _ _ err -> failure "parse" err i
66+
67+roundTripNoEnc :: (FromJSON a, ToJSON a, Show a) =>
68+ (a -> a -> Property) -> a -> a -> Property
69+roundTripNoEnc eq _ i =
70+ case ifromJSON . toJSON $ i of
71+ (ISuccess v) -> v `eq` i
72+ (IError path err) -> failure "fromJSON" (formatError path err) i
73+
74+roundTripEq :: (Eq a, FromJSON a, ToJSON a, Show a) => a -> a -> Property
75+roundTripEq x y = roundTripEnc (===) x y .&&. roundTripNoEnc (===) x y
76+
77+-- We test keys by encoding HashMap and Map with it
78+roundTripKey
79+ :: (Ord a, Hashable a, FromJSONKey a, ToJSONKey a, Show a)
80+ => a -> HashMap a Int -> Map a Int -> Property
81+roundTripKey _ h m = roundTripEq h h .&&. roundTripEq m m
82+
83+infix 4 ==~
84+(==~) :: (ApproxEq a, Show a) => a -> a -> Property
85+x ==~ y =
86+ counterexample (show x ++ " /= " ++ show y) (x =~ y)
87+
88+toFromJSON :: (Arbitrary a, Eq a, FromJSON a, ToJSON a, Show a) => a -> Property
89+toFromJSON x = case ifromJSON (toJSON x) of
90+ IError path err -> failure "fromJSON" (formatError path err) x
91+ ISuccess x' -> x === x'
92+
93+modifyFailureProp :: String -> String -> Bool
94+modifyFailureProp orig added =
95+ result == Error (added ++ orig)
96+ where
97+ parser = const $ modifyFailure (added ++) $ fail orig
98+ result :: Result ()
99+ result = parse parser ()
100+
101+parserThrowErrorProp :: String -> Property
102+parserThrowErrorProp msg =
103+ result === Error msg
104+ where
105+ parser = const $ parserThrowError [] msg
106+ result :: Result ()
107+ result = parse parser ()
108+
109+-- | Tests (also) that we catch the JSONPath and it has elements in the right order.
110+parserCatchErrorProp :: [String] -> String -> Property
111+parserCatchErrorProp path msg =
112+ result === Success ([I.Key "outer", I.Key "inner"] ++ jsonPath, msg)
113+ where
114+ parser = parserCatchError outer (curry pure)
115+
116+ outer = inner I.<?> I.Key "outer"
117+ inner = parserThrowError jsonPath msg I.<?> I.Key "inner"
118+
119+ result :: Result (I.JSONPath, String)
120+ result = parse (const parser) ()
121+
122+ jsonPath = map (I.Key . T.pack) path
123+
124+-- | Perform a structural comparison of the results of two encoding
125+-- methods. Compares decoded values to account for HashMap-driven
126+-- variation in JSON object key ordering.
127+sameAs :: (a -> Value) -> (a -> Encoding) -> a -> Property
128+sameAs toVal toEnc v =
129+ counterexample (show s) $
130+ eitherDecode s === Right (toVal v)
131+ where
132+ s = encodingToLazyByteString (toEnc v)
133+
134+sameAs1
135+ :: (forall a. LiftToJSON f a)
136+ -> (forall a. LiftToEncoding f a)
137+ -> f Int
138+ -> Property
139+sameAs1 toVal1 toEnc1 v = lhs === rhs
140+ where
141+ rhs = Right $ toVal1 toJSON (listValue toJSON) v
142+ lhs = eitherDecode . encodingToLazyByteString $
143+ toEnc1 toEncoding (listEncoding toEncoding) v
144+
145+sameAs1Agree
146+ :: ToJSON a
147+ => (f a -> Encoding)
148+ -> (forall b. LiftToEncoding f b)
149+ -> f a
150+ -> Property
151+sameAs1Agree toEnc toEnc1 v = rhs === lhs
152+ where
153+ rhs = encodingToLazyByteString $ toEnc v
154+ lhs = encodingToLazyByteString $ toEnc1 toEncoding (listEncoding toEncoding) v
155+
156+type P6 = Product6 Int Bool String (Approx Double) (Int, Approx Double) ()
157+type S4 = Sum4 Int8 ZonedTime T.Text (Map.Map String Int)
158+
159+--------------------------------------------------------------------------------
160+-- Value properties
161+--------------------------------------------------------------------------------
162+
163+-- | Add the formatted @Value@ to the printed counterexample when the property
164+-- fails.
165+checkValue :: Testable a => (Value -> a) -> Value -> Property
166+checkValue prop v = counterexample (L.unpack (encode v)) (prop v)
167+
168+isString :: Value -> Bool
169+isString (String _) = True
170+isString _ = False
171+
172+is2ElemArray :: Value -> Bool
173+is2ElemArray (Array v) = V.length v == 2 && isString (V.head v)
174+is2ElemArray _ = False
175+
176+isTaggedObjectValue :: Value -> Bool
177+isTaggedObjectValue (Object obj) = "tag" `H.member` obj &&
178+ "contents" `H.member` obj
179+isTaggedObjectValue _ = False
180+
181+isNullaryTaggedObject :: Value -> Bool
182+isNullaryTaggedObject obj = isTaggedObject' obj && isObjectWithSingleField obj
183+
184+isTaggedObject :: Value -> Property
185+isTaggedObject = checkValue isTaggedObject'
186+
187+isTaggedObject' :: Value -> Bool
188+isTaggedObject' (Object obj) = "tag" `H.member` obj
189+isTaggedObject' _ = False
190+
191+isObjectWithSingleField :: Value -> Bool
192+isObjectWithSingleField (Object obj) = H.size obj == 1
193+isObjectWithSingleField _ = False
194+
195+-- | is untaggedValue of EitherTextInt
196+isUntaggedValueETI :: Value -> Bool
197+isUntaggedValueETI (String s)
198+ | s == "nonenullary" = True
199+isUntaggedValueETI (Bool _) = True
200+isUntaggedValueETI (Number _) = True
201+isUntaggedValueETI (Array a) = length a == 2
202+isUntaggedValueETI _ = False
203+
204+isEmptyArray :: Value -> Property
205+isEmptyArray = checkValue isEmptyArray'
206+
207+isEmptyArray' :: Value -> Bool
208+isEmptyArray' = (Array mempty ==)
tests/Properties.hs+17−448
@@ -1,288 +1,28 @@
1−{-# LANGUAGE CPP #-}
1+{-# LANGUAGE NoImplicitPrelude #-}
2−{-# LANGUAGE FlexibleContexts #-} -- For arbitrary Compose
3−{-# LANGUAGE OverloadedStrings #-}
4−{-# LANGUAGE RankNTypes #-}
5−{-# LANGUAGE ScopedTypeVariables #-}
6
2
7−module Properties where
3+module Properties (module Properties) where
8
4
9−import Prelude ()
10import Prelude.Compat
5import Prelude.Compat
11
6
12−import Control.Applicative (Const)
13−import Data.Aeson (eitherDecode, encode)
14−import Data.Aeson.Encoding (encodingToLazyByteString)
15−import Data.Aeson.Internal (IResult(..), formatError, ifromJSON, iparse)
16−import Data.Aeson.Parser (value)
17−import Data.Aeson.Types
18−import Data.DList (DList)
19−import Data.Functor.Compose (Compose (..))
20−import Data.HashMap.Strict (HashMap)
21−import Data.Hashable (Hashable)
22−import Data.Int (Int8)
23−import Data.List.NonEmpty (NonEmpty)
24−import Data.Map (Map)
25−import Data.Proxy (Proxy)
26−import Data.Ratio (Ratio)
27−import Data.Sequence (Seq)
28−import Data.Tagged (Tagged)
29−import Data.Time (Day, LocalTime, NominalDiffTime, TimeOfDay, UTCTime, ZonedTime)
30−import Data.Version (Version)
31−import Encoders
32import Instances ()
7import Instances ()
33−import Numeric.Natural (Natural)
34−import Test.Framework (Test, testGroup)
8+import Test.Tasty (TestTree, testGroup)
35−import Test.Framework.Providers.QuickCheck2 (testProperty)
9+import Test.Tasty.QuickCheck (testProperty)
36−import Test.QuickCheck (Arbitrary(..), Property, (===), (.&&.), counterexample)
10+import Test.QuickCheck (Property)
37−import Types
11+import PropUtils
38−import qualified Data.Attoparsec.Lazy as L
12+import PropertyGeneric
39−import qualified Data.ByteString.Lazy.Char8 as L
13+import PropertyKeys
40−import qualified Data.HashMap.Strict as H
14+import PropertyRoundTrip
41−import qualified Data.Map as Map
15+import PropertyTH
42−import qualified Data.Text as T
43−import qualified Data.Text.Lazy as LT
44−import qualified Data.UUID.Types as UUID
45−import qualified Data.Vector as V
46
16
47−encodeDouble :: Double -> Double -> Property
48−encodeDouble num denom
49− | isInfinite d || isNaN d = encode d === "null"
50− | otherwise = (read . L.unpack . encode) d === d
51− where d = num / denom
52
17
53−encodeInteger :: Integer -> Property
54−encodeInteger i = encode i === L.pack (show i)
55−
56−toParseJSON :: (Eq a, Show a) =>
57− (Value -> Parser a) -> (a -> Value) -> a -> Property
58−toParseJSON parsejson tojson x =
59− case iparse parsejson . tojson $ x of
60− IError path msg -> failure "parse" (formatError path msg) x
61− ISuccess x' -> x === x'
62−
63−toParseJSON1
64− :: (Eq (f Int), Show (f Int))
65− => (forall a. LiftParseJSON f a)
66− -> (forall a. LiftToJSON f a)
67− -> f Int
68− -> Property
69−toParseJSON1 parsejson1 tojson1 = toParseJSON parsejson tojson
70− where
71− parsejson = parsejson1 parseJSON (listParser parseJSON)
72− tojson = tojson1 toJSON (listValue toJSON)
73−
74−roundTripEnc :: (FromJSON a, ToJSON a, Show a) =>
75− (a -> a -> Property) -> a -> a -> Property
76−roundTripEnc eq _ i =
77− case fmap ifromJSON . L.parse value . encode $ i of
78− L.Done _ (ISuccess v) -> v `eq` i
79− L.Done _ (IError path err) -> failure "fromJSON" (formatError path err) i
80− L.Fail _ _ err -> failure "parse" err i
81−
82−roundTripNoEnc :: (FromJSON a, ToJSON a, Show a) =>
83− (a -> a -> Property) -> a -> a -> Property
84−roundTripNoEnc eq _ i =
85− case ifromJSON . toJSON $ i of
86− (ISuccess v) -> v `eq` i
87− (IError path err) -> failure "fromJSON" (formatError path err) i
88−
89−roundTripEq :: (Eq a, FromJSON a, ToJSON a, Show a) => a -> a -> Property
90−roundTripEq x y = roundTripEnc (===) x y .&&. roundTripNoEnc (===) x y
91−
92−-- We test keys by encoding HashMap and Map with it
93−roundTripKey
94− :: (Ord a, Hashable a, FromJSONKey a, ToJSONKey a, Show a)
95− => a -> HashMap a Int -> Map a Int -> Property
96−roundTripKey _ h m = roundTripEq h h .&&. roundTripEq m m
97−
98−infix 4 ==~
99−(==~) :: (ApproxEq a, Show a) => a -> a -> Property
100−x ==~ y =
101− counterexample (show x ++ " /= " ++ show y) (x =~ y)
102−
103−toFromJSON :: (Arbitrary a, Eq a, FromJSON a, ToJSON a, Show a) => a -> Property
104−toFromJSON x = case ifromJSON (toJSON x) of
105− IError path err -> failure "fromJSON" (formatError path err) x
106− ISuccess x' -> x === x'
107−
108−modifyFailureProp :: String -> String -> Bool
109−modifyFailureProp orig added =
110− result == Error (added ++ orig)
111− where
112− parser = const $ modifyFailure (added ++) $ fail orig
113− result :: Result ()
114− result = parse parser ()
115−
116−-- | Perform a structural comparison of the results of two encoding
117−-- methods. Compares decoded values to account for HashMap-driven
118−-- variation in JSON object key ordering.
119−sameAs :: (a -> Value) -> (a -> Encoding) -> a -> Property
120−sameAs toVal toEnc v =
121− eitherDecode (encodingToLazyByteString (toEnc v)) === Right (toVal v)
122−
123−sameAs1
124− :: (forall a. LiftToJSON f a)
125− -> (forall a. LiftToEncoding f a)
126− -> f Int
127− -> Property
128−sameAs1 toVal1 toEnc1 v = lhs === rhs
129− where
130− rhs = Right $ toVal1 toJSON (listValue toJSON) v
131− lhs = eitherDecode . encodingToLazyByteString $
132− toEnc1 toEncoding (listEncoding toEncoding) v
133−
134−sameAs1Agree
135− :: ToJSON a
136− => (f a -> Encoding)
137− -> (forall b. LiftToEncoding f b)
138− -> f a
139− -> Property
140−sameAs1Agree toEnc toEnc1 v = rhs === lhs
141− where
142− rhs = encodingToLazyByteString $ toEnc v
143− lhs = encodingToLazyByteString $ toEnc1 toEncoding (listEncoding toEncoding) v
144−
145−type P6 = Product6 Int Bool String (Approx Double) (Int, Approx Double) ()
146−type S4 = Sum4 Int8 ZonedTime T.Text (Map.Map String Int)
147−
148−--------------------------------------------------------------------------------
149−-- Value properties
150−--------------------------------------------------------------------------------
151−
152−isString :: Value -> Bool
153−isString (String _) = True
154−isString _ = False
155−
156−is2ElemArray :: Value -> Bool
157−is2ElemArray (Array v) = V.length v == 2 && isString (V.head v)
158−is2ElemArray _ = False
159−
160−isTaggedObjectValue :: Value -> Bool
161−isTaggedObjectValue (Object obj) = "tag" `H.member` obj &&
162− "contents" `H.member` obj
163−isTaggedObjectValue _ = False
164−
165−isNullaryTaggedObject :: Value -> Bool
166−isNullaryTaggedObject obj = isTaggedObject obj && isObjectWithSingleField obj
167−
168−isTaggedObject :: Value -> Bool
169−isTaggedObject (Object obj) = "tag" `H.member` obj
170−isTaggedObject _ = False
171−
172−isObjectWithSingleField :: Value -> Bool
173−isObjectWithSingleField (Object obj) = H.size obj == 1
174−isObjectWithSingleField _ = False
175−
176−-- | is untaggedValue of EitherTextInt
177−isUntaggedValueETI :: Value -> Bool
178−isUntaggedValueETI (String s)
179− | s == "nonenullary" = True
180−isUntaggedValueETI (Bool _) = True
181−isUntaggedValueETI (Number _) = True
182−isUntaggedValueETI (Array a) = length a == 2
183−isUntaggedValueETI _ = False
184−
185−
186−--------------------------------------------------------------------------------
187−
188−
189−tests :: Test
18+tests :: TestTree
190tests = testGroup "properties" [
19tests = testGroup "properties" [
191 testGroup "encode" [
20 testGroup "encode" [
192 testProperty "encodeDouble" encodeDouble
21 testProperty "encodeDouble" encodeDouble
193 , testProperty "encodeInteger" encodeInteger
22 , testProperty "encodeInteger" encodeInteger
194 ]
23 ]
195− , testGroup "roundTrip" [
24+ , roundTripTests
196− testProperty "Bool" $ roundTripEq True
25+ , keysTests
197− , testProperty "Double" $ roundTripEq (1 :: Approx Double)
198− , testProperty "Int" $ roundTripEq (1 :: Int)
199− , testProperty "NonEmpty Char" $ roundTripEq (undefined :: NonEmpty Char)
200− , testProperty "Integer" $ roundTripEq (1 :: Integer)
201− , testProperty "String" $ roundTripEq ("" :: String)
202− , testProperty "Text" $ roundTripEq T.empty
203− , testProperty "Lazy Text" $ roundTripEq LT.empty
204− , testProperty "Foo" $ roundTripEq (undefined :: Foo)
205− , testProperty "Day" $ roundTripEq (undefined :: Day)
206− , testProperty "BCE Day" $ roundTripEq (undefined :: BCEDay)
207− , testProperty "DotNetTime" $ roundTripEq (undefined :: Approx DotNetTime)
208− , testProperty "LocalTime" $ roundTripEq (undefined :: LocalTime)
209− , testProperty "TimeOfDay" $ roundTripEq (undefined :: TimeOfDay)
210− , testProperty "UTCTime" $ roundTripEq (undefined :: UTCTime)
211− , testProperty "ZonedTime" $ roundTripEq (undefined :: ZonedTime)
212− , testProperty "NominalDiffTime" $ roundTripEq (undefined :: NominalDiffTime)
213− , testProperty "Version" $ roundTripEq (undefined :: Version)
214− , testProperty "Natural" $ roundTripEq (undefined :: Natural)
215− , testProperty "Proxy" $ roundTripEq (undefined :: Proxy Int)
216− , testProperty "Tagged" $ roundTripEq (undefined :: Tagged Int Char)
217− , testProperty "Const" $ roundTripEq (undefined :: Const Int Char)
218− , testProperty "DList" $ roundTripEq (undefined :: DList Int)
219− , testProperty "Seq" $ roundTripEq (undefined :: Seq Int)
220− , testProperty "Rational" $ roundTripEq (undefined :: Rational)
221− , testProperty "Ratio Int" $ roundTripEq (undefined :: Ratio Int)
222− , testProperty "UUID" $ roundTripEq UUID.nil
223− , testGroup "functors"
224− [ testProperty "Identity Char" $ roundTripEq (undefined :: I Int)
225−
226− , testProperty "Identity Char" $ roundTripEq (undefined :: I Char)
227− , testProperty "Identity [Char]" $ roundTripEq (undefined :: I [Char])
228− , testProperty "[Identity Char]" $ roundTripEq (undefined :: [I Char])
229−
230− , testProperty "Compose I I Int" $ roundTripEq (undefined :: LogScaled (Compose I I Int))
231− , testProperty "Compose [] I Int" $ roundTripEq (undefined :: LogScaled (Compose [] I Int))
232− , testProperty "Compose I [] Int" $ roundTripEq (undefined :: LogScaled (Compose I [] Int))
233− , testProperty "Compose [] [] Int" $ roundTripEq (undefined :: LogScaled (Compose [] [] Int))
234−
235− , testProperty "Compose I I Char" $ roundTripEq (undefined :: LogScaled (Compose I I Char))
236− , testProperty "Compose [] I Char" $ roundTripEq (undefined :: LogScaled (Compose [] I Char))
237− , testProperty "Compose I [] Char" $ roundTripEq (undefined :: LogScaled (Compose I [] Char))
238− , testProperty "Compose [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose [] [] Char))
239−
240− , testProperty "Compose3 I I I Char" $ roundTripEq (undefined :: LogScaled (Compose3 I I I Char))
241− , testProperty "Compose3 I [] I Char" $ roundTripEq (undefined :: LogScaled (Compose3 I [] I Char))
242− , testProperty "Compose3 I I [] Char" $ roundTripEq (undefined :: LogScaled (Compose3 I I [] Char))
243− , testProperty "Compose3 I [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose3 I [] [] Char))
244− , testProperty "Compose3 [] I I Char" $ roundTripEq (undefined :: LogScaled (Compose3 [] I I Char))
245− , testProperty "Compose3 [] [] I Char" $ roundTripEq (undefined :: LogScaled (Compose3 [] [] I Char))
246− , testProperty "Compose3 [] I [] Char" $ roundTripEq (undefined :: LogScaled (Compose3 [] I [] Char))
247− , testProperty "Compose3 [] [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose3 [] [] [] Char))
248−
249− , testProperty "Compose3' I I I Char" $ roundTripEq (undefined :: LogScaled (Compose3' I I I Char))
250− , testProperty "Compose3' I [] I Char" $ roundTripEq (undefined :: LogScaled (Compose3' I [] I Char))
251− , testProperty "Compose3' I I [] Char" $ roundTripEq (undefined :: LogScaled (Compose3' I I [] Char))
252− , testProperty "Compose3' I [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose3' I [] [] Char))
253− , testProperty "Compose3' [] I I Char" $ roundTripEq (undefined :: LogScaled (Compose3' [] I I Char))
254− , testProperty "Compose3' [] [] I Char" $ roundTripEq (undefined :: LogScaled (Compose3' [] [] I Char))
255− , testProperty "Compose3' [] I [] Char" $ roundTripEq (undefined :: LogScaled (Compose3' [] I [] Char))
256− , testProperty "Compose3' [] [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose3' [] [] [] Char))
257− ]
258− , testGroup "ghcGenerics" [
259− testProperty "OneConstructor" $ roundTripEq OneConstructor
260− , testProperty "Product2" $ roundTripEq (undefined :: Product2 Int Bool)
261− , testProperty "Product6" $ roundTripEq (undefined :: P6)
262− , testProperty "Sum4" $ roundTripEq (undefined :: S4)
263− ]
264− ]
265− , testGroup "roundTrip Key"
266− [ testProperty "Bool" $ roundTripKey True
267− , testProperty "Text" $ roundTripKey (undefined :: T.Text)
268− , testProperty "String" $ roundTripKey (undefined :: String)
269− , testProperty "Int" $ roundTripKey (undefined :: Int)
270− , testProperty "[Text]" $ roundTripKey (undefined :: LogScaled [T.Text])
271− , testProperty "(Int,Char)" $ roundTripKey (undefined :: (Int,Char))
272− , testProperty "Integer" $ roundTripKey (undefined :: Integer)
273− , testProperty "Natural" $ roundTripKey (undefined :: Natural)
274− , testProperty "Float" $ roundTripKey (undefined :: Float)
275− , testProperty "Double" $ roundTripKey (undefined :: Double)
276−#if MIN_VERSION_base(4,7,0)
277− , testProperty "Day" $ roundTripKey (undefined :: Day)
278− , testProperty "LocalTime" $ roundTripKey (undefined :: LocalTime)
279− , testProperty "TimeOfDay" $ roundTripKey (undefined :: TimeOfDay)
280− , testProperty "UTCTime" $ roundTripKey (undefined :: UTCTime)
281−#endif
282− , testProperty "Version" $ roundTripKey (undefined :: Version)
283− , testProperty "Lazy Text" $ roundTripKey (undefined :: LT.Text)
284− , testProperty "UUID" $ roundTripKey UUID.nil
285− ]
286 , testGroup "toFromJSON" [
26 , testGroup "toFromJSON" [
287 testProperty "Integer" (toFromJSON :: Integer -> Property)
27 testProperty "Integer" (toFromJSON :: Integer -> Property)
288 , testProperty "Double" (toFromJSON :: Double -> Property)
28 , testProperty "Double" (toFromJSON :: Double -> Property)
@@ -292,180 +32,9 @@ tests = testGroup "properties" [
292 ]
32 ]
293 , testGroup "failure messages" [
33 , testGroup "failure messages" [
294 testProperty "modify failure" modifyFailureProp
34 testProperty "modify failure" modifyFailureProp
35+ , testProperty "parserThrowError" parserThrowErrorProp
36+ , testProperty "parserCatchError" parserCatchErrorProp
295 ]
37 ]
296− , testGroup "generic" [
38+ , genericTests
297− testGroup "toJSON" [
39+ , templateHaskellTests
298− testGroup "Nullary" [
299− testProperty "string" (isString . gNullaryToJSONString)
300− , testProperty "2ElemArray" (is2ElemArray . gNullaryToJSON2ElemArray)
301− , testProperty "TaggedObject" (isNullaryTaggedObject . gNullaryToJSONTaggedObject)
302− , testProperty "ObjectWithSingleField" (isObjectWithSingleField . gNullaryToJSONObjectWithSingleField)
303− , testGroup "roundTrip" [
304− testProperty "string" (toParseJSON gNullaryParseJSONString gNullaryToJSONString)
305− , testProperty "2ElemArray" (toParseJSON gNullaryParseJSON2ElemArray gNullaryToJSON2ElemArray)
306− , testProperty "TaggedObject" (toParseJSON gNullaryParseJSONTaggedObject gNullaryToJSONTaggedObject)
307− , testProperty "ObjectWithSingleField" (toParseJSON gNullaryParseJSONObjectWithSingleField gNullaryToJSONObjectWithSingleField)
308− ]
309− ]
310− , testGroup "EitherTextInt" [
311− testProperty "UntaggedValue" (isUntaggedValueETI . gEitherTextIntToJSONUntaggedValue)
312− , testProperty "roundtrip" (toParseJSON gEitherTextIntParseJSONUntaggedValue gEitherTextIntToJSONUntaggedValue)
313− ]
314− , testGroup "SomeType" [
315− testProperty "2ElemArray" (is2ElemArray . gSomeTypeToJSON2ElemArray)
316− , testProperty "TaggedObject" (isTaggedObject . gSomeTypeToJSONTaggedObject)
317− , testProperty "ObjectWithSingleField" (isObjectWithSingleField . gSomeTypeToJSONObjectWithSingleField)
318− , testGroup "roundTrip" [
319− testProperty "2ElemArray" (toParseJSON gSomeTypeParseJSON2ElemArray gSomeTypeToJSON2ElemArray)
320− , testProperty "TaggedObject" (toParseJSON gSomeTypeParseJSONTaggedObject gSomeTypeToJSONTaggedObject)
321− , testProperty "ObjectWithSingleField" (toParseJSON gSomeTypeParseJSONObjectWithSingleField gSomeTypeToJSONObjectWithSingleField)
322−
323−#if __GLASGOW_HASKELL__ >= 706
324− , testProperty "2ElemArray unary" (toParseJSON1 gSomeTypeLiftParseJSON2ElemArray gSomeTypeLiftToJSON2ElemArray)
325− , testProperty "TaggedObject unary" (toParseJSON1 gSomeTypeLiftParseJSONTaggedObject gSomeTypeLiftToJSONTaggedObject)
326− , testProperty "ObjectWithSingleField unary" (toParseJSON1 gSomeTypeLiftParseJSONObjectWithSingleField gSomeTypeLiftToJSONObjectWithSingleField)
327−#endif
328− ]
329− ]
330− ]
331− , testGroup "toEncoding" [
332− testProperty "NullaryString" $
333− gNullaryToJSONString `sameAs` gNullaryToEncodingString
334− , testProperty "Nullary2ElemArray" $
335− gNullaryToJSON2ElemArray `sameAs` gNullaryToEncoding2ElemArray
336− , testProperty "NullaryTaggedObject" $
337− gNullaryToJSONTaggedObject `sameAs` gNullaryToEncodingTaggedObject
338− , testProperty "NullaryObjectWithSingleField" $
339− gNullaryToJSONObjectWithSingleField `sameAs`
340− gNullaryToEncodingObjectWithSingleField
341− -- , testProperty "ApproxUnwrap" $
342− -- gApproxToJSONUnwrap `sameAs` gApproxToEncodingUnwrap
343− , testProperty "ApproxDefault" $
344− gApproxToJSONDefault `sameAs` gApproxToEncodingDefault
345−
346− , testProperty "EitherTextInt UntaggedValue" $
347− gEitherTextIntToJSONUntaggedValue `sameAs` gEitherTextIntToEncodingUntaggedValue
348−
349− , testProperty "SomeType2ElemArray" $
350− gSomeTypeToJSON2ElemArray `sameAs` gSomeTypeToEncoding2ElemArray
351−#if __GLASGOW_HASKELL__ >= 706
352− , testProperty "SomeType2ElemArray unary" $
353− gSomeTypeLiftToJSON2ElemArray `sameAs1` gSomeTypeLiftToEncoding2ElemArray
354− , testProperty "SomeType2ElemArray unary agree" $
355− gSomeTypeToEncoding2ElemArray `sameAs1Agree` gSomeTypeLiftToEncoding2ElemArray
356−#endif
357−
358− , testProperty "SomeTypeTaggedObject" $
359− gSomeTypeToJSONTaggedObject `sameAs` gSomeTypeToEncodingTaggedObject
360−#if __GLASGOW_HASKELL__ >= 706
361− , testProperty "SomeTypeTaggedObject unary" $
362− gSomeTypeLiftToJSONTaggedObject `sameAs1` gSomeTypeLiftToEncodingTaggedObject
363− , testProperty "SomeTypeTaggedObject unary agree" $
364− gSomeTypeToEncodingTaggedObject `sameAs1Agree` gSomeTypeLiftToEncodingTaggedObject
365−#endif
366−
367− , testProperty "SomeTypeObjectWithSingleField" $
368− gSomeTypeToJSONObjectWithSingleField `sameAs` gSomeTypeToEncodingObjectWithSingleField
369−#if __GLASGOW_HASKELL__ >= 706
370− , testProperty "SomeTypeObjectWithSingleField unary" $
371− gSomeTypeLiftToJSONObjectWithSingleField `sameAs1` gSomeTypeLiftToEncodingObjectWithSingleField
372− , testProperty "SomeTypeObjectWithSingleField unary agree" $
373− gSomeTypeToEncodingObjectWithSingleField `sameAs1Agree` gSomeTypeLiftToEncodingObjectWithSingleField
374−#endif
375−
376− , testProperty "SomeTypeOmitNothingFields" $
377− gSomeTypeToJSONOmitNothingFields `sameAs` gSomeTypeToEncodingOmitNothingFields
378− ]
379− ]
380− , testGroup "template-haskell" [
381− testGroup "toJSON" [
382− testGroup "Nullary" [
383− testProperty "string" (isString . thNullaryToJSONString)
384− , testProperty "2ElemArray" (is2ElemArray . thNullaryToJSON2ElemArray)
385− , testProperty "TaggedObject" (isNullaryTaggedObject . thNullaryToJSONTaggedObject)
386− , testProperty "ObjectWithSingleField" (isObjectWithSingleField . thNullaryToJSONObjectWithSingleField)
387−
388− , testGroup "roundTrip" [
389− testProperty "string" (toParseJSON thNullaryParseJSONString thNullaryToJSONString)
390− , testProperty "2ElemArray" (toParseJSON thNullaryParseJSON2ElemArray thNullaryToJSON2ElemArray)
391− , testProperty "TaggedObject" (toParseJSON thNullaryParseJSONTaggedObject thNullaryToJSONTaggedObject)
392− , testProperty "ObjectWithSingleField" (toParseJSON thNullaryParseJSONObjectWithSingleField thNullaryToJSONObjectWithSingleField)
393− ]
394− ]
395− , testGroup "EitherTextInt" [
396− testProperty "UntaggedValue" (isUntaggedValueETI . thEitherTextIntToJSONUntaggedValue)
397− , testProperty "roundtrip" (toParseJSON thEitherTextIntParseJSONUntaggedValue thEitherTextIntToJSONUntaggedValue)
398− ]
399− , testGroup "SomeType" [
400− testProperty "2ElemArray" (is2ElemArray . thSomeTypeToJSON2ElemArray)
401− , testProperty "TaggedObject" (isTaggedObject . thSomeTypeToJSONTaggedObject)
402− , testProperty "ObjectWithSingleField" (isObjectWithSingleField . thSomeTypeToJSONObjectWithSingleField)
403− , testGroup "roundTrip" [
404− testProperty "2ElemArray" (toParseJSON thSomeTypeParseJSON2ElemArray thSomeTypeToJSON2ElemArray)
405− , testProperty "TaggedObject" (toParseJSON thSomeTypeParseJSONTaggedObject thSomeTypeToJSONTaggedObject)
406− , testProperty "ObjectWithSingleField" (toParseJSON thSomeTypeParseJSONObjectWithSingleField thSomeTypeToJSONObjectWithSingleField)
407−
408− , testProperty "2ElemArray unary" (toParseJSON1 thSomeTypeLiftParseJSON2ElemArray thSomeTypeLiftToJSON2ElemArray)
409− , testProperty "TaggedObject unary" (toParseJSON1 thSomeTypeLiftParseJSONTaggedObject thSomeTypeLiftToJSONTaggedObject)
410− , testProperty "ObjectWithSingleField unary" (toParseJSON1 thSomeTypeLiftParseJSONObjectWithSingleField thSomeTypeLiftToJSONObjectWithSingleField)
411−
412− ]
413− , testGroup "Approx" [
414− testProperty "string" (isString . thApproxToJSONUnwrap)
415− , testProperty "ObjectWithSingleField" (isObjectWithSingleField . thApproxToJSONDefault)
416− , testGroup "roundTrip" [
417− testProperty "string" (toParseJSON thApproxParseJSONUnwrap thApproxToJSONUnwrap)
418− , testProperty "ObjectWithSingleField" (toParseJSON thApproxParseJSONDefault thApproxToJSONDefault)
419− ]
420− ]
421− , testGroup "GADT" [
422− testProperty "string" (isString . thGADTToJSONUnwrap)
423− , testProperty "ObjectWithSingleField" (isObjectWithSingleField . thGADTToJSONDefault)
424− , testGroup "roundTrip" [
425− testProperty "string" (toParseJSON thGADTParseJSONUnwrap thGADTToJSONUnwrap)
426− , testProperty "ObjectWithSingleField" (toParseJSON thGADTParseJSONDefault thGADTToJSONDefault)
427− ]
428− ]
429− ]
430− ]
431− , testGroup "toEncoding" [
432− testProperty "NullaryString" $
433− thNullaryToJSONString `sameAs` thNullaryToEncodingString
434− , testProperty "Nullary2ElemArray" $
435− thNullaryToJSON2ElemArray `sameAs` thNullaryToEncoding2ElemArray
436− , testProperty "NullaryTaggedObject" $
437− thNullaryToJSONTaggedObject `sameAs` thNullaryToEncodingTaggedObject
438− , testProperty "NullaryObjectWithSingleField" $
439− thNullaryToJSONObjectWithSingleField `sameAs`
440− thNullaryToEncodingObjectWithSingleField
441− , testProperty "ApproxUnwrap" $
442− thApproxToJSONUnwrap `sameAs` thApproxToEncodingUnwrap
443− , testProperty "ApproxDefault" $
444− thApproxToJSONDefault `sameAs` thApproxToEncodingDefault
445−
446− , testProperty "EitherTextInt UntaggedValue" $
447− thEitherTextIntToJSONUntaggedValue `sameAs` thEitherTextIntToEncodingUntaggedValue
448−
449− , testProperty "SomeType2ElemArray" $
450− thSomeTypeToJSON2ElemArray `sameAs` thSomeTypeToEncoding2ElemArray
451− , testProperty "SomeType2ElemArray unary" $
452− thSomeTypeLiftToJSON2ElemArray `sameAs1` thSomeTypeLiftToEncoding2ElemArray
453− , testProperty "SomeType2ElemArray unary agree" $
454− thSomeTypeToEncoding2ElemArray `sameAs1Agree` thSomeTypeLiftToEncoding2ElemArray
455−
456− , testProperty "SomeTypeTaggedObject" $
457− thSomeTypeToJSONTaggedObject `sameAs` thSomeTypeToEncodingTaggedObject
458− , testProperty "SomeTypeTaggedObject unary" $
459− thSomeTypeLiftToJSONTaggedObject `sameAs1` thSomeTypeLiftToEncodingTaggedObject
460− , testProperty "SomeTypeTaggedObject unary agree" $
461− thSomeTypeToEncodingTaggedObject `sameAs1Agree` thSomeTypeLiftToEncodingTaggedObject
462−
463− , testProperty "SomeTypeObjectWithSingleField" $
464− thSomeTypeToJSONObjectWithSingleField `sameAs` thSomeTypeToEncodingObjectWithSingleField
465− , testProperty "SomeTypeObjectWithSingleField unary" $
466− thSomeTypeLiftToJSONObjectWithSingleField `sameAs1` thSomeTypeLiftToEncodingObjectWithSingleField
467− , testProperty "SomeTypeObjectWithSingleField unary agree" $
468− thSomeTypeToEncodingObjectWithSingleField `sameAs1Agree` thSomeTypeLiftToEncodingObjectWithSingleField
469− ]
470− ]
471 ]
40 ]
tests/PropertyGeneric.hsnew file+116
@@ -0,0 +1,116 @@
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE NoImplicitPrelude #-}
3+
4+module PropertyGeneric ( genericTests ) where
5+
6+import Prelude.Compat
7+
8+import Data.Semigroup (Option(..))
9+import Encoders
10+import Instances ()
11+import Test.Tasty (TestTree, testGroup)
12+import Test.Tasty.QuickCheck (testProperty)
13+import Test.QuickCheck ( (===) )
14+import Types
15+import PropUtils
16+
17+
18+genericTests :: TestTree
19+genericTests =
20+ testGroup "generic" [
21+ testGroup "toJSON" [
22+ testGroup "Nullary" [
23+ testProperty "string" (isString . gNullaryToJSONString)
24+ , testProperty "2ElemArray" (is2ElemArray . gNullaryToJSON2ElemArray)
25+ , testProperty "TaggedObject" (isNullaryTaggedObject . gNullaryToJSONTaggedObject)
26+ , testProperty "ObjectWithSingleField" (isObjectWithSingleField . gNullaryToJSONObjectWithSingleField)
27+ , testGroup "roundTrip" [
28+ testProperty "string" (toParseJSON gNullaryParseJSONString gNullaryToJSONString)
29+ , testProperty "2ElemArray" (toParseJSON gNullaryParseJSON2ElemArray gNullaryToJSON2ElemArray)
30+ , testProperty "TaggedObject" (toParseJSON gNullaryParseJSONTaggedObject gNullaryToJSONTaggedObject)
31+ , testProperty "ObjectWithSingleField" (toParseJSON gNullaryParseJSONObjectWithSingleField gNullaryToJSONObjectWithSingleField)
32+ ]
33+ ]
34+ , testGroup "EitherTextInt" [
35+ testProperty "UntaggedValue" (isUntaggedValueETI . gEitherTextIntToJSONUntaggedValue)
36+ , testProperty "roundtrip" (toParseJSON gEitherTextIntParseJSONUntaggedValue gEitherTextIntToJSONUntaggedValue)
37+ ]
38+ , testGroup "SomeType" [
39+ testProperty "2ElemArray" (is2ElemArray . gSomeTypeToJSON2ElemArray)
40+ , testProperty "TaggedObject" (isTaggedObject . gSomeTypeToJSONTaggedObject)
41+ , testProperty "ObjectWithSingleField" (isObjectWithSingleField . gSomeTypeToJSONObjectWithSingleField)
42+ , testGroup "roundTrip" [
43+ testProperty "2ElemArray" (toParseJSON gSomeTypeParseJSON2ElemArray gSomeTypeToJSON2ElemArray)
44+ , testProperty "TaggedObject" (toParseJSON gSomeTypeParseJSONTaggedObject gSomeTypeToJSONTaggedObject)
45+ , testProperty "ObjectWithSingleField" (toParseJSON gSomeTypeParseJSONObjectWithSingleField gSomeTypeToJSONObjectWithSingleField)
46+
47+ , testProperty "2ElemArray unary" (toParseJSON1 gSomeTypeLiftParseJSON2ElemArray gSomeTypeLiftToJSON2ElemArray)
48+ , testProperty "TaggedObject unary" (toParseJSON1 gSomeTypeLiftParseJSONTaggedObject gSomeTypeLiftToJSONTaggedObject)
49+ , testProperty "ObjectWithSingleField unary" (toParseJSON1 gSomeTypeLiftParseJSONObjectWithSingleField gSomeTypeLiftToJSONObjectWithSingleField)
50+ ]
51+ ]
52+ , testGroup "OneConstructor" [
53+ testProperty "default" (isEmptyArray . gOneConstructorToJSONDefault)
54+ , testProperty "Tagged" (isTaggedObject . gOneConstructorToJSONTagged)
55+ , testGroup "roundTrip" [
56+ testProperty "default" (toParseJSON gOneConstructorParseJSONDefault gOneConstructorToJSONDefault)
57+ , testProperty "Tagged" (toParseJSON gOneConstructorParseJSONTagged gOneConstructorToJSONTagged)
58+ ]
59+ ]
60+ , testGroup "OptionField" [
61+ testProperty "like Maybe" $
62+ \x -> gOptionFieldToJSON (OptionField (Option x)) === thMaybeFieldToJSON (MaybeField x)
63+ , testProperty "roundTrip" (toParseJSON gOptionFieldParseJSON gOptionFieldToJSON)
64+ ]
65+ ]
66+ , testGroup "toEncoding" [
67+ testProperty "NullaryString" $
68+ gNullaryToJSONString `sameAs` gNullaryToEncodingString
69+ , testProperty "Nullary2ElemArray" $
70+ gNullaryToJSON2ElemArray `sameAs` gNullaryToEncoding2ElemArray
71+ , testProperty "NullaryTaggedObject" $
72+ gNullaryToJSONTaggedObject `sameAs` gNullaryToEncodingTaggedObject
73+ , testProperty "NullaryObjectWithSingleField" $
74+ gNullaryToJSONObjectWithSingleField `sameAs`
75+ gNullaryToEncodingObjectWithSingleField
76+ -- , testProperty "ApproxUnwrap" $
77+ -- gApproxToJSONUnwrap `sameAs` gApproxToEncodingUnwrap
78+ , testProperty "ApproxDefault" $
79+ gApproxToJSONDefault `sameAs` gApproxToEncodingDefault
80+
81+ , testProperty "EitherTextInt UntaggedValue" $
82+ gEitherTextIntToJSONUntaggedValue `sameAs` gEitherTextIntToEncodingUntaggedValue
83+
84+ , testProperty "SomeType2ElemArray" $
85+ gSomeTypeToJSON2ElemArray `sameAs` gSomeTypeToEncoding2ElemArray
86+ , testProperty "SomeType2ElemArray unary" $
87+ gSomeTypeLiftToJSON2ElemArray `sameAs1` gSomeTypeLiftToEncoding2ElemArray
88+ , testProperty "SomeType2ElemArray unary agree" $
89+ gSomeTypeToEncoding2ElemArray `sameAs1Agree` gSomeTypeLiftToEncoding2ElemArray
90+
91+ , testProperty "SomeTypeTaggedObject" $
92+ gSomeTypeToJSONTaggedObject `sameAs` gSomeTypeToEncodingTaggedObject
93+ , testProperty "SomeTypeTaggedObject unary" $
94+ gSomeTypeLiftToJSONTaggedObject `sameAs1` gSomeTypeLiftToEncodingTaggedObject
95+ , testProperty "SomeTypeTaggedObject unary agree" $
96+ gSomeTypeToEncodingTaggedObject `sameAs1Agree` gSomeTypeLiftToEncodingTaggedObject
97+
98+ , testProperty "SomeTypeObjectWithSingleField" $
99+ gSomeTypeToJSONObjectWithSingleField `sameAs` gSomeTypeToEncodingObjectWithSingleField
100+ , testProperty "SomeTypeObjectWithSingleField unary" $
101+ gSomeTypeLiftToJSONObjectWithSingleField `sameAs1` gSomeTypeLiftToEncodingObjectWithSingleField
102+ , testProperty "SomeTypeObjectWithSingleField unary agree" $
103+ gSomeTypeToEncodingObjectWithSingleField `sameAs1Agree` gSomeTypeLiftToEncodingObjectWithSingleField
104+
105+ , testProperty "SomeTypeOmitNothingFields" $
106+ gSomeTypeToJSONOmitNothingFields `sameAs` gSomeTypeToEncodingOmitNothingFields
107+
108+ , testProperty "OneConstructorDefault" $
109+ gOneConstructorToJSONDefault `sameAs` gOneConstructorToEncodingDefault
110+ , testProperty "OneConstructorTagged" $
111+ gOneConstructorToJSONTagged `sameAs` gOneConstructorToEncodingTagged
112+
113+ , testProperty "OptionField" $
114+ gOptionFieldToJSON `sameAs` gOptionFieldToEncoding
115+ ]
116+ ]
tests/PropertyKeys.hsnew file+40
@@ -0,0 +1,40 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
3+module PropertyKeys ( keysTests ) where
4+
5+import Prelude.Compat
6+
7+import Data.Time (Day, LocalTime, TimeOfDay, UTCTime)
8+import Data.Version (Version)
9+import Instances ()
10+import Numeric.Natural (Natural)
11+import Test.Tasty (TestTree, testGroup)
12+import Test.Tasty.QuickCheck (testProperty)
13+import Types
14+import qualified Data.Text as T
15+import qualified Data.Text.Lazy as LT
16+import qualified Data.UUID.Types as UUID
17+import PropUtils
18+
19+
20+keysTests :: TestTree
21+keysTests =
22+ testGroup "roundTrip Key"
23+ [ testProperty "Bool" $ roundTripKey True
24+ , testProperty "Text" $ roundTripKey (undefined :: T.Text)
25+ , testProperty "String" $ roundTripKey (undefined :: String)
26+ , testProperty "Int" $ roundTripKey (undefined :: Int)
27+ , testProperty "[Text]" $ roundTripKey (undefined :: LogScaled [T.Text])
28+ , testProperty "(Int,Char)" $ roundTripKey (undefined :: (Int,Char))
29+ , testProperty "Integer" $ roundTripKey (undefined :: Integer)
30+ , testProperty "Natural" $ roundTripKey (undefined :: Natural)
31+ , testProperty "Float" $ roundTripKey (undefined :: Float)
32+ , testProperty "Double" $ roundTripKey (undefined :: Double)
33+ , testProperty "Day" $ roundTripKey (undefined :: Day)
34+ , testProperty "LocalTime" $ roundTripKey (undefined :: LocalTime)
35+ , testProperty "TimeOfDay" $ roundTripKey (undefined :: TimeOfDay)
36+ , testProperty "UTCTime" $ roundTripKey (undefined :: UTCTime)
37+ , testProperty "Version" $ roundTripKey (undefined :: Version)
38+ , testProperty "Lazy Text" $ roundTripKey (undefined :: LT.Text)
39+ , testProperty "UUID" $ roundTripKey UUID.nil
40+ ]
tests/PropertyRTFunctors.hsnew file+51
@@ -0,0 +1,51 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
3+module PropertyRTFunctors ( roundTripFunctorsTests ) where
4+
5+import Prelude.Compat
6+
7+import Data.Functor.Compose (Compose (..))
8+import Instances ()
9+import Test.Tasty (TestTree, testGroup)
10+import Test.Tasty.QuickCheck (testProperty)
11+import Types
12+import PropUtils
13+
14+
15+roundTripFunctorsTests :: TestTree
16+roundTripFunctorsTests =
17+ testGroup "functors"
18+ [ testProperty "Identity Char" $ roundTripEq (undefined :: I Int)
19+
20+ , testProperty "Identity Char" $ roundTripEq (undefined :: I Char)
21+ , testProperty "Identity [Char]" $ roundTripEq (undefined :: I String)
22+ , testProperty "[Identity Char]" $ roundTripEq (undefined :: [I Char])
23+
24+ , testProperty "Compose I I Int" $ roundTripEq (undefined :: LogScaled (Compose I I Int))
25+ , testProperty "Compose [] I Int" $ roundTripEq (undefined :: LogScaled (Compose [] I Int))
26+ , testProperty "Compose I [] Int" $ roundTripEq (undefined :: LogScaled (Compose I [] Int))
27+ , testProperty "Compose [] [] Int" $ roundTripEq (undefined :: LogScaled (Compose [] [] Int))
28+
29+ , testProperty "Compose I I Char" $ roundTripEq (undefined :: LogScaled (Compose I I Char))
30+ , testProperty "Compose [] I Char" $ roundTripEq (undefined :: LogScaled (Compose [] I Char))
31+ , testProperty "Compose I [] Char" $ roundTripEq (undefined :: LogScaled (Compose I [] Char))
32+ , testProperty "Compose [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose [] [] Char))
33+
34+ , testProperty "Compose3 I I I Char" $ roundTripEq (undefined :: LogScaled (Compose3 I I I Char))
35+ , testProperty "Compose3 I [] I Char" $ roundTripEq (undefined :: LogScaled (Compose3 I [] I Char))
36+ , testProperty "Compose3 I I [] Char" $ roundTripEq (undefined :: LogScaled (Compose3 I I [] Char))
37+ , testProperty "Compose3 I [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose3 I [] [] Char))
38+ , testProperty "Compose3 [] I I Char" $ roundTripEq (undefined :: LogScaled (Compose3 [] I I Char))
39+ , testProperty "Compose3 [] [] I Char" $ roundTripEq (undefined :: LogScaled (Compose3 [] [] I Char))
40+ , testProperty "Compose3 [] I [] Char" $ roundTripEq (undefined :: LogScaled (Compose3 [] I [] Char))
41+ , testProperty "Compose3 [] [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose3 [] [] [] Char))
42+
43+ , testProperty "Compose3' I I I Char" $ roundTripEq (undefined :: LogScaled (Compose3' I I I Char))
44+ , testProperty "Compose3' I [] I Char" $ roundTripEq (undefined :: LogScaled (Compose3' I [] I Char))
45+ , testProperty "Compose3' I I [] Char" $ roundTripEq (undefined :: LogScaled (Compose3' I I [] Char))
46+ , testProperty "Compose3' I [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose3' I [] [] Char))
47+ , testProperty "Compose3' [] I I Char" $ roundTripEq (undefined :: LogScaled (Compose3' [] I I Char))
48+ , testProperty "Compose3' [] [] I Char" $ roundTripEq (undefined :: LogScaled (Compose3' [] [] I Char))
49+ , testProperty "Compose3' [] I [] Char" $ roundTripEq (undefined :: LogScaled (Compose3' [] I [] Char))
50+ , testProperty "Compose3' [] [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose3' [] [] [] Char))
51+ ]
tests/PropertyRoundTrip.hsnew file+74
@@ -0,0 +1,74 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
3+module PropertyRoundTrip ( roundTripTests ) where
4+
5+import Prelude.Compat
6+
7+import Control.Applicative (Const)
8+import Data.Aeson.Types
9+import Data.DList (DList)
10+import Data.List.NonEmpty (NonEmpty)
11+import Data.Proxy (Proxy)
12+import Data.Ratio (Ratio)
13+import Data.Sequence (Seq)
14+import Data.Tagged (Tagged)
15+import Data.Time (Day, DiffTime, LocalTime, NominalDiffTime, TimeOfDay, UTCTime, ZonedTime)
16+import Data.Version (Version)
17+import Data.Time.Calendar.Compat (CalendarDiffDays, DayOfWeek)
18+import Data.Time.LocalTime.Compat (CalendarDiffTime)
19+import Data.Time.Clock.System.Compat (SystemTime)
20+import Instances ()
21+import Numeric.Natural (Natural)
22+import Test.Tasty (TestTree, testGroup)
23+import Test.Tasty.QuickCheck (testProperty)
24+import Types
25+import qualified Data.Text as T
26+import qualified Data.Text.Lazy as LT
27+import qualified Data.UUID.Types as UUID
28+import PropUtils
29+import PropertyRTFunctors
30+
31+
32+roundTripTests :: TestTree
33+roundTripTests =
34+ testGroup "roundTrip" [
35+ testProperty "Bool" $ roundTripEq True
36+ , testProperty "Double" $ roundTripEq (1 :: Approx Double)
37+ , testProperty "Int" $ roundTripEq (1 :: Int)
38+ , testProperty "NonEmpty Char" $ roundTripEq (undefined :: NonEmpty Char)
39+ , testProperty "Integer" $ roundTripEq (1 :: Integer)
40+ , testProperty "String" $ roundTripEq ("" :: String)
41+ , testProperty "Text" $ roundTripEq T.empty
42+ , testProperty "Lazy Text" $ roundTripEq LT.empty
43+ , testProperty "Foo" $ roundTripEq (undefined :: Foo)
44+ , testProperty "Day" $ roundTripEq (undefined :: Day)
45+ , testProperty "BCE Day" $ roundTripEq (undefined :: BCEDay)
46+ , testProperty "DotNetTime" $ roundTripEq (undefined :: Approx DotNetTime)
47+ , testProperty "LocalTime" $ roundTripEq (undefined :: LocalTime)
48+ , testProperty "TimeOfDay" $ roundTripEq (undefined :: TimeOfDay)
49+ , testProperty "UTCTime" $ roundTripEq (undefined :: UTCTime)
50+ , testProperty "ZonedTime" $ roundTripEq (undefined :: ZonedTime)
51+ , testProperty "NominalDiffTime" $ roundTripEq (undefined :: NominalDiffTime)
52+ , testProperty "DiffTime" $ roundTripEq (undefined :: DiffTime)
53+ , testProperty "DayOfWeek" $ roundTripEq (undefined :: DayOfWeek)
54+ , testProperty "SystemTime" $ roundTripEq (undefined :: SystemTime)
55+ , testProperty "CalendarDiffTime" $ roundTripEq (undefined :: CalendarDiffTime)
56+ , testProperty "CalendarDiffDays" $ roundTripEq (undefined :: CalendarDiffDays)
57+ , testProperty "Version" $ roundTripEq (undefined :: Version)
58+ , testProperty "Natural" $ roundTripEq (undefined :: Natural)
59+ , testProperty "Proxy" $ roundTripEq (undefined :: Proxy Int)
60+ , testProperty "Tagged" $ roundTripEq (undefined :: Tagged Int Char)
61+ , testProperty "Const" $ roundTripEq (undefined :: Const Int Char)
62+ , testProperty "DList" $ roundTripEq (undefined :: DList Int)
63+ , testProperty "Seq" $ roundTripEq (undefined :: Seq Int)
64+ , testProperty "Rational" $ roundTripEq (undefined :: Rational)
65+ , testProperty "Ratio Int" $ roundTripEq (undefined :: Ratio Int)
66+ , testProperty "UUID" $ roundTripEq UUID.nil
67+ , roundTripFunctorsTests
68+ , testGroup "ghcGenerics" [
69+ testProperty "OneConstructor" $ roundTripEq OneConstructor
70+ , testProperty "Product2" $ roundTripEq (undefined :: Product2 Int Bool)
71+ , testProperty "Product6" $ roundTripEq (undefined :: P6)
72+ , testProperty "Sum4" $ roundTripEq (undefined :: S4)
73+ ]
74+ ]
tests/PropertyTH.hsnew file+130
@@ -0,0 +1,130 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
3+module PropertyTH ( templateHaskellTests ) where
4+
5+import Prelude.Compat
6+
7+import Data.Semigroup (Option(..))
8+import Encoders
9+import Instances ()
10+import Test.Tasty (TestTree, testGroup)
11+import Test.Tasty.QuickCheck (testProperty)
12+import Test.QuickCheck ( (===) )
13+import Types
14+import PropUtils
15+
16+
17+templateHaskellTests :: TestTree
18+templateHaskellTests =
19+ testGroup "template-haskell" [
20+ testGroup "toJSON" [
21+ testGroup "Nullary" [
22+ testProperty "string" (isString . thNullaryToJSONString)
23+ , testProperty "2ElemArray" (is2ElemArray . thNullaryToJSON2ElemArray)
24+ , testProperty "TaggedObject" (isNullaryTaggedObject . thNullaryToJSONTaggedObject)
25+ , testProperty "ObjectWithSingleField" (isObjectWithSingleField . thNullaryToJSONObjectWithSingleField)
26+
27+ , testGroup "roundTrip" [
28+ testProperty "string" (toParseJSON thNullaryParseJSONString thNullaryToJSONString)
29+ , testProperty "2ElemArray" (toParseJSON thNullaryParseJSON2ElemArray thNullaryToJSON2ElemArray)
30+ , testProperty "TaggedObject" (toParseJSON thNullaryParseJSONTaggedObject thNullaryToJSONTaggedObject)
31+ , testProperty "ObjectWithSingleField" (toParseJSON thNullaryParseJSONObjectWithSingleField thNullaryToJSONObjectWithSingleField)
32+ ]
33+ ]
34+ , testGroup "EitherTextInt" [
35+ testProperty "UntaggedValue" (isUntaggedValueETI . thEitherTextIntToJSONUntaggedValue)
36+ , testProperty "roundtrip" (toParseJSON thEitherTextIntParseJSONUntaggedValue thEitherTextIntToJSONUntaggedValue)
37+ ]
38+ , testGroup "SomeType" [
39+ testProperty "2ElemArray" (is2ElemArray . thSomeTypeToJSON2ElemArray)
40+ , testProperty "TaggedObject" (isTaggedObject . thSomeTypeToJSONTaggedObject)
41+ , testProperty "ObjectWithSingleField" (isObjectWithSingleField . thSomeTypeToJSONObjectWithSingleField)
42+ , testGroup "roundTrip" [
43+ testProperty "2ElemArray" (toParseJSON thSomeTypeParseJSON2ElemArray thSomeTypeToJSON2ElemArray)
44+ , testProperty "TaggedObject" (toParseJSON thSomeTypeParseJSONTaggedObject thSomeTypeToJSONTaggedObject)
45+ , testProperty "ObjectWithSingleField" (toParseJSON thSomeTypeParseJSONObjectWithSingleField thSomeTypeToJSONObjectWithSingleField)
46+
47+ , testProperty "2ElemArray unary" (toParseJSON1 thSomeTypeLiftParseJSON2ElemArray thSomeTypeLiftToJSON2ElemArray)
48+ , testProperty "TaggedObject unary" (toParseJSON1 thSomeTypeLiftParseJSONTaggedObject thSomeTypeLiftToJSONTaggedObject)
49+ , testProperty "ObjectWithSingleField unary" (toParseJSON1 thSomeTypeLiftParseJSONObjectWithSingleField thSomeTypeLiftToJSONObjectWithSingleField)
50+
51+ ]
52+ ]
53+ , testGroup "Approx" [
54+ testProperty "string" (isString . thApproxToJSONUnwrap)
55+ , testProperty "ObjectWithSingleField" (isObjectWithSingleField . thApproxToJSONDefault)
56+ , testGroup "roundTrip" [
57+ testProperty "string" (toParseJSON thApproxParseJSONUnwrap thApproxToJSONUnwrap)
58+ , testProperty "ObjectWithSingleField" (toParseJSON thApproxParseJSONDefault thApproxToJSONDefault)
59+ ]
60+ ]
61+ , testGroup "GADT" [
62+ testProperty "string" (isString . thGADTToJSONUnwrap)
63+ , testProperty "ObjectWithSingleField" (isObjectWithSingleField . thGADTToJSONDefault)
64+ , testGroup "roundTrip" [
65+ testProperty "string" (toParseJSON thGADTParseJSONUnwrap thGADTToJSONUnwrap)
66+ , testProperty "ObjectWithSingleField" (toParseJSON thGADTParseJSONDefault thGADTToJSONDefault)
67+ ]
68+ ]
69+ , testGroup "OneConstructor" [
70+ testProperty "default" (isEmptyArray . thOneConstructorToJSONDefault)
71+ , testProperty "Tagged" (isTaggedObject . thOneConstructorToJSONTagged)
72+ , testGroup "roundTrip" [
73+ testProperty "default" (toParseJSON thOneConstructorParseJSONDefault thOneConstructorToJSONDefault)
74+ , testProperty "Tagged" (toParseJSON thOneConstructorParseJSONTagged thOneConstructorToJSONTagged)
75+ ]
76+ ]
77+ , testGroup "OptionField" [
78+ testProperty "like Maybe" $
79+ \x -> thOptionFieldToJSON (OptionField (Option x)) === thMaybeFieldToJSON (MaybeField x)
80+ , testProperty "roundTrip" (toParseJSON thOptionFieldParseJSON thOptionFieldToJSON)
81+ ]
82+ ]
83+ , testGroup "toEncoding" [
84+ testProperty "NullaryString" $
85+ thNullaryToJSONString `sameAs` thNullaryToEncodingString
86+ , testProperty "Nullary2ElemArray" $
87+ thNullaryToJSON2ElemArray `sameAs` thNullaryToEncoding2ElemArray
88+ , testProperty "NullaryTaggedObject" $
89+ thNullaryToJSONTaggedObject `sameAs` thNullaryToEncodingTaggedObject
90+ , testProperty "NullaryObjectWithSingleField" $
91+ thNullaryToJSONObjectWithSingleField `sameAs`
92+ thNullaryToEncodingObjectWithSingleField
93+ , testProperty "ApproxUnwrap" $
94+ thApproxToJSONUnwrap `sameAs` thApproxToEncodingUnwrap
95+ , testProperty "ApproxDefault" $
96+ thApproxToJSONDefault `sameAs` thApproxToEncodingDefault
97+
98+ , testProperty "EitherTextInt UntaggedValue" $
99+ thEitherTextIntToJSONUntaggedValue `sameAs` thEitherTextIntToEncodingUntaggedValue
100+
101+ , testProperty "SomeType2ElemArray" $
102+ thSomeTypeToJSON2ElemArray `sameAs` thSomeTypeToEncoding2ElemArray
103+ , testProperty "SomeType2ElemArray unary" $
104+ thSomeTypeLiftToJSON2ElemArray `sameAs1` thSomeTypeLiftToEncoding2ElemArray
105+ , testProperty "SomeType2ElemArray unary agree" $
106+ thSomeTypeToEncoding2ElemArray `sameAs1Agree` thSomeTypeLiftToEncoding2ElemArray
107+
108+ , testProperty "SomeTypeTaggedObject" $
109+ thSomeTypeToJSONTaggedObject `sameAs` thSomeTypeToEncodingTaggedObject
110+ , testProperty "SomeTypeTaggedObject unary" $
111+ thSomeTypeLiftToJSONTaggedObject `sameAs1` thSomeTypeLiftToEncodingTaggedObject
112+ , testProperty "SomeTypeTaggedObject unary agree" $
113+ thSomeTypeToEncodingTaggedObject `sameAs1Agree` thSomeTypeLiftToEncodingTaggedObject
114+
115+ , testProperty "SomeTypeObjectWithSingleField" $
116+ thSomeTypeToJSONObjectWithSingleField `sameAs` thSomeTypeToEncodingObjectWithSingleField
117+ , testProperty "SomeTypeObjectWithSingleField unary" $
118+ thSomeTypeLiftToJSONObjectWithSingleField `sameAs1` thSomeTypeLiftToEncodingObjectWithSingleField
119+ , testProperty "SomeTypeObjectWithSingleField unary agree" $
120+ thSomeTypeToEncodingObjectWithSingleField `sameAs1Agree` thSomeTypeLiftToEncodingObjectWithSingleField
121+
122+ , testProperty "OneConstructorDefault" $
123+ thOneConstructorToJSONDefault `sameAs` thOneConstructorToEncodingDefault
124+ , testProperty "OneConstructorTagged" $
125+ thOneConstructorToJSONTagged `sameAs` thOneConstructorToEncodingTagged
126+
127+ , testProperty "OptionField" $
128+ thOptionFieldToJSON `sameAs` thOptionFieldToEncoding
129+ ]
130+ ]
tests/SerializationFormatSpec.hs+183−134
@@ -1,10 +1,9 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2{-# LANGUAGE DeriveGeneric #-}
2{-# LANGUAGE DeriveGeneric #-}
3{-# LANGUAGE GADTs #-}
3{-# LANGUAGE GADTs #-}
4+{-# LANGUAGE NoImplicitPrelude #-}
4{-# LANGUAGE OverloadedStrings #-}
5{-# LANGUAGE OverloadedStrings #-}
5−#if __GLASGOW_HASKELL__ >= 708
6{-# LANGUAGE DataKinds #-}
6{-# LANGUAGE DataKinds #-}
7−#endif
8
7
9------------------------------------------------------------------------------
8------------------------------------------------------------------------------
10-- These tests assert that the JSON serialization doesn't change by accident.
9-- These tests assert that the JSON serialization doesn't change by accident.
@@ -15,13 +14,13 @@ module SerializationFormatSpec
15 tests
14 tests
16 ) where
15 ) where
17
16
18−import Prelude ()
19import Prelude.Compat
17import Prelude.Compat
20
18
21import Control.Applicative (Const(..))
19import Control.Applicative (Const(..))
22import Data.Aeson (FromJSON(..), decode, encode, genericParseJSON, genericToEncoding, genericToJSON)
20import Data.Aeson (FromJSON(..), decode, encode, genericParseJSON, genericToEncoding, genericToJSON)
23import Data.Aeson.Types (Options(..), SumEncoding(..), ToJSON(..), defaultOptions)
21import Data.Aeson.Types (Options(..), SumEncoding(..), ToJSON(..), defaultOptions)
24import Data.Fixed (Pico)
22import Data.Fixed (Pico)
23+import Data.Foldable (for_, toList)
25import Data.Functor.Compose (Compose(..))
24import Data.Functor.Compose (Compose(..))
26import Data.Functor.Identity (Identity(..))
25import Data.Functor.Identity (Identity(..))
27import Data.Functor.Product (Product(..))
26import Data.Functor.Product (Product(..))
@@ -31,12 +30,14 @@ import Data.Proxy (Proxy(..))
31import Data.Scientific (Scientific)
30import Data.Scientific (Scientific)
32import Data.Tagged (Tagged(..))
31import Data.Tagged (Tagged(..))
33import Data.Time (fromGregorian)
32import Data.Time (fromGregorian)
33+import Data.Time.Calendar.Compat (CalendarDiffDays (..), DayOfWeek (..))
34+import Data.Time.LocalTime.Compat (CalendarDiffTime (..))
35+import Data.Time.Clock.System.Compat (SystemTime (..))
34import Data.Word (Word8)
36import Data.Word (Word8)
35import GHC.Generics (Generic)
37import GHC.Generics (Generic)
36import Instances ()
38import Instances ()
37−import Test.Framework (Test, testGroup)
39+import Test.Tasty (TestTree, testGroup)
38−import Test.Framework.Providers.HUnit (testCase)
39−import Test.HUnit (assertFailure, assertEqual)
40+import Test.Tasty.HUnit (assertFailure, assertEqual, testCase)
40import Types (Approx(..), Compose3, Compose3', I)
41import Types (Approx(..), Compose3, Compose3', I)
41import qualified Data.ByteString.Lazy.Char8 as L
42import qualified Data.ByteString.Lazy.Char8 as L
42import qualified Data.DList as DList
43import qualified Data.DList as DList
@@ -53,7 +54,7 @@ import qualified Data.Tree as Tree
53import qualified Data.UUID.Types as UUID
54import qualified Data.UUID.Types as UUID
54import qualified Data.Vector as Vector
55import qualified Data.Vector as Vector
55
56
56−tests :: [Test]
57+tests :: [TestTree]
57tests =
58tests =
58 [
59 [
59 testGroup "To JSON representation" $ fmap assertJsonEncodingExample jsonEncodingExamples
60 testGroup "To JSON representation" $ fmap assertJsonEncodingExample jsonEncodingExamples
@@ -65,141 +66,165 @@ tests =
65jsonExamples :: [Example]
66jsonExamples :: [Example]
66jsonExamples =
67jsonExamples =
67 [
68 [
68− Example "Either Left" "{\"Left\":1}" (Left 1 :: Either Int Int)
69+ example "Either Left" "{\"Left\":1}" (Left 1 :: Either Int Int)
69− , Example "Either Right" "{\"Right\":1}" (Right 1 :: Either Int Int)
70+ , example "Either Right" "{\"Right\":1}" (Right 1 :: Either Int Int)
70− , Example "Nothing" "null" (Nothing :: Maybe Int)
71+ , example "Nothing" "null" (Nothing :: Maybe Int)
72+ -- Maybe serialising is lossy
73+ -- https://github.com/bos/aeson/issues/376
74+ , Example "Just Nothing" ["null"] (Just Nothing :: Maybe (Maybe Int)) Nothing
71− , Example "Just" "1" (Just 1 :: Maybe Int)
75+ , example "Just" "1" (Just 1 :: Maybe Int)
72− , Example "Proxy Int" "null" (Proxy :: Proxy Int)
76+ , example "Proxy Int" "null" (Proxy :: Proxy Int)
73− , Example "Tagged Char Int" "1" (Tagged 1 :: Tagged Char Int)
77+ , example "Tagged Char Int" "1" (Tagged 1 :: Tagged Char Int)
74−#if __GLASGOW_HASKELL__ >= 708
75 -- Test Tagged instance is polykinded
78 -- Test Tagged instance is polykinded
76− , Example "Tagged 123 Int" "1" (Tagged 1 :: Tagged 123 Int)
79+ , example "Tagged 123 Int" "1" (Tagged 1 :: Tagged 123 Int)
77−#endif
78− , Example "Const Char Int" "\"c\"" (Const 'c' :: Const Char Int)
80+ , example "Const Char Int" "\"c\"" (Const 'c' :: Const Char Int)
79− , Example "Tuple" "[1,2]" ((1, 2) :: (Int, Int))
81+ , example "Tuple" "[1,2]" ((1, 2) :: (Int, Int))
80− , Example "NonEmpty" "[1,2,3]" (1 :| [2, 3] :: NonEmpty Int)
82+ , example "NonEmpty" "[1,2,3]" (1 :| [2, 3] :: NonEmpty Int)
81− , Example "Seq" "[1,2,3]" (Seq.fromList [1, 2, 3] :: Seq.Seq Int)
83+ , example "Seq" "[1,2,3]" (Seq.fromList [1, 2, 3] :: Seq.Seq Int)
82− , Example "DList" "[1,2,3]" (DList.fromList [1, 2, 3] :: DList.DList Int)
84+ , example "DList" "[1,2,3]" (DList.fromList [1, 2, 3] :: DList.DList Int)
83− , Example "()" "[]" ()
85+ , example "()" "[]" ()
84−
86+
87+ , ndExample "HashMap Int Int"
88+ [ "{\"0\":1,\"2\":3}", "{\"2\":3,\"0\":1}"]
85− , Example "HashMap Int Int" "{\"0\":1,\"2\":3}" (HM.fromList [(0,1),(2,3)] :: HM.HashMap Int Int)
89+ (HM.fromList [(0,1),(2,3)] :: HM.HashMap Int Int)
90+ , ndExample "Map Int Int"
91+ [ "{\"0\":1,\"2\":3}", "{\"2\":3,\"0\":1}"]
86− , Example "Map Int Int" "{\"0\":1,\"2\":3}" (M.fromList [(0,1),(2,3)] :: M.Map Int Int)
92+ (M.fromList [(0,1),(2,3)] :: M.Map Int Int)
93+ , ndExample "Map (Tagged Int Int) Int"
94+ [ "{\"0\":1,\"2\":3}", "{\"2\":3,\"0\":1}"]
87− , Example "Map (Tagged Int Int) Int" "{\"0\":1,\"2\":3}" (M.fromList [(Tagged 0,1),(Tagged 2,3)] :: M.Map (Tagged Int Int) Int)
95+ (M.fromList [(Tagged 0,1),(Tagged 2,3)] :: M.Map (Tagged Int Int) Int)
96+ , example "Map [Int] Int"
97+ "[[[0],1],[[2],3]]"
88− , Example "Map [Int] Int" "[[[0],1],[[2],3]]" (M.fromList [([0],1),([2],3)] :: M.Map [Int] Int)
98+ (M.fromList [([0],1),([2],3)] :: M.Map [Int] Int)
99+ , ndExample "Map [Char] Int"
100+ [ "{\"ab\":1,\"cd\":3}", "{\"cd\":3,\"ab\":1}" ]
89− , Example "Map [Char] Int" "{\"ab\":1,\"cd\":3}" (M.fromList [("ab",1),("cd",3)] :: M.Map [Char] Int)
101+ (M.fromList [("ab",1),("cd",3)] :: M.Map String Int)
102+ , ndExample "Map [I Char] Int"
103+ [ "{\"ab\":1,\"cd\":3}", "{\"cd\":3,\"ab\":1}" ]
90− , Example "Map [I Char] Int" "{\"ab\":1,\"cd\":3}" (M.fromList [(map pure "ab",1),(map pure "cd",3)] :: M.Map [I Char] Int)
104+ (M.fromList [(map pure "ab",1),(map pure "cd",3)] :: M.Map [I Char] Int)
91−
105+
92− , Example "nan :: Double" "null" (Approx $ 0/0 :: Approx Double)
106+ , example "nan :: Double" "null" (Approx $ 0/0 :: Approx Double)
93−
107+
94− , Example "Ordering LT" "\"LT\"" LT
108+ , example "Ordering LT" "\"LT\"" LT
95− , Example "Ordering EQ" "\"EQ\"" EQ
109+ , example "Ordering EQ" "\"EQ\"" EQ
96− , Example "Ordering GT" "\"GT\"" GT
110+ , example "Ordering GT" "\"GT\"" GT
97−
111+
98− , Example "Float" "3.14" (3.14 :: Float)
112+ , example "Float" "3.14" (3.14 :: Float)
99− , Example "Pico" "3.14" (3.14 :: Pico)
113+ , example "Pico" "3.14" (3.14 :: Pico)
100− , Example "Scientific" "3.14" (3.14 :: Scientific)
114+ , example "Scientific" "3.14" (3.14 :: Scientific)
101−
115+
102− , Example "UUID" "\"c2cc10e1-57d6-4b6f-9899-38d972112d8c\"" $ UUID.fromWords
116+ , example "UUID" "\"c2cc10e1-57d6-4b6f-9899-38d972112d8c\"" $ UUID.fromWords
103 0xc2cc10e1 0x57d64b6f 0x989938d9 0x72112d8c
117 0xc2cc10e1 0x57d64b6f 0x989938d9 0x72112d8c
104
118
105− , Example "Set Int" "[1,2,3]" (Set.fromList [3, 2, 1] :: Set.Set Int)
119+ , example "Set Int" "[1,2,3]" (Set.fromList [3, 2, 1] :: Set.Set Int)
106− , Example "IntSet" "[1,2,3]" (IntSet.fromList [3, 2, 1])
120+ , example "IntSet" "[1,2,3]" (IntSet.fromList [3, 2, 1])
107− , Example "IntMap" "[[1,2],[3,4]]" (IntMap.fromList [(3,4), (1,2)] :: IntMap.IntMap Int)
121+ , example "IntMap" "[[1,2],[3,4]]" (IntMap.fromList [(3,4), (1,2)] :: IntMap.IntMap Int)
108− , Example "Vector" "[1,2,3]" (Vector.fromList [1, 2, 3] :: Vector.Vector Int)
122+ , example "Vector" "[1,2,3]" (Vector.fromList [1, 2, 3] :: Vector.Vector Int)
109− , Example "HashSet Int" "[1,2,3]" (HashSet.fromList [3, 2, 1] :: HashSet.HashSet Int)
123+ , example "HashSet Int" "[1,2,3]" (HashSet.fromList [3, 2, 1] :: HashSet.HashSet Int)
110− , Example "Tree Int" "[1,[[2,[[3,[]],[4,[]]]],[5,[]]]]" (let n = Tree.Node in n 1 [n 2 [n 3 [], n 4 []], n 5 []] :: Tree.Tree Int)
124+ , example "Tree Int" "[1,[[2,[[3,[]],[4,[]]]],[5,[]]]]" (let n = Tree.Node in n 1 [n 2 [n 3 [], n 4 []], n 5 []] :: Tree.Tree Int)
111
125
112 -- Three separate cases, as ordering in HashMap is not defined
126 -- Three separate cases, as ordering in HashMap is not defined
113− , Example "HashMap Float Int, NaN" "{\"NaN\":1}" (Approx $ HM.singleton (0/0) 1 :: Approx (HM.HashMap Float Int))
127+ , example "HashMap Float Int, NaN" "{\"NaN\":1}" (Approx $ HM.singleton (0/0) 1 :: Approx (HM.HashMap Float Int))
114− , Example "HashMap Float Int, Infinity" "{\"Infinity\":1}" (HM.singleton (1/0) 1 :: HM.HashMap Float Int)
128+ , example "HashMap Float Int, Infinity" "{\"Infinity\":1}" (HM.singleton (1/0) 1 :: HM.HashMap Float Int)
115− , Example "HashMap Float Int, +Infinity" "{\"-Infinity\":1}" (HM.singleton (negate 1/0) 1 :: HM.HashMap Float Int)
129+ , example "HashMap Float Int, +Infinity" "{\"-Infinity\":1}" (HM.singleton (negate 1/0) 1 :: HM.HashMap Float Int)
116
130
117 -- Functors
131 -- Functors
118− , Example "Identity Int" "1" (pure 1 :: Identity Int)
132+ , example "Identity Int" "1" (pure 1 :: Identity Int)
119−
133+
120− , Example "Identity Char" "\"x\"" (pure 'x' :: Identity Char)
134+ , example "Identity Char" "\"x\"" (pure 'x' :: Identity Char)
121− , Example "Identity String" "\"foo\"" (pure "foo" :: Identity String)
135+ , example "Identity String" "\"foo\"" (pure "foo" :: Identity String)
122− , Example "[Identity Char]" "\"xy\"" ([pure 'x', pure 'y'] :: [Identity Char])
136+ , example "[Identity Char]" "\"xy\"" ([pure 'x', pure 'y'] :: [Identity Char])
123−
137+
124− , Example "Maybe Char" "\"x\"" (pure 'x' :: Maybe Char)
138+ , example "Maybe Char" "\"x\"" (pure 'x' :: Maybe Char)
125− , Example "Maybe String" "\"foo\"" (pure "foo" :: Maybe String)
139+ , example "Maybe String" "\"foo\"" (pure "foo" :: Maybe String)
126− , Example "Maybe [Identity Char]" "\"xy\"" (pure [pure 'x', pure 'y'] :: Maybe [Identity Char])
140+ , example "Maybe [Identity Char]" "\"xy\"" (pure [pure 'x', pure 'y'] :: Maybe [Identity Char])
127−
141+
128− , Example "Day; year >= 1000" "\"1999-10-12\"" (fromGregorian 1999 10 12)
142+ , example "Day; year >= 1000" "\"1999-10-12\"" (fromGregorian 1999 10 12)
129− , Example "Day; year > 0 && < 1000" "\"0500-03-04\"" (fromGregorian 500 3 4)
143+ , example "Day; year > 0 && < 1000" "\"0500-03-04\"" (fromGregorian 500 3 4)
130− , Example "Day; year == 0" "\"0000-02-20\"" (fromGregorian 0 2 20)
144+ , example "Day; year == 0" "\"0000-02-20\"" (fromGregorian 0 2 20)
131− , Example "Day; year < 0" "\"-0234-01-01\"" (fromGregorian (-234) 1 1)
145+ , example "Day; year < 0" "\"-0234-01-01\"" (fromGregorian (-234) 1 1)
132− , Example "Day; year < -1000" "\"-1234-01-01\"" (fromGregorian (-1234) 1 1)
146+ , example "Day; year < -1000" "\"-1234-01-01\"" (fromGregorian (-1234) 1 1)
133−
147+
134− , Example "Product I Maybe Int" "[1,2]" (Pair (pure 1) (pure 2) :: Product I Maybe Int)
148+ , example "Product I Maybe Int" "[1,2]" (Pair (pure 1) (pure 2) :: Product I Maybe Int)
135− , Example "Product I Maybe Int" "[1,null]" (Pair (pure 1) Nothing :: Product I Maybe Int)
149+ , example "Product I Maybe Int" "[1,null]" (Pair (pure 1) Nothing :: Product I Maybe Int)
136− , Example "Product I [] Char" "[\"a\",\"foo\"]" (Pair (pure 'a') "foo" :: Product I [] Char)
150+ , example "Product I [] Char" "[\"a\",\"foo\"]" (Pair (pure 'a') "foo" :: Product I [] Char)
137−
151+
138− , Example "Sum I [] Int: InL" "{\"InL\":1}" (InL (pure 1) :: Sum I [] Int)
152+ , example "Sum I [] Int: InL" "{\"InL\":1}" (InL (pure 1) :: Sum I [] Int)
139− , Example "Sum I [] Int: InR" "{\"InR\":[1,2]}" (InR [1, 2] :: Sum I [] Int)
153+ , example "Sum I [] Int: InR" "{\"InR\":[1,2]}" (InR [1, 2] :: Sum I [] Int)
140− , Example "Sum I [] Char: InR" "{\"InR\":\"foo\"}" (InR "foo" :: Sum I [] Char)
154+ , example "Sum I [] Char: InR" "{\"InR\":\"foo\"}" (InR "foo" :: Sum I [] Char)
141−
155+
142− , Example "Compose I I Int" "1" (pure 1 :: Compose I I Int)
156+ , example "Compose I I Int" "1" (pure 1 :: Compose I I Int)
143− , Example "Compose I [] Int" "[1]" (pure 1 :: Compose I [] Int)
157+ , example "Compose I [] Int" "[1]" (pure 1 :: Compose I [] Int)
144− , Example "Compose [] I Int" "[1]" (pure 1 :: Compose [] I Int)
158+ , example "Compose [] I Int" "[1]" (pure 1 :: Compose [] I Int)
145− , Example "Compose [] [] Int" "[[1]]" (pure 1 :: Compose [] [] Int)
159+ , example "Compose [] [] Int" "[[1]]" (pure 1 :: Compose [] [] Int)
146−
160+
147− , Example "Compose I I Char" "\"x\"" (pure 'x' :: Compose I I Char)
161+ , example "Compose I I Char" "\"x\"" (pure 'x' :: Compose I I Char)
148− , Example "Compose I [] Char" "\"x\"" (pure 'x' :: Compose I [] Char)
162+ , example "Compose I [] Char" "\"x\"" (pure 'x' :: Compose I [] Char)
149− , Example "Compose [] I Char" "\"x\"" (pure 'x' :: Compose [] I Char)
163+ , example "Compose [] I Char" "\"x\"" (pure 'x' :: Compose [] I Char)
150− , Example "Compose [] [] Char" "[\"x\"]" (pure 'x' :: Compose [] [] Char)
164+ , example "Compose [] [] Char" "[\"x\"]" (pure 'x' :: Compose [] [] Char)
151−
165+
152− , Example "Compose3 I I I Char" "\"x\"" (pure 'x' :: Compose3 I I I Char)
166+ , example "Compose3 I I I Char" "\"x\"" (pure 'x' :: Compose3 I I I Char)
153− , Example "Compose3 I I [] Char" "\"x\"" (pure 'x' :: Compose3 I I [] Char)
167+ , example "Compose3 I I [] Char" "\"x\"" (pure 'x' :: Compose3 I I [] Char)
154− , Example "Compose3 I [] I Char" "\"x\"" (pure 'x' :: Compose3 I [] I Char)
168+ , example "Compose3 I [] I Char" "\"x\"" (pure 'x' :: Compose3 I [] I Char)
155− , Example "Compose3 I [] [] Char" "[\"x\"]" (pure 'x' :: Compose3 I [] [] Char)
169+ , example "Compose3 I [] [] Char" "[\"x\"]" (pure 'x' :: Compose3 I [] [] Char)
156− , Example "Compose3 [] I I Char" "\"x\"" (pure 'x' :: Compose3 [] I I Char)
170+ , example "Compose3 [] I I Char" "\"x\"" (pure 'x' :: Compose3 [] I I Char)
157− , Example "Compose3 [] I [] Char" "[\"x\"]" (pure 'x' :: Compose3 [] I [] Char)
171+ , example "Compose3 [] I [] Char" "[\"x\"]" (pure 'x' :: Compose3 [] I [] Char)
158− , Example "Compose3 [] [] I Char" "[\"x\"]" (pure 'x' :: Compose3 [] [] I Char)
172+ , example "Compose3 [] [] I Char" "[\"x\"]" (pure 'x' :: Compose3 [] [] I Char)
159− , Example "Compose3 [] [] [] Char" "[[\"x\"]]" (pure 'x' :: Compose3 [] [] [] Char)
173+ , example "Compose3 [] [] [] Char" "[[\"x\"]]" (pure 'x' :: Compose3 [] [] [] Char)
160−
174+
161− , Example "Compose3' I I I Char" "\"x\"" (pure 'x' :: Compose3' I I I Char)
175+ , example "Compose3' I I I Char" "\"x\"" (pure 'x' :: Compose3' I I I Char)
162− , Example "Compose3' I I [] Char" "\"x\"" (pure 'x' :: Compose3' I I [] Char)
176+ , example "Compose3' I I [] Char" "\"x\"" (pure 'x' :: Compose3' I I [] Char)
163− , Example "Compose3' I [] I Char" "\"x\"" (pure 'x' :: Compose3' I [] I Char)
177+ , example "Compose3' I [] I Char" "\"x\"" (pure 'x' :: Compose3' I [] I Char)
164− , Example "Compose3' I [] [] Char" "[\"x\"]" (pure 'x' :: Compose3' I [] [] Char)
178+ , example "Compose3' I [] [] Char" "[\"x\"]" (pure 'x' :: Compose3' I [] [] Char)
165− , Example "Compose3' [] I I Char" "\"x\"" (pure 'x' :: Compose3' [] I I Char)
179+ , example "Compose3' [] I I Char" "\"x\"" (pure 'x' :: Compose3' [] I I Char)
166− , Example "Compose3' [] I [] Char" "[\"x\"]" (pure 'x' :: Compose3' [] I [] Char)
180+ , example "Compose3' [] I [] Char" "[\"x\"]" (pure 'x' :: Compose3' [] I [] Char)
167− , Example "Compose3' [] [] I Char" "[\"x\"]" (pure 'x' :: Compose3' [] [] I Char)
181+ , example "Compose3' [] [] I Char" "[\"x\"]" (pure 'x' :: Compose3' [] [] I Char)
168− , Example "Compose3' [] [] [] Char" "[[\"x\"]]" (pure 'x' :: Compose3' [] [] [] Char)
182+ , example "Compose3' [] [] [] Char" "[[\"x\"]]" (pure 'x' :: Compose3' [] [] [] Char)
169−
183+
170− , Example "MyEither Int String: Left" "42" (MyLeft 42 :: MyEither Int String)
184+ , example "MyEither Int String: Left" "42" (MyLeft 42 :: MyEither Int String)
171− , Example "MyEither Int String: Right" "\"foo\"" (MyRight "foo" :: MyEither Int String)
185+ , example "MyEither Int String: Right" "\"foo\"" (MyRight "foo" :: MyEither Int String)
172
186
173 -- newtypes from Monoid/Semigroup
187 -- newtypes from Monoid/Semigroup
174− , Example "Monoid.Dual Int" "2" (pure 2 :: Monoid.Dual Int)
188+ , example "Monoid.Dual Int" "2" (pure 2 :: Monoid.Dual Int)
175− , Example "Monoid.First Int" "2" (pure 2 :: Monoid.First Int)
189+ , example "Monoid.First Int" "2" (pure 2 :: Monoid.First Int)
176− , Example "Monoid.Last Int" "2" (pure 2 :: Monoid.Last Int)
190+ , example "Monoid.Last Int" "2" (pure 2 :: Monoid.Last Int)
177− , Example "Semigroup.Min Int" "2" (pure 2 :: Semigroup.Min Int)
191+ , example "Semigroup.Min Int" "2" (pure 2 :: Semigroup.Min Int)
178− , Example "Semigroup.Max Int" "2" (pure 2 :: Semigroup.Max Int)
192+ , example "Semigroup.Max Int" "2" (pure 2 :: Semigroup.Max Int)
179− , Example "Semigroup.First Int" "2" (pure 2 :: Semigroup.First Int)
193+ , example "Semigroup.First Int" "2" (pure 2 :: Semigroup.First Int)
180− , Example "Semigroup.Last Int" "2" (pure 2 :: Semigroup.Last Int)
194+ , example "Semigroup.Last Int" "2" (pure 2 :: Semigroup.Last Int)
181− , Example "Semigroup.WrappedMonoid Int" "2" (Semigroup.WrapMonoid 2 :: Semigroup.WrappedMonoid Int)
195+ , example "Semigroup.WrappedMonoid Int" "2" (Semigroup.WrapMonoid 2 :: Semigroup.WrappedMonoid Int)
182− , Example "Semigroup.Option Just" "2" (pure 2 :: Semigroup.Option Int)
196+ , example "Semigroup.Option Just" "2" (pure 2 :: Semigroup.Option Int)
183− , Example "Semigroup.Option Nothing" "null" (Semigroup.Option (Nothing :: Maybe Bool))
197+ , example "Semigroup.Option Nothing" "null" (Semigroup.Option (Nothing :: Maybe Bool))
198+
199+ -- time 1.9
200+ , example "SystemTime" "123.123456789" (MkSystemTime 123 123456789)
201+ , Example "SystemTime" ["124.23456789"]
202+ (MkSystemTime 123 1234567890)
203+ (MkSystemTime 124 234567890)
204+ , ndExample "CalendarDiffTime"
205+ [ "{\"months\":12,\"time\":456.789}", "{\"time\":456.789,\"months\":12}" ]
206+ (CalendarDiffTime 12 456.789)
207+ , ndExample "CalendarDiffDays"
208+ [ "{\"months\":12,\"days\":20}", "{\"days\":20,\"months\":12}" ]
209+ (CalendarDiffDays 12 20)
210+ , example "DayOfWeek" "\"monday\"" Monday
184 ]
211 ]
185
212
186jsonEncodingExamples :: [Example]
213jsonEncodingExamples :: [Example]
187jsonEncodingExamples =
214jsonEncodingExamples =
188 [
215 [
189− -- Maybe serialising is lossy
190− -- https://github.com/bos/aeson/issues/376
191− Example "Just Nothing" "null" (Just Nothing :: Maybe (Maybe Int))
192 -- infinities cannot be recovered, null is decoded as NaN
216 -- infinities cannot be recovered, null is decoded as NaN
217+ example "inf :: Double" "null" (Approx $ 1/0 :: Approx Double)
193− , Example "inf :: Double" "null" (Approx $ 1/0 :: Approx Double)
218+ , example "-inf :: Double" "null" (Approx $ -1/0 :: Approx Double)
194 ]
219 ]
195
220
196jsonDecodingExamples :: [Example]
221jsonDecodingExamples :: [Example]
197jsonDecodingExamples = [
222jsonDecodingExamples = [
198 -- Maybe serialising is lossy
223 -- Maybe serialising is lossy
199 -- https://github.com/bos/aeson/issues/376
224 -- https://github.com/bos/aeson/issues/376
200− MaybeExample "Nothing" "null" (Just $ Nothing :: Maybe (Maybe Int))
225+ MaybeExample "Nothing" "null" (Just Nothing :: Maybe (Maybe Int))
201 , MaybeExample "Just" "1" (Just $ Just 1 :: Maybe (Maybe Int))
226 , MaybeExample "Just" "1" (Just $ Just 1 :: Maybe (Maybe Int))
202− , MaybeExample "Just Nothing" "null" (Just $ Nothing :: Maybe (Maybe (Maybe Int)))
227+ , MaybeExample "Just Nothing" "null" (Just Nothing :: Maybe (Maybe (Maybe Int)))
203 -- Integral values are truncated, and overflowed
228 -- Integral values are truncated, and overflowed
204 -- https://github.com/bos/aeson/issues/317
229 -- https://github.com/bos/aeson/issues/317
205 , MaybeExample "Word8 3" "3" (Just 3 :: Maybe Word8)
230 , MaybeExample "Word8 3" "3" (Just 3 :: Maybe Word8)
@@ -212,12 +237,27 @@ jsonDecodingExamples = [
212 ]
237 ]
213
238
214data Example where
239data Example where
215− Example
240+ Example
241+ :: (Eq a, Show a, ToJSON a, FromJSON a)
242+ => String -- name
243+ -> [L.ByteString] -- encoded variants
244+ -> a -- input
245+ -> a -- decoded
246+ -> Example -- empty bytestring will fail, any p [] == False
247+
248+ MaybeExample
249+ :: (Eq a, Show a, FromJSON a)
250+ => String -> L.ByteString -> Maybe a -> Example
251+
216− :: (Eq a, Show a, ToJSON a, FromJSON a)
252+example :: (Eq a, Show a, ToJSON a, FromJSON a)
217 => String -> L.ByteString -> a -> Example
253 => String -> L.ByteString -> a -> Example
218− MaybeExample
254+example n bs x = Example n [bs] x x
255+
256+-- | Non-deterministic example, input encodes to some of bytestrings.
219− :: (Eq a, Show a, FromJSON a)
257+ndExample :: (Eq a, Show a, ToJSON a, FromJSON a)
220− => String -> L.ByteString -> Maybe a -> Example
258+ => String -> [L.ByteString] -> a -> Example
259+ndExample n bss x = Example n bss x x
260+
221
261
222data MyEither a b = MyLeft a | MyRight b
262data MyEither a b = MyLeft a | MyRight b
223 deriving (Generic, Show, Eq)
263 deriving (Generic, Show, Eq)
@@ -229,17 +269,26 @@ instance (ToJSON a, ToJSON b) => ToJSON (MyEither a b) where
229instance (FromJSON a, FromJSON b) => FromJSON (MyEither a b) where
269instance (FromJSON a, FromJSON b) => FromJSON (MyEither a b) where
230 parseJSON = genericParseJSON defaultOptions { sumEncoding = UntaggedValue }
270 parseJSON = genericParseJSON defaultOptions { sumEncoding = UntaggedValue }
231
271
232−assertJsonExample :: Example -> Test
272+assertJsonExample :: Example -> TestTree
233−assertJsonExample (Example name bs val) = testCase name $ do
273+assertJsonExample (Example name bss val val') = testCase name $ do
234− assertEqual "encode" bs (encode val)
274+ assertSomeEqual "encode" bss (encode val)
235− assertEqual "encode/via value" bs (encode $ toJSON val)
275+ assertSomeEqual "encode/via value" bss (encode $ toJSON val)
276+ for_ bss $ \bs ->
236− assertEqual "decode" (Just val) (decode bs)
277+ assertEqual "decode" (Just val') (decode bs)
237assertJsonExample (MaybeExample name bs mval) = testCase name $
278assertJsonExample (MaybeExample name bs mval) = testCase name $
238 assertEqual "decode" mval (decode bs)
279 assertEqual "decode" mval (decode bs)
239
280
240−assertJsonEncodingExample :: Example -> Test
281+assertJsonEncodingExample :: Example -> TestTree
241−assertJsonEncodingExample (Example name bs val) = testCase name $ do
282+assertJsonEncodingExample (Example name bss val _) = testCase name $ do
242− assertEqual "encode" bs (encode val)
283+ assertSomeEqual "encode" bss (encode val)
243− assertEqual "encode/via value" bs (encode $ toJSON val)
284+ assertSomeEqual "encode/via value" bss (encode $ toJSON val)
244assertJsonEncodingExample (MaybeExample name _ _) = testCase name $
285assertJsonEncodingExample (MaybeExample name _ _) = testCase name $
245 assertFailure "cannot encode MaybeExample"
286 assertFailure "cannot encode MaybeExample"
287+
288+assertSomeEqual :: (Eq a, Show a, Foldable f) => String -> f a -> a -> IO ()
289+assertSomeEqual preface expected actual
290+ | actual `elem` expected = return ()
291+ | otherwise = assertFailure $ preface
292+ ++ ": expecting one of " ++ show (toList expected)
293+ ++ ", got " ++ show actual
294+
tests/Tests.hs+5−3
@@ -1,9 +1,10 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
1module Main (main) where
3module Main (main) where
2
4
3−import Prelude ()
4import Prelude.Compat
5import Prelude.Compat
5
6
6−import Test.Framework (defaultMain)
7+import Test.Tasty (defaultMain, testGroup)
7import qualified DataFamilies.Properties as DF
8import qualified DataFamilies.Properties as DF
8import qualified Properties
9import qualified Properties
9import qualified UnitTests
10import qualified UnitTests
@@ -11,4 +12,5 @@ import qualified UnitTests
11main :: IO ()
12main :: IO ()
12main = do
13main = do
13 ioTests <- UnitTests.ioTests
14 ioTests <- UnitTests.ioTests
14− defaultMain (DF.tests : Properties.tests : UnitTests.tests : ioTests)
15+ let allTests = DF.tests : Properties.tests : UnitTests.tests : ioTests
16+ defaultMain (testGroup "tests" allTests)
tests/Types.hs+11−6
@@ -4,19 +4,21 @@
4{-# LANGUAGE FlexibleInstances #-}
4{-# LANGUAGE FlexibleInstances #-}
5{-# LANGUAGE GADTs #-}
5{-# LANGUAGE GADTs #-}
6{-# LANGUAGE GeneralizedNewtypeDeriving #-}
6{-# LANGUAGE GeneralizedNewtypeDeriving #-}
7−{-# LANGUAGE StandaloneDeriving #-}
7+{-# LANGUAGE NoImplicitPrelude #-}
8{-# LANGUAGE ScopedTypeVariables #-}
8{-# LANGUAGE ScopedTypeVariables #-}
9+{-# LANGUAGE StandaloneDeriving #-}
9
10
10−module Types where
11+module Types (module Types) where
11
12
12−import Prelude ()
13import Prelude.Compat
13import Prelude.Compat
14
14
15import Math.NumberTheory.Logarithms (intLog2)
15import Math.NumberTheory.Logarithms (intLog2)
16+import Control.Applicative ((<$>))
16import Data.Data
17import Data.Data
17import Data.Functor.Compose (Compose (..))
18import Data.Functor.Compose (Compose (..))
18import Data.Functor.Identity (Identity (..))
19import Data.Functor.Identity (Identity (..))
19import Data.Hashable (Hashable (..))
20import Data.Hashable (Hashable (..))
21+import Data.Semigroup (Option)
20import Data.Text
22import Data.Text
21import Data.Time (Day (..), fromGregorian)
23import Data.Time (Day (..), fromGregorian)
22import GHC.Generics
24import GHC.Generics
@@ -104,6 +106,10 @@ deriving instance Data (GADT String)
104deriving instance Eq (GADT a)
106deriving instance Eq (GADT a)
105deriving instance Show (GADT a)
107deriving instance Show (GADT a)
106
108
109+newtype MaybeField = MaybeField { maybeField :: Maybe Int }
110+newtype OptionField = OptionField { optionField :: Option Int }
111+ deriving (Eq, Show)
112+
107deriving instance Generic Foo
113deriving instance Generic Foo
108deriving instance Generic UFoo
114deriving instance Generic UFoo
109deriving instance Generic OneConstructor
115deriving instance Generic OneConstructor
@@ -113,9 +119,8 @@ deriving instance Generic (Sum4 a b c d)
113deriving instance Generic (Approx a)
119deriving instance Generic (Approx a)
114deriving instance Generic Nullary
120deriving instance Generic Nullary
115deriving instance Generic (SomeType a)
121deriving instance Generic (SomeType a)
116−#if __GLASGOW_HASKELL__ >= 706
117deriving instance Generic1 SomeType
122deriving instance Generic1 SomeType
118−#endif
123+deriving instance Generic OptionField
119deriving instance Generic EitherTextInt
124deriving instance Generic EitherTextInt
120
125
121failure :: Show a => String -> String -> a -> Property
126failure :: Show a => String -> String -> a -> Property
@@ -146,7 +151,7 @@ instance Hashable a => Hashable (LogScaled a) where
146 hashWithSalt salt (LogScaled a) = hashWithSalt salt a
151 hashWithSalt salt (LogScaled a) = hashWithSalt salt a
147
152
148instance Arbitrary a => Arbitrary (LogScaled a) where
153instance Arbitrary a => Arbitrary (LogScaled a) where
149− arbitrary = fmap LogScaled $ scale (\x -> intLog2 $ x + 1) arbitrary
154+ arbitrary = LogScaled <$> scale (\x -> intLog2 $ x + 1) arbitrary
150 shrink = fmap LogScaled . shrink . getLogScaled
155 shrink = fmap LogScaled . shrink . getLogScaled
151
156
152instance ToJSON a => ToJSON (LogScaled a) where
157instance ToJSON a => ToJSON (LogScaled a) where
tests/UnitTests.hs+321−52
@@ -1,56 +1,72 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2{-# LANGUAGE DeriveGeneric #-}
2{-# LANGUAGE DeriveGeneric #-}
3{-# LANGUAGE GeneralizedNewtypeDeriving #-}
3{-# LANGUAGE GeneralizedNewtypeDeriving #-}
4+{-# LANGUAGE NoImplicitPrelude #-}
4{-# LANGUAGE OverloadedStrings #-}
5{-# LANGUAGE OverloadedStrings #-}
5{-# LANGUAGE ScopedTypeVariables #-}
6{-# LANGUAGE ScopedTypeVariables #-}
6{-# LANGUAGE TemplateHaskell #-}
7{-# LANGUAGE TemplateHaskell #-}
8+{-# LANGUAGE QuasiQuotes #-}
7
9
8-- For Data.Aeson.Types.camelTo
10-- For Data.Aeson.Types.camelTo
9{-# OPTIONS_GHC -fno-warn-deprecations #-}
11{-# OPTIONS_GHC -fno-warn-deprecations #-}
10
12
13+#if MIN_VERSION_base(4,9,0)
14+{-# OPTIONS_GHC -fno-warn-unused-top-binds #-}
15+#endif
16+
11module UnitTests
17module UnitTests
12 (
18 (
13 ioTests
19 ioTests
14 , tests
20 , tests
21+ , withEmbeddedJSONTest
15 ) where
22 ) where
16
23
17−import Prelude ()
18import Prelude.Compat
24import Prelude.Compat
19
25
20−import Control.Monad (forM, forM_, unless)
26+import Control.Monad (forM, forM_)
21−import Data.Aeson ((.=), (.:), (.:?), (.:!), FromJSON(..), FromJSONKeyFunction(..), FromJSONKey(..), ToJSON1(..), decode, eitherDecode, encode, genericToEncoding, genericToJSON, object, withObject)
27+import Data.Aeson ((.=), (.:), (.:?), (.:!), FromJSON(..), FromJSONKeyFunction(..), FromJSONKey(..), ToJSON1(..), decode, eitherDecode, encode, fromJSON, genericParseJSON, genericToEncoding, genericToJSON, object, withObject, withEmbeddedJSON)
22import Data.Aeson.Internal (JSONPathElement(..), formatError)
28import Data.Aeson.Internal (JSONPathElement(..), formatError)
29+import Data.Aeson.QQ.Simple (aesonQQ)
23import Data.Aeson.TH (deriveJSON, deriveToJSON, deriveToJSON1)
30import Data.Aeson.TH (deriveJSON, deriveToJSON, deriveToJSON1)
24import Data.Aeson.Text (encodeToTextBuilder)
31import Data.Aeson.Text (encodeToTextBuilder)
32+import Data.Aeson.Parser
33+ ( json, jsonLast, jsonAccum, jsonNoDup
34+ , json', jsonLast', jsonAccum', jsonNoDup')
35+import Data.Aeson.Types
36+ ( Options(..), Result(Success, Error), ToJSON(..)
37+ , Value(Array, Bool, Null, Number, Object, String), camelTo, camelTo2
25−import Data.Aeson.Types (Options(..), ToJSON(..), Value, camelTo, camelTo2, defaultOptions, omitNothingFields)
38+ , defaultOptions, formatPath, formatRelativePath, omitNothingFields, parse)
39+import Data.Attoparsec.ByteString (Parser, parseOnly)
26import Data.Char (toUpper)
40import Data.Char (toUpper)
27import Data.Either.Compat (isLeft, isRight)
41import Data.Either.Compat (isLeft, isRight)
28import Data.Hashable (hash)
42import Data.Hashable (hash)
29−import Data.List (sort)
43+import Data.HashMap.Strict (HashMap)
44+import Data.List (sort, isSuffixOf)
30import Data.Maybe (fromMaybe)
45import Data.Maybe (fromMaybe)
31−import Data.Sequence (Seq)
46+import Data.Scientific (Scientific, scientific)
32import Data.Tagged (Tagged(..))
47import Data.Tagged (Tagged(..))
33import Data.Text (Text)
48import Data.Text (Text)
34import Data.Time (UTCTime)
49import Data.Time (UTCTime)
35−import Data.Time.Format (parseTime)
50+import Data.Time.Format.Compat (parseTimeM, defaultTimeLocale)
36−import Data.Time.Locale.Compat (defaultTimeLocale)
37import GHC.Generics (Generic)
51import GHC.Generics (Generic)
38import Instances ()
52import Instances ()
53+import Numeric.Natural (Natural)
39−import System.Directory (doesDirectoryExist, getDirectoryContents)
54+import System.Directory (getDirectoryContents)
40−import System.Exit (exitWith, ExitCode(ExitFailure))
41import System.FilePath ((</>), takeExtension, takeFileName)
55import System.FilePath ((</>), takeExtension, takeFileName)
42−import Test.Framework (Test, testGroup)
56+import Test.Tasty (TestTree, testGroup)
43−import Test.Framework.Providers.HUnit (testCase)
44−import Test.HUnit (Assertion, assertBool, assertFailure, assertEqual)
57+import Test.Tasty.HUnit (Assertion, assertBool, assertFailure, assertEqual, testCase, (@?=))
45import Text.Printf (printf)
58import Text.Printf (printf)
46import UnitTests.NullaryConstructors (nullaryConstructors)
59import UnitTests.NullaryConstructors (nullaryConstructors)
60+import qualified Data.ByteString as S
47import qualified Data.ByteString.Base16.Lazy as LBase16
61import qualified Data.ByteString.Base16.Lazy as LBase16
48import qualified Data.ByteString.Lazy.Char8 as L
62import qualified Data.ByteString.Lazy.Char8 as L
49import qualified Data.HashSet as HashSet
63import qualified Data.HashSet as HashSet
64+import qualified Data.HashMap.Lazy as HashMap
50import qualified Data.Text.Lazy as LT
65import qualified Data.Text.Lazy as LT
51import qualified Data.Text.Lazy.Builder as TLB
66import qualified Data.Text.Lazy.Builder as TLB
52import qualified Data.Text.Lazy.Encoding as LT
67import qualified Data.Text.Lazy.Encoding as LT
53import qualified Data.Text.Lazy.Encoding as TLE
68import qualified Data.Text.Lazy.Encoding as TLE
69+import qualified Data.Vector as Vector
54import qualified ErrorMessages
70import qualified ErrorMessages
55import qualified SerializationFormatSpec
71import qualified SerializationFormatSpec
56
72
@@ -58,7 +74,7 @@ import qualified SerializationFormatSpec
58import Data.Aeson.Parser.UnescapeFFI ()
74import Data.Aeson.Parser.UnescapeFFI ()
59import Data.Aeson.Parser.UnescapePure ()
75import Data.Aeson.Parser.UnescapePure ()
60
76
61−tests :: Test
77+tests :: TestTree
62tests = testGroup "unit" [
78tests = testGroup "unit" [
63 testGroup "SerializationFormatSpec" SerializationFormatSpec.tests
79 testGroup "SerializationFormatSpec" SerializationFormatSpec.tests
64 , testGroup "ErrorMessages" ErrorMessages.tests
80 , testGroup "ErrorMessages" ErrorMessages.tests
@@ -75,23 +91,41 @@ tests = testGroup "unit" [
75 assertEqual "" "camel_api_case" (camelTo2 '_' "CamelAPICase")
91 assertEqual "" "camel_api_case" (camelTo2 '_' "CamelAPICase")
76 ]
92 ]
77 , testGroup "encoding" [
93 , testGroup "encoding" [
78− testCase "goodProducer" $ goodProducer
94+ testCase "goodProducer" goodProducer
79 ]
95 ]
80 , testGroup "utctime" [
96 , testGroup "utctime" [
81− testCase "good" $ utcTimeGood
97+ testCase "good" utcTimeGood
82− , testCase "bad" $ utcTimeBad
98+ , testCase "bad" utcTimeBad
83 ]
99 ]
84 , testGroup "formatError" [
100 , testGroup "formatError" [
85− testCase "example 1" $ formatErrorExample
101+ testCase "example 1" formatErrorExample
86 ]
102 ]
87 , testGroup ".:, .:?, .:!" $ fmap (testCase "-") dotColonMark
103 , testGroup ".:, .:?, .:!" $ fmap (testCase "-") dotColonMark
88− , testGroup "JSONPath" $ fmap (testCase "-") jsonPath
89 , testGroup "Hashable laws" $ fmap (testCase "-") hashableLaws
104 , testGroup "Hashable laws" $ fmap (testCase "-") hashableLaws
105+ , testGroup "Object construction" $ fmap (testCase "-") objectConstruction
90 , testGroup "Issue #351" $ fmap (testCase "-") issue351
106 , testGroup "Issue #351" $ fmap (testCase "-") issue351
91 , testGroup "Nullary constructors" $ fmap (testCase "-") nullaryConstructors
107 , testGroup "Nullary constructors" $ fmap (testCase "-") nullaryConstructors
92 , testGroup "FromJSONKey" $ fmap (testCase "-") fromJSONKeyAssertions
108 , testGroup "FromJSONKey" $ fmap (testCase "-") fromJSONKeyAssertions
93 , testCase "PR #455" pr455
109 , testCase "PR #455" pr455
94 , testCase "Unescape string (PR #477)" unescapeString
110 , testCase "Unescape string (PR #477)" unescapeString
111+ , testCase "Show Options" showOptions
112+ , testGroup "SingleMaybeField" singleMaybeField
113+ , testCase "withEmbeddedJSON" withEmbeddedJSONTest
114+ , testCase "SingleFieldCon" singleFieldCon
115+ , testGroup "UnknownFields" unknownFields
116+ , testGroup "Ordering of object keys" keyOrdering
117+ , testCase "Ratio with denominator 0" ratioDenominator0
118+ , testCase "Rational parses number" rationalNumber
119+ , testCase "Big rational" bigRationalDecoding
120+ , testCase "Small rational" smallRationalDecoding
121+ , testCase "Big scientific exponent" bigScientificExponent
122+ , testCase "Big integer decoding" bigIntegerDecoding
123+ , testCase "Big natural decading" bigNaturalDecoding
124+ , testCase "Big integer key decoding" bigIntegerKeyDecoding
125+ , testGroup "QQ.Simple"
126+ [ testCase "example" $
127+ assertEqual "" (object ["foo" .= True]) [aesonQQ| {"foo": true } |]
128+ ]
95 ]
129 ]
96
130
97roundTripCamel :: String -> Assertion
131roundTripCamel :: String -> Assertion
@@ -184,14 +218,20 @@ utcTimeGood = do
184 assertEqual "utctime" (parseWithRead "%F %H:%MZ" ts11) t11
218 assertEqual "utctime" (parseWithRead "%F %H:%MZ" ts11) t11
185 assertEqual "utctime" (parseWithRead "%FT%T%QZ" "2015-01-01T14:30:00Z") t12
219 assertEqual "utctime" (parseWithRead "%FT%T%QZ" "2015-01-01T14:30:00Z") t12
186
220
221+ -- leap seconds are included correctly
222+ let ts13 = "2015-08-23T23:59:60.128+00" :: LT.Text
223+ let (Just (t13 :: UTCTime)) = parseWithAeson ts13
224+ assertEqual "utctime" (parseWithRead "%FT%T%QZ" "2015-08-23T23:59:60.128Z") t13
225+ let ts14 = "2015-08-23T23:59:60.999999999999+00" :: LT.Text
226+ let (Just (t14 :: UTCTime)) = parseWithAeson ts14
227+ assertEqual "utctime" (parseWithRead "%FT%T%QZ" "2015-08-23T23:59:60.999999999999Z") t14
228+
187 where
229 where
188 parseWithRead :: String -> LT.Text -> UTCTime
230 parseWithRead :: String -> LT.Text -> UTCTime
189 parseWithRead f s =
231 parseWithRead f s =
190− case parseTime defaultTimeLocale f . LT.unpack $ s of
232+ fromMaybe (error "parseTime input malformed") . parseTimeM True defaultTimeLocale f . LT.unpack $ s
191− Nothing -> error "parseTime input malformed"
192− Just t -> t
193 parseWithAeson :: LT.Text -> Maybe UTCTime
233 parseWithAeson :: LT.Text -> Maybe UTCTime
194− parseWithAeson s = decode . LT.encodeUtf8 $ (LT.concat ["\"", s, "\""])
234+ parseWithAeson s = decode . LT.encodeUtf8 $ LT.concat ["\"", s, "\""]
195
235
196-- Test that a few non-timezone qualified timestamp formats get
236-- Test that a few non-timezone qualified timestamp formats get
197-- rejected if decoding to UTCTime.
237-- rejected if decoding to UTCTime.
@@ -205,9 +245,10 @@ utcTimeBad = do
205 verifyFailParse "2015-01-01T12:30:00.00+00:00Z" -- no Zulu if offset given
245 verifyFailParse "2015-01-01T12:30:00.00+00:00Z" -- no Zulu if offset given
206 verifyFailParse "2015-01-03 12:13:00.Z" -- decimal at the end but no digits
246 verifyFailParse "2015-01-03 12:13:00.Z" -- decimal at the end but no digits
207 verifyFailParse "2015-01-03 12:13.000Z" -- decimal at the end, but no seconds
247 verifyFailParse "2015-01-03 12:13.000Z" -- decimal at the end, but no seconds
248+ verifyFailParse "2015-01-03 23:59:61Z" -- exceeds allowed seconds per day
208 where
249 where
209 verifyFailParse (s :: LT.Text) =
250 verifyFailParse (s :: LT.Text) =
210− let (dec :: Maybe UTCTime) = decode . LT.encodeUtf8 $ (LT.concat ["\"", s, "\""]) in
251+ let (dec :: Maybe UTCTime) = decode . LT.encodeUtf8 $ LT.concat ["\"", s, "\""] in
211 assertEqual "verify failure" Nothing dec
252 assertEqual "verify failure" Nothing dec
212
253
213-- Non identifier keys should be escaped & enclosed in brackets
254-- Non identifier keys should be escaped & enclosed in brackets
@@ -217,6 +258,18 @@ formatErrorExample =
217 lhs = "Error in $[0].foo.bar['a.b.c']['']['\\'\\\\'].end: error msg"
258 lhs = "Error in $[0].foo.bar['a.b.c']['']['\\'\\\\'].end: error msg"
218 in assertEqual "formatError example" lhs rhs
259 in assertEqual "formatError example" lhs rhs
219
260
261+formatPathExample :: Assertion
262+formatPathExample =
263+ let rhs = formatPath [Key "x", Index 0]
264+ lhs = "$.x[0]"
265+ in assertEqual "formatPath example" lhs rhs
266+
267+formatRelativePathExample :: Assertion
268+formatRelativePathExample =
269+ let rhs = formatPath [Key "x", Index 0]
270+ lhs = ".x[0]"
271+ in assertEqual "formatRelativePath example" lhs rhs
272+
220------------------------------------------------------------------------------
273------------------------------------------------------------------------------
221-- Comparison (.:?) and (.:!)
274-- Comparison (.:?) and (.:!)
222------------------------------------------------------------------------------
275------------------------------------------------------------------------------
@@ -235,11 +288,11 @@ dotColonMark = [
235 , assertEqual ".: 42" (Just (T1 (Just 42))) (decode ex2 :: Maybe T1)
288 , assertEqual ".: 42" (Just (T1 (Just 42))) (decode ex2 :: Maybe T1)
236 , assertEqual ".: null" (Just (T1 Nothing)) (decode ex3 :: Maybe T1)
289 , assertEqual ".: null" (Just (T1 Nothing)) (decode ex3 :: Maybe T1)
237
290
238− , assertEqual ".:? not-present" (Just (T2 (Nothing))) (decode ex1 :: Maybe T2)
291+ , assertEqual ".:? not-present" (Just (T2 Nothing)) (decode ex1 :: Maybe T2)
239 , assertEqual ".:? 42" (Just (T2 (Just 42))) (decode ex2 :: Maybe T2)
292 , assertEqual ".:? 42" (Just (T2 (Just 42))) (decode ex2 :: Maybe T2)
240 , assertEqual ".:? null" (Just (T2 Nothing)) (decode ex3 :: Maybe T2)
293 , assertEqual ".:? null" (Just (T2 Nothing)) (decode ex3 :: Maybe T2)
241
294
242− , assertEqual ".:! not-present" (Just (T3 (Nothing))) (decode ex1 :: Maybe T3)
295+ , assertEqual ".:! not-present" (Just (T3 Nothing)) (decode ex1 :: Maybe T3)
243 , assertEqual ".:! 42" (Just (T3 (Just 42))) (decode ex2 :: Maybe T3)
296 , assertEqual ".:! 42" (Just (T3 (Just 42))) (decode ex2 :: Maybe T3)
244 , assertEqual ".:! null" Nothing (decode ex3 :: Maybe T3)
297 , assertEqual ".:! null" Nothing (decode ex3 :: Maybe T3)
245 ]
298 ]
@@ -247,27 +300,6 @@ dotColonMark = [
247 ex2 = "{\"value\": 42 }"
300 ex2 = "{\"value\": 42 }"
248 ex3 = "{\"value\": null }"
301 ex3 = "{\"value\": null }"
249
302
250−------------------------------------------------------------------------------
251−-- These tests check that JSONPath is tracked correctly
252−-----------------------------------------------------------------------------
253−
254−jsonPath :: [Assertion]
255−jsonPath = [
256− -- issue #356
257− assertEqual "Either"
258− (Left "Error in $[1].Left[1]: expected Bool, encountered Number")
259− (eitherDecode "[1,{\"Left\":[2,3]}]"
260− :: Either String (Int, Either (Int, Bool) ()))
261− -- issue #358
262− , assertEqual "Seq a"
263− (Left "Error in $[2]: expected Int, encountered Boolean")
264− (eitherDecode "[0,1,true]" :: Either String (Seq Int))
265− , assertEqual "Wibble"
266− (Left "Error in $.wibbleInt: expected Int, encountered Boolean")
267− (eitherDecode "{\"wibbleString\":\"\",\"wibbleInt\":true}"
268− :: Either String Wibble)
269− ]
270−
271------------------------------------------------------------------------------
303------------------------------------------------------------------------------
272-- Check that the hashes of two equal Value are the same
304-- Check that the hashes of two equal Value are the same
273------------------------------------------------------------------------------
305------------------------------------------------------------------------------
@@ -280,6 +312,18 @@ hashableLaws = [
280 a = object ["223" .= False, "807882556" .= True]
312 a = object ["223" .= False, "807882556" .= True]
281 b = object ["807882556" .= True, "223" .= False]
313 b = object ["807882556" .= True, "223" .= False]
282
314
315+------------------------------------------------------------------------------
316+-- Check that an alternative way to construct objects works
317+------------------------------------------------------------------------------
318+
319+objectConstruction :: [Assertion]
320+objectConstruction = [
321+ assertEqual "Equal objects constructed differently" recommended notRecommended
322+ ]
323+ where
324+ recommended = object ["foo" .= True, "bar" .= (-1 :: Int)]
325+ notRecommended = Object (mconcat ["foo" .= True, "bar" .= (-1 :: Int)])
326+
283-------------------------------------------------------------------------------
327-------------------------------------------------------------------------------
284-- ToJSONKey
328-- ToJSONKey
285-------------------------------------------------------------------------------
329-------------------------------------------------------------------------------
@@ -340,13 +384,13 @@ issue351 = [
340-- Comparison between bytestring and text encoders
384-- Comparison between bytestring and text encoders
341------------------------------------------------------------------------------
385------------------------------------------------------------------------------
342
386
343−ioTests :: IO [Test]
387+ioTests :: IO [TestTree]
344ioTests = do
388ioTests = do
345 enc <- encoderComparisonTests
389 enc <- encoderComparisonTests
346 js <- jsonTestSuite
390 js <- jsonTestSuite
347 return [enc, js]
391 return [enc, js]
348
392
349−encoderComparisonTests :: IO Test
393+encoderComparisonTests :: IO TestTree
350encoderComparisonTests = do
394encoderComparisonTests = do
351 encoderTests <- forM testFiles $ \file0 -> do
395 encoderTests <- forM testFiles $ \file0 -> do
352 let file = "benchmarks/json-data/" ++ file0
396 let file = "benchmarks/json-data/" ++ file0
@@ -406,7 +450,7 @@ unescapeString = do
406
450
407-- JSONTestSuite
451-- JSONTestSuite
408
452
409−jsonTestSuiteTest :: FilePath -> Test
453+jsonTestSuiteTest :: FilePath -> TestTree
410jsonTestSuiteTest path = testCase fileName $ do
454jsonTestSuiteTest path = testCase fileName $ do
411 payload <- L.readFile path
455 payload <- L.readFile path
412 let result = eitherDecode payload :: Either String Value
456 let result = eitherDecode payload :: Either String Value
@@ -421,10 +465,9 @@ jsonTestSuiteTest path = testCase fileName $ do
421-- Build a collection of tests based on the current contents of the
465-- Build a collection of tests based on the current contents of the
422-- JSONTestSuite test directories.
466-- JSONTestSuite test directories.
423
467
424−jsonTestSuite :: IO Test
468+jsonTestSuite :: IO TestTree
425jsonTestSuite = do
469jsonTestSuite = do
426 let suitePath = "tests/JSONTestSuite"
470 let suitePath = "tests/JSONTestSuite"
427− exists <- doesDirectoryExist suitePath
428 let suites = ["test_parsing", "test_transform"]
471 let suites = ["test_parsing", "test_transform"]
429 testPaths <- fmap (sort . concat) . forM suites $ \suite -> do
472 testPaths <- fmap (sort . concat) . forM suites $ \suite -> do
430 let dir = suitePath </> suite
473 let dir = suitePath </> suite
@@ -485,7 +528,233 @@ pr455 = assertEqual "FooCons FooNil"
485 foo :: Foo Int
528 foo :: Foo Int
486 foo = FooCons FooNil
529 foo = FooCons FooNil
487
530
531+showOptions :: Assertion
532+showOptions =
533+ assertEqual
534+ "Show Options"
535+ ( "Options {"
536+ ++ "fieldLabelModifier =~ \"exampleField\""
537+ ++ ", constructorTagModifier =~ \"ExampleConstructor\""
538+ ++ ", allNullaryToStringTag = True"
539+ ++ ", omitNothingFields = False"
540+ ++ ", sumEncoding = TaggedObject {tagFieldName = \"tag\", contentsFieldName = \"contents\"}"
541+ ++ ", unwrapUnaryRecords = False"
542+ ++ ", tagSingleConstructors = False"
543+ ++ ", rejectUnknownFields = False"
544+ ++ "}")
545+ (show defaultOptions)
546+
547+newtype SingleMaybeField = SingleMaybeField { smf :: Maybe Int }
548+ deriving (Eq, Show, Generic)
549+
550+singleMaybeField :: [TestTree]
551+singleMaybeField = do
552+ (gName, gToJSON, gToEncoding, gFromJSON) <-
553+ [ ("generic", genericToJSON opts, genericToEncoding opts, parse (genericParseJSON opts))
554+ , ("th", toJSON, toEncoding, fromJSON) ]
555+ return $
556+ testCase gName $ do
557+ assertEqual "toJSON" Null (gToJSON v)
558+ assertEqual "toEncoding" (toEncoding (gToJSON v)) (gToEncoding v)
559+ assertEqual "fromJSON" (Success v) (gFromJSON Null)
560+ where
561+ v = SingleMaybeField Nothing
562+ opts = defaultOptions{omitNothingFields=True,unwrapUnaryRecords=True}
563+
564+
565+newtype EmbeddedJSONTest = EmbeddedJSONTest Int
566+ deriving (Eq, Show)
567+
568+instance FromJSON EmbeddedJSONTest where
569+ parseJSON =
570+ withObject "Object" $ \o ->
571+ EmbeddedJSONTest <$> (o .: "prop" >>= withEmbeddedJSON "Quoted Int" parseJSON)
572+
573+withEmbeddedJSONTest :: Assertion
574+withEmbeddedJSONTest =
575+ assertEqual "Unquote embedded JSON" (Right $ EmbeddedJSONTest 1) (eitherDecode "{\"prop\":\"1\"}")
576+
577+-- Regression test for https://github.com/bos/aeson/issues/627
578+newtype SingleFieldCon = SingleFieldCon Int deriving (Eq, Show, Generic)
579+
580+instance FromJSON SingleFieldCon where
581+ parseJSON = genericParseJSON defaultOptions{unwrapUnaryRecords=True}
582+ -- This option should have no effect on this type
583+
584+singleFieldCon :: Assertion
585+singleFieldCon =
586+ assertEqual "fromJSON" (Right (SingleFieldCon 0)) (eitherDecode "0")
587+
588+newtype UnknownFields = UnknownFields { knownField :: Int }
589+ deriving (Eq, Show, Generic)
590+newtype UnknownFieldsTag = UnknownFieldsTag { tag :: Int }
591+ deriving (Eq, Show, Generic)
592+newtype UnknownFieldsUnaryTagged = UnknownFieldsUnaryTagged { knownFieldUnaryTagged :: Int }
593+ deriving (Eq, Show, Generic)
594+data UnknownFieldsSum
595+ = UnknownFields1 { knownField1 :: Int }
596+ | UnknownFields2 { knownField2 :: Int }
597+ deriving (Eq, Show, Generic)
598+
599+unknownFields :: [TestTree]
600+unknownFields = concat
601+ [ testsUnary
602+ "unary-unknown"
603+ (object [("knownField", Number 1), ("unknownField", Number 1)])
604+ (Error "nknown fields: [\"unknownField\"]" :: Result UnknownFields)
605+ , testsUnary
606+ "unary-unknown-tag"
607+ (object [("knownField", Number 1), ("tag", String "UnknownFields")])
608+ (Error "nknown fields: [\"tag\"]" :: Result UnknownFields)
609+ , testsUnaryTag
610+ "unary-explicit-tag"
611+ (object [("tag", Number 1)])
612+ (Success $ UnknownFieldsTag 1)
613+ , testsSum
614+ "sum-tag"
615+ (object [("knownField1", Number 1), ("tag", String "UnknownFields1")])
616+ (Success $ UnknownFields1 1)
617+ , testsSum
618+ "sum-unknown-in-branch"
619+ (object [("knownField1", Number 1), ("knownField2", Number 1), ("tag", String "UnknownFields1")])
620+ (Error "nknown fields: [\"knownField2\"]" :: Result UnknownFieldsSum)
621+ , testsSum
622+ "sum-unknown"
623+ (object [("knownField1", Number 1), ("unknownField", Number 1), ("tag", String "UnknownFields1")])
624+ (Error "nknown fields: [\"unknownField\"]" :: Result UnknownFieldsSum)
625+ , testsTagged
626+ "unary-tagged"
627+ (object [("knownFieldUnaryTagged", Number 1), ("tag", String "UnknownFieldsUnaryTagged")])
628+ (Success $ UnknownFieldsUnaryTagged 1)
629+ , -- Just a case to verify that the tag isn't optional, this is likely already tested by other unit tests
630+ testsTagged
631+ "unary-tagged-notag"
632+ (object [("knownFieldUnaryTagged", Number 1)])
633+ (Error "key \"tag\" not found" :: Result UnknownFieldsUnaryTagged)
634+ , testsTagged
635+ "unary-tagged-unknown"
636+ (object [ ("knownFieldUnaryTagged", Number 1), ("unknownField", Number 1)
637+ , ("tag", String "UnknownFieldsUnaryTagged")])
638+ (Error "nknown fields: [\"unknownField\"]" :: Result UnknownFieldsUnaryTagged)
639+ ]
640+ where
641+ opts = defaultOptions{rejectUnknownFields=True}
642+ taggedOpts = opts{tagSingleConstructors=True}
643+ assertApprox :: (Show a, Eq a) => Result a -> Result a -> IO ()
644+ assertApprox (Error expected) (Error actual) | expected `isSuffixOf` actual = return ()
645+ assertApprox expected actual = assertEqual "fromJSON" expected actual
646+ testsBase :: (Show a, Eq a) => (Value -> Result a) -> (Value -> Result a)
647+ -> String -> Value -> Result a -> [TestTree]
648+ testsBase th g name value expected =
649+ [ testCase (name ++ "-th") $ assertApprox expected (th value)
650+ , testCase (name ++ "-generic") $ assertApprox expected (g value)
651+ ]
652+ testsUnary :: String -> Value -> Result UnknownFields -> [TestTree]
653+ testsUnary = testsBase fromJSON (parse (genericParseJSON opts))
654+ testsUnaryTag :: String -> Value -> Result UnknownFieldsTag -> [TestTree]
655+ testsUnaryTag = testsBase fromJSON (parse (genericParseJSON opts))
656+ testsSum :: String -> Value -> Result UnknownFieldsSum -> [TestTree]
657+ testsSum = testsBase fromJSON (parse (genericParseJSON opts))
658+ testsTagged :: String -> Value -> Result UnknownFieldsUnaryTagged -> [TestTree]
659+ testsTagged = testsBase fromJSON (parse (genericParseJSON taggedOpts))
660+
661+testParser :: (Eq a, Show a)
662+ => String -> Parser a -> S.ByteString -> Either String a -> TestTree
663+testParser name json_ s expected =
664+ testCase name (parseOnly json_ s @?= expected)
665+
666+keyOrdering :: [TestTree]
667+keyOrdering =
668+ [ testParser "json" json
669+ "{\"k\":true,\"k\":false}" $
670+ Right (Object (HashMap.fromList [("k", Bool True)]))
671+ , testParser "jsonLast" jsonLast
672+ "{\"k\":true,\"k\":false}" $
673+ Right (Object (HashMap.fromList [("k", Bool False)]))
674+ , testParser "jsonAccum" jsonAccum
675+ "{\"k\":true,\"k\":false}" $
676+ Right (Object (HashMap.fromList [("k", Array (Vector.fromList [Bool True, Bool False]))]))
677+ , testParser "jsonNoDup" jsonNoDup
678+ "{\"k\":true,\"k\":false}" $
679+ Left "Failed reading: found duplicate key: \"k\""
680+
681+ , testParser "json'" json'
682+ "{\"k\":true,\"k\":false}" $
683+ Right (Object (HashMap.fromList [("k", Bool True)]))
684+ , testParser "jsonLast'" jsonLast'
685+ "{\"k\":true,\"k\":false}" $
686+ Right (Object (HashMap.fromList [("k", Bool False)]))
687+ , testParser "jsonAccum'" jsonAccum'
688+ "{\"k\":true,\"k\":false}" $
689+ Right (Object (HashMap.fromList [("k", Array (Vector.fromList [Bool True, Bool False]))]))
690+ , testParser "jsonNoDup'" jsonNoDup'
691+ "{\"k\":true,\"k\":false}" $
692+ Left "Failed reading: found duplicate key: \"k\""
693+ ]
694+
695+ratioDenominator0 :: Assertion
696+ratioDenominator0 =
697+ assertEqual "Ratio with denominator 0"
698+ (Left "Error in $: Ratio denominator was 0")
699+ (eitherDecode "{ \"numerator\": 1, \"denominator\": 0 }" :: Either String Rational)
700+
701+rationalNumber :: Assertion
702+rationalNumber =
703+ assertEqual "Ratio with denominator 0"
704+ (Right 1.37)
705+ (eitherDecode "1.37" :: Either String Rational)
706+
707+bigRationalDecoding :: Assertion
708+bigRationalDecoding =
709+ assertEqual "Decoding an Integer with a large exponent should fail"
710+ (Left "Error in $: parsing Ratio failed, found a number with exponent 2000, but it must not be greater than 1024 or less than -1024")
711+ ((eitherDecode :: L.ByteString -> Either String Rational) "1e2000")
712+
713+smallRationalDecoding :: Assertion
714+smallRationalDecoding =
715+ assertEqual "Decoding an Integer with a large exponent should fail"
716+ (Left "Error in $: parsing Ratio failed, found a number with exponent -2000, but it must not be greater than 1024 or less than -1024")
717+ ((eitherDecode :: L.ByteString -> Either String Rational) "1e-2000")
718+
719+
720+bigScientificExponent :: Assertion
721+bigScientificExponent =
722+ assertEqual "Encoding an integral scientific with a large exponent should normalize it"
723+ "1.0e2000"
724+ (encode (scientific 1 2000 :: Scientific))
725+
726+bigIntegerDecoding :: Assertion
727+bigIntegerDecoding =
728+ assertEqual "Decoding an Integer with a large exponent should fail"
729+ (Left "Error in $: parsing Integer failed, found a number with exponent 2000, but it must not be greater than 1024")
730+ ((eitherDecode :: L.ByteString -> Either String Integer) "1e2000")
731+
732+bigNaturalDecoding :: Assertion
733+bigNaturalDecoding =
734+ assertEqual "Decoding a Natural with a large exponent should fail"
735+ (Left "Error in $: parsing Natural failed, found a number with exponent 2000, but it must not be greater than 1024")
736+ ((eitherDecode :: L.ByteString -> Either String Natural) "1e2000")
737+
738+bigIntegerKeyDecoding :: Assertion
739+bigIntegerKeyDecoding =
740+ assertEqual "Decoding an Integer key with a large exponent should fail"
741+ (Left "Error in $['1e2000']: parsing Integer failed, found a number with exponent 2000, but it must not be greater than 1024")
742+ ((eitherDecode :: L.ByteString -> Either String (HashMap Integer Value)) "{ \"1e2000\": null }")
743+
744+bigNaturalKeyDecoding :: Assertion
745+bigNaturalKeyDecoding =
746+ assertEqual "Decoding an Integer key with a large exponent should fail"
747+ (Left "Error in $['1e2000']: found a number with exponent 2000, but it must not be greater than 1024")
748+ ((eitherDecode :: L.ByteString -> Either String (HashMap Natural Value)) "{ \"1e2000\": null }")
749+
488deriveJSON defaultOptions{omitNothingFields=True} ''MyRecord
750deriveJSON defaultOptions{omitNothingFields=True} ''MyRecord
489
751
490deriveToJSON defaultOptions ''Foo
752deriveToJSON defaultOptions ''Foo
491deriveToJSON1 defaultOptions ''Foo
753deriveToJSON1 defaultOptions ''Foo
754+
755+deriveJSON defaultOptions{omitNothingFields=True,unwrapUnaryRecords=True} ''SingleMaybeField
756+
757+deriveJSON defaultOptions{rejectUnknownFields=True} ''UnknownFields
758+deriveJSON defaultOptions{rejectUnknownFields=True} ''UnknownFieldsTag
759+deriveJSON defaultOptions{tagSingleConstructors=True,rejectUnknownFields=True} ''UnknownFieldsUnaryTagged
760+deriveJSON defaultOptions{rejectUnknownFields=True} ''UnknownFieldsSum
tests/UnitTests/NullaryConstructors.hs+8−3
@@ -1,4 +1,5 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
1−{-# LANGUAGE OverloadedStrings #-}
2+{-# LANGUAGE OverloadedStrings #-}
2
3
3{-# OPTIONS_GHC -fno-warn-deprecations #-}
4{-# OPTIONS_GHC -fno-warn-deprecations #-}
4
5
@@ -7,16 +8,16 @@ module UnitTests.NullaryConstructors
7 nullaryConstructors
8 nullaryConstructors
8 ) where
9 ) where
9
10
10−import Prelude ()
11import Prelude.Compat
11import Prelude.Compat
12
12
13import Data.Aeson (decode, eitherDecode, fromEncoding, Value)
13import Data.Aeson (decode, eitherDecode, fromEncoding, Value)
14import Data.Aeson.Internal (IResult (..), iparse)
14import Data.Aeson.Internal (IResult (..), iparse)
15import Data.Aeson.Types (Parser)
15import Data.Aeson.Types (Parser)
16import Data.ByteString.Builder (toLazyByteString)
16import Data.ByteString.Builder (toLazyByteString)
17+import Data.Foldable (for_)
17import Data.Maybe (fromJust)
18import Data.Maybe (fromJust)
18import Encoders
19import Encoders
19−import Test.HUnit ((@=?), Assertion)
20+import Test.Tasty.HUnit ((@=?), Assertion)
20import Types
21import Types
21import qualified Data.ByteString.Lazy.Char8 as L
22import qualified Data.ByteString.Lazy.Char8 as L
22
23
@@ -52,6 +53,10 @@ nullaryConstructors =
52 -- Make sure that the old `"contents" : []' is still allowed
53 -- Make sure that the old `"contents" : []' is still allowed
53 , ISuccess C1 @=? parse thNullaryParseJSONTaggedObject (dec "{\"tag\":\"c1\",\"contents\":[]}")
54 , ISuccess C1 @=? parse thNullaryParseJSONTaggedObject (dec "{\"tag\":\"c1\",\"contents\":[]}")
54 , ISuccess C1 @=? parse gNullaryParseJSONTaggedObject (dec "{\"tag\":\"c1\",\"contents\":[]}")
55 , ISuccess C1 @=? parse gNullaryParseJSONTaggedObject (dec "{\"tag\":\"c1\",\"contents\":[]}")
56+
57+ , for_ [("kC1", C1), ("kC2", C2), ("kC3", C3)] $ \(jkey, key) -> do
58+ Right jkey @=? gNullaryToJSONKey key
59+ ISuccess key @=? parse gNullaryFromJSONKey jkey
55 ]
60 ]
56 where
61 where
57 enc = eitherDecode . toLazyByteString . fromEncoding
62 enc = eitherDecode . toLazyByteString . fromEncoding
tests/golden/generic.expectednew file+48
@@ -0,0 +1,48 @@
1+OneConstructor
2+Error in $: parsing Types.OneConstructor(OneConstructor) failed, expected Array, but encountered String
3+Error in $: parsing Types.OneConstructor(OneConstructor) failed, expected an empty Array, but encountered an Array of length 1
4+Nullary
5+Error in $: parsing Types.Nullary failed, expected one of the tags ["C1","C2","C3"], but found tag "X"
6+Error in $: parsing Types.Nullary failed, expected String, but encountered Array
7+SomeType (tagged)
8+Error in $.contents: parsing Int failed, expected Number, but encountered Boolean
9+Error in $: parsing Types.SomeType(Unary) failed, key "contents" not found
10+Error in $: parsing Types.SomeType(Record) failed, key "testone" not found
11+Error in $.testone: parsing Double failed, unexpected Boolean
12+Error in $.tag: parsing Types.SomeType failed, expected tag field to be one of ["nullary","unary","product","record","list"], but found tag "X"
13+Error in $: parsing Types.SomeType failed, expected Object with key "tag" containing one of ["nullary","unary","product","record","list"], key "tag" not found
14+Error in $: parsing Types.SomeType failed, expected Object, but encountered Array
15+SomeType (single-field)
16+Error in $.unary: parsing Int failed, expected Number, but encountered Object
17+Error in $.unary: parsing Int failed, expected Number, but encountered Array
18+Error in $: parsing Types.SomeType failed, expected an Object with a single pair where the tag is one of ["nullary","unary","product","record","list"], but found tag "X"
19+Error in $: parsing Types.SomeType failed, expected an Object with a single pair, but found 2 pairs
20+Error in $: parsing Types.SomeType failed, expected an Object with a single pair, but found 0 pairs
21+Error in $: parsing Types.SomeType failed, expected Object, but encountered Array
22+Error in $: not enough input. Expecting ':'
23+Error in $: not enough input. Expecting object value
24+Error in $: not enough input. Expecting ',' or '}'
25+SomeType (two-element array)
26+Error in $[1]: parsing Int failed, expected Number, but encountered Boolean
27+Error in $[1]: parsing Types.SomeType(Record) failed, expected Object, but encountered Null
28+Error in $[0]: parsing Types.SomeType failed, expected tag of the 2-element Array to be one of ["nullary","unary","product","record","list"], but found tag "X"
29+Error in $[0]: parsing Types.SomeType failed, tag element is not a String
30+Error in $: parsing Types.SomeType failed, expected a 2-element Array, but encountered an Array of length 0
31+Error in $: parsing Types.SomeType failed, expected Array, but encountered Object
32+Error in $: not enough input. Expecting ',' or ']'
33+Error in $: not enough input. Expecting json list value
34+SomeType (reject unknown fields)
35+Error in $: parsing Types.SomeType(Record) failed, unknown fields: ["testZero"]
36+Error in $: parsing Types.SomeType failed, expected Object with key "tag" containing one of ["nullary","unary","product","record","list"], key "tag" not found
37+Error in $: parsing Types.SomeType(Record) failed, unknown fields: ["testtwo","testone","testthree"]
38+Foo (reject unknown fields)
39+Error in $: parsing Types.Foo(Foo) failed, unknown fields: ["tag"]
40+Foo (reject unknown fields, tagged single)
41+Error in $: parsing Types.Foo(Foo) failed, unknown fields: ["unknownField"]
42+EitherTextInt
43+Error in $: parsing Types.EitherTextInt(NoneNullary) failed, expected tag "nonenullary", but found tag "X"
44+Error in $: parsing Types.EitherTextInt(NoneNullary) failed, expected String, but encountered Array
45+Product2 Int Bool
46+Error in $[1]: expected Bool, but encountered Null
47+Error in $: parsing Types.Product2(Product2) failed, expected an Array of length 2, but encountered an Array of length 0
48+Error in $: parsing Types.Product2(Product2) failed, expected Array, but encountered Object
tests/golden/simple.expectednew file+22
@@ -0,0 +1,22 @@
1+Int
2+Error in $: parsing Int failed, expected Number, but encountered String
3+Error in $: parsing Int failed, expected Number, but encountered Array
4+Error in $: parsing Int failed, expected Number, but encountered Object
5+Error in $: parsing Int failed, expected Number, but encountered Null
6+Integer
7+Error in $: parsing Integer failed, unexpected floating number 44.44
8+Natural
9+Error in $: parsing Natural failed, unexpected floating number 44.44
10+Error in $: parsing Natural failed, unexpected negative number -50
11+String
12+Error in $: expected String, but encountered Number
13+Error in $: expected String, but encountered Array
14+Error in $: expected String, but encountered Object
15+Error in $: expected String, but encountered Null
16+HashMap
17+Error in $: parsing HashMap failed, expected Object, but encountered String
18+Error in $: parsing HashMap failed, expected Object, but encountered Array
19+Either
20+Error in $[1].Left[1]: expected Bool, but encountered Number
21+Seq
22+Error in $[2]: parsing Int failed, expected Number, but encountered Boolean
travis/cabal_macros.hnew file+448
@@ -0,0 +1,448 @@
1+/* DO NOT EDIT: This file is automatically generated by Cabal */
2+
3+/* package aeson-1.4.4.0 */
4+#ifndef VERSION_aeson
5+#define VERSION_aeson "1.4.4.0"
6+#endif /* VERSION_aeson */
7+#ifndef MIN_VERSION_aeson
8+#define MIN_VERSION_aeson(major1,major2,minor) (\
9+ (major1) < 1 || \
10+ (major1) == 1 && (major2) < 4 || \
11+ (major1) == 1 && (major2) == 4 && (minor) <= 4)
12+#endif /* MIN_VERSION_aeson */
13+
14+/* package Diff-0.3.4 */
15+#ifndef VERSION_Diff
16+#define VERSION_Diff "0.3.4"
17+#endif /* VERSION_Diff */
18+#ifndef MIN_VERSION_Diff
19+#define MIN_VERSION_Diff(major1,major2,minor) (\
20+ (major1) < 0 || \
21+ (major1) == 0 && (major2) < 3 || \
22+ (major1) == 0 && (major2) == 3 && (minor) <= 4)
23+#endif /* MIN_VERSION_Diff */
24+
25+/* package QuickCheck-2.13.1 */
26+#ifndef VERSION_QuickCheck
27+#define VERSION_QuickCheck "2.13.1"
28+#endif /* VERSION_QuickCheck */
29+#ifndef MIN_VERSION_QuickCheck
30+#define MIN_VERSION_QuickCheck(major1,major2,minor) (\
31+ (major1) < 2 || \
32+ (major1) == 2 && (major2) < 13 || \
33+ (major1) == 2 && (major2) == 13 && (minor) <= 1)
34+#endif /* MIN_VERSION_QuickCheck */
35+
36+/* package aeson-1.4.4.0 */
37+#ifndef VERSION_aeson
38+#define VERSION_aeson "1.4.4.0"
39+#endif /* VERSION_aeson */
40+#ifndef MIN_VERSION_aeson
41+#define MIN_VERSION_aeson(major1,major2,minor) (\
42+ (major1) < 1 || \
43+ (major1) == 1 && (major2) < 4 || \
44+ (major1) == 1 && (major2) == 4 && (minor) <= 4)
45+#endif /* MIN_VERSION_aeson */
46+
47+/* package attoparsec-0.13.2.2 */
48+#ifndef VERSION_attoparsec
49+#define VERSION_attoparsec "0.13.2.2"
50+#endif /* VERSION_attoparsec */
51+#ifndef MIN_VERSION_attoparsec
52+#define MIN_VERSION_attoparsec(major1,major2,minor) (\
53+ (major1) < 0 || \
54+ (major1) == 0 && (major2) < 13 || \
55+ (major1) == 0 && (major2) == 13 && (minor) <= 2)
56+#endif /* MIN_VERSION_attoparsec */
57+
58+/* package base-4.12.0.0 */
59+#ifndef VERSION_base
60+#define VERSION_base "4.12.0.0"
61+#endif /* VERSION_base */
62+#ifndef MIN_VERSION_base
63+#define MIN_VERSION_base(major1,major2,minor) (\
64+ (major1) < 4 || \
65+ (major1) == 4 && (major2) < 12 || \
66+ (major1) == 4 && (major2) == 12 && (minor) <= 0)
67+#endif /* MIN_VERSION_base */
68+
69+/* package base-compat-0.10.5 */
70+#ifndef VERSION_base_compat
71+#define VERSION_base_compat "0.10.5"
72+#endif /* VERSION_base_compat */
73+#ifndef MIN_VERSION_base_compat
74+#define MIN_VERSION_base_compat(major1,major2,minor) (\
75+ (major1) < 0 || \
76+ (major1) == 0 && (major2) < 10 || \
77+ (major1) == 0 && (major2) == 10 && (minor) <= 5)
78+#endif /* MIN_VERSION_base_compat */
79+
80+/* package base-orphans-0.8.1 */
81+#ifndef VERSION_base_orphans
82+#define VERSION_base_orphans "0.8.1"
83+#endif /* VERSION_base_orphans */
84+#ifndef MIN_VERSION_base_orphans
85+#define MIN_VERSION_base_orphans(major1,major2,minor) (\
86+ (major1) < 0 || \
87+ (major1) == 0 && (major2) < 8 || \
88+ (major1) == 0 && (major2) == 8 && (minor) <= 1)
89+#endif /* MIN_VERSION_base_orphans */
90+
91+/* package base16-bytestring-0.1.1.6 */
92+#ifndef VERSION_base16_bytestring
93+#define VERSION_base16_bytestring "0.1.1.6"
94+#endif /* VERSION_base16_bytestring */
95+#ifndef MIN_VERSION_base16_bytestring
96+#define MIN_VERSION_base16_bytestring(major1,major2,minor) (\
97+ (major1) < 0 || \
98+ (major1) == 0 && (major2) < 1 || \
99+ (major1) == 0 && (major2) == 1 && (minor) <= 1)
100+#endif /* MIN_VERSION_base16_bytestring */
101+
102+/* package bytestring-0.10.8.2 */
103+#ifndef VERSION_bytestring
104+#define VERSION_bytestring "0.10.8.2"
105+#endif /* VERSION_bytestring */
106+#ifndef MIN_VERSION_bytestring
107+#define MIN_VERSION_bytestring(major1,major2,minor) (\
108+ (major1) < 0 || \
109+ (major1) == 0 && (major2) < 10 || \
110+ (major1) == 0 && (major2) == 10 && (minor) <= 8)
111+#endif /* MIN_VERSION_bytestring */
112+
113+/* package containers-0.6.0.1 */
114+#ifndef VERSION_containers
115+#define VERSION_containers "0.6.0.1"
116+#endif /* VERSION_containers */
117+#ifndef MIN_VERSION_containers
118+#define MIN_VERSION_containers(major1,major2,minor) (\
119+ (major1) < 0 || \
120+ (major1) == 0 && (major2) < 6 || \
121+ (major1) == 0 && (major2) == 6 && (minor) <= 0)
122+#endif /* MIN_VERSION_containers */
123+
124+/* package directory-1.3.3.0 */
125+#ifndef VERSION_directory
126+#define VERSION_directory "1.3.3.0"
127+#endif /* VERSION_directory */
128+#ifndef MIN_VERSION_directory
129+#define MIN_VERSION_directory(major1,major2,minor) (\
130+ (major1) < 1 || \
131+ (major1) == 1 && (major2) < 3 || \
132+ (major1) == 1 && (major2) == 3 && (minor) <= 3)
133+#endif /* MIN_VERSION_directory */
134+
135+/* package dlist-0.8.0.6 */
136+#ifndef VERSION_dlist
137+#define VERSION_dlist "0.8.0.6"
138+#endif /* VERSION_dlist */
139+#ifndef MIN_VERSION_dlist
140+#define MIN_VERSION_dlist(major1,major2,minor) (\
141+ (major1) < 0 || \
142+ (major1) == 0 && (major2) < 8 || \
143+ (major1) == 0 && (major2) == 8 && (minor) <= 0)
144+#endif /* MIN_VERSION_dlist */
145+
146+/* package filepath-1.4.2.1 */
147+#ifndef VERSION_filepath
148+#define VERSION_filepath "1.4.2.1"
149+#endif /* VERSION_filepath */
150+#ifndef MIN_VERSION_filepath
151+#define MIN_VERSION_filepath(major1,major2,minor) (\
152+ (major1) < 1 || \
153+ (major1) == 1 && (major2) < 4 || \
154+ (major1) == 1 && (major2) == 4 && (minor) <= 2)
155+#endif /* MIN_VERSION_filepath */
156+
157+/* package generic-deriving-1.12.4 */
158+#ifndef VERSION_generic_deriving
159+#define VERSION_generic_deriving "1.12.4"
160+#endif /* VERSION_generic_deriving */
161+#ifndef MIN_VERSION_generic_deriving
162+#define MIN_VERSION_generic_deriving(major1,major2,minor) (\
163+ (major1) < 1 || \
164+ (major1) == 1 && (major2) < 12 || \
165+ (major1) == 1 && (major2) == 12 && (minor) <= 4)
166+#endif /* MIN_VERSION_generic_deriving */
167+
168+/* package ghc-prim-0.5.3 */
169+#ifndef VERSION_ghc_prim
170+#define VERSION_ghc_prim "0.5.3"
171+#endif /* VERSION_ghc_prim */
172+#ifndef MIN_VERSION_ghc_prim
173+#define MIN_VERSION_ghc_prim(major1,major2,minor) (\
174+ (major1) < 0 || \
175+ (major1) == 0 && (major2) < 5 || \
176+ (major1) == 0 && (major2) == 5 && (minor) <= 3)
177+#endif /* MIN_VERSION_ghc_prim */
178+
179+/* package hashable-1.3.0.0 */
180+#ifndef VERSION_hashable
181+#define VERSION_hashable "1.3.0.0"
182+#endif /* VERSION_hashable */
183+#ifndef MIN_VERSION_hashable
184+#define MIN_VERSION_hashable(major1,major2,minor) (\
185+ (major1) < 1 || \
186+ (major1) == 1 && (major2) < 3 || \
187+ (major1) == 1 && (major2) == 3 && (minor) <= 0)
188+#endif /* MIN_VERSION_hashable */
189+
190+/* package hashable-time-0.2.0.2 */
191+#ifndef VERSION_hashable_time
192+#define VERSION_hashable_time "0.2.0.2"
193+#endif /* VERSION_hashable_time */
194+#ifndef MIN_VERSION_hashable_time
195+#define MIN_VERSION_hashable_time(major1,major2,minor) (\
196+ (major1) < 0 || \
197+ (major1) == 0 && (major2) < 2 || \
198+ (major1) == 0 && (major2) == 2 && (minor) <= 0)
199+#endif /* MIN_VERSION_hashable_time */
200+
201+/* package integer-logarithms-1.0.3 */
202+#ifndef VERSION_integer_logarithms
203+#define VERSION_integer_logarithms "1.0.3"
204+#endif /* VERSION_integer_logarithms */
205+#ifndef MIN_VERSION_integer_logarithms
206+#define MIN_VERSION_integer_logarithms(major1,major2,minor) (\
207+ (major1) < 1 || \
208+ (major1) == 1 && (major2) < 0 || \
209+ (major1) == 1 && (major2) == 0 && (minor) <= 3)
210+#endif /* MIN_VERSION_integer_logarithms */
211+
212+/* package quickcheck-instances-0.3.21 */
213+#ifndef VERSION_quickcheck_instances
214+#define VERSION_quickcheck_instances "0.3.21"
215+#endif /* VERSION_quickcheck_instances */
216+#ifndef MIN_VERSION_quickcheck_instances
217+#define MIN_VERSION_quickcheck_instances(major1,major2,minor) (\
218+ (major1) < 0 || \
219+ (major1) == 0 && (major2) < 3 || \
220+ (major1) == 0 && (major2) == 3 && (minor) <= 21)
221+#endif /* MIN_VERSION_quickcheck_instances */
222+
223+/* package scientific-0.3.6.2 */
224+#ifndef VERSION_scientific
225+#define VERSION_scientific "0.3.6.2"
226+#endif /* VERSION_scientific */
227+#ifndef MIN_VERSION_scientific
228+#define MIN_VERSION_scientific(major1,major2,minor) (\
229+ (major1) < 0 || \
230+ (major1) == 0 && (major2) < 3 || \
231+ (major1) == 0 && (major2) == 3 && (minor) <= 6)
232+#endif /* MIN_VERSION_scientific */
233+
234+/* package tagged-0.8.6 */
235+#ifndef VERSION_tagged
236+#define VERSION_tagged "0.8.6"
237+#endif /* VERSION_tagged */
238+#ifndef MIN_VERSION_tagged
239+#define MIN_VERSION_tagged(major1,major2,minor) (\
240+ (major1) < 0 || \
241+ (major1) == 0 && (major2) < 8 || \
242+ (major1) == 0 && (major2) == 8 && (minor) <= 6)
243+#endif /* MIN_VERSION_tagged */
244+
245+/* package tasty-1.2.3 */
246+#ifndef VERSION_tasty
247+#define VERSION_tasty "1.2.3"
248+#endif /* VERSION_tasty */
249+#ifndef MIN_VERSION_tasty
250+#define MIN_VERSION_tasty(major1,major2,minor) (\
251+ (major1) < 1 || \
252+ (major1) == 1 && (major2) < 2 || \
253+ (major1) == 1 && (major2) == 2 && (minor) <= 3)
254+#endif /* MIN_VERSION_tasty */
255+
256+/* package tasty-golden-2.3.2 */
257+#ifndef VERSION_tasty_golden
258+#define VERSION_tasty_golden "2.3.2"
259+#endif /* VERSION_tasty_golden */
260+#ifndef MIN_VERSION_tasty_golden
261+#define MIN_VERSION_tasty_golden(major1,major2,minor) (\
262+ (major1) < 2 || \
263+ (major1) == 2 && (major2) < 3 || \
264+ (major1) == 2 && (major2) == 3 && (minor) <= 2)
265+#endif /* MIN_VERSION_tasty_golden */
266+
267+/* package tasty-hunit-0.10.0.2 */
268+#ifndef VERSION_tasty_hunit
269+#define VERSION_tasty_hunit "0.10.0.2"
270+#endif /* VERSION_tasty_hunit */
271+#ifndef MIN_VERSION_tasty_hunit
272+#define MIN_VERSION_tasty_hunit(major1,major2,minor) (\
273+ (major1) < 0 || \
274+ (major1) == 0 && (major2) < 10 || \
275+ (major1) == 0 && (major2) == 10 && (minor) <= 0)
276+#endif /* MIN_VERSION_tasty_hunit */
277+
278+/* package tasty-quickcheck-0.10.1 */
279+#ifndef VERSION_tasty_quickcheck
280+#define VERSION_tasty_quickcheck "0.10.1"
281+#endif /* VERSION_tasty_quickcheck */
282+#ifndef MIN_VERSION_tasty_quickcheck
283+#define MIN_VERSION_tasty_quickcheck(major1,major2,minor) (\
284+ (major1) < 0 || \
285+ (major1) == 0 && (major2) < 10 || \
286+ (major1) == 0 && (major2) == 10 && (minor) <= 1)
287+#endif /* MIN_VERSION_tasty_quickcheck */
288+
289+/* package template-haskell-2.14.0.0 */
290+#ifndef VERSION_template_haskell
291+#define VERSION_template_haskell "2.14.0.0"
292+#endif /* VERSION_template_haskell */
293+#ifndef MIN_VERSION_template_haskell
294+#define MIN_VERSION_template_haskell(major1,major2,minor) (\
295+ (major1) < 2 || \
296+ (major1) == 2 && (major2) < 14 || \
297+ (major1) == 2 && (major2) == 14 && (minor) <= 0)
298+#endif /* MIN_VERSION_template_haskell */
299+
300+/* package text-1.2.3.1 */
301+#ifndef VERSION_text
302+#define VERSION_text "1.2.3.1"
303+#endif /* VERSION_text */
304+#ifndef MIN_VERSION_text
305+#define MIN_VERSION_text(major1,major2,minor) (\
306+ (major1) < 1 || \
307+ (major1) == 1 && (major2) < 2 || \
308+ (major1) == 1 && (major2) == 2 && (minor) <= 3)
309+#endif /* MIN_VERSION_text */
310+
311+/* package time-1.8.0.2 */
312+#ifndef VERSION_time
313+#define VERSION_time "1.8.0.2"
314+#endif /* VERSION_time */
315+#ifndef MIN_VERSION_time
316+#define MIN_VERSION_time(major1,major2,minor) (\
317+ (major1) < 1 || \
318+ (major1) == 1 && (major2) < 8 || \
319+ (major1) == 1 && (major2) == 8 && (minor) <= 0)
320+#endif /* MIN_VERSION_time */
321+
322+/* package time-compat-1.9.2.2 */
323+#ifndef VERSION_time_compat
324+#define VERSION_time_compat "1.9.2.2"
325+#endif /* VERSION_time_compat */
326+#ifndef MIN_VERSION_time_compat
327+#define MIN_VERSION_time_compat(major1,major2,minor) (\
328+ (major1) < 1 || \
329+ (major1) == 1 && (major2) < 9 || \
330+ (major1) == 1 && (major2) == 9 && (minor) <= 2)
331+#endif /* MIN_VERSION_time_compat */
332+
333+/* package unordered-containers-0.2.10.0 */
334+#ifndef VERSION_unordered_containers
335+#define VERSION_unordered_containers "0.2.10.0"
336+#endif /* VERSION_unordered_containers */
337+#ifndef MIN_VERSION_unordered_containers
338+#define MIN_VERSION_unordered_containers(major1,major2,minor) (\
339+ (major1) < 0 || \
340+ (major1) == 0 && (major2) < 2 || \
341+ (major1) == 0 && (major2) == 2 && (minor) <= 10)
342+#endif /* MIN_VERSION_unordered_containers */
343+
344+/* package uuid-types-1.0.3 */
345+#ifndef VERSION_uuid_types
346+#define VERSION_uuid_types "1.0.3"
347+#endif /* VERSION_uuid_types */
348+#ifndef MIN_VERSION_uuid_types
349+#define MIN_VERSION_uuid_types(major1,major2,minor) (\
350+ (major1) < 1 || \
351+ (major1) == 1 && (major2) < 0 || \
352+ (major1) == 1 && (major2) == 0 && (minor) <= 3)
353+#endif /* MIN_VERSION_uuid_types */
354+
355+/* package vector-0.12.0.3 */
356+#ifndef VERSION_vector
357+#define VERSION_vector "0.12.0.3"
358+#endif /* VERSION_vector */
359+#ifndef MIN_VERSION_vector
360+#define MIN_VERSION_vector(major1,major2,minor) (\
361+ (major1) < 0 || \
362+ (major1) == 0 && (major2) < 12 || \
363+ (major1) == 0 && (major2) == 12 && (minor) <= 0)
364+#endif /* MIN_VERSION_vector */
365+
366+/* tool gcc-4.2.1 */
367+#ifndef TOOL_VERSION_gcc
368+#define TOOL_VERSION_gcc "4.2.1"
369+#endif /* TOOL_VERSION_gcc */
370+#ifndef MIN_TOOL_VERSION_gcc
371+#define MIN_TOOL_VERSION_gcc(major1,major2,minor) (\
372+ (major1) < 4 || \
373+ (major1) == 4 && (major2) < 2 || \
374+ (major1) == 4 && (major2) == 2 && (minor) <= 1)
375+#endif /* MIN_TOOL_VERSION_gcc */
376+
377+/* tool ghc-8.6.5 */
378+#ifndef TOOL_VERSION_ghc
379+#define TOOL_VERSION_ghc "8.6.5"
380+#endif /* TOOL_VERSION_ghc */
381+#ifndef MIN_TOOL_VERSION_ghc
382+#define MIN_TOOL_VERSION_ghc(major1,major2,minor) (\
383+ (major1) < 8 || \
384+ (major1) == 8 && (major2) < 6 || \
385+ (major1) == 8 && (major2) == 6 && (minor) <= 5)
386+#endif /* MIN_TOOL_VERSION_ghc */
387+
388+/* tool ghc-pkg-8.6.5 */
389+#ifndef TOOL_VERSION_ghc_pkg
390+#define TOOL_VERSION_ghc_pkg "8.6.5"
391+#endif /* TOOL_VERSION_ghc_pkg */
392+#ifndef MIN_TOOL_VERSION_ghc_pkg
393+#define MIN_TOOL_VERSION_ghc_pkg(major1,major2,minor) (\
394+ (major1) < 8 || \
395+ (major1) == 8 && (major2) < 6 || \
396+ (major1) == 8 && (major2) == 6 && (minor) <= 5)
397+#endif /* MIN_TOOL_VERSION_ghc_pkg */
398+
399+/* tool haddock-2.22.0 */
400+#ifndef TOOL_VERSION_haddock
401+#define TOOL_VERSION_haddock "2.22.0"
402+#endif /* TOOL_VERSION_haddock */
403+#ifndef MIN_TOOL_VERSION_haddock
404+#define MIN_TOOL_VERSION_haddock(major1,major2,minor) (\
405+ (major1) < 2 || \
406+ (major1) == 2 && (major2) < 22 || \
407+ (major1) == 2 && (major2) == 22 && (minor) <= 0)
408+#endif /* MIN_TOOL_VERSION_haddock */
409+
410+/* tool hpc-0.67 */
411+#ifndef TOOL_VERSION_hpc
412+#define TOOL_VERSION_hpc "0.67"
413+#endif /* TOOL_VERSION_hpc */
414+#ifndef MIN_TOOL_VERSION_hpc
415+#define MIN_TOOL_VERSION_hpc(major1,major2,minor) (\
416+ (major1) < 0 || \
417+ (major1) == 0 && (major2) < 67 || \
418+ (major1) == 0 && (major2) == 67 && (minor) <= 0)
419+#endif /* MIN_TOOL_VERSION_hpc */
420+
421+/* tool hsc2hs-0.68.5 */
422+#ifndef TOOL_VERSION_hsc2hs
423+#define TOOL_VERSION_hsc2hs "0.68.5"
424+#endif /* TOOL_VERSION_hsc2hs */
425+#ifndef MIN_TOOL_VERSION_hsc2hs
426+#define MIN_TOOL_VERSION_hsc2hs(major1,major2,minor) (\
427+ (major1) < 0 || \
428+ (major1) == 0 && (major2) < 68 || \
429+ (major1) == 0 && (major2) == 68 && (minor) <= 5)
430+#endif /* MIN_TOOL_VERSION_hsc2hs */
431+
432+/* tool runghc-8.6.5 */
433+#ifndef TOOL_VERSION_runghc
434+#define TOOL_VERSION_runghc "8.6.5"
435+#endif /* TOOL_VERSION_runghc */
436+#ifndef MIN_TOOL_VERSION_runghc
437+#define MIN_TOOL_VERSION_runghc(major1,major2,minor) (\
438+ (major1) < 8 || \
439+ (major1) == 8 && (major2) < 6 || \
440+ (major1) == 8 && (major2) == 6 && (minor) <= 5)
441+#endif /* MIN_TOOL_VERSION_runghc */
442+
443+#ifndef CURRENT_COMPONENT_ID
444+#define CURRENT_COMPONENT_ID "aeson-1.4.4.0-inplace-tests"
445+#endif /* CURRENT_COMPONENT_ID */
446+#ifndef CURRENT_PACKAGE_VERSION
447+#define CURRENT_PACKAGE_VERSION "1.4.4.0"
448+#endif /* CURRENT_PACKAGE_VERSION */
travis/install.sh+11
@@ -7,6 +7,11 @@ echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo
7stack --version
7stack --version
8
8
9case $BUILD in
9case $BUILD in
10+ hlint)
11+ echo "Downloading hlint"
12+ curl -sSL https://raw.github.com/ndmitchell/hlint/master/misc/run.sh > hlint.sh
13+ chmod +x hlint.sh
14+ ;;
10 stack)
15 stack)
11 stack --no-terminal --skip-ghc-check setup
16 stack --no-terminal --skip-ghc-check setup
12 stack --no-terminal --skip-ghc-check test --only-snapshot
17 stack --no-terminal --skip-ghc-check test --only-snapshot
@@ -44,4 +49,10 @@ case $BUILD in
44 cp -a $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin installplan.txt $HOME/.cabsnap/;
49 cp -a $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin installplan.txt $HOME/.cabsnap/;
45 fi
50 fi
46 ;;
51 ;;
52+ cabal2)
53+ cabal v2-update -v
54+ sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
55+
56+ cabal v2-build --only-dependencies --enable-tests --enable-benchmarks --dry
57+ ;;
47esac
58esac
travis/script.sh+8−1
@@ -4,7 +4,7 @@ set -ex
4
4
5case $BUILD in
5case $BUILD in
6 stack)
6 stack)
7− stack build --test --haddock
7+ stack build --test --haddock --no-terminal
8 ;;
8 ;;
9 cabal)
9 cabal)
10 if [ -f configure.ac ]; then autoreconf -i; fi
10 if [ -f configure.ac ]; then autoreconf -i; fi
@@ -19,4 +19,11 @@ case $BUILD in
19 SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&
19 SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&
20 (cd dist && cabal install --force-reinstalls "$SRC_TGZ")
20 (cd dist && cabal install --force-reinstalls "$SRC_TGZ")
21 ;;
21 ;;
22+ cabal2)
23+ cabal v2-build --enable-tests --enable-benchmarks
24+ cabal v2-test --enable-tests --enable-benchmarks
25+ ;;
26+ hlint)
27+ make lint
28+ ;;
22esac
29esac