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+42−21
@@ -12,38 +12,59 @@ 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:
27+
22− - env: BUILD=hlint CABALVER=1.24 GHCVER=8.0.2
28+ - env: BUILD=hlint CABALVER=2.2 GHCVER=8.4.4
23− compiler: ": #GHC 8.0.2"
29+ compiler: ": #GHC 8.4.4"
24− addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
30+ addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.4], sources: [hvr-ghc]}}
31+
25− - env: BUILD=stack CABALVER=1.24 GHCVER=8.0.2 STACK_YAML=stack-bench.yaml
32+ - env: BUILD=stack CABALVER=2.4 GHCVER=8.6.5 STACK_YAML=stack-bench.yaml
26− compiler: ": #GHC 8.0.2"
33+ compiler: ": #GHC 8.6.5"
27− addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
34+ addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.5], sources: [hvr-ghc]}}
35+
28− - env: BUILD=stack CABALVER=1.24 GHCVER=8.0.2 STACK_YAML=stack-pure-unescape.yaml
36+ - env: BUILD=stack CABALVER=2.2 GHCVER=8.6.5 STACK_YAML=stack-ffi-unescape.yaml
29− compiler: ": #GHC 8.0.2"
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"
30− addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
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+
31− - env: BUILD=cabal CABALVER=1.24 GHCVER=8.0.2
56+ - env: BUILD=cabal CABALVER=2.0 GHCVER=8.0.2
32 compiler: ": #GHC 8.0.2"
57 compiler: ": #GHC 8.0.2"
33− addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
58+ addons: {apt: {packages: [cabal-install-2.0,ghc-8.0.2], sources: [hvr-ghc]}}
34− - env: BUILD=cabal CABALVER=1.18 GHCVER=7.4.2
59+
35− compiler: ": #GHC 7.4.2"
36− addons: {apt: {packages: [cabal-install-1.18,ghc-7.4.2], sources: [hvr-ghc]}}
37− - env: BUILD=cabal CABALVER=1.18 GHCVER=7.6.3
38− compiler: ": #GHC 7.6.3"
39− addons: {apt: {packages: [cabal-install-1.18,ghc-7.6.3], sources: [hvr-ghc]}}
40− - env: BUILD=cabal CABALVER=1.18 GHCVER=7.8.4
41− compiler: ": #GHC 7.8.4"
42− addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
43 - env: BUILD=cabal CABALVER=1.22 GHCVER=7.10.3
60 - env: BUILD=cabal CABALVER=1.22 GHCVER=7.10.3
44 compiler: ": #GHC 7.10.3"
61 compiler: ": #GHC 7.10.3"
45 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]}}
46
63
64+ - env: BUILD=cabal CABALVER=1.18 GHCVER=7.8.4
65+ compiler: ": #GHC 7.8.4"
66+ addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
67+
47before_install:
68before_install:
48 - unset CC
69 - unset CC
49 - export PATH=$HOME/.local/bin:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
70 - export PATH=$HOME/.local/bin:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
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+77−5
@@ -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
@@ -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+2−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
@@ -49,6 +51,5 @@ module Data.Aeson.Encoding
49 , value
51 , value
50 ) where
52 ) where
51
53
52−import Prelude ()
53
54
54import Data.Aeson.Encoding.Internal
55import Data.Aeson.Encoding.Internal
Data/Aeson/Encoding/Builder.hs+6−80
@@ -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)
@@ -269,62 +254,3 @@ twoDigits a = T (digit hi) (digit lo)
269
254
270digit :: Int -> Char
255digit :: Int -> Char
271digit x = chr (x + 48)
256digit x = chr (x + 48)
272−
273−#if !(MIN_VERSION_bytestring(0,10,4))
274−-- | Encode text using UTF-8 encoding and escape the ASCII characters using
275−-- a 'BP.BoundedPrim'.
276−--
277−-- Use this function is to implement efficient encoders for text-based formats
278−-- like JSON or HTML.
279−{-# INLINE encodeUtf8BuilderEscaped #-}
280−-- TODO: Extend documentation with references to source code in @blaze-html@
281−-- or @aeson@ that uses this function.
282−encodeUtf8BuilderEscaped :: BP.BoundedPrim Word8 -> Text -> B.Builder
283−encodeUtf8BuilderEscaped be =
284− -- manual eta-expansion to ensure inlining works as expected
285− \txt -> B.builder (mkBuildstep txt)
286− where
287− bound = max 4 $ BP.sizeBound be
288−
289− mkBuildstep (Text arr off len) !k =
290− outerLoop off
291− where
292− iend = off + len
293−
294− outerLoop !i0 br@(B.BufferRange op0 ope)
295− | i0 >= iend = k br
296− | outRemaining > 0 = goPartial (i0 + min outRemaining inpRemaining)
297− -- TODO: Use a loop with an integrated bound's check if outRemaining
298− -- is smaller than 8, as this will save on divisions.
299− | otherwise = return $ B.bufferFull bound op0 (outerLoop i0)
300− where
301− outRemaining = (ope `minusPtr` op0) `div` bound
302− inpRemaining = iend - i0
303−
304− goPartial !iendTmp = go i0 op0
305− where
306− go !i !op
307− | i < iendTmp = case A.unsafeIndex arr i of
308− w | w <= 0x7F ->
309− BP.runB be (fromIntegral w) op >>= go (i + 1)
310− | w <= 0x7FF -> do
311− poke8 0 $ (w `shiftR` 6) + 0xC0
312− poke8 1 $ (w .&. 0x3f) + 0x80
313− go (i + 1) (op `plusPtr` 2)
314− | 0xD800 <= w && w <= 0xDBFF -> do
315− let c = ord $ U16.chr2 w (A.unsafeIndex arr (i+1))
316− poke8 0 $ (c `shiftR` 18) + 0xF0
317− poke8 1 $ ((c `shiftR` 12) .&. 0x3F) + 0x80
318− poke8 2 $ ((c `shiftR` 6) .&. 0x3F) + 0x80
319− poke8 3 $ (c .&. 0x3F) + 0x80
320− go (i + 2) (op `plusPtr` 4)
321− | otherwise -> do
322− poke8 0 $ (w `shiftR` 12) + 0xE0
323− poke8 1 $ ((w `shiftR` 6) .&. 0x3F) + 0x80
324− poke8 2 $ (w .&. 0x3F) + 0x80
325− go (i + 1) (op `plusPtr` 3)
326− | otherwise =
327− outerLoop i (B.BufferRange op ope)
328− where
329− poke8 j v = poke (op `plusPtr` j) (fromIntegral v :: Word8)
330−#endif
Data/Aeson/Encoding/Internal.hs+3−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
@@ -55,7 +57,6 @@ module Data.Aeson.Encoding.Internal
55 , comma, colon, openBracket, closeBracket, openCurly, closeCurly
57 , comma, colon, openBracket, closeBracket, openCurly, closeCurly
56 ) where
58 ) where
57
59
58−import Prelude ()
59import Prelude.Compat
60import Prelude.Compat
60
61
61import Data.Aeson.Types.Internal (Value)
62import Data.Aeson.Types.Internal (Value)
@@ -81,7 +82,7 @@ newtype Encoding' tag = Encoding {
81 -- ^ Acquire the underlying bytestring builder.
82 -- ^ Acquire the underlying bytestring builder.
82 } deriving (Typeable)
83 } deriving (Typeable)
83
84
84−-- | Often used synonnym for 'Encoding''.
85+-- | Often used synonym for 'Encoding''.
85type Encoding = Encoding' Value
86type Encoding = Encoding' Value
86
87
87-- | Make Encoding from Builder.
88-- | Make Encoding from Builder.
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/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−65
@@ -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,23 +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−-- This hint will no longer trigger once hlint > 1.9.41 is released.
225−{-# ANN S ("HLint: ignore Use newtype instead of data" :: String) #-}
226−#else
227 startState = False
360 startState = False
228 go a c
361 go a c
229 | a = Just False
362 | a = Just False
@@ -257,7 +390,12 @@ eitherDecodeWith p to s =
257 L.Done _ v -> case to v of
390 L.Done _ v -> case to v of
258 ISuccess a -> Right a
391 ISuccess a -> Right a
259 IError path msg -> Left (path, msg)
392 IError path msg -> Left (path, msg)
260− 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
261{-# INLINE eitherDecodeWith #-}
399{-# INLINE eitherDecodeWith #-}
262
400
263eitherDecodeStrictWith :: Parser Value -> (Value -> IResult a) -> B.ByteString
401eitherDecodeStrictWith :: Parser Value -> (Value -> IResult a) -> B.ByteString
@@ -310,14 +448,13 @@ data SP = SP !Integer {-# UNPACK #-}!Int
310
448
311decimal0 :: Parser Integer
449decimal0 :: Parser Integer
312decimal0 = do
450decimal0 = do
313− let step a w = a * 10 + fromIntegral (w - zero)
314− zero = 48
451+ let zero = 48
315 digits <- A.takeWhile1 isDigit_w8
452 digits <- A.takeWhile1 isDigit_w8
316 if B.length digits > 1 && B.unsafeHead digits == zero
453 if B.length digits > 1 && B.unsafeHead digits == zero
317 then fail "leading zero"
454 then fail "leading zero"
318− else return (B.foldl' step 0 digits)
455+ else return (bsToInteger digits)
319
456
320−{-# INLINE scientific #-}
457+-- | Parse a JSON number.
321scientific :: Parser Scientific
458scientific :: Parser Scientific
322scientific = do
459scientific = do
323 let minus = 45
460 let minus = 45
@@ -347,3 +484,54 @@ scientific = do
347 (A.satisfy (\ex -> ex == littleE || ex == bigE) *>
484 (A.satisfy (\ex -> ex == littleE || ex == bigE) *>
348 fmap (Sci.scientific signedCoeff . (e +)) (signed decimal)) <|>
485 fmap (Sci.scientific signedCoeff . (e +)) (signed decimal)) <|>
349 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+2−1
@@ -1,3 +1,5 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
1module Data.Aeson.Parser.Time
3module Data.Aeson.Parser.Time
2 (
4 (
3 run
5 run
@@ -9,7 +11,6 @@ module Data.Aeson.Parser.Time
9 , zonedTime
11 , zonedTime
10 ) where
12 ) where
11
13
12−import Prelude ()
13import Prelude.Compat
14import Prelude.Compat
14
15
15import Data.Attoparsec.Text (Parser)
16import Data.Attoparsec.Text (Parser)
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+436−860
@@ -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,385 +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] | not (tagSingleConstructors opts) -> [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] | not (tagSingleConstructors opts) -> [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
369+-- | Wrap fields of a non-record constructor. See 'sumToValue'.
406−sumToValue :: Options -> Bool -> Bool -> Name -> Q Exp -> Q Exp
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 nullary 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} ->
415+ -- TODO: Maybe throw an error in case
416+ -- tagFieldName overwrites a field in pairs.
413− let tag = infixApp [|T.pack tagFieldName|] [|(.=)|] (conStr opts conName)
417+ let tag = pairE tagFieldName (conStr target opts conName)
414− contents = infixApp [|T.pack contentsFieldName|] [|(.=)|] exp
418+ content = pairs contentsFieldName
415− in
419+ in fromPairsE $
416− [|A.object|] `appE` listE (if nullary then [tag] else [tag, contents])
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
420− ]
421− UntaggedValue | nullary -> conStr opts conName
423+ UntaggedValue | nullary -> conStr target opts conName
422− UntaggedValue -> exp
424+ UntaggedValue -> value
423− | otherwise = exp
425+ | otherwise = value
424
426
425-- | Generates code to generate the JSON encoding of a single constructor.
427-- | Generates code to generate the JSON encoding of a single constructor.
426−argsToValue :: JSONClass -> [(Name, Name)] -> Options -> Bool -> Con -> Q Match
428+argsToValue :: ToJSONFun -> JSONClass -> TyVarMap -> Options -> Bool -> ConstructorInfo -> Q Match
427
429
428-- Polyadic constructors with special case for unary constructors.
430-- Polyadic constructors with special case for unary constructors.
429−argsToValue jc tjs opts multiCons (NormalC conName ts) = do
431+argsToValue target jc tvMap opts multiCons
430− (argTys, tvMap) <- reifyConTys jc tjs conName
432+ ConstructorInfo { constructorName = conName
433+ , constructorVariant = NormalConstructor
434+ , constructorFields = argTys } = do
435+ argTys' <- mapM resolveTypeSynonyms argTys
431− let len = length ts
436+ let len = length argTys'
432 args <- newNameList "arg" len
437 args <- newNameList "arg" len
433− js <- case [ dispatchToJSON jc conName tvMap argTy
438+ let js = case [ dispatchToJSON target jc conName tvMap argTy
434− `appE` varE arg
439+ `appE` varE arg
435− | (arg, argTy) <- zip args argTys
440+ | (arg, argTy) <- zip args argTys'
436− ] of
441+ ] of
437− -- Single argument is directly converted.
442+ -- Single argument is directly converted.
438− [e] -> return e
443+ [e] -> e
439− -- Multiple arguments are converted to a JSON array.
444+ -- Zero and multiple arguments are converted to a JSON array.
440− es -> do
445+ es -> array target es
441− mv <- newName "mv"
446+
442− let newMV = bindS (varP mv)
443− ([|VM.unsafeNew|] `appE`
444− litE (integerL $ fromIntegral len))
445− stmts = [ noBindS $
446− [|VM.unsafeWrite|] `appE`
447− varE mv `appE`
448− litE (integerL ix) `appE`
449− e
450− | (ix, e) <- zip [(0::Integer)..] es
451− ]
452− ret = noBindS $ [|return|] `appE` varE mv
453− return $ [|Array|] `appE`
454− (varE 'V.create `appE`
455− doE (newMV:stmts++[ret]))
456 match (conP conName $ map varP args)
447 match (conP conName $ map varP args)
457− (normalB $ sumToValue opts multiCons (null ts) conName js)
448+ (normalB $ opaqueSumToValue target opts multiCons (null argTys') conName js)
458 []
449 []
459
450
460-- Records.
451-- Records.
452+argsToValue target jc tvMap opts multiCons
453+ info@ConstructorInfo { constructorName = conName
454+ , constructorVariant = RecordConstructor fields
455+ , constructorFields = argTys } =
461−argsToValue jc tjs opts multiCons (RecC conName ts) = case (unwrapUnaryRecords opts, not multiCons, ts) of
456+ case (unwrapUnaryRecords opts, not multiCons, argTys) of
462− (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})
463− _ -> do
459+ _ -> do
464− (argTys, tvMap) <- reifyConTys jc tjs conName
460+ argTys' <- mapM resolveTypeSynonyms argTys
465− args <- newNameList "arg" $ length ts
461+ args <- newNameList "arg" $ length argTys'
466− let exp = [|A.object|] `appE` pairs
467−
468− pairs | omitNothingFields opts = infixApp maybeFields
462+ let pairs | omitNothingFields opts = infixApp maybeFields
469− [|(++)|]
463+ [|(Monoid.<>)|]
470− restFields
464+ restFields
471− | otherwise = listE $ map toPair argCons
465+ | otherwise = mconcatE (map pureToPair argCons)
472−
466+
473− argCons = zip3 args argTys ts
467+ argCons = zip3 (map varE args) argTys' fields
474−
468+
475− maybeFields = [|catMaybes|] `appE` listE (map maybeToPair maybes)
469+ maybeFields = mconcatE (map maybeToPair maybes)
476−
470+
477− restFields = listE $ map toPair rest
471+ restFields = mconcatE (map pureToPair rest)
478−
472+
479− (maybes, rest) = partition isMaybe argCons
473+ (maybes0, rest0) = partition isMaybe argCons
480−
474+ (options, rest) = partition isOption rest0
481− maybeToPair (arg, argTy, (field, _, _)) =
475+ maybes = maybes0 ++ map optionToMaybe options
482− infixApp ([|keyValuePairWith|]
476+
483− `appE` dispatchToJSON jc conName tvMap argTy
477+ maybeToPair = toPairLifted True
484− `appE` toFieldName field)
478+ pureToPair = toPairLifted False
485− [|(<$>)|]
479+
486− (varE arg)
487−
488− toPair (arg, argTy, (field, _, _)) =
480+ toPairLifted lifted (arg, argTy, field) =
489− [|keyValuePairWith|]
490− `appE` dispatchToJSON jc conName tvMap argTy
481+ let toValue = dispatchToJSON target jc conName tvMap argTy
491− `appE` toFieldName field
482+ fieldName = fieldLabel opts field
492− `appE` varE arg
483+ e arg' = pairE fieldName (toValue `appE` arg')
493−
484+ in if lifted
494− toFieldName field = [|T.pack|] `appE` fieldLabelExp opts field
485+ then do
495−
486+ x <- newName "x"
487+ [|maybe mempty|] `appE` lam1E (varP x) (e (varE x)) `appE` arg
488+ else e arg
489+
496− match (conP conName $ map varP args)
490+ match (conP conName $ map varP args)
497− ( normalB
491+ (normalB $ recordSumToValue target opts multiCons (null argTys) conName pairs)
498− $ if multiCons
499− then case sumEncoding opts of
500− TwoElemArray -> [|toJSON|] `appE` tupE [conStr opts conName, exp]
501− TaggedObject{tagFieldName} ->
502− [|A.object|] `appE`
503− -- TODO: Maybe throw an error in case
504− -- tagFieldName overwrites a field in pairs.
505− infixApp (infixApp [|T.pack tagFieldName|]
506− [|(.=)|]
507− (conStr opts conName))
508− [|(:)|]
509− pairs
510− ObjectWithSingleField ->
511− [|A.object|] `appE` listE
512− [ infixApp (conTxt opts conName) [|(.=)|] exp ]
513− UntaggedValue -> exp
514− else exp
515− ) []
492+ []
516
493
517-- Infix constructors.
494-- Infix constructors.
518−argsToValue jc tjs opts multiCons (InfixC _ conName _) = do
495+argsToValue target jc tvMap opts multiCons
519− ([alTy, arTy], tvMap) <- reifyConTys jc tjs conName
496+ ConstructorInfo { constructorName = conName
497+ , constructorVariant = InfixConstructor
498+ , constructorFields = argTys } = do
499+ [alTy, arTy] <- mapM resolveTypeSynonyms argTys
520 al <- newName "argL"
500 al <- newName "argL"
521 ar <- newName "argR"
501 ar <- newName "argR"
522 match (infixP (varP al) conName (varP ar))
502 match (infixP (varP al) conName (varP ar))
523 ( normalB
503 ( normalB
524− $ sumToValue opts multiCons False conName
504+ $ opaqueSumToValue target opts multiCons False conName
505+ $ array target
525− $ [|toJSON|] `appE` listE [ dispatchToJSON jc conName tvMap aTy
506+ [ dispatchToJSON target jc conName tvMap aTy
526− `appE` varE a
507+ `appE` varE a
527− | (a, aTy) <- [(al,alTy), (ar,arTy)]
508+ | (a, aTy) <- [(al,alTy), (ar,arTy)]
528− ]
509+ ]
529 )
510 )
530 []
511 []
531−-- Existentially quantified constructors.
532−argsToValue jc tjs opts multiCons (ForallC _ _ con) =
533− argsToValue jc tjs opts multiCons con
534
512
535−#if MIN_VERSION_template_haskell(2,11,0)
513+isMaybe :: (a, Type, b) -> Bool
536−-- GADTs.
514+isMaybe (_, AppT (ConT t) _, _) = t == ''Maybe
537−argsToValue jc tjs opts multiCons (GadtC conNames ts _) =
515+isMaybe _ = False
538− argsToValue jc tjs opts multiCons $ NormalC (head conNames) ts
539
516
540−argsToValue jc tjs opts multiCons (RecGadtC conNames ts _) =
517+isOption :: (a, Type, b) -> Bool
541− argsToValue jc tjs opts multiCons $ RecC (head conNames) ts
518+isOption (_, AppT (ConT t) _, _) = t == ''Semigroup.Option
542−#endif
519+isOption _ = False
543
520
544−isMaybe :: (a, b, (c, d, Type)) -> Bool
521+optionToMaybe :: (ExpQ, b, c) -> (ExpQ, b, c)
545−isMaybe (_, _, (_, _, AppT (ConT t) _)) = t == ''Maybe
522+optionToMaybe (a, b, c) = ([|Semigroup.getOption|] `appE` a, b, c)
546−isMaybe _ = False
547
523
548(<^>) :: ExpQ -> ExpQ -> ExpQ
524(<^>) :: ExpQ -> ExpQ -> ExpQ
549(<^>) a b = infixApp a [|(E.><)|] b
525(<^>) a b = infixApp a [|(E.><)|] b
550infixr 6 <^>
526infixr 6 <^>
551
527
552−(<:>) :: ExpQ -> ExpQ -> ExpQ
553−(<:>) a b = a <^> [|E.colon|] <^> b
554−infixr 5 <:>
555−
556(<%>) :: ExpQ -> ExpQ -> ExpQ
528(<%>) :: ExpQ -> ExpQ -> ExpQ
557(<%>) a b = a <^> [|E.comma|] <^> b
529(<%>) a b = a <^> [|E.comma|] <^> b
558infixr 4 <%>
530infixr 4 <%>
559
531
560−array :: ExpQ -> ExpQ
532+-- | Wrap a list of quoted 'Value's in a quoted 'Array' (of type 'Value').
561−array exp = [|E.wrapArray|] `appE` exp
533+array :: ToJSONFun -> [ExpQ] -> ExpQ
562−
534+array Encoding [] = [|E.emptyArray_|]
563−object :: ExpQ -> ExpQ
535+array Value [] = [|Array V.empty|]
564−object exp = [|E.wrapObject|] `appE` exp
536+array Encoding es = [|E.wrapArray|] `appE` foldr1 (<%>) es
565−
537+array Value es = do
566−sumToEncoding :: Options -> Bool -> Bool -> Name -> Q Exp -> Q Exp
538+ mv <- newName "mv"
567−sumToEncoding opts multiCons nullary conName exp
539+ let newMV = bindS (varP mv)
568− | multiCons =
540+ ([|VM.unsafeNew|] `appE`
569− let fexp = exp in
541+ litE (integerL $ fromIntegral (length es)))
570− case sumEncoding opts of
542+ stmts = [ noBindS $
571− TwoElemArray ->
543+ [|VM.unsafeWrite|] `appE`
572− array (encStr opts conName <%> fexp)
544+ varE mv `appE`
573− TaggedObject{tagFieldName, contentsFieldName} ->
545+ litE (integerL ix) `appE`
574− let tag = [|E.text (T.pack tagFieldName)|] <:> encStr opts conName
546+ e
575− contents = [|E.text (T.pack contentsFieldName)|] <:> fexp
547+ | (ix, e) <- zip [(0::Integer)..] es
576− in
548+ ]
577− object $
549+ ret = noBindS $ [|return|] `appE` varE mv
578− if nullary then tag else tag <%> contents
550+ [|Array|] `appE`
579− ObjectWithSingleField ->
551+ (varE 'V.create `appE`
580− object (encStr opts conName <:> fexp)
552+ doE (newMV:stmts++[ret]))
581− UntaggedValue | nullary -> encStr opts conName
582− UntaggedValue -> exp
583− | otherwise = exp
584−
585−-- | Generates code to generate the JSON encoding of a single constructor.
586−argsToEncoding :: JSONClass -> [(Name, Name)] -> Options -> Bool -> Con -> Q Match
587−
588−-- Polyadic constructors with special case for unary constructors.
589−argsToEncoding jc tes opts multiCons (NormalC conName ts) = do
590− (argTys, tvMap) <- reifyConTys jc tes conName
591− let len = length ts
592− args <- newNameList "arg" len
593− js <- case zip args argTys of
594− -- Nullary constructors are converted to an empty array.
595− [] -> return [| E.emptyArray_ |]
596−
597− -- Single argument is directly converted.
598− [(e,eTy)] -> return (dispatchToEncoding jc conName tvMap eTy
599− `appE` varE e)
600− -- Multiple arguments are converted to a JSON array.
601− es ->
602− return (array (foldr1 (<%>) [ dispatchToEncoding jc conName tvMap xTy
603− `appE` varE x
604− | (x,xTy) <- es
605− ]))
606− match (conP conName $ map varP args)
607− (normalB $ sumToEncoding opts multiCons (null ts) conName js)
608− []
609−
610−-- Records.
611−argsToEncoding jc tes opts multiCons (RecC conName ts) = case (unwrapUnaryRecords opts, not multiCons, ts) of
612− (True,True,[(_,st,ty)]) -> argsToEncoding jc tes opts multiCons (NormalC conName [(st,ty)])
613− _ -> do
614− args <- newNameList "arg" $ length ts
615− (argTys, tvMap) <- reifyConTys jc tes conName
616− let exp = object objBody
617−
618− objBody = [|E.econcat|] `appE`
619− ([|intersperse E.comma|] `appE` pairs)
620− pairs | omitNothingFields opts = infixApp maybeFields
621− [|(++)|]
622− restFields
623− | otherwise = listE (map toPair argCons)
624−
625− argCons = zip3 args argTys ts
626−
627− maybeFields = [|catMaybes|] `appE` listE (map maybeToPair maybes)
628−
629− restFields = listE (map toPair rest)
630−
631− (maybes, rest) = partition isMaybe argCons
632−
633− maybeToPair (arg, argTy, (field, _, _)) =
634− infixApp
635− (infixApp
636− (infixE
637− (Just $ toFieldName field <^> [|E.colon|])
638− [|(E.><)|]
639− Nothing)
640− [|(.)|]
641− (dispatchToEncoding jc conName tvMap argTy))
642− [|(<$>)|]
643− (varE arg)
644−
645− toPair (arg, argTy, (field, _, _)) =
646− toFieldName field
647− <:> dispatchToEncoding jc conName tvMap argTy
648− `appE` varE arg
649−
650− toFieldName field = [|E.text|] `appE`
651− ([|T.pack|] `appE` fieldLabelExp opts field)
652
553
653− match (conP conName $ map varP args)
554+-- | Wrap an associative list of keys and quoted values in a quoted 'Object'.
654− ( normalB
555+objectE :: [(String, ExpQ)] -> ExpQ
655− $ if multiCons
556+objectE = fromPairsE . mconcatE . fmap (uncurry pairE)
656− then case sumEncoding opts of
657− TwoElemArray -> array $
658− encStr opts conName <%> exp
659− TaggedObject{tagFieldName} -> object $
660− ([|E.text (T.pack tagFieldName)|] <:>
661− encStr opts conName) <%>
662− objBody
663− ObjectWithSingleField -> object $
664− encStr opts conName <:> exp
665− UntaggedValue -> exp
666− else exp
667− ) []
668
557
669−-- Infix constructors.
558+-- | 'mconcat' a list of fixed length.
670−argsToEncoding jc tes opts multiCons (InfixC _ conName _) = do
559+--
671− al <- newName "argL"
560+-- > mconcatE [ [|x|], [|y|], [|z|] ] = [| x <> (y <> z) |]
672− ar <- newName "argR"
561+mconcatE :: [ExpQ] -> ExpQ
673− ([alTy,arTy], tvMap) <- reifyConTys jc tes conName
562+mconcatE [] = [|Monoid.mempty|]
674− match (infixP (varP al) conName (varP ar))
563+mconcatE [x] = x
675− ( normalB
564+mconcatE (x : xs) = infixApp x [|(Monoid.<>)|] (mconcatE xs)
676− $ sumToEncoding opts multiCons False conName
677− $ array (foldr1 (<%>) [ dispatchToEncoding jc conName tvMap aTy
678− `appE` varE a
679− | (a,aTy) <- [(al,alTy), (ar,arTy)]
680− ])
681− )
682− []
683−-- Existentially quantified constructors.
684−argsToEncoding jc tes opts multiCons (ForallC _ _ con) =
685− argsToEncoding jc tes opts multiCons con
686
565
687−#if MIN_VERSION_template_haskell(2,11,0)
566+fromPairsE :: ExpQ -> ExpQ
688−-- GADTs.
567+fromPairsE = ([|fromPairs|] `appE`)
689−argsToEncoding jc tes opts multiCons (GadtC conNames ts _) =
690− argsToEncoding jc tes opts multiCons $ NormalC (head conNames) ts
691
568
692−argsToEncoding jc tes opts multiCons (RecGadtC conNames ts _) =
569+-- | Create (an encoding of) a key-value pair.
693− argsToEncoding jc tes opts multiCons $ RecC (head conNames) ts
570+--
694−#endif
571+-- > pairE "k" [|v|] = [|pair "k" v|]
572+pairE :: String -> ExpQ -> ExpQ
573+pairE k v = [|pair k|] `appE` v
695
574
696--------------------------------------------------------------------------------
575--------------------------------------------------------------------------------
697-- FromJSON
576-- FromJSON
@@ -775,33 +654,41 @@ consFromJSON :: JSONClass
775 -- ^ Name of the type to which the constructors belong.
654 -- ^ Name of the type to which the constructors belong.
776 -> Options
655 -> Options
777 -- ^ Encoding options
656 -- ^ Encoding options
778− -> [Con]
657+ -> [Type]
658+ -- ^ The types from the data type/data family instance declaration
659+ -> [ConstructorInfo]
779 -- ^ Constructors for which to generate JSON parsing code.
660 -- ^ Constructors for which to generate JSON parsing code.
780 -> Q Exp
661 -> Q Exp
781
662
782−consFromJSON _ _ _ [] = error $ "Data.Aeson.TH.consFromJSON: "
663+consFromJSON _ _ _ _ [] = error $ "Data.Aeson.TH.consFromJSON: "
783− ++ "Not a single constructor given!"
664+ ++ "Not a single constructor given!"
784
665
785−consFromJSON jc tName opts cons = do
666+consFromJSON jc tName opts instTys cons = do
786 value <- newName "value"
667 value <- newName "value"
787 pjs <- newNameList "_pj" $ arityInt jc
668 pjs <- newNameList "_pj" $ arityInt jc
788 pjls <- newNameList "_pjl" $ arityInt jc
669 pjls <- newNameList "_pjl" $ arityInt jc
789 let zippedPJs = zip pjs pjls
670 let zippedPJs = zip pjs pjls
790 interleavedPJs = interleave pjs pjls
671 interleavedPJs = interleave pjs pjls
791− lamE (map varP $ interleavedPJs ++ [value]) $ lamExpr value zippedPJs
672+ lastTyVars = map varTToName $ drop (length instTys - arityInt jc) instTys
673+ tvMap = M.fromList $ zip lastTyVars zippedPJs
674+ lamE (map varP $ interleavedPJs ++ [value]) $ lamExpr value tvMap
792
675
793 where
676 where
794− lamExpr value pjs = case cons of
677+ checkExi tvMap con = checkExistentialContext jc tvMap
678+ (constructorContext con)
679+ (constructorName con)
680+
681+ lamExpr value tvMap = case cons of
795 [con]
682 [con]
796 | not (tagSingleConstructors opts)
683 | not (tagSingleConstructors opts)
797− -> parseArgs jc pjs tName opts con (Right value)
684+ -> checkExi tvMap con $ parseArgs jc tvMap tName opts con (Right value)
798 _ | sumEncoding opts == UntaggedValue
685 _ | sumEncoding opts == UntaggedValue
799− -> parseUntaggedValue pjs cons value
686+ -> parseUntaggedValue tvMap cons value
800 | otherwise
687 | otherwise
801 -> caseE (varE value) $
688 -> caseE (varE value) $
802 if allNullaryToStringTag opts && all isNullary cons
689 if allNullaryToStringTag opts && all isNullary cons
803 then allNullaryMatches
690 then allNullaryMatches
804− else mixedMatches pjs
691+ else mixedMatches tvMap
805
692
806 allNullaryMatches =
693 allNullaryMatches =
807 [ do txt <- newName "txt"
694 [ do txt <- newName "txt"
@@ -810,12 +697,11 @@ consFromJSON jc tName opts cons = do
810 [ liftM2 (,) (normalG $
697 [ liftM2 (,) (normalG $
811 infixApp (varE txt)
698 infixApp (varE txt)
812 [|(==)|]
699 [|(==)|]
813− ([|T.pack|] `appE`
700+ (conTxt opts conName)
814− conStringE opts conName)
815 )
701 )
816 ([|pure|] `appE` conE conName)
702 ([|pure|] `appE` conE conName)
817 | con <- cons
703 | con <- cons
818− , let conName = getConName con
704+ , let conName = constructorName con
819 ]
705 ]
820 ++
706 ++
821 [ liftM2 (,)
707 [ liftM2 (,)
@@ -836,13 +722,13 @@ consFromJSON jc tName opts cons = do
836 []
722 []
837 ]
723 ]
838
724
839− mixedMatches pjs =
725+ mixedMatches tvMap =
840 case sumEncoding opts of
726 case sumEncoding opts of
841 TaggedObject {tagFieldName, contentsFieldName} ->
727 TaggedObject {tagFieldName, contentsFieldName} ->
842− parseObject $ parseTaggedObject pjs tagFieldName contentsFieldName
728+ parseObject $ parseTaggedObject tvMap tagFieldName contentsFieldName
843 UntaggedValue -> error "UntaggedValue: Should be handled already"
729 UntaggedValue -> error "UntaggedValue: Should be handled already"
844 ObjectWithSingleField ->
730 ObjectWithSingleField ->
845− parseObject $ parseObjectWithSingleField pjs
731+ parseObject $ parseObjectWithSingleField tvMap
846 TwoElemArray ->
732 TwoElemArray ->
847 [ do arr <- newName "array"
733 [ do arr <- newName "array"
848 match (conP 'Array [varP arr])
734 match (conP 'Array [varP arr])
@@ -850,7 +736,7 @@ consFromJSON jc tName opts cons = do
850 [ liftM2 (,) (normalG $ infixApp ([|V.length|] `appE` varE arr)
736 [ liftM2 (,) (normalG $ infixApp ([|V.length|] `appE` varE arr)
851 [|(==)|]
737 [|(==)|]
852 (litE $ integerL 2))
738 (litE $ integerL 2))
853− (parse2ElemArray pjs arr)
739+ (parse2ElemArray tvMap arr)
854 , liftM2 (,) (normalG [|otherwise|])
740 , liftM2 (,) (normalG [|otherwise|])
855 ([|not2ElemArray|]
741 ([|not2ElemArray|]
856 `appE` litE (stringL $ show tName)
742 `appE` litE (stringL $ show tName)
@@ -881,25 +767,29 @@ consFromJSON jc tName opts cons = do
881 []
767 []
882 ]
768 ]
883
769
884− parseTaggedObject pjs typFieldName valFieldName obj = do
770+ parseTaggedObject tvMap typFieldName valFieldName obj = do
885 conKey <- newName "conKey"
771 conKey <- newName "conKey"
886 doE [ bindS (varP conKey)
772 doE [ bindS (varP conKey)
887 (infixApp (varE obj)
773 (infixApp (varE obj)
888 [|(.:)|]
774 [|(.:)|]
889 ([|T.pack|] `appE` stringE typFieldName))
775 ([|T.pack|] `appE` stringE typFieldName))
890− , noBindS $ parseContents pjs conKey (Left (valFieldName, obj)) 'conNotFoundFailTaggedObject
776+ , noBindS $ parseContents tvMap conKey (Left (valFieldName, obj)) 'conNotFoundFailTaggedObject
891 ]
777 ]
892
778
893− parseUntaggedValue pjs cons' conVal =
779+ parseUntaggedValue tvMap cons' conVal =
894 foldr1 (\e e' -> infixApp e [|(<|>)|] e')
780 foldr1 (\e e' -> infixApp e [|(<|>)|] e')
895− (map (\x -> parseValue pjs x conVal) cons')
781+ (map (\x -> parseValue tvMap x conVal) cons')
896
782
897− parseValue _pjs (NormalC conName []) conVal = do
783+ parseValue _tvMap
784+ ConstructorInfo { constructorName = conName
785+ , constructorVariant = NormalConstructor
786+ , constructorFields = [] }
787+ conVal = do
898 str <- newName "str"
788 str <- newName "str"
899 caseE (varE conVal)
789 caseE (varE conVal)
900 [ match (conP 'String [varP str])
790 [ match (conP 'String [varP str])
901 (guardedB
791 (guardedB
902− [ liftM2 (,) (normalG $ infixApp (varE str) [|(==)|] ([|T.pack|] `appE` conStringE opts conName)
792+ [ liftM2 (,) (normalG $ infixApp (varE str) [|(==)|] (conTxt opts conName)
903 )
793 )
904 ([|pure|] `appE` conE conName)
794 ([|pure|] `appE` conE conName)
905 ]
795 ]
@@ -907,11 +797,11 @@ consFromJSON jc tName opts cons = do
907 []
797 []
908 , matchFailed tName conName "String"
798 , matchFailed tName conName "String"
909 ]
799 ]
910− parseValue pjs con conVal =
800+ parseValue tvMap con conVal =
911− parseArgs jc pjs tName opts con (Right conVal)
801+ checkExi tvMap con $ parseArgs jc tvMap tName opts con (Right conVal)
912
802
913
803
914− parse2ElemArray pjs arr = do
804+ parse2ElemArray tvMap arr = do
915 conKey <- newName "conKey"
805 conKey <- newName "conKey"
916 conVal <- newName "conVal"
806 conVal <- newName "conVal"
917 let letIx n ix =
807 let letIx n ix =
@@ -926,7 +816,7 @@ consFromJSON jc tName opts cons = do
926 (caseE (varE conKey)
816 (caseE (varE conKey)
927 [ do txt <- newName "txt"
817 [ do txt <- newName "txt"
928 match (conP 'String [varP txt])
818 match (conP 'String [varP txt])
929− (normalB $ parseContents pjs
819+ (normalB $ parseContents tvMap
930 txt
820 txt
931 (Right conVal)
821 (Right conVal)
932 'conNotFoundFail2ElemArray
822 'conNotFoundFail2ElemArray
@@ -943,12 +833,12 @@ consFromJSON jc tName opts cons = do
943 ]
833 ]
944 )
834 )
945
835
946− parseObjectWithSingleField pjs obj = do
836+ parseObjectWithSingleField tvMap obj = do
947 conKey <- newName "conKey"
837 conKey <- newName "conKey"
948 conVal <- newName "conVal"
838 conVal <- newName "conVal"
949 caseE ([e|H.toList|] `appE` varE obj)
839 caseE ([e|H.toList|] `appE` varE obj)
950 [ match (listP [tupP [varP conKey, varP conVal]])
840 [ match (listP [tupP [varP conKey, varP conVal]])
951− (normalB $ parseContents pjs conKey (Right conVal) 'conNotFoundFailObjectSingleField)
841+ (normalB $ parseContents tvMap conKey (Right conVal) 'conNotFoundFailObjectSingleField)
952 []
842 []
953 , do other <- newName "other"
843 , do other <- newName "other"
954 match (varP other)
844 match (varP other)
@@ -959,7 +849,7 @@ consFromJSON jc tName opts cons = do
959 []
849 []
960 ]
850 ]
961
851
962− parseContents pjs conKey contents errorFun =
852+ parseContents tvMap conKey contents errorFun =
963 caseE (varE conKey)
853 caseE (varE conKey)
964 [ match wildP
854 [ match wildP
965 ( guardedB $
855 ( guardedB $
@@ -967,7 +857,8 @@ consFromJSON jc tName opts cons = do
967 [|(==)|]
857 [|(==)|]
968 ([|T.pack|] `appE`
858 ([|T.pack|] `appE`
969 conNameExp opts con)
859 conNameExp opts con)
970− e <- parseArgs jc pjs tName opts con contents
860+ e <- checkExi tvMap con $
861+ parseArgs jc tvMap tName opts con contents
971 return (g, e)
862 return (g, e)
972 | con <- cons
863 | con <- cons
973 ]
864 ]
@@ -980,7 +871,7 @@ consFromJSON jc tName opts cons = do
980 . stringL
871 . stringL
981 . constructorTagModifier opts
872 . constructorTagModifier opts
982 . nameBase
873 . nameBase
983− . getConName
874+ . constructorName
984 ) cons
875 ) cons
985 )
876 )
986 `appE` ([|T.unpack|] `appE` varE conKey)
877 `appE` ([|T.unpack|] `appE` varE conKey)
@@ -1029,22 +920,42 @@ parseRecord :: JSONClass
1029 -> Options
920 -> Options
1030 -> Name
921 -> Name
1031 -> Name
922 -> Name
1032− -> [VarStrictType]
923+ -> [Name]
1033 -> Name
924 -> Name
925+ -> Bool
1034 -> ExpQ
926 -> ExpQ
1035−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) $
1036 foldl' (\a b -> infixApp a [|(<*>)|] b)
931 foldl' (\a b -> infixApp a [|(<*>)|] b)
1037 (infixApp (conE conName) [|(<$>)|] x)
932 (infixApp (conE conName) [|(<$>)|] x)
1038 xs
933 xs
1039 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+ ]
1040 x:xs = [ [|lookupField|]
951 x:xs = [ [|lookupField|]
1041 `appE` dispatchParseJSON jc conName tvMap argTy
952 `appE` dispatchParseJSON jc conName tvMap argTy
1042 `appE` litE (stringL $ show tName)
953 `appE` litE (stringL $ show tName)
1043 `appE` litE (stringL $ constructorTagModifier opts $ nameBase conName)
954 `appE` litE (stringL $ constructorTagModifier opts $ nameBase conName)
1044 `appE` varE obj
955 `appE` varE obj
1045− `appE` ( [|T.pack|] `appE` fieldLabelExp opts field
956+ `appE` ( [|T.pack|] `appE` stringE (fieldLabel opts field)
1046 )
957 )
1047− | ((field, _, _), argTy) <- zip ts argTys
958+ | (field, argTy) <- zip fields argTys
1048 ]
959 ]
1049
960
1050getValField :: Name -> String -> [MatchQ] -> Q Exp
961getValField :: Name -> String -> [MatchQ] -> Q Exp
@@ -1063,67 +974,82 @@ matchCases (Right valName) = caseE (varE valName)
1063
974
1064-- | Generates code to parse the JSON encoding of a single constructor.
975-- | Generates code to parse the JSON encoding of a single constructor.
1065parseArgs :: JSONClass -- ^ The FromJSON variant being derived.
976parseArgs :: JSONClass -- ^ The FromJSON variant being derived.
1066− -> [(Name, Name)] -- ^ The names of the encoding/decoding function arguments.
977+ -> TyVarMap -- ^ Maps the last type variables to their decoding
978+ -- function arguments.
1067 -> Name -- ^ Name of the type to which the constructor belongs.
979 -> Name -- ^ Name of the type to which the constructor belongs.
1068 -> Options -- ^ Encoding options.
980 -> Options -- ^ Encoding options.
1069− -> Con -- ^ Constructor for which to generate JSON parsing code.
981+ -> ConstructorInfo -- ^ Constructor for which to generate JSON parsing code.
1070 -> Either (String, Name) Name -- ^ Left (valFieldName, objName) or
982 -> Either (String, Name) Name -- ^ Left (valFieldName, objName) or
1071 -- Right valName
983 -- Right valName
1072 -> Q Exp
984 -> Q Exp
1073-- Nullary constructors.
985-- Nullary constructors.
1074−parseArgs jc pjs _ _ (NormalC conName []) (Left _) = do
986+parseArgs _ _ _ _
1075− ([], _) <- reifyConTys jc pjs conName
987+ ConstructorInfo { constructorName = conName
1076− [|pure|] `appE` conE conName
988+ , constructorVariant = NormalConstructor
1077−parseArgs jc pjs tName _ (NormalC conName []) (Right valName) = do
989+ , constructorFields = [] }
1078− ([], _) <- reifyConTys jc pjs conName
990+ (Left _) =
1079− caseE (varE valName) $ parseNullaryMatches tName conName
991+ [|pure|] `appE` conE conName
992+parseArgs _ _ tName _
993+ ConstructorInfo { constructorName = conName
994+ , constructorVariant = NormalConstructor
995+ , constructorFields = [] }
996+ (Right valName) =
997+ caseE (varE valName) $ parseNullaryMatches tName conName
1080
998
1081-- Unary constructors.
999-- Unary constructors.
1082−parseArgs jc pjs _ _ (NormalC conName [_]) contents = do
1000+parseArgs jc tvMap _ _
1083− ([argTy], tvMap) <- reifyConTys jc pjs conName
1001+ ConstructorInfo { constructorName = conName
1084− matchCases contents $ parseUnaryMatches jc tvMap argTy conName
1002+ , constructorVariant = NormalConstructor
1003+ , constructorFields = [argTy] }
1004+ contents = do
1005+ argTy' <- resolveTypeSynonyms argTy
1006+ matchCases contents $ parseUnaryMatches jc tvMap argTy' conName
1085
1007
1086-- Polyadic constructors.
1008-- Polyadic constructors.
1087−parseArgs jc pjs tName _ (NormalC conName ts) contents = do
1009+parseArgs jc tvMap tName _
1088− (argTys, tvMap) <- reifyConTys jc pjs conName
1010+ ConstructorInfo { constructorName = conName
1089− let len = genericLength ts
1011+ , constructorVariant = NormalConstructor
1090− matchCases contents $ parseProduct jc tvMap argTys tName conName len
1012+ , constructorFields = argTys }
1013+ contents = do
1014+ argTys' <- mapM resolveTypeSynonyms argTys
1015+ let len = genericLength argTys'
1016+ matchCases contents $ parseProduct jc tvMap argTys' tName conName len
1091
1017
1092-- Records.
1018-- Records.
1093−parseArgs jc pjs tName opts (RecC conName ts) (Left (_, obj)) = do
1019+parseArgs jc tvMap tName opts
1094− (argTys, tvMap) <- reifyConTys jc pjs conName
1020+ ConstructorInfo { constructorName = conName
1095− parseRecord jc tvMap argTys opts tName conName ts obj
1021+ , constructorVariant = RecordConstructor fields
1096−parseArgs jc pjs tName opts (RecC conName ts) (Right valName) = case (unwrapUnaryRecords opts,ts) of
1022+ , constructorFields = argTys }
1097− (True,[(_,st,ty)])-> parseArgs jc pjs tName opts (NormalC conName [(st,ty)]) (Right valName)
1023+ (Left (_, obj)) = do
1098− _ -> do
1024+ argTys' <- mapM resolveTypeSynonyms argTys
1099− obj <- newName "recObj"
1025+ parseRecord jc tvMap argTys' opts tName conName fields obj True
1100− (argTys, tvMap) <- reifyConTys jc pjs conName
1026+parseArgs jc tvMap tName opts
1101− caseE (varE valName)
1027+ info@ConstructorInfo { constructorName = conName
1102− [ match (conP 'Object [varP obj]) (normalB $
1028+ , constructorVariant = RecordConstructor fields
1103− parseRecord jc tvMap argTys opts tName conName ts obj) []
1029+ , constructorFields = argTys }
1104− , matchFailed tName conName "Object"
1030+ (Right valName) =
1105− ]
1031+ case (unwrapUnaryRecords opts,argTys) of
1032+ (True,[_])-> parseArgs jc tvMap tName opts
1033+ (info{constructorVariant = NormalConstructor})
1034+ (Right valName)
1035+ _ -> do
1036+ obj <- newName "recObj"
1037+ argTys' <- mapM resolveTypeSynonyms argTys
1038+ caseE (varE valName)
1039+ [ match (conP 'Object [varP obj]) (normalB $
1040+ parseRecord jc tvMap argTys' opts tName conName fields obj False) []
1041+ , matchFailed tName conName "Object"
1042+ ]
1106
1043
1107-- Infix constructors. Apart from syntax these are the same as
1044-- Infix constructors. Apart from syntax these are the same as
1108-- polyadic constructors.
1045-- polyadic constructors.
1109−parseArgs jc pjs tName _ (InfixC _ conName _) contents = do
1046+parseArgs jc tvMap tName _
1110− (argTys, tvMap) <- reifyConTys jc pjs conName
1047+ ConstructorInfo { constructorName = conName
1111− matchCases contents $ parseProduct jc tvMap argTys tName conName 2
1048+ , constructorVariant = InfixConstructor
1112−
1049+ , constructorFields = argTys }
1113−-- Existentially quantified constructors. We ignore the quantifiers
1050+ contents = do
1114−-- and proceed with the contained constructor.
1051+ argTys' <- mapM resolveTypeSynonyms argTys
1115−parseArgs jc pjs tName opts (ForallC _ _ con) contents =
1052+ matchCases contents $ parseProduct jc tvMap argTys' tName conName 2
1116− parseArgs jc pjs tName opts con contents
1117−
1118−#if MIN_VERSION_template_haskell(2,11,0)
1119−-- GADTs. We ignore the refined return type and proceed as if it were a
1120−-- NormalC or RecC.
1121−parseArgs jc pjs tName opts (GadtC conNames ts _) contents =
1122− parseArgs jc pjs tName opts (NormalC (head conNames) ts) contents
1123−
1124−parseArgs jc pjs tName opts (RecGadtC conNames ts _) contents =
1125− parseArgs jc pjs tName opts (RecC (head conNames) ts) contents
1126−#endif
1127
1053
1128-- | Generates code to parse the JSON encoding of an n-ary
1054-- | Generates code to parse the JSON encoding of an n-ary
1129-- constructor.
1055-- constructor.
@@ -1200,6 +1126,11 @@ instance OVERLAPPABLE_ LookupField a where
1200instance INCOHERENT_ LookupField (Maybe a) where
1126instance INCOHERENT_ LookupField (Maybe a) where
1201 lookupField pj _ _ = parseOptionalFieldWith pj
1127 lookupField pj _ _ = parseOptionalFieldWith pj
1202
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+
1203lookupFieldWith :: (Value -> Parser a) -> String -> String
1134lookupFieldWith :: (Value -> Parser a) -> String -> String
1204 -> Object -> T.Text -> Parser a
1135 -> Object -> T.Text -> Parser a
1205lookupFieldWith pj tName rec obj key =
1136lookupFieldWith pj tName rec obj key =
@@ -1207,9 +1138,6 @@ lookupFieldWith pj tName rec obj key =
1207 Nothing -> unknownFieldFail tName rec (T.unpack key)
1138 Nothing -> unknownFieldFail tName rec (T.unpack key)
1208 Just v -> pj v <?> Key key
1139 Just v -> pj v <?> Key key
1209
1140
1210−keyValuePairWith :: (v -> Value) -> T.Text -> v -> Pair
1211−keyValuePairWith tj name value = (name, tj value)
1212−
1213unknownFieldFail :: String -> String -> String -> Parser fail
1141unknownFieldFail :: String -> String -> String -> Parser fail
1214unknownFieldFail tName rec key =
1142unknownFieldFail tName rec key =
1215 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."
@@ -1278,7 +1206,8 @@ deriveJSONBoth dtj dfj opts name =
1278 liftM2 (++) (dtj opts name) (dfj opts name)
1206 liftM2 (++) (dtj opts name) (dfj opts name)
1279
1207
1280-- | Functionality common to @deriveToJSON(1)(2)@ and @deriveFromJSON(1)(2)@.
1208-- | Functionality common to @deriveToJSON(1)(2)@ and @deriveFromJSON(1)(2)@.
1281−deriveJSONClass :: [(JSONFun, JSONClass -> Name -> Options -> [Con] -> Q Exp)]
1209+deriveJSONClass :: [(JSONFun, JSONClass -> Name -> Options -> [Type]
1210+ -> [ConstructorInfo] -> Q Exp)]
1282 -- ^ The class methods and the functions which derive them.
1211 -- ^ The class methods and the functions which derive them.
1283 -> JSONClass
1212 -> JSONClass
1284 -- ^ The class for which to generate an instance.
1213 -- ^ The class for which to generate an instance.
@@ -1288,27 +1217,34 @@ deriveJSONClass :: [(JSONFun, JSONClass -> Name -> Options -> [Con] -> Q Exp)]
1288 -- ^ Name of the type for which to generate a class instance
1217 -- ^ Name of the type for which to generate a class instance
1289 -- declaration.
1218 -- declaration.
1290 -> Q [Dec]
1219 -> Q [Dec]
1291−deriveJSONClass consFuns jc opts name =
1220+deriveJSONClass consFuns jc opts name = do
1292− withType name $ \name' ctxt tvbs cons mbTys ->
1221+ info <- reifyDatatype name
1293− (:[]) <$> fromCons name' ctxt tvbs cons mbTys
1222+ case info of
1294− where
1223+ DatatypeInfo { datatypeContext = ctxt
1295− fromCons :: Name -> Cxt -> [TyVarBndr] -> [Con] -> Maybe [Type] -> Q Dec
1224+ , datatypeName = parentName
1296− 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
1297 (instanceCxt, instanceType)
1233 (instanceCxt, instanceType)
1298− <- buildTypeInstance name' jc ctxt tvbs mbTys
1234+ <- buildTypeInstance parentName jc ctxt instTys variant
1299− instanceD (return instanceCxt)
1235+ (:[]) <$> instanceD (return instanceCxt)
1300− (return instanceType)
1236+ (return instanceType)
1301− (methodDecs name' cons)
1237+ (methodDecs parentName instTys cons)
1302−
1238+ where
1303− methodDecs :: Name -> [Con] -> [Q Dec]
1239+ methodDecs :: Name -> [Type] -> [ConstructorInfo] -> [Q Dec]
1304− methodDecs name' cons = flip map consFuns $ \(jf, jfMaker) ->
1240+ methodDecs parentName instTys cons = flip map consFuns $ \(jf, jfMaker) ->
1305 funD (jsonFunValName jf (arity jc))
1241 funD (jsonFunValName jf (arity jc))
1306 [ clause []
1242 [ clause []
1307− (normalB $ jfMaker jc name' opts cons)
1243+ (normalB $ jfMaker jc parentName opts instTys cons)
1308 []
1244 []
1309 ]
1245 ]
1310
1246
1311−mkFunCommon :: (JSONClass -> Name -> Options -> [Con] -> Q Exp)
1247+mkFunCommon :: (JSONClass -> Name -> Options -> [Type] -> [ConstructorInfo] -> Q Exp)
1312 -- ^ The function which derives the expression.
1248 -- ^ The function which derives the expression.
1313 -> JSONClass
1249 -> JSONClass
1314 -- ^ Which class's method is being derived.
1250 -- ^ Which class's method is being derived.
@@ -1317,15 +1253,24 @@ mkFunCommon :: (JSONClass -> Name -> Options -> [Con] -> Q Exp)
1317 -> Name
1253 -> Name
1318 -- ^ Name of the encoded type.
1254 -- ^ Name of the encoded type.
1319 -> Q Exp
1255 -> Q Exp
1320−mkFunCommon consFun jc opts name = withType name fromCons
1256+mkFunCommon consFun jc opts name = do
1321− where
1257+ info <- reifyDatatype name
1322− fromCons :: Name -> Cxt -> [TyVarBndr] -> [Con] -> Maybe [Type] -> Q Exp
1258+ case info of
1323− fromCons name' ctxt tvbs cons mbTys = do
1259+ DatatypeInfo { datatypeContext = ctxt
1324− -- We force buildTypeInstance here since it performs some checks for whether
1260+ , datatypeName = parentName
1325− -- or not the provided datatype's kind matches the derived method's
1261+#if MIN_VERSION_th_abstraction(0,3,0)
1326− -- typeclass, and produces errors if it can't.
1262+ , datatypeInstTypes = instTys
1327− !_ <- buildTypeInstance name' jc ctxt tvbs mbTys
1263+#else
1328− consFun jc name' opts cons
1264+ , datatypeVars = instTys
1265+#endif
1266+ , datatypeVariant = variant
1267+ , datatypeCons = cons
1268+ } -> do
1269+ -- We force buildTypeInstance here since it performs some checks for whether
1270+ -- or not the provided datatype's kind matches the derived method's
1271+ -- typeclass, and produces errors if it can't.
1272+ !_ <- buildTypeInstance parentName jc ctxt instTys variant
1273+ consFun jc parentName opts instTys cons
1329
1274
1330dispatchFunByType :: JSONClass
1275dispatchFunByType :: JSONClass
1331 -> JSONFun
1276 -> JSONFun
@@ -1370,200 +1315,37 @@ dispatchFunByType jc jf conName tvMap list ty = do
1370 (interleave rhsArgs rhsArgs)
1315 (interleave rhsArgs rhsArgs)
1371 else varE $ jsonFunValOrListName list jf Arity0
1316 else varE $ jsonFunValOrListName list jf Arity0
1372
1317
1373−dispatchToJSON, dispatchToEncoding, dispatchParseJSON
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+
1323+dispatchParseJSON
1374 :: JSONClass -> Name -> TyVarMap -> Type -> Q Exp
1324 :: JSONClass -> Name -> TyVarMap -> Type -> Q Exp
1375−dispatchToJSON jc n tvMap = dispatchFunByType jc ToJSON n tvMap False
1376−dispatchToEncoding jc n tvMap = dispatchFunByType jc ToEncoding n tvMap False
1377dispatchParseJSON jc n tvMap = dispatchFunByType jc ParseJSON n tvMap False
1325dispatchParseJSON jc n tvMap = dispatchFunByType jc ParseJSON n tvMap False
1378
1326
1379--------------------------------------------------------------------------------
1327--------------------------------------------------------------------------------
1380-- Utility functions
1328-- Utility functions
1381--------------------------------------------------------------------------------
1329--------------------------------------------------------------------------------
1382
1330
1383−-- | Boilerplate for top level splices.
1331+-- For the given Types, generate an instance context and head.
1384−--
1385−-- The given 'Name' must meet one of two criteria:
1386−--
1387−-- 1. It must be the name of a type constructor of a plain data type or newtype.
1388−-- 2. It must be the name of a data family instance or newtype instance constructor.
1389−
1390−-- Any other value will result in an exception.
1391−withType :: Name
1392− -> (Name -> Cxt -> [TyVarBndr] -> [Con] -> Maybe [Type] -> Q a)
1393− -- ^ Function that generates the actual code. Will be applied
1394− -- to the datatype/data family 'Name', datatype context, type
1395− -- variable binders and constructors extracted from the given
1396− -- 'Name'. If the 'Name' is from a data family instance
1397− -- constructor, it will also have its instantiated types;
1398− -- otherwise, it will be 'Nothing'.
1399− -> Q a
1400− -- ^ Resulting value in the 'Q'uasi monad.
1401−withType name f = do
1402− info <- reify name
1403− case info of
1404− TyConI dec ->
1405− case dec of
1406−#if MIN_VERSION_template_haskell(2,11,0)
1407− DataD ctxt _ tvbs _ cons _ -> f name ctxt tvbs cons Nothing
1408− NewtypeD ctxt _ tvbs _ con _ -> f name ctxt tvbs [con] Nothing
1409−#else
1410− DataD ctxt _ tvbs cons _ -> f name ctxt tvbs cons Nothing
1411− NewtypeD ctxt _ tvbs con _ -> f name ctxt tvbs [con] Nothing
1412−#endif
1413− other -> fail $ ns ++ "Unsupported type: " ++ show other
1414−#if MIN_VERSION_template_haskell(2,11,0)
1415− DataConI _ _ parentName -> do
1416−#else
1417− DataConI _ _ parentName _ -> do
1418−#endif
1419− parentInfo <- reify parentName
1420− case parentInfo of
1421−#if MIN_VERSION_template_haskell(2,11,0)
1422− FamilyI (DataFamilyD _ tvbs _) decs ->
1423−#else
1424− FamilyI (FamilyD DataFam _ tvbs _) decs ->
1425−#endif
1426− let instDec = flip find decs $ \dec -> case dec of
1427−#if MIN_VERSION_template_haskell(2,11,0)
1428− DataInstD _ _ _ _ cons _ -> any ((name ==) . getConName) cons
1429− NewtypeInstD _ _ _ _ con _ -> name == getConName con
1430−#else
1431− DataInstD _ _ _ cons _ -> any ((name ==) . getConName) cons
1432− NewtypeInstD _ _ _ con _ -> name == getConName con
1433−#endif
1434− _ -> error $ ns ++ "Must be a data or newtype instance."
1435− in case instDec of
1436−#if MIN_VERSION_template_haskell(2,11,0)
1437− Just (DataInstD ctxt _ instTys _ cons _) -> f parentName ctxt tvbs cons $ Just instTys
1438− Just (NewtypeInstD ctxt _ instTys _ con _) -> f parentName ctxt tvbs [con] $ Just instTys
1439−#else
1440− Just (DataInstD ctxt _ instTys cons _) -> f parentName ctxt tvbs cons $ Just instTys
1441− Just (NewtypeInstD ctxt _ instTys con _) -> f parentName ctxt tvbs [con] $ Just instTys
1442−#endif
1443− _ -> fail $ ns ++
1444− "Could not find data or newtype instance constructor."
1445− _ -> fail $ ns ++ "Data constructor " ++ show name ++
1446− " is not from a data family instance constructor."
1447−#if MIN_VERSION_template_haskell(2,11,0)
1448− FamilyI DataFamilyD{} _ ->
1449−#else
1450− FamilyI (FamilyD DataFam _ _ _) _ ->
1451−#endif
1452− fail $ ns ++
1453− "Cannot use a data family name. Use a data family instance constructor instead."
1454− _ -> fail $ ns ++ "I need the name of a plain data type constructor, "
1455− ++ "or a data family instance constructor."
1456− where
1457− ns :: String
1458− ns = "Data.Aeson.TH.withType: "
1459−
1460−-- | Infer the context and instance head needed for a FromJSON or ToJSON instance.
1461buildTypeInstance :: Name
1332buildTypeInstance :: Name
1462 -- ^ The type constructor or data family name
1333 -- ^ The type constructor or data family name
1463 -> JSONClass
1334 -> JSONClass
1464 -- ^ The typeclass to derive
1335 -- ^ The typeclass to derive
1465 -> Cxt
1336 -> Cxt
1466 -- ^ The datatype context
1337 -- ^ The datatype context
1467− -> [TyVarBndr]
1338+ -> [Type]
1468− -- ^ The type variables from the data type/data family declaration
1339+ -- ^ The types to instantiate the instance with
1469− -> Maybe [Type]
1340+ -> DatatypeVariant
1470− -- ^ 'Just' the types used to instantiate a data family instance,
1341+ -- ^ Are we dealing with a data family instance or not
1471− -- or 'Nothing' if it's a plain data type
1472 -> Q (Cxt, Type)
1342 -> Q (Cxt, Type)
1473− -- ^ The resulting 'Cxt' and 'Type' to use in a class instance
1343+buildTypeInstance tyConName jc dataCxt varTysOrig variant = do
1474−-- Plain data type/newtype case
1475−buildTypeInstance tyConName jc dataCxt tvbs Nothing =
1476− let varTys :: [Type]
1477− varTys = map tvbToType tvbs
1478− in buildTypeInstanceFromTys tyConName jc dataCxt varTys False
1479−-- Data family instance case
1480−--
1481−-- The CPP is present to work around a couple of annoying old GHC bugs.
1482−-- See Note [Polykinded data families in Template Haskell]
1483−buildTypeInstance dataFamName jc dataCxt tvbs (Just instTysAndKinds) = do
1484−#if !(MIN_VERSION_template_haskell(2,8,0)) || MIN_VERSION_template_haskell(2,10,0)
1485− let instTys :: [Type]
1486− instTys = zipWith stealKindForType tvbs instTysAndKinds
1487−#else
1488− let kindVarNames :: [Name]
1489− kindVarNames = nub $ concatMap (tyVarNamesOfType . tvbKind) tvbs
1490−
1491− numKindVars :: Int
1492− numKindVars = length kindVarNames
1493−
1494− givenKinds, givenKinds' :: [Kind]
1495− givenTys :: [Type]
1496− (givenKinds, givenTys) = splitAt numKindVars instTysAndKinds
1497− givenKinds' = map sanitizeStars givenKinds
1498−
1499− -- A GHC 7.6-specific bug requires us to replace all occurrences of
1500− -- (ConT GHC.Prim.*) with StarT, or else Template Haskell will reject it.
1501− -- Luckily, (ConT GHC.Prim.*) only seems to occur in this one spot.
1502− sanitizeStars :: Kind -> Kind
1503− sanitizeStars = go
1504− where
1505− go :: Kind -> Kind
1506− go (AppT t1 t2) = AppT (go t1) (go t2)
1507− go (SigT t k) = SigT (go t) (go k)
1508− go (ConT n) | n == starKindName = StarT
1509− go t = t
1510−
1511− -- It's quite awkward to import * from GHC.Prim, so we'll just
1512− -- hack our way around it.
1513− starKindName :: Name
1514− starKindName = mkNameG_tc "ghc-prim" "GHC.Prim" "*"
1515−
1516− -- If we run this code with GHC 7.8, we might have to generate extra type
1517− -- variables to compensate for any type variables that Template Haskell
1518− -- eta-reduced away.
1519− -- See Note [Polykinded data families in Template Haskell]
1520− xTypeNames <- newNameList "tExtra" (length tvbs - length givenTys)
1521−
1522− let xTys :: [Type]
1523− xTys = map VarT xTypeNames
1524− -- ^ Because these type variables were eta-reduced away, we can only
1525− -- determine their kind by using stealKindForType. Therefore, we mark
1526− -- them as VarT to ensure they will be given an explicit kind annotation
1527− -- (and so the kind inference machinery has the right information).
1528−
1529− substNamesWithKinds :: [(Name, Kind)] -> Type -> Type
1530− substNamesWithKinds nks t = foldr' (uncurry substNameWithKind) t nks
1531−
1532− -- The types from the data family instance might not have explicit kind
1533− -- annotations, which the kind machinery needs to work correctly. To
1534− -- compensate, we use stealKindForType to explicitly annotate any
1535− -- types without kind annotations.
1536− instTys :: [Type]
1537− instTys = map (substNamesWithKinds (zip kindVarNames givenKinds'))
1538− -- Note that due to a GHC 7.8-specific bug
1539− -- (see Note [Polykinded data families in Template Haskell]),
1540− -- there may be more kind variable names than there are kinds
1541− -- to substitute. But this is OK! If a kind is eta-reduced, it
1542− -- means that is was not instantiated to something more specific,
1543− -- so we need not substitute it. Using stealKindForType will
1544− -- grab the correct kind.
1545− $ zipWith stealKindForType tvbs (givenTys ++ xTys)
1546−#endif
1547− buildTypeInstanceFromTys dataFamName jc dataCxt instTys True
1548−
1549−-- For the given Types, generate an instance context and head.
1550−buildTypeInstanceFromTys :: Name
1551− -- ^ The type constructor or data family name
1552− -> JSONClass
1553− -- ^ The typeclass to derive
1554− -> Cxt
1555− -- ^ The datatype context
1556− -> [Type]
1557− -- ^ The types to instantiate the instance with
1558− -> Bool
1559− -- ^ True if it's a data family, False otherwise
1560− -> Q (Cxt, Type)
1561−buildTypeInstanceFromTys tyConName jc dataCxt varTysOrig isDataFamily = do
1562 -- Make sure to expand through type/kind synonyms! Otherwise, the
1344 -- Make sure to expand through type/kind synonyms! Otherwise, the
1563 -- 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
1564 -- synonym that are actually dropped.
1346 -- synonym that are actually dropped.
1565 -- (See GHC Trac #11416 for a scenario where this actually happened.)
1347 -- (See GHC Trac #11416 for a scenario where this actually happened.)
1566− varTysExp <- mapM expandSyn varTysOrig
1348+ varTysExp <- mapM resolveTypeSynonyms varTysOrig
1567
1349
1568 let remainingLength :: Int
1350 let remainingLength :: Int
1569 remainingLength = length varTysOrig - arityInt jc
1351 remainingLength = length varTysOrig - arityInt jc
@@ -1593,7 +1375,7 @@ buildTypeInstanceFromTys tyConName jc dataCxt varTysOrig isDataFamily = do
1593 -- All of the type variables mentioned in the dropped types
1375 -- All of the type variables mentioned in the dropped types
1594 -- (post-synonym expansion)
1376 -- (post-synonym expansion)
1595 droppedTyVarNames :: [Name]
1377 droppedTyVarNames :: [Name]
1596− droppedTyVarNames = concatMap tyVarNamesOfType droppedTysExpSubst
1378+ droppedTyVarNames = freeVariables droppedTysExpSubst
1597
1379
1598 -- 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 *
1599 -- 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.
@@ -1634,6 +1416,13 @@ buildTypeInstanceFromTys tyConName jc dataCxt varTysOrig isDataFamily = do
1634 map (substNamesWithKindStar (droppedKindVarNames `union` kvNames'))
1416 map (substNamesWithKindStar (droppedKindVarNames `union` kvNames'))
1635 $ take remainingLength varTysOrig
1417 $ take remainingLength varTysOrig
1636
1418
1419+ isDataFamily :: Bool
1420+ isDataFamily = case variant of
1421+ Datatype -> False
1422+ Newtype -> False
1423+ DataInstance -> True
1424+ NewtypeInstance -> True
1425+
1637 remainingTysOrigSubst' :: [Type]
1426 remainingTysOrigSubst' :: [Type]
1638 -- See Note [Kind signatures in derived instances] for an explanation
1427 -- See Note [Kind signatures in derived instances] for an explanation
1639 -- of the isDataFamily check.
1428 -- of the isDataFamily check.
@@ -1687,55 +1476,6 @@ deriveConstraint jc t
1687 jcConstraint = jsonClassName . JSONClass (direction jc)
1476 jcConstraint = jsonClassName . JSONClass (direction jc)
1688
1477
1689{-
1478{-
1690−Note [Polykinded data families in Template Haskell]
1691−~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1692−
1693−In order to come up with the correct instance context and head for an instance, e.g.,
1694−
1695− instance C a => C (Data a) where ...
1696−
1697−We need to know the exact types and kinds used to instantiate the instance. For
1698−plain old datatypes, this is simple: every type must be a type variable, and
1699−Template Haskell reliably tells us the type variables and their kinds.
1700−
1701−Doing the same for data families proves to be much harder for three reasons:
1702−
1703−1. On any version of Template Haskell, it may not tell you what an instantiated
1704− type's kind is. For instance, in the following data family instance:
1705−
1706− data family Fam (f :: * -> *) (a :: *)
1707− data instance Fam f a
1708−
1709− Then if we use TH's reify function, it would tell us the TyVarBndrs of the
1710− data family declaration are:
1711−
1712− [KindedTV f (AppT (AppT ArrowT StarT) StarT),KindedTV a StarT]
1713−
1714− and the instantiated types of the data family instance are:
1715−
1716− [VarT f1,VarT a1]
1717−
1718− We can't just pass [VarT f1,VarT a1] to buildTypeInstanceFromTys, since we
1719− have no way of knowing their kinds. Luckily, the TyVarBndrs tell us what the
1720− kind is in case an instantiated type isn't a SigT, so we use the stealKindForType
1721− function to ensure all of the instantiated types are SigTs before passing them
1722− to buildTypeInstanceFromTys.
1723−2. On GHC 7.6 and 7.8, a bug is present in which Template Haskell lists all of
1724− the specified kinds of a data family instance efore any of the instantiated
1725− types. Fortunately, this is easy to deal with: you simply count the number of
1726− distinct kind variables in the data family declaration, take that many elements
1727− from the front of the Types list of the data family instance, substitute the
1728− kind variables with their respective instantiated kinds (which you took earlier),
1729− and proceed as normal.
1730−3. On GHC 7.8, an even uglier bug is present (GHC Trac #9692) in which Template
1731− Haskell might not even list all of the Types of a data family instance, since
1732− they are eta-reduced away! And yes, kinds can be eta-reduced too.
1733−
1734− The simplest workaround is to count how many instantiated types are missing from
1735− the list and generate extra type variables to use in their place. Luckily, we
1736− needn't worry much if its kind was eta-reduced away, since using stealKindForType
1737− will get it back.
1738−
1739Note [Kind signatures in derived instances]
1479Note [Kind signatures in derived instances]
1740~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1480~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1741
1481
@@ -1813,50 +1553,14 @@ things we can do to make instance contexts that work for 80% of use cases:
1813 and perform kind substitution as in the other cases.
1553 and perform kind substitution as in the other cases.
1814-}
1554-}
1815
1555
1816−-- Determines the types of a constructor's arguments as well as the last type
1556+checkExistentialContext :: JSONClass -> TyVarMap -> Cxt -> Name
1817−-- parameters (mapped to their encoding/decoding functions), expanding through
1557+ -> Q a -> Q a
1818−-- any type synonyms.
1558+checkExistentialContext jc tvMap ctxt conName q =
1819−--
1559+ if (any (`predMentionsName` M.keys tvMap) ctxt
1820−-- The type parameters are determined on a constructor-by-constructor basis since
1560+ || M.size tvMap < arityInt jc)
1821−-- they may be refined to be particular types in a GADT.
1561+ && not (allowExQuant jc)
1822−reifyConTys :: JSONClass
1562+ then existentialContextError conName
1823− -> [(Name, Name)]
1563+ else q
1824− -> Name
1825− -> Q ([Type], TyVarMap)
1826−reifyConTys jc tpjs conName = do
1827− info <- reify conName
1828− (ctxt, uncTy) <- case info of
1829− DataConI _ ty _
1830−#if !(MIN_VERSION_template_haskell(2,11,0))
1831− _
1832−#endif
1833− -> fmap uncurryTy (expandSyn ty)
1834− _ -> error "Must be a data constructor"
1835− let (argTys, [resTy]) = NE.splitAt (NE.length uncTy - 1) uncTy
1836− unapResTy = unapplyTy resTy
1837− -- If one of the last type variables is refined to a particular type
1838− -- (i.e., not truly polymorphic), we mark it with Nothing and filter
1839− -- it out later, since we only apply encoding/decoding functions to
1840− -- arguments of a type that it (1) one of the last type variables,
1841− -- and (2) of a truly polymorphic type.
1842− jArity = arityInt jc
1843− mbTvNames = map varTToNameMaybe $
1844− NE.drop (NE.length unapResTy - jArity) unapResTy
1845− -- We use M.fromList to ensure that if there are any duplicate type
1846− -- variables (as can happen in a GADT), the rightmost type variable gets
1847− -- associated with the show function.
1848− --
1849− -- See Note [Matching functions with GADT type variables]
1850− tvMap = M.fromList
1851− . catMaybes -- Drop refined types
1852− $ zipWith (\mbTvName tpj ->
1853− fmap (\tvName -> (tvName, tpj)) mbTvName)
1854− mbTvNames tpjs
1855− if (any (`predMentionsName` M.keys tvMap) ctxt
1856− || M.size tvMap < jArity)
1857− && not (allowExQuant jc)
1858− then existentialContextError conName
1859− else return (argTys, tvMap)
1860
1564
1861{-
1565{-
1862Note [Matching functions with GADT type variables]
1566Note [Matching functions with GADT type variables]
@@ -1896,69 +1600,22 @@ Both.
1896-- are the function arguments of types (b -> Value) and ([b] -> Value).
1600-- are the function arguments of types (b -> Value) and ([b] -> Value).
1897type TyVarMap = Map Name (Name, Name)
1601type TyVarMap = Map Name (Name, Name)
1898
1602
1899−-- | If a VarT is missing an explicit kind signature, steal it from a TyVarBndr.
1900−stealKindForType :: TyVarBndr -> Type -> Type
1901−stealKindForType tvb t@VarT{} = SigT t (tvbKind tvb)
1902−stealKindForType _ t = t
1903−
1904−-- | Extracts the kind from a type variable binder.
1905−tvbKind :: TyVarBndr -> Kind
1906−#if MIN_VERSION_template_haskell(2,8,0)
1907−tvbKind (PlainTV _ ) = StarT
1908−#else
1909−tvbKind (PlainTV _ ) = StarK
1910−#endif
1911−tvbKind (KindedTV _ k) = k
1912−
1913−tvbToType :: TyVarBndr -> Type
1914−tvbToType (PlainTV n) = VarT n
1915−tvbToType (KindedTV n k) = SigT (VarT n) k
1916−
1917-- | Returns True if a Type has kind *.
1603-- | Returns True if a Type has kind *.
1918hasKindStar :: Type -> Bool
1604hasKindStar :: Type -> Bool
1919hasKindStar VarT{} = True
1605hasKindStar VarT{} = True
1920−#if MIN_VERSION_template_haskell(2,8,0)
1921hasKindStar (SigT _ StarT) = True
1606hasKindStar (SigT _ StarT) = True
1922−#else
1923−hasKindStar (SigT _ StarK) = True
1924−#endif
1925hasKindStar _ = False
1607hasKindStar _ = False
1926
1608
1927-- 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.
1928isStarOrVar :: Kind -> Bool
1610isStarOrVar :: Kind -> Bool
1929−#if MIN_VERSION_template_haskell(2,8,0)
1930isStarOrVar StarT = True
1611isStarOrVar StarT = True
1931isStarOrVar VarT{} = True
1612isStarOrVar VarT{} = True
1932−#else
1933−isStarOrVar StarK = True
1934−#endif
1935isStarOrVar _ = False
1613isStarOrVar _ = False
1936
1614
1937-- 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.
1938newNameList :: String -> Int -> Q [Name]
1616newNameList :: String -> Int -> Q [Name]
1939newNameList prefix len = mapM newName [prefix ++ show n | n <- [1..len]]
1617newNameList prefix len = mapM newName [prefix ++ show n | n <- [1..len]]
1940
1618
1941−-- Gets all of the type/kind variable names mentioned somewhere in a Type.
1942−tyVarNamesOfType :: Type -> [Name]
1943−tyVarNamesOfType = go
1944− where
1945− go :: Type -> [Name]
1946− go (AppT t1 t2) = go t1 ++ go t2
1947− go (SigT t _k) = go t
1948−#if MIN_VERSION_template_haskell(2,8,0)
1949− ++ go _k
1950−#endif
1951− go (VarT n) = [n]
1952− go _ = []
1953−
1954−-- | Gets all of the type/kind variable names mentioned somewhere in a Kind.
1955−tyVarNamesOfKind :: Kind -> [Name]
1956−#if MIN_VERSION_template_haskell(2,8,0)
1957−tyVarNamesOfKind = tyVarNamesOfType
1958−#else
1959−tyVarNamesOfKind _ = [] -- There are no kind variables
1960−#endif
1961−
1962-- | @hasKindVarChain n kind@ Checks if @kind@ is of the form
1619-- | @hasKindVarChain n kind@ Checks if @kind@ is of the form
1963-- 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
1964-- kind variables.
1621-- kind variables.
@@ -1966,7 +1623,7 @@ hasKindVarChain :: Int -> Type -> Maybe [Name]
1966hasKindVarChain kindArrows t =
1623hasKindVarChain kindArrows t =
1967 let uk = uncurryKind (tyKind t)
1624 let uk = uncurryKind (tyKind t)
1968 in if (NE.length uk - 1 == kindArrows) && F.all isStarOrVar uk
1625 in if (NE.length uk - 1 == kindArrows) && F.all isStarOrVar uk
1969− then Just (concatMap tyVarNamesOfKind uk)
1626+ then Just (concatMap freeVariables uk)
1970 else Nothing
1627 else Nothing
1971
1628
1972-- | 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 *.
@@ -1986,17 +1643,6 @@ varTToNameMaybe _ = Nothing
1986varTToName :: Type -> Name
1643varTToName :: Type -> Name
1987varTToName = fromMaybe (error "Not a type variable!") . varTToNameMaybe
1644varTToName = fromMaybe (error "Not a type variable!") . varTToNameMaybe
1988
1645
1989−-- | Extracts the name from a constructor.
1990−getConName :: Con -> Name
1991−getConName (NormalC name _) = name
1992−getConName (RecC name _) = name
1993−getConName (InfixC _ name _) = name
1994−getConName (ForallC _ _ con) = getConName con
1995−#if MIN_VERSION_template_haskell(2,11,0)
1996−getConName (GadtC names _ _) = head names
1997−getConName (RecGadtC names _ _) = head names
1998−#endif
1999−
2000interleave :: [a] -> [a] -> [a]
1646interleave :: [a] -> [a] -> [a]
2001interleave (a1:a1s) (a2:a2s) = a1:a2:interleave a1s a2s
1647interleave (a1:a1s) (a2:a2s) = a1:a2:interleave a1s a2s
2002interleave _ _ = []
1648interleave _ _ = []
@@ -2021,9 +1667,7 @@ isTyFamily (ConT n) = do
2021#else
1667#else
2022 FamilyI (FamilyD TypeFam _ _ _) _ -> True
1668 FamilyI (FamilyD TypeFam _ _ _) _ -> True
2023#endif
1669#endif
2024−#if MIN_VERSION_template_haskell(2,9,0)
2025 FamilyI ClosedTypeFamilyD{} _ -> True
1670 FamilyI ClosedTypeFamilyD{} _ -> True
2026−#endif
2027 _ -> False
1671 _ -> False
2028isTyFamily _ = return False
1672isTyFamily _ = return False
2029
1673
@@ -2051,9 +1695,7 @@ mentionsName = go
2051 go :: Type -> [Name] -> Bool
1695 go :: Type -> [Name] -> Bool
2052 go (AppT t1 t2) names = go t1 names || go t2 names
1696 go (AppT t1 t2) names = go t1 names || go t2 names
2053 go (SigT t _k) names = go t names
1697 go (SigT t _k) names = go t names
2054−#if MIN_VERSION_template_haskell(2,8,0)
2055 || go _k names
1698 || go _k names
2056−#endif
2057 go (VarT n) names = n `elem` names
1699 go (VarT n) names = n `elem` names
2058 go _ _ = False
1700 go _ _ = False
2059
1701
@@ -2109,37 +1751,28 @@ uncurryTy t = ([], t :| [])
2109
1751
2110-- | Like uncurryType, except on a kind level.
1752-- | Like uncurryType, except on a kind level.
2111uncurryKind :: Kind -> NonEmpty Kind
1753uncurryKind :: Kind -> NonEmpty Kind
2112−#if MIN_VERSION_template_haskell(2,8,0)
2113uncurryKind = snd . uncurryTy
1754uncurryKind = snd . uncurryTy
2114−#else
2115−uncurryKind (ArrowK k1 k2) = k1 <| uncurryKind k2
2116−uncurryKind k = k :| []
2117−#endif
2118
1755
2119createKindChain :: Int -> Kind
1756createKindChain :: Int -> Kind
2120createKindChain = go starK
1757createKindChain = go starK
2121 where
1758 where
2122 go :: Kind -> Int -> Kind
1759 go :: Kind -> Int -> Kind
2123 go k 0 = k
1760 go k 0 = k
2124−#if MIN_VERSION_template_haskell(2,8,0)
2125 go k !n = go (AppT (AppT ArrowT StarT) k) (n - 1)
1761 go k !n = go (AppT (AppT ArrowT StarT) k) (n - 1)
2126−#else
2127− go k !n = go (ArrowK StarK k) (n - 1)
2128−#endif
2129
1762
2130-- | Makes a string literal expression from a constructor's name.
1763-- | Makes a string literal expression from a constructor's name.
2131−conNameExp :: Options -> Con -> Q Exp
1764+conNameExp :: Options -> ConstructorInfo -> Q Exp
2132conNameExp opts = litE
1765conNameExp opts = litE
2133 . stringL
1766 . stringL
2134 . constructorTagModifier opts
1767 . constructorTagModifier opts
2135 . nameBase
1768 . nameBase
2136− . getConName
1769+ . constructorName
2137
1770
2138−-- | Creates a string literal expression from a record field label.
1771+-- | Extracts a record field label.
2139−fieldLabelExp :: Options -- ^ Encoding options
1772+fieldLabel :: Options -- ^ Encoding options
2140− -> Name
1773+ -> Name
2141− -> Q Exp
1774+ -> String
2142−fieldLabelExp opts = litE . stringL . fieldLabelModifier opts . nameBase
1775+fieldLabel opts = fieldLabelModifier opts . nameBase
2143
1776
2144-- | The name of the outermost 'Value' constructor.
1777-- | The name of the outermost 'Value' constructor.
2145valueConName :: Value -> String
1778valueConName :: Value -> String
@@ -2178,73 +1811,11 @@ canEtaReduce remaining dropped =
2178-- Expanding type synonyms
1811-- Expanding type synonyms
2179-------------------------------------------------------------------------------
1812-------------------------------------------------------------------------------
2180
1813
2181−-- | Expands all type synonyms in a type. Written by Dan Rosén in the
1814+applySubstitutionKind :: Map Name Kind -> Type -> Type
2182−-- @genifunctors@ package (licensed under BSD3).
1815+applySubstitutionKind = applySubstitution
2183−expandSyn :: Type -> Q Type
2184−expandSyn (ForallT tvs ctx t) = ForallT tvs ctx <$> expandSyn t
2185−expandSyn t@AppT{} = expandSynApp t []
2186−expandSyn t@ConT{} = expandSynApp t []
2187−expandSyn (SigT t k) = do t' <- expandSyn t
2188− k' <- expandSynKind k
2189− return (SigT t' k')
2190−expandSyn t = return t
2191−
2192−expandSynKind :: Kind -> Q Kind
2193−#if MIN_VERSION_template_haskell(2,8,0)
2194−expandSynKind = expandSyn
2195−#else
2196−expandSynKind = return -- There are no kind synonyms to deal with
2197−#endif
2198−
2199−expandSynApp :: Type -> [Type] -> Q Type
2200−expandSynApp (AppT t1 t2) ts = do
2201− t2' <- expandSyn t2
2202− expandSynApp t1 (t2':ts)
2203−expandSynApp (ConT n) ts | nameBase n == "[]" = return $ foldl' AppT ListT ts
2204−expandSynApp t@(ConT n) ts = do
2205− info <- reify n
2206− case info of
2207− TyConI (TySynD _ tvs rhs) ->
2208− let (ts', ts'') = splitAt (length tvs) ts
2209− subs = mkSubst tvs ts'
2210− rhs' = substType subs rhs
2211− in expandSynApp rhs' ts''
2212− _ -> return $ foldl' AppT t ts
2213−expandSynApp t ts = do
2214− t' <- expandSyn t
2215− return $ foldl' AppT t' ts
2216−
2217−type TypeSubst = Map Name Type
2218−type KindSubst = Map Name Kind
2219−
2220−mkSubst :: [TyVarBndr] -> [Type] -> TypeSubst
2221−mkSubst vs ts =
2222− let vs' = map un vs
2223− un (PlainTV v) = v
2224− un (KindedTV v _) = v
2225− in M.fromList $ zip vs' ts
2226−
2227−substType :: TypeSubst -> Type -> Type
2228−substType subs (ForallT v c t) = ForallT v c $ substType subs t
2229−substType subs t@(VarT n) = M.findWithDefault t n subs
2230−substType subs (AppT t1 t2) = AppT (substType subs t1) (substType subs t2)
2231−substType subs (SigT t k) = SigT (substType subs t)
2232−#if MIN_VERSION_template_haskell(2,8,0)
2233− (substType subs k)
2234−#else
2235− k
2236−#endif
2237−substType _ t = t
2238−
2239−substKind :: KindSubst -> Type -> Type
2240−#if MIN_VERSION_template_haskell(2,8,0)
2241−substKind = substType
2242−#else
2243−substKind _ t = t -- There are no kind variables!
2244−#endif
2245
1816
2246substNameWithKind :: Name -> Kind -> Type -> Type
1817substNameWithKind :: Name -> Kind -> Type -> Type
2247−substNameWithKind n k = substKind (M.singleton n k)
1818+substNameWithKind n k = applySubstitutionKind (M.singleton n k)
2248
1819
2249substNamesWithKindStar :: [Name] -> Type -> Type
1820substNamesWithKindStar :: [Name] -> Type -> Type
2250substNamesWithKindStar ns t = foldr' (`substNameWithKind` starK) t ns
1821substNamesWithKindStar ns t = foldr' (`substNameWithKind` starK) t ns
@@ -2330,6 +1901,13 @@ data Direction = To | From
2330-- | A representation of which typeclass method is being spliced in.
1901-- | A representation of which typeclass method is being spliced in.
2331data JSONFun = ToJSON | ToEncoding | ParseJSON
1902data JSONFun = ToJSON | ToEncoding | ParseJSON
2332
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+
2333-- | A representation of which typeclass is being derived.
1911-- | A representation of which typeclass is being derived.
2334data JSONClass = JSONClass { direction :: Direction, arity :: Arity }
1912data JSONClass = JSONClass { direction :: Direction, arity :: Arity }
2335
1913
@@ -2398,9 +1976,7 @@ data StarKindStatus = NotKindStar
2398canRealizeKindStar :: Type -> StarKindStatus
1976canRealizeKindStar :: Type -> StarKindStatus
2399canRealizeKindStar t = case t of
1977canRealizeKindStar t = case t of
2400 _ | hasKindStar t -> KindStar
1978 _ | hasKindStar t -> KindStar
2401−#if MIN_VERSION_template_haskell(2,8,0)
2402 SigT _ (VarT k) -> IsKindVar k
1979 SigT _ (VarT k) -> IsKindVar k
2403−#endif
2404 _ -> NotKindStar
1980 _ -> NotKindStar
2405
1981
2406-- | 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.
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+41−3
@@ -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
@@ -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+8−3
@@ -4,8 +4,8 @@
4{-# LANGUAGE FlexibleInstances #-}
4{-# LANGUAGE FlexibleInstances #-}
5{-# LANGUAGE GADTs #-}
5{-# LANGUAGE GADTs #-}
6{-# LANGUAGE MultiParamTypeClasses #-}
6{-# LANGUAGE MultiParamTypeClasses #-}
7+{-# LANGUAGE NoImplicitPrelude #-}
7{-# LANGUAGE ScopedTypeVariables #-}
8{-# LANGUAGE ScopedTypeVariables #-}
8−{-# LANGUAGE TypeSynonymInstances #-}
9
9
10-- |
10-- |
11-- Module: Data.Aeson.Types.Class
11-- Module: Data.Aeson.Types.Class
@@ -58,6 +58,11 @@ module Data.Aeson.Types.Class
58 , fromJSONKeyCoerce
58 , fromJSONKeyCoerce
59 , coerceFromJSONKeyFunction
59 , coerceFromJSONKeyFunction
60 , mapFromJSONKeyFunction
60 , mapFromJSONKeyFunction
61+ -- ** Generic keys
62+ , GToJSONKey()
63+ , genericToJSONKey
64+ , GFromJSONKey()
65+ , genericFromJSONKey
61 -- * Object key-value pairs
66 -- * Object key-value pairs
62 , KeyValue(..)
67 , KeyValue(..)
63
68
@@ -70,14 +75,15 @@ module Data.Aeson.Types.Class
70 , withObject
75 , withObject
71 , withText
76 , withText
72 , withArray
77 , withArray
73− , withNumber
74 , withScientific
78 , withScientific
75 , withBool
79 , withBool
80+ , withEmbeddedJSON
76
81
77 -- * Functions
82 -- * Functions
78 , fromJSON
83 , fromJSON
79 , ifromJSON
84 , ifromJSON
80 , typeMismatch
85 , typeMismatch
86+ , unexpected
81 , parseField
87 , parseField
82 , parseFieldMaybe
88 , parseFieldMaybe
83 , parseFieldMaybe'
89 , parseFieldMaybe'
@@ -91,7 +97,6 @@ module Data.Aeson.Types.Class
91 , (.!=)
97 , (.!=)
92 ) where
98 ) where
93
99
94−import Prelude ()
95
100
96import Data.Aeson.Types.FromJSON
101import Data.Aeson.Types.FromJSON
97import Data.Aeson.Types.Generic (One, Zero)
102import Data.Aeson.Types.Generic (One, Zero)
Data/Aeson/Types/FromJSON.hs+846−416
@@ -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 (..))
106−import Data.Time.Locale.Compat (defaultTimeLocale)
107+import Data.Time.LocalTime.Compat (CalendarDiffTime (..))
108+import Data.Time.Clock.System.Compat (SystemTime (..))
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 =
219− parseScientificText t >>= parseIntegralFromScientific expected
218+ prependContext name $
219+ parseScientificText t
220+ >>= rejectLargeExponent
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 =
224− parseScientificText t >>= parseBoundedIntegralFromScientific expected
229+ prependContext name $
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--
291−-- An example type and instance using 'typeMismatch':
301+-- 'prependFailure' (or 'modifyFailure') add more information to a parser's
302+-- error messages.
303+--
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.
@@ -302,20 +315,22 @@ genericLiftParseJSON opts pj pjl = fmap to1 . gParseJSON opts (From1Args pj pjl)
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.
307−-- 'parseJSON' invalid = 'typeMismatch' \"Coord\" invalid
320+-- 'parseJSON' invalid =
321+-- 'prependFailure' "parsing Coord failed, "
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-- @
@@ -347,7 +362,7 @@ genericLiftParseJSON opts pj pjl = fmap to1 . gParseJSON opts (From1Args pj pjl)
347-- @
362-- @
348--
363--
349-- The default implementation will be equivalent to
364-- The default implementation will be equivalent to
350−-- @parseJSON = 'genericParseJSON' 'defaultOptions'@; If you need different
365+-- @parseJSON = 'genericParseJSON' 'defaultOptions'@; if you need different
351-- options, you can customize the generic decoding by defining:
366-- options, you can customize the generic decoding by defining:
352--
367--
353-- @
368-- @
@@ -365,13 +380,11 @@ class FromJSON a where
365 parseJSON = genericParseJSON defaultOptions
380 parseJSON = genericParseJSON defaultOptions
366
381
367 parseJSONList :: Value -> Parser [a]
382 parseJSONList :: Value -> Parser [a]
368− parseJSONList (Array a)
383+ parseJSONList = withArray "[]" $ \a ->
369− = zipWithM (parseIndexedJSON parseJSON) [0..]
384+ zipWithM (parseIndexedJSON parseJSON) [0..]
370 . V.toList
385 . V.toList
371 $ a
386 $ a
372
387
373− parseJSONList v = typeMismatch "[a]" v
374−
375-------------------------------------------------------------------------------
388-------------------------------------------------------------------------------
376-- Classes and types for map keys
389-- Classes and types for map keys
377-------------------------------------------------------------------------------
390-------------------------------------------------------------------------------
@@ -383,6 +396,16 @@ class FromJSON a where
383-- > newtype SomeId = SomeId { getSomeId :: Text }
396-- > newtype SomeId = SomeId { getSomeId :: Text }
384-- > deriving (Eq,Ord,Hashable,FromJSONKey)
397-- > deriving (Eq,Ord,Hashable,FromJSONKey)
385--
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+-- @
386class FromJSONKey a where
409class FromJSONKey a where
387 -- | Strategy for parsing the key of a map-like container.
410 -- | Strategy for parsing the key of a map-like container.
388 fromJSONKey :: FromJSONKeyFunction a
411 fromJSONKey :: FromJSONKeyFunction a
@@ -405,11 +428,7 @@ class FromJSONKey a where
405-- At the moment this type is intentionally not exported. 'FromJSONKeyFunction'
428-- At the moment this type is intentionally not exported. 'FromJSONKeyFunction'
406-- can be inspected, but cannot be constructed.
429-- can be inspected, but cannot be constructed.
407data CoerceText a where
430data CoerceText a where
408−#if HAS_COERCIBLE
409 CoerceText :: Coercible Text a => CoerceText a
431 CoerceText :: Coercible Text a => CoerceText a
410−#else
411− CoerceText :: CoerceText a
412−#endif
413
432
414-- | 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
415-- 'FromJSONKey' instance, then 'ToJSONKeyValue' should be used in the 'ToJSONKey'
434-- 'FromJSONKey' instance, then 'ToJSONKeyValue' should be used in the 'ToJSONKey'
@@ -429,7 +448,7 @@ data FromJSONKeyFunction a
429
448
430-- | Only law abiding up to interpretation
449-- | Only law abiding up to interpretation
431instance Functor FromJSONKeyFunction where
450instance Functor FromJSONKeyFunction where
432− fmap h (FromJSONKeyCoerce CoerceText) = FromJSONKeyText (h . coerce')
451+ fmap h (FromJSONKeyCoerce CoerceText) = FromJSONKeyText (h . coerce)
433 fmap h (FromJSONKeyText f) = FromJSONKeyText (h . f)
452 fmap h (FromJSONKeyText f) = FromJSONKeyText (h . f)
434 fmap h (FromJSONKeyTextParser f) = FromJSONKeyTextParser (fmap h . f)
453 fmap h (FromJSONKeyTextParser f) = FromJSONKeyTextParser (fmap h . f)
435 fmap h (FromJSONKeyValue f) = FromJSONKeyValue (fmap h . f)
454 fmap h (FromJSONKeyValue f) = FromJSONKeyValue (fmap h . f)
@@ -443,9 +462,7 @@ instance Functor FromJSONKeyFunction where
443--
462--
444-- On pre GHC 7.8 this is unconstrainted function.
463-- On pre GHC 7.8 this is unconstrainted function.
445fromJSONKeyCoerce ::
464fromJSONKeyCoerce ::
446−#if HAS_COERCIBLE
447 Coercible Text a =>
465 Coercible Text a =>
448−#endif
449 FromJSONKeyFunction a
466 FromJSONKeyFunction a
450fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText
467fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText
451
468
@@ -453,60 +470,91 @@ fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText
453--
470--
454-- See note on 'fromJSONKeyCoerce'.
471-- See note on 'fromJSONKeyCoerce'.
455coerceFromJSONKeyFunction ::
472coerceFromJSONKeyFunction ::
456−#if HAS_COERCIBLE
457 Coercible a b =>
473 Coercible a b =>
458−#endif
459 FromJSONKeyFunction a -> FromJSONKeyFunction b
474 FromJSONKeyFunction a -> FromJSONKeyFunction b
460−#if HAS_COERCIBLE
461coerceFromJSONKeyFunction = coerce
475coerceFromJSONKeyFunction = coerce
462−#else
463−coerceFromJSONKeyFunction (FromJSONKeyCoerce CoerceText) = FromJSONKeyCoerce CoerceText
464−coerceFromJSONKeyFunction (FromJSONKeyText f) = FromJSONKeyText (coerce' . f)
465−coerceFromJSONKeyFunction (FromJSONKeyTextParser f) = FromJSONKeyTextParser (fmap coerce' . f)
466−coerceFromJSONKeyFunction (FromJSONKeyValue f) = FromJSONKeyValue (fmap coerce' . f)
467−#endif
468
476
469{-# RULES
477{-# RULES
470 "FromJSONKeyCoerce: fmap id" forall (x :: FromJSONKeyFunction a).
478 "FromJSONKeyCoerce: fmap id" forall (x :: FromJSONKeyFunction a).
471 fmap id x = x
479 fmap id x = x
472 #-}
480 #-}
473−#if HAS_COERCIBLE
474{-# RULES
481{-# RULES
475 "FromJSONKeyCoerce: fmap coerce" forall x .
482 "FromJSONKeyCoerce: fmap coerce" forall x .
476 fmap coerce x = coerceFromJSONKeyFunction x
483 fmap coerce x = coerceFromJSONKeyFunction x
477 #-}
484 #-}
478−#endif
479
485
480-- | Same as 'fmap'. Provided for the consistency with 'ToJSONKeyFunction'.
486-- | Same as 'fmap'. Provided for the consistency with 'ToJSONKeyFunction'.
481mapFromJSONKeyFunction :: (a -> b) -> FromJSONKeyFunction a -> FromJSONKeyFunction b
487mapFromJSONKeyFunction :: (a -> b) -> FromJSONKeyFunction a -> FromJSONKeyFunction b
482mapFromJSONKeyFunction = fmap
488mapFromJSONKeyFunction = fmap
483
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+
484-------------------------------------------------------------------------------
519-------------------------------------------------------------------------------
485-- Functions needed for documentation
520-- Functions needed for documentation
486-------------------------------------------------------------------------------
521-------------------------------------------------------------------------------
487
522
488-- | Fail parsing due to a type mismatch, with a descriptive message.
523-- | Fail parsing due to a type mismatch, with a descriptive message.
489--
524--
490−-- Example usage:
525+-- The following wrappers should generally be prefered:
526+-- 'withObject', 'withArray', 'withText', 'withBool'.
491--
527--
492−-- @
528+-- ==== Error message example
493−-- instance FromJSON Coord where
529+--
494−-- parseJSON ('Object' v) = {- type matches, life is good -}
530+-- > typeMismatch "Object" (String "oops")
495−-- parseJSON wat = 'typeMismatch' \"Coord\" wat
531+-- > -- Error: "expected Object, but encountered String"
496−-- @
532+typeMismatch :: String -- ^ The name of the JSON type being parsed
497−typeMismatch :: String -- ^ The name of the type you are trying to parse.
533+ -- (@\"Object\"@, @\"Array\"@, @\"String\"@, @\"Number\"@,
534+ -- @\"Boolean\"@, or @\"Null\"@).
498 -> Value -- ^ The actual value encountered.
535 -> Value -- ^ The actual value encountered.
499 -> Parser a
536 -> Parser a
500typeMismatch expected actual =
537typeMismatch expected actual =
501− fail $ "expected " ++ expected ++ ", encountered " ++ name
538+ fail $ "expected " ++ expected ++ ", but encountered " ++ typeOf actual
502− where
539+
503− name = case actual of
540+-- | Fail parsing due to a type mismatch, when the expected types are implicit.
504− Object _ -> "Object"
541+--
505− Array _ -> "Array"
542+-- ==== Error message example
506− String _ -> "String"
543+--
507− Number _ -> "Number"
544+-- > unexpected (String "oops")
508− Bool _ -> "Boolean"
545+-- > -- Error: "unexpected String"
509− Null -> "Null"
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
551+typeOf v = case v of
552+ Object _ -> "Object"
553+ Array _ -> "Array"
554+ String _ -> "String"
555+ Number _ -> "Number"
556+ Bool _ -> "Boolean"
557+ Null -> "Null"
510
558
511-------------------------------------------------------------------------------
559-------------------------------------------------------------------------------
512-- Lifings of FromJSON and ToJSON to unary and binary type constructors
560-- Lifings of FromJSON and ToJSON to unary and binary type constructors
@@ -587,9 +635,8 @@ class FromJSON2 f where
587 -> (Value -> Parser b)
635 -> (Value -> Parser b)
588 -> (Value -> Parser [b])
636 -> (Value -> Parser [b])
589 -> Value -> Parser [f a b]
637 -> Value -> Parser [f a b]
590− liftParseJSONList2 fa ga fb gb v = case v of
638+ liftParseJSONList2 fa ga fb gb = withArray "[]" $ \vals ->
591− 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)
592− _ -> typeMismatch "[a]" v
593
640
594-- | Lift the standard 'parseJSON' function through the type constructor.
641-- | Lift the standard 'parseJSON' function through the type constructor.
595parseJSON2 :: (FromJSON2 f, FromJSON a, FromJSON b) => Value -> Parser (f a b)
642parseJSON2 :: (FromJSON2 f, FromJSON a, FromJSON b) => Value -> Parser (f a b)
@@ -603,7 +650,7 @@ parseJSON2 = liftParseJSON2 parseJSON parseJSONList parseJSON parseJSONList
603-- | Helper function to use with 'liftParseJSON'. See 'Data.Aeson.ToJSON.listEncoding'.
650-- | Helper function to use with 'liftParseJSON'. See 'Data.Aeson.ToJSON.listEncoding'.
604listParser :: (Value -> Parser a) -> Value -> Parser [a]
651listParser :: (Value -> Parser a) -> Value -> Parser [a]
605listParser f (Array xs) = fmap V.toList (V.mapM f xs)
652listParser f (Array xs) = fmap V.toList (V.mapM f xs)
606−listParser _ v = typeMismatch "[a]" v
653+listParser _ v = typeMismatch "Array" v
607{-# INLINE listParser #-}
654{-# INLINE listParser #-}
608
655
609-------------------------------------------------------------------------------
656-------------------------------------------------------------------------------
@@ -621,49 +668,139 @@ instance (FromJSON a) => FromJSON [a] where
621-- Functions
668-- Functions
622-------------------------------------------------------------------------------
669-------------------------------------------------------------------------------
623
670
624−-- | @'withObject' expected f value@ applies @f@ to the 'Object' when @value@
671+-- | Add context to a failure message, indicating the name of the structure
625−-- is an 'Object' and fails using @'typeMismatch' expected@ otherwise.
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+
679+-- | @'withObject' name f value@ applies @f@ to the 'Object' when @value@
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"
626withObject :: String -> (Object -> Parser a) -> Value -> Parser a
686withObject :: String -> (Object -> Parser a) -> Value -> Parser a
627−withObject _ f (Object obj) = f obj
687+withObject _ f (Object obj) = f obj
628−withObject expected _ v = typeMismatch expected v
688+withObject name _ v = prependContext name (typeMismatch "Object" v)
629{-# INLINE withObject #-}
689{-# INLINE withObject #-}
630
690
631−-- | @'withText' expected f value@ applies @f@ to the 'Text' when @value@ is a
691+-- | @'withText' name f value@ applies @f@ to the 'Text' when @value@ is a
632−-- 'String' 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"
633withText :: String -> (Text -> Parser a) -> Value -> Parser a
698withText :: String -> (Text -> Parser a) -> Value -> Parser a
634−withText _ f (String txt) = f txt
699+withText _ f (String txt) = f txt
635−withText expected _ v = typeMismatch expected v
700+withText name _ v = prependContext name (typeMismatch "String" v)
636{-# INLINE withText #-}
701{-# INLINE withText #-}
637
702
638-- | @'withArray' expected f value@ applies @f@ to the 'Array' when @value@ is
703-- | @'withArray' expected f value@ applies @f@ to the 'Array' when @value@ is
639−-- an 'Array' 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"
640withArray :: String -> (Array -> Parser a) -> Value -> Parser a
710withArray :: String -> (Array -> Parser a) -> Value -> Parser a
641−withArray _ f (Array arr) = f arr
711+withArray _ f (Array arr) = f arr
642−withArray expected _ v = typeMismatch expected v
712+withArray name _ v = prependContext name (typeMismatch "Array" v)
643{-# INLINE withArray #-}
713{-# INLINE withArray #-}
644
714
645−-- | @'withNumber' expected f value@ applies @f@ to the 'Number' when @value@
715+-- | @'withScientific' name f value@ applies @f@ to the 'Scientific' number
646−-- is a 'Number' and fails using @'typeMismatch' expected@ otherwise.
716+-- when @value@ is a 'Data.Aeson.Number' and fails using 'typeMismatch'
647−withNumber :: String -> (Number -> Parser a) -> Value -> Parser a
648−withNumber expected f = withScientific expected (f . scientificToNumber)
649−{-# INLINE withNumber #-}
650−{-# DEPRECATED withNumber "Use withScientific instead" #-}
651−
652−-- | @'withScientific' expected f value@ applies @f@ to the 'Scientific' number
653−-- when @value@ is a 'Number' and fails using @'typeMismatch' expected@
654-- otherwise.
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"
655withScientific :: String -> (Scientific -> Parser a) -> Value -> Parser a
728withScientific :: String -> (Scientific -> Parser a) -> Value -> Parser a
656−withScientific _ f (Number scientific) = f scientific
729+withScientific _ f (Number scientific) = f scientific
657−withScientific expected _ v = typeMismatch expected v
730+withScientific name _ v = prependContext name (typeMismatch "Number" v)
658{-# INLINE withScientific #-}
731{-# INLINE withScientific #-}
659
732
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+
660-- | @'withBool' expected f value@ applies @f@ to the 'Bool' when @value@ is a
782-- | @'withBool' expected f value@ applies @f@ to the 'Bool' when @value@ is a
661−-- 'Bool' 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"
662withBool :: String -> (Bool -> Parser a) -> Value -> Parser a
789withBool :: String -> (Bool -> Parser a) -> Value -> Parser a
663−withBool _ f (Bool arr) = f arr
790+withBool _ f (Bool arr) = f arr
664−withBool expected _ v = typeMismatch expected v
791+withBool name _ v = prependContext name (typeMismatch "Boolean" v)
665{-# INLINE withBool #-}
792{-# INLINE withBool #-}
666
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+
667-- | 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.
668fromJSON :: (FromJSON a) => Value -> Result a
805fromJSON :: (FromJSON a) => Value -> Result a
669fromJSON = parse parseJSON
806fromJSON = parse parseJSON
@@ -726,7 +863,7 @@ parseFieldMaybe' = (.:!)
726-- 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)@
727explicitParseField :: (Value -> Parser a) -> Object -> Text -> Parser a
864explicitParseField :: (Value -> Parser a) -> Object -> Text -> Parser a
728explicitParseField p obj key = case H.lookup key obj of
865explicitParseField p obj key = case H.lookup key obj of
729− Nothing -> fail $ "key " ++ show key ++ " not present"
866+ Nothing -> fail $ "key " ++ show key ++ " not found"
730 Just v -> p v <?> Key key
867 Just v -> p v <?> Key key
731{-# INLINE explicitParseField #-}
868{-# INLINE explicitParseField #-}
732
869
@@ -766,11 +903,47 @@ pmval .!= val = fromMaybe val <$> pmval
766-- Generic parseJSON
903-- Generic parseJSON
767-------------------------------------------------------------------------------
904-------------------------------------------------------------------------------
768
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+
769instance OVERLAPPABLE_ (GFromJSON arity a) => GFromJSON arity (M1 i c a) where
911instance OVERLAPPABLE_ (GFromJSON arity a) => GFromJSON arity (M1 i c a) where
770 -- 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
771 -- parsed value:
913 -- parsed value:
772 gParseJSON opts fargs = fmap M1 . gParseJSON opts fargs
914 gParseJSON opts fargs = fmap M1 . gParseJSON opts fargs
773
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+
774instance (FromJSON a) => GFromJSON arity (K1 i a) where
947instance (FromJSON a) => GFromJSON arity (K1 i a) where
775 -- Constant values are decoded using their FromJSON instance:
948 -- Constant values are decoded using their FromJSON instance:
776 gParseJSON _opts _ = fmap K1 . parseJSON
949 gParseJSON _opts _ = fmap K1 . parseJSON
@@ -785,339 +958,499 @@ instance (FromJSON1 f) => GFromJSON One (Rec1 f) where
785 -- FromJSON1 instance:
958 -- FromJSON1 instance:
786 gParseJSON _opts (From1Args pj pjl) = fmap Rec1 . liftParseJSON pj pjl
959 gParseJSON _opts (From1Args pj pjl) = fmap Rec1 . liftParseJSON pj pjl
787
960
788−instance GFromJSON arity U1 where
961+instance (FromJSON1 f, GFromJSON One g) => GFromJSON One (f :.: g) where
789− -- Empty constructors are expected to be encoded as an empty array:
962+ -- If an occurrence of the last type parameter is nested inside two
790− gParseJSON _opts _ v
963+ -- composed types, it is decoded by using the outermost type's FromJSON1
791− | isEmptyArray v = pure U1
964+ -- instance to generically decode the innermost type:
792− | otherwise = typeMismatch "unit constructor (U1)" v
965+ gParseJSON opts fargs =
966+ let gpj = gParseJSON opts fargs in
967+ fmap Comp1 . liftParseJSON gpj (listParser gpj)
968+
969+--------------------------------------------------------------------------------
793
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.
794instance ( ConsFromJSON arity a
987instance ( ConsFromJSON arity a
795 , AllNullary (C1 c a) allNullary
988 , AllNullary (C1 c a) allNullary
796 , ParseSum arity (C1 c a) allNullary
989 , ParseSum arity (C1 c a) allNullary
797− ) => GFromJSON arity (D1 d (C1 c a)) where
990+ , Constructor c
991+ ) => GFromJSON' arity (C1 c a) where
798 -- The option 'tagSingleConstructors' determines whether to wrap
992 -- The option 'tagSingleConstructors' determines whether to wrap
799 -- a single-constructor type.
993 -- a single-constructor type.
800− gParseJSON opts fargs
994+ gParseJSON' p@(_ :* opts :* _)
801 | tagSingleConstructors opts
995 | tagSingleConstructors opts
802− = fmap M1
996+ = (unTagged :: Tagged allNullary (Parser (C1 c a p)) -> Parser (C1 c a p))
803− . (unTagged :: Tagged allNullary (Parser (C1 c a p)) -> Parser (C1 c a p))
997+ . parseSum p
804− . parseSum opts fargs
998+ | otherwise = fmap M1 . consParseJSON (cname :* p)
805− | otherwise = fmap M1 . fmap M1 . consParseJSON opts fargs
999+ where
806−
1000+ cname = conName (undefined :: M1 _i c _f _p)
807−instance (ConsFromJSON arity a) => GFromJSON arity (C1 c a) where
1001+
808− -- Constructors need to be decoded differently depending on whether they're
1002+-- | Multiple constructors.
809− -- a record or not. This distinction is made by consParseJSON:
1003+instance ( AllNullary (a :+: b) allNullary
810− gParseJSON opts fargs = fmap M1 . consParseJSON opts fargs
1004+ , ParseSum arity (a :+: b) allNullary
811−
1005+ ) => GFromJSON' arity (a :+: b) where
812−instance ( FromProduct arity a, FromProduct arity b
813− , ProductSize a, ProductSize b
814− ) => GFromJSON arity (a :*: b) where
815− -- Products are expected to be encoded to an array. Here we check whether we
816− -- got an array of the same size as the product, then parse each of the
817− -- product's elements using parseProduct:
818− gParseJSON opts fargs = withArray "product (:*:)" $ \arr ->
819− let lenArray = V.length arr
820− lenProduct = (unTagged2 :: Tagged2 (a :*: b) Int -> Int)
821− productSize in
822− if lenArray == lenProduct
823− then parseProduct opts fargs arr 0 lenProduct
824− else fail $ "When expecting a product of " ++ show lenProduct ++
825− " values, encountered an Array of " ++ show lenArray ++
826− " elements instead"
827−
828−instance ( AllNullary (a :+: b) allNullary
829− , ParseSum arity (a :+: b) allNullary
830− ) => GFromJSON arity (a :+: b) where
831 -- If all constructors of a sum datatype are nullary and the
1006 -- If all constructors of a sum datatype are nullary and the
832 -- 'allNullaryToStringTag' option is set they are expected to be
1007 -- 'allNullaryToStringTag' option is set they are expected to be
833 -- encoded as strings. This distinction is made by 'parseSum':
1008 -- encoded as strings. This distinction is made by 'parseSum':
834− gParseJSON opts fargs =
1009+ gParseJSON' p =
835− (unTagged :: Tagged allNullary (Parser ((a :+: b) d)) ->
1010+ (unTagged :: Tagged allNullary (Parser ((a :+: b) _d)) ->
836− Parser ((a :+: b) d))
1011+ Parser ((a :+: b) _d))
837− . parseSum opts fargs
1012+ . parseSum p
838−
839−instance (FromJSON1 f, GFromJSON One g) => GFromJSON One (f :.: g) where
840− -- If an occurrence of the last type parameter is nested inside two
841− -- composed types, it is decoded by using the outermost type's FromJSON1
842− -- instance to generically decode the innermost type:
843− gParseJSON opts fargs =
844− let gpj = gParseJSON opts fargs in
845− fmap Comp1 . liftParseJSON gpj (listParser gpj)
846
1013
847--------------------------------------------------------------------------------
1014--------------------------------------------------------------------------------
848
1015
849class ParseSum arity f allNullary where
1016class ParseSum arity f allNullary where
850− parseSum :: Options -> FromArgs arity a
1017+ parseSum :: TypeName :* Options :* FromArgs arity a
851− -> Value -> Tagged allNullary (Parser (f a))
1018+ -> Value
1019+ -> Tagged allNullary (Parser (f a))
852
1020
853−instance ( SumFromString f
1021+instance ( ConstructorNames f
1022+ , SumFromString f
854 , FromPair arity f
1023 , FromPair arity f
855 , FromTaggedObject arity f
1024 , FromTaggedObject arity f
856 , FromUntaggedValue arity f
1025 , FromUntaggedValue arity f
857 ) => ParseSum arity f True where
1026 ) => ParseSum arity f True where
858− parseSum opts fargs
1027+ parseSum p@(tname :* opts :* _)
859− | allNullaryToStringTag opts = Tagged . parseAllNullarySum opts
1028+ | allNullaryToStringTag opts = Tagged . parseAllNullarySum tname opts
860− | otherwise = Tagged . parseNonAllNullarySum opts fargs
1029+ | otherwise = Tagged . parseNonAllNullarySum p
861
1030
862−instance ( FromPair arity f
1031+instance ( ConstructorNames f
1032+ , FromPair arity f
863 , FromTaggedObject arity f
1033 , FromTaggedObject arity f
864 , FromUntaggedValue arity f
1034 , FromUntaggedValue arity f
865 ) => ParseSum arity f False where
1035 ) => ParseSum arity f False where
866− parseSum opts fargs = Tagged . parseNonAllNullarySum opts fargs
1036+ parseSum p = Tagged . parseNonAllNullarySum p
867
1037
868--------------------------------------------------------------------------------
1038--------------------------------------------------------------------------------
869
1039
870−parseAllNullarySum :: SumFromString f => Options -> Value -> Parser (f a)
1040+parseAllNullarySum :: (SumFromString f, ConstructorNames f)
871−parseAllNullarySum opts = withText "Text" $ \key ->
1041+ => TypeName -> Options -> Value -> Parser (f a)
872− maybe (notFound key) return $
1042+parseAllNullarySum tname opts =
873− parseSumFromString opts key
1043+ withText tname $ \tag ->
1044+ maybe (badTag tag) return $
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])
874
1062
875class SumFromString f where
1063class SumFromString f where
876− parseSumFromString :: Options -> Text -> Maybe (f a)
1064+ parseSumFromString :: (String -> String) -> Text -> Maybe (f a)
877
1065
878instance (SumFromString a, SumFromString b) => SumFromString (a :+: b) where
1066instance (SumFromString a, SumFromString b) => SumFromString (a :+: b) where
879 parseSumFromString opts key = (L1 <$> parseSumFromString opts key) <|>
1067 parseSumFromString opts key = (L1 <$> parseSumFromString opts key) <|>
880 (R1 <$> parseSumFromString opts key)
1068 (R1 <$> parseSumFromString opts key)
881
1069
882instance (Constructor c) => SumFromString (C1 c U1) where
1070instance (Constructor c) => SumFromString (C1 c U1) where
883− parseSumFromString opts key | key == name = Just $ M1 U1
1071+ parseSumFromString modifier key
884− | otherwise = Nothing
1072+ | key == name = Just $ M1 U1
885− where
1073+ | otherwise = Nothing
886− name = pack $ constructorTagModifier opts $
1074+ where
887− conName (undefined :: t c U1 p)
1075+ name = pack $ modifier $ conName (undefined :: M1 _i c _f _p)
888
1076
889−--------------------------------------------------------------------------------
1077+-- For genericFromJSONKey
1078+instance SumFromString a => SumFromString (D1 d a) where
1079+ parseSumFromString modifier key = M1 <$> parseSumFromString modifier key
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)
890
1090
891−parseNonAllNullarySum :: ( FromPair arity f
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+--------------------------------------------------------------------------------
1113+parseNonAllNullarySum :: forall f c arity.
1114+ ( FromPair arity f
892 , FromTaggedObject arity f
1115 , FromTaggedObject arity f
893 , FromUntaggedValue arity f
1116 , FromUntaggedValue arity f
894− ) => Options -> FromArgs arity c
1117+ , ConstructorNames f
1118+ ) => TypeName :* Options :* FromArgs arity c
895 -> Value -> Parser (f c)
1119 -> Value -> Parser (f c)
896−parseNonAllNullarySum opts fargs =
1120+parseNonAllNullarySum p@(tname :* opts :* _) =
897 case sumEncoding opts of
1121 case sumEncoding opts of
898 TaggedObject{..} ->
1122 TaggedObject{..} ->
899− withObject "Object" $ \obj -> do
1123+ withObject tname $ \obj -> do
900− tag <- obj .: pack tagFieldName
1124+ tag <- contextType tname . contextTag tagKey cnames_ $ obj .: tagKey
901− fromMaybe (notFound tag) $
1125+ fromMaybe (badTag tag <?> Key tagKey) $
902− 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])
903
1133
904 ObjectWithSingleField ->
1134 ObjectWithSingleField ->
905− withObject "Object" $ \obj ->
1135+ withObject tname $ \obj -> case H.toList obj of
906− case H.toList obj of
1136+ [(tag, v)] -> maybe (badTag tag) (<?> Key tag) $
907− [pair@(tag, _)] -> fromMaybe (notFound tag) $
1137+ parsePair (tag :* p) v
908− parsePair opts fargs pair
1138+ _ -> contextType tname . fail $
909− _ -> fail "Object doesn't have a single field"
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
910
1145
911 TwoElemArray ->
1146 TwoElemArray ->
912− withArray "Array" $ \arr ->
1147+ withArray tname $ \arr -> case V.length arr of
913− if V.length arr == 2
1148+ 2 | String tag <- V.unsafeIndex arr 0 ->
914− then case V.unsafeIndex arr 0 of
1149+ maybe (badTag tag <?> Index 0) (<?> Index 1) $
915− String tag -> fromMaybe (notFound tag) $
1150+ parsePair (tag :* p) (V.unsafeIndex arr 1)
916− parsePair opts fargs (tag, V.unsafeIndex arr 1)
1151+ | otherwise ->
917− _ -> fail "First element is not a String"
1152+ contextType tname $
918− else fail "Array doesn't have 2 elements"
1153+ fail "tag element is not a String" <?> Index 0
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
919
1161
920− UntaggedValue -> parseUntaggedValue opts fargs
1162+ UntaggedValue -> parseUntaggedValue p
1163+ where
1164+ failWith_ = failWithCTags tname (constructorTagModifier opts)
921
1165
922--------------------------------------------------------------------------------
1166--------------------------------------------------------------------------------
923
1167
924class FromTaggedObject arity f where
1168class FromTaggedObject arity f where
925− parseFromTaggedObject :: Options -> FromArgs arity a
1169+ -- The first two components of the parameter tuple are: the constructor tag
926− -> String -> Object
1170+ -- to match against, and the contents field name.
927− -> Text -> Maybe (Parser (f a))
1171+ parseFromTaggedObject
1172+ :: Text :* String :* TypeName :* Options :* FromArgs arity a
1173+ -> Object
1174+ -> Maybe (Parser (f a))
928
1175
929instance ( FromTaggedObject arity a, FromTaggedObject arity b) =>
1176instance ( FromTaggedObject arity a, FromTaggedObject arity b) =>
930 FromTaggedObject arity (a :+: b) where
1177 FromTaggedObject arity (a :+: b) where
931− parseFromTaggedObject opts fargs contentsFieldName obj tag =
1178+ parseFromTaggedObject p obj =
932− (fmap L1 <$> parseFromTaggedObject opts fargs contentsFieldName obj tag) <|>
1179+ (fmap L1 <$> parseFromTaggedObject p obj) <|>
933− (fmap R1 <$> parseFromTaggedObject opts fargs contentsFieldName obj tag)
1180+ (fmap R1 <$> parseFromTaggedObject p obj)
934
1181
935−instance ( FromTaggedObject' arity f
1182+instance ( IsRecord f isRecord
1183+ , FromTaggedObject' arity f isRecord
936 , Constructor c
1184 , Constructor c
937 ) => FromTaggedObject arity (C1 c f) where
1185 ) => FromTaggedObject arity (C1 c f) where
938− parseFromTaggedObject opts fargs contentsFieldName obj tag
1186+ parseFromTaggedObject (tag :* contentsFieldName :* p@(_ :* opts :* _))
939− | tag == name = Just $ M1 <$> parseFromTaggedObject'
1187+ | tag == tag'
940− opts fargs contentsFieldName obj
1188+ = Just . fmap M1 .
941− | otherwise = Nothing
1189+ (unTagged :: Tagged isRecord (Parser (f a)) -> Parser (f a)) .
942− where
1190+ parseFromTaggedObject' (contentsFieldName :* cname :* p)
943− name = pack $ constructorTagModifier opts $
1191+ | otherwise = const Nothing
944− conName (undefined :: t c f p)
1192+ where
1193+ tag' = pack $ constructorTagModifier opts cname
1194+ cname = conName (undefined :: M1 _i c _f _p)
945
1195
946--------------------------------------------------------------------------------
1196--------------------------------------------------------------------------------
947
1197
948−class FromTaggedObject' arity f where
1198+class FromTaggedObject' arity f isRecord where
949− parseFromTaggedObject' :: Options -> FromArgs arity a -> String
1199+ -- The first component of the parameter tuple is the contents field name.
950− -> Object -> Parser (f a)
1200+ parseFromTaggedObject'
951−
1201+ :: String :* ConName :* TypeName :* Options :* FromArgs arity a
952−class FromTaggedObject'' arity f isRecord where
1202+ -> Object -> Tagged isRecord (Parser (f a))
953− parseFromTaggedObject'' :: Options -> FromArgs arity a -> String
1203+
954− -> Object -> Tagged isRecord (Parser (f a))
1204+instance (RecordFromJSON arity f, FieldNames f) => FromTaggedObject' arity f True where
955−
1205+ -- Records are unpacked in the tagged object
956−instance ( IsRecord f isRecord
1206+ parseFromTaggedObject' (_ :* p) = Tagged . recordParseJSON (True :* p)
957− , FromTaggedObject'' arity f isRecord
1207+
958− ) => FromTaggedObject' arity f where
1208+instance (ConsFromJSON arity f) => FromTaggedObject' arity f False where
959− parseFromTaggedObject' opts fargs contentsFieldName =
1209+ -- Nonnullary nonrecords are encoded in the contents field
960− (unTagged :: Tagged isRecord (Parser (f a)) -> Parser (f a)) .
1210+ parseFromTaggedObject' p obj = Tagged $ do
961− parseFromTaggedObject'' opts fargs contentsFieldName
1211+ contents <- contextCons cname tname (obj .: key)
962−
1212+ consParseJSON p' contents <?> Key key
963−instance (FromRecord arity f) => FromTaggedObject'' arity f True where
1213+ where
964− parseFromTaggedObject'' opts fargs _ =
1214+ key = pack contentsFieldName
965− Tagged . parseRecord opts fargs Nothing
1215+ contentsFieldName :* p'@(cname :* tname :* _) = p
966−
967−instance (GFromJSON arity f) => FromTaggedObject'' arity f False where
968− parseFromTaggedObject'' opts fargs contentsFieldName = Tagged .
969− (gParseJSON opts fargs <=< (.: pack contentsFieldName))
970
1216
971−instance OVERLAPPING_ FromTaggedObject'' arity U1 False where
1217+instance OVERLAPPING_ FromTaggedObject' arity U1 False where
972− parseFromTaggedObject'' _ _ _ _ = Tagged (pure U1)
1218+ -- Nullary constructors don't need a contents field
1219+ parseFromTaggedObject' _ _ = Tagged (pure U1)
973
1220
974--------------------------------------------------------------------------------
1221--------------------------------------------------------------------------------
975
1222
1223+-- | Constructors need to be decoded differently depending on whether they're
1224+-- a record or not. This distinction is made by 'ConsParseJSON'.
976class ConsFromJSON arity f where
1225class ConsFromJSON arity f where
977− consParseJSON :: Options -> FromArgs arity a
1226+ consParseJSON
978− -> Value -> Parser (f a)
1227+ :: ConName :* TypeName :* Options :* FromArgs arity a
1228+ -> Value -> Parser (f a)
979
1229
980class ConsFromJSON' arity f isRecord where
1230class ConsFromJSON' arity f isRecord where
981− consParseJSON' :: Options -> FromArgs arity a
1231+ consParseJSON'
982− -> Maybe Text -- ^ A dummy label
1232+ :: ConName :* TypeName :* Options :* FromArgs arity a
983− -- (Nothing to use proper label)
1233+ -> Value -> Tagged isRecord (Parser (f a))
984− -> Value -> Tagged isRecord (Parser (f a))
985
1234
986instance ( IsRecord f isRecord
1235instance ( IsRecord f isRecord
987 , ConsFromJSON' arity f isRecord
1236 , ConsFromJSON' arity f isRecord
988 ) => ConsFromJSON arity f where
1237 ) => ConsFromJSON arity f where
989− consParseJSON opts fargs v = let
1238+ consParseJSON p =
990− (v2,lab) = case (unwrapUnaryRecords opts,isUnary (undefined :: f a)) of
1239+ (unTagged :: Tagged isRecord (Parser (f a)) -> Parser (f a))
991− -- use a dummy object with a dummy label
1240+ . consParseJSON' p
992− (True,True) -> (object [(pack "dummy",v)], Just $ pack "dummy")
993− _ ->(v,Nothing)
994− in (unTagged :: Tagged isRecord (Parser (f a)) -> Parser (f a))
995− $ consParseJSON' opts fargs lab v2
996
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)
1246+ | unwrapUnaryRecords opts = Tagged . fmap M1 . gParseJSON opts fargs
1247+ | otherwise = Tagged . withObject (showCons cname tname) (recordParseJSON (False :* p))
1248+
1249+instance RecordFromJSON arity f => ConsFromJSON' arity f True where
1250+ consParseJSON' p@(cname :* tname :* _) =
1251+ Tagged . withObject (showCons cname tname) (recordParseJSON (False :* p))
997
1252
998−instance (FromRecord arity f) => ConsFromJSON' arity f True where
1253+instance OVERLAPPING_
999− consParseJSON' opts fargs mlab = Tagged . withObject "record (:*:)"
1254+ ConsFromJSON' arity U1 False where
1000− (parseRecord opts fargs mlab)
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)
1001
1265
1002−instance (GFromJSON arity f) => ConsFromJSON' arity f False where
1266+instance OVERLAPPING_
1003− consParseJSON' opts fargs _ = Tagged . gParseJSON opts fargs
1267+ GFromJSON arity f => ConsFromJSON' arity (S1 s f) False where
1268+ consParseJSON' (_ :* _ :* opts :* fargs) =
1269+ Tagged . fmap M1 . gParseJSON opts fargs
1270+
1271+instance (ProductFromJSON arity f, ProductSize f
1272+ ) => ConsFromJSON' arity f False where
1273+ consParseJSON' p = Tagged . productParseJSON0 p
1004
1274
1005--------------------------------------------------------------------------------
1275--------------------------------------------------------------------------------
1006
1276
1007−class FromRecord arity f where
1277+class FieldNames f where
1008− parseRecord :: Options -> FromArgs arity a
1278+ fieldNames :: f a -> [Text] -> [Text]
1009− -> Maybe Text -- ^ A dummy label
1010− -- (Nothing to use proper label)
1011− -> Object -> Parser (f a)
1012
1279
1013−instance ( FromRecord arity a
1280+instance (FieldNames a, FieldNames b) => FieldNames (a :*: b) where
1014− , FromRecord arity b
1281+ fieldNames _ =
1015− ) => FromRecord arity (a :*: b) where
1282+ fieldNames (undefined :: a x) .
1016− parseRecord opts fargs _ obj =
1283+ fieldNames (undefined :: b y)
1017− (:*:) <$> parseRecord opts fargs Nothing obj
1018− <*> parseRecord opts fargs Nothing obj
1019
1284
1020−instance OVERLAPPABLE_ (Selector s, GFromJSON arity a) =>
1285+instance (Selector s) => FieldNames (S1 s f) where
1021− FromRecord arity (S1 s a) where
1286+ fieldNames _ = (pack (selName (undefined :: M1 _i s _f _p)) :)
1022− parseRecord opts fargs lab =
1287+
1023− (<?> 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
1024 where
1298 where
1025− label = fromMaybe defLabel lab
1299+ knownFields :: H.HashMap Text ()
1026− defLabel = pack . fieldLabelModifier opts $
1300+ knownFields = H.fromList $ map (,()) $
1027− selName (undefined :: t s a p)
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
1329+ label = pack $ fieldLabelModifier opts sname
1330+ sname = selName (undefined :: M1 _i s _f _p)
1028
1331
1029instance INCOHERENT_ (Selector s, FromJSON a) =>
1332instance INCOHERENT_ (Selector s, FromJSON a) =>
1030− FromRecord arity (S1 s (K1 i (Maybe a))) where
1333+ RecordFromJSON' arity (S1 s (K1 i (Maybe a))) where
1031− parseRecord _ _ (Just lab) obj = (M1 . K1) <$> obj .:? lab
1334+ recordParseJSON' (_ :* _ :* opts :* _) obj = M1 . K1 <$> obj .:? pack label
1032− parseRecord opts _ Nothing obj = (M1 . K1) <$> obj .:? pack label
1335+ where
1033− where
1336+ label = fieldLabelModifier opts sname
1034− label = fieldLabelModifier opts $
1337+ sname = selName (undefined :: M1 _i s _f _p)
1035− selName (undefined :: t s (K1 i (Maybe a)) 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))
1036
1346
1037--------------------------------------------------------------------------------
1347--------------------------------------------------------------------------------
1038
1348
1039−class FromProduct arity f where
1349+productParseJSON0
1040− parseProduct :: Options -> FromArgs arity a
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+
1369+class ProductFromJSON arity f where
1370+ productParseJSON :: ConName :* TypeName :* Options :* FromArgs arity a
1041 -> Array -> Int -> Int
1371 -> Array -> Int -> Int
1042 -> Parser (f a)
1372 -> Parser (f a)
1043
1373
1044−instance ( FromProduct arity a
1374+instance ( ProductFromJSON arity a
1045− , FromProduct arity b
1375+ , ProductFromJSON arity b
1046− ) => FromProduct arity (a :*: b) where
1376+ ) => ProductFromJSON arity (a :*: b) where
1047− parseProduct opts fargs arr ix len =
1377+ productParseJSON p arr ix len =
1048− (:*:) <$> parseProduct opts fargs arr ix lenL
1378+ (:*:) <$> productParseJSON p arr ix lenL
1049− <*> parseProduct opts fargs arr ixR lenR
1379+ <*> productParseJSON p arr ixR lenR
1050 where
1380 where
1051 lenL = len `unsafeShiftR` 1
1381 lenL = len `unsafeShiftR` 1
1052 ixR = ix + lenL
1382 ixR = ix + lenL
1053 lenR = len - lenL
1383 lenR = len - lenL
1054
1384
1055−instance (GFromJSON arity a) => FromProduct arity (S1 s a) where
1385+instance (GFromJSON arity a) => ProductFromJSON arity (S1 s a) where
1056− parseProduct opts fargs arr ix _ =
1386+ productParseJSON (_ :* _ :* opts :* fargs) arr ix _ =
1057− gParseJSON opts fargs $ V.unsafeIndex arr ix
1387+ M1 <$> gParseJSON opts fargs (V.unsafeIndex arr ix) <?> Index ix
1058
1388
1059--------------------------------------------------------------------------------
1389--------------------------------------------------------------------------------
1060
1390
1061class FromPair arity f where
1391class FromPair arity f where
1062− parsePair :: Options -> FromArgs arity a
1392+ -- The first component of the parameter tuple is the tag to match.
1063− -> Pair -> Maybe (Parser (f a))
1393+ parsePair :: Text :* TypeName :* Options :* FromArgs arity a
1394+ -> Value
1395+ -> Maybe (Parser (f a))
1064
1396
1065instance ( FromPair arity a
1397instance ( FromPair arity a
1066 , FromPair arity b
1398 , FromPair arity b
1067 ) => FromPair arity (a :+: b) where
1399 ) => FromPair arity (a :+: b) where
1068− parsePair opts fargs pair = (fmap L1 <$> parsePair opts fargs pair) <|>
1400+ parsePair p pair =
1069− (fmap R1 <$> parsePair opts fargs pair)
1401+ (fmap L1 <$> parsePair p pair) <|>
1402+ (fmap R1 <$> parsePair p pair)
1070
1403
1071instance ( Constructor c
1404instance ( Constructor c
1072− , GFromJSON arity a
1073 , ConsFromJSON arity a
1405 , ConsFromJSON arity a
1074 ) => FromPair arity (C1 c a) where
1406 ) => FromPair arity (C1 c a) where
1075− parsePair opts fargs (tag, value)
1407+ parsePair (tag :* p@(_ :* opts :* _)) v
1076− | tag == tag' = Just $ gParseJSON opts fargs value
1408+ | tag == tag' = Just $ M1 <$> consParseJSON (cname :* p) v
1077 | otherwise = Nothing
1409 | otherwise = Nothing
1078− where
1410+ where
1079− tag' = pack $ constructorTagModifier opts $
1411+ tag' = pack $ constructorTagModifier opts cname
1080− conName (undefined :: t c a p)
1412+ cname = conName (undefined :: M1 _i c _a _p)
1081
1413
1082--------------------------------------------------------------------------------
1414--------------------------------------------------------------------------------
1083
1415
1084class FromUntaggedValue arity f where
1416class FromUntaggedValue arity f where
1085− parseUntaggedValue :: Options -> FromArgs arity a
1417+ parseUntaggedValue :: TypeName :* Options :* FromArgs arity a
1086− -> Value -> Parser (f a)
1418+ -> Value
1419+ -> Parser (f a)
1087
1420
1088instance
1421instance
1089 ( FromUntaggedValue arity a
1422 ( FromUntaggedValue arity a
1090 , FromUntaggedValue arity b
1423 , FromUntaggedValue arity b
1091 ) => FromUntaggedValue arity (a :+: b)
1424 ) => FromUntaggedValue arity (a :+: b)
1092 where
1425 where
1093− parseUntaggedValue opts fargs value =
1426+ parseUntaggedValue p value =
1094− L1 <$> parseUntaggedValue opts fargs value <|>
1427+ L1 <$> parseUntaggedValue p value <|>
1095− R1 <$> parseUntaggedValue opts fargs value
1428+ R1 <$> parseUntaggedValue p value
1096
1429
1097instance OVERLAPPABLE_
1430instance OVERLAPPABLE_
1098− ( GFromJSON arity a
1431+ ( ConsFromJSON arity a
1099− , ConsFromJSON arity a
1432+ , Constructor c
1100 ) => FromUntaggedValue arity (C1 c a)
1433 ) => FromUntaggedValue arity (C1 c a)
1101 where
1434 where
1102− parseUntaggedValue = gParseJSON
1435+ parseUntaggedValue p = fmap M1 . consParseJSON (cname :* p)
1436+ where
1437+ cname = conName (undefined :: M1 _i c _f _p)
1103
1438
1104instance OVERLAPPING_
1439instance OVERLAPPING_
1105 ( Constructor c )
1440 ( Constructor c )
1106 => FromUntaggedValue arity (C1 c U1)
1441 => FromUntaggedValue arity (C1 c U1)
1107 where
1442 where
1108− parseUntaggedValue opts _ (String s)
1443+ parseUntaggedValue (tname :* opts :* _) v =
1109− | s == pack (constructorTagModifier opts (conName (undefined :: t c U1 p))) =
1444+ contextCons cname tname $ case v of
1110− pure $ M1 U1
1445+ String tag
1111− | otherwise =
1446+ | tag == tag' -> pure $ M1 U1
1112− fail $ "Invalid tag: " ++ unpack s
1447+ | otherwise -> fail_ tag
1113− parseUntaggedValue _ _ v = typeMismatch (conName (undefined :: t c U1 p)) v
1448+ _ -> typeMismatch "String" v
1114−
1449+ where
1115−
1450+ tag' = pack $ constructorTagModifier opts cname
1116−--------------------------------------------------------------------------------
1451+ cname = conName (undefined :: M1 _i c _f _p)
1117−
1452+ fail_ tag = fail $
1118−notFound :: Text -> Parser a
1453+ "expected tag " ++ show tag' ++ ", but found tag " ++ show tag
1119−notFound key = fail $ "The key \"" ++ unpack key ++ "\" was not found"
1120−{-# INLINE notFound #-}
1121
1454
1122-------------------------------------------------------------------------------
1455-------------------------------------------------------------------------------
1123-- Instances
1456-- Instances
@@ -1175,17 +1508,20 @@ instance (FromJSON a, FromJSON b) => FromJSON (Either a b) where
1175 parseJSON = parseJSON2
1508 parseJSON = parseJSON2
1176 {-# INLINE parseJSON #-}
1509 {-# INLINE parseJSON #-}
1177
1510
1178−
1511+instance FromJSON Void where
1512+ parseJSON _ = fail "Cannot parse Void"
1513+ {-# INLINE parseJSON #-}
1179
1514
1180instance FromJSON Bool where
1515instance FromJSON Bool where
1181− parseJSON = withBool "Bool" pure
1516+ parseJSON (Bool b) = pure b
1517+ parseJSON v = typeMismatch "Bool" v
1182 {-# INLINE parseJSON #-}
1518 {-# INLINE parseJSON #-}
1183
1519
1184instance FromJSONKey Bool where
1520instance FromJSONKey Bool where
1185 fromJSONKey = FromJSONKeyTextParser $ \t -> case t of
1521 fromJSONKey = FromJSONKeyTextParser $ \t -> case t of
1186 "true" -> pure True
1522 "true" -> pure True
1187 "false" -> pure False
1523 "false" -> pure False
1188− _ -> fail $ "Cannot parse key into Bool: " ++ T.unpack t
1524+ _ -> fail $ "cannot parse key " ++ show t ++ " into Bool"
1189
1525
1190instance FromJSON Ordering where
1526instance FromJSON Ordering where
1191 parseJSON = withText "Ordering" $ \s ->
1527 parseJSON = withText "Ordering" $ \s ->
@@ -1193,25 +1529,30 @@ instance FromJSON Ordering where
1193 "LT" -> return LT
1529 "LT" -> return LT
1194 "EQ" -> return EQ
1530 "EQ" -> return EQ
1195 "GT" -> return GT
1531 "GT" -> return GT
1196− _ -> fail "Parsing Ordering value failed: expected \"LT\", \"EQ\", or \"GT\""
1532+ _ -> fail $ "parsing Ordering failed, unexpected " ++ show s ++
1533+ " (expected \"LT\", \"EQ\", or \"GT\")"
1197
1534
1198instance FromJSON () where
1535instance FromJSON () where
1199 parseJSON = withArray "()" $ \v ->
1536 parseJSON = withArray "()" $ \v ->
1200 if V.null v
1537 if V.null v
1201 then pure ()
1538 then pure ()
1202− else fail "Expected an empty array"
1539+ else prependContext "()" $ fail "expected an empty array"
1203 {-# INLINE parseJSON #-}
1540 {-# INLINE parseJSON #-}
1204
1541
1205instance FromJSON Char where
1542instance FromJSON Char where
1206− parseJSON = withText "Char" $ \t ->
1543+ parseJSON = withText "Char" parseChar
1207− if T.compareLength t 1 == EQ
1208− then pure $ T.head t
1209− else fail "Expected a string of length 1"
1210 {-# INLINE parseJSON #-}
1544 {-# INLINE parseJSON #-}
1211
1545
1212− parseJSONList = withText "String" $ pure . T.unpack
1546+ parseJSONList (String s) = pure (T.unpack s)
1547+ parseJSONList v = typeMismatch "String" v
1213 {-# INLINE parseJSONList #-}
1548 {-# INLINE parseJSONList #-}
1214
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+
1215instance FromJSON Double where
1556instance FromJSON Double where
1216 parseJSON = parseRealFloat "Double"
1557 parseJSON = parseRealFloat "Double"
1217 {-# INLINE parseJSON #-}
1558 {-# INLINE parseJSON #-}
@@ -1223,12 +1564,6 @@ instance FromJSONKey Double where
1223 "-Infinity" -> pure (negate 1/0)
1564 "-Infinity" -> pure (negate 1/0)
1224 _ -> Scientific.toRealFloat <$> parseScientificText t
1565 _ -> Scientific.toRealFloat <$> parseScientificText t
1225
1566
1226−instance FromJSON Number where
1227− parseJSON (Number s) = pure $ scientificToNumber s
1228− parseJSON Null = pure (D (0/0))
1229− parseJSON v = typeMismatch "Number" v
1230− {-# INLINE parseJSON #-}
1231−
1232instance FromJSON Float where
1567instance FromJSON Float where
1233 parseJSON = parseRealFloat "Float"
1568 parseJSON = parseRealFloat "Float"
1234 {-# INLINE parseJSON #-}
1569 {-# INLINE parseJSON #-}
@@ -1241,17 +1576,30 @@ instance FromJSONKey Float where
1241 _ -> Scientific.toRealFloat <$> parseScientificText t
1576 _ -> Scientific.toRealFloat <$> parseScientificText t
1242
1577
1243instance (FromJSON a, Integral a) => FromJSON (Ratio a) where
1578instance (FromJSON a, Integral a) => FromJSON (Ratio a) where
1244− parseJSON = withObject "Rational" $ \obj ->
1579+ parseJSON (Number x)
1245− (%) <$> obj .: "numerator"
1580+ | exp10 <= 1024
1246− <*> obj .: "denominator"
1581+ , exp10 >= -1024 = return $! realToFrac x
1247− {-# INLINE parseJSON #-}
1582+ | otherwise = prependContext "Ratio" $ fail msg
1248−
1583+ where
1249−-- | /WARNING:/ Only parse fixed-precision numbers from trusted input
1584+ exp10 = base10Exponent x
1250−-- since an attacker could easily fill up the memory of the target
1585+ msg = "found a number with exponent " ++ show exp10
1251−-- system by specifying a scientific number with a big exponent like
1586+ ++ ", but it must not be greater than 1024 or less than -1024"
1252−-- @1e1000000000@.
1587+ parseJSON o = objParser o
1588+ where
1589+ objParser = withObject "Rational" $ \obj -> do
1590+ numerator <- obj .: "numerator"
1591+ denominator <- obj .: "denominator"
1592+ if denominator == 0
1593+ then fail "Ratio denominator was 0"
1594+ else pure $ numerator % denominator
1595+ {-# INLINE parseJSON #-}
1596+
1597+-- | This instance includes a bounds check to prevent maliciously
1598+-- large inputs to fill up the memory of the target system. You can
1599+-- newtype 'Scientific' and provide your own instance using
1600+-- 'withScientific' if you want to allow larger inputs.
1253instance HasResolution a => FromJSON (Fixed a) where
1601instance HasResolution a => FromJSON (Fixed a) where
1254− parseJSON = withScientific "Fixed" $ pure . realToFrac
1602+ parseJSON = prependContext "Fixed" . withBoundedScientific' (pure . realToFrac)
1255 {-# INLINE parseJSON #-}
1603 {-# INLINE parseJSON #-}
1256
1604
1257instance FromJSON Int where
1605instance FromJSON Int where
@@ -1261,10 +1609,10 @@ instance FromJSON Int where
1261instance FromJSONKey Int where
1609instance FromJSONKey Int where
1262 fromJSONKey = FromJSONKeyTextParser $ parseBoundedIntegralText "Int"
1610 fromJSONKey = FromJSONKeyTextParser $ parseBoundedIntegralText "Int"
1263
1611
1264−-- | /WARNING:/ Only parse Integers from trusted input since an
1612+-- | This instance includes a bounds check to prevent maliciously
1265−-- 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
1266−-- specifying a scientific number with a big exponent like
1614+-- newtype 'Scientific' and provide your own instance using
1267−-- @1e1000000000@.
1615+-- 'withScientific' if you want to allow larger inputs.
1268instance FromJSON Integer where
1616instance FromJSON Integer where
1269 parseJSON = parseIntegral "Integer"
1617 parseJSON = parseIntegral "Integer"
1270 {-# INLINE parseJSON #-}
1618 {-# INLINE parseJSON #-}
@@ -1273,16 +1621,21 @@ instance FromJSONKey Integer where
1273 fromJSONKey = FromJSONKeyTextParser $ parseIntegralText "Integer"
1621 fromJSONKey = FromJSONKeyTextParser $ parseIntegralText "Integer"
1274
1622
1275instance FromJSON Natural where
1623instance FromJSON Natural where
1276− parseJSON = withScientific "Natural" $ \s ->
1624+ parseJSON value = do
1277− if Scientific.coefficient s < 0
1625+ integer <- parseIntegral "Natural" value
1278− then fail $ "Expected a Natural number but got the negative number: " <> show s
1626+ parseNatural integer
1279− else pure $ truncate s
1280
1627
1281instance FromJSONKey Natural where
1628instance FromJSONKey Natural where
1282− fromJSONKey = FromJSONKeyTextParser $ \t -> parseScientificText t >>= \s ->
1629+ fromJSONKey = FromJSONKeyTextParser $ \text -> do
1283− if Scientific.coefficient s < 0
1630+ integer <- parseIntegralText "Natural" text
1284− then fail $ "Expected a Natural number but got the negative number: " <> show s
1631+ parseNatural integer
1285− else pure $ truncate s
1632+
1633+parseNatural :: Integer -> Parser Natural
1634+parseNatural integer =
1635+ if integer < 0 then
1636+ fail $ "parsing Natural failed, unexpected negative number " <> show integer
1637+ else
1638+ pure $ fromIntegral integer
1286
1639
1287instance FromJSON Int8 where
1640instance FromJSON Int8 where
1288 parseJSON = parseBoundedIntegral "Int8"
1641 parseJSON = parseBoundedIntegral "Int8"
@@ -1347,6 +1700,9 @@ instance FromJSON Word64 where
1347instance FromJSONKey Word64 where
1700instance FromJSONKey Word64 where
1348 fromJSONKey = FromJSONKeyTextParser $ parseBoundedIntegralText "Word64"
1701 fromJSONKey = FromJSONKeyTextParser $ parseBoundedIntegralText "Word64"
1349
1702
1703+instance FromJSON CTime where
1704+ parseJSON = fmap CTime . parseJSON
1705+ {-# INLINE parseJSON #-}
1350
1706
1351instance FromJSON Text where
1707instance FromJSON Text where
1352 parseJSON = withText "Text" pure
1708 parseJSON = withText "Text" pure
@@ -1376,17 +1732,17 @@ parseVersionText = go . readP_to_S parseVersion . unpack
1376 where
1732 where
1377 go [(v,[])] = return v
1733 go [(v,[])] = return v
1378 go (_ : xs) = go xs
1734 go (_ : xs) = go xs
1379− go _ = fail "could not parse Version"
1735+ go _ = fail "parsing Version failed"
1380
1736
1381-------------------------------------------------------------------------------
1737-------------------------------------------------------------------------------
1382-- semigroups NonEmpty
1738-- semigroups NonEmpty
1383-------------------------------------------------------------------------------
1739-------------------------------------------------------------------------------
1384
1740
1385instance FromJSON1 NonEmpty where
1741instance FromJSON1 NonEmpty where
1386− liftParseJSON p _ = withArray "NonEmpty a" $
1742+ liftParseJSON p _ = withArray "NonEmpty" $
1387 (>>= ne) . Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1743 (>>= ne) . Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1388 where
1744 where
1389− ne [] = fail "Expected a NonEmpty but got an empty list"
1745+ ne [] = fail "parsing NonEmpty failed, unexpected empty list"
1390 ne (x:xs) = pure (x :| xs)
1746 ne (x:xs) = pure (x :| xs)
1391 {-# INLINE liftParseJSON #-}
1747 {-# INLINE liftParseJSON #-}
1392
1748
@@ -1407,7 +1763,7 @@ instance FromJSON Scientific where
1407-------------------------------------------------------------------------------
1763-------------------------------------------------------------------------------
1408
1764
1409instance FromJSON1 DList.DList where
1765instance FromJSON1 DList.DList where
1410− liftParseJSON p _ = withArray "DList a" $
1766+ liftParseJSON p _ = withArray "DList" $
1411 fmap DList.fromList .
1767 fmap DList.fromList .
1412 Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1768 Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1413 {-# INLINE liftParseJSON #-}
1769 {-# INLINE liftParseJSON #-}
@@ -1484,7 +1840,7 @@ instance (FromJSON1 f, FromJSON1 g) => FromJSON1 (Sum f g) where
1484 inr = "InR"
1840 inr = "InR"
1485
1841
1486 liftParseJSON _ _ _ = fail $
1842 liftParseJSON _ _ _ = fail $
1487− "expected an object with a single property " ++
1843+ "parsing Sum failed, expected an object with a single property " ++
1488 "where the property key should be either " ++
1844 "where the property key should be either " ++
1489 "\"InL\" or \"InR\""
1845 "\"InL\" or \"InR\""
1490 {-# INLINE liftParseJSON #-}
1846 {-# INLINE liftParseJSON #-}
@@ -1498,7 +1854,7 @@ instance (FromJSON1 f, FromJSON1 g, FromJSON a) => FromJSON (Sum f g a) where
1498-------------------------------------------------------------------------------
1854-------------------------------------------------------------------------------
1499
1855
1500instance FromJSON1 Seq.Seq where
1856instance FromJSON1 Seq.Seq where
1501− liftParseJSON p _ = withArray "Seq a" $
1857+ liftParseJSON p _ = withArray "Seq" $
1502 fmap Seq.fromList .
1858 fmap Seq.fromList .
1503 Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1859 Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1504 {-# INLINE liftParseJSON #-}
1860 {-# INLINE liftParseJSON #-}
@@ -1532,15 +1888,15 @@ instance FromJSON a => FromJSON (IntMap.IntMap a) where
1532
1888
1533instance (FromJSONKey k, Ord k) => FromJSON1 (M.Map k) where
1889instance (FromJSONKey k, Ord k) => FromJSON1 (M.Map k) where
1534 liftParseJSON p _ = case fromJSONKey of
1890 liftParseJSON p _ = case fromJSONKey of
1535− FromJSONKeyCoerce _-> withObject "Map k v" $
1891+ FromJSONKeyCoerce _ -> withObject "Map" $
1536 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)
1537− FromJSONKeyText f -> withObject "Map k v" $
1893+ FromJSONKeyText f -> withObject "Map" $
1538 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)
1539− FromJSONKeyTextParser f -> withObject "Map k v" $
1895+ FromJSONKeyTextParser f -> withObject "Map" $
1540 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)
1541− FromJSONKeyValue f -> withArray "Map k v" $ \arr ->
1897+ FromJSONKeyValue f -> withArray "Map" $ \arr ->
1542− M.fromList <$> (Tr.sequence .
1898+ fmap M.fromList . Tr.sequence .
1543− zipWith (parseIndexedJSONPair f p) [0..] . V.toList $ arr)
1899+ zipWith (parseIndexedJSONPair f p) [0..] . V.toList $ arr
1544 {-# INLINE liftParseJSON #-}
1900 {-# INLINE liftParseJSON #-}
1545
1901
1546instance (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
@@ -1566,18 +1922,18 @@ instance (FromJSON v) => FromJSON (Tree.Tree v) where
1566
1922
1567instance FromJSON UUID.UUID where
1923instance FromJSON UUID.UUID where
1568 parseJSON = withText "UUID" $
1924 parseJSON = withText "UUID" $
1569− maybe (fail "Invalid UUID") pure . UUID.fromText
1925+ maybe (fail "invalid UUID") pure . UUID.fromText
1570
1926
1571instance FromJSONKey UUID.UUID where
1927instance FromJSONKey UUID.UUID where
1572 fromJSONKey = FromJSONKeyTextParser $
1928 fromJSONKey = FromJSONKeyTextParser $
1573− maybe (fail "Invalid UUID") pure . UUID.fromText
1929+ maybe (fail "invalid UUID") pure . UUID.fromText
1574
1930
1575-------------------------------------------------------------------------------
1931-------------------------------------------------------------------------------
1576-- vector
1932-- vector
1577-------------------------------------------------------------------------------
1933-------------------------------------------------------------------------------
1578
1934
1579instance FromJSON1 Vector where
1935instance FromJSON1 Vector where
1580− liftParseJSON p _ = withArray "Vector a" $
1936+ liftParseJSON p _ = withArray "Vector" $
1581 V.mapM (uncurry $ parseIndexedJSON p) . V.indexed
1937 V.mapM (uncurry $ parseIndexedJSON p) . V.indexed
1582 {-# INLINE liftParseJSON #-}
1938 {-# INLINE liftParseJSON #-}
1583
1939
@@ -1591,14 +1947,14 @@ vectorParseJSON s = withArray s $ fmap V.convert . V.mapM (uncurry $ parseIndexe
1591{-# INLINE vectorParseJSON #-}
1947{-# INLINE vectorParseJSON #-}
1592
1948
1593instance (Storable a, FromJSON a) => FromJSON (VS.Vector a) where
1949instance (Storable a, FromJSON a) => FromJSON (VS.Vector a) where
1594− parseJSON = vectorParseJSON "Data.Vector.Storable.Vector a"
1950+ parseJSON = vectorParseJSON "Data.Vector.Storable.Vector"
1595
1951
1596instance (VP.Prim a, FromJSON a) => FromJSON (VP.Vector a) where
1952instance (VP.Prim a, FromJSON a) => FromJSON (VP.Vector a) where
1597− parseJSON = vectorParseJSON "Data.Vector.Primitive.Vector a"
1953+ parseJSON = vectorParseJSON "Data.Vector.Primitive.Vector"
1598 {-# INLINE parseJSON #-}
1954 {-# INLINE parseJSON #-}
1599
1955
1600instance (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
1601− parseJSON = vectorParseJSON "Data.Vector.Unboxed.Vector a"
1957+ parseJSON = vectorParseJSON "Data.Vector.Unboxed.Vector"
1602 {-# INLINE parseJSON #-}
1958 {-# INLINE parseJSON #-}
1603
1959
1604-------------------------------------------------------------------------------
1960-------------------------------------------------------------------------------
@@ -1612,15 +1968,15 @@ instance (Eq a, Hashable a, FromJSON a) => FromJSON (HashSet.HashSet a) where
1612
1968
1613instance (FromJSONKey k, Eq k, Hashable k) => FromJSON1 (H.HashMap k) where
1969instance (FromJSONKey k, Eq k, Hashable k) => FromJSON1 (H.HashMap k) where
1614 liftParseJSON p _ = case fromJSONKey of
1970 liftParseJSON p _ = case fromJSONKey of
1615− FromJSONKeyCoerce _ -> withObject "HashMap ~Text v" $
1971+ FromJSONKeyCoerce _ -> withObject "HashMap ~Text" $
1616 uc . H.traverseWithKey (\k v -> p v <?> Key k)
1972 uc . H.traverseWithKey (\k v -> p v <?> Key k)
1617− FromJSONKeyText f -> withObject "HashMap k v" $
1973+ FromJSONKeyText f -> withObject "HashMap" $
1618 fmap (mapKey f) . H.traverseWithKey (\k v -> p v <?> Key k)
1974 fmap (mapKey f) . H.traverseWithKey (\k v -> p v <?> Key k)
1619− FromJSONKeyTextParser f -> withObject "HashMap k v" $
1975+ FromJSONKeyTextParser f -> withObject "HashMap" $
1620 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)
1621− FromJSONKeyValue f -> withArray "Map k v" $ \arr ->
1977+ FromJSONKeyValue f -> withArray "Map" $ \arr ->
1622− H.fromList <$> (Tr.sequence .
1978+ fmap H.fromList . Tr.sequence .
1623− zipWith (parseIndexedJSONPair f p) [0..] . V.toList $ arr)
1979+ zipWith (parseIndexedJSONPair f p) [0..] . V.toList $ arr
1624 where
1980 where
1625 uc :: Parser (H.HashMap Text v) -> Parser (H.HashMap k v)
1981 uc :: Parser (H.HashMap Text v) -> Parser (H.HashMap k v)
1626 uc = unsafeCoerce
1982 uc = unsafeCoerce
@@ -1641,11 +1997,33 @@ instance FromJSON DotNetTime where
1641 parseJSON = withText "DotNetTime" $ \t ->
1997 parseJSON = withText "DotNetTime" $ \t ->
1642 let (s,m) = T.splitAt (T.length t - 5) t
1998 let (s,m) = T.splitAt (T.length t - 5) t
1643 t' = T.concat [s,".",m]
1999 t' = T.concat [s,".",m]
1644− in case parseTime defaultTimeLocale "/Date(%s%Q)/" (unpack t') of
2000+ in case parseTimeM True defaultTimeLocale "/Date(%s%Q)/" (unpack t') of
1645 Just d -> pure (DotNetTime d)
2001 Just d -> pure (DotNetTime d)
1646 _ -> fail "could not parse .NET time"
2002 _ -> fail "could not parse .NET time"
1647 {-# INLINE parseJSON #-}
2003 {-# INLINE parseJSON #-}
1648
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+
1649-------------------------------------------------------------------------------
2027-------------------------------------------------------------------------------
1650-- time
2028-- time
1651-------------------------------------------------------------------------------
2029-------------------------------------------------------------------------------
@@ -1671,6 +2049,17 @@ instance FromJSONKey LocalTime where
1671 fromJSONKey = FromJSONKeyTextParser (Time.run Time.localTime)
2049 fromJSONKey = FromJSONKeyTextParser (Time.run Time.localTime)
1672
2050
1673
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.
1674instance FromJSON ZonedTime where
2063instance FromJSON ZonedTime where
1675 parseJSON = withText "ZonedTime" (Time.run Time.zonedTime)
2064 parseJSON = withText "ZonedTime" (Time.run Time.zonedTime)
1676
2065
@@ -1685,14 +2074,57 @@ instance FromJSONKey UTCTime where
1685 fromJSONKey = FromJSONKeyTextParser (Time.run Time.utcTime)
2074 fromJSONKey = FromJSONKeyTextParser (Time.run Time.utcTime)
1686
2075
1687
2076
1688−-- | /WARNING:/ Only parse lengths of time from trusted input
2077+-- | This instance includes a bounds check to prevent maliciously
1689−-- 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
1690−-- system by specifying a scientific number with a big exponent like
2079+-- newtype 'Scientific' and provide your own instance using
1691−-- @1e1000000000@.
2080+-- 'withScientific' if you want to allow larger inputs.
1692instance FromJSON NominalDiffTime where
2081instance FromJSON NominalDiffTime where
1693− 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
1694 {-# INLINE parseJSON #-}
2092 {-# INLINE parseJSON #-}
1695
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+
1696-------------------------------------------------------------------------------
2128-------------------------------------------------------------------------------
1697-- base Monoid/Semigroup
2129-- base Monoid/Semigroup
1698-------------------------------------------------------------------------------
2130-------------------------------------------------------------------------------
@@ -1813,14 +2245,15 @@ instance FromJSON a => FromJSON (Semigroup.Option a) where
1813
2245
1814instance FromJSON1 Proxy where
2246instance FromJSON1 Proxy where
1815 {-# INLINE liftParseJSON #-}
2247 {-# INLINE liftParseJSON #-}
1816− liftParseJSON _ _ Null = pure Proxy
2248+ liftParseJSON _ _ = fromNull "Proxy" Proxy
1817− liftParseJSON _ _ v = typeMismatch "Proxy" v
1818
2249
1819instance FromJSON (Proxy a) where
2250instance FromJSON (Proxy a) where
1820 {-# INLINE parseJSON #-}
2251 {-# INLINE parseJSON #-}
1821− parseJSON Null = pure Proxy
2252+ parseJSON = fromNull "Proxy" Proxy
1822− parseJSON v = typeMismatch "Proxy" v
1823
2253
2254+fromNull :: String -> a -> Value -> Parser a
2255+fromNull _ a Null = pure a
2256+fromNull c _ v = prependContext c (typeMismatch "Null" v)
1824
2257
1825instance FromJSON2 Tagged where
2258instance FromJSON2 Tagged where
1826 liftParseJSON2 _ _ p _ = fmap Tagged . p
2259 liftParseJSON2 _ _ p _ = fmap Tagged . p
@@ -1847,10 +2280,7 @@ instance (FromJSON a, FromJSON b, FromJSON c) => FromJSONKey (a,b,c)
1847instance (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)
1848
2281
1849instance FromJSONKey Char where
2282instance FromJSONKey Char where
1850− fromJSONKey = FromJSONKeyTextParser $ \t ->
2283+ fromJSONKey = FromJSONKeyTextParser parseChar
1851− if T.length t == 1
1852− then return (T.index t 0)
1853− else typeMismatch "Expected Char but String didn't contain exactly one character" (String t)
1854 fromJSONKeyList = FromJSONKeyText T.unpack
2284 fromJSONKeyList = FromJSONKeyText T.unpack
1855
2285
1856instance (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+145−12
@@ -1,6 +1,8 @@
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#if __GLASGOW_HASKELL__ >= 800
7#if __GLASGOW_HASKELL__ >= 800
6-- a) THQ works on cross-compilers and unregisterised GHCs
8-- a) THQ works on cross-compilers and unregisterised GHCs
@@ -43,7 +45,12 @@ module Data.Aeson.Types.Internal
43 , parseEither
45 , parseEither
44 , parseMaybe
46 , parseMaybe
45 , modifyFailure
47 , modifyFailure
48+ , prependFailure
49+ , parserThrowError
50+ , parserCatchError
46 , formatError
51 , formatError
52+ , formatPath
53+ , formatRelativePath
47 , (<?>)
54 , (<?>)
48 -- * Constructors and accessors
55 -- * Constructors and accessors
49 , object
56 , object
@@ -57,11 +64,14 @@ module Data.Aeson.Types.Internal
57 , sumEncoding
64 , sumEncoding
58 , unwrapUnaryRecords
65 , unwrapUnaryRecords
59 , tagSingleConstructors
66 , tagSingleConstructors
67+ , rejectUnknownFields
60 )
68 )
61
69
62 , SumEncoding(..)
70 , SumEncoding(..)
71+ , JSONKeyOptions(keyModifier)
63 , defaultOptions
72 , defaultOptions
64 , defaultTaggedObject
73 , defaultTaggedObject
74+ , defaultJSONKeyOptions
65
75
66 -- * Used for changing CamelCase names into something else.
76 -- * Used for changing CamelCase names into something else.
67 , camelTo
77 , camelTo
@@ -71,7 +81,6 @@ module Data.Aeson.Types.Internal
71 , DotNetTime(..)
81 , DotNetTime(..)
72 ) where
82 ) where
73
83
74−import Prelude ()
75import Prelude.Compat
84import Prelude.Compat
76
85
77import Control.Applicative (Alternative(..))
86import Control.Applicative (Alternative(..))
@@ -92,6 +101,8 @@ import Data.Time (UTCTime)
92import Data.Time.Format (FormatTime)
101import Data.Time.Format (FormatTime)
93import Data.Typeable (Typeable)
102import Data.Typeable (Typeable)
94import Data.Vector (Vector)
103import Data.Vector (Vector)
104+import GHC.Generics (Generic)
105+import qualified Control.Monad as Monad
95import qualified Control.Monad.Fail as Fail
106import qualified Control.Monad.Fail as Fail
96import qualified Data.HashMap.Strict as H
107import qualified Data.HashMap.Strict as H
97import qualified Data.Scientific as S
108import qualified Data.Scientific as S
@@ -110,7 +121,7 @@ data JSONPathElement = Key Text
110 | Index {-# UNPACK #-} !Int
121 | Index {-# UNPACK #-} !Int
111 -- ^ JSON path element of an index into an
122 -- ^ JSON path element of an index into an
112 -- array, \"array[index]\".
123 -- array, \"array[index]\".
113− deriving (Eq, Show, Typeable)
124+ deriving (Eq, Show, Typeable, Ord)
114type JSONPath = [JSONPathElement]
125type JSONPath = [JSONPathElement]
115
126
116-- | The internal result of running a 'Parser'.
127-- | The internal result of running a 'Parser'.
@@ -145,7 +156,7 @@ instance Functor Result where
145 fmap _ (Error err) = Error err
156 fmap _ (Error err) = Error err
146 {-# INLINE fmap #-}
157 {-# INLINE fmap #-}
147
158
148−instance Monad IResult where
159+instance Monad.Monad IResult where
149 return = pure
160 return = pure
150 {-# INLINE return #-}
161 {-# INLINE return #-}
151
162
@@ -153,14 +164,16 @@ instance Monad IResult where
153 IError path err >>= _ = IError path err
164 IError path err >>= _ = IError path err
154 {-# INLINE (>>=) #-}
165 {-# INLINE (>>=) #-}
155
166
167+#if !(MIN_VERSION_base(4,13,0))
156 fail = Fail.fail
168 fail = Fail.fail
157 {-# INLINE fail #-}
169 {-# INLINE fail #-}
170+#endif
158
171
159instance Fail.MonadFail IResult where
172instance Fail.MonadFail IResult where
160 fail err = IError [] err
173 fail err = IError [] err
161 {-# INLINE fail #-}
174 {-# INLINE fail #-}
162
175
163−instance Monad Result where
176+instance Monad.Monad Result where
164 return = pure
177 return = pure
165 {-# INLINE return #-}
178 {-# INLINE return #-}
166
179
@@ -168,8 +181,10 @@ instance Monad Result where
168 Error err >>= _ = Error err
181 Error err >>= _ = Error err
169 {-# INLINE (>>=) #-}
182 {-# INLINE (>>=) #-}
170
183
184+#if !(MIN_VERSION_base(4,13,0))
171 fail = Fail.fail
185 fail = Fail.fail
172 {-# INLINE fail #-}
186 {-# INLINE fail #-}
187+#endif
173
188
174instance Fail.MonadFail Result where
189instance Fail.MonadFail Result where
175 fail err = Error err
190 fail err = Error err
@@ -266,7 +281,9 @@ type Failure f r = JSONPath -> String -> f r
266-- | Success continuation.
281-- | Success continuation.
267type Success a f r = a -> f r
282type Success a f r = a -> f r
268
283
269−-- | 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.
270newtype Parser a = Parser {
287newtype Parser a = Parser {
271 runParser :: forall f r.
288 runParser :: forall f r.
272 JSONPath
289 JSONPath
@@ -275,14 +292,17 @@ newtype Parser a = Parser {
275 -> f r
292 -> f r
276 }
293 }
277
294
278−instance Monad Parser where
295+instance Monad.Monad Parser where
279 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
280 in runParser m path kf ks'
297 in runParser m path kf ks'
281 {-# INLINE (>>=) #-}
298 {-# INLINE (>>=) #-}
282 return = pure
299 return = pure
283 {-# INLINE return #-}
300 {-# INLINE return #-}
301+
302+#if !(MIN_VERSION_base(4,13,0))
284 fail = Fail.fail
303 fail = Fail.fail
285 {-# INLINE fail #-}
304 {-# INLINE fail #-}
305+#endif
286
306
287instance Fail.MonadFail Parser where
307instance Fail.MonadFail Parser where
288 fail msg = Parser $ \path kf _ks -> kf (reverse path) msg
308 fail msg = Parser $ \path kf _ks -> kf (reverse path) msg
@@ -325,8 +345,7 @@ instance Monoid (Parser a) where
325apP :: Parser (a -> b) -> Parser a -> Parser b
345apP :: Parser (a -> b) -> Parser a -> Parser b
326apP d e = do
346apP d e = do
327 b <- d
347 b <- d
328− a <- e
348+ b <$> e
329− return (b a)
330{-# INLINE apP #-}
349{-# INLINE apP #-}
331
350
332-- | A JSON \"object\" (key\/value map).
351-- | A JSON \"object\" (key\/value map).
@@ -342,7 +361,7 @@ data Value = Object !Object
342 | Number !Scientific
361 | Number !Scientific
343 | Bool !Bool
362 | Bool !Bool
344 | Null
363 | Null
345− deriving (Eq, Read, Show, Typeable, Data)
364+ deriving (Eq, Read, Show, Typeable, Data, Generic)
346
365
347-- | A newtype wrapper for 'UTCTime' that uses the same non-standard
366-- | A newtype wrapper for 'UTCTime' that uses the same non-standard
348-- serialization format as Microsoft .NET, whose
367-- serialization format as Microsoft .NET, whose
@@ -442,7 +461,17 @@ parseEither m v = runParser (m v) [] onError Right
442-- | Annotate an error message with a
461-- | Annotate an error message with a
443-- <http://goessner.net/articles/JsonPath/ JSONPath> error location.
462-- <http://goessner.net/articles/JsonPath/ JSONPath> error location.
444formatError :: JSONPath -> String -> String
463formatError :: JSONPath -> String -> String
445−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
446 where
475 where
447 format :: String -> JSONPath -> String
476 format :: String -> JSONPath -> String
448 format pfx [] = pfx
477 format pfx [] = pfx
@@ -505,13 +534,40 @@ p <?> pathElem = Parser $ \path kf ks -> runParser p (pathElem:path) kf ks
505--
534--
506-- Since 0.6.2.0
535-- Since 0.6.2.0
507modifyFailure :: (String -> String) -> Parser a -> Parser a
536modifyFailure :: (String -> String) -> Parser a -> Parser a
508−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
509
562
510--------------------------------------------------------------------------------
563--------------------------------------------------------------------------------
511-- Generic and TH encoding configuration
564-- Generic and TH encoding configuration
512--------------------------------------------------------------------------------
565--------------------------------------------------------------------------------
513
566
514-- | 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.
515data Options = Options
571data Options = Options
516 { fieldLabelModifier :: String -> String
572 { fieldLabelModifier :: String -> String
517 -- ^ Function applied to field labels.
573 -- ^ Function applied to field labels.
@@ -528,6 +584,39 @@ data Options = Options
528 -- ^ If 'True' record fields with a 'Nothing' value will be
584 -- ^ If 'True' record fields with a 'Nothing' value will be
529 -- omitted from the resulting object. If 'False' the resulting
585 -- omitted from the resulting object. If 'False' the resulting
530 -- 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+ -- @
531 , sumEncoding :: SumEncoding
620 , sumEncoding :: SumEncoding
532 -- ^ Specifies how to encode constructors of a sum datatype.
621 -- ^ Specifies how to encode constructors of a sum datatype.
533 , unwrapUnaryRecords :: Bool
622 , unwrapUnaryRecords :: Bool
@@ -536,10 +625,14 @@ data Options = Options
536 , tagSingleConstructors :: Bool
625 , tagSingleConstructors :: Bool
537 -- ^ Encode types with a single constructor as sums,
626 -- ^ Encode types with a single constructor as sums,
538 -- so that `allNullaryToStringTag` and `sumEncoding` apply.
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.
539 }
632 }
540
633
541instance Show Options where
634instance Show Options where
542− show (Options f c a o s u t) =
635+ show (Options f c a o s u t r) =
543 "Options {"
636 "Options {"
544 ++ intercalate ", "
637 ++ intercalate ", "
545 [ "fieldLabelModifier =~ " ++ show (f "exampleField")
638 [ "fieldLabelModifier =~ " ++ show (f "exampleField")
@@ -549,6 +642,7 @@ instance Show Options where
549 , "sumEncoding = " ++ show s
642 , "sumEncoding = " ++ show s
550 , "unwrapUnaryRecords = " ++ show u
643 , "unwrapUnaryRecords = " ++ show u
551 , "tagSingleConstructors = " ++ show t
644 , "tagSingleConstructors = " ++ show t
645+ , "rejectUnknownFields = " ++ show r
552 ]
646 ]
553 ++ "}"
647 ++ "}"
554
648
@@ -592,6 +686,33 @@ data SumEncoding =
592 -- contents of the constructor.
686 -- contents of the constructor.
593 deriving (Eq, Show)
687 deriving (Eq, Show)
594
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+
595-- | Default encoding 'Options':
716-- | Default encoding 'Options':
596--
717--
597-- @
718-- @
@@ -603,6 +724,7 @@ data SumEncoding =
603-- , 'sumEncoding' = 'defaultTaggedObject'
724-- , 'sumEncoding' = 'defaultTaggedObject'
604-- , 'unwrapUnaryRecords' = False
725-- , 'unwrapUnaryRecords' = False
605-- , 'tagSingleConstructors' = False
726-- , 'tagSingleConstructors' = False
727+-- , 'rejectUnknownFields' = False
606-- }
728-- }
607-- @
729-- @
608defaultOptions :: Options
730defaultOptions :: Options
@@ -614,6 +736,7 @@ defaultOptions = Options
614 , sumEncoding = defaultTaggedObject
736 , sumEncoding = defaultTaggedObject
615 , unwrapUnaryRecords = False
737 , unwrapUnaryRecords = False
616 , tagSingleConstructors = False
738 , tagSingleConstructors = False
739+ , rejectUnknownFields = False
617 }
740 }
618
741
619-- | Default 'TaggedObject' 'SumEncoding' options:
742-- | Default 'TaggedObject' 'SumEncoding' options:
@@ -630,6 +753,16 @@ defaultTaggedObject = TaggedObject
630 , contentsFieldName = "contents"
753 , contentsFieldName = "contents"
631 }
754 }
632
755
756+-- | Default 'JSONKeyOptions':
757+--
758+-- @
759+-- defaultJSONKeyOptions = 'JSONKeyOptions'
760+-- { 'keyModifier' = 'id'
761+-- }
762+-- @
763+defaultJSONKeyOptions :: JSONKeyOptions
764+defaultJSONKeyOptions = JSONKeyOptions id
765+
633-- | Converts from CamelCase to another lower case, interspersing
766-- | Converts from CamelCase to another lower case, interspersing
634-- the character between all capital letters and their previous
767-- the character between all capital letters and their previous
635-- entries, except those capital letters that appear together,
768-- entries, except those capital letters that appear together,
Data/Aeson/Types/ToJSON.hs+250−84
@@ -5,21 +5,17 @@
5{-# LANGUAGE FlexibleInstances #-}
5{-# LANGUAGE FlexibleInstances #-}
6{-# LANGUAGE FunctionalDependencies #-}
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 #-}
@@ -47,15 +43,20 @@ module Data.Aeson.Types.ToJSON
47 , ToJSONKeyFunction(..)
43 , ToJSONKeyFunction(..)
48 , toJSONKeyText
44 , toJSONKeyText
49 , contramapToJSONKeyFunction
45 , contramapToJSONKeyFunction
46+
47+ , GToJSONKey()
48+ , genericToJSONKey
49+
50 -- * Object key-value pairs
50 -- * Object key-value pairs
51 , KeyValue(..)
51 , KeyValue(..)
52+ , KeyValuePair(..)
53+ , FromPairs(..)
52 -- * Functions needed for documentation
54 -- * Functions needed for documentation
53 -- * Encoding functions
55 -- * Encoding functions
54 , listEncoding
56 , listEncoding
55 , listValue
57 , listValue
56 ) where
58 ) where
57
59
58−import Prelude ()
59import Prelude.Compat
60import Prelude.Compat
60
61
61import Control.Applicative (Const(..))
62import Control.Applicative (Const(..))
@@ -63,38 +64,42 @@ import Control.Monad.ST (ST)
63import Data.Aeson.Encoding (Encoding, Encoding', Series, dict, emptyArray_)
64import Data.Aeson.Encoding (Encoding, Encoding', Series, dict, emptyArray_)
64import Data.Aeson.Encoding.Internal ((>*<))
65import Data.Aeson.Encoding.Internal ((>*<))
65import Data.Aeson.Internal.Functions (mapHashKeyVal, mapKeyVal)
66import Data.Aeson.Internal.Functions (mapHashKeyVal, mapKeyVal)
66−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)
67import Data.Aeson.Types.Internal
68import Data.Aeson.Types.Internal
68import Data.Attoparsec.Number (Number(..))
69import Data.Attoparsec.Number (Number(..))
69import Data.Bits (unsafeShiftR)
70import Data.Bits (unsafeShiftR)
70import Data.DList (DList)
71import Data.DList (DList)
71−import Data.Fixed (Fixed, HasResolution)
72+import Data.Fixed (Fixed, HasResolution, Nano)
72import Data.Foldable (toList)
73import Data.Foldable (toList)
73import Data.Functor.Compose (Compose(..))
74import Data.Functor.Compose (Compose(..))
75+import Data.Functor.Contravariant (Contravariant (..))
74import Data.Functor.Identity (Identity(..))
76import Data.Functor.Identity (Identity(..))
75import Data.Functor.Product (Product(..))
77import Data.Functor.Product (Product(..))
76import Data.Functor.Sum (Sum(..))
78import Data.Functor.Sum (Sum(..))
77import Data.Int (Int16, Int32, Int64, Int8)
79import Data.Int (Int16, Int32, Int64, Int8)
78import Data.List (intersperse)
80import Data.List (intersperse)
79import Data.List.NonEmpty (NonEmpty(..))
81import Data.List.NonEmpty (NonEmpty(..))
80−import Data.Monoid ((<>))
82+import Data.Semigroup ((<>))
81import Data.Proxy (Proxy(..))
83import Data.Proxy (Proxy(..))
82import Data.Ratio (Ratio, denominator, numerator)
84import Data.Ratio (Ratio, denominator, numerator)
83import Data.Scientific (Scientific)
85import Data.Scientific (Scientific)
84import Data.Tagged (Tagged(..))
86import Data.Tagged (Tagged(..))
85import Data.Text (Text, pack)
87import Data.Text (Text, pack)
86−import Data.Time (Day, LocalTime, NominalDiffTime, TimeOfDay, UTCTime, ZonedTime)
88+import Data.Time (Day, DiffTime, LocalTime, NominalDiffTime, TimeOfDay, UTCTime, ZonedTime)
87−import Data.Time.Format (FormatTime, formatTime)
89+import Data.Time.Calendar.Compat (CalendarDiffDays (..), DayOfWeek (..))
88−import Data.Time.Locale.Compat (defaultTimeLocale)
90+import Data.Time.LocalTime.Compat (CalendarDiffTime (..))
91+import Data.Time.Clock.System.Compat (SystemTime (..))
92+import Data.Time.Format.Compat (FormatTime, formatTime, defaultTimeLocale)
89import Data.Vector (Vector)
93import Data.Vector (Vector)
90import Data.Version (Version, showVersion)
94import Data.Version (Version, showVersion)
95+import Data.Void (Void, absurd)
91import Data.Word (Word16, Word32, Word64, Word8)
96import Data.Word (Word16, Word32, Word64, Word8)
92import Foreign.Storable (Storable)
97import Foreign.Storable (Storable)
98+import Foreign.C.Types (CTime (..))
93import GHC.Generics
99import GHC.Generics
94import Numeric.Natural (Natural)
100import Numeric.Natural (Natural)
95import qualified Data.Aeson.Encoding as E
101import qualified Data.Aeson.Encoding as E
96import qualified Data.Aeson.Encoding.Internal as E (InArray, comma, econcat, retagEncoding)
102import qualified Data.Aeson.Encoding.Internal as E (InArray, comma, econcat, retagEncoding)
97−import qualified Data.ByteString as S
98import qualified Data.ByteString.Lazy as L
103import qualified Data.ByteString.Lazy as L
99import qualified Data.DList as DList
104import qualified Data.DList as DList
100import qualified Data.HashMap.Strict as H
105import qualified Data.HashMap.Strict as H
@@ -123,15 +128,17 @@ import qualified Data.Vector.Unboxed as VU
123import qualified Data.Aeson.Encoding.Builder as EB
128import qualified Data.Aeson.Encoding.Builder as EB
124import qualified Data.ByteString.Builder as B
129import qualified Data.ByteString.Builder as B
125
130
126−#if !(MIN_VERSION_bytestring(0,10,0))
131+import qualified GHC.Exts as Exts
127−import Foreign.ForeignPtr (withForeignPtr)
132+import qualified Data.Primitive.Array as PM
128−import Foreign.Marshal.Utils (copyBytes)
133+import qualified Data.Primitive.SmallArray as PM
129−import Foreign.Ptr (plusPtr)
134+import qualified Data.Primitive.Types as PM
130−import qualified Data.ByteString.Internal as S
131−import qualified Data.ByteString.Lazy.Internal as L
132−#endif
133
135
134−{-# ANN module ("HLint: ignore Reduce duplication"::String) #-}
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
140+import qualified Data.Primitive.PrimArray as PM
141+#endif
135
142
136toJSONPair :: (a -> Value) -> (b -> Value) -> (a, b) -> Value
143toJSONPair :: (a -> Value) -> (b -> Value) -> (a, b) -> Value
137toJSONPair a b = liftToJSON2 a (listValue a) b (listValue b)
144toJSONPair a b = liftToJSON2 a (listValue a) b (listValue b)
@@ -260,7 +267,7 @@ genericLiftToEncoding opts te tel = gToJSON opts (To1Args te tel) . from1
260-- @
267-- @
261--
268--
262-- Previous versions of this library only had the 'toJSON' method. Adding
269-- Previous versions of this library only had the 'toJSON' method. Adding
263−-- 'toEncoding' had to reasons:
270+-- 'toEncoding' had two reasons:
264--
271--
265-- 1. toEncoding is more efficient for the common case that the output of
272-- 1. toEncoding is more efficient for the common case that the output of
266-- 'toJSON' is directly serialized to a @ByteString@.
273-- 'toJSON' is directly serialized to a @ByteString@.
@@ -331,6 +338,13 @@ instance KeyValue Pair where
331 name .= value = (name, toJSON value)
338 name .= value = (name, toJSON value)
332 {-# INLINE (.=) #-}
339 {-# INLINE (.=) #-}
333
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+
334-------------------------------------------------------------------------------
348-------------------------------------------------------------------------------
335-- Classes and types for map keys
349-- Classes and types for map keys
336-------------------------------------------------------------------------------
350-------------------------------------------------------------------------------
@@ -388,7 +402,7 @@ instance KeyValue Pair where
388-- newtype wrapper around 'Text'. The recommended approach is to use
402-- newtype wrapper around 'Text'. The recommended approach is to use
389-- generalized newtype deriving:
403-- generalized newtype deriving:
390--
404--
391−-- > newtype RecordId = RecordId { getRecordId :: Text}
405+-- > newtype RecordId = RecordId { getRecordId :: Text }
392-- > deriving (Eq,Ord,ToJSONKey)
406-- > deriving (Eq,Ord,ToJSONKey)
393--
407--
394-- Then we may write:
408-- Then we may write:
@@ -403,8 +417,18 @@ instance KeyValue Pair where
403--
417--
404-- 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
405-- 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
406−-- and from 'Text' that does not require any escape sequences. So, in
420+-- and from 'Text' that does not require any escape sequences. So
407−-- 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+--
408-- The 'Show' instance can be used to help write 'ToJSONKey':
432-- The 'Show' instance can be used to help write 'ToJSONKey':
409--
433--
410-- > instance ToJSONKey Color where
434-- > instance ToJSONKey Color where
@@ -479,16 +503,42 @@ toJSONKeyTextEnc e = ToJSONKeyText tot e
479 -- TODO: dropAround is also used in stringEncoding, which is unfortunate atm
503 -- TODO: dropAround is also used in stringEncoding, which is unfortunate atm
480 tot = T.dropAround (== '"')
504 tot = T.dropAround (== '"')
481 . T.decodeLatin1
505 . T.decodeLatin1
482− . lazyToStrictByteString
506+ . L.toStrict
483 . E.encodingToLazyByteString
507 . E.encodingToLazyByteString
484 . e
508 . e
485
509
510+instance Contravariant ToJSONKeyFunction where
511+ contramap = contramapToJSONKeyFunction
512+
486-- | Contravariant map, as 'ToJSONKeyFunction' is a contravariant functor.
513-- | Contravariant map, as 'ToJSONKeyFunction' is a contravariant functor.
487contramapToJSONKeyFunction :: (b -> a) -> ToJSONKeyFunction a -> ToJSONKeyFunction b
514contramapToJSONKeyFunction :: (b -> a) -> ToJSONKeyFunction a -> ToJSONKeyFunction b
488contramapToJSONKeyFunction h x = case x of
515contramapToJSONKeyFunction h x = case x of
489 ToJSONKeyText f g -> ToJSONKeyText (f . h) (g . h)
516 ToJSONKeyText f g -> ToJSONKeyText (f . h) (g . h)
490 ToJSONKeyValue f g -> ToJSONKeyValue (f . h) (g . h)
517 ToJSONKeyValue f g -> ToJSONKeyValue (f . h) (g . h)
491
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+
492-------------------------------------------------------------------------------
542-------------------------------------------------------------------------------
493-- Lifings of FromJSON and ToJSON to unary and binary type constructors
543-- Lifings of FromJSON and ToJSON to unary and binary type constructors
494-------------------------------------------------------------------------------
544-------------------------------------------------------------------------------
@@ -653,11 +703,13 @@ instance (ToJSON a) => ToJSON [a] where
653instance OVERLAPPABLE_ (GToJSON enc arity a) => GToJSON enc arity (M1 i c a) where
703instance OVERLAPPABLE_ (GToJSON enc arity a) => GToJSON enc arity (M1 i c a) where
654 -- Meta-information, which is not handled elsewhere, is ignored:
704 -- Meta-information, which is not handled elsewhere, is ignored:
655 gToJSON opts targs = gToJSON opts targs . unM1
705 gToJSON opts targs = gToJSON opts targs . unM1
706+ {-# INLINE gToJSON #-}
656
707
657instance GToJSON enc One Par1 where
708instance GToJSON enc One Par1 where
658 -- Direct occurrences of the last type parameter are encoded with the
709 -- Direct occurrences of the last type parameter are encoded with the
659 -- function passed in as an argument:
710 -- function passed in as an argument:
660 gToJSON _opts (To1Args tj _) = tj . unPar1
711 gToJSON _opts (To1Args tj _) = tj . unPar1
712+ {-# INLINE gToJSON #-}
661
713
662instance ( ConsToJSON enc arity a
714instance ( ConsToJSON enc arity a
663 , AllNullary (C1 c a) allNullary
715 , AllNullary (C1 c a) allNullary
@@ -670,11 +722,13 @@ instance ( ConsToJSON enc arity a
670 . sumToJSON opts targs
722 . sumToJSON opts targs
671 . unM1
723 . unM1
672 | otherwise = consToJSON opts targs . unM1 . unM1
724 | otherwise = consToJSON opts targs . unM1 . unM1
725+ {-# INLINE gToJSON #-}
673
726
674instance (ConsToJSON enc arity a) => GToJSON enc arity (C1 c a) where
727instance (ConsToJSON enc arity a) => GToJSON enc arity (C1 c a) where
675 -- Constructors need to be encoded differently depending on whether they're
728 -- Constructors need to be encoded differently depending on whether they're
676 -- a record or not. This distinction is made by 'consToJSON':
729 -- a record or not. This distinction is made by 'consToJSON':
677 gToJSON opts targs = consToJSON opts targs . unM1
730 gToJSON opts targs = consToJSON opts targs . unM1
731+ {-# INLINE gToJSON #-}
678
732
679instance ( AllNullary (a :+: b) allNullary
733instance ( AllNullary (a :+: b) allNullary
680 , SumToJSON enc arity (a :+: b) allNullary
734 , SumToJSON enc arity (a :+: b) allNullary
@@ -685,6 +739,7 @@ instance ( AllNullary (a :+: b) allNullary
685 -- strings. This distinction is made by 'sumToJSON':
739 -- strings. This distinction is made by 'sumToJSON':
686 gToJSON opts targs = (unTagged :: Tagged allNullary enc -> enc)
740 gToJSON opts targs = (unTagged :: Tagged allNullary enc -> enc)
687 . sumToJSON opts targs
741 . sumToJSON opts targs
742+ {-# INLINE gToJSON #-}
688
743
689--------------------------------------------------------------------------------
744--------------------------------------------------------------------------------
690-- Generic toJSON
745-- Generic toJSON
@@ -693,18 +748,27 @@ instance ( AllNullary (a :+: b) allNullary
693-- possible but makes error messages a bit harder to understand for missing
748-- possible but makes error messages a bit harder to understand for missing
694-- instances.
749-- instances.
695
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+
696instance ToJSON a => GToJSON Value arity (K1 i a) where
757instance ToJSON a => GToJSON Value arity (K1 i a) where
697 -- Constant values are encoded using their ToJSON instance:
758 -- Constant values are encoded using their ToJSON instance:
698 gToJSON _opts _ = toJSON . unK1
759 gToJSON _opts _ = toJSON . unK1
760+ {-# INLINE gToJSON #-}
699
761
700instance ToJSON1 f => GToJSON Value One (Rec1 f) where
762instance ToJSON1 f => GToJSON Value One (Rec1 f) where
701 -- Recursive occurrences of the last type parameter are encoded using their
763 -- Recursive occurrences of the last type parameter are encoded using their
702 -- ToJSON1 instance:
764 -- ToJSON1 instance:
703 gToJSON _opts (To1Args tj tjl) = liftToJSON tj tjl . unRec1
765 gToJSON _opts (To1Args tj tjl) = liftToJSON tj tjl . unRec1
766+ {-# INLINE gToJSON #-}
704
767
705instance GToJSON Value arity U1 where
768instance GToJSON Value arity U1 where
706 -- Empty constructors are encoded to an empty array:
769 -- Empty constructors are encoded to an empty array:
707 gToJSON _opts _ _ = emptyArray
770 gToJSON _opts _ _ = emptyArray
771+ {-# INLINE gToJSON #-}
708
772
709instance ( WriteProduct arity a, WriteProduct arity b
773instance ( WriteProduct arity a, WriteProduct arity b
710 , ProductSize a, ProductSize b
774 , ProductSize a, ProductSize b
@@ -721,6 +785,7 @@ instance ( WriteProduct arity a, WriteProduct arity b
721 where
785 where
722 lenProduct = (unTagged2 :: Tagged2 (a :*: b) Int -> Int)
786 lenProduct = (unTagged2 :: Tagged2 (a :*: b) Int -> Int)
723 productSize
787 productSize
788+ {-# INLINE gToJSON #-}
724
789
725instance ( ToJSON1 f
790instance ( ToJSON1 f
726 , GToJSON Value One g
791 , GToJSON Value One g
@@ -732,6 +797,7 @@ instance ( ToJSON1 f
732 gToJSON opts targs =
797 gToJSON opts targs =
733 let gtj = gToJSON opts targs in
798 let gtj = gToJSON opts targs in
734 liftToJSON gtj (listValue gtj) . unComp1
799 liftToJSON gtj (listValue gtj) . unComp1
800+ {-# INLINE gToJSON #-}
735
801
736--------------------------------------------------------------------------------
802--------------------------------------------------------------------------------
737-- Generic toEncoding
803-- Generic toEncoding
@@ -739,15 +805,18 @@ instance ( ToJSON1 f
739instance ToJSON a => GToJSON Encoding arity (K1 i a) where
805instance ToJSON a => GToJSON Encoding arity (K1 i a) where
740 -- Constant values are encoded using their ToJSON instance:
806 -- Constant values are encoded using their ToJSON instance:
741 gToJSON _opts _ = toEncoding . unK1
807 gToJSON _opts _ = toEncoding . unK1
808+ {-# INLINE gToJSON #-}
742
809
743instance ToJSON1 f => GToJSON Encoding One (Rec1 f) where
810instance ToJSON1 f => GToJSON Encoding One (Rec1 f) where
744 -- Recursive occurrences of the last type parameter are encoded using their
811 -- Recursive occurrences of the last type parameter are encoded using their
745 -- ToEncoding1 instance:
812 -- ToEncoding1 instance:
746 gToJSON _opts (To1Args te tel) = liftToEncoding te tel . unRec1
813 gToJSON _opts (To1Args te tel) = liftToEncoding te tel . unRec1
814+ {-# INLINE gToJSON #-}
747
815
748instance GToJSON Encoding arity U1 where
816instance GToJSON Encoding arity U1 where
749 -- Empty constructors are encoded to an empty array:
817 -- Empty constructors are encoded to an empty array:
750 gToJSON _opts _ _ = E.emptyArray_
818 gToJSON _opts _ _ = E.emptyArray_
819+ {-# INLINE gToJSON #-}
751
820
752instance ( EncodeProduct arity a
821instance ( EncodeProduct arity a
753 , EncodeProduct arity b
822 , EncodeProduct arity b
@@ -757,6 +826,7 @@ instance ( EncodeProduct arity a
757 -- 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
758 -- 'encodeProduct':
827 -- 'encodeProduct':
759 gToJSON opts targs p = E.list E.retagEncoding [encodeProduct opts targs p]
828 gToJSON opts targs p = E.list E.retagEncoding [encodeProduct opts targs p]
829+ {-# INLINE gToJSON #-}
760
830
761instance ( ToJSON1 f
831instance ( ToJSON1 f
762 , GToJSON Encoding One g
832 , GToJSON Encoding One g
@@ -768,6 +838,7 @@ instance ( ToJSON1 f
768 gToJSON opts targs =
838 gToJSON opts targs =
769 let gte = gToJSON opts targs in
839 let gte = gToJSON opts targs in
770 liftToEncoding gte (listEncoding gte) . unComp1
840 liftToEncoding gte (listEncoding gte) . unComp1
841+ {-# INLINE gToJSON #-}
771
842
772--------------------------------------------------------------------------------
843--------------------------------------------------------------------------------
773
844
@@ -851,14 +922,14 @@ instance ( IsRecord a isRecord
851 , TaggedObject' enc pairs arity a isRecord
922 , TaggedObject' enc pairs arity a isRecord
852 , FromPairs enc pairs
923 , FromPairs enc pairs
853 , FromString enc
924 , FromString enc
854− , GKeyValue enc pairs
925+ , KeyValuePair enc pairs
855 , Constructor c
926 , Constructor c
856 ) => TaggedObject enc arity (C1 c a)
927 ) => TaggedObject enc arity (C1 c a)
857 where
928 where
858 taggedObject opts targs tagFieldName contentsFieldName =
929 taggedObject opts targs tagFieldName contentsFieldName =
859− fromPairs . (tag <>) . contents
930+ fromPairs . mappend tag . contents
860 where
931 where
861− tag = tagFieldName `gPair`
932+ tag = tagFieldName `pair`
862 (fromString (constructorTagModifier opts (conName (undefined :: t c a p)))
933 (fromString (constructorTagModifier opts (conName (undefined :: t c a p)))
863 :: enc)
934 :: enc)
864 contents =
935 contents =
@@ -870,11 +941,11 @@ class TaggedObject' enc pairs arity f isRecord where
870 -> String -> f a -> Tagged isRecord pairs
941 -> String -> f a -> Tagged isRecord pairs
871
942
872instance ( GToJSON enc arity f
943instance ( GToJSON enc arity f
873− , GKeyValue enc pairs
944+ , KeyValuePair enc pairs
874 ) => TaggedObject' enc pairs arity f False
945 ) => TaggedObject' enc pairs arity f False
875 where
946 where
876 taggedObject' opts targs contentsFieldName =
947 taggedObject' opts targs contentsFieldName =
877− Tagged . (contentsFieldName `gPair`) . gToJSON opts targs
948+ Tagged . (contentsFieldName `pair`) . gToJSON opts targs
878
949
879instance OVERLAPPING_ Monoid pairs => TaggedObject' enc pairs arity U1 False where
950instance OVERLAPPING_ Monoid pairs => TaggedObject' enc pairs arity U1 False where
880 taggedObject' _ _ _ _ = Tagged mempty
951 taggedObject' _ _ _ _ = Tagged mempty
@@ -897,6 +968,9 @@ instance (GetConName a, GetConName b) => GetConName (a :+: b) where
897instance (Constructor c) => GetConName (C1 c a) where
968instance (Constructor c) => GetConName (C1 c a) where
898 getConName = conName
969 getConName = conName
899
970
971+-- For genericToJSONKey
972+instance GetConName a => GetConName (D1 d a) where
973+ getConName (M1 x) = getConName x
900
974
901--------------------------------------------------------------------------------
975--------------------------------------------------------------------------------
902
976
@@ -952,7 +1026,6 @@ class ConsToJSON enc arity f where
952
1026
953class ConsToJSON' enc arity f isRecord where
1027class ConsToJSON' enc arity f isRecord where
954 consToJSON' :: Options -> ToArgs enc arity a
1028 consToJSON' :: Options -> ToArgs enc arity a
955− -> Bool -- ^ Are we a record with one field?
956 -> f a -> Tagged isRecord enc
1029 -> f a -> Tagged isRecord enc
957
1030
958instance ( IsRecord f isRecord
1031instance ( IsRecord f isRecord
@@ -961,23 +1034,29 @@ instance ( IsRecord f isRecord
961 where
1034 where
962 consToJSON opts targs =
1035 consToJSON opts targs =
963 (unTagged :: Tagged isRecord enc -> enc)
1036 (unTagged :: Tagged isRecord enc -> enc)
964− . consToJSON' opts targs (isUnary (undefined :: f a))
1037+ . consToJSON' opts targs
965 {-# INLINE consToJSON #-}
1038 {-# INLINE consToJSON #-}
966
1039
967−instance ( RecordToPairs enc pairs arity f
1040+instance OVERLAPPING_
1041+ ( RecordToPairs enc pairs arity (S1 s f)
968 , FromPairs enc pairs
1042 , FromPairs enc pairs
969 , GToJSON enc arity f
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
970 ) => ConsToJSON' enc arity f True
1053 ) => ConsToJSON' enc arity f True
971 where
1054 where
972− consToJSON' opts targs isUn =
1055+ consToJSON' opts targs = Tagged . fromPairs . recordToPairs opts targs
973− Tagged .
974− case (isUn, unwrapUnaryRecords opts) of
975− (True, True) -> gToJSON opts targs
976− _ -> fromPairs . recordToPairs opts targs
977 {-# INLINE consToJSON' #-}
1056 {-# INLINE consToJSON' #-}
978
1057
979instance GToJSON enc arity f => ConsToJSON' enc arity f False where
1058instance GToJSON enc arity f => ConsToJSON' enc arity f False where
980− consToJSON' opts targs _ = Tagged . gToJSON opts targs
1059+ consToJSON' opts targs = Tagged . gToJSON opts targs
981 {-# INLINE consToJSON' #-}
1060 {-# INLINE consToJSON' #-}
982
1061
983--------------------------------------------------------------------------------
1062--------------------------------------------------------------------------------
@@ -995,7 +1074,7 @@ instance ( Monoid pairs
995 ) => RecordToPairs enc pairs arity (a :*: b)
1074 ) => RecordToPairs enc pairs arity (a :*: b)
996 where
1075 where
997 recordToPairs opts (targs :: ToArgs enc arity p) (a :*: b) =
1076 recordToPairs opts (targs :: ToArgs enc arity p) (a :*: b) =
998− pairsOf a <> pairsOf b
1077+ pairsOf a `mappend` pairsOf b
999 where
1078 where
1000 pairsOf :: (RecordToPairs enc pairs arity f) => f p -> pairs
1079 pairsOf :: (RecordToPairs enc pairs arity f) => f p -> pairs
1001 pairsOf = recordToPairs opts targs
1080 pairsOf = recordToPairs opts targs
@@ -1003,16 +1082,16 @@ instance ( Monoid pairs
1003
1082
1004instance ( Selector s
1083instance ( Selector s
1005 , GToJSON enc arity a
1084 , GToJSON enc arity a
1006− , GKeyValue enc pairs
1085+ , KeyValuePair enc pairs
1007 ) => RecordToPairs enc pairs arity (S1 s a)
1086 ) => RecordToPairs enc pairs arity (S1 s a)
1008 where
1087 where
1009 recordToPairs = fieldToPair
1088 recordToPairs = fieldToPair
1010 {-# INLINE recordToPairs #-}
1089 {-# INLINE recordToPairs #-}
1011
1090
1012−instance OVERLAPPING_
1091+instance INCOHERENT_
1013 ( Selector s
1092 ( Selector s
1014 , GToJSON enc arity (K1 i (Maybe a))
1093 , GToJSON enc arity (K1 i (Maybe a))
1015− , GKeyValue enc pairs
1094+ , KeyValuePair enc pairs
1016 , Monoid pairs
1095 , Monoid pairs
1017 ) => RecordToPairs enc pairs arity (S1 s (K1 i (Maybe a)))
1096 ) => RecordToPairs enc pairs arity (S1 s (K1 i (Maybe a)))
1018 where
1097 where
@@ -1021,15 +1100,28 @@ instance OVERLAPPING_
1021 recordToPairs opts targs m1 = fieldToPair opts targs m1
1100 recordToPairs opts targs m1 = fieldToPair opts targs m1
1022 {-# INLINE recordToPairs #-}
1101 {-# INLINE recordToPairs #-}
1023
1102
1103+instance INCOHERENT_
1104+ ( Selector s
1105+ , GToJSON enc arity (K1 i (Maybe a))
1106+ , KeyValuePair enc pairs
1107+ , Monoid pairs
1108+ ) => RecordToPairs enc pairs arity (S1 s (K1 i (Semigroup.Option a)))
1109+ where
1110+ recordToPairs opts targs = recordToPairs opts targs . unwrap
1111+ where
1112+ unwrap :: S1 s (K1 i (Semigroup.Option a)) p -> S1 s (K1 i (Maybe a)) p
1113+ unwrap (M1 (K1 (Semigroup.Option a))) = M1 (K1 a)
1114+ {-# INLINE recordToPairs #-}
1115+
1024fieldToPair :: (Selector s
1116fieldToPair :: (Selector s
1025 , GToJSON enc arity a
1117 , GToJSON enc arity a
1026− , GKeyValue enc pairs)
1118+ , KeyValuePair enc pairs)
1027 => Options -> ToArgs enc arity p
1119 => Options -> ToArgs enc arity p
1028 -> S1 s a p -> pairs
1120 -> S1 s a p -> pairs
1029fieldToPair opts targs m1 =
1121fieldToPair opts targs m1 =
1030 let key = fieldLabelModifier opts (selName m1)
1122 let key = fieldLabelModifier opts (selName m1)
1031 value = gToJSON opts targs (unM1 m1)
1123 value = gToJSON opts targs (unM1 m1)
1032− in key `gPair` value
1124+ in key `pair` value
1033{-# INLINE fieldToPair #-}
1125{-# INLINE fieldToPair #-}
1034
1126
1035--------------------------------------------------------------------------------
1127--------------------------------------------------------------------------------
@@ -1053,10 +1145,12 @@ instance ( WriteProduct arity a
1053 lenL = len `unsafeShiftR` 1
1145 lenL = len `unsafeShiftR` 1
1054 lenR = len - lenL
1146 lenR = len - lenL
1055 ixR = ix + lenL
1147 ixR = ix + lenL
1148+ {-# INLINE writeProduct #-}
1056
1149
1057instance OVERLAPPABLE_ (GToJSON Value arity a) => WriteProduct arity a where
1150instance OVERLAPPABLE_ (GToJSON Value arity a) => WriteProduct arity a where
1058 writeProduct opts targs mv ix _ =
1151 writeProduct opts targs mv ix _ =
1059 VM.unsafeWrite mv ix . gToJSON opts targs
1152 VM.unsafeWrite mv ix . gToJSON opts targs
1153+ {-# INLINE writeProduct #-}
1060
1154
1061--------------------------------------------------------------------------------
1155--------------------------------------------------------------------------------
1062
1156
@@ -1074,21 +1168,23 @@ instance ( EncodeProduct arity a
1074 encodeProduct opts targs (a :*: b) =
1168 encodeProduct opts targs (a :*: b) =
1075 encodeProduct opts targs a >*<
1169 encodeProduct opts targs a >*<
1076 encodeProduct opts targs b
1170 encodeProduct opts targs b
1171+ {-# INLINE encodeProduct #-}
1077
1172
1078instance OVERLAPPABLE_ (GToJSON Encoding arity a) => EncodeProduct arity a where
1173instance OVERLAPPABLE_ (GToJSON Encoding arity a) => EncodeProduct arity a where
1079 encodeProduct opts targs a = E.retagEncoding $ gToJSON opts targs a
1174 encodeProduct opts targs a = E.retagEncoding $ gToJSON opts targs a
1175+ {-# INLINE encodeProduct #-}
1080
1176
1081--------------------------------------------------------------------------------
1177--------------------------------------------------------------------------------
1082
1178
1083instance ( GToJSON enc arity a
1179instance ( GToJSON enc arity a
1084 , ConsToJSON enc arity a
1180 , ConsToJSON enc arity a
1085 , FromPairs enc pairs
1181 , FromPairs enc pairs
1086− , GKeyValue enc pairs
1182+ , KeyValuePair enc pairs
1087 , Constructor c
1183 , Constructor c
1088 ) => SumToJSON' ObjectWithSingleField enc arity (C1 c a)
1184 ) => SumToJSON' ObjectWithSingleField enc arity (C1 c a)
1089 where
1185 where
1090 sumToJSON' opts targs =
1186 sumToJSON' opts targs =
1091− Tagged . fromPairs . (typ `gPair`) . gToJSON opts targs
1187+ Tagged . fromPairs . (typ `pair`) . gToJSON opts targs
1092 where
1188 where
1093 typ = constructorTagModifier opts $
1189 typ = constructorTagModifier opts $
1094 conName (undefined :: t c a p)
1190 conName (undefined :: t c a p)
@@ -1180,6 +1276,13 @@ instance (ToJSON a, ToJSON b) => ToJSON (Either a b) where
1180 toEncoding = toEncoding2
1276 toEncoding = toEncoding2
1181 {-# INLINE toEncoding #-}
1277 {-# INLINE toEncoding #-}
1182
1278
1279+instance ToJSON Void where
1280+ toJSON = absurd
1281+ {-# INLINE toJSON #-}
1282+
1283+ toEncoding = absurd
1284+ {-# INLINE toEncoding #-}
1285+
1183
1286
1184instance ToJSON Bool where
1287instance ToJSON Bool where
1185 toJSON = Bool
1288 toJSON = Bool
@@ -1365,7 +1468,6 @@ instance ToJSONKey Int64 where
1365 toJSONKey = toJSONKeyTextEnc E.int64Text
1468 toJSONKey = toJSONKeyTextEnc E.int64Text
1366 {-# INLINE toJSONKey #-}
1469 {-# INLINE toJSONKey #-}
1367
1470
1368−
1369instance ToJSON Word where
1471instance ToJSON Word where
1370 toJSON = Number . fromIntegral
1472 toJSON = Number . fromIntegral
1371 {-# INLINE toJSON #-}
1473 {-# INLINE toJSON #-}
@@ -1425,6 +1527,12 @@ instance ToJSONKey Word64 where
1425 toJSONKey = toJSONKeyTextEnc E.word64Text
1527 toJSONKey = toJSONKeyTextEnc E.word64Text
1426 {-# INLINE toJSONKey #-}
1528 {-# INLINE toJSONKey #-}
1427
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 #-}
1428
1536
1429instance ToJSON Text where
1537instance ToJSON Text where
1430 toJSON = String
1538 toJSON = String
@@ -1858,6 +1966,32 @@ dotNetTime (DotNetTime t) = secs ++ formatMillis t ++ ")/"
1858formatMillis :: (FormatTime t) => t -> String
1966formatMillis :: (FormatTime t) => t -> String
1859formatMillis = take 3 . formatTime defaultTimeLocale "%q"
1967formatMillis = take 3 . formatTime defaultTimeLocale "%q"
1860
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+
1861-------------------------------------------------------------------------------
1995-------------------------------------------------------------------------------
1862-- time
1996-- time
1863-------------------------------------------------------------------------------
1997-------------------------------------------------------------------------------
@@ -1906,10 +2040,11 @@ stringEncoding :: Encoding' Text -> Value
1906stringEncoding = String
2040stringEncoding = String
1907 . T.dropAround (== '"')
2041 . T.dropAround (== '"')
1908 . T.decodeLatin1
2042 . T.decodeLatin1
1909− . lazyToStrictByteString
2043+ . L.toStrict
1910 . E.encodingToLazyByteString
2044 . E.encodingToLazyByteString
1911{-# INLINE stringEncoding #-}
2045{-# INLINE stringEncoding #-}
1912
2046
2047+
1913instance ToJSON NominalDiffTime where
2048instance ToJSON NominalDiffTime where
1914 toJSON = Number . realToFrac
2049 toJSON = Number . realToFrac
1915 {-# INLINE toJSON #-}
2050 {-# INLINE toJSON #-}
@@ -1917,6 +2052,58 @@ instance ToJSON NominalDiffTime where
1917 toEncoding = E.scientific . realToFrac
2052 toEncoding = E.scientific . realToFrac
1918 {-# INLINE toEncoding #-}
2053 {-# INLINE toEncoding #-}
1919
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+
1920-------------------------------------------------------------------------------
2107-------------------------------------------------------------------------------
1921-- base Monoid/Semigroup
2108-- base Monoid/Semigroup
1922-------------------------------------------------------------------------------
2109-------------------------------------------------------------------------------
@@ -2660,47 +2847,26 @@ instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f, ToJSON g,
2660 toEncoding = toEncoding2
2847 toEncoding = toEncoding2
2661 {-# INLINE toEncoding #-}
2848 {-# INLINE toEncoding #-}
2662
2849
2663−-------------------------------------------------------------------------------
2664−-- pre-bytestring-0.10 compatibility
2665−-------------------------------------------------------------------------------
2666−
2667−{-# INLINE lazyToStrictByteString #-}
2668−lazyToStrictByteString :: L.ByteString -> S.ByteString
2669−#if MIN_VERSION_bytestring(0,10,0)
2670−lazyToStrictByteString = L.toStrict
2671−#else
2672−lazyToStrictByteString = packChunks
2673−
2674−-- packChunks is taken from the blaze-builder package.
2675−
2676−-- | Pack the chunks of a lazy bytestring into a single strict bytestring.
2677−packChunks :: L.ByteString -> S.ByteString
2678−packChunks lbs =
2679− S.unsafeCreate (fromIntegral $ L.length lbs) (copyChunks lbs)
2680− where
2681− copyChunks L.Empty _pf = return ()
2682− copyChunks (L.Chunk (S.PS fpbuf o l) lbs') pf = do
2683− withForeignPtr fpbuf $ \pbuf ->
2684− copyBytes pf (pbuf `plusPtr` o) l
2685− copyChunks lbs' (pf `plusPtr` l)
2686−#endif
2687−
2688--------------------------------------------------------------------------------
2850--------------------------------------------------------------------------------
2689
2851
2852+-- | Wrap a list of pairs as an object.
2690class Monoid pairs => FromPairs enc pairs | enc -> pairs where
2853class Monoid pairs => FromPairs enc pairs | enc -> pairs where
2691 fromPairs :: pairs -> enc
2854 fromPairs :: pairs -> enc
2692
2855
2693−instance FromPairs Encoding Series where
2856+instance (a ~ Value) => FromPairs (Encoding' a) Series where
2694 fromPairs = E.pairs
2857 fromPairs = E.pairs
2695
2858
2696instance FromPairs Value (DList Pair) where
2859instance FromPairs Value (DList Pair) where
2697 fromPairs = object . toList
2860 fromPairs = object . toList
2698
2861
2699−class Monoid kv => GKeyValue v kv where
2862+-- | Like 'KeyValue' but the value is already converted to JSON
2700− gPair :: String -> v -> kv
2863+-- ('Value' or 'Encoding'), and the result actually represents lists of pairs
2864+-- so it can be readily concatenated.
2865+class Monoid kv => KeyValuePair v kv where
2866+ pair :: String -> v -> kv
2701
2867
2702−instance ToJSON v => GKeyValue v (DList Pair) where
2868+instance (v ~ Value) => KeyValuePair v (DList Pair) where
2703− gPair k v = DList.singleton (pack k .= v)
2869+ pair k v = DList.singleton (pack k .= v)
2704
2870
2705−instance GKeyValue Encoding Series where
2871+instance (e ~ Encoding) => KeyValuePair e Series where
2706− gPair = E.pairStr
2872+ pair = E.pairStr
HLint.hsdeleted−10
@@ -1,10 +0,0 @@
1−module HLint.HLint where
2−
3−import "hint" HLint.Default
4−import "hint" HLint.Builtin.All
5−import "hint" HLint.Dollar
6−
7−ignore "Avoid lambda"
8−ignore "Eta reduce"
9−ignore "Functor law"
10−ignore "Use >=>"
Makefile+1−1
@@ -1,2 +1,2 @@
1lint:
1lint:
2− hlint --cpp-include include/ --cpp-file .stack-work/dist/*/*Cabal-*/build/autogen/cabal_macros.h .
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+66−53
@@ -1,5 +1,5 @@
1name: aeson
1name: aeson
2−version: 1.1.2.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,20 +21,6 @@ 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:
@@ -56,6 +42,7 @@ extra-source-files:
56 include/*.h
42 include/*.h
57 tests/JSONTestSuite/test_parsing/*.json
43 tests/JSONTestSuite/test_parsing/*.json
58 tests/JSONTestSuite/test_transform/*.json
44 tests/JSONTestSuite/test_transform/*.json
45+ tests/golden/*.expected
59 pure/Data/Aeson/Parser/*.hs
46 pure/Data/Aeson/Parser/*.hs
60
47
61flag developer
48flag developer
@@ -89,10 +76,12 @@ library
89 Data.Aeson.Text
76 Data.Aeson.Text
90 Data.Aeson.Types
77 Data.Aeson.Types
91 Data.Aeson.TH
78 Data.Aeson.TH
79+ Data.Aeson.QQ.Simple
92
80
93 Data.Aeson.Encoding.Internal
81 Data.Aeson.Encoding.Internal
94 Data.Aeson.Internal
82 Data.Aeson.Internal
95 Data.Aeson.Internal.Time
83 Data.Aeson.Internal.Time
84+ Data.Aeson.Parser.Internal
96
85
97 -- Deprecated modules
86 -- Deprecated modules
98 exposed-modules:
87 exposed-modules:
@@ -101,7 +90,6 @@ library
101 other-modules:
90 other-modules:
102 Data.Aeson.Encoding.Builder
91 Data.Aeson.Encoding.Builder
103 Data.Aeson.Internal.Functions
92 Data.Aeson.Internal.Functions
104− Data.Aeson.Parser.Internal
105 Data.Aeson.Parser.Unescape
93 Data.Aeson.Parser.Unescape
106 Data.Aeson.Parser.Time
94 Data.Aeson.Parser.Time
107 Data.Aeson.Types.FromJSON
95 Data.Aeson.Types.FromJSON
@@ -112,42 +100,59 @@ library
112 Data.Attoparsec.Time
100 Data.Attoparsec.Time
113 Data.Attoparsec.Time.Internal
101 Data.Attoparsec.Time.Internal
114
102
103+ -- GHC bundled libs
115 build-depends:
104 build-depends:
116− attoparsec >= 0.13.0.1,
105+ base >= 4.7.0.0 && < 5,
117− base >= 4.5 && < 5,
106+ bytestring >= 0.10.4.0 && < 0.11,
118− base-compat >= 0.9.1 && < 0.10,
107+ containers >= 0.5.5.1 && < 0.7,
119− containers >= 0.4.2,
108+ deepseq >= 1.3.0.0 && < 1.5,
120− deepseq >= 1.3 && < 1.5,
109+ ghc-prim >= 0.2 && < 0.6,
121− dlist >= 0.6,
110+ template-haskell >= 2.9.0.0 && < 2.16,
122− ghc-prim >= 0.2,
111+ text >= 1.2.3.0 && < 1.3,
123− hashable >= 1.1.2.0,
112+ time >= 1.4 && < 1.10
124− scientific >= 0.3.4.7 && < 0.4,
125− tagged >=0.8.3 && <0.9,
126− template-haskell >= 2.7,
127− text >= 1.1.1.0,
128− time >= 1.1.1.4,
129− time-locale-compat >= 0.1.1 && < 0.2,
130− unordered-containers >= 0.2.5.0 && < 0.3,
131− uuid-types >= 1.0.3 && <1.1,
132− vector >= 0.8
133
113
134− if flag(bytestring-builder)
114+ if impl(ghc >= 8.0)
135− build-depends: bytestring >= 0.9.2 && < 0.10.4,
115+ build-depends: bytestring >= 0.10.8.1
136− bytestring-builder >= 0.10.4 && < 1
116+
137− else
117+ -- Compat
138− build-depends: bytestring >= 0.10.4 && < 0.11
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)
123+ build-depends:
124+ contravariant >=1.4.1 && <1.6
139
125
140 if !impl(ghc >= 8.0)
126 if !impl(ghc >= 8.0)
141 -- `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
142 build-depends:
128 build-depends:
143− semigroups >= 0.18.2 && < 0.19,
129+ semigroups >= 0.18.5 && < 0.20,
144− transformers >= 0.2.2.0,
130+ transformers >= 0.3.0.0 && < 0.6,
145− transformers-compat >= 0.3,
131+ transformers-compat >= 0.6.2 && < 0.7,
146 fail == 4.9.*
132 fail == 4.9.*
147
133
148 if !impl(ghc >= 7.10)
134 if !impl(ghc >= 7.10)
149 -- `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
150− 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
151
156
152 ghc-options: -Wall
157 ghc-options: -Wall
153
158
@@ -190,42 +195,49 @@ test-suite tests
190 Functions
195 Functions
191 Instances
196 Instances
192 Options
197 Options
198+ PropUtils
193 Properties
199 Properties
200+ PropertyGeneric
201+ PropertyKeys
202+ PropertyRoundTrip
203+ PropertyRTFunctors
204+ PropertyTH
194 SerializationFormatSpec
205 SerializationFormatSpec
195 Types
206 Types
196 UnitTests
207 UnitTests
197 UnitTests.NullaryConstructors
208 UnitTests.NullaryConstructors
198
209
199 build-depends:
210 build-depends:
200− HUnit,
211+ QuickCheck >= 2.10.0.1 && < 2.14,
201− QuickCheck >= 2.8 && <2.9.3,
202 aeson,
212 aeson,
203 integer-logarithms >= 1 && <1.1,
213 integer-logarithms >= 1 && <1.1,
204 attoparsec,
214 attoparsec,
205 base,
215 base,
206 base-compat,
216 base-compat,
207− base-orphans >= 0.5.3 && <0.6,
217+ base-orphans >= 0.5.3 && <0.9,
208 base16-bytestring,
218 base16-bytestring,
209 containers,
219 containers,
210 directory,
220 directory,
211 dlist,
221 dlist,
222+ Diff >= 0.4 && < 0.5,
212 filepath,
223 filepath,
213− generic-deriving >= 1.10 && < 1.12,
224+ generic-deriving >= 1.10 && < 1.14,
214 ghc-prim >= 0.2,
225 ghc-prim >= 0.2,
215 hashable >= 1.2.4.0,
226 hashable >= 1.2.4.0,
216 scientific,
227 scientific,
217 tagged,
228 tagged,
218 template-haskell,
229 template-haskell,
219− test-framework,
230+ tasty,
220− test-framework-hunit,
231+ tasty-golden,
221− test-framework-quickcheck2,
232+ tasty-hunit,
233+ tasty-quickcheck,
222 text,
234 text,
223 time,
235 time,
224− time-locale-compat,
236+ time-compat,
225 unordered-containers,
237 unordered-containers,
226 uuid-types,
238 uuid-types,
227 vector,
239 vector,
228− quickcheck-instances >=0.3.12
240+ quickcheck-instances >= 0.3.21 && <0.4
229
241
230 if flag(bytestring-builder)
242 if flag(bytestring-builder)
231 build-depends: bytestring >= 0.9 && < 0.10.4,
243 build-depends: bytestring >= 0.9 && < 0.10.4,
@@ -235,12 +247,13 @@ test-suite tests
235
247
236 if !impl(ghc >= 8.0)
248 if !impl(ghc >= 8.0)
237 build-depends:
249 build-depends:
238− semigroups >= 0.18.2 && < 0.19,
250+ semigroups >= 0.18.2 && < 0.20,
239 transformers >= 0.2.2.0,
251 transformers >= 0.2.2.0,
240 transformers-compat >= 0.3
252 transformers-compat >= 0.3
241
253
242 if !impl(ghc >= 7.10)
254 if !impl(ghc >= 7.10)
243− build-depends: nats >=1 && <1.2
255+ build-depends: nats >=1 && <1.2,
256+ void >=0.7.2 && <0.8
244
257
245 if impl(ghc >= 7.8)
258 if impl(ghc >= 7.8)
246 build-depends: hashable-time >= 0.2 && <0.3
259 build-depends: hashable-time >= 0.2 && <0.3
attoparsec-iso8601/Data/Attoparsec/Time.hs+4−5
@@ -1,6 +1,6 @@
1{-# LANGUAGE BangPatterns #-}
1{-# LANGUAGE BangPatterns #-}
2+{-# LANGUAGE NoImplicitPrelude #-}
2{-# LANGUAGE ScopedTypeVariables #-}
3{-# LANGUAGE ScopedTypeVariables #-}
3−
4-- |
4-- |
5-- Module: Data.Aeson.Parser.Time
5-- Module: Data.Aeson.Parser.Time
6-- Copyright: (c) 2015-2016 Bryan O'Sullivan
6-- Copyright: (c) 2015-2016 Bryan O'Sullivan
@@ -21,7 +21,6 @@ module Data.Attoparsec.Time
21 , zonedTime
21 , zonedTime
22 ) where
22 ) where
23
23
24−import Prelude ()
25import Prelude.Compat
24import Prelude.Compat
26
25
27import Control.Applicative ((<|>))
26import Control.Applicative ((<|>))
@@ -42,9 +41,9 @@ import qualified Data.Time.LocalTime as Local
42day :: Parser Day
41day :: Parser Day
43day = do
42day = do
44 absOrNeg <- negate <$ char '-' <|> id <$ char '+' <|> pure id
43 absOrNeg <- negate <$ char '-' <|> id <$ char '+' <|> pure id
45− y <- decimal <* char '-'
44+ y <- (decimal <* char '-') <|> fail "date must be of form [+,-]YYYY-MM-DD"
46− m <- twoDigits <* char '-'
45+ m <- (twoDigits <* char '-') <|> fail "date must be of form [+,-]YYYY-MM-DD"
47− d <- twoDigits
46+ d <- twoDigits <|> fail "date must be of form [+,-]YYYY-MM-DD"
48 maybe (fail "invalid date") return (fromGregorianValid (absOrNeg y) m d)
47 maybe (fail "invalid date") return (fromGregorianValid (absOrNeg y) m d)
49
48
50-- | Parse a two-digit integer (e.g. day of month, hour).
49-- | Parse a two-digit integer (e.g. day of month, hour).
attoparsec-iso8601/Data/Attoparsec/Time/Internal.hs+21−18
@@ -1,5 +1,5 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2−
2+{-# LANGUAGE NoImplicitPrelude #-}
3-- |
3-- |
4-- Module: Data.Aeson.Internal.Time
4-- Module: Data.Aeson.Internal.Time
5-- Copyright: (c) 2015-2016 Bryan O'Sullivan
5-- Copyright: (c) 2015-2016 Bryan O'Sullivan
@@ -17,45 +17,48 @@ module Data.Attoparsec.Time.Internal
17 , toTimeOfDay64
17 , toTimeOfDay64
18 ) where
18 ) where
19
19
20−import Prelude ()
21import Prelude.Compat
20import Prelude.Compat
22
21
23import Data.Int (Int64)
22import Data.Int (Int64)
24import Data.Time
23import Data.Time
25import Unsafe.Coerce (unsafeCoerce)
24import Unsafe.Coerce (unsafeCoerce)
26
25
27−#if MIN_VERSION_base(4,7,0)
26+#if MIN_VERSION_time(1,6,0)
28
27
29−import Data.Fixed (Pico, Fixed(MkFixed))
28+import Data.Time.Clock (diffTimeToPicoseconds)
30
29
31−toPico :: Integer -> Pico
30+#endif
32−toPico = MkFixed
33
31
34−fromPico :: Pico -> Integer
32+import Data.Fixed (Pico, Fixed(MkFixed))
35−fromPico (MkFixed i) = i
36
33
37−#else
34+#if !MIN_VERSION_time(1,6,0)
38
35
39−import Data.Fixed (Pico)
36+diffTimeToPicoseconds :: DiffTime -> Integer
37+diffTimeToPicoseconds = unsafeCoerce
38+
39+#endif
40
40
41toPico :: Integer -> Pico
41toPico :: Integer -> Pico
42−toPico = unsafeCoerce
42+toPico = MkFixed
43
43
44fromPico :: Pico -> Integer
44fromPico :: Pico -> Integer
45−fromPico = unsafeCoerce
45+fromPico (MkFixed i) = i
46−
47−#endif
48
46
49-- | Like TimeOfDay, but using a fixed-width integer for seconds.
47-- | Like TimeOfDay, but using a fixed-width integer for seconds.
50data TimeOfDay64 = TOD {-# UNPACK #-} !Int
48data TimeOfDay64 = TOD {-# UNPACK #-} !Int
51 {-# UNPACK #-} !Int
49 {-# UNPACK #-} !Int
52 {-# UNPACK #-} !Int64
50 {-# UNPACK #-} !Int64
53
51
52+posixDayLength :: DiffTime
53+posixDayLength = 86400
54+
54diffTimeOfDay64 :: DiffTime -> TimeOfDay64
55diffTimeOfDay64 :: DiffTime -> TimeOfDay64
55−diffTimeOfDay64 t = TOD (fromIntegral h) (fromIntegral m) s
56+diffTimeOfDay64 t
56− where (h,mp) = fromIntegral pico `quotRem` 3600000000000000
57+ | t >= posixDayLength = TOD 23 59 (60000000000000 + pico (t - posixDayLength))
57− (m,s) = mp `quotRem` 60000000000000
58+ | otherwise = TOD (fromIntegral h) (fromIntegral m) s
58− pico = unsafeCoerce t :: Integer
59+ where (h,mp) = pico t `quotRem` 3600000000000000
60+ (m,s) = mp `quotRem` 60000000000000
61+ pico = fromIntegral . diffTimeToPicoseconds
59
62
60toTimeOfDay64 :: TimeOfDay -> TimeOfDay64
63toTimeOfDay64 :: TimeOfDay -> TimeOfDay64
61toTimeOfDay64 (TimeOfDay h m s) = TOD h m (fromIntegral (fromPico s))
64toTimeOfDay64 (TimeOfDay h m s) = TOD h m (fromIntegral (fromPico s))
attoparsec-iso8601/attoparsec-iso8601.cabal+3−3
@@ -1,5 +1,5 @@
1name: attoparsec-iso8601
1name: attoparsec-iso8601
2−version: 1.0.0.0
2+version: 1.0.1.0
3synopsis: Parsing of ISO 8601 dates, originally from aeson.
3synopsis: Parsing of ISO 8601 dates, originally from aeson.
4description: Parsing of ISO 8601 dates, originally from aeson.
4description: Parsing of ISO 8601 dates, originally from aeson.
5license: BSD3
5license: BSD3
@@ -36,8 +36,8 @@ library
36 Data.Attoparsec.Time
36 Data.Attoparsec.Time
37 build-depends:
37 build-depends:
38 attoparsec >= 0.13.0.1,
38 attoparsec >= 0.13.0.1,
39− base >= 4.5 && < 5,
39+ base >= 4.7 && < 5,
40− base-compat >= 0.9.1 && < 0.10,
40+ base-compat >= 0.9.1 && < 0.12,
41 text >= 1.1.1.0,
41 text >= 1.1.1.0,
42 time >= 1.1.1.4
42 time >= 1.1.1.4
43
43
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−282
@@ -1,282 +0,0 @@
1−{-# LANGUAGE DeriveGeneric #-}
2−{-# LANGUAGE FlexibleContexts #-}
3−{-# LANGUAGE TemplateHaskell #-}
4−
5−module Main (main) where
6−
7−import Prelude ()
8−import Prelude.Compat
9−
10−import Control.Monad
11−import Control.DeepSeq (NFData, rnf, deepseq)
12−import Criterion.Main hiding (defaultOptions)
13−import Data.Aeson
14−import Data.Aeson.Encoding
15−import Data.Aeson.TH
16−import Data.Aeson.Types
17−import Data.ByteString.Lazy (ByteString)
18−import Data.Data (Data)
19−import Data.Typeable (Typeable)
20−import GHC.Generics (Generic, Rep)
21−import Options
22−
23−toBS :: Encoding -> ByteString
24−toBS = encodingToLazyByteString
25−
26−gEncode :: (Generic a, GToEncoding Zero (Rep a)) => a -> ByteString
27−gEncode = toBS . genericToEncoding opts
28−
29−--------------------------------------------------------------------------------
30−
31−data D a = Nullary
32− | Unary Int
33− | Product String Char a
34− | Record { testOne :: Double
35− , testTwo :: Bool
36− , testThree :: D a
37− }
38− deriving (Show, Eq)
39−
40−deriveJSON opts ''D
41−
42−instance NFData a => NFData (D a) where
43− rnf Nullary = ()
44− rnf (Unary n) = rnf n
45− rnf (Product s c x) = s `deepseq` c `deepseq` rnf x
46− rnf (Record d b y) = d `deepseq` b `deepseq` rnf y
47−
48−type T = D (D (D ()))
49−
50−d :: T
51−d = Record
52− { testOne = 1234.56789
53− , testTwo = True
54− , testThree = Product "Hello World!" 'a'
55− Record
56− { testOne = 9876.54321
57− , testTwo = False
58− , testThree = Product "Yeehaa!!!" '\n' Nullary
59− }
60− }
61−
62−--------------------------------------------------------------------------------
63−
64−data D' a = Nullary'
65− | Unary' Int
66− | Product' String Char a
67− | Record' { testOne' :: Double
68− , testTwo' :: Bool
69− , testThree' :: D' a
70− }
71− deriving (Show, Eq, Generic)
72−
73−instance ToJSON a => ToJSON (D' a) where
74− toJSON = genericToJSON opts
75−
76−instance FromJSON a => FromJSON (D' a) where
77− parseJSON = genericParseJSON opts
78−
79−instance NFData a => NFData (D' a) where
80− rnf Nullary' = ()
81− rnf (Unary' n) = rnf n
82− rnf (Product' s c x) = s `deepseq` c `deepseq` rnf x
83− rnf (Record' d b y) = d `deepseq` b `deepseq` rnf y
84−
85−type T' = D' (D' (D' ()))
86−
87−d' :: T'
88−d' = Record'
89− { testOne' = 1234.56789
90− , testTwo' = True
91− , testThree' = Product' "Hello World!" 'a'
92− Record'
93− { testOne' = 9876.54321
94− , testTwo' = False
95− , testThree' = Product' "Yeehaa!!!" '\n' Nullary'
96− }
97− }
98−
99−--------------------------------------------------------------------------------
100−
101−data BigRecord = BigRecord
102− { field01 :: !Int, field02 :: !Int, field03 :: !Int, field04 :: !Int, field05 :: !Int
103− , field06 :: !Int, field07 :: !Int, field08 :: !Int, field09 :: !Int, field10 :: !Int
104− , field11 :: !Int, field12 :: !Int, field13 :: !Int, field14 :: !Int, field15 :: !Int
105− , field16 :: !Int, field17 :: !Int, field18 :: !Int, field19 :: !Int, field20 :: !Int
106− , field21 :: !Int, field22 :: !Int, field23 :: !Int, field24 :: !Int, field25 :: !Int
107− } deriving (Show, Eq, Generic)
108−
109−instance NFData BigRecord
110−
111−bigRecord = BigRecord 1 2 3 4 5
112− 6 7 8 9 10
113− 11 12 13 14 15
114− 16 17 18 19 20
115− 21 22 23 24 25
116−
117−return []
118−
119−gBigRecordToJSON :: BigRecord -> Value
120−gBigRecordToJSON = genericToJSON opts
121−
122−gBigRecordEncode :: BigRecord -> ByteString
123−gBigRecordEncode = gEncode
124−
125−gBigRecordFromJSON :: Value -> Result BigRecord
126−gBigRecordFromJSON = parse $ genericParseJSON opts
127−
128−thBigRecordToJSON :: BigRecord -> Value
129−thBigRecordToJSON = $(mkToJSON opts ''BigRecord)
130−
131−thBigRecordEncode :: BigRecord -> ByteString
132−thBigRecordEncode = toBS . $(mkToEncoding opts ''BigRecord)
133−
134−thBigRecordFromJSON :: Value -> Result BigRecord
135−thBigRecordFromJSON = parse $(mkParseJSON opts ''BigRecord)
136−
137−--------------------------------------------------------------------------------
138−
139−data BigProduct = BigProduct
140− !Int !Int !Int !Int !Int
141− !Int !Int !Int !Int !Int
142− !Int !Int !Int !Int !Int
143− !Int !Int !Int !Int !Int
144− !Int !Int !Int !Int !Int
145− deriving (Show, Eq, Generic)
146−
147−instance NFData BigProduct
148−
149−bigProduct = BigProduct 1 2 3 4 5
150− 6 7 8 9 10
151− 11 12 13 14 15
152− 16 17 18 19 20
153− 21 22 23 24 25
154−
155−return []
156−
157−gBigProductToJSON :: BigProduct -> Value
158−gBigProductToJSON = genericToJSON opts
159−
160−gBigProductEncode :: BigProduct -> ByteString
161−gBigProductEncode = gEncode
162−
163−gBigProductFromJSON :: Value -> Result BigProduct
164−gBigProductFromJSON = parse $ genericParseJSON opts
165−
166−thBigProductToJSON :: BigProduct -> Value
167−thBigProductToJSON = $(mkToJSON opts ''BigProduct)
168−
169−thBigProductEncode :: BigProduct -> ByteString
170−thBigProductEncode = toBS . $(mkToEncoding opts ''BigProduct)
171−
172−thBigProductFromJSON :: Value -> Result BigProduct
173−thBigProductFromJSON = parse $(mkParseJSON opts ''BigProduct)
174−
175−--------------------------------------------------------------------------------
176−
177−data BigSum = F01 | F02 | F03 | F04 | F05
178− | F06 | F07 | F08 | F09 | F10
179− | F11 | F12 | F13 | F14 | F15
180− | F16 | F17 | F18 | F19 | F20
181− | F21 | F22 | F23 | F24 | F25
182− deriving (Show, Eq, Generic)
183−
184−instance NFData BigSum
185−
186−bigSum = F25
187−
188−return []
189−
190−gBigSumToJSON :: BigSum -> Value
191−gBigSumToJSON = genericToJSON opts
192−
193−gBigSumEncode :: BigSum -> ByteString
194−gBigSumEncode = gEncode
195−
196−gBigSumFromJSON :: Value -> Result BigSum
197−gBigSumFromJSON = parse $ genericParseJSON opts
198−
199−thBigSumToJSON :: BigSum -> Value
200−thBigSumToJSON = $(mkToJSON opts ''BigSum)
201−
202−thBigSumEncode :: BigSum -> ByteString
203−thBigSumEncode = toBS . $(mkToEncoding opts ''BigSum)
204−
205−thBigSumFromJSON :: Value -> Result BigSum
206−thBigSumFromJSON = parse $(mkParseJSON opts ''BigSum)
207−
208−--------------------------------------------------------------------------------
209−
210−type FJ a = Value -> Result a
211−
212−runBench :: IO ()
213−runBench = defaultMain
214− [ let v = toJSON d
215− in (d, d', v) `deepseq`
216− bgroup "D"
217− [ group "toJSON" (nf toJSON d)
218− (nf toJSON d')
219− , group "encode" (nf encode d)
220− (nf encode d')
221− , group "fromJSON" (nf ( fromJSON :: FJ T ) v)
222− (nf ( fromJSON :: FJ T') v)
223− ]
224− , let v = thBigRecordToJSON bigRecord
225− in bigRecord `deepseq` v `deepseq`
226− bgroup "BigRecord"
227− [ group "toJSON" (nf thBigRecordToJSON bigRecord)
228− (nf gBigRecordToJSON bigRecord)
229− , group "encode" (nf thBigRecordEncode bigRecord)
230− (nf gBigRecordEncode bigRecord)
231− , group "fromJSON" (nf (thBigRecordFromJSON :: FJ BigRecord) v)
232− (nf ( gBigRecordFromJSON :: FJ BigRecord) v)
233− ]
234− , let v = thBigProductToJSON bigProduct
235− in bigProduct `deepseq` v `deepseq`
236− bgroup "BigProduct"
237− [ group "toJSON" (nf thBigProductToJSON bigProduct)
238− (nf gBigProductToJSON bigProduct)
239− , group "encode" (nf thBigProductEncode bigProduct)
240− (nf gBigProductEncode bigProduct)
241− , group "fromJSON" (nf (thBigProductFromJSON :: FJ BigProduct) v)
242− (nf (gBigProductFromJSON :: FJ BigProduct) v)
243− ]
244− , let v = thBigSumToJSON bigSum
245− in bigSum `deepseq` v `deepseq`
246− bgroup "BigSum"
247− [ group "toJSON" (nf thBigSumToJSON bigSum)
248− (nf gBigSumToJSON bigSum)
249− , group "encode" (nf thBigSumEncode bigSum)
250− (nf gBigSumEncode bigSum)
251− , group "fromJSON" (nf (thBigSumFromJSON :: FJ BigSum) v)
252− (nf (gBigSumFromJSON :: FJ BigSum) v)
253− ]
254− ]
255−
256−group n th gen = bgroup n [ bench "th" th
257− , bench "generic" gen
258− ]
259−
260−sanityCheck = do
261− check d toJSON fromJSON encode
262− check d' toJSON fromJSON encode
263− check bigRecord thBigRecordToJSON thBigRecordFromJSON thBigRecordEncode
264− check bigRecord gBigRecordToJSON gBigRecordFromJSON gBigRecordEncode
265− check bigProduct thBigProductToJSON thBigProductFromJSON thBigProductEncode
266− check bigProduct gBigProductToJSON gBigProductFromJSON gBigProductEncode
267− check bigSum thBigSumToJSON thBigSumFromJSON thBigSumEncode
268− check bigSum gBigSumToJSON gBigSumFromJSON gBigSumEncode
269−
270−check :: (Show a, Eq a)
271− => a -> (a -> Value) -> (Value -> Result a) -> (a -> ByteString) -> IO ()
272−check x toJSON fromJSON encode = do
273− unless (Success x == (fromJSON . toJSON) x) $ fail $ "toJSON: " ++ show x
274− unless (Success x == (decode' . encode) x) $ fail $ "encode: " ++ show x
275− where
276− decode' s = case decode s of
277− Just v -> fromJSON v
278− Nothing -> fail ""
279−
280−main = do
281− sanityCheck
282− runBench
benchmarks/AesonEncode.hs+2−2
@@ -1,13 +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.Monad
10+import Control.Monad (forM_)
11import Data.Aeson
11import Data.Aeson
12import Data.Attoparsec.ByteString (IResult(..), parseWith)
12import Data.Attoparsec.ByteString (IResult(..), parseWith)
13import Data.Char (isDigit)
13import Data.Char (isDigit)
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
68+ [ benchEncode "-" valueList
87− , benchEncodeB "L" $ L valueList
69+ , benchEncode "L" $ L valueList
88− , benchEncodeB "F" $ F valueList
70+ , benchEncode "F" $ F valueList
89− , benchEncodeA "-" valueList
90− , benchEncodeA "L" $ L valueList
91− , benchEncodeA "F" $ F valueList
92 ]
71 ]
93 , bgroup "Seq"
72 , bgroup "Seq"
94− [ benchEncodeB "-" valueSeq
73+ [ benchEncode "-" valueSeq
95− , benchEncodeB "L" $ L valueSeq
74+ , benchEncode "L" $ L valueSeq
96− , benchEncodeB "F" $ F valueSeq
75+ , benchEncode "F" $ F valueSeq
97− , benchEncodeA "-" valueSeq
98− , benchEncodeA "L" $ L valueSeq
99− , benchEncodeA "F" $ F valueSeq
100 ]
76 ]
101 , bgroup "Vector"
77 , bgroup "Vector"
102− [ benchEncodeB "-" valueVector
78+ [ benchEncode "-" valueVector
103− , benchEncodeB "L" $ L valueVector
79+ , benchEncode "L" $ L valueVector
104− , benchEncodeB "F" $ F valueVector
80+ , benchEncode "F" $ F valueVector
105− , benchEncodeA "-" valueVector
106− , benchEncodeA "L" $ L valueVector
107− , benchEncodeA "F" $ F valueVector
108 ]
81 ]
109 , bgroup "Vector.Unboxed"
82 , bgroup "Vector.Unboxed"
110− [ benchEncodeB "-" valueUVector
83+ [ benchEncode "-" valueUVector
111− , benchEncodeA "-" 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
17+import Data.Aeson.Types (fromJSONKeyCoerce)
20−import qualified "aeson-benchmarks" Data.Aeson.Types as B (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)
118+ :: (FromJSON (M.Map k T.Text), Ord 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)
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
150+ , bench "Tagged Text" $ nf (decodeHM $ proxyTagged proxyText) val
164− , bench "Tagged Text" $ nf (decodeHMB $ proxyTagged proxyText) val
151+ , bench "Tagged Identity" $ nf (decodeHM $ proxyTagged proxyT1) val
165− , bench "Tagged Identity" $ nf (decodeHMB $ proxyTagged proxyT1) val
152+ , bench "Tagged Coerce" $ nf (decodeHM $ proxyTagged proxyT2) val
166− , bench "Tagged Coerce" $ nf (decodeHMB $ proxyTagged proxyT2) val
153+ , bench "Tagged Parser" $ nf (decodeHM $ proxyTagged proxyT3) val
167− , bench "Tagged Parser" $ nf (decodeHMB $ 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+2−3
@@ -1,13 +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
11import Control.Monad
10import Control.Monad
12import Data.Attoparsec.ByteString (IResult(..), parseWith)
11import Data.Attoparsec.ByteString (IResult(..), parseWith)
13import Data.Time.Clock
12import Data.Time.Clock
benchmarks/AesonTuples.hs+2−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 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−9
@@ -1,17 +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 MagicHash #-}
3{-# LANGUAGE MagicHash #-}
4+{-# LANGUAGE NoImplicitPrelude #-}
7{-# LANGUAGE OverloadedStrings #-}
5{-# LANGUAGE OverloadedStrings #-}
8{-# LANGUAGE RecordWildCards #-}
6{-# LANGUAGE RecordWildCards #-}
9{-# LANGUAGE ScopedTypeVariables #-}
7{-# LANGUAGE ScopedTypeVariables #-}
10
8
9+-- Adapted from a buffer-builder benchmark:
10+--
11+-- https://github.com/chadaustin/buffer-builder/blob/master/test.json
12+
11module Compare.JsonBench (benchmarks) where
13module Compare.JsonBench (benchmarks) where
12
14
13−import Prelude ()
15+import Prelude.Compat hiding ((<>))
14−import Prelude.Compat
15
16
16import Control.DeepSeq (NFData(..))
17import Control.DeepSeq (NFData(..))
17import Criterion
18import Criterion
@@ -19,9 +20,13 @@ import Data.Aeson ((.:))
19import Data.Monoid ((<>))
20import Data.Monoid ((<>))
20import Data.Text (Text)
21import Data.Text (Text)
21import Typed.Common (load)
22import Typed.Common (load)
23+import qualified Control.Monad.Fail as Fail
22import qualified Data.Aeson as Aeson
24import qualified Data.Aeson as Aeson
23import qualified Data.BufferBuilder.Json as Json
25import qualified Data.BufferBuilder.Json as Json
26+
27+#ifdef MIN_VERSION_json_builder
24import qualified Data.Json.Builder as JB
28import qualified Data.Json.Builder as JB
29+#endif
25
30
26data EyeColor = Green | Blue | Brown
31data EyeColor = Green | Blue | Brown
27 deriving (Eq, Show)
32 deriving (Eq, Show)
@@ -64,10 +69,10 @@ instance NFData Gender where rnf !_ = ()
64instance NFData Fruit where rnf !_ = ()
69instance NFData Fruit where rnf !_ = ()
65
70
66instance NFData Friend where
71instance NFData Friend where
67− rnf Friend {..} = rnf fId `seq` rnf fName `seq` ()
72+ rnf Friend {..} = rnf fId `seq` rnf fName
68
73
69instance NFData User where
74instance NFData User where
70− 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
71
76
72eyeColorTable :: [(Text, EyeColor)]
77eyeColorTable :: [(Text, EyeColor)]
73eyeColorTable = [("brown", Brown), ("green", Green), ("blue", Blue)]
78eyeColorTable = [("brown", Brown), ("green", Green), ("blue", Blue)]
@@ -78,7 +83,7 @@ genderTable = [("male", Male), ("female", Female)]
78fruitTable :: [(Text, Fruit)]
83fruitTable :: [(Text, Fruit)]
79fruitTable = [("apple", Apple), ("strawberry", Strawberry), ("banana", Banana)]
84fruitTable = [("apple", Apple), ("strawberry", Strawberry), ("banana", Banana)]
80
85
81−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
82enumFromJson enumName table extract v = do
87enumFromJson enumName table extract v = do
83 s <- extract v
88 s <- extract v
84 case lookup s table of
89 case lookup s table of
@@ -268,6 +273,7 @@ instance Json.ToJson User where
268 <> "greeting"# Json..=# uGreeting
273 <> "greeting"# Json..=# uGreeting
269 <> "favoriteFruit"# Json..=# uFavouriteFruit
274 <> "favoriteFruit"# Json..=# uFavouriteFruit
270
275
276+#ifdef MIN_VERSION_json_builder
271---- json-builder instances ----
277---- json-builder instances ----
272
278
273instance JB.Value EyeColor where
279instance JB.Value EyeColor where
@@ -319,6 +325,7 @@ instance JB.Value User where
319 <> t "friends" `JB.row` uFriends
325 <> t "friends" `JB.row` uFriends
320 <> t "greeting" `JB.row` uGreeting
326 <> t "greeting" `JB.row` uGreeting
321 <> t "favoriteFruit" `JB.row` uFavouriteFruit
327 <> t "favoriteFruit" `JB.row` uFavouriteFruit
328+#endif
322
329
323benchmarks :: Benchmark
330benchmarks :: Benchmark
324benchmarks = env (load "json-data/buffer-builder.json") $
331benchmarks = env (load "json-data/buffer-builder.json") $
@@ -326,5 +333,7 @@ benchmarks = env (load "json-data/buffer-builder.json") $
326 bgroup "json-bench" [
333 bgroup "json-bench" [
327 bench "aeson" $ nf Aeson.encode parsedUserList
334 bench "aeson" $ nf Aeson.encode parsedUserList
328 , bench "buffer-builder" $ nf Json.encodeJson parsedUserList
335 , bench "buffer-builder" $ nf Json.encodeJson parsedUserList
336+#ifdef MIN_VERSION_json_builder
329 , bench "json-builder" $ nf JB.toJsonLBS parsedUserList
337 , bench "json-builder" $ nf JB.toJsonLBS parsedUserList
338+#endif
330 ]
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+32−17
@@ -1,8 +1,9 @@
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)
@@ -12,6 +13,8 @@ import Criterion.Main
12import Data.Maybe (fromMaybe)
13import Data.Maybe (fromMaybe)
13import qualified Data.Aeson as A
14import qualified Data.Aeson as A
14import 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
15import qualified Data.ByteString.Lazy as BL
18import qualified Data.ByteString.Lazy as BL
16import qualified Data.Text.Lazy as TL
19import qualified Data.Text.Lazy as TL
17import qualified Data.Text.Lazy.Builder as TLB
20import qualified Data.Text.Lazy.Builder as TLB
@@ -24,7 +27,7 @@ instance (NFData v) => NFData (J.JSObject v) where
24instance NFData J.JSValue where
27instance NFData J.JSValue where
25 rnf J.JSNull = ()
28 rnf J.JSNull = ()
26 rnf (J.JSBool b) = rnf b
29 rnf (J.JSBool b) = rnf b
27− rnf (J.JSRational a b) = rnf a `seq` rnf b `seq` ()
30+ rnf (J.JSRational a b) = rnf a `seq` rnf b
28 rnf (J.JSString s) = rnf (J.fromJSString s)
31 rnf (J.JSString s) = rnf (J.fromJSString s)
29 rnf (J.JSArray lst) = rnf lst
32 rnf (J.JSArray lst) = rnf lst
30 rnf (J.JSObject o) = rnf o
33 rnf (J.JSObject o) = rnf o
@@ -35,11 +38,18 @@ decodeJ s =
35 J.Ok v -> v
38 J.Ok v -> v
36 J.Error _ -> error "fail to parse via JSON"
39 J.Error _ -> error "fail to parse via JSON"
37
40
38−decodeA :: BL.ByteString -> A.Value
41+decode :: BL.ByteString -> A.Value
39−decodeA s = fromMaybe (error "fail to parse via Aeson") $ A.decode s
42+decode s = fromMaybe (error "fail to parse via Aeson") $ A.decode s
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
48+decodeS s = fromMaybe (error "fail to parse via Aeson") $ A.decodeStrict' s
40
49
41−decodeA' :: BL.ByteString -> A.Value
50+decodeIP :: BL.ByteString -> A.Value
42−decodeA' s = fromMaybe (error "fail to parse via Aeson") $ A.decode' s
51+decodeIP s = fromMaybe (error "fail to parse via Parser.decodeWith") $
52+ I.decodeWith I.jsonEOF A.fromJSON s
43
53
44encodeJ :: J.JSValue -> BL.ByteString
54encodeJ :: J.JSValue -> BL.ByteString
45encodeJ = toLazyByteString . fromString . J.encode
55encodeJ = toLazyByteString . fromString . J.encode
@@ -55,32 +65,37 @@ main = do
55 let enFile = "json-data/twitter100.json"
65 let enFile = "json-data/twitter100.json"
56 jpFile = "json-data/jp100.json"
66 jpFile = "json-data/jp100.json"
57 enA <- BL.readFile enFile
67 enA <- BL.readFile enFile
68+ enS <- BS.readFile enFile
58 enJ <- readFile enFile
69 enJ <- readFile enFile
59 jpA <- BL.readFile jpFile
70 jpA <- BL.readFile jpFile
71+ jpS <- BS.readFile jpFile
60 jpJ <- readFile jpFile
72 jpJ <- readFile jpFile
61 defaultMain [
73 defaultMain [
62 bgroup "decode" [
74 bgroup "decode" [
63 bgroup "en" [
75 bgroup "en" [
64− bench "aeson/lazy" $ nf decodeA enA
76+ bench "aeson/lazy" $ nf decode enA
65− , bench "aeson/strict" $ nf decodeA' enA
77+ , bench "aeson/strict" $ nf decode' enA
66− , bench "json" $ nf decodeJ enJ
78+ , bench "aeson/stricter" $ nf decodeS enS
79+ , bench "aeson/parser" $ nf decodeIP enA
80+ , bench "json" $ nf decodeJ enJ
67 ]
81 ]
68 , bgroup "jp" [
82 , bgroup "jp" [
69− bench "aeson" $ nf decodeA jpA
83+ bench "aeson" $ nf decode jpA
70− , bench "json" $ nf decodeJ jpJ
84+ , bench "aeson/stricter" $ nf decodeS jpS
85+ , bench "json" $ nf decodeJ jpJ
71 ]
86 ]
72 ]
87 ]
73 , bgroup "encode" [
88 , bgroup "encode" [
74 bgroup "en" [
89 bgroup "en" [
75− bench "aeson-to-bytestring" $ nf A.encode (decodeA enA)
90+ bench "aeson-to-bytestring" $ nf A.encode (decode enA)
76− , bench "aeson-via-text-to-bytestring" $ nf encodeViaText (decodeA enA)
91+ , bench "aeson-via-text-to-bytestring" $ nf encodeViaText (decode enA)
77− , bench "aeson-to-text" $ nf encodeToText (decodeA enA)
92+ , bench "aeson-to-text" $ nf encodeToText (decode enA)
78 , bench "json" $ nf encodeJ (decodeJ enJ)
93 , bench "json" $ nf encodeJ (decodeJ enJ)
79 ]
94 ]
80 , bgroup "jp" [
95 , bgroup "jp" [
81− bench "aeson-to-bytestring" $ nf A.encode (decodeA jpA)
96+ bench "aeson-to-bytestring" $ nf A.encode (decode jpA)
82− , bench "aeson-via-text-to-bytestring" $ nf encodeViaText (decodeA jpA)
97+ , bench "aeson-via-text-to-bytestring" $ nf encodeViaText (decode jpA)
83− , bench "aeson-to-text" $ nf encodeToText (decodeA jpA)
98+ , bench "aeson-to-text" $ nf encodeToText (decode jpA)
84 , bench "json" $ nf encodeJ (decodeJ jpJ)
99 , bench "json" $ nf encodeJ (decodeJ jpJ)
85 ]
100 ]
86 ]
101 ]
benchmarks/Dates.hs+2−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
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+1−1
@@ -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
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−10
@@ -1,25 +1,16 @@
1−{-# LANGUAGE CPP #-}
1+{-# LANGUAGE NoImplicitPrelude #-}
2−#ifdef HAS_BOTH_AESON_AND_BENCHMARKS
3−{-# LANGUAGE PackageImports #-}
4−#endif
5
2
6{-# OPTIONS_GHC -fno-warn-unused-imports #-}
3{-# OPTIONS_GHC -fno-warn-unused-imports #-}
7
4
8module Typed.Common (load) where
5module Typed.Common (load) where
9
6
10−import Prelude ()
11import Prelude.Compat
7import Prelude.Compat
12
8
13import Data.ByteString.Lazy as L
9import Data.ByteString.Lazy as L
14import System.Exit
10import System.Exit
15import System.IO
11import System.IO
16
12
17−#ifndef HAS_BOTH_AESON_AND_BENCHMARKS
18import Data.Aeson hiding (Result)
13import Data.Aeson hiding (Result)
19−#else
20−import "aeson" Data.Aeson hiding (Result)
21−import qualified "aeson-benchmarks" Data.Aeson as B
22−#endif
23
14
24load :: FromJSON a => FilePath -> IO a
15load :: FromJSON a => FilePath -> IO a
25load fileName = do
16load fileName = do
benchmarks/Typed/Generic.hs+27−25
@@ -1,42 +1,44 @@
1−{-# LANGUAGE PackageImports #-}
1+{-# LANGUAGE NoImplicitPrelude #-}
2−module Typed.Generic (benchmarks) where
2+
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
16+encodeViaValue :: Result -> L.ByteString
21−encodeDirectB = B.encode
17+encodeViaValue = encode . toJSON
22−
23−encodeViaValueB :: Result -> L.ByteString
24−encodeViaValueB = B.encode . B.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
25+ , bench "jp100" $ nf encodeDirect jp100
33− , bench "twitter100 baseline" $ nf encodeDirectA twitter100
34− , bench "jp100 baseline" $ nf encodeDirectA 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+ ]
40− , bench "jp100 baseline" $ nf encodeViaValueA jp100
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
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−module Typed.Manual (benchmarks) where
2+
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
16+encodeViaValue :: Result -> L.ByteString
21−encodeDirectB = B.encode
17+encodeViaValue = encode . toJSON
22−
23−encodeViaValueB :: Result -> L.ByteString
24−encodeViaValueB = B.encode . B.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
25+ , bench "jp100" $ nf encodeDirect jp100
33− , bench "twitter100 baseline" $ nf encodeDirectA twitter100
34− , bench "jp100 baseline" $ nf encodeDirectA 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+ ]
40− , bench "jp100 baseline" $ nf encodeViaValueA jp100
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
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−module Typed.TH (benchmarks) where
2+
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
16+encodeViaValue :: Result -> L.ByteString
21−encodeDirectB = B.encode
17+encodeViaValue = encode . toJSON
22−
23−encodeViaValueB :: Result -> L.ByteString
24−encodeViaValueB = B.encode . B.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
25+ , bench "jp100" $ nf encodeDirect jp100
33− , bench "twitter100 baseline" $ nf encodeDirectA twitter100
34− , bench "jp100 baseline" $ nf encodeDirectA 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+ ]
40− , bench "jp100 baseline" $ nf encodeViaValueB jp100
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
42+ , bench "jp100" $ nf decodeDirect jp100
41 ]
43 ]
42 ]
44 ]
benchmarks/aeson-benchmarks.cabal+183−66
@@ -1,64 +1,21 @@
1name: aeson-benchmarks
1name: aeson-benchmarks
2version: 0
2version: 0
3build-type: Simple
3build-type: Simple
4−
4+cabal-version: >=1.10
5−cabal-version: >=1.8
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: .. . ../ffi ../pure ../attoparsec-iso8601
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.Parser.UnescapeFFI
28− Data.Aeson.Parser.UnescapePure
29− Data.Aeson.TH
30− Data.Aeson.Text
31− Data.Aeson.Types
32− Data.Aeson.Types.Class
33− Data.Aeson.Types.FromJSON
34− Data.Aeson.Types.Generic
35− Data.Aeson.Types.Internal
36− Data.Aeson.Types.ToJSON
37− Data.Attoparsec.Time
38− Data.Attoparsec.Time.Internal
39
16
40− build-depends:
17+library
41− attoparsec >= 0.13.0.1,
18+ default-language: Haskell2010
42− base == 4.*,
43− base-compat >= 0.9.1 && <0.10,
44− time-locale-compat >=0.1.1 && <0.2,
45− containers,
46− deepseq,
47− dlist >= 0.2,
48− fail == 4.9.*,
49− ghc-prim >= 0.2,
50− hashable >= 1.1.2.0,
51− mtl,
52− scientific >= 0.3.4.7 && < 0.4,
53− syb,
54− tagged >=0.8.3 && <0.9,
55− template-haskell >= 2.4,
56− text >= 1.1.1.0,
57− time,
58− transformers,
59− unordered-containers >= 0.2.3.0,
60− uuid-types >= 1.0.3 && <1.1,
61− vector >= 0.7.1
62
19
63 if flag(bytestring-builder)
20 if flag(bytestring-builder)
64 build-depends: bytestring >= 0.9 && < 0.10.4,
21 build-depends: bytestring >= 0.9 && < 0.10.4,
@@ -66,22 +23,142 @@ library
66 else
23 else
67 build-depends: bytestring >= 0.10.4
24 build-depends: bytestring >= 0.10.4
68
25
69− if impl(ghc >=7.8)
26+ if flag(local-aeson)
70− cpp-options: -DHAS_COERCIBLE
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+
55+ if !impl(ghc >= 8.6)
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
71
62
72− if !impl(ghc >= 8.0)
63+ if !impl(ghc >= 7.10)
73− -- `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
74− build-depends: semigroups >= 0.18.2 && < 0.19
65+ build-depends: nats,
66+ void
75
67
76− include-dirs: ../include
68+ include-dirs: ../include
77
69
78− ghc-options: -O2 -Wall
70+ ghc-options: -O2 -Wall
79− 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
80
150
81executable aeson-benchmark-compare
151executable aeson-benchmark-compare
152+ default-language: Haskell2010
82 main-is: Compare.hs
153 main-is: Compare.hs
83 hs-source-dirs: ../examples .
154 hs-source-dirs: ../examples .
84 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
85 build-depends:
162 build-depends:
86 aeson-benchmarks,
163 aeson-benchmarks,
87 base,
164 base,
@@ -91,10 +168,19 @@ executable aeson-benchmark-compare
91 criterion >= 1.0,
168 criterion >= 1.0,
92 deepseq,
169 deepseq,
93 ghc-prim,
170 ghc-prim,
94− json-builder,
95 text
171 text
96
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+
97executable aeson-benchmark-micro
182executable aeson-benchmark-micro
183+ default-language: Haskell2010
98 main-is: Micro.hs
184 main-is: Micro.hs
99 hs-source-dirs: ../examples .
185 hs-source-dirs: ../examples .
100 ghc-options: -Wall -O2 -rtsopts
186 ghc-options: -Wall -O2 -rtsopts
@@ -109,14 +195,21 @@ executable aeson-benchmark-micro
109 text
195 text
110
196
111executable aeson-benchmark-typed
197executable aeson-benchmark-typed
198+ default-language: Haskell2010
112 main-is: Typed.hs
199 main-is: Typed.hs
113 hs-source-dirs: ../examples .
200 hs-source-dirs: ../examples .
114 ghc-options: -Wall -O2 -rtsopts
201 ghc-options: -Wall -O2 -rtsopts
115− -- We must help ourself in situations when there is both
202+ other-modules:
116− -- aeson and aeson-benchmakrs
203+ Twitter
117− 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
118 build-depends:
212 build-depends:
119− aeson,
120 aeson-benchmarks,
213 aeson-benchmarks,
121 base,
214 base,
122 base-compat,
215 base-compat,
@@ -131,8 +224,11 @@ executable aeson-benchmark-typed
131 bytestring-builder >= 0.10.4 && < 1
224 bytestring-builder >= 0.10.4 && < 1
132 else
225 else
133 build-depends: bytestring >= 0.10.4
226 build-depends: bytestring >= 0.10.4
227+ if impl(ghc < 8.0)
228+ build-depends: semigroups
134
229
135executable aeson-benchmark-compare-with-json
230executable aeson-benchmark-compare-with-json
231+ default-language: Haskell2010
136 main-is: CompareWithJSON.hs
232 main-is: CompareWithJSON.hs
137 ghc-options: -Wall -O2 -rtsopts
233 ghc-options: -Wall -O2 -rtsopts
138 build-depends:
234 build-depends:
@@ -147,6 +243,7 @@ executable aeson-benchmark-compare-with-json
147 text
243 text
148
244
149executable aeson-benchmark-aeson-encode
245executable aeson-benchmark-aeson-encode
246+ default-language: Haskell2010
150 main-is: AesonEncode.hs
247 main-is: AesonEncode.hs
151 ghc-options: -Wall -O2 -rtsopts
248 ghc-options: -Wall -O2 -rtsopts
152 build-depends:
249 build-depends:
@@ -159,6 +256,7 @@ executable aeson-benchmark-aeson-encode
159 time
256 time
160
257
161executable aeson-benchmark-aeson-parse
258executable aeson-benchmark-aeson-parse
259+ default-language: Haskell2010
162 main-is: AesonParse.hs
260 main-is: AesonParse.hs
163 ghc-options: -Wall -O2 -rtsopts
261 ghc-options: -Wall -O2 -rtsopts
164 build-depends:
262 build-depends:
@@ -170,6 +268,7 @@ executable aeson-benchmark-aeson-parse
170 time
268 time
171
269
172executable aeson-benchmark-json-parse
270executable aeson-benchmark-json-parse
271+ default-language: Haskell2010
173 main-is: JsonParse.hs
272 main-is: JsonParse.hs
174 ghc-options: -Wall -O2 -rtsopts
273 ghc-options: -Wall -O2 -rtsopts
175 build-depends:
274 build-depends:
@@ -180,6 +279,7 @@ executable aeson-benchmark-json-parse
180 time
279 time
181
280
182executable aeson-benchmark-dates
281executable aeson-benchmark-dates
282+ default-language: Haskell2010
183 main-is: Dates.hs
283 main-is: Dates.hs
184 ghc-options: -Wall -O2 -rtsopts
284 ghc-options: -Wall -O2 -rtsopts
185 build-depends:
285 build-depends:
@@ -191,12 +291,14 @@ executable aeson-benchmark-dates
191 aeson-benchmarks,
291 aeson-benchmarks,
192 text,
292 text,
193 time
293 time
294+ if impl(ghc >= 8.2)
295+ ghc-options: -Wno-simplifiable-class-constraints
194
296
195executable aeson-benchmark-map
297executable aeson-benchmark-map
298+ default-language: Haskell2010
196 main-is: AesonMap.hs
299 main-is: AesonMap.hs
197 ghc-options: -Wall -O2 -rtsopts
300 ghc-options: -Wall -O2 -rtsopts
198 build-depends:
301 build-depends:
199− aeson,
200 aeson-benchmarks,
302 aeson-benchmarks,
201 base,
303 base,
202 base-compat,
304 base-compat,
@@ -210,10 +312,10 @@ executable aeson-benchmark-map
210 unordered-containers
312 unordered-containers
211
313
212executable aeson-benchmark-foldable
314executable aeson-benchmark-foldable
315+ default-language: Haskell2010
213 main-is: AesonFoldable.hs
316 main-is: AesonFoldable.hs
214 ghc-options: -Wall -O2 -rtsopts
317 ghc-options: -Wall -O2 -rtsopts
215 build-depends:
318 build-depends:
216− aeson,
217 aeson-benchmarks,
319 aeson-benchmarks,
218 base,
320 base,
219 base-compat,
321 base-compat,
@@ -226,3 +328,18 @@ executable aeson-benchmark-foldable
226 text,
328 text,
227 unordered-containers,
329 unordered-containers,
228 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+173
@@ -1,5 +1,178 @@
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+
3### 1.1.2.0
176### 1.1.2.0
4
177
5* Fix an accidental change in the format of `deriveJSON`. Thanks to Xia Li-yao!
178* Fix an accidental change in the format of `deriveJSON`. Thanks to Xia Li-yao!
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+1−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,6 @@ 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)
31
30
32{-# ANN module "Hlint: ignore Use camelCase" #-}
31{-# ANN module "Hlint: ignore Use camelCase" #-}
33{-# ANN module "Hlint: ignore Use newtype instead of data" #-}
32{-# ANN module "Hlint: ignore Use newtype instead of data" #-}
examples/Twitter/Generic.hs+31−36
@@ -1,5 +1,7 @@
1-- Use GHC generics to automatically generate good instances.
1-- Use GHC generics to automatically generate good instances.
2−{-# LANGUAGE CPP #-}
2+
3+{-# LANGUAGE NoImplicitPrelude #-}
4+
3{-# OPTIONS_GHC -fno-warn-orphans #-}
5{-# OPTIONS_GHC -fno-warn-orphans #-}
4
6
5module Twitter.Generic
7module Twitter.Generic
@@ -10,40 +12,33 @@ module Twitter.Generic
10 , Result(..)
12 , Result(..)
11 ) where
13 ) where
12
14
13−import Prelude ()
15+import Prelude.Compat ()
14−import Prelude.Compat
15
16
16import Twitter
17import Twitter
17−
18+import Twitter.Options
18−#ifndef HAS_BOTH_AESON_AND_BENCHMARKS
19+
19−import Data.Aeson (ToJSON, FromJSON)
20+import Data.Aeson (ToJSON (..), FromJSON (..), genericToJSON, genericToEncoding, genericParseJSON)
20−#else
21+
21−import "aeson" Data.Aeson (ToJSON, FromJSON)
22+instance ToJSON Metadata where
22−import qualified "aeson-benchmarks" Data.Aeson as B
23+ toJSON = genericToJSON twitterOptions
23−#endif
24+ toEncoding = genericToEncoding twitterOptions
24−
25+instance FromJSON Metadata where
25−instance ToJSON Metadata
26+ parseJSON = genericParseJSON twitterOptions
26−instance FromJSON Metadata
27+
27−
28+instance ToJSON Geo where
28−instance ToJSON Geo
29+ toJSON = genericToJSON twitterOptions
29−instance FromJSON Geo
30+ toEncoding = genericToEncoding twitterOptions
30−
31+instance FromJSON Geo where
31−instance ToJSON Story
32+ parseJSON = genericParseJSON twitterOptions
32−instance FromJSON Story
33+
33−
34+instance ToJSON Story where
34−instance ToJSON Result
35+ toJSON = genericToJSON twitterOptions
35−instance FromJSON Result
36+ toEncoding = genericToEncoding twitterOptions
36−
37+instance FromJSON Story where
37−#ifdef HAS_BOTH_AESON_AND_BENCHMARKS
38+ parseJSON = genericParseJSON twitterOptions
38−instance B.ToJSON Metadata
39+
39−instance B.FromJSON Metadata
40+instance ToJSON Result where
40−
41+ toJSON = genericToJSON twitterOptions
41−instance B.ToJSON Geo
42+ toEncoding = genericToEncoding twitterOptions
42−instance B.FromJSON Geo
43+instance FromJSON Result where
43−
44+ parseJSON = genericParseJSON twitterOptions
44−instance B.ToJSON Story
45−instance B.FromJSON Story
46−
47−instance B.ToJSON Result
48−instance B.FromJSON Result
49−#endif
examples/Twitter/Manual.hs+3−139
@@ -1,13 +1,9 @@
1-- Manually write instances.
1-- Manually write instances.
2−
2+{-# LANGUAGE NoImplicitPrelude #-}
3−{-# LANGUAGE CPP #-}
4{-# LANGUAGE OverloadedStrings #-}
3{-# LANGUAGE OverloadedStrings #-}
5{-# LANGUAGE RecordWildCards #-}
4{-# LANGUAGE RecordWildCards #-}
6−{-# OPTIONS_GHC -fno-warn-orphans #-}
7
5
8−#ifdef HAS_BOTH_AESON_AND_BENCHMARKS
6+{-# OPTIONS_GHC -fno-warn-orphans #-}
9−{-# LANGUAGE PackageImports #-}
10−#endif
11
7
12module Twitter.Manual
8module Twitter.Manual
13 (
9 (
@@ -17,20 +13,13 @@ module Twitter.Manual
17 , Result(..)
13 , Result(..)
18 ) where
14 ) where
19
15
20−import Prelude ()
21import Prelude.Compat
16import Prelude.Compat
22
17
23import Control.Applicative
18import Control.Applicative
24−import Data.Monoid ((<>))
19+import Data.Semigroup ((<>))
25−import Prelude hiding (id)
26import Twitter
20import Twitter
27
21
28−#ifndef HAS_BOTH_AESON_AND_BENCHMARKS
29import Data.Aeson hiding (Result)
22import Data.Aeson hiding (Result)
30−#else
31−import "aeson" Data.Aeson hiding (Result)
32−import qualified "aeson-benchmarks" Data.Aeson as B
33−#endif
34
23
35instance ToJSON Metadata where
24instance ToJSON Metadata where
36
25
@@ -155,128 +144,3 @@ instance FromJSON Result where
155 <*> v .: "max_id_str"
144 <*> v .: "max_id_str"
156 <*> v .: "query"
145 <*> v .: "query"
157 parseJSON _ = empty
146 parseJSON _ = empty
158−
159−#ifdef HAS_BOTH_AESON_AND_BENCHMARKS
160−instance B.ToJSON Metadata where
161− toJSON Metadata{..} = B.object [
162− "result_type" B..= result_type
163− ]
164−
165− toEncoding Metadata{..} = B.pairs $
166− "result_type" B..= result_type
167−
168−instance B.FromJSON Metadata where
169− parseJSON (B.Object v) = Metadata <$> v B..: "result_type"
170− parseJSON _ = empty
171−
172−instance B.ToJSON Geo where
173− toJSON Geo{..} = B.object [
174− "type_" B..= type_
175− , "coordinates" B..= coordinates
176− ]
177−
178− toEncoding Geo{..} = B.pairs $
179− "type_" B..= type_
180− <> "coordinates" B..= coordinates
181−
182−instance B.FromJSON Geo where
183− parseJSON (B.Object v) = Geo <$>
184− v B..: "type_"
185− <*> v B..: "coordinates"
186− parseJSON _ = empty
187−
188−instance B.ToJSON Story where
189− toJSON Story{..} = B.object [
190− "from_user_id_str" B..= from_user_id_str
191− , "profile_image_url" B..= profile_image_url
192− , "created_at" B..= created_at
193− , "from_user" B..= from_user
194− , "id_str" B..= id_str
195− , "metadata" B..= metadata
196− , "to_user_id" B..= to_user_id
197− , "text" B..= text
198− , "id" B..= id_
199− , "from_user_id" B..= from_user_id
200− , "geo" B..= geo
201− , "iso_language_code" B..= iso_language_code
202− , "to_user_id_str" B..= to_user_id_str
203− , "source" B..= source
204− ]
205−
206− toEncoding Story{..} = B.pairs $
207− "from_user_id_str" B..= from_user_id_str
208− <> "profile_image_url" B..= profile_image_url
209− <> "created_at" B..= created_at
210− <> "from_user" B..= from_user
211− <> "id_str" B..= id_str
212− <> "metadata" B..= metadata
213− <> "to_user_id" B..= to_user_id
214− <> "text" B..= text
215− <> "id" B..= id_
216− <> "from_user_id" B..= from_user_id
217− <> "geo" B..= geo
218− <> "iso_language_code" B..= iso_language_code
219− <> "to_user_id_str" B..= to_user_id_str
220− <> "source" B..= source
221−
222−instance B.FromJSON Story where
223− parseJSON (B.Object v) = Story <$>
224− v B..: "from_user_id_str"
225− <*> v B..: "profile_image_url"
226− <*> v B..: "created_at"
227− <*> v B..: "from_user"
228− <*> v B..: "id_str"
229− <*> v B..: "metadata"
230− <*> v B..: "to_user_id"
231− <*> v B..: "text"
232− <*> v B..: "id"
233− <*> v B..: "from_user_id"
234− <*> v B..: "geo"
235− <*> v B..: "iso_language_code"
236− <*> v B..: "to_user_id_str"
237− <*> v B..: "source"
238− parseJSON _ = empty
239−
240−instance B.ToJSON Result where
241− toJSON Result{..} = B.object [
242− "results" B..= results
243− , "max_id" B..= max_id
244− , "since_id" B..= since_id
245− , "refresh_url" B..= refresh_url
246− , "next_page" B..= next_page
247− , "results_per_page" B..= results_per_page
248− , "page" B..= page
249− , "completed_in" B..= completed_in
250− , "since_id_str" B..= since_id_str
251− , "max_id_str" B..= max_id_str
252− , "query" B..= query
253− ]
254−
255− toEncoding Result{..} = B.pairs $
256− "results" B..= results
257− <> "max_id" B..= max_id
258− <> "since_id" B..= since_id
259− <> "refresh_url" B..= refresh_url
260− <> "next_page" B..= next_page
261− <> "results_per_page" B..= results_per_page
262− <> "page" B..= page
263− <> "completed_in" B..= completed_in
264− <> "since_id_str" B..= since_id_str
265− <> "max_id_str" B..= max_id_str
266− <> "query" B..= query
267−
268−instance B.FromJSON Result where
269− parseJSON (B.Object v) = Result <$>
270− v B..: "results"
271− <*> v B..: "max_id"
272− <*> v B..: "since_id"
273− <*> v B..: "refresh_url"
274− <*> v B..: "next_page"
275− <*> v B..: "results_per_page"
276− <*> v B..: "page"
277− <*> v B..: "completed_in"
278− <*> v B..: "since_id_str"
279− <*> v B..: "max_id_str"
280− <*> v B..: "query"
281− parseJSON _ = empty
282−#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
22+$(deriveJSON twitterOptions ''Metadata)
33−$(B.deriveJSON B.defaultOptions ''Metadata)
23+$(deriveJSON twitterOptions ''Geo)
34−$(B.deriveJSON B.defaultOptions ''Geo)
24+$(deriveJSON twitterOptions ''Story)
35−$(B.deriveJSON B.defaultOptions ''Story)
25+$(deriveJSON twitterOptions ''Result)
36−$(B.deriveJSON B.defaultOptions ''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+13−36
@@ -119,38 +119,18 @@ decode UtfTail1 point word = case word of
119 w | 0x80 <= w && w <= 0xbf -> (UtfGround, setByte1 point word)
119 w | 0x80 <= w && w <= 0xbf -> (UtfGround, setByte1 point word)
120 _ -> throwDecodeError
120 _ -> throwDecodeError
121
121
122−{-# INLINE decode #-}
123−
124decodeHex :: Word8 -> Word16
122decodeHex :: Word8 -> Word16
125−decodeHex 48 = 0 -- '0'
123+decodeHex x
126−decodeHex 49 = 1 -- '1'
124+ | 48 <= x && x <= 57 = fromIntegral x - 48 -- 0-9
127−decodeHex 50 = 2 -- '2'
125+ | 65 <= x && x <= 70 = fromIntegral x - 55 -- A-F
128−decodeHex 51 = 3 -- '3'
126+ | 97 <= x && x <= 102 = fromIntegral x - 87 -- a-f
129−decodeHex 52 = 4 -- '4'
127+ | otherwise = throwDecodeError
130−decodeHex 53 = 5 -- '5'
131−decodeHex 54 = 6 -- '6'
132−decodeHex 55 = 7 -- '7'
133−decodeHex 56 = 8 -- '8'
134−decodeHex 57 = 9 -- '9'
135−decodeHex 65 = 10 -- 'A'
136−decodeHex 97 = 10 -- 'a'
137−decodeHex 66 = 11 -- 'B'
138−decodeHex 98 = 11 -- 'b'
139−decodeHex 67 = 12 -- 'C'
140−decodeHex 99 = 12 -- 'c'
141−decodeHex 68 = 13 -- 'D'
142−decodeHex 100 = 13 -- 'd'
143−decodeHex 69 = 14 -- 'E'
144−decodeHex 101 = 14 -- 'e'
145−decodeHex 70 = 15 -- 'F'
146−decodeHex 102 = 15 -- 'f'
147−decodeHex _ = throwDecodeError
148−{-# INLINE decodeHex #-}
149
128
150unescapeText' :: ByteString -> Text
129unescapeText' :: ByteString -> Text
151unescapeText' bs = runText $ \done -> do
130unescapeText' bs = runText $ \done -> do
152 dest <- A.new len
131 dest <- A.new len
153− (pos, finalState) <- B.foldl' (f' dest) (return (0, StateNone)) bs
132+
133+ (pos, finalState) <- loop dest (0, StateNone) 0
154
134
155 -- Check final state. Currently pos gets only increased over time, so this check should catch overflows.
135 -- Check final state. Currently pos gets only increased over time, so this check should catch overflows.
156 when ( finalState /= StateNone || pos > len)
136 when ( finalState /= StateNone || pos > len)
@@ -172,11 +152,12 @@ unescapeText' bs = runText $ \done -> do
172 (st', p) ->
152 (st', p) ->
173 return (pos, StateUtf st' p)
153 return (pos, StateUtf st' p)
174
154
175− {-# INLINE runUtf #-}
155+ loop :: A.MArray s -> (Int, State) -> Int -> ST s (Int, State)
176−
156+ loop _ ps i | i >= len = return ps
177− f' dest m c = m >>= \s -> f dest s c
157+ loop dest ps i = do
178−
158+ let c = B.index bs i -- JP: We can use unsafe index once we prove bounds with Liquid Haskell.
179− {-# INLINE f' #-}
159+ ps' <- f dest ps c
160+ loop dest ps' $ i+1
180
161
181 -- No pending state.
162 -- No pending state.
182 f dest (pos, StateNone) c = runUtf dest pos UtfGround 0 c
163 f dest (pos, StateNone) c = runUtf dest pos UtfGround 0 c
@@ -253,8 +234,6 @@ unescapeText' bs = runText $ \done -> do
253 else
234 else
254 writeAndReturn dest pos u StateNone
235 writeAndReturn dest pos u StateNone
255
236
256− {-# INLINE f #-}
257−
258write :: A.MArray s -> Int -> Word16 -> ST s ()
237write :: A.MArray s -> Int -> Word16 -> ST s ()
259write dest pos char =
238write dest pos char =
260 A.unsafeWrite dest pos char
239 A.unsafeWrite dest pos char
@@ -270,8 +249,6 @@ throwDecodeError :: a
270throwDecodeError =
249throwDecodeError =
271 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
272 throw (DecodeError desc Nothing)
251 throw (DecodeError desc Nothing)
273−{-# INLINE throwDecodeError #-}
274
252
275unescapeText :: ByteString -> Either UnicodeException Text
253unescapeText :: ByteString -> Either UnicodeException Text
276unescapeText = unsafeDupablePerformIO . try . evaluate . unescapeText'
254unescapeText = unsafeDupablePerformIO . try . evaluate . unescapeText'
277−{-# 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−2
@@ -1,4 +1,12 @@
1−resolver: lts-8.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−- '.'
4- benchmarks
11- benchmarks
12+extra-deps: []
stack-ffi-unescape.yamlnew file+9
@@ -0,0 +1,9 @@
1+resolver: nightly-2019-09-21
2+packages:
3+- '.'
4+flags:
5+ aeson:
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−14
@@ -1,14 +0,0 @@
1−resolver: lts-6.30
2−packages:
3−- '.'
4−- attoparsec-iso8601
5−extra-deps:
6−- semigroups-0.18.2
7−- integer-logarithms-1
8−flags:
9− aeson:
10− fast: true
11− attoparsec-iso8601:
12− fast: true
13− semigroups:
14− bytestring-builder: false
stack-lts7.yamldeleted−11
@@ -1,11 +0,0 @@
1−resolver: lts-7.19
2−packages:
3−- '.'
4−- attoparsec-iso8601
5−extra-deps:
6−- integer-logarithms-1
7−flags:
8− aeson:
9− fast: true
10− attoparsec-iso8601:
11− fast: true
stack-lts8.yamldeleted−9
@@ -1,9 +0,0 @@
1−resolver: lts-8.1
2−packages:
3−- '.'
4−- attoparsec-iso8601
5−flags:
6− aeson:
7− fast: true
8− attoparsec-iso8601:
9− fast: true
stack-nightly.yaml+3−1
@@ -1,4 +1,4 @@
1−resolver: nightly-2017-03-25
1+resolver: nightly-2019-10-14
2packages:
2packages:
3- '.'
3- '.'
4- attoparsec-iso8601
4- attoparsec-iso8601
@@ -7,3 +7,5 @@ flags:
7 fast: true
7 fast: true
8 attoparsec-iso8601:
8 attoparsec-iso8601:
9 fast: true
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−import Test.Framework (Test, testGroup)
12+
13−import Test.Framework.Providers.QuickCheck2 (testProperty)
13+import Test.Tasty (TestTree, testGroup)
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+82−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-------------------------------------------------------------------------------
@@ -382,3 +446,13 @@ gOneConstructorToEncodingTagged = genericToEncoding optsTagSingleConstructors
382
446
383gOneConstructorParseJSONTagged :: Value -> Parser OneConstructor
447gOneConstructorParseJSONTagged :: Value -> Parser OneConstructor
384gOneConstructorParseJSONTagged = genericParseJSON optsTagSingleConstructors
448gOneConstructorParseJSONTagged = 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
21−tests :: [Test]
27+import Encoders
28+import Types
29+
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
34+ ]
26− , testCase "HashMap" hashMap
35+
27− ]
36+output :: Output
28−
37+output = concat
29−int :: Assertion
38+ [ testFor "Int" (Proxy :: Proxy Int)
30−int = do
39+ [ "\"\""
31− let t = test (Proxy :: Proxy Int)
40+ , "[]"
32− t "\"\"" $ expected "Int" "String"
41+ , "{}"
33− t "[]" $ expected "Int" "Array"
42+ , "null"
34− t "{}" $ expected "Int" "Object"
43+ ]
35− t "null" $ expected "Int" "Null"
44+
36−
45+ , testFor "Integer" (Proxy :: Proxy Integer)
37−string :: Assertion
46+ [ "44.44"
38−string = do
47+ ]
39− let t = test (Proxy :: Proxy String)
48+
40− t "1" $ expected "String" "Number"
49+ , testFor "Natural" (Proxy :: Proxy Natural)
41− t "[]" $ expected "String" "Array"
50+ [ "44.44"
42− t "{}" $ expected "String" "Object"
51+ , "-50"
43− t "null" $ expected "String" "Null"
52+ ]
44−
53+
45−hashMap :: Assertion
54+ , testFor "String" (Proxy :: Proxy String)
46−hashMap = do
55+ [ "1"
47− let t = test (Proxy :: Proxy (HM.HashMap String Int))
56+ , "[]"
48− t "\"\"" $ expected "HashMap k v" "String"
57+ , "{}"
49− t "[]" $ expected "HashMap k v" "Array"
58+ , "null"
50−
59+ ]
51−expected :: String -> String -> String
60+
52−expected ex enc = "Error in $: expected " ++ ex ++ ", encountered " ++ enc
61+ , testFor "HashMap" (Proxy :: Proxy (HM.HashMap String Int))
53−
62+ [ "\"\""
54−test :: forall a proxy . (FromJSON a, Show a) => proxy a -> L.ByteString -> String -> Assertion
63+ , "[]"
55−test _ v msg = case eitherDecode v of
64+ ]
56− Left e -> assertEqual "Invalid error message" msg e
65+
57− Right (x :: a) -> assertFailure $ "Expected parsing to fail but it suceeded with: " ++ show x
66+ -- issue #356
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+
216+testFor :: forall a proxy. (FromJSON a, Show a)
217+ => String -> proxy a -> [L.ByteString] -> Output
218+testFor name _ = testWith name (parseJSON :: Value -> Parser a)
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−69
@@ -1,22 +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+
6{-# OPTIONS_GHC -fno-warn-orphans #-}
7{-# OPTIONS_GHC -fno-warn-orphans #-}
7
8
8module Instances () where
9module Instances () where
9
10
10−import Prelude ()
11import Prelude.Compat
11import Prelude.Compat
12
12
13import Control.Applicative (empty)
13import Control.Applicative (empty)
14import Control.Monad
14import Control.Monad
15import Data.Aeson.Types
15import Data.Aeson.Types
16import Data.Function (on)
16import Data.Function (on)
17−import Data.Functor.Compose (Compose (..))
18−import Data.Proxy (Proxy(..))
19−import Data.Tagged (Tagged(..))
20import Data.Time (ZonedTime(..), TimeZone(..))
17import Data.Time (ZonedTime(..), TimeZone(..))
21import Data.Time.Clock (UTCTime(..))
18import Data.Time.Clock (UTCTime(..))
22import Functions
19import Functions
@@ -24,32 +21,15 @@ import Test.QuickCheck (Arbitrary(..), elements, oneof)
24import Types
21import Types
25import qualified Data.DList as DList
22import qualified Data.DList as DList
26import qualified Data.HashMap.Strict as HM
23import qualified Data.HashMap.Strict as HM
27−import qualified Data.UUID.Types as UUID
28−
29−#if !MIN_VERSION_QuickCheck(2,9,0)
30−import Control.Applicative (Const(..))
31−import Data.Functor.Identity (Identity (..))
32−import Data.List.NonEmpty (NonEmpty(..))
33−import Data.Version
34−import Test.QuickCheck (getNonNegative, listOf1, resize)
35−#endif
36
24
37import Data.Orphans ()
25import Data.Orphans ()
38import Test.QuickCheck.Instances ()
26import Test.QuickCheck.Instances ()
39−#if MIN_VERSION_base(4,7,0)
40import Data.Hashable.Time ()
27import Data.Hashable.Time ()
41−#endif
42−
43−#if !MIN_VERSION_base(4,8,0) && !MIN_VERSION_QuickCheck(2,8,3)
44−import Numeric.Natural
45−#endif
46−
47−{-# ANN module ("HLint: ignore Use fewer imports"::String) #-}
48
28
49-- "System" types.
29-- "System" types.
50
30
51instance Arbitrary DotNetTime where
31instance Arbitrary DotNetTime where
52− arbitrary = DotNetTime `liftM` arbitrary
32+ arbitrary = DotNetTime `fmap` arbitrary
53 shrink = map DotNetTime . shrink . fromDotNetTime
33 shrink = map DotNetTime . shrink . fromDotNetTime
54
34
55-- | Compare timezone part only on 'timeZoneMinutes'
35-- | Compare timezone part only on 'timeZoneMinutes'
@@ -173,57 +153,15 @@ instance Arbitrary EitherTextInt where
173instance Arbitrary (GADT String) where
153instance Arbitrary (GADT String) where
174 arbitrary = GADT <$> arbitrary
154 arbitrary = GADT <$> arbitrary
175
155
156+instance Arbitrary OptionField where
157+ arbitrary = OptionField <$> arbitrary
158+
159+
176instance ApproxEq Char where
160instance ApproxEq Char where
177 (=~) = (==)
161 (=~) = (==)
178
162
179instance (ApproxEq a) => ApproxEq [a] where
163instance (ApproxEq a) => ApproxEq [a] where
180 a =~ b = length a == length b && all (uncurry (=~)) (zip a b)
164 a =~ b = length a == length b && all (uncurry (=~)) (zip a b)
181
165
182−-- Version tags are deprecated, so we avoid using them in the Arbitrary
183−-- instance. However, the recommended constructor 'makeVersion' is not
184−-- exported by "Data.Version" until base-4.8.0.0. For previous versions,
185−-- a definition is given below.
186−
187−
188−#if !MIN_VERSION_base(4,8,0) && !MIN_VERSION_QuickCheck(2,8,3)
189−instance Arbitrary Natural where
190− arbitrary = fromInteger . abs <$> arbitrary
191−#endif
192−
193−instance Arbitrary (Proxy a) where
194− arbitrary = pure Proxy
195−
196−instance Arbitrary b => Arbitrary (Tagged a b) where
197− arbitrary = Tagged <$> arbitrary
198−
199instance Arbitrary a => Arbitrary (DList.DList a) where
166instance Arbitrary a => Arbitrary (DList.DList a) where
200 arbitrary = DList.fromList <$> arbitrary
167 arbitrary = DList.fromList <$> arbitrary
201−
202−instance Arbitrary (f (g a)) => Arbitrary (Compose f g a) where
203− arbitrary = Compose <$> arbitrary
204−
205−#if !MIN_VERSION_QuickCheck(2,9,0)
206−instance Arbitrary a => Arbitrary (Const a b) where
207− arbitrary = Const <$> arbitrary
208−
209−instance Arbitrary a => Arbitrary (NonEmpty a) where
210− arbitrary = (:|) <$> arbitrary <*> arbitrary
211−
212−instance Arbitrary Version where
213− arbitrary = makeVersion . fmap getNonNegative <$> resize 4 (listOf1 arbitrary)
214−
215−#if !MIN_VERSION_base(4,8,0)
216−makeVersion :: [Int] -> Version
217−makeVersion b = Version b []
218−#endif
219−
220−instance Arbitrary a => Arbitrary (Identity a) where
221− arbitrary = Identity <$> arbitrary
222−#endif
223−
224−instance Arbitrary UUID.UUID where
225− arbitrary = UUID.fromWords
226− <$> arbitrary
227− <*> arbitrary
228− <*> arbitrary
229− <*> 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:
15− base >= 4.7 && < 5
17+ aeson
16− , aeson
18+ , base >=4.7 && <5
17 , base-prelude
19 , base-prelude
18 , bytestring
20 , bytestring
19 default-language: Haskell2010
21 default-language: Haskell2010
tests/Options.hs+20−2
@@ -1,6 +1,7 @@
1−module Options where
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
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
@@ -48,3 +49,20 @@ optsTagSingleConstructors = optsDefault
48 { tagSingleConstructors = True
49 { tagSingleConstructors = True
49 , allNullaryToStringTag = False
50 , allNullaryToStringTag = False
50 }
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−488
@@ -1,302 +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)
8+import Test.Tasty (TestTree, testGroup)
34−import Test.Framework (Test, testGroup)
9+import Test.Tasty.QuickCheck (testProperty)
35−import Test.Framework.Providers.QuickCheck2 (testProperty)
10+import Test.QuickCheck (Property)
36−import Test.QuickCheck (Arbitrary(..), Property, Testable, (===), (.&&.), counterexample)
11+import PropUtils
37−import Types
12+import PropertyGeneric
38−import qualified Data.Attoparsec.Lazy as L
13+import PropertyKeys
39−import qualified Data.ByteString.Lazy.Char8 as L
14+import PropertyRoundTrip
40−import qualified Data.HashMap.Strict as H
15+import PropertyTH
41−import qualified Data.Map as Map
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
18+tests :: TestTree
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−-- | Add the formatted @Value@ to the printed counterexample when the property
153−-- fails.
154−checkValue :: Testable a => (Value -> a) -> Value -> Property
155−checkValue prop v = counterexample (L.unpack (encode v)) (prop v)
156−
157−isString :: Value -> Bool
158−isString (String _) = True
159−isString _ = False
160−
161−is2ElemArray :: Value -> Bool
162−is2ElemArray (Array v) = V.length v == 2 && isString (V.head v)
163−is2ElemArray _ = False
164−
165−isTaggedObjectValue :: Value -> Bool
166−isTaggedObjectValue (Object obj) = "tag" `H.member` obj &&
167− "contents" `H.member` obj
168−isTaggedObjectValue _ = False
169−
170−isNullaryTaggedObject :: Value -> Bool
171−isNullaryTaggedObject obj = isTaggedObject' obj && isObjectWithSingleField obj
172−
173−isTaggedObject :: Value -> Property
174−isTaggedObject = checkValue isTaggedObject'
175−
176−isTaggedObject' :: Value -> Bool
177−isTaggedObject' (Object obj) = "tag" `H.member` obj
178−isTaggedObject' _ = False
179−
180−isObjectWithSingleField :: Value -> Bool
181−isObjectWithSingleField (Object obj) = H.size obj == 1
182−isObjectWithSingleField _ = False
183−
184−-- | is untaggedValue of EitherTextInt
185−isUntaggedValueETI :: Value -> Bool
186−isUntaggedValueETI (String s)
187− | s == "nonenullary" = True
188−isUntaggedValueETI (Bool _) = True
189−isUntaggedValueETI (Number _) = True
190−isUntaggedValueETI (Array a) = length a == 2
191−isUntaggedValueETI _ = False
192−
193−isEmptyArray :: Value -> Property
194−isEmptyArray = checkValue isEmptyArray'
195−
196−isEmptyArray' :: Value -> Bool
197−isEmptyArray' = (Array mempty ==)
198−
199−
200−--------------------------------------------------------------------------------
201−
202−
203−tests :: Test
204tests = testGroup "properties" [
19tests = testGroup "properties" [
205 testGroup "encode" [
20 testGroup "encode" [
206 testProperty "encodeDouble" encodeDouble
21 testProperty "encodeDouble" encodeDouble
207 , testProperty "encodeInteger" encodeInteger
22 , testProperty "encodeInteger" encodeInteger
208 ]
23 ]
209− , testGroup "roundTrip" [
24+ , roundTripTests
210− testProperty "Bool" $ roundTripEq True
25+ , keysTests
211− , testProperty "Double" $ roundTripEq (1 :: Approx Double)
212− , testProperty "Int" $ roundTripEq (1 :: Int)
213− , testProperty "NonEmpty Char" $ roundTripEq (undefined :: NonEmpty Char)
214− , testProperty "Integer" $ roundTripEq (1 :: Integer)
215− , testProperty "String" $ roundTripEq ("" :: String)
216− , testProperty "Text" $ roundTripEq T.empty
217− , testProperty "Lazy Text" $ roundTripEq LT.empty
218− , testProperty "Foo" $ roundTripEq (undefined :: Foo)
219− , testProperty "Day" $ roundTripEq (undefined :: Day)
220− , testProperty "BCE Day" $ roundTripEq (undefined :: BCEDay)
221− , testProperty "DotNetTime" $ roundTripEq (undefined :: Approx DotNetTime)
222− , testProperty "LocalTime" $ roundTripEq (undefined :: LocalTime)
223− , testProperty "TimeOfDay" $ roundTripEq (undefined :: TimeOfDay)
224− , testProperty "UTCTime" $ roundTripEq (undefined :: UTCTime)
225− , testProperty "ZonedTime" $ roundTripEq (undefined :: ZonedTime)
226− , testProperty "NominalDiffTime" $ roundTripEq (undefined :: NominalDiffTime)
227− , testProperty "Version" $ roundTripEq (undefined :: Version)
228− , testProperty "Natural" $ roundTripEq (undefined :: Natural)
229− , testProperty "Proxy" $ roundTripEq (undefined :: Proxy Int)
230− , testProperty "Tagged" $ roundTripEq (undefined :: Tagged Int Char)
231− , testProperty "Const" $ roundTripEq (undefined :: Const Int Char)
232− , testProperty "DList" $ roundTripEq (undefined :: DList Int)
233− , testProperty "Seq" $ roundTripEq (undefined :: Seq Int)
234− , testProperty "Rational" $ roundTripEq (undefined :: Rational)
235− , testProperty "Ratio Int" $ roundTripEq (undefined :: Ratio Int)
236− , testProperty "UUID" $ roundTripEq UUID.nil
237− , testGroup "functors"
238− [ testProperty "Identity Char" $ roundTripEq (undefined :: I Int)
239−
240− , testProperty "Identity Char" $ roundTripEq (undefined :: I Char)
241− , testProperty "Identity [Char]" $ roundTripEq (undefined :: I String)
242− , testProperty "[Identity Char]" $ roundTripEq (undefined :: [I Char])
243−
244− , testProperty "Compose I I Int" $ roundTripEq (undefined :: LogScaled (Compose I I Int))
245− , testProperty "Compose [] I Int" $ roundTripEq (undefined :: LogScaled (Compose [] I Int))
246− , testProperty "Compose I [] Int" $ roundTripEq (undefined :: LogScaled (Compose I [] Int))
247− , testProperty "Compose [] [] Int" $ roundTripEq (undefined :: LogScaled (Compose [] [] Int))
248−
249− , testProperty "Compose I I Char" $ roundTripEq (undefined :: LogScaled (Compose I I Char))
250− , testProperty "Compose [] I Char" $ roundTripEq (undefined :: LogScaled (Compose [] I Char))
251− , testProperty "Compose I [] Char" $ roundTripEq (undefined :: LogScaled (Compose I [] Char))
252− , testProperty "Compose [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose [] [] Char))
253−
254− , testProperty "Compose3 I I I Char" $ roundTripEq (undefined :: LogScaled (Compose3 I I I Char))
255− , testProperty "Compose3 I [] I Char" $ roundTripEq (undefined :: LogScaled (Compose3 I [] I Char))
256− , testProperty "Compose3 I I [] Char" $ roundTripEq (undefined :: LogScaled (Compose3 I I [] Char))
257− , testProperty "Compose3 I [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose3 I [] [] Char))
258− , testProperty "Compose3 [] I I Char" $ roundTripEq (undefined :: LogScaled (Compose3 [] I I Char))
259− , testProperty "Compose3 [] [] I Char" $ roundTripEq (undefined :: LogScaled (Compose3 [] [] I Char))
260− , testProperty "Compose3 [] I [] Char" $ roundTripEq (undefined :: LogScaled (Compose3 [] I [] Char))
261− , testProperty "Compose3 [] [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose3 [] [] [] Char))
262−
263− , testProperty "Compose3' I I I Char" $ roundTripEq (undefined :: LogScaled (Compose3' I I I Char))
264− , testProperty "Compose3' I [] I Char" $ roundTripEq (undefined :: LogScaled (Compose3' I [] I Char))
265− , testProperty "Compose3' I I [] Char" $ roundTripEq (undefined :: LogScaled (Compose3' I I [] Char))
266− , testProperty "Compose3' I [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose3' I [] [] Char))
267− , testProperty "Compose3' [] I I Char" $ roundTripEq (undefined :: LogScaled (Compose3' [] I I Char))
268− , testProperty "Compose3' [] [] I Char" $ roundTripEq (undefined :: LogScaled (Compose3' [] [] I Char))
269− , testProperty "Compose3' [] I [] Char" $ roundTripEq (undefined :: LogScaled (Compose3' [] I [] Char))
270− , testProperty "Compose3' [] [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose3' [] [] [] Char))
271− ]
272− , testGroup "ghcGenerics" [
273− testProperty "OneConstructor" $ roundTripEq OneConstructor
274− , testProperty "Product2" $ roundTripEq (undefined :: Product2 Int Bool)
275− , testProperty "Product6" $ roundTripEq (undefined :: P6)
276− , testProperty "Sum4" $ roundTripEq (undefined :: S4)
277− ]
278− ]
279− , testGroup "roundTrip Key"
280− [ testProperty "Bool" $ roundTripKey True
281− , testProperty "Text" $ roundTripKey (undefined :: T.Text)
282− , testProperty "String" $ roundTripKey (undefined :: String)
283− , testProperty "Int" $ roundTripKey (undefined :: Int)
284− , testProperty "[Text]" $ roundTripKey (undefined :: LogScaled [T.Text])
285− , testProperty "(Int,Char)" $ roundTripKey (undefined :: (Int,Char))
286− , testProperty "Integer" $ roundTripKey (undefined :: Integer)
287− , testProperty "Natural" $ roundTripKey (undefined :: Natural)
288− , testProperty "Float" $ roundTripKey (undefined :: Float)
289− , testProperty "Double" $ roundTripKey (undefined :: Double)
290−#if MIN_VERSION_base(4,7,0)
291− , testProperty "Day" $ roundTripKey (undefined :: Day)
292− , testProperty "LocalTime" $ roundTripKey (undefined :: LocalTime)
293− , testProperty "TimeOfDay" $ roundTripKey (undefined :: TimeOfDay)
294− , testProperty "UTCTime" $ roundTripKey (undefined :: UTCTime)
295−#endif
296− , testProperty "Version" $ roundTripKey (undefined :: Version)
297− , testProperty "Lazy Text" $ roundTripKey (undefined :: LT.Text)
298− , testProperty "UUID" $ roundTripKey UUID.nil
299− ]
300 , testGroup "toFromJSON" [
26 , testGroup "toFromJSON" [
301 testProperty "Integer" (toFromJSON :: Integer -> Property)
27 testProperty "Integer" (toFromJSON :: Integer -> Property)
302 , testProperty "Double" (toFromJSON :: Double -> Property)
28 , testProperty "Double" (toFromJSON :: Double -> Property)
@@ -306,206 +32,9 @@ tests = testGroup "properties" [
306 ]
32 ]
307 , testGroup "failure messages" [
33 , testGroup "failure messages" [
308 testProperty "modify failure" modifyFailureProp
34 testProperty "modify failure" modifyFailureProp
35+ , testProperty "parserThrowError" parserThrowErrorProp
36+ , testProperty "parserCatchError" parserCatchErrorProp
309 ]
37 ]
310− , testGroup "generic" [
38+ , genericTests
311− testGroup "toJSON" [
39+ , templateHaskellTests
312− testGroup "Nullary" [
313− testProperty "string" (isString . gNullaryToJSONString)
314− , testProperty "2ElemArray" (is2ElemArray . gNullaryToJSON2ElemArray)
315− , testProperty "TaggedObject" (isNullaryTaggedObject . gNullaryToJSONTaggedObject)
316− , testProperty "ObjectWithSingleField" (isObjectWithSingleField . gNullaryToJSONObjectWithSingleField)
317− , testGroup "roundTrip" [
318− testProperty "string" (toParseJSON gNullaryParseJSONString gNullaryToJSONString)
319− , testProperty "2ElemArray" (toParseJSON gNullaryParseJSON2ElemArray gNullaryToJSON2ElemArray)
320− , testProperty "TaggedObject" (toParseJSON gNullaryParseJSONTaggedObject gNullaryToJSONTaggedObject)
321− , testProperty "ObjectWithSingleField" (toParseJSON gNullaryParseJSONObjectWithSingleField gNullaryToJSONObjectWithSingleField)
322− ]
323− ]
324− , testGroup "EitherTextInt" [
325− testProperty "UntaggedValue" (isUntaggedValueETI . gEitherTextIntToJSONUntaggedValue)
326− , testProperty "roundtrip" (toParseJSON gEitherTextIntParseJSONUntaggedValue gEitherTextIntToJSONUntaggedValue)
327− ]
328− , testGroup "SomeType" [
329− testProperty "2ElemArray" (is2ElemArray . gSomeTypeToJSON2ElemArray)
330− , testProperty "TaggedObject" (isTaggedObject . gSomeTypeToJSONTaggedObject)
331− , testProperty "ObjectWithSingleField" (isObjectWithSingleField . gSomeTypeToJSONObjectWithSingleField)
332− , testGroup "roundTrip" [
333− testProperty "2ElemArray" (toParseJSON gSomeTypeParseJSON2ElemArray gSomeTypeToJSON2ElemArray)
334− , testProperty "TaggedObject" (toParseJSON gSomeTypeParseJSONTaggedObject gSomeTypeToJSONTaggedObject)
335− , testProperty "ObjectWithSingleField" (toParseJSON gSomeTypeParseJSONObjectWithSingleField gSomeTypeToJSONObjectWithSingleField)
336−
337−#if __GLASGOW_HASKELL__ >= 706
338− , testProperty "2ElemArray unary" (toParseJSON1 gSomeTypeLiftParseJSON2ElemArray gSomeTypeLiftToJSON2ElemArray)
339− , testProperty "TaggedObject unary" (toParseJSON1 gSomeTypeLiftParseJSONTaggedObject gSomeTypeLiftToJSONTaggedObject)
340− , testProperty "ObjectWithSingleField unary" (toParseJSON1 gSomeTypeLiftParseJSONObjectWithSingleField gSomeTypeLiftToJSONObjectWithSingleField)
341−#endif
342− ]
343− ]
344− , testGroup "OneConstructor" [
345− testProperty "default" (isEmptyArray . gOneConstructorToJSONDefault)
346− , testProperty "Tagged" (isTaggedObject . gOneConstructorToJSONTagged)
347− , testGroup "roundTrip" [
348− testProperty "default" (toParseJSON gOneConstructorParseJSONDefault gOneConstructorToJSONDefault)
349− , testProperty "Tagged" (toParseJSON gOneConstructorParseJSONTagged gOneConstructorToJSONTagged)
350− ]
351− ]
352− ]
353− , testGroup "toEncoding" [
354− testProperty "NullaryString" $
355− gNullaryToJSONString `sameAs` gNullaryToEncodingString
356− , testProperty "Nullary2ElemArray" $
357− gNullaryToJSON2ElemArray `sameAs` gNullaryToEncoding2ElemArray
358− , testProperty "NullaryTaggedObject" $
359− gNullaryToJSONTaggedObject `sameAs` gNullaryToEncodingTaggedObject
360− , testProperty "NullaryObjectWithSingleField" $
361− gNullaryToJSONObjectWithSingleField `sameAs`
362− gNullaryToEncodingObjectWithSingleField
363− -- , testProperty "ApproxUnwrap" $
364− -- gApproxToJSONUnwrap `sameAs` gApproxToEncodingUnwrap
365− , testProperty "ApproxDefault" $
366− gApproxToJSONDefault `sameAs` gApproxToEncodingDefault
367−
368− , testProperty "EitherTextInt UntaggedValue" $
369− gEitherTextIntToJSONUntaggedValue `sameAs` gEitherTextIntToEncodingUntaggedValue
370−
371− , testProperty "SomeType2ElemArray" $
372− gSomeTypeToJSON2ElemArray `sameAs` gSomeTypeToEncoding2ElemArray
373−#if __GLASGOW_HASKELL__ >= 706
374− , testProperty "SomeType2ElemArray unary" $
375− gSomeTypeLiftToJSON2ElemArray `sameAs1` gSomeTypeLiftToEncoding2ElemArray
376− , testProperty "SomeType2ElemArray unary agree" $
377− gSomeTypeToEncoding2ElemArray `sameAs1Agree` gSomeTypeLiftToEncoding2ElemArray
378−#endif
379−
380− , testProperty "SomeTypeTaggedObject" $
381− gSomeTypeToJSONTaggedObject `sameAs` gSomeTypeToEncodingTaggedObject
382−#if __GLASGOW_HASKELL__ >= 706
383− , testProperty "SomeTypeTaggedObject unary" $
384− gSomeTypeLiftToJSONTaggedObject `sameAs1` gSomeTypeLiftToEncodingTaggedObject
385− , testProperty "SomeTypeTaggedObject unary agree" $
386− gSomeTypeToEncodingTaggedObject `sameAs1Agree` gSomeTypeLiftToEncodingTaggedObject
387−#endif
388−
389− , testProperty "SomeTypeObjectWithSingleField" $
390− gSomeTypeToJSONObjectWithSingleField `sameAs` gSomeTypeToEncodingObjectWithSingleField
391−#if __GLASGOW_HASKELL__ >= 706
392− , testProperty "SomeTypeObjectWithSingleField unary" $
393− gSomeTypeLiftToJSONObjectWithSingleField `sameAs1` gSomeTypeLiftToEncodingObjectWithSingleField
394− , testProperty "SomeTypeObjectWithSingleField unary agree" $
395− gSomeTypeToEncodingObjectWithSingleField `sameAs1Agree` gSomeTypeLiftToEncodingObjectWithSingleField
396−#endif
397−
398− , testProperty "SomeTypeOmitNothingFields" $
399− gSomeTypeToJSONOmitNothingFields `sameAs` gSomeTypeToEncodingOmitNothingFields
400−
401− , testProperty "OneConstructorDefault" $
402− gOneConstructorToJSONDefault `sameAs` gOneConstructorToEncodingDefault
403− , testProperty "OneConstructorTagged" $
404− gOneConstructorToJSONTagged `sameAs` gOneConstructorToEncodingTagged
405− ]
406− ]
407− , testGroup "template-haskell" [
408− testGroup "toJSON" [
409− testGroup "Nullary" [
410− testProperty "string" (isString . thNullaryToJSONString)
411− , testProperty "2ElemArray" (is2ElemArray . thNullaryToJSON2ElemArray)
412− , testProperty "TaggedObject" (isNullaryTaggedObject . thNullaryToJSONTaggedObject)
413− , testProperty "ObjectWithSingleField" (isObjectWithSingleField . thNullaryToJSONObjectWithSingleField)
414−
415− , testGroup "roundTrip" [
416− testProperty "string" (toParseJSON thNullaryParseJSONString thNullaryToJSONString)
417− , testProperty "2ElemArray" (toParseJSON thNullaryParseJSON2ElemArray thNullaryToJSON2ElemArray)
418− , testProperty "TaggedObject" (toParseJSON thNullaryParseJSONTaggedObject thNullaryToJSONTaggedObject)
419− , testProperty "ObjectWithSingleField" (toParseJSON thNullaryParseJSONObjectWithSingleField thNullaryToJSONObjectWithSingleField)
420− ]
421− ]
422− , testGroup "EitherTextInt" [
423− testProperty "UntaggedValue" (isUntaggedValueETI . thEitherTextIntToJSONUntaggedValue)
424− , testProperty "roundtrip" (toParseJSON thEitherTextIntParseJSONUntaggedValue thEitherTextIntToJSONUntaggedValue)
425− ]
426− , testGroup "SomeType" [
427− testProperty "2ElemArray" (is2ElemArray . thSomeTypeToJSON2ElemArray)
428− , testProperty "TaggedObject" (isTaggedObject . thSomeTypeToJSONTaggedObject)
429− , testProperty "ObjectWithSingleField" (isObjectWithSingleField . thSomeTypeToJSONObjectWithSingleField)
430− , testGroup "roundTrip" [
431− testProperty "2ElemArray" (toParseJSON thSomeTypeParseJSON2ElemArray thSomeTypeToJSON2ElemArray)
432− , testProperty "TaggedObject" (toParseJSON thSomeTypeParseJSONTaggedObject thSomeTypeToJSONTaggedObject)
433− , testProperty "ObjectWithSingleField" (toParseJSON thSomeTypeParseJSONObjectWithSingleField thSomeTypeToJSONObjectWithSingleField)
434−
435− , testProperty "2ElemArray unary" (toParseJSON1 thSomeTypeLiftParseJSON2ElemArray thSomeTypeLiftToJSON2ElemArray)
436− , testProperty "TaggedObject unary" (toParseJSON1 thSomeTypeLiftParseJSONTaggedObject thSomeTypeLiftToJSONTaggedObject)
437− , testProperty "ObjectWithSingleField unary" (toParseJSON1 thSomeTypeLiftParseJSONObjectWithSingleField thSomeTypeLiftToJSONObjectWithSingleField)
438−
439− ]
440− ]
441− , testGroup "Approx" [
442− testProperty "string" (isString . thApproxToJSONUnwrap)
443− , testProperty "ObjectWithSingleField" (isObjectWithSingleField . thApproxToJSONDefault)
444− , testGroup "roundTrip" [
445− testProperty "string" (toParseJSON thApproxParseJSONUnwrap thApproxToJSONUnwrap)
446− , testProperty "ObjectWithSingleField" (toParseJSON thApproxParseJSONDefault thApproxToJSONDefault)
447− ]
448− ]
449− , testGroup "GADT" [
450− testProperty "string" (isString . thGADTToJSONUnwrap)
451− , testProperty "ObjectWithSingleField" (isObjectWithSingleField . thGADTToJSONDefault)
452− , testGroup "roundTrip" [
453− testProperty "string" (toParseJSON thGADTParseJSONUnwrap thGADTToJSONUnwrap)
454− , testProperty "ObjectWithSingleField" (toParseJSON thGADTParseJSONDefault thGADTToJSONDefault)
455− ]
456− ]
457− , testGroup "OneConstructor" [
458− testProperty "default" (isEmptyArray . thOneConstructorToJSONDefault)
459− , testProperty "Tagged" (isTaggedObject . thOneConstructorToJSONTagged)
460− , testGroup "roundTrip" [
461− testProperty "default" (toParseJSON thOneConstructorParseJSONDefault thOneConstructorToJSONDefault)
462− , testProperty "Tagged" (toParseJSON thOneConstructorParseJSONTagged thOneConstructorToJSONTagged)
463− ]
464− ]
465− ]
466− , testGroup "toEncoding" [
467− testProperty "NullaryString" $
468− thNullaryToJSONString `sameAs` thNullaryToEncodingString
469− , testProperty "Nullary2ElemArray" $
470− thNullaryToJSON2ElemArray `sameAs` thNullaryToEncoding2ElemArray
471− , testProperty "NullaryTaggedObject" $
472− thNullaryToJSONTaggedObject `sameAs` thNullaryToEncodingTaggedObject
473− , testProperty "NullaryObjectWithSingleField" $
474− thNullaryToJSONObjectWithSingleField `sameAs`
475− thNullaryToEncodingObjectWithSingleField
476− , testProperty "ApproxUnwrap" $
477− thApproxToJSONUnwrap `sameAs` thApproxToEncodingUnwrap
478− , testProperty "ApproxDefault" $
479− thApproxToJSONDefault `sameAs` thApproxToEncodingDefault
480−
481− , testProperty "EitherTextInt UntaggedValue" $
482− thEitherTextIntToJSONUntaggedValue `sameAs` thEitherTextIntToEncodingUntaggedValue
483−
484− , testProperty "SomeType2ElemArray" $
485− thSomeTypeToJSON2ElemArray `sameAs` thSomeTypeToEncoding2ElemArray
486− , testProperty "SomeType2ElemArray unary" $
487− thSomeTypeLiftToJSON2ElemArray `sameAs1` thSomeTypeLiftToEncoding2ElemArray
488− , testProperty "SomeType2ElemArray unary agree" $
489− thSomeTypeToEncoding2ElemArray `sameAs1Agree` thSomeTypeLiftToEncoding2ElemArray
490−
491− , testProperty "SomeTypeTaggedObject" $
492− thSomeTypeToJSONTaggedObject `sameAs` thSomeTypeToEncodingTaggedObject
493− , testProperty "SomeTypeTaggedObject unary" $
494− thSomeTypeLiftToJSONTaggedObject `sameAs1` thSomeTypeLiftToEncodingTaggedObject
495− , testProperty "SomeTypeTaggedObject unary agree" $
496− thSomeTypeToEncodingTaggedObject `sameAs1Agree` thSomeTypeLiftToEncodingTaggedObject
497−
498− , testProperty "SomeTypeObjectWithSingleField" $
499− thSomeTypeToJSONObjectWithSingleField `sameAs` thSomeTypeToEncodingObjectWithSingleField
500− , testProperty "SomeTypeObjectWithSingleField unary" $
501− thSomeTypeLiftToJSONObjectWithSingleField `sameAs1` thSomeTypeLiftToEncodingObjectWithSingleField
502− , testProperty "SomeTypeObjectWithSingleField unary agree" $
503− thSomeTypeToEncodingObjectWithSingleField `sameAs1Agree` thSomeTypeLiftToEncodingObjectWithSingleField
504−
505− , testProperty "OneConstructorDefault" $
506− thOneConstructorToJSONDefault `sameAs` thOneConstructorToEncodingDefault
507− , testProperty "OneConstructorTagged" $
508− thOneConstructorToJSONTagged `sameAs` thOneConstructorToEncodingTagged
509− ]
510− ]
511 ]
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+181−132
@@ -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)
40+import Test.Tasty.HUnit (assertFailure, assertEqual, testCase)
39−import Test.HUnit (assertFailure, assertEqual)
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,132 +66,156 @@ 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)
71− , Example "Just" "1" (Just 1 :: Maybe Int)
72+ -- Maybe serialising is lossy
72− , Example "Proxy Int" "null" (Proxy :: Proxy Int)
73+ -- https://github.com/bos/aeson/issues/376
73− , Example "Tagged Char Int" "1" (Tagged 1 :: Tagged Char Int)
74+ , Example "Just Nothing" ["null"] (Just Nothing :: Maybe (Maybe Int)) Nothing
74−#if __GLASGOW_HASKELL__ >= 708
75+ , example "Just" "1" (Just 1 :: Maybe Int)
76+ , example "Proxy Int" "null" (Proxy :: Proxy Int)
77+ , example "Tagged Char Int" "1" (Tagged 1 :: Tagged Char Int)
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
80+ , example "Const Char Int" "\"c\"" (Const 'c' :: Const Char Int)
78− , Example "Const Char Int" "\"c\"" (Const 'c' :: Const Char Int)
81+ , example "Tuple" "[1,2]" ((1, 2) :: (Int, Int))
79− , Example "Tuple" "[1,2]" ((1, 2) :: (Int, Int))
82+ , example "NonEmpty" "[1,2,3]" (1 :| [2, 3] :: NonEmpty Int)
80− , Example "NonEmpty" "[1,2,3]" (1 :| [2, 3] :: NonEmpty Int)
83+ , example "Seq" "[1,2,3]" (Seq.fromList [1, 2, 3] :: Seq.Seq Int)
81− , Example "Seq" "[1,2,3]" (Seq.fromList [1, 2, 3] :: Seq.Seq Int)
84+ , example "DList" "[1,2,3]" (DList.fromList [1, 2, 3] :: DList.DList Int)
82− , Example "DList" "[1,2,3]" (DList.fromList [1, 2, 3] :: DList.DList Int)
85+ , example "()" "[]" ()
83− , Example "()" "[]" ()
86+
84−
87+ , ndExample "HashMap Int Int"
85− , Example "HashMap Int Int" "{\"0\":1,\"2\":3}" (HM.fromList [(0,1),(2,3)] :: HM.HashMap Int Int)
88+ [ "{\"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)
89+ (HM.fromList [(0,1),(2,3)] :: HM.HashMap Int Int)
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)
90+ , ndExample "Map Int Int"
88− , Example "Map [Int] Int" "[[[0],1],[[2],3]]" (M.fromList [([0],1),([2],3)] :: M.Map [Int] Int)
91+ [ "{\"0\":1,\"2\":3}", "{\"2\":3,\"0\":1}"]
89− , Example "Map [Char] Int" "{\"ab\":1,\"cd\":3}" (M.fromList [("ab",1),("cd",3)] :: M.Map String Int)
92+ (M.fromList [(0,1),(2,3)] :: M.Map Int Int)
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)
93+ , ndExample "Map (Tagged Int Int) Int"
91−
94+ [ "{\"0\":1,\"2\":3}", "{\"2\":3,\"0\":1}"]
92− , Example "nan :: Double" "null" (Approx $ 0/0 :: Approx Double)
95+ (M.fromList [(Tagged 0,1),(Tagged 2,3)] :: M.Map (Tagged Int Int) Int)
93−
96+ , example "Map [Int] Int"
94− , Example "Ordering LT" "\"LT\"" LT
97+ "[[[0],1],[[2],3]]"
95− , Example "Ordering EQ" "\"EQ\"" EQ
98+ (M.fromList [([0],1),([2],3)] :: M.Map [Int] Int)
96− , Example "Ordering GT" "\"GT\"" GT
99+ , ndExample "Map [Char] Int"
97−
100+ [ "{\"ab\":1,\"cd\":3}", "{\"cd\":3,\"ab\":1}" ]
98− , Example "Float" "3.14" (3.14 :: Float)
101+ (M.fromList [("ab",1),("cd",3)] :: M.Map String Int)
99− , Example "Pico" "3.14" (3.14 :: Pico)
102+ , ndExample "Map [I Char] Int"
100− , Example "Scientific" "3.14" (3.14 :: Scientific)
103+ [ "{\"ab\":1,\"cd\":3}", "{\"cd\":3,\"ab\":1}" ]
101−
104+ (M.fromList [(map pure "ab",1),(map pure "cd",3)] :: M.Map [I Char] Int)
102− , Example "UUID" "\"c2cc10e1-57d6-4b6f-9899-38d972112d8c\"" $ UUID.fromWords
105+
106+ , example "nan :: Double" "null" (Approx $ 0/0 :: Approx Double)
107+
108+ , example "Ordering LT" "\"LT\"" LT
109+ , example "Ordering EQ" "\"EQ\"" EQ
110+ , example "Ordering GT" "\"GT\"" GT
111+
112+ , example "Float" "3.14" (3.14 :: Float)
113+ , example "Pico" "3.14" (3.14 :: Pico)
114+ , example "Scientific" "3.14" (3.14 :: Scientific)
115+
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
193− , Example "inf :: Double" "null" (Approx $ 1/0 :: Approx Double)
217+ 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]
@@ -212,12 +237,27 @@ jsonDecodingExamples = [
212 ]
237 ]
213
238
214data Example where
239data Example where
215− Example
240+ Example
216− :: (Eq a, Show a, ToJSON a, FromJSON a)
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+
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
219− :: (Eq a, Show a, FromJSON a)
255+
220− => String -> L.ByteString -> Maybe a -> Example
256+-- | Non-deterministic example, input encodes to some of bytestrings.
257+ndExample :: (Eq a, Show a, ToJSON a, FromJSON a)
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)
236− assertEqual "decode" (Just val) (decode bs)
276+ for_ bss $ \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+276−39
@@ -1,55 +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
20import Control.Monad (forM, forM_)
26import Control.Monad (forM, forM_)
21−import Data.Aeson ((.=), (.:), (.:?), (.:!), FromJSON(..), FromJSONKeyFunction(..), FromJSONKey(..), ToJSON1(..), decode, eitherDecode, encode, fromJSON, genericParseJSON, 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)
25−import Data.Aeson.Types (Options(..), Result(Success), ToJSON(..), Value(Null), camelTo, camelTo2, defaultOptions, omitNothingFields, parse)
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
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)
39import System.Directory (getDirectoryContents)
54import System.Directory (getDirectoryContents)
40import System.FilePath ((</>), takeExtension, takeFileName)
55import System.FilePath ((</>), takeExtension, takeFileName)
41−import Test.Framework (Test, testGroup)
56+import Test.Tasty (TestTree, testGroup)
42−import Test.Framework.Providers.HUnit (testCase)
57+import Test.Tasty.HUnit (Assertion, assertBool, assertFailure, assertEqual, testCase, (@?=))
43−import Test.HUnit (Assertion, assertBool, assertFailure, assertEqual)
44import Text.Printf (printf)
58import Text.Printf (printf)
45import UnitTests.NullaryConstructors (nullaryConstructors)
59import UnitTests.NullaryConstructors (nullaryConstructors)
60+import qualified Data.ByteString as S
46import qualified Data.ByteString.Base16.Lazy as LBase16
61import qualified Data.ByteString.Base16.Lazy as LBase16
47import qualified Data.ByteString.Lazy.Char8 as L
62import qualified Data.ByteString.Lazy.Char8 as L
48import qualified Data.HashSet as HashSet
63import qualified Data.HashSet as HashSet
64+import qualified Data.HashMap.Lazy as HashMap
49import qualified Data.Text.Lazy as LT
65import qualified Data.Text.Lazy as LT
50import qualified Data.Text.Lazy.Builder as TLB
66import qualified Data.Text.Lazy.Builder as TLB
51import qualified Data.Text.Lazy.Encoding as LT
67import qualified Data.Text.Lazy.Encoding as LT
52import qualified Data.Text.Lazy.Encoding as TLE
68import qualified Data.Text.Lazy.Encoding as TLE
69+import qualified Data.Vector as Vector
53import qualified ErrorMessages
70import qualified ErrorMessages
54import qualified SerializationFormatSpec
71import qualified SerializationFormatSpec
55
72
@@ -57,7 +74,7 @@ import qualified SerializationFormatSpec
57import Data.Aeson.Parser.UnescapeFFI ()
74import Data.Aeson.Parser.UnescapeFFI ()
58import Data.Aeson.Parser.UnescapePure ()
75import Data.Aeson.Parser.UnescapePure ()
59
76
60−tests :: Test
77+tests :: TestTree
61tests = testGroup "unit" [
78tests = testGroup "unit" [
62 testGroup "SerializationFormatSpec" SerializationFormatSpec.tests
79 testGroup "SerializationFormatSpec" SerializationFormatSpec.tests
63 , testGroup "ErrorMessages" ErrorMessages.tests
80 , testGroup "ErrorMessages" ErrorMessages.tests
@@ -84,8 +101,8 @@ tests = testGroup "unit" [
84 testCase "example 1" formatErrorExample
101 testCase "example 1" formatErrorExample
85 ]
102 ]
86 , testGroup ".:, .:?, .:!" $ fmap (testCase "-") dotColonMark
103 , testGroup ".:, .:?, .:!" $ fmap (testCase "-") dotColonMark
87− , testGroup "JSONPath" $ fmap (testCase "-") jsonPath
88 , testGroup "Hashable laws" $ fmap (testCase "-") hashableLaws
104 , testGroup "Hashable laws" $ fmap (testCase "-") hashableLaws
105+ , testGroup "Object construction" $ fmap (testCase "-") objectConstruction
89 , testGroup "Issue #351" $ fmap (testCase "-") issue351
106 , testGroup "Issue #351" $ fmap (testCase "-") issue351
90 , testGroup "Nullary constructors" $ fmap (testCase "-") nullaryConstructors
107 , testGroup "Nullary constructors" $ fmap (testCase "-") nullaryConstructors
91 , testGroup "FromJSONKey" $ fmap (testCase "-") fromJSONKeyAssertions
108 , testGroup "FromJSONKey" $ fmap (testCase "-") fromJSONKeyAssertions
@@ -93,6 +110,22 @@ tests = testGroup "unit" [
93 , testCase "Unescape string (PR #477)" unescapeString
110 , testCase "Unescape string (PR #477)" unescapeString
94 , testCase "Show Options" showOptions
111 , testCase "Show Options" showOptions
95 , testGroup "SingleMaybeField" singleMaybeField
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+ ]
96 ]
129 ]
97
130
98roundTripCamel :: String -> Assertion
131roundTripCamel :: String -> Assertion
@@ -185,10 +218,18 @@ utcTimeGood = do
185 assertEqual "utctime" (parseWithRead "%F %H:%MZ" ts11) t11
218 assertEqual "utctime" (parseWithRead "%F %H:%MZ" ts11) t11
186 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
187
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+
188 where
229 where
189 parseWithRead :: String -> LT.Text -> UTCTime
230 parseWithRead :: String -> LT.Text -> UTCTime
190 parseWithRead f s =
231 parseWithRead f s =
191− fromMaybe (error "parseTime input malformed") . parseTime defaultTimeLocale f . LT.unpack $ s
232+ fromMaybe (error "parseTime input malformed") . parseTimeM True defaultTimeLocale f . LT.unpack $ s
192 parseWithAeson :: LT.Text -> Maybe UTCTime
233 parseWithAeson :: LT.Text -> Maybe UTCTime
193 parseWithAeson s = decode . LT.encodeUtf8 $ LT.concat ["\"", s, "\""]
234 parseWithAeson s = decode . LT.encodeUtf8 $ LT.concat ["\"", s, "\""]
194
235
@@ -204,6 +245,7 @@ utcTimeBad = do
204 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
205 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
206 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
207 where
249 where
208 verifyFailParse (s :: LT.Text) =
250 verifyFailParse (s :: LT.Text) =
209 let (dec :: Maybe UTCTime) = decode . LT.encodeUtf8 $ LT.concat ["\"", s, "\""] in
251 let (dec :: Maybe UTCTime) = decode . LT.encodeUtf8 $ LT.concat ["\"", s, "\""] in
@@ -216,6 +258,18 @@ formatErrorExample =
216 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"
217 in assertEqual "formatError example" lhs rhs
259 in assertEqual "formatError example" lhs rhs
218
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+
219------------------------------------------------------------------------------
273------------------------------------------------------------------------------
220-- Comparison (.:?) and (.:!)
274-- Comparison (.:?) and (.:!)
221------------------------------------------------------------------------------
275------------------------------------------------------------------------------
@@ -246,27 +300,6 @@ dotColonMark = [
246 ex2 = "{\"value\": 42 }"
300 ex2 = "{\"value\": 42 }"
247 ex3 = "{\"value\": null }"
301 ex3 = "{\"value\": null }"
248
302
249−------------------------------------------------------------------------------
250−-- These tests check that JSONPath is tracked correctly
251−-----------------------------------------------------------------------------
252−
253−jsonPath :: [Assertion]
254−jsonPath = [
255− -- issue #356
256− assertEqual "Either"
257− (Left "Error in $[1].Left[1]: expected Bool, encountered Number")
258− (eitherDecode "[1,{\"Left\":[2,3]}]"
259− :: Either String (Int, Either (Int, Bool) ()))
260− -- issue #358
261− , assertEqual "Seq a"
262− (Left "Error in $[2]: expected Int, encountered Boolean")
263− (eitherDecode "[0,1,true]" :: Either String (Seq Int))
264− , assertEqual "Wibble"
265− (Left "Error in $.wibbleInt: expected Int, encountered Boolean")
266− (eitherDecode "{\"wibbleString\":\"\",\"wibbleInt\":true}"
267− :: Either String Wibble)
268− ]
269−
270------------------------------------------------------------------------------
303------------------------------------------------------------------------------
271-- Check that the hashes of two equal Value are the same
304-- Check that the hashes of two equal Value are the same
272------------------------------------------------------------------------------
305------------------------------------------------------------------------------
@@ -279,6 +312,18 @@ hashableLaws = [
279 a = object ["223" .= False, "807882556" .= True]
312 a = object ["223" .= False, "807882556" .= True]
280 b = object ["807882556" .= True, "223" .= False]
313 b = object ["807882556" .= True, "223" .= False]
281
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+
282-------------------------------------------------------------------------------
327-------------------------------------------------------------------------------
283-- ToJSONKey
328-- ToJSONKey
284-------------------------------------------------------------------------------
329-------------------------------------------------------------------------------
@@ -339,13 +384,13 @@ issue351 = [
339-- Comparison between bytestring and text encoders
384-- Comparison between bytestring and text encoders
340------------------------------------------------------------------------------
385------------------------------------------------------------------------------
341
386
342−ioTests :: IO [Test]
387+ioTests :: IO [TestTree]
343ioTests = do
388ioTests = do
344 enc <- encoderComparisonTests
389 enc <- encoderComparisonTests
345 js <- jsonTestSuite
390 js <- jsonTestSuite
346 return [enc, js]
391 return [enc, js]
347
392
348−encoderComparisonTests :: IO Test
393+encoderComparisonTests :: IO TestTree
349encoderComparisonTests = do
394encoderComparisonTests = do
350 encoderTests <- forM testFiles $ \file0 -> do
395 encoderTests <- forM testFiles $ \file0 -> do
351 let file = "benchmarks/json-data/" ++ file0
396 let file = "benchmarks/json-data/" ++ file0
@@ -405,7 +450,7 @@ unescapeString = do
405
450
406-- JSONTestSuite
451-- JSONTestSuite
407
452
408−jsonTestSuiteTest :: FilePath -> Test
453+jsonTestSuiteTest :: FilePath -> TestTree
409jsonTestSuiteTest path = testCase fileName $ do
454jsonTestSuiteTest path = testCase fileName $ do
410 payload <- L.readFile path
455 payload <- L.readFile path
411 let result = eitherDecode payload :: Either String Value
456 let result = eitherDecode payload :: Either String Value
@@ -420,7 +465,7 @@ jsonTestSuiteTest path = testCase fileName $ do
420-- 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
421-- JSONTestSuite test directories.
466-- JSONTestSuite test directories.
422
467
423−jsonTestSuite :: IO Test
468+jsonTestSuite :: IO TestTree
424jsonTestSuite = do
469jsonTestSuite = do
425 let suitePath = "tests/JSONTestSuite"
470 let suitePath = "tests/JSONTestSuite"
426 let suites = ["test_parsing", "test_transform"]
471 let suites = ["test_parsing", "test_transform"]
@@ -495,13 +540,14 @@ showOptions =
495 ++ ", sumEncoding = TaggedObject {tagFieldName = \"tag\", contentsFieldName = \"contents\"}"
540 ++ ", sumEncoding = TaggedObject {tagFieldName = \"tag\", contentsFieldName = \"contents\"}"
496 ++ ", unwrapUnaryRecords = False"
541 ++ ", unwrapUnaryRecords = False"
497 ++ ", tagSingleConstructors = False"
542 ++ ", tagSingleConstructors = False"
543+ ++ ", rejectUnknownFields = False"
498 ++ "}")
544 ++ "}")
499 (show defaultOptions)
545 (show defaultOptions)
500
546
501newtype SingleMaybeField = SingleMaybeField { smf :: Maybe Int }
547newtype SingleMaybeField = SingleMaybeField { smf :: Maybe Int }
502 deriving (Eq, Show, Generic)
548 deriving (Eq, Show, Generic)
503
549
504−singleMaybeField :: [Test]
550+singleMaybeField :: [TestTree]
505singleMaybeField = do
551singleMaybeField = do
506 (gName, gToJSON, gToEncoding, gFromJSON) <-
552 (gName, gToJSON, gToEncoding, gFromJSON) <-
507 [ ("generic", genericToJSON opts, genericToEncoding opts, parse (genericParseJSON opts))
553 [ ("generic", genericToJSON opts, genericToEncoding opts, parse (genericParseJSON opts))
@@ -515,9 +561,200 @@ singleMaybeField = do
515 v = SingleMaybeField Nothing
561 v = SingleMaybeField Nothing
516 opts = defaultOptions{omitNothingFields=True,unwrapUnaryRecords=True}
562 opts = defaultOptions{omitNothingFields=True,unwrapUnaryRecords=True}
517
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+
518deriveJSON defaultOptions{omitNothingFields=True} ''MyRecord
750deriveJSON defaultOptions{omitNothingFields=True} ''MyRecord
519
751
520deriveToJSON defaultOptions ''Foo
752deriveToJSON defaultOptions ''Foo
521deriveToJSON1 defaultOptions ''Foo
753deriveToJSON1 defaultOptions ''Foo
522
754
523deriveJSON defaultOptions{omitNothingFields=True,unwrapUnaryRecords=True} ''SingleMaybeField
755deriveJSON 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 OverloadedStrings #-}
1+{-# LANGUAGE NoImplicitPrelude #-}
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+4−2
@@ -19,9 +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+ ;;
22 hlint)
26 hlint)
23− stack build --fast aeson --stack-yaml stack-lts8.yaml --system-ghc --no-terminal
24− stack install hlint --resolver lts-8 --system-ghc --no-terminal
25 make lint
27 make lint
26 ;;
28 ;;
27esac
29esac