on 83f2830 help sign in
.gitignore−6
since splitsnapshots
unifiedsplit
@@ -1,11 +1,8 @@
1dist
1dist
2dist-newstyle
2dist-newstyle
3−.ghc.environment.*
4.cabal-sandbox/
3.cabal-sandbox/
5cabal.sandbox.config
4cabal.sandbox.config
6.stack-work/
5.stack-work/
7−.stack-work-bench/
8−*.yaml.lock
9
6
10*.o
7*.o
11*.hi
8*.hi
@@ -14,9 +11,6 @@ cabal.sandbox.config
14.\#*
11.\#*
15\#*
12\#*
16
13
17−# Emacs backup files
18−*~
19−
20benchmarks/AesonEncode
14benchmarks/AesonEncode
21
15
22tests/qc
16tests/qc
.hlint.yamldeleted−11
@@ -1,11 +0,0 @@
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+21−42
@@ -12,58 +12,37 @@ 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
16
15
17before_cache:
16before_cache:
18 - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
17 - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
19− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*
18+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.tar
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
24
19
25matrix:
20matrix:
26 include:
21 include:
27−
28− - env: BUILD=hlint CABALVER=2.2 GHCVER=8.4.4
22+ - env: BUILD=hlint CABALVER=1.24 GHCVER=8.0.2
29− compiler: ": #GHC 8.4.4"
30− addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.4], sources: [hvr-ghc]}}
31−
32− - env: BUILD=stack CABALVER=2.4 GHCVER=8.6.5 STACK_YAML=stack-bench.yaml
33− compiler: ": #GHC 8.6.5"
34− addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.5], sources: [hvr-ghc]}}
35−
36− - env: BUILD=stack CABALVER=2.2 GHCVER=8.6.5 STACK_YAML=stack-ffi-unescape.yaml
37− compiler: ": #GHC 8.6.5"
38− addons: {apt: {packages: [cabal-install-2.2,ghc-8.6.5], sources: [hvr-ghc]}}
39−
40− - env: BUILD=cabal2 CABALVER=3.0 GHCVER=8.8.1
41− compiler: ": #GHC 8.8.1"
42− addons: {apt: {packages: [cabal-install-3.0,ghc-8.8.1], sources: [hvr-ghc]}}
43−
44− - env: BUILD=cabal CABALVER=2.4 GHCVER=8.6.5
45− compiler: ": #GHC 8.6.5"
46− addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.5], sources: [hvr-ghc]}}
47−
48− - env: BUILD=cabal CABALVER=2.2 GHCVER=8.4.4
49− compiler: ": #GHC 8.4.4"
50− addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.4], sources: [hvr-ghc]}}
51−
52− - env: BUILD=cabal CABALVER=2.0 GHCVER=8.2.2
53− compiler: ": #GHC 8.2.2"
54− addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}
55−
56− - env: BUILD=cabal CABALVER=2.0 GHCVER=8.0.2
57 compiler: ": #GHC 8.0.2"
23 compiler: ": #GHC 8.0.2"
58− addons: {apt: {packages: [cabal-install-2.0,ghc-8.0.2], sources: [hvr-ghc]}}
24+ addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
59−
25+ - env: BUILD=stack CABALVER=1.24 GHCVER=8.0.2 STACK_YAML=stack-bench.yaml
26+ compiler: ": #GHC 8.0.2"
27+ addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
28+ - env: BUILD=stack CABALVER=1.24 GHCVER=8.0.2 STACK_YAML=stack-pure-unescape.yaml
29+ compiler: ": #GHC 8.0.2"
30+ addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
31+ - env: BUILD=cabal CABALVER=1.24 GHCVER=8.0.2
32+ compiler: ": #GHC 8.0.2"
33+ addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
34+ - env: BUILD=cabal CABALVER=1.18 GHCVER=7.4.2
35+ compiler: ": #GHC 7.4.2"
36+ addons: {apt: {packages: [cabal-install-1.18,ghc-7.4.2], sources: [hvr-ghc]}}
60− - env: BUILD=cabal CABALVER=1.22 GHCVER=7.10.3
37+ - env: BUILD=cabal CABALVER=1.18 GHCVER=7.6.3
61− compiler: ": #GHC 7.10.3"
38+ compiler: ": #GHC 7.6.3"
62− addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
39+ addons: {apt: {packages: [cabal-install-1.18,ghc-7.6.3], sources: [hvr-ghc]}}
63−
64 - env: BUILD=cabal CABALVER=1.18 GHCVER=7.8.4
40 - env: BUILD=cabal CABALVER=1.18 GHCVER=7.8.4
65 compiler: ": #GHC 7.8.4"
41 compiler: ": #GHC 7.8.4"
66 addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
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
44+ compiler: ": #GHC 7.10.3"
45+ addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
67
46
68before_install:
47before_install:
69 - unset CC
48 - unset CC
CONTRIBUTING.md+1−39
@@ -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,41 +58,3 @@ 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+7−79
@@ -1,4 +1,3 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
2-- |
1-- |
3-- Module: Data.Aeson
2-- Module: Data.Aeson
4-- Copyright: (c) 2011-2016 Bryan O'Sullivan
3-- Copyright: (c) 2011-2016 Bryan O'Sullivan
@@ -39,16 +38,11 @@ module Data.Aeson
39 , eitherDecode
38 , eitherDecode
40 , eitherDecode'
39 , eitherDecode'
41 , encode
40 , encode
42− , encodeFile
43 -- ** Variants for strict bytestrings
41 -- ** Variants for strict bytestrings
44 , decodeStrict
42 , decodeStrict
45− , decodeFileStrict
46 , decodeStrict'
43 , decodeStrict'
47− , decodeFileStrict'
48 , eitherDecodeStrict
44 , eitherDecodeStrict
49− , eitherDecodeFileStrict
50 , eitherDecodeStrict'
45 , eitherDecodeStrict'
51− , eitherDecodeFileStrict'
52 -- * Core JSON types
46 -- * Core JSON types
53 , Value(..)
47 , Value(..)
54 , Encoding
48 , Encoding
@@ -63,18 +57,11 @@ module Data.Aeson
63 , fromJSON
57 , fromJSON
64 , ToJSON(..)
58 , ToJSON(..)
65 , KeyValue(..)
59 , KeyValue(..)
66− , (<?>)
67− , JSONPath
68 -- ** Keys for maps
60 -- ** Keys for maps
69 , ToJSONKey(..)
61 , ToJSONKey(..)
70 , ToJSONKeyFunction(..)
62 , ToJSONKeyFunction(..)
71 , FromJSONKey(..)
63 , FromJSONKey(..)
72 , FromJSONKeyFunction(..)
64 , FromJSONKeyFunction(..)
73− -- *** Generic keys
74− , GToJSONKey()
75− , genericToJSONKey
76− , GFromJSONKey()
77− , genericFromJSONKey
78 -- ** Liftings to unary and binary type constructors
65 -- ** Liftings to unary and binary type constructors
79 , FromJSON1(..)
66 , FromJSON1(..)
80 , parseJSON1
67 , parseJSON1
@@ -89,8 +76,8 @@ module Data.Aeson
89 -- ** Generic JSON classes and options
76 -- ** Generic JSON classes and options
90 , GFromJSON(..)
77 , GFromJSON(..)
91 , FromArgs(..)
78 , FromArgs(..)
92− , GToJSON
79+ , GToJSON(..)
93− , GToEncoding
80+ , GToEncoding(..)
94 , ToArgs(..)
81 , ToArgs(..)
95 , Zero
82 , Zero
96 , One
83 , One
@@ -100,34 +87,15 @@ module Data.Aeson
100 , genericLiftToEncoding
87 , genericLiftToEncoding
101 , genericParseJSON
88 , genericParseJSON
102 , genericLiftParseJSON
89 , genericLiftParseJSON
103− -- ** Generic and TH encoding configuration
104− , Options
105 , defaultOptions
90 , 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
123
91
124 -- * Inspecting @'Value's@
92 -- * Inspecting @'Value's@
125 , withObject
93 , withObject
126 , withText
94 , withText
127 , withArray
95 , withArray
96+ , withNumber
128 , withScientific
97 , withScientific
129 , withBool
98 , withBool
130− , withEmbeddedJSON
131 -- * Constructors and accessors
99 -- * Constructors and accessors
132 , Series
100 , Series
133 , pairs
101 , pairs
@@ -140,16 +108,16 @@ module Data.Aeson
140 -- * Parsing
108 -- * Parsing
141 , json
109 , json
142 , json'
110 , json'
143− , parseIndexedJSON
144 ) where
111 ) where
145
112
113+import Prelude ()
146import Prelude.Compat
114import Prelude.Compat
147
115
148−import Data.Aeson.Types.FromJSON (ifromJSON, parseIndexedJSON)
116+import Data.Aeson.Types.FromJSON (ifromJSON)
149import Data.Aeson.Encoding (encodingToLazyByteString)
117import Data.Aeson.Encoding (encodingToLazyByteString)
150import Data.Aeson.Parser.Internal (decodeWith, decodeStrictWith, eitherDecodeWith, eitherDecodeStrictWith, jsonEOF, json, jsonEOF', json')
118import Data.Aeson.Parser.Internal (decodeWith, decodeStrictWith, eitherDecodeWith, eitherDecodeStrictWith, jsonEOF, json, jsonEOF', json')
151import Data.Aeson.Types
119import Data.Aeson.Types
152−import Data.Aeson.Types.Internal (JSONPath, formatError, (<?>))
120+import Data.Aeson.Types.Internal (JSONPath, formatError)
153import qualified Data.ByteString as B
121import qualified Data.ByteString as B
154import qualified Data.ByteString.Lazy as L
122import qualified Data.ByteString.Lazy as L
155
123
@@ -159,10 +127,6 @@ import qualified Data.ByteString.Lazy as L
159encode :: (ToJSON a) => a -> L.ByteString
127encode :: (ToJSON a) => a -> L.ByteString
160encode = encodingToLazyByteString . toEncoding
128encode = encodingToLazyByteString . toEncoding
161
129
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−
166-- | Efficiently deserialize a JSON value from a lazy 'L.ByteString'.
130-- | Efficiently deserialize a JSON value from a lazy 'L.ByteString'.
167-- If this fails due to incomplete or invalid input, 'Nothing' is
131-- If this fails due to incomplete or invalid input, 'Nothing' is
168-- returned.
132-- returned.
@@ -189,18 +153,6 @@ decodeStrict :: (FromJSON a) => B.ByteString -> Maybe a
189decodeStrict = decodeStrictWith jsonEOF fromJSON
153decodeStrict = decodeStrictWith jsonEOF fromJSON
190{-# INLINE decodeStrict #-}
154{-# INLINE decodeStrict #-}
191
155
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−
204-- | Efficiently deserialize a JSON value from a lazy 'L.ByteString'.
156-- | Efficiently deserialize a JSON value from a lazy 'L.ByteString'.
205-- If this fails due to incomplete or invalid input, 'Nothing' is
157-- If this fails due to incomplete or invalid input, 'Nothing' is
206-- returned.
158-- returned.
@@ -227,18 +179,6 @@ decodeStrict' :: (FromJSON a) => B.ByteString -> Maybe a
227decodeStrict' = decodeStrictWith jsonEOF' fromJSON
179decodeStrict' = decodeStrictWith jsonEOF' fromJSON
228{-# INLINE decodeStrict' #-}
180{-# INLINE decodeStrict' #-}
229
181
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−
242eitherFormatError :: Either (JSONPath, String) a -> Either String a
182eitherFormatError :: Either (JSONPath, String) a -> Either String a
243eitherFormatError = either (Left . uncurry formatError) Right
183eitherFormatError = either (Left . uncurry formatError) Right
244{-# INLINE eitherFormatError #-}
184{-# INLINE eitherFormatError #-}
@@ -254,12 +194,6 @@ eitherDecodeStrict =
254 eitherFormatError . eitherDecodeStrictWith jsonEOF ifromJSON
194 eitherFormatError . eitherDecodeStrictWith jsonEOF ifromJSON
255{-# INLINE eitherDecodeStrict #-}
195{-# INLINE eitherDecodeStrict #-}
256
196
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−
263-- | Like 'decode'' but returns an error message when decoding fails.
197-- | Like 'decode'' but returns an error message when decoding fails.
264eitherDecode' :: (FromJSON a) => L.ByteString -> Either String a
198eitherDecode' :: (FromJSON a) => L.ByteString -> Either String a
265eitherDecode' = eitherFormatError . eitherDecodeWith jsonEOF' ifromJSON
199eitherDecode' = eitherFormatError . eitherDecodeWith jsonEOF' ifromJSON
@@ -271,12 +205,6 @@ eitherDecodeStrict' =
271 eitherFormatError . eitherDecodeStrictWith jsonEOF' ifromJSON
205 eitherFormatError . eitherDecodeStrictWith jsonEOF' ifromJSON
272{-# INLINE eitherDecodeStrict' #-}
206{-# INLINE eitherDecodeStrict' #-}
273
207
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−
280-- $use
208-- $use
281--
209--
282-- This section contains basic information on the different ways to
210-- This section contains basic information on the different ways to
@@ -438,7 +366,7 @@ eitherDecodeFileStrict' =
438-- The 'Object' type contains JSON objects:
366-- The 'Object' type contains JSON objects:
439--
367--
440-- > λ> decode "{\"name\":\"Dave\",\"age\":2}" :: Maybe Object
368-- > λ> decode "{\"name\":\"Dave\",\"age\":2}" :: Maybe Object
441−-- > Just (fromList [("name",String "Dave"),("age",Number 2)])
369+-- > Just (fromList) [("name",String "Dave"),("age",Number 2)]
442--
370--
443-- You can extract values from it with a parser using 'parse',
371-- You can extract values from it with a parser using 'parse',
444-- 'parseEither' or, in this example, 'parseMaybe':
372-- 'parseEither' or, in this example, 'parseMaybe':
Data/Aeson/Encode.hs+1−2
@@ -1,4 +1,3 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
2-- |
1-- |
3-- Module: Data.Aeson.Encode
2-- Module: Data.Aeson.Encode
4-- Copyright: (c) 2012-2016 Bryan O'Sullivan
3-- Copyright: (c) 2012-2016 Bryan O'Sullivan
@@ -9,13 +8,13 @@
9-- Portability: portable
8-- Portability: portable
10--
9--
11-- This module is left to supply limited backwards-compatibility.
10-- This module is left to supply limited backwards-compatibility.
12−
13module Data.Aeson.Encode {-# DEPRECATED "Use Data.Aeson or Data.Aeson.Text instead" #-}
11module Data.Aeson.Encode {-# DEPRECATED "Use Data.Aeson or Data.Aeson.Text instead" #-}
14 (
12 (
15 encode
13 encode
16 , encodeToTextBuilder
14 , encodeToTextBuilder
17 ) where
15 ) where
18
16
17+import Prelude ()
19
18
20import Data.ByteString.Lazy (ByteString)
19import Data.ByteString.Lazy (ByteString)
21import Data.Text.Lazy.Builder (Builder)
20import Data.Text.Lazy.Builder (Builder)
Data/Aeson/Encoding.hs+1−3
@@ -1,10 +1,8 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
2-- |
1-- |
3--
2--
4-- Functions in this module return well-formed 'Encoding''.
3-- Functions in this module return well-formed 'Encoding''.
5-- Polymorphic variants, which return @'Encoding' a@, return a textual JSON
4-- Polymorphic variants, which return @'Encoding' a@, return a textual JSON
6-- value, so it can be used as both @'Encoding'' 'Text'@ and @'Encoding' = 'Encoding'' 'Value'@.
5-- value, so it can be used as both @'Encoding'' 'Text'@ and @'Encoding' = 'Encoding'' 'Value'@.
7−
8module Data.Aeson.Encoding
6module Data.Aeson.Encoding
9 (
7 (
10 -- * Encoding
8 -- * Encoding
@@ -16,7 +14,6 @@ module Data.Aeson.Encoding
16 , Series
14 , Series
17 , pairs
15 , pairs
18 , pair
16 , pair
19− , pairStr
20 , pair'
17 , pair'
21 -- * Predicates
18 -- * Predicates
22 , nullEncoding
19 , nullEncoding
@@ -51,5 +48,6 @@ module Data.Aeson.Encoding
51 , value
48 , value
52 ) where
49 ) where
53
50
51+import Prelude ()
54
52
55import Data.Aeson.Encoding.Internal
53import Data.Aeson.Encoding.Internal
Data/Aeson/Encoding/Builder.hs+80−6
@@ -1,6 +1,7 @@
1{-# LANGUAGE BangPatterns #-}
1{-# LANGUAGE BangPatterns #-}
2−{-# LANGUAGE NoImplicitPrelude #-}
2+{-# LANGUAGE CPP #-}
3−{-# LANGUAGE TupleSections #-}
3+{-# LANGUAGE OverloadedStrings #-}
4+
4-- |
5-- |
5-- Module: Data.Aeson.Encoding.Builder
6-- Module: Data.Aeson.Encoding.Builder
6-- Copyright: (c) 2011 MailRank, Inc.
7-- Copyright: (c) 2011 MailRank, Inc.
@@ -36,6 +37,7 @@ module Data.Aeson.Encoding.Builder
36 , ascii5
37 , ascii5
37 ) where
38 ) where
38
39
40+import Prelude ()
39import Prelude.Compat
41import Prelude.Compat
40
42
41import Data.Aeson.Internal.Time
43import Data.Aeson.Internal.Time
@@ -44,9 +46,8 @@ import Data.ByteString.Builder as B
44import Data.ByteString.Builder.Prim as BP
46import Data.ByteString.Builder.Prim as BP
45import Data.ByteString.Builder.Scientific (scientificBuilder)
47import Data.ByteString.Builder.Scientific (scientificBuilder)
46import Data.Char (chr, ord)
48import Data.Char (chr, ord)
47−import Data.Semigroup ((<>))
49+import Data.Monoid ((<>))
48import Data.Scientific (Scientific, base10Exponent, coefficient)
50import Data.Scientific (Scientific, base10Exponent, coefficient)
49−import Data.Text.Encoding (encodeUtf8BuilderEscaped)
50import Data.Time (UTCTime(..))
51import Data.Time (UTCTime(..))
51import Data.Time.Calendar (Day(..), toGregorian)
52import Data.Time.Calendar (Day(..), toGregorian)
52import Data.Time.LocalTime
53import Data.Time.LocalTime
@@ -55,6 +56,20 @@ import qualified Data.HashMap.Strict as HMS
55import qualified Data.Text as T
56import qualified Data.Text as T
56import qualified Data.Vector as V
57import qualified Data.Vector as V
57
58
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+
58-- | Encode a JSON value to a "Data.ByteString" 'B.Builder'.
73-- | Encode a JSON value to a "Data.ByteString" 'B.Builder'.
59--
74--
60-- Use this function if you are encoding over the wire, or need to
75-- Use this function if you are encoding over the wire, or need to
@@ -133,7 +148,7 @@ c2w c = fromIntegral (ord c)
133-- | Encode a JSON number.
148-- | Encode a JSON number.
134scientific :: Scientific -> Builder
149scientific :: Scientific -> Builder
135scientific s
150scientific s
136− | e < 0 || e > 1024 = scientificBuilder s
151+ | e < 0 = scientificBuilder s
137 | otherwise = B.integerDec (coefficient s * 10 ^ e)
152 | otherwise = B.integerDec (coefficient s * 10 ^ e)
138 where
153 where
139 e = base10Exponent s
154 e = base10Exponent s
@@ -201,7 +216,7 @@ timeOfDay64 (TOD h m s)
201 !(T mh ml) = twoDigits m
216 !(T mh ml) = twoDigits m
202 !(T sh sl) = twoDigits (fromIntegral real)
217 !(T sh sl) = twoDigits (fromIntegral real)
203 (real,frac) = s `quotRem` pico
218 (real,frac) = s `quotRem` pico
204− showFrac = ('.',) >$< (BP.liftFixedToBounded BP.char7 >*< trunc12)
219+ showFrac = (\x -> ('.', x)) >$< (BP.liftFixedToBounded BP.char7 >*< trunc12)
205 trunc12 = (`quotRem` micro) >$<
220 trunc12 = (`quotRem` micro) >$<
206 BP.condB (\(_,y) -> y == 0) (fst >$< trunc6) (digits6 >*< trunc6)
221 BP.condB (\(_,y) -> y == 0) (fst >$< trunc6) (digits6 >*< trunc6)
207 digits6 = ((`quotRem` milli) . fromIntegral) >$< (digits3 >*< digits3)
222 digits6 = ((`quotRem` milli) . fromIntegral) >$< (digits3 >*< digits3)
@@ -254,3 +269,62 @@ twoDigits a = T (digit hi) (digit lo)
254
269
255digit :: Int -> Char
270digit :: Int -> Char
256digit x = chr (x + 48)
271digit 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+2−9
@@ -1,9 +1,7 @@
1{-# LANGUAGE DeriveDataTypeable #-}
1{-# LANGUAGE DeriveDataTypeable #-}
2{-# LANGUAGE EmptyDataDecls #-}
2{-# LANGUAGE EmptyDataDecls #-}
3−{-# LANGUAGE NoImplicitPrelude #-}
4{-# LANGUAGE OverloadedStrings #-}
3{-# LANGUAGE OverloadedStrings #-}
5{-# LANGUAGE RankNTypes #-}
4{-# LANGUAGE RankNTypes #-}
6−
7module Data.Aeson.Encoding.Internal
5module Data.Aeson.Encoding.Internal
8 (
6 (
9 -- * Encoding
7 -- * Encoding
@@ -15,7 +13,6 @@ module Data.Aeson.Encoding.Internal
15 , Series (..)
13 , Series (..)
16 , pairs
14 , pairs
17 , pair
15 , pair
18− , pairStr
19 , pair'
16 , pair'
20 -- * Predicates
17 -- * Predicates
21 , nullEncoding
18 , nullEncoding
@@ -57,6 +54,7 @@ module Data.Aeson.Encoding.Internal
57 , comma, colon, openBracket, closeBracket, openCurly, closeCurly
54 , comma, colon, openBracket, closeBracket, openCurly, closeCurly
58 ) where
55 ) where
59
56
57+import Prelude ()
60import Prelude.Compat
58import Prelude.Compat
61
59
62import Data.Aeson.Types.Internal (Value)
60import Data.Aeson.Types.Internal (Value)
@@ -82,7 +80,7 @@ newtype Encoding' tag = Encoding {
82 -- ^ Acquire the underlying bytestring builder.
80 -- ^ Acquire the underlying bytestring builder.
83 } deriving (Typeable)
81 } deriving (Typeable)
84
82
85−-- | Often used synonym for 'Encoding''.
83+-- | Often used synonnym for 'Encoding''.
86type Encoding = Encoding' Value
84type Encoding = Encoding' Value
87
85
88-- | Make Encoding from Builder.
86-- | Make Encoding from Builder.
@@ -126,11 +124,6 @@ data Series = Empty
126
124
127pair :: Text -> Encoding -> Series
125pair :: Text -> Encoding -> Series
128pair name val = pair' (text name) val
126pair name val = pair' (text name) val
129−{-# INLINE pair #-}
130−
131−pairStr :: String -> Encoding -> Series
132−pairStr name val = pair' (string name) val
133−{-# INLINE pairStr #-}
134
127
135pair' :: Encoding' Text -> Encoding -> Series
128pair' :: Encoding' Text -> Encoding -> Series
136pair' name val = Value $ retagEncoding $ retagEncoding name >< colon >< val
129pair' name val = Value $ retagEncoding $ retagEncoding name >< colon >< val
Data/Aeson/Internal.hs+1−1
@@ -1,4 +1,3 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
2-- |
1-- |
3-- Module: Data.Aeson.Internal
2-- Module: Data.Aeson.Internal
4-- Copyright: (c) 2015-2016 Bryan O'Sullivan
3-- Copyright: (c) 2015-2016 Bryan O'Sullivan
@@ -23,6 +22,7 @@ module Data.Aeson.Internal
23 , iparse
22 , iparse
24 ) where
23 ) where
25
24
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,4 +1,3 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
2-- |
1-- |
3-- Module: Data.Aeson.Functions
2-- Module: Data.Aeson.Functions
4-- Copyright: (c) 2011-2016 Bryan O'Sullivan
3-- Copyright: (c) 2011-2016 Bryan O'Sullivan
@@ -15,6 +14,7 @@ module Data.Aeson.Internal.Functions
15 , mapKey
14 , mapKey
16 ) where
15 ) where
17
16
17+import Prelude ()
18import Prelude.Compat
18import Prelude.Compat
19
19
20import Data.Hashable (Hashable)
20import Data.Hashable (Hashable)
Data/Aeson/Internal/Time.hs+42−1
@@ -17,4 +17,45 @@ module Data.Aeson.Internal.Time
17 , toTimeOfDay64
17 , toTimeOfDay64
18 ) where
18 ) where
19
19
20−import Data.Attoparsec.Time.Internal
20+import Prelude ()
21+import Prelude.Compat
22+
23+import Data.Int (Int64)
24+import Data.Time
25+import Unsafe.Coerce (unsafeCoerce)
26+
27+#if MIN_VERSION_base(4,7,0)
28+
29+import Data.Fixed (Pico, Fixed(MkFixed))
30+
31+toPico :: Integer -> Pico
32+toPico = MkFixed
33+
34+fromPico :: Pico -> Integer
35+fromPico (MkFixed i) = i
36+
37+#else
38+
39+import Data.Fixed (Pico)
40+
41+toPico :: Integer -> Pico
42+toPico = unsafeCoerce
43+
44+fromPico :: Pico -> Integer
45+fromPico = unsafeCoerce
46+
47+#endif
48+
49+-- | Like TimeOfDay, but using a fixed-width integer for seconds.
50+data TimeOfDay64 = TOD {-# UNPACK #-} !Int
51+ {-# UNPACK #-} !Int
52+ {-# UNPACK #-} !Int64
53+
54+diffTimeOfDay64 :: DiffTime -> TimeOfDay64
55+diffTimeOfDay64 t = TOD (fromIntegral h) (fromIntegral m) s
56+ where (h,mp) = fromIntegral pico `quotRem` 3600000000000000
57+ (m,s) = mp `quotRem` 60000000000000
58+ pico = unsafeCoerce t :: Integer
59+
60+toTimeOfDay64 :: TimeOfDay -> TimeOfDay64
61+toTimeOfDay64 (TimeOfDay h m s) = TOD h m (fromIntegral (fromPico s))
Data/Aeson/Parser.hs+4−13
@@ -1,4 +1,5 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
1+{-# LANGUAGE OverloadedStrings #-}
2+
2-- |
3-- |
3-- Module: Data.Aeson.Parser
4-- Module: Data.Aeson.Parser
4-- Copyright: (c) 2012-2016 Bryan O'Sullivan
5-- Copyright: (c) 2012-2016 Bryan O'Sullivan
@@ -34,21 +35,10 @@ module Data.Aeson.Parser
34 json
35 json
35 , value
36 , value
36 , jstring
37 , jstring
37− , scientific
38− -- ** Handling objects with duplicate keys
39− , jsonWith
40− , jsonLast
41− , jsonAccum
42− , jsonNoDup
43 -- * Strict parsers
38 -- * Strict parsers
44 -- $strict
39 -- $strict
45 , json'
40 , json'
46 , value'
41 , value'
47− -- ** Handling objects with duplicate keys
48− , jsonWith'
49− , jsonLast'
50− , jsonAccum'
51− , jsonNoDup'
52 -- * Decoding without FromJSON instances
42 -- * Decoding without FromJSON instances
53 , decodeWith
43 , decodeWith
54 , decodeStrictWith
44 , decodeStrictWith
@@ -56,8 +46,9 @@ module Data.Aeson.Parser
56 , eitherDecodeStrictWith
46 , eitherDecodeStrictWith
57 ) where
47 ) where
58
48
49+import Prelude ()
59
50
60−import Data.Aeson.Parser.Internal
51+import Data.Aeson.Parser.Internal (decodeStrictWith, decodeWith, eitherDecodeStrictWith, eitherDecodeWith, json, json', jstring, value, value')
61
52
62-- $lazy
53-- $lazy
63--
54--
Data/Aeson/Parser/Internal.hs+65−253
@@ -1,14 +1,10 @@
1{-# LANGUAGE BangPatterns #-}
1{-# LANGUAGE BangPatterns #-}
2{-# LANGUAGE CPP #-}
2{-# LANGUAGE CPP #-}
3−{-# LANGUAGE NoImplicitPrelude #-}
4{-# LANGUAGE OverloadedStrings #-}
3{-# LANGUAGE OverloadedStrings #-}
5#if MIN_VERSION_ghc_prim(0,3,1)
4#if MIN_VERSION_ghc_prim(0,3,1)
6{-# LANGUAGE MagicHash #-}
5{-# LANGUAGE MagicHash #-}
7#endif
6#endif
8−#if __GLASGOW_HASKELL__ <= 710 && __GLASGOW_HASKELL__ >= 706
7+
9−-- Work around a compiler bug
10−{-# OPTIONS_GHC -fsimpl-tick-factor=200 #-}
11−#endif
12-- |
8-- |
13-- Module: Data.Aeson.Parser.Internal
9-- Module: Data.Aeson.Parser.Internal
14-- Copyright: (c) 2011-2016 Bryan O'Sullivan
10-- Copyright: (c) 2011-2016 Bryan O'Sullivan
@@ -25,43 +21,28 @@ module Data.Aeson.Parser.Internal
25 (
21 (
26 -- * Lazy parsers
22 -- * Lazy parsers
27 json, jsonEOF
23 json, jsonEOF
28− , jsonWith
29− , jsonLast
30− , jsonAccum
31− , jsonNoDup
32 , value
24 , value
33 , jstring
25 , jstring
34− , jstring_
35− , scientific
36 -- * Strict parsers
26 -- * Strict parsers
37 , json', jsonEOF'
27 , json', jsonEOF'
38− , jsonWith'
39− , jsonLast'
40− , jsonAccum'
41− , jsonNoDup'
42 , value'
28 , value'
43 -- * Helpers
29 -- * Helpers
44 , decodeWith
30 , decodeWith
45 , decodeStrictWith
31 , decodeStrictWith
46 , eitherDecodeWith
32 , eitherDecodeWith
47 , eitherDecodeStrictWith
33 , eitherDecodeStrictWith
48− -- ** Handling objects with duplicate keys
49− , fromListAccum
50− , parseListNoDup
51 ) where
34 ) where
52
35
36+import Prelude ()
53import Prelude.Compat
37import Prelude.Compat
54
38
55import Control.Applicative ((<|>))
39import Control.Applicative ((<|>))
56import Control.Monad (void, when)
40import Control.Monad (void, when)
57−import Data.Aeson.Types.Internal (IResult(..), JSONPath, Object, Result(..), Value(..))
41+import Data.Aeson.Types.Internal (IResult(..), JSONPath, Result(..), Value(..))
58import Data.Attoparsec.ByteString.Char8 (Parser, char, decimal, endOfInput, isDigit_w8, signed, string)
42import Data.Attoparsec.ByteString.Char8 (Parser, char, decimal, endOfInput, isDigit_w8, signed, string)
59−import Data.Function (fix)
60−import Data.Functor.Compat (($>))
61import Data.Scientific (Scientific)
43import Data.Scientific (Scientific)
62import Data.Text (Text)
44import Data.Text (Text)
63−import Data.Vector (Vector)
64−import qualified Data.Vector as Vector (empty, fromList, fromListN, reverse)
45+import Data.Vector as Vector (Vector, empty, fromListN, reverse)
65import qualified Data.Attoparsec.ByteString as A
46import qualified Data.Attoparsec.ByteString as A
66import qualified Data.Attoparsec.Lazy as L
47import qualified Data.Attoparsec.Lazy as L
67import qualified Data.ByteString as B
48import qualified Data.ByteString as B
@@ -72,9 +53,8 @@ import qualified Data.Scientific as Sci
72import Data.Aeson.Parser.Unescape (unescapeText)
53import Data.Aeson.Parser.Unescape (unescapeText)
73
54
74#if MIN_VERSION_ghc_prim(0,3,1)
55#if MIN_VERSION_ghc_prim(0,3,1)
75−import GHC.Base (Int#, (==#), isTrue#, word2Int#, orI#, andI#)
56+import GHC.Base (Int#, (==#), isTrue#, word2Int#)
76import GHC.Word (Word8(W8#))
57import GHC.Word (Word8(W8#))
77−import qualified Data.Text.Encoding as TE
78#endif
58#endif
79
59
80#define BACKSLASH 92
60#define BACKSLASH 92
@@ -93,7 +73,7 @@ import qualified Data.Text.Encoding as TE
93#define C_n 110
73#define C_n 110
94#define C_t 116
74#define C_t 116
95
75
96−-- | Parse any JSON value.
76+-- | Parse a top-level JSON value.
97--
77--
98-- The conversion of a parsed value to a Haskell value is deferred
78-- The conversion of a parsed value to a Haskell value is deferred
99-- until the Haskell value is needed. This may improve performance if
79-- until the Haskell value is needed. This may improve performance if
@@ -103,15 +83,10 @@ import qualified Data.Text.Encoding as TE
103-- This function is an alias for 'value'. In aeson 0.8 and earlier, it
83-- This function is an alias for 'value'. In aeson 0.8 and earlier, it
104-- parsed only object or array types, in conformance with the
84-- parsed only object or array types, in conformance with the
105-- now-obsolete RFC 4627.
85-- 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'.
111json :: Parser Value
86json :: Parser Value
112json = value
87json = value
113
88
114−-- | Parse any JSON value.
89+-- | Parse a top-level JSON value.
115--
90--
116-- This is a strict version of 'json' which avoids building up thunks
91-- This is a strict version of 'json' which avoids building up thunks
117-- during parsing; it performs all conversions immediately. Prefer
92-- during parsing; it performs all conversions immediately. Prefer
@@ -120,35 +95,23 @@ json = value
120-- This function is an alias for 'value''. In aeson 0.8 and earlier, it
95-- This function is an alias for 'value''. In aeson 0.8 and earlier, it
121-- parsed only object or array types, in conformance with the
96-- parsed only object or array types, in conformance with the
122-- now-obsolete RFC 4627.
97-- 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''.
128json' :: Parser Value
98json' :: Parser Value
129json' = value'
99json' = value'
130
100
131−-- Open recursion: object_, object_', array_, array_' are parameterized by the
101+object_ :: Parser Value
132−-- toplevel Value parser to be called recursively, to keep the parameter
102+object_ = {-# SCC "object_" #-} Object <$> objectValues jstring value
133−-- mkObject outside of the recursive loop for proper inlining.
134
103
135−object_ :: ([(Text, Value)] -> Either String Object) -> Parser Value -> Parser Value
104+object_' :: 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
140−object_' mkObject val' = {-# SCC "object_'" #-} do
105+object_' = {-# SCC "object_'" #-} do
141− !vals <- objectValues mkObject jstring' val'
106+ !vals <- objectValues jstring' value'
142 return (Object vals)
107 return (Object vals)
143 where
108 where
144 jstring' = do
109 jstring' = do
145 !s <- jstring
110 !s <- jstring
146 return s
111 return s
147−{-# INLINE object_' #-}
148
112
149−objectValues :: ([(Text, Value)] -> Either String Object)
150− -> Parser Text -> Parser Value -> Parser (H.HashMap Text Value)
113+objectValues :: Parser Text -> Parser Value -> Parser (H.HashMap Text Value)
151−objectValues mkObject str val = do
114+objectValues str val = do
152 skipSpace
115 skipSpace
153 w <- A.peekWord8'
116 w <- A.peekWord8'
154 if w == CLOSE_CURLY
117 if w == CLOSE_CURLY
@@ -158,26 +121,22 @@ objectValues mkObject str val = do
158 -- Why use acc pattern here, you may ask? because 'H.fromList' use 'unsafeInsert'
121 -- Why use acc pattern here, you may ask? because 'H.fromList' use 'unsafeInsert'
159 -- and it's much faster because it's doing in place update to the 'HashMap'!
122 -- and it's much faster because it's doing in place update to the 'HashMap'!
160 loop acc = do
123 loop acc = do
161− k <- (str A.<?> "object key") <* skipSpace <* (char ':' A.<?> "':'")
124+ k <- str <* skipSpace <* char ':'
162− v <- (val A.<?> "object value") <* skipSpace
125+ v <- val <* skipSpace
163− ch <- A.satisfy (\w -> w == COMMA || w == CLOSE_CURLY) A.<?> "',' or '}'"
126+ ch <- A.satisfy $ \w -> w == COMMA || w == CLOSE_CURLY
164 let acc' = (k, v) : acc
127 let acc' = (k, v) : acc
165 if ch == COMMA
128 if ch == COMMA
166 then skipSpace >> loop acc'
129 then skipSpace >> loop acc'
167− else case mkObject acc' of
130+ else return (H.fromList acc')
168− Left err -> fail err
169− Right obj -> pure obj
170{-# INLINE objectValues #-}
131{-# INLINE objectValues #-}
171
132
172−array_ :: Parser Value -> Parser Value
133+array_ :: Parser Value
173−array_ val = {-# SCC "array_" #-} Array <$> arrayValues val
134+array_ = {-# SCC "array_" #-} Array <$> arrayValues value
174−{-# INLINE array_ #-}
175
135
176−array_' :: Parser Value -> Parser Value
136+array_' :: Parser Value
177−array_' val = {-# SCC "array_'" #-} do
137+array_' = {-# SCC "array_'" #-} do
178− !vals <- arrayValues val
138+ !vals <- arrayValues value'
179 return (Array vals)
139 return (Array vals)
180−{-# INLINE array_' #-}
181
140
182arrayValues :: Parser Value -> Parser (Vector Value)
141arrayValues :: Parser Value -> Parser (Vector Value)
183arrayValues val = do
142arrayValues val = do
@@ -188,133 +147,57 @@ arrayValues val = do
188 else loop [] 1
147 else loop [] 1
189 where
148 where
190 loop acc !len = do
149 loop acc !len = do
191− v <- (val A.<?> "json list value") <* skipSpace
150+ v <- val <* skipSpace
192− ch <- A.satisfy (\w -> w == COMMA || w == CLOSE_SQUARE) A.<?> "',' or ']'"
151+ ch <- A.satisfy $ \w -> w == COMMA || w == CLOSE_SQUARE
193 if ch == COMMA
152 if ch == COMMA
194 then skipSpace >> loop (v:acc) (len+1)
153 then skipSpace >> loop (v:acc) (len+1)
195 else return (Vector.reverse (Vector.fromListN len (v:acc)))
154 else return (Vector.reverse (Vector.fromListN len (v:acc)))
196{-# INLINE arrayValues #-}
155{-# INLINE arrayValues #-}
197
156
198−-- | Parse any JSON value. Synonym of 'json'.
157+-- | Parse any JSON value. You should usually 'json' in preference to
199−value :: Parser Value
158+-- this function, as this function relaxes the object-or-array
200−value = jsonWith (pure . H.fromList)
159+-- requirement of RFC 4627.
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--
160--
210−-- 'json' keeps only the first occurence of each key, using 'HashMap.Lazy.fromList'.
161+-- In particular, be careful in using this function if you think your
211−--
162+-- code might interoperate with Javascript. A na&#xef;ve Javascript
212−-- @
163+-- library that parses JSON data using @eval@ is vulnerable to attack
213−-- 'json' = 'jsonWith' ('Right' '.' 'H.fromList')
164+-- unless the encoded data represents an object or an array. JSON
214−-- @
165+-- implementations in other languages conform to that same restriction
215−--
166+-- to preserve interoperability and security.
216−-- 'jsonLast' keeps the last occurence of each key, using
167+value :: Parser Value
217−-- @'HashMap.Lazy.fromListWith' ('const' 'id')@.
168+value = do
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
237 skipSpace
169 skipSpace
238 w <- A.peekWord8'
170 w <- A.peekWord8'
239 case w of
171 case w of
240 DOUBLE_QUOTE -> A.anyWord8 *> (String <$> jstring_)
172 DOUBLE_QUOTE -> A.anyWord8 *> (String <$> jstring_)
241− OPEN_CURLY -> A.anyWord8 *> object_ mkObject value_
173+ OPEN_CURLY -> A.anyWord8 *> object_
242− OPEN_SQUARE -> A.anyWord8 *> array_ value_
174+ OPEN_SQUARE -> A.anyWord8 *> array_
243− C_f -> string "false" $> Bool False
175+ C_f -> string "false" *> pure (Bool False)
244− C_t -> string "true" $> Bool True
176+ C_t -> string "true" *> pure (Bool True)
245− C_n -> string "null" $> Null
177+ C_n -> string "null" *> pure Null
246 _ | w >= 48 && w <= 57 || w == 45
178 _ | w >= 48 && w <= 57 || w == 45
247 -> Number <$> scientific
179 -> Number <$> scientific
248 | otherwise -> fail "not a valid json value"
180 | 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)
259
181
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−
281−-- | Strict version of 'value'. Synonym of 'json''.
182+-- | Strict version of 'value'. See also 'json''.
282value' :: Parser Value
183value' :: Parser Value
283−value' = jsonWith' (pure . H.fromList)
184+value' = do
284−
285−-- | Strict version of 'jsonWith'.
286−jsonWith' :: ([(Text, Value)] -> Either String Object) -> Parser Value
287−jsonWith' mkObject = fix $ \value_ -> do
288 skipSpace
185 skipSpace
289 w <- A.peekWord8'
186 w <- A.peekWord8'
290 case w of
187 case w of
291 DOUBLE_QUOTE -> do
188 DOUBLE_QUOTE -> do
292 !s <- A.anyWord8 *> jstring_
189 !s <- A.anyWord8 *> jstring_
293 return (String s)
190 return (String s)
294− OPEN_CURLY -> A.anyWord8 *> object_' mkObject value_
191+ OPEN_CURLY -> A.anyWord8 *> object_'
295− OPEN_SQUARE -> A.anyWord8 *> array_' value_
192+ OPEN_SQUARE -> A.anyWord8 *> array_'
296− C_f -> string "false" $> Bool False
193+ C_f -> string "false" *> pure (Bool False)
297− C_t -> string "true" $> Bool True
194+ C_t -> string "true" *> pure (Bool True)
298− C_n -> string "null" $> Null
195+ C_n -> string "null" *> pure Null
299 _ | w >= 48 && w <= 57 || w == 45
196 _ | w >= 48 && w <= 57 || w == 45
300 -> do
197 -> do
301 !n <- scientific
198 !n <- scientific
302 return (Number n)
199 return (Number n)
303 | otherwise -> fail "not a valid json value"
200 | 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
318
201
319-- | Parse a quoted JSON string.
202-- | Parse a quoted JSON string.
320jstring :: Parser Text
203jstring :: Parser Text
@@ -324,39 +207,23 @@ jstring = A.word8 DOUBLE_QUOTE *> jstring_
324jstring_ :: Parser Text
207jstring_ :: Parser Text
325{-# INLINE jstring_ #-}
208{-# INLINE jstring_ #-}
326jstring_ = {-# SCC "jstring_" #-} do
209jstring_ = {-# 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
355 s <- A.scan startState go <* A.anyWord8
210 s <- A.scan startState go <* A.anyWord8
356 case unescapeText s of
211 case unescapeText s of
357 Right r -> return r
212 Right r -> return r
358 Left err -> fail $ show err
213 Left err -> fail $ show err
359 where
214 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
360 startState = False
227 startState = False
361 go a c
228 go a c
362 | a = Just False
229 | a = Just False
@@ -390,12 +257,7 @@ eitherDecodeWith p to s =
390 L.Done _ v -> case to v of
257 L.Done _ v -> case to v of
391 ISuccess a -> Right a
258 ISuccess a -> Right a
392 IError path msg -> Left (path, msg)
259 IError path msg -> Left (path, msg)
393− L.Fail _ ctx msg -> Left ([], buildMsg ctx msg)
260+ L.Fail _ _ msg -> Left ([], msg)
394− where
395− buildMsg :: [String] -> String -> String
396− buildMsg [] msg = msg
397− buildMsg (expectation:_) msg =
398− msg ++ ". Expecting " ++ expectation
399{-# INLINE eitherDecodeWith #-}
261{-# INLINE eitherDecodeWith #-}
400
262
401eitherDecodeStrictWith :: Parser Value -> (Value -> IResult a) -> B.ByteString
263eitherDecodeStrictWith :: Parser Value -> (Value -> IResult a) -> B.ByteString
@@ -448,13 +310,14 @@ data SP = SP !Integer {-# UNPACK #-}!Int
448
310
449decimal0 :: Parser Integer
311decimal0 :: Parser Integer
450decimal0 = do
312decimal0 = do
313+ let step a w = a * 10 + fromIntegral (w - zero)
451− let zero = 48
314+ zero = 48
452 digits <- A.takeWhile1 isDigit_w8
315 digits <- A.takeWhile1 isDigit_w8
453 if B.length digits > 1 && B.unsafeHead digits == zero
316 if B.length digits > 1 && B.unsafeHead digits == zero
454 then fail "leading zero"
317 then fail "leading zero"
455− else return (bsToInteger digits)
318+ else return (B.foldl' step 0 digits)
456
319
457−-- | Parse a JSON number.
320+{-# INLINE scientific #-}
458scientific :: Parser Scientific
321scientific :: Parser Scientific
459scientific = do
322scientific = do
460 let minus = 45
323 let minus = 45
@@ -484,54 +347,3 @@ scientific = do
484 (A.satisfy (\ex -> ex == littleE || ex == bigE) *>
347 (A.satisfy (\ex -> ex == littleE || ex == bigE) *>
485 fmap (Sci.scientific signedCoeff . (e +)) (signed decimal)) <|>
348 fmap (Sci.scientific signedCoeff . (e +)) (signed decimal)) <|>
486 return (Sci.scientific signedCoeff e)
349 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+103−18
@@ -1,4 +1,15 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
1+{-# LANGUAGE BangPatterns #-}
2+{-# LANGUAGE ScopedTypeVariables #-}
3+
4+-- |
5+-- Module: Data.Aeson.Parser.Time
6+-- Copyright: (c) 2015-2016 Bryan O'Sullivan
7+-- License: BSD3
8+-- Maintainer: Bryan O'Sullivan <bos@serpentine.com>
9+-- Stability: experimental
10+-- Portability: portable
11+--
12+-- Parsers for parsing dates and times.
2
13
3module Data.Aeson.Parser.Time
14module Data.Aeson.Parser.Time
4 (
15 (
@@ -11,51 +22,123 @@ module Data.Aeson.Parser.Time
11 , zonedTime
22 , zonedTime
12 ) where
23 ) where
13
24
25+import Prelude ()
14import Prelude.Compat
26import Prelude.Compat
15
27
28+import Control.Applicative ((<|>))
29+import Control.Monad (void, when)
30+import Data.Aeson.Internal.Time (toPico)
16−import Data.Attoparsec.Text (Parser)
31+import Data.Attoparsec.Text as A
32+import Data.Bits ((.&.))
33+import Data.Char (isDigit, ord)
34+import Data.Fixed (Pico)
35+import Data.Int (Int64)
36+import Data.Maybe (fromMaybe)
17import Data.Text (Text)
37import Data.Text (Text)
18−import Data.Time.Calendar (Day)
38+import Data.Time.Calendar (Day, fromGregorianValid)
19import Data.Time.Clock (UTCTime(..))
39import Data.Time.Clock (UTCTime(..))
20import qualified Data.Aeson.Types.Internal as Aeson
40import qualified Data.Aeson.Types.Internal as Aeson
21−import qualified Data.Attoparsec.Text as A
41+import qualified Data.Text as T
22−import qualified Data.Attoparsec.Time as T
23import qualified Data.Time.LocalTime as Local
42import qualified Data.Time.LocalTime as Local
24
43
25-- | Run an attoparsec parser as an aeson parser.
44-- | Run an attoparsec parser as an aeson parser.
26run :: Parser a -> Text -> Aeson.Parser a
45run :: Parser a -> Text -> Aeson.Parser a
27−run p t = case A.parseOnly (p <* A.endOfInput) t of
46+run p t = case A.parseOnly (p <* endOfInput) t of
28 Left err -> fail $ "could not parse date: " ++ err
47 Left err -> fail $ "could not parse date: " ++ err
29 Right r -> return r
48 Right r -> return r
30
49
31-- | Parse a date of the form @[+,-]YYYY-MM-DD@.
50-- | Parse a date of the form @[+,-]YYYY-MM-DD@.
32day :: Parser Day
51day :: Parser Day
33−day = T.day
52+day = do
34−{-# INLINE day #-}
53+ absOrNeg <- negate <$ char '-' <|> id <$ char '+' <|> pure id
54+ y <- decimal <* char '-'
55+ m <- twoDigits <* char '-'
56+ d <- twoDigits
57+ maybe (fail "invalid date") return (fromGregorianValid (absOrNeg y) m d)
58+
59+-- | Parse a two-digit integer (e.g. day of month, hour).
60+twoDigits :: Parser Int
61+twoDigits = do
62+ a <- digit
63+ b <- digit
64+ let c2d c = ord c .&. 15
65+ return $! c2d a * 10 + c2d b
35
66
36-- | Parse a time of the form @HH:MM[:SS[.SSS]]@.
67-- | Parse a time of the form @HH:MM[:SS[.SSS]]@.
37timeOfDay :: Parser Local.TimeOfDay
68timeOfDay :: Parser Local.TimeOfDay
38−timeOfDay = T.timeOfDay
69+timeOfDay = do
39−{-# INLINE timeOfDay #-}
70+ h <- twoDigits
71+ m <- char ':' *> twoDigits
72+ s <- option 0 (char ':' *> seconds)
73+ if h < 24 && m < 60 && s < 61
74+ then return (Local.TimeOfDay h m s)
75+ else fail "invalid time"
76+
77+data T = T {-# UNPACK #-} !Int {-# UNPACK #-} !Int64
78+
79+-- | Parse a count of seconds, with the integer part being two digits
80+-- long.
81+seconds :: Parser Pico
82+seconds = do
83+ real <- twoDigits
84+ mc <- peekChar
85+ case mc of
86+ Just '.' -> do
87+ t <- anyChar *> takeWhile1 isDigit
88+ return $! parsePicos real t
89+ _ -> return $! fromIntegral real
90+ where
91+ parsePicos a0 t = toPico (fromIntegral (t' * 10^n))
92+ where T n t' = T.foldl' step (T 12 (fromIntegral a0)) t
93+ step ma@(T m a) c
94+ | m <= 0 = ma
95+ | otherwise = T (m-1) (10 * a + fromIntegral (ord c) .&. 15)
40
96
41-- | Parse a time zone, and return 'Nothing' if the offset from UTC is
97-- | Parse a time zone, and return 'Nothing' if the offset from UTC is
42-- zero. (This makes some speedups possible.)
98-- zero. (This makes some speedups possible.)
43timeZone :: Parser (Maybe Local.TimeZone)
99timeZone :: Parser (Maybe Local.TimeZone)
44−timeZone = T.timeZone
100+timeZone = do
45−{-# INLINE timeZone #-}
101+ let maybeSkip c = do ch <- peekChar'; when (ch == c) (void anyChar)
102+ maybeSkip ' '
103+ ch <- satisfy $ \c -> c == 'Z' || c == '+' || c == '-'
104+ if ch == 'Z'
105+ then return Nothing
106+ else do
107+ h <- twoDigits
108+ mm <- peekChar
109+ m <- case mm of
110+ Just ':' -> anyChar *> twoDigits
111+ Just d | isDigit d -> twoDigits
112+ _ -> return 0
113+ let off | ch == '-' = negate off0
114+ | otherwise = off0
115+ off0 = h * 60 + m
116+ case undefined of
117+ _ | off == 0 ->
118+ return Nothing
119+ | off < -720 || off > 840 || m > 59 ->
120+ fail "invalid time zone offset"
121+ | otherwise ->
122+ let !tz = Local.minutesToTimeZone off
123+ in return (Just tz)
46
124
47-- | Parse a date and time, of the form @YYYY-MM-DD HH:MM[:SS[.SSS]]@.
125-- | Parse a date and time, of the form @YYYY-MM-DD HH:MM[:SS[.SSS]]@.
48-- The space may be replaced with a @T@. The number of seconds is optional
126-- The space may be replaced with a @T@. The number of seconds is optional
49-- and may be followed by a fractional component.
127-- and may be followed by a fractional component.
50localTime :: Parser Local.LocalTime
128localTime :: Parser Local.LocalTime
51−localTime = T.localTime
129+localTime = Local.LocalTime <$> day <* daySep <*> timeOfDay
52−{-# INLINE localTime #-}
130+ where daySep = satisfy (\c -> c == 'T' || c == ' ')
53
131
54-- | Behaves as 'zonedTime', but converts any time zone offset into a
132-- | Behaves as 'zonedTime', but converts any time zone offset into a
55-- UTC time.
133-- UTC time.
56utcTime :: Parser UTCTime
134utcTime :: Parser UTCTime
57−utcTime = T.utcTime
135+utcTime = do
58−{-# INLINE utcTime #-}
136+ lt@(Local.LocalTime d t) <- localTime
137+ mtz <- timeZone
138+ case mtz of
139+ Nothing -> let !tt = Local.timeOfDayToTime t
140+ in return (UTCTime d tt)
141+ Just tz -> return $! Local.localTimeToUTC tz lt
59
142
60-- | Parse a date with time zone info. Acceptable formats:
143-- | Parse a date with time zone info. Acceptable formats:
61--
144--
@@ -69,5 +152,7 @@ utcTime = T.utcTime
69-- two digits are hours, the @:@ is optional and the second two digits
152-- two digits are hours, the @:@ is optional and the second two digits
70-- (also optional) are minutes.
153-- (also optional) are minutes.
71zonedTime :: Parser Local.ZonedTime
154zonedTime :: Parser Local.ZonedTime
72−zonedTime = T.zonedTime
155+zonedTime = Local.ZonedTime <$> localTime <*> (fromMaybe utc <$> timeZone)
73−{-# INLINE zonedTime #-}
156+
157+utc :: Local.TimeZone
158+utc = Local.TimeZone 0 False ""
Data/Aeson/QQ/Simple.hsdeleted−25
@@ -1,25 +0,0 @@
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+860−438
@@ -85,6 +85,7 @@ $('deriveJSON' 'defaultOptions' ''(,,,))
85@
85@
86
86
87-}
87-}
88+
88module Data.Aeson.TH
89module Data.Aeson.TH
89 (
90 (
90 -- * Encoding configuration
91 -- * Encoding configuration
@@ -116,42 +117,49 @@ module Data.Aeson.TH
116 , mkLiftParseJSON2
117 , mkLiftParseJSON2
117 ) where
118 ) where
118
119
119−import Prelude.Compat
120+import Prelude ()
121+import Prelude.Compat hiding (exp)
120
122
121import Control.Applicative ((<|>))
123import Control.Applicative ((<|>))
122−import Data.Aeson (Object, (.:), FromJSON(..), FromJSON1(..), FromJSON2(..), ToJSON(..), ToJSON1(..), ToJSON2(..))
124+import Data.Aeson (Object, (.=), (.:), FromJSON(..), FromJSON1(..), FromJSON2(..), ToJSON(..), ToJSON1(..), ToJSON2(..))
123import Data.Aeson.Types (Options(..), Parser, SumEncoding(..), Value(..), defaultOptions, defaultTaggedObject)
125import Data.Aeson.Types (Options(..), Parser, SumEncoding(..), Value(..), defaultOptions, defaultTaggedObject)
124−import Data.Aeson.Types.Internal ((<?>), JSONPathElement(Key))
126+import Data.Aeson.Types.Internal ((<?>), Pair, JSONPathElement(Key))
125import Data.Aeson.Types.FromJSON (parseOptionalFieldWith)
127import Data.Aeson.Types.FromJSON (parseOptionalFieldWith)
126−import Data.Aeson.Types.ToJSON (fromPairs, pair)
127import Control.Monad (liftM2, unless, when)
128import Control.Monad (liftM2, unless, when)
128import Data.Foldable (foldr')
129import Data.Foldable (foldr')
129#if MIN_VERSION_template_haskell(2,8,0) && !MIN_VERSION_template_haskell(2,10,0)
130#if MIN_VERSION_template_haskell(2,8,0) && !MIN_VERSION_template_haskell(2,10,0)
130import Data.List (nub)
131import Data.List (nub)
131#endif
132#endif
132−import Data.List (foldl', genericLength, intercalate, partition, union)
133+import Data.List (find, foldl', genericLength , intercalate , intersperse, partition, union)
133import Data.List.NonEmpty ((<|), NonEmpty((:|)))
134import Data.List.NonEmpty ((<|), NonEmpty((:|)))
134import Data.Map (Map)
135import Data.Map (Map)
135import Data.Maybe (catMaybes, fromMaybe, mapMaybe)
136import 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)
138import Language.Haskell.TH hiding (Arity)
139import Language.Haskell.TH hiding (Arity)
140+#else
141+import Language.Haskell.TH
142+#endif
139−import Language.Haskell.TH.Datatype
143+import Language.Haskell.TH.Syntax (VarStrictType)
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
140#if MIN_VERSION_template_haskell(2,8,0) && !(MIN_VERSION_template_haskell(2,10,0))
147#if MIN_VERSION_template_haskell(2,8,0) && !(MIN_VERSION_template_haskell(2,10,0))
141import Language.Haskell.TH.Syntax (mkNameG_tc)
148import Language.Haskell.TH.Syntax (mkNameG_tc)
142#endif
149#endif
143import Text.Printf (printf)
150import Text.Printf (printf)
151+import qualified Data.Aeson as A
144import qualified Data.Aeson.Encoding.Internal as E
152import qualified Data.Aeson.Encoding.Internal as E
145import qualified Data.Foldable as F (all)
153import qualified Data.Foldable as F (all)
146−import qualified Data.HashMap.Strict as H (difference, fromList, keys, lookup, toList)
154+import qualified Data.HashMap.Strict as H (lookup, toList)
147−import qualified Data.List.NonEmpty as NE (length, reverse)
155+import qualified Data.List.NonEmpty as NE (drop, length, reverse, splitAt)
148−import qualified Data.Map as M (fromList, keys, lookup , singleton, size)
156+import qualified Data.Map as M (fromList, findWithDefault, keys, lookup , singleton, size)
149−import qualified Data.Semigroup as Semigroup (Option(..))
150import qualified Data.Set as Set (empty, insert, member)
157import qualified Data.Set as Set (empty, insert, member)
151import qualified Data.Text as T (Text, pack, unpack)
158import qualified Data.Text as T (Text, pack, unpack)
152−import qualified Data.Vector as V (unsafeIndex, null, length, create, empty)
159+import qualified Data.Vector as V (unsafeIndex, null, length, create, fromList)
153import qualified Data.Vector.Mutable as VM (unsafeNew, unsafeWrite)
160import qualified Data.Vector.Mutable as VM (unsafeNew, unsafeWrite)
154
161
162+
155--------------------------------------------------------------------------------
163--------------------------------------------------------------------------------
156-- Convenience
164-- Convenience
157--------------------------------------------------------------------------------
165--------------------------------------------------------------------------------
@@ -245,8 +253,8 @@ deriveToJSONCommon :: JSONClass
245 -> Name
253 -> Name
246 -- ^ Name of the type for which to generate an instance.
254 -- ^ Name of the type for which to generate an instance.
247 -> Q [Dec]
255 -> Q [Dec]
248−deriveToJSONCommon = deriveJSONClass [ (ToJSON, \jc _ -> consToValue Value jc)
256+deriveToJSONCommon = deriveJSONClass [ (ToJSON, \jc _ -> consToValue jc)
249− , (ToEncoding, \jc _ -> consToValue Encoding jc)
257+ , (ToEncoding, \jc _ -> consToEncoding jc)
250 ]
258 ]
251
259
252-- | Generates a lambda expression which encodes the given data type or
260-- | Generates a lambda expression which encodes the given data type or
@@ -276,7 +284,7 @@ mkToJSONCommon :: JSONClass -- ^ Which class's method is being derived.
276 -> Options -- ^ Encoding options.
284 -> Options -- ^ Encoding options.
277 -> Name -- ^ Name of the encoded type.
285 -> Name -- ^ Name of the encoded type.
278 -> Q Exp
286 -> Q Exp
279−mkToJSONCommon = mkFunCommon (\jc _ -> consToValue Value jc)
287+mkToJSONCommon = mkFunCommon (\jc _ -> consToValue jc)
280
288
281-- | Generates a lambda expression which encodes the given data type or
289-- | Generates a lambda expression which encodes the given data type or
282-- data family instance constructor as a JSON string.
290-- data family instance constructor as a JSON string.
@@ -305,272 +313,385 @@ mkToEncodingCommon :: JSONClass -- ^ Which class's method is being derived.
305 -> Options -- ^ Encoding options.
313 -> Options -- ^ Encoding options.
306 -> Name -- ^ Name of the encoded type.
314 -> Name -- ^ Name of the encoded type.
307 -> Q Exp
315 -> Q Exp
308−mkToEncodingCommon = mkFunCommon (\jc _ -> consToValue Encoding jc)
316+mkToEncodingCommon = mkFunCommon (\jc _ -> consToEncoding jc)
309
317
310-- | Helper function used by both 'deriveToJSON' and 'mkToJSON'. Generates
318-- | Helper function used by both 'deriveToJSON' and 'mkToJSON'. Generates
311−-- code to generate a 'Value' or 'Encoding' of a number of constructors. All
319+-- code to generate a 'Value' of a number of constructors. All constructors
312−-- constructors must be from the same type.
320+-- must be from the same type.
313−consToValue :: ToJSONFun
314− -- ^ The method ('toJSON' or 'toEncoding') being derived.
315− -> JSONClass
321+consToValue :: JSONClass
316 -- ^ The ToJSON variant being derived.
322 -- ^ The ToJSON variant being derived.
317 -> Options
323 -> Options
318 -- ^ Encoding options.
324 -- ^ Encoding options.
319− -> [Type]
325+ -> [Con]
320− -- ^ The types from the data type/data family instance declaration
321− -> [ConstructorInfo]
322 -- ^ Constructors for which to generate JSON generating code.
326 -- ^ Constructors for which to generate JSON generating code.
323 -> Q Exp
327 -> Q Exp
324
328
325−consToValue _ _ _ _ [] = error $ "Data.Aeson.TH.consToValue: "
329+consToValue _ _ [] = error $ "Data.Aeson.TH.consToValue: "
326− ++ "Not a single constructor given!"
330+ ++ "Not a single constructor given!"
327
331
328−consToValue target jc opts instTys cons = do
332+consToValue jc opts cons = do
329 value <- newName "value"
333 value <- newName "value"
330 tjs <- newNameList "_tj" $ arityInt jc
334 tjs <- newNameList "_tj" $ arityInt jc
331 tjls <- newNameList "_tjl" $ arityInt jc
335 tjls <- newNameList "_tjl" $ arityInt jc
332 let zippedTJs = zip tjs tjls
336 let zippedTJs = zip tjs tjls
333 interleavedTJs = interleave tjs tjls
337 interleavedTJs = interleave tjs tjls
334− lastTyVars = map varTToName $ drop (length instTys - arityInt jc) instTys
335− tvMap = M.fromList $ zip lastTyVars zippedTJs
336 lamE (map varP $ interleavedTJs ++ [value]) $
338 lamE (map varP $ interleavedTJs ++ [value]) $
337− caseE (varE value) (matches tvMap)
339+ caseE (varE value) (matches zippedTJs)
338 where
340 where
339− matches tvMap = case cons of
341+ matches tjs = case cons of
340 -- A single constructor is directly encoded. The constructor itself may be
342 -- A single constructor is directly encoded. The constructor itself may be
341 -- forgotten.
343 -- forgotten.
342− [con] | not (tagSingleConstructors opts) -> [argsToValue target jc tvMap opts False con]
344+ [con] -> [argsToValue jc tjs opts False con]
343 _ | allNullaryToStringTag opts && all isNullary cons ->
345 _ | allNullaryToStringTag opts && all isNullary cons ->
344− [ match (conP conName []) (normalB $ conStr target opts conName) []
346+ [ match (conP conName []) (normalB $ conStr opts conName) []
345 | con <- cons
347 | con <- cons
346− , let conName = constructorName con
348+ , let conName = getConName con
347 ]
349 ]
348− | otherwise -> [argsToValue target jc tvMap opts True con | con <- cons]
350+ | otherwise -> [argsToValue jc tjs opts True con | con <- cons]
349
351
350−-- | Name of the constructor as a quoted 'Value' or 'Encoding'.
351−conStr :: ToJSONFun -> Options -> Name -> Q Exp
352+conStr :: Options -> Name -> Q Exp
352−conStr Value opts = appE [|String|] . conTxt opts
353+conStr 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'.
356conTxt :: Options -> Name -> Q Exp
355conTxt :: Options -> Name -> Q Exp
357−conTxt opts = appE [|T.pack|] . stringE . conString opts
356+conTxt opts = appE [|T.pack|] . conStringE opts
357+
358+conStringE :: Options -> Name -> Q Exp
359+conStringE opts = stringE . constructorTagModifier opts . nameBase
360+
361+-- | Helper function used by both 'deriveToJSON' and 'mkToEncoding'. Generates
362+-- code to write out a value for a number of constructors. All constructors
363+-- must be from the same type.
364+consToEncoding :: JSONClass
365+ -- ^ The ToJSON variant being derived.
366+ -> Options
367+ -- ^ Encoding options.
368+ -> [Con]
369+ -- ^ Constructors for which to generate JSON generating code.
370+ -> Q Exp
371+
372+consToEncoding _ _ [] = error $ "Data.Aeson.TH.consToEncoding: "
373+ ++ "Not a single constructor given!"
374+
375+consToEncoding jc opts cons = do
376+ value <- newName "value"
377+ tes <- newNameList "_te" $ arityInt jc
378+ tels <- newNameList "_tel" $ arityInt jc
379+ let zippedTEs = zip tes tels
380+ interleavedTEs = interleave tes tels
381+ lamE (map varP $ interleavedTEs ++ [value]) $
382+ caseE (varE value) (matches zippedTEs)
383+ where
384+ matches tes = case cons of
385+ -- A single constructor is directly encoded. The constructor itself may be
386+ -- forgotten.
387+ [con] -> [argsToEncoding jc tes opts False con]
388+ -- Encode just the name of the constructor of a sum type iff all the
389+ -- constructors are nullary.
390+ _ | allNullaryToStringTag opts && all isNullary cons ->
391+ [ match (conP conName [])
392+ (normalB $ encStr opts conName) []
393+ | con <- cons
394+ , let conName = getConName con
395+ ]
396+ | otherwise -> [argsToEncoding jc tes opts True con | con <- cons]
358
397
359−-- | Name of the constructor.
360−conString :: Options -> Name -> String
398+encStr :: Options -> Name -> Q Exp
361−conString opts = constructorTagModifier opts . nameBase
399+encStr opts = appE [|E.text|] . conTxt opts
362
400
363-- | If constructor is nullary.
401-- | If constructor is nullary.
364−isNullary :: ConstructorInfo -> Bool
402+isNullary :: Con -> Bool
365−isNullary ConstructorInfo { constructorVariant = NormalConstructor
403+isNullary (NormalC _ []) = True
366− , constructorFields = tys } = null tys
367isNullary _ = False
404isNullary _ = False
368
405
369−-- | Wrap fields of a non-record constructor. See 'sumToValue'.
370−opaqueSumToValue :: ToJSONFun -> Options -> Bool -> Bool -> Name -> ExpQ -> ExpQ
406+sumToValue :: Options -> Bool -> Bool -> Name -> Q Exp -> Q Exp
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 =
381− sumToValue target opts multiCons nullary conName
407+sumToValue opts multiCons nullary conName exp
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
410 | multiCons =
408 | multiCons =
411 case sumEncoding opts of
409 case sumEncoding opts of
412 TwoElemArray ->
410 TwoElemArray ->
413− array target [conStr target opts conName, value]
411+ [|Array|] `appE` ([|V.fromList|] `appE` listE [conStr opts conName, exp])
414 TaggedObject{tagFieldName, contentsFieldName} ->
412 TaggedObject{tagFieldName, contentsFieldName} ->
415− -- TODO: Maybe throw an error in case
416− -- tagFieldName overwrites a field in pairs.
417− let tag = pairE tagFieldName (conStr target opts conName)
413+ let tag = infixApp [|T.pack tagFieldName|] [|(.=)|] (conStr opts conName)
418− content = pairs contentsFieldName
414+ contents = infixApp [|T.pack contentsFieldName|] [|(.=)|] exp
419− in fromPairsE $
415+ in
420− if nullary then tag else infixApp tag [|(Monoid.<>)|] content
416+ [|A.object|] `appE` listE (if nullary then [tag] else [tag, contents])
421 ObjectWithSingleField ->
417 ObjectWithSingleField ->
422− objectE [(conString opts conName, value)]
418+ [|A.object|] `appE` listE
419+ [ infixApp (conTxt opts conName) [|(.=)|] exp
420+ ]
423− UntaggedValue | nullary -> conStr target opts conName
421+ UntaggedValue | nullary -> conStr opts conName
424− UntaggedValue -> value
422+ UntaggedValue -> exp
425− | otherwise = value
423+ | otherwise = exp
426
424
427-- | Generates code to generate the JSON encoding of a single constructor.
425-- | Generates code to generate the JSON encoding of a single constructor.
428−argsToValue :: ToJSONFun -> JSONClass -> TyVarMap -> Options -> Bool -> ConstructorInfo -> Q Match
426+argsToValue :: JSONClass -> [(Name, Name)] -> Options -> Bool -> Con -> Q Match
429
427
430-- Polyadic constructors with special case for unary constructors.
428-- Polyadic constructors with special case for unary constructors.
431−argsToValue target jc tvMap opts multiCons
429+argsToValue jc tjs opts multiCons (NormalC conName ts) = do
432− ConstructorInfo { constructorName = conName
430+ (argTys, tvMap) <- reifyConTys jc tjs conName
433− , constructorVariant = NormalConstructor
434− , constructorFields = argTys } = do
435− argTys' <- mapM resolveTypeSynonyms argTys
436− let len = length argTys'
431+ let len = length ts
437 args <- newNameList "arg" len
432 args <- newNameList "arg" len
438− let js = case [ dispatchToJSON target jc conName tvMap argTy
433+ js <- case [ dispatchToJSON jc conName tvMap argTy
439− `appE` varE arg
434+ `appE` varE arg
440− | (arg, argTy) <- zip args argTys'
435+ | (arg, argTy) <- zip args argTys
441− ] of
436+ ] of
442− -- Single argument is directly converted.
437+ -- Single argument is directly converted.
443− [e] -> e
438+ [e] -> return e
444− -- Zero and multiple arguments are converted to a JSON array.
439+ -- Multiple arguments are converted to a JSON array.
445− es -> array target es
440+ es -> do
446−
441+ mv <- newName "mv"
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]))
447 match (conP conName $ map varP args)
456 match (conP conName $ map varP args)
448− (normalB $ opaqueSumToValue target opts multiCons (null argTys') conName js)
457+ (normalB $ sumToValue opts multiCons (null ts) conName js)
449 []
458 []
450
459
451-- Records.
460-- Records.
452−argsToValue target jc tvMap opts multiCons
453− info@ConstructorInfo { constructorName = conName
454− , constructorVariant = RecordConstructor fields
455− , constructorFields = argTys } =
456− case (unwrapUnaryRecords opts, not multiCons, argTys) of
461+argsToValue jc tjs opts multiCons (RecC conName ts) = case (unwrapUnaryRecords opts, not multiCons, ts) of
457− (True,True,[_]) -> argsToValue target jc tvMap opts multiCons
462+ (True,True,[(_,st,ty)]) -> argsToValue jc tjs opts multiCons (NormalC conName [(st,ty)])
458− (info{constructorVariant = NormalConstructor})
459− _ -> do
463+ _ -> do
460− argTys' <- mapM resolveTypeSynonyms argTys
464+ (argTys, tvMap) <- reifyConTys jc tjs conName
461− args <- newNameList "arg" $ length argTys'
465+ args <- newNameList "arg" $ length ts
466+ let exp = [|A.object|] `appE` pairs
467+
462− let pairs | omitNothingFields opts = infixApp maybeFields
468+ pairs | omitNothingFields opts = infixApp maybeFields
463− [|(Monoid.<>)|]
469+ [|(++)|]
464− restFields
470+ restFields
465− | otherwise = mconcatE (map pureToPair argCons)
471+ | otherwise = listE $ map toPair argCons
466−
472+
467− argCons = zip3 (map varE args) argTys' fields
473+ argCons = zip3 args argTys ts
468−
474+
469− maybeFields = mconcatE (map maybeToPair maybes)
475+ maybeFields = [|catMaybes|] `appE` listE (map maybeToPair maybes)
470−
476+
471− restFields = mconcatE (map pureToPair rest)
477+ restFields = listE $ map toPair rest
472−
478+
473− (maybes0, rest0) = partition isMaybe argCons
479+ (maybes, rest) = partition isMaybe argCons
474− (options, rest) = partition isOption rest0
480+
475− maybes = maybes0 ++ map optionToMaybe options
481+ maybeToPair (arg, argTy, (field, _, _)) =
476−
482+ infixApp ([|keyValuePairWith|]
477− maybeToPair = toPairLifted True
483+ `appE` dispatchToJSON jc conName tvMap argTy
478− pureToPair = toPairLifted False
484+ `appE` toFieldName field)
479−
485+ [|(<$>)|]
486+ (varE arg)
487+
480− toPairLifted lifted (arg, argTy, field) =
488+ toPair (arg, argTy, (field, _, _)) =
489+ [|keyValuePairWith|]
481− let toValue = dispatchToJSON target jc conName tvMap argTy
490+ `appE` dispatchToJSON jc conName tvMap argTy
482− fieldName = fieldLabel opts field
491+ `appE` toFieldName field
483− e arg' = pairE fieldName (toValue `appE` arg')
492+ `appE` varE arg
484− in if lifted
493+
485− then do
494+ toFieldName field = [|T.pack|] `appE` fieldLabelExp opts field
486− x <- newName "x"
495+
487− [|maybe mempty|] `appE` lam1E (varP x) (e (varE x)) `appE` arg
496+ match (conP conName $ map varP args)
497+ ( normalB
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
488− else e arg
514+ else exp
489−
490− match (conP conName $ map varP args)
491− (normalB $ recordSumToValue target opts multiCons (null argTys) conName pairs)
492− []
515+ ) []
493
516
494-- Infix constructors.
517-- Infix constructors.
495−argsToValue target jc tvMap opts multiCons
518+argsToValue jc tjs opts multiCons (InfixC _ conName _) = do
496− ConstructorInfo { constructorName = conName
519+ ([alTy, arTy], tvMap) <- reifyConTys jc tjs conName
497− , constructorVariant = InfixConstructor
498− , constructorFields = argTys } = do
499− [alTy, arTy] <- mapM resolveTypeSynonyms argTys
500 al <- newName "argL"
520 al <- newName "argL"
501 ar <- newName "argR"
521 ar <- newName "argR"
502 match (infixP (varP al) conName (varP ar))
522 match (infixP (varP al) conName (varP ar))
503 ( normalB
523 ( normalB
504− $ opaqueSumToValue target opts multiCons False conName
524+ $ sumToValue opts multiCons False conName
505− $ array target
506− [ dispatchToJSON target jc conName tvMap aTy
525+ $ [|toJSON|] `appE` listE [ dispatchToJSON jc conName tvMap aTy
507− `appE` varE a
526+ `appE` varE a
508− | (a, aTy) <- [(al,alTy), (ar,arTy)]
527+ | (a, aTy) <- [(al,alTy), (ar,arTy)]
509− ]
528+ ]
510 )
529 )
511 []
530 []
531+-- Existentially quantified constructors.
532+argsToValue jc tjs opts multiCons (ForallC _ _ con) =
533+ argsToValue jc tjs opts multiCons con
512
534
513−isMaybe :: (a, Type, b) -> Bool
535+#if MIN_VERSION_template_haskell(2,11,0)
514−isMaybe (_, AppT (ConT t) _, _) = t == ''Maybe
536+-- GADTs.
515−isMaybe _ = False
537+argsToValue jc tjs opts multiCons (GadtC conNames ts _) =
538+ argsToValue jc tjs opts multiCons $ NormalC (head conNames) ts
516
539
517−isOption :: (a, Type, b) -> Bool
540+argsToValue jc tjs opts multiCons (RecGadtC conNames ts _) =
518−isOption (_, AppT (ConT t) _, _) = t == ''Semigroup.Option
541+ argsToValue jc tjs opts multiCons $ RecC (head conNames) ts
519−isOption _ = False
542+#endif
520
543
521−optionToMaybe :: (ExpQ, b, c) -> (ExpQ, b, c)
544+isMaybe :: (a, b, (c, d, Type)) -> Bool
522−optionToMaybe (a, b, c) = ([|Semigroup.getOption|] `appE` a, b, c)
545+isMaybe (_, _, (_, _, AppT (ConT t) _)) = t == ''Maybe
546+isMaybe _ = False
523
547
524(<^>) :: ExpQ -> ExpQ -> ExpQ
548(<^>) :: ExpQ -> ExpQ -> ExpQ
525(<^>) a b = infixApp a [|(E.><)|] b
549(<^>) a b = infixApp a [|(E.><)|] b
526infixr 6 <^>
550infixr 6 <^>
527
551
552+(<:>) :: ExpQ -> ExpQ -> ExpQ
553+(<:>) a b = a <^> [|E.colon|] <^> b
554+infixr 5 <:>
555+
528(<%>) :: ExpQ -> ExpQ -> ExpQ
556(<%>) :: ExpQ -> ExpQ -> ExpQ
529(<%>) a b = a <^> [|E.comma|] <^> b
557(<%>) a b = a <^> [|E.comma|] <^> b
530infixr 4 <%>
558infixr 4 <%>
531
559
532−-- | Wrap a list of quoted 'Value's in a quoted 'Array' (of type 'Value').
533−array :: ToJSONFun -> [ExpQ] -> ExpQ
560+array :: ExpQ -> ExpQ
534−array Encoding [] = [|E.emptyArray_|]
535−array Value [] = [|Array V.empty|]
536−array Encoding es = [|E.wrapArray|] `appE` foldr1 (<%>) es
561+array exp = [|E.wrapArray|] `appE` exp
537−array Value es = do
538− mv <- newName "mv"
539− let newMV = bindS (varP mv)
540− ([|VM.unsafeNew|] `appE`
541− litE (integerL $ fromIntegral (length es)))
542− stmts = [ noBindS $
543− [|VM.unsafeWrite|] `appE`
544− varE mv `appE`
545− litE (integerL ix) `appE`
546− e
547− | (ix, e) <- zip [(0::Integer)..] es
548− ]
549− ret = noBindS $ [|return|] `appE` varE mv
550− [|Array|] `appE`
551− (varE 'V.create `appE`
552− doE (newMV:stmts++[ret]))
553
562
554−-- | Wrap an associative list of keys and quoted values in a quoted 'Object'.
555−objectE :: [(String, ExpQ)] -> ExpQ
563+object :: ExpQ -> ExpQ
556−objectE = fromPairsE . mconcatE . fmap (uncurry pairE)
564+object exp = [|E.wrapObject|] `appE` exp
557
565
558−-- | 'mconcat' a list of fixed length.
566+sumToEncoding :: Options -> Bool -> Bool -> Name -> Q Exp -> Q Exp
559−--
567+sumToEncoding opts multiCons nullary conName exp
560−-- > mconcatE [ [|x|], [|y|], [|z|] ] = [| x <> (y <> z) |]
568+ | multiCons =
561−mconcatE :: [ExpQ] -> ExpQ
569+ let fexp = exp in
562−mconcatE [] = [|Monoid.mempty|]
570+ case sumEncoding opts of
563−mconcatE [x] = x
571+ TwoElemArray ->
564−mconcatE (x : xs) = infixApp x [|(Monoid.<>)|] (mconcatE xs)
572+ array (encStr opts conName <%> fexp)
573+ TaggedObject{tagFieldName, contentsFieldName} ->
574+ let tag = [|E.text (T.pack tagFieldName)|] <:> encStr opts conName
575+ contents = [|E.text (T.pack contentsFieldName)|] <:> fexp
576+ in
577+ object $
578+ if nullary then tag else tag <%> contents
579+ ObjectWithSingleField ->
580+ object (encStr opts conName <:> fexp)
581+ UntaggedValue | nullary -> encStr opts conName
582+ UntaggedValue -> exp
583+ | otherwise = exp
565
584
566−fromPairsE :: ExpQ -> ExpQ
585+-- | Generates code to generate the JSON encoding of a single constructor.
567−fromPairsE = ([|fromPairs|] `appE`)
586+argsToEncoding :: JSONClass -> [(Name, Name)] -> Options -> Bool -> Con -> Q Match
568
587
569−-- | Create (an encoding of) a key-value pair.
588+-- Polyadic constructors with special case for unary constructors.
570−--
589+argsToEncoding jc tes opts multiCons (NormalC conName ts) = do
571−-- > pairE "k" [|v|] = [|pair "k" v|]
590+ (argTys, tvMap) <- reifyConTys jc tes conName
572−pairE :: String -> ExpQ -> ExpQ
591+ let len = length ts
573−pairE k v = [|pair k|] `appE` v
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+
653+ match (conP conName $ map varP args)
654+ ( normalB
655+ $ if multiCons
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+
669+-- Infix constructors.
670+argsToEncoding jc tes opts multiCons (InfixC _ conName _) = do
671+ al <- newName "argL"
672+ ar <- newName "argR"
673+ ([alTy,arTy], tvMap) <- reifyConTys jc tes conName
674+ match (infixP (varP al) conName (varP ar))
675+ ( normalB
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+
687+#if MIN_VERSION_template_haskell(2,11,0)
688+-- GADTs.
689+argsToEncoding jc tes opts multiCons (GadtC conNames ts _) =
690+ argsToEncoding jc tes opts multiCons $ NormalC (head conNames) ts
691+
692+argsToEncoding jc tes opts multiCons (RecGadtC conNames ts _) =
693+ argsToEncoding jc tes opts multiCons $ RecC (head conNames) ts
694+#endif
574
695
575--------------------------------------------------------------------------------
696--------------------------------------------------------------------------------
576-- FromJSON
697-- FromJSON
@@ -654,41 +775,31 @@ consFromJSON :: JSONClass
654 -- ^ Name of the type to which the constructors belong.
775 -- ^ Name of the type to which the constructors belong.
655 -> Options
776 -> Options
656 -- ^ Encoding options
777 -- ^ Encoding options
657− -> [Type]
778+ -> [Con]
658− -- ^ The types from the data type/data family instance declaration
659− -> [ConstructorInfo]
660 -- ^ Constructors for which to generate JSON parsing code.
779 -- ^ Constructors for which to generate JSON parsing code.
661 -> Q Exp
780 -> Q Exp
662
781
663−consFromJSON _ _ _ _ [] = error $ "Data.Aeson.TH.consFromJSON: "
782+consFromJSON _ _ _ [] = error $ "Data.Aeson.TH.consFromJSON: "
664− ++ "Not a single constructor given!"
783+ ++ "Not a single constructor given!"
665
784
666−consFromJSON jc tName opts instTys cons = do
785+consFromJSON jc tName opts cons = do
667 value <- newName "value"
786 value <- newName "value"
668 pjs <- newNameList "_pj" $ arityInt jc
787 pjs <- newNameList "_pj" $ arityInt jc
669 pjls <- newNameList "_pjl" $ arityInt jc
788 pjls <- newNameList "_pjl" $ arityInt jc
670 let zippedPJs = zip pjs pjls
789 let zippedPJs = zip pjs pjls
671 interleavedPJs = interleave pjs pjls
790 interleavedPJs = interleave pjs pjls
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
791+ lamE (map varP $ interleavedPJs ++ [value]) $ lamExpr value zippedPJs
675
792
676 where
793 where
677− checkExi tvMap con = checkExistentialContext jc tvMap
678− (constructorContext con)
679− (constructorName con)
680−
681− lamExpr value tvMap = case cons of
794+ lamExpr value pjs = case cons of
682− [con]
683− | not (tagSingleConstructors opts)
684− -> checkExi tvMap con $ parseArgs jc tvMap tName opts con (Right value)
795+ [con] -> parseArgs jc pjs tName opts con (Right value)
685 _ | sumEncoding opts == UntaggedValue
796 _ | sumEncoding opts == UntaggedValue
686− -> parseUntaggedValue tvMap cons value
797+ -> parseUntaggedValue pjs cons value
687 | otherwise
798 | otherwise
688 -> caseE (varE value) $
799 -> caseE (varE value) $
689 if allNullaryToStringTag opts && all isNullary cons
800 if allNullaryToStringTag opts && all isNullary cons
690 then allNullaryMatches
801 then allNullaryMatches
691− else mixedMatches tvMap
802+ else mixedMatches pjs
692
803
693 allNullaryMatches =
804 allNullaryMatches =
694 [ do txt <- newName "txt"
805 [ do txt <- newName "txt"
@@ -697,11 +808,12 @@ consFromJSON jc tName opts instTys cons = do
697 [ liftM2 (,) (normalG $
808 [ liftM2 (,) (normalG $
698 infixApp (varE txt)
809 infixApp (varE txt)
699 [|(==)|]
810 [|(==)|]
811+ ([|T.pack|] `appE`
700− (conTxt opts conName)
812+ conStringE opts conName)
701 )
813 )
702 ([|pure|] `appE` conE conName)
814 ([|pure|] `appE` conE conName)
703 | con <- cons
815 | con <- cons
704− , let conName = constructorName con
816+ , let conName = getConName con
705 ]
817 ]
706 ++
818 ++
707 [ liftM2 (,)
819 [ liftM2 (,)
@@ -722,13 +834,13 @@ consFromJSON jc tName opts instTys cons = do
722 []
834 []
723 ]
835 ]
724
836
725− mixedMatches tvMap =
837+ mixedMatches pjs =
726 case sumEncoding opts of
838 case sumEncoding opts of
727 TaggedObject {tagFieldName, contentsFieldName} ->
839 TaggedObject {tagFieldName, contentsFieldName} ->
728− parseObject $ parseTaggedObject tvMap tagFieldName contentsFieldName
840+ parseObject $ parseTaggedObject pjs tagFieldName contentsFieldName
729 UntaggedValue -> error "UntaggedValue: Should be handled already"
841 UntaggedValue -> error "UntaggedValue: Should be handled already"
730 ObjectWithSingleField ->
842 ObjectWithSingleField ->
731− parseObject $ parseObjectWithSingleField tvMap
843+ parseObject $ parseObjectWithSingleField pjs
732 TwoElemArray ->
844 TwoElemArray ->
733 [ do arr <- newName "array"
845 [ do arr <- newName "array"
734 match (conP 'Array [varP arr])
846 match (conP 'Array [varP arr])
@@ -736,7 +848,7 @@ consFromJSON jc tName opts instTys cons = do
736 [ liftM2 (,) (normalG $ infixApp ([|V.length|] `appE` varE arr)
848 [ liftM2 (,) (normalG $ infixApp ([|V.length|] `appE` varE arr)
737 [|(==)|]
849 [|(==)|]
738 (litE $ integerL 2))
850 (litE $ integerL 2))
739− (parse2ElemArray tvMap arr)
851+ (parse2ElemArray pjs arr)
740 , liftM2 (,) (normalG [|otherwise|])
852 , liftM2 (,) (normalG [|otherwise|])
741 ([|not2ElemArray|]
853 ([|not2ElemArray|]
742 `appE` litE (stringL $ show tName)
854 `appE` litE (stringL $ show tName)
@@ -767,29 +879,25 @@ consFromJSON jc tName opts instTys cons = do
767 []
879 []
768 ]
880 ]
769
881
770− parseTaggedObject tvMap typFieldName valFieldName obj = do
882+ parseTaggedObject pjs typFieldName valFieldName obj = do
771 conKey <- newName "conKey"
883 conKey <- newName "conKey"
772 doE [ bindS (varP conKey)
884 doE [ bindS (varP conKey)
773 (infixApp (varE obj)
885 (infixApp (varE obj)
774 [|(.:)|]
886 [|(.:)|]
775 ([|T.pack|] `appE` stringE typFieldName))
887 ([|T.pack|] `appE` stringE typFieldName))
776− , noBindS $ parseContents tvMap conKey (Left (valFieldName, obj)) 'conNotFoundFailTaggedObject
888+ , noBindS $ parseContents pjs conKey (Left (valFieldName, obj)) 'conNotFoundFailTaggedObject
777 ]
889 ]
778
890
779− parseUntaggedValue tvMap cons' conVal =
891+ parseUntaggedValue pjs cons' conVal =
780 foldr1 (\e e' -> infixApp e [|(<|>)|] e')
892 foldr1 (\e e' -> infixApp e [|(<|>)|] e')
781− (map (\x -> parseValue tvMap x conVal) cons')
893+ (map (\x -> parseValue pjs x conVal) cons')
782
894
783− parseValue _tvMap
895+ parseValue _pjs (NormalC conName []) conVal = do
784− ConstructorInfo { constructorName = conName
785− , constructorVariant = NormalConstructor
786− , constructorFields = [] }
787− conVal = do
788 str <- newName "str"
896 str <- newName "str"
789 caseE (varE conVal)
897 caseE (varE conVal)
790 [ match (conP 'String [varP str])
898 [ match (conP 'String [varP str])
791 (guardedB
899 (guardedB
792− [ liftM2 (,) (normalG $ infixApp (varE str) [|(==)|] (conTxt opts conName)
900+ [ liftM2 (,) (normalG $ infixApp (varE str) [|(==)|] ([|T.pack|] `appE` conStringE opts conName)
793 )
901 )
794 ([|pure|] `appE` conE conName)
902 ([|pure|] `appE` conE conName)
795 ]
903 ]
@@ -797,11 +905,11 @@ consFromJSON jc tName opts instTys cons = do
797 []
905 []
798 , matchFailed tName conName "String"
906 , matchFailed tName conName "String"
799 ]
907 ]
800− parseValue tvMap con conVal =
908+ parseValue pjs con conVal =
801− checkExi tvMap con $ parseArgs jc tvMap tName opts con (Right conVal)
909+ parseArgs jc pjs tName opts con (Right conVal)
802
910
803
911
804− parse2ElemArray tvMap arr = do
912+ parse2ElemArray pjs arr = do
805 conKey <- newName "conKey"
913 conKey <- newName "conKey"
806 conVal <- newName "conVal"
914 conVal <- newName "conVal"
807 let letIx n ix =
915 let letIx n ix =
@@ -816,7 +924,7 @@ consFromJSON jc tName opts instTys cons = do
816 (caseE (varE conKey)
924 (caseE (varE conKey)
817 [ do txt <- newName "txt"
925 [ do txt <- newName "txt"
818 match (conP 'String [varP txt])
926 match (conP 'String [varP txt])
819− (normalB $ parseContents tvMap
927+ (normalB $ parseContents pjs
820 txt
928 txt
821 (Right conVal)
929 (Right conVal)
822 'conNotFoundFail2ElemArray
930 'conNotFoundFail2ElemArray
@@ -833,12 +941,12 @@ consFromJSON jc tName opts instTys cons = do
833 ]
941 ]
834 )
942 )
835
943
836− parseObjectWithSingleField tvMap obj = do
944+ parseObjectWithSingleField pjs obj = do
837 conKey <- newName "conKey"
945 conKey <- newName "conKey"
838 conVal <- newName "conVal"
946 conVal <- newName "conVal"
839 caseE ([e|H.toList|] `appE` varE obj)
947 caseE ([e|H.toList|] `appE` varE obj)
840 [ match (listP [tupP [varP conKey, varP conVal]])
948 [ match (listP [tupP [varP conKey, varP conVal]])
841− (normalB $ parseContents tvMap conKey (Right conVal) 'conNotFoundFailObjectSingleField)
949+ (normalB $ parseContents pjs conKey (Right conVal) 'conNotFoundFailObjectSingleField)
842 []
950 []
843 , do other <- newName "other"
951 , do other <- newName "other"
844 match (varP other)
952 match (varP other)
@@ -849,7 +957,7 @@ consFromJSON jc tName opts instTys cons = do
849 []
957 []
850 ]
958 ]
851
959
852− parseContents tvMap conKey contents errorFun =
960+ parseContents pjs conKey contents errorFun =
853 caseE (varE conKey)
961 caseE (varE conKey)
854 [ match wildP
962 [ match wildP
855 ( guardedB $
963 ( guardedB $
@@ -857,8 +965,7 @@ consFromJSON jc tName opts instTys cons = do
857 [|(==)|]
965 [|(==)|]
858 ([|T.pack|] `appE`
966 ([|T.pack|] `appE`
859 conNameExp opts con)
967 conNameExp opts con)
860− e <- checkExi tvMap con $
861− parseArgs jc tvMap tName opts con contents
968+ e <- parseArgs jc pjs tName opts con contents
862 return (g, e)
969 return (g, e)
863 | con <- cons
970 | con <- cons
864 ]
971 ]
@@ -871,7 +978,7 @@ consFromJSON jc tName opts instTys cons = do
871 . stringL
978 . stringL
872 . constructorTagModifier opts
979 . constructorTagModifier opts
873 . nameBase
980 . nameBase
874− . constructorName
981+ . getConName
875 ) cons
982 ) cons
876 )
983 )
877 `appE` ([|T.unpack|] `appE` varE conKey)
984 `appE` ([|T.unpack|] `appE` varE conKey)
@@ -920,42 +1027,22 @@ parseRecord :: JSONClass
920 -> Options
1027 -> Options
921 -> Name
1028 -> Name
922 -> Name
1029 -> Name
923− -> [Name]
1030+ -> [VarStrictType]
924 -> Name
1031 -> Name
925− -> Bool
926 -> ExpQ
1032 -> ExpQ
927−parseRecord jc tvMap argTys opts tName conName fields obj inTaggedObject =
1033+parseRecord jc tvMap argTys opts tName conName ts obj =
928− (if rejectUnknownFields opts
929− then infixApp checkUnknownRecords [|(>>)|]
930− else id) $
931 foldl' (\a b -> infixApp a [|(<*>)|] b)
1034 foldl' (\a b -> infixApp a [|(<*>)|] b)
932 (infixApp (conE conName) [|(<$>)|] x)
1035 (infixApp (conE conName) [|(<$>)|] x)
933 xs
1036 xs
934 where
1037 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− ]
951 x:xs = [ [|lookupField|]
1038 x:xs = [ [|lookupField|]
952 `appE` dispatchParseJSON jc conName tvMap argTy
1039 `appE` dispatchParseJSON jc conName tvMap argTy
953 `appE` litE (stringL $ show tName)
1040 `appE` litE (stringL $ show tName)
954 `appE` litE (stringL $ constructorTagModifier opts $ nameBase conName)
1041 `appE` litE (stringL $ constructorTagModifier opts $ nameBase conName)
955 `appE` varE obj
1042 `appE` varE obj
956− `appE` ( [|T.pack|] `appE` stringE (fieldLabel opts field)
1043+ `appE` ( [|T.pack|] `appE` fieldLabelExp opts field
957 )
1044 )
958− | (field, argTy) <- zip fields argTys
1045+ | ((field, _, _), argTy) <- zip ts argTys
959 ]
1046 ]
960
1047
961getValField :: Name -> String -> [MatchQ] -> Q Exp
1048getValField :: Name -> String -> [MatchQ] -> Q Exp
@@ -974,82 +1061,67 @@ matchCases (Right valName) = caseE (varE valName)
974
1061
975-- | Generates code to parse the JSON encoding of a single constructor.
1062-- | Generates code to parse the JSON encoding of a single constructor.
976parseArgs :: JSONClass -- ^ The FromJSON variant being derived.
1063parseArgs :: JSONClass -- ^ The FromJSON variant being derived.
977− -> TyVarMap -- ^ Maps the last type variables to their decoding
978− -- function arguments.
1064+ -> [(Name, Name)] -- ^ The names of the encoding/decoding function arguments.
979 -> Name -- ^ Name of the type to which the constructor belongs.
1065 -> Name -- ^ Name of the type to which the constructor belongs.
980 -> Options -- ^ Encoding options.
1066 -> Options -- ^ Encoding options.
981− -> ConstructorInfo -- ^ Constructor for which to generate JSON parsing code.
1067+ -> Con -- ^ Constructor for which to generate JSON parsing code.
982 -> Either (String, Name) Name -- ^ Left (valFieldName, objName) or
1068 -> Either (String, Name) Name -- ^ Left (valFieldName, objName) or
983 -- Right valName
1069 -- Right valName
984 -> Q Exp
1070 -> Q Exp
985-- Nullary constructors.
1071-- Nullary constructors.
986−parseArgs _ _ _ _
1072+parseArgs jc pjs _ _ (NormalC conName []) (Left _) = do
987− ConstructorInfo { constructorName = conName
1073+ ([], _) <- reifyConTys jc pjs conName
988− , constructorVariant = NormalConstructor
989− , constructorFields = [] }
990− (Left _) =
991− [|pure|] `appE` conE conName
1074+ [|pure|] `appE` conE conName
992−parseArgs _ _ tName _
1075+parseArgs jc pjs tName _ (NormalC conName []) (Right valName) = do
993− ConstructorInfo { constructorName = conName
1076+ ([], _) <- reifyConTys jc pjs conName
994− , constructorVariant = NormalConstructor
995− , constructorFields = [] }
996− (Right valName) =
997− caseE (varE valName) $ parseNullaryMatches tName conName
1077+ caseE (varE valName) $ parseNullaryMatches tName conName
998
1078
999-- Unary constructors.
1079-- Unary constructors.
1000−parseArgs jc tvMap _ _
1080+parseArgs jc pjs _ _ (NormalC conName [_]) contents = do
1001− ConstructorInfo { constructorName = conName
1081+ ([argTy], tvMap) <- reifyConTys jc pjs conName
1002− , constructorVariant = NormalConstructor
1003− , constructorFields = [argTy] }
1004− contents = do
1005− argTy' <- resolveTypeSynonyms argTy
1006− matchCases contents $ parseUnaryMatches jc tvMap argTy' conName
1082+ matchCases contents $ parseUnaryMatches jc tvMap argTy conName
1007
1083
1008-- Polyadic constructors.
1084-- Polyadic constructors.
1009−parseArgs jc tvMap tName _
1085+parseArgs jc pjs tName _ (NormalC conName ts) contents = do
1010− ConstructorInfo { constructorName = conName
1086+ (argTys, tvMap) <- reifyConTys jc pjs conName
1011− , constructorVariant = NormalConstructor
1012− , constructorFields = argTys }
1013− contents = do
1014− argTys' <- mapM resolveTypeSynonyms argTys
1015− let len = genericLength argTys'
1087+ let len = genericLength ts
1016− matchCases contents $ parseProduct jc tvMap argTys' tName conName len
1088+ matchCases contents $ parseProduct jc tvMap argTys tName conName len
1017
1089
1018-- Records.
1090-- Records.
1019−parseArgs jc tvMap tName opts
1091+parseArgs jc pjs tName opts (RecC conName ts) (Left (_, obj)) = do
1020− ConstructorInfo { constructorName = conName
1092+ (argTys, tvMap) <- reifyConTys jc pjs conName
1021− , constructorVariant = RecordConstructor fields
1022− , constructorFields = argTys }
1023− (Left (_, obj)) = do
1024− argTys' <- mapM resolveTypeSynonyms argTys
1025− parseRecord jc tvMap argTys' opts tName conName fields obj True
1093+ parseRecord jc tvMap argTys opts tName conName ts obj
1026−parseArgs jc tvMap tName opts
1027− info@ConstructorInfo { constructorName = conName
1028− , constructorVariant = RecordConstructor fields
1029− , constructorFields = argTys }
1030− (Right valName) =
1031− case (unwrapUnaryRecords opts,argTys) of
1094+parseArgs jc pjs tName opts (RecC conName ts) (Right valName) = case (unwrapUnaryRecords opts,ts) of
1032− (True,[_])-> parseArgs jc tvMap tName opts
1095+ (True,[(_,st,ty)])-> parseArgs jc pjs tName opts (NormalC conName [(st,ty)]) (Right valName)
1033− (info{constructorVariant = NormalConstructor})
1034− (Right valName)
1035− _ -> do
1096+ _ -> do
1036− obj <- newName "recObj"
1097+ obj <- newName "recObj"
1037− argTys' <- mapM resolveTypeSynonyms argTys
1098+ (argTys, tvMap) <- reifyConTys jc pjs conName
1038− caseE (varE valName)
1099+ caseE (varE valName)
1039− [ match (conP 'Object [varP obj]) (normalB $
1100+ [ match (conP 'Object [varP obj]) (normalB $
1040− parseRecord jc tvMap argTys' opts tName conName fields obj False) []
1101+ parseRecord jc tvMap argTys opts tName conName ts obj) []
1041− , matchFailed tName conName "Object"
1102+ , matchFailed tName conName "Object"
1042− ]
1103+ ]
1043
1104
1044-- Infix constructors. Apart from syntax these are the same as
1105-- Infix constructors. Apart from syntax these are the same as
1045-- polyadic constructors.
1106-- polyadic constructors.
1046−parseArgs jc tvMap tName _
1107+parseArgs jc pjs tName _ (InfixC _ conName _) contents = do
1047− ConstructorInfo { constructorName = conName
1108+ (argTys, tvMap) <- reifyConTys jc pjs conName
1048− , constructorVariant = InfixConstructor
1049− , constructorFields = argTys }
1050− contents = do
1051− argTys' <- mapM resolveTypeSynonyms argTys
1052− matchCases contents $ parseProduct jc tvMap argTys' tName conName 2
1109+ matchCases contents $ parseProduct jc tvMap argTys tName conName 2
1110+
1111+-- Existentially quantified constructors. We ignore the quantifiers
1112+-- and proceed with the contained constructor.
1113+parseArgs jc pjs tName opts (ForallC _ _ con) contents =
1114+ parseArgs jc pjs tName opts con contents
1115+
1116+#if MIN_VERSION_template_haskell(2,11,0)
1117+-- GADTs. We ignore the refined return type and proceed as if it were a
1118+-- NormalC or RecC.
1119+parseArgs jc pjs tName opts (GadtC conNames ts _) contents =
1120+ parseArgs jc pjs tName opts (NormalC (head conNames) ts) contents
1121+
1122+parseArgs jc pjs tName opts (RecGadtC conNames ts _) contents =
1123+ parseArgs jc pjs tName opts (RecC (head conNames) ts) contents
1124+#endif
1053
1125
1054-- | Generates code to parse the JSON encoding of an n-ary
1126-- | Generates code to parse the JSON encoding of an n-ary
1055-- constructor.
1127-- constructor.
@@ -1126,11 +1198,6 @@ instance OVERLAPPABLE_ LookupField a where
1126instance INCOHERENT_ LookupField (Maybe a) where
1198instance INCOHERENT_ LookupField (Maybe a) where
1127 lookupField pj _ _ = parseOptionalFieldWith pj
1199 lookupField pj _ _ = parseOptionalFieldWith pj
1128
1200
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−
1134lookupFieldWith :: (Value -> Parser a) -> String -> String
1201lookupFieldWith :: (Value -> Parser a) -> String -> String
1135 -> Object -> T.Text -> Parser a
1202 -> Object -> T.Text -> Parser a
1136lookupFieldWith pj tName rec obj key =
1203lookupFieldWith pj tName rec obj key =
@@ -1138,6 +1205,9 @@ lookupFieldWith pj tName rec obj key =
1138 Nothing -> unknownFieldFail tName rec (T.unpack key)
1205 Nothing -> unknownFieldFail tName rec (T.unpack key)
1139 Just v -> pj v <?> Key key
1206 Just v -> pj v <?> Key key
1140
1207
1208+keyValuePairWith :: (v -> Value) -> T.Text -> v -> Pair
1209+keyValuePairWith tj name value = (name, tj value)
1210+
1141unknownFieldFail :: String -> String -> String -> Parser fail
1211unknownFieldFail :: String -> String -> String -> Parser fail
1142unknownFieldFail tName rec key =
1212unknownFieldFail tName rec key =
1143 fail $ printf "When parsing the record %s of type %s the key %s was not present."
1213 fail $ printf "When parsing the record %s of type %s the key %s was not present."
@@ -1206,8 +1276,7 @@ deriveJSONBoth dtj dfj opts name =
1206 liftM2 (++) (dtj opts name) (dfj opts name)
1276 liftM2 (++) (dtj opts name) (dfj opts name)
1207
1277
1208-- | Functionality common to @deriveToJSON(1)(2)@ and @deriveFromJSON(1)(2)@.
1278-- | Functionality common to @deriveToJSON(1)(2)@ and @deriveFromJSON(1)(2)@.
1209−deriveJSONClass :: [(JSONFun, JSONClass -> Name -> Options -> [Type]
1279+deriveJSONClass :: [(JSONFun, JSONClass -> Name -> Options -> [Con] -> Q Exp)]
1210− -> [ConstructorInfo] -> Q Exp)]
1211 -- ^ The class methods and the functions which derive them.
1280 -- ^ The class methods and the functions which derive them.
1212 -> JSONClass
1281 -> JSONClass
1213 -- ^ The class for which to generate an instance.
1282 -- ^ The class for which to generate an instance.
@@ -1217,34 +1286,27 @@ deriveJSONClass :: [(JSONFun, JSONClass -> Name -> Options -> [Type]
1217 -- ^ Name of the type for which to generate a class instance
1286 -- ^ Name of the type for which to generate a class instance
1218 -- declaration.
1287 -- declaration.
1219 -> Q [Dec]
1288 -> Q [Dec]
1220−deriveJSONClass consFuns jc opts name = do
1289+deriveJSONClass consFuns jc opts name =
1221− info <- reifyDatatype name
1290+ withType name $ \name' ctxt tvbs cons mbTys ->
1222− case info of
1291+ (:[]) <$> fromCons name' ctxt tvbs cons mbTys
1223− DatatypeInfo { datatypeContext = ctxt
1224− , datatypeName = parentName
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
1233− (instanceCxt, instanceType)
1234− <- buildTypeInstance parentName jc ctxt instTys variant
1235− (:[]) <$> instanceD (return instanceCxt)
1236− (return instanceType)
1237− (methodDecs parentName instTys cons)
1238 where
1292 where
1239− methodDecs :: Name -> [Type] -> [ConstructorInfo] -> [Q Dec]
1293+ fromCons :: Name -> Cxt -> [TyVarBndr] -> [Con] -> Maybe [Type] -> Q Dec
1294+ fromCons name' ctxt tvbs cons mbTys = do
1295+ (instanceCxt, instanceType)
1296+ <- buildTypeInstance name' jc ctxt tvbs mbTys
1297+ instanceD (return instanceCxt)
1298+ (return instanceType)
1299+ (methodDecs name' cons)
1300+
1301+ methodDecs :: Name -> [Con] -> [Q Dec]
1240− methodDecs parentName instTys cons = flip map consFuns $ \(jf, jfMaker) ->
1302+ methodDecs name' cons = flip map consFuns $ \(jf, jfMaker) ->
1241 funD (jsonFunValName jf (arity jc))
1303 funD (jsonFunValName jf (arity jc))
1242 [ clause []
1304 [ clause []
1243− (normalB $ jfMaker jc parentName opts instTys cons)
1305+ (normalB $ jfMaker jc name' opts cons)
1244 []
1306 []
1245 ]
1307 ]
1246
1308
1247−mkFunCommon :: (JSONClass -> Name -> Options -> [Type] -> [ConstructorInfo] -> Q Exp)
1309+mkFunCommon :: (JSONClass -> Name -> Options -> [Con] -> Q Exp)
1248 -- ^ The function which derives the expression.
1310 -- ^ The function which derives the expression.
1249 -> JSONClass
1311 -> JSONClass
1250 -- ^ Which class's method is being derived.
1312 -- ^ Which class's method is being derived.
@@ -1253,24 +1315,15 @@ mkFunCommon :: (JSONClass -> Name -> Options -> [Type] -> [ConstructorInfo] -> Q
1253 -> Name
1315 -> Name
1254 -- ^ Name of the encoded type.
1316 -- ^ Name of the encoded type.
1255 -> Q Exp
1317 -> Q Exp
1256−mkFunCommon consFun jc opts name = do
1318+mkFunCommon consFun jc opts name = withType name fromCons
1257− info <- reifyDatatype name
1319+ where
1258− case info of
1320+ fromCons :: Name -> Cxt -> [TyVarBndr] -> [Con] -> Maybe [Type] -> Q Exp
1259− DatatypeInfo { datatypeContext = ctxt
1321+ fromCons name' ctxt tvbs cons mbTys = do
1260− , datatypeName = parentName
1261−#if MIN_VERSION_th_abstraction(0,3,0)
1262− , datatypeInstTypes = instTys
1263−#else
1264− , datatypeVars = instTys
1265−#endif
1266− , datatypeVariant = variant
1267− , datatypeCons = cons
1268− } -> do
1269− -- We force buildTypeInstance here since it performs some checks for whether
1322+ -- We force buildTypeInstance here since it performs some checks for whether
1270− -- or not the provided datatype's kind matches the derived method's
1323+ -- or not the provided datatype's kind matches the derived method's
1271− -- typeclass, and produces errors if it can't.
1324+ -- typeclass, and produces errors if it can't.
1272− !_ <- buildTypeInstance parentName jc ctxt instTys variant
1325+ !_ <- buildTypeInstance name' jc ctxt tvbs mbTys
1273− consFun jc parentName opts instTys cons
1326+ consFun jc name' opts cons
1274
1327
1275dispatchFunByType :: JSONClass
1328dispatchFunByType :: JSONClass
1276 -> JSONFun
1329 -> JSONFun
@@ -1315,37 +1368,200 @@ dispatchFunByType jc jf conName tvMap list ty = do
1315 (interleave rhsArgs rhsArgs)
1368 (interleave rhsArgs rhsArgs)
1316 else varE $ jsonFunValOrListName list jf Arity0
1369 else varE $ jsonFunValOrListName list jf Arity0
1317
1370
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
1371+dispatchToJSON, dispatchToEncoding, dispatchParseJSON
1324 :: JSONClass -> Name -> TyVarMap -> Type -> Q Exp
1372 :: JSONClass -> Name -> TyVarMap -> Type -> Q Exp
1373+dispatchToJSON jc n tvMap = dispatchFunByType jc ToJSON n tvMap False
1374+dispatchToEncoding jc n tvMap = dispatchFunByType jc ToEncoding n tvMap False
1325dispatchParseJSON jc n tvMap = dispatchFunByType jc ParseJSON n tvMap False
1375dispatchParseJSON jc n tvMap = dispatchFunByType jc ParseJSON n tvMap False
1326
1376
1327--------------------------------------------------------------------------------
1377--------------------------------------------------------------------------------
1328-- Utility functions
1378-- Utility functions
1329--------------------------------------------------------------------------------
1379--------------------------------------------------------------------------------
1330
1380
1331−-- For the given Types, generate an instance context and head.
1381+-- | Boilerplate for top level splices.
1382+--
1383+-- The given 'Name' must meet one of two criteria:
1384+--
1385+-- 1. It must be the name of a type constructor of a plain data type or newtype.
1386+-- 2. It must be the name of a data family instance or newtype instance constructor.
1387+
1388+-- Any other value will result in an exception.
1389+withType :: Name
1390+ -> (Name -> Cxt -> [TyVarBndr] -> [Con] -> Maybe [Type] -> Q a)
1391+ -- ^ Function that generates the actual code. Will be applied
1392+ -- to the datatype/data family 'Name', datatype context, type
1393+ -- variable binders and constructors extracted from the given
1394+ -- 'Name'. If the 'Name' is from a data family instance
1395+ -- constructor, it will also have its instantiated types;
1396+ -- otherwise, it will be 'Nothing'.
1397+ -> Q a
1398+ -- ^ Resulting value in the 'Q'uasi monad.
1399+withType name f = do
1400+ info <- reify name
1401+ case info of
1402+ TyConI dec ->
1403+ case dec of
1404+#if MIN_VERSION_template_haskell(2,11,0)
1405+ DataD ctxt _ tvbs _ cons _ -> f name ctxt tvbs cons Nothing
1406+ NewtypeD ctxt _ tvbs _ con _ -> f name ctxt tvbs [con] Nothing
1407+#else
1408+ DataD ctxt _ tvbs cons _ -> f name ctxt tvbs cons Nothing
1409+ NewtypeD ctxt _ tvbs con _ -> f name ctxt tvbs [con] Nothing
1410+#endif
1411+ other -> fail $ ns ++ "Unsupported type: " ++ show other
1412+#if MIN_VERSION_template_haskell(2,11,0)
1413+ DataConI _ _ parentName -> do
1414+#else
1415+ DataConI _ _ parentName _ -> do
1416+#endif
1417+ parentInfo <- reify parentName
1418+ case parentInfo of
1419+#if MIN_VERSION_template_haskell(2,11,0)
1420+ FamilyI (DataFamilyD _ tvbs _) decs ->
1421+#else
1422+ FamilyI (FamilyD DataFam _ tvbs _) decs ->
1423+#endif
1424+ let instDec = flip find decs $ \dec -> case dec of
1425+#if MIN_VERSION_template_haskell(2,11,0)
1426+ DataInstD _ _ _ _ cons _ -> any ((name ==) . getConName) cons
1427+ NewtypeInstD _ _ _ _ con _ -> name == getConName con
1428+#else
1429+ DataInstD _ _ _ cons _ -> any ((name ==) . getConName) cons
1430+ NewtypeInstD _ _ _ con _ -> name == getConName con
1431+#endif
1432+ _ -> error $ ns ++ "Must be a data or newtype instance."
1433+ in case instDec of
1434+#if MIN_VERSION_template_haskell(2,11,0)
1435+ Just (DataInstD ctxt _ instTys _ cons _) -> f parentName ctxt tvbs cons $ Just instTys
1436+ Just (NewtypeInstD ctxt _ instTys _ con _) -> f parentName ctxt tvbs [con] $ Just instTys
1437+#else
1438+ Just (DataInstD ctxt _ instTys cons _) -> f parentName ctxt tvbs cons $ Just instTys
1439+ Just (NewtypeInstD ctxt _ instTys con _) -> f parentName ctxt tvbs [con] $ Just instTys
1440+#endif
1441+ _ -> fail $ ns ++
1442+ "Could not find data or newtype instance constructor."
1443+ _ -> fail $ ns ++ "Data constructor " ++ show name ++
1444+ " is not from a data family instance constructor."
1445+#if MIN_VERSION_template_haskell(2,11,0)
1446+ FamilyI DataFamilyD{} _ ->
1447+#else
1448+ FamilyI (FamilyD DataFam _ _ _) _ ->
1449+#endif
1450+ fail $ ns ++
1451+ "Cannot use a data family name. Use a data family instance constructor instead."
1452+ _ -> fail $ ns ++ "I need the name of a plain data type constructor, "
1453+ ++ "or a data family instance constructor."
1454+ where
1455+ ns :: String
1456+ ns = "Data.Aeson.TH.withType: "
1457+
1458+-- | Infer the context and instance head needed for a FromJSON or ToJSON instance.
1332buildTypeInstance :: Name
1459buildTypeInstance :: Name
1333 -- ^ The type constructor or data family name
1460 -- ^ The type constructor or data family name
1334 -> JSONClass
1461 -> JSONClass
1335 -- ^ The typeclass to derive
1462 -- ^ The typeclass to derive
1336 -> Cxt
1463 -> Cxt
1337 -- ^ The datatype context
1464 -- ^ The datatype context
1465+ -> [TyVarBndr]
1466+ -- ^ The type variables from the data type/data family declaration
1338− -> [Type]
1467+ -> Maybe [Type]
1339− -- ^ The types to instantiate the instance with
1340− -> DatatypeVariant
1341− -- ^ Are we dealing with a data family instance or not
1468+ -- ^ 'Just' the types used to instantiate a data family instance,
1469+ -- or 'Nothing' if it's a plain data type
1342 -> Q (Cxt, Type)
1470 -> Q (Cxt, Type)
1471+ -- ^ The resulting 'Cxt' and 'Type' to use in a class instance
1472+-- Plain data type/newtype case
1343−buildTypeInstance tyConName jc dataCxt varTysOrig variant = do
1473+buildTypeInstance tyConName jc dataCxt tvbs Nothing =
1474+ let varTys :: [Type]
1475+ varTys = map tvbToType tvbs
1476+ in buildTypeInstanceFromTys tyConName jc dataCxt varTys False
1477+-- Data family instance case
1478+--
1479+-- The CPP is present to work around a couple of annoying old GHC bugs.
1480+-- See Note [Polykinded data families in Template Haskell]
1481+buildTypeInstance dataFamName jc dataCxt tvbs (Just instTysAndKinds) = do
1482+#if !(MIN_VERSION_template_haskell(2,8,0)) || MIN_VERSION_template_haskell(2,10,0)
1483+ let instTys :: [Type]
1484+ instTys = zipWith stealKindForType tvbs instTysAndKinds
1485+#else
1486+ let kindVarNames :: [Name]
1487+ kindVarNames = nub $ concatMap (tyVarNamesOfType . tvbKind) tvbs
1488+
1489+ numKindVars :: Int
1490+ numKindVars = length kindVarNames
1491+
1492+ givenKinds, givenKinds' :: [Kind]
1493+ givenTys :: [Type]
1494+ (givenKinds, givenTys) = splitAt numKindVars instTysAndKinds
1495+ givenKinds' = map sanitizeStars givenKinds
1496+
1497+ -- A GHC 7.6-specific bug requires us to replace all occurrences of
1498+ -- (ConT GHC.Prim.*) with StarT, or else Template Haskell will reject it.
1499+ -- Luckily, (ConT GHC.Prim.*) only seems to occur in this one spot.
1500+ sanitizeStars :: Kind -> Kind
1501+ sanitizeStars = go
1502+ where
1503+ go :: Kind -> Kind
1504+ go (AppT t1 t2) = AppT (go t1) (go t2)
1505+ go (SigT t k) = SigT (go t) (go k)
1506+ go (ConT n) | n == starKindName = StarT
1507+ go t = t
1508+
1509+ -- It's quite awkward to import * from GHC.Prim, so we'll just
1510+ -- hack our way around it.
1511+ starKindName :: Name
1512+ starKindName = mkNameG_tc "ghc-prim" "GHC.Prim" "*"
1513+
1514+ -- If we run this code with GHC 7.8, we might have to generate extra type
1515+ -- variables to compensate for any type variables that Template Haskell
1516+ -- eta-reduced away.
1517+ -- See Note [Polykinded data families in Template Haskell]
1518+ xTypeNames <- newNameList "tExtra" (length tvbs - length givenTys)
1519+
1520+ let xTys :: [Type]
1521+ xTys = map VarT xTypeNames
1522+ -- ^ Because these type variables were eta-reduced away, we can only
1523+ -- determine their kind by using stealKindForType. Therefore, we mark
1524+ -- them as VarT to ensure they will be given an explicit kind annotation
1525+ -- (and so the kind inference machinery has the right information).
1526+
1527+ substNamesWithKinds :: [(Name, Kind)] -> Type -> Type
1528+ substNamesWithKinds nks t = foldr' (uncurry substNameWithKind) t nks
1529+
1530+ -- The types from the data family instance might not have explicit kind
1531+ -- annotations, which the kind machinery needs to work correctly. To
1532+ -- compensate, we use stealKindForType to explicitly annotate any
1533+ -- types without kind annotations.
1534+ instTys :: [Type]
1535+ instTys = map (substNamesWithKinds (zip kindVarNames givenKinds'))
1536+ -- Note that due to a GHC 7.8-specific bug
1537+ -- (see Note [Polykinded data families in Template Haskell]),
1538+ -- there may be more kind variable names than there are kinds
1539+ -- to substitute. But this is OK! If a kind is eta-reduced, it
1540+ -- means that is was not instantiated to something more specific,
1541+ -- so we need not substitute it. Using stealKindForType will
1542+ -- grab the correct kind.
1543+ $ zipWith stealKindForType tvbs (givenTys ++ xTys)
1544+#endif
1545+ buildTypeInstanceFromTys dataFamName jc dataCxt instTys True
1546+
1547+-- For the given Types, generate an instance context and head.
1548+buildTypeInstanceFromTys :: Name
1549+ -- ^ The type constructor or data family name
1550+ -> JSONClass
1551+ -- ^ The typeclass to derive
1552+ -> Cxt
1553+ -- ^ The datatype context
1554+ -> [Type]
1555+ -- ^ The types to instantiate the instance with
1556+ -> Bool
1557+ -- ^ True if it's a data family, False otherwise
1558+ -> Q (Cxt, Type)
1559+buildTypeInstanceFromTys tyConName jc dataCxt varTysOrig isDataFamily = do
1344 -- Make sure to expand through type/kind synonyms! Otherwise, the
1560 -- Make sure to expand through type/kind synonyms! Otherwise, the
1345 -- eta-reduction check might get tripped up over type variables in a
1561 -- eta-reduction check might get tripped up over type variables in a
1346 -- synonym that are actually dropped.
1562 -- synonym that are actually dropped.
1347 -- (See GHC Trac #11416 for a scenario where this actually happened.)
1563 -- (See GHC Trac #11416 for a scenario where this actually happened.)
1348− varTysExp <- mapM resolveTypeSynonyms varTysOrig
1564+ varTysExp <- mapM expandSyn varTysOrig
1349
1565
1350 let remainingLength :: Int
1566 let remainingLength :: Int
1351 remainingLength = length varTysOrig - arityInt jc
1567 remainingLength = length varTysOrig - arityInt jc
@@ -1375,7 +1591,7 @@ buildTypeInstance tyConName jc dataCxt varTysOrig variant = do
1375 -- All of the type variables mentioned in the dropped types
1591 -- All of the type variables mentioned in the dropped types
1376 -- (post-synonym expansion)
1592 -- (post-synonym expansion)
1377 droppedTyVarNames :: [Name]
1593 droppedTyVarNames :: [Name]
1378− droppedTyVarNames = freeVariables droppedTysExpSubst
1594+ droppedTyVarNames = concatMap tyVarNamesOfType droppedTysExpSubst
1379
1595
1380 -- If any of the dropped types were polykinded, ensure that they are of kind *
1596 -- If any of the dropped types were polykinded, ensure that they are of kind *
1381 -- after substituting * for the dropped kind variables. If not, throw an error.
1597 -- after substituting * for the dropped kind variables. If not, throw an error.
@@ -1416,13 +1632,6 @@ buildTypeInstance tyConName jc dataCxt varTysOrig variant = do
1416 map (substNamesWithKindStar (droppedKindVarNames `union` kvNames'))
1632 map (substNamesWithKindStar (droppedKindVarNames `union` kvNames'))
1417 $ take remainingLength varTysOrig
1633 $ take remainingLength varTysOrig
1418
1634
1419− isDataFamily :: Bool
1420− isDataFamily = case variant of
1421− Datatype -> False
1422− Newtype -> False
1423− DataInstance -> True
1424− NewtypeInstance -> True
1425−
1426 remainingTysOrigSubst' :: [Type]
1635 remainingTysOrigSubst' :: [Type]
1427 -- See Note [Kind signatures in derived instances] for an explanation
1636 -- See Note [Kind signatures in derived instances] for an explanation
1428 -- of the isDataFamily check.
1637 -- of the isDataFamily check.
@@ -1476,6 +1685,55 @@ deriveConstraint jc t
1476 jcConstraint = jsonClassName . JSONClass (direction jc)
1685 jcConstraint = jsonClassName . JSONClass (direction jc)
1477
1686
1478{-
1687{-
1688+Note [Polykinded data families in Template Haskell]
1689+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1690+
1691+In order to come up with the correct instance context and head for an instance, e.g.,
1692+
1693+ instance C a => C (Data a) where ...
1694+
1695+We need to know the exact types and kinds used to instantiate the instance. For
1696+plain old datatypes, this is simple: every type must be a type variable, and
1697+Template Haskell reliably tells us the type variables and their kinds.
1698+
1699+Doing the same for data families proves to be much harder for three reasons:
1700+
1701+1. On any version of Template Haskell, it may not tell you what an instantiated
1702+ type's kind is. For instance, in the following data family instance:
1703+
1704+ data family Fam (f :: * -> *) (a :: *)
1705+ data instance Fam f a
1706+
1707+ Then if we use TH's reify function, it would tell us the TyVarBndrs of the
1708+ data family declaration are:
1709+
1710+ [KindedTV f (AppT (AppT ArrowT StarT) StarT),KindedTV a StarT]
1711+
1712+ and the instantiated types of the data family instance are:
1713+
1714+ [VarT f1,VarT a1]
1715+
1716+ We can't just pass [VarT f1,VarT a1] to buildTypeInstanceFromTys, since we
1717+ have no way of knowing their kinds. Luckily, the TyVarBndrs tell us what the
1718+ kind is in case an instantiated type isn't a SigT, so we use the stealKindForType
1719+ function to ensure all of the instantiated types are SigTs before passing them
1720+ to buildTypeInstanceFromTys.
1721+2. On GHC 7.6 and 7.8, a bug is present in which Template Haskell lists all of
1722+ the specified kinds of a data family instance efore any of the instantiated
1723+ types. Fortunately, this is easy to deal with: you simply count the number of
1724+ distinct kind variables in the data family declaration, take that many elements
1725+ from the front of the Types list of the data family instance, substitute the
1726+ kind variables with their respective instantiated kinds (which you took earlier),
1727+ and proceed as normal.
1728+3. On GHC 7.8, an even uglier bug is present (GHC Trac #9692) in which Template
1729+ Haskell might not even list all of the Types of a data family instance, since
1730+ they are eta-reduced away! And yes, kinds can be eta-reduced too.
1731+
1732+ The simplest workaround is to count how many instantiated types are missing from
1733+ the list and generate extra type variables to use in their place. Luckily, we
1734+ needn't worry much if its kind was eta-reduced away, since using stealKindForType
1735+ will get it back.
1736+
1479Note [Kind signatures in derived instances]
1737Note [Kind signatures in derived instances]
1480~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1738~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1481
1739
@@ -1553,14 +1811,50 @@ things we can do to make instance contexts that work for 80% of use cases:
1553 and perform kind substitution as in the other cases.
1811 and perform kind substitution as in the other cases.
1554-}
1812-}
1555
1813
1556−checkExistentialContext :: JSONClass -> TyVarMap -> Cxt -> Name
1814+-- Determines the types of a constructor's arguments as well as the last type
1557− -> Q a -> Q a
1815+-- parameters (mapped to their encoding/decoding functions), expanding through
1558−checkExistentialContext jc tvMap ctxt conName q =
1816+-- any type synonyms.
1817+--
1818+-- The type parameters are determined on a constructor-by-constructor basis since
1819+-- they may be refined to be particular types in a GADT.
1820+reifyConTys :: JSONClass
1821+ -> [(Name, Name)]
1822+ -> Name
1823+ -> Q ([Type], TyVarMap)
1824+reifyConTys jc tpjs conName = do
1825+ info <- reify conName
1826+ (ctxt, uncTy) <- case info of
1827+ DataConI _ ty _
1828+#if !(MIN_VERSION_template_haskell(2,11,0))
1829+ _
1830+#endif
1831+ -> fmap uncurryTy (expandSyn ty)
1832+ _ -> error "Must be a data constructor"
1833+ let (argTys, [resTy]) = NE.splitAt (NE.length uncTy - 1) uncTy
1834+ unapResTy = unapplyTy resTy
1835+ -- If one of the last type variables is refined to a particular type
1836+ -- (i.e., not truly polymorphic), we mark it with Nothing and filter
1837+ -- it out later, since we only apply encoding/decoding functions to
1838+ -- arguments of a type that it (1) one of the last type variables,
1839+ -- and (2) of a truly polymorphic type.
1840+ jArity = arityInt jc
1841+ mbTvNames = map varTToNameMaybe $
1842+ NE.drop (NE.length unapResTy - jArity) unapResTy
1843+ -- We use M.fromList to ensure that if there are any duplicate type
1844+ -- variables (as can happen in a GADT), the rightmost type variable gets
1845+ -- associated with the show function.
1846+ --
1847+ -- See Note [Matching functions with GADT type variables]
1848+ tvMap = M.fromList
1849+ . catMaybes -- Drop refined types
1850+ $ zipWith (\mbTvName tpj ->
1851+ fmap (\tvName -> (tvName, tpj)) mbTvName)
1852+ mbTvNames tpjs
1559− if (any (`predMentionsName` M.keys tvMap) ctxt
1853+ if (any (`predMentionsName` M.keys tvMap) ctxt
1560− || M.size tvMap < arityInt jc)
1854+ || M.size tvMap < jArity)
1561− && not (allowExQuant jc)
1855+ && not (allowExQuant jc)
1562− then existentialContextError conName
1856+ then existentialContextError conName
1563− else q
1857+ else return (argTys, tvMap)
1564
1858
1565{-
1859{-
1566Note [Matching functions with GADT type variables]
1860Note [Matching functions with GADT type variables]
@@ -1600,22 +1894,69 @@ Both.
1600-- are the function arguments of types (b -> Value) and ([b] -> Value).
1894-- are the function arguments of types (b -> Value) and ([b] -> Value).
1601type TyVarMap = Map Name (Name, Name)
1895type TyVarMap = Map Name (Name, Name)
1602
1896
1897+-- | If a VarT is missing an explicit kind signature, steal it from a TyVarBndr.
1898+stealKindForType :: TyVarBndr -> Type -> Type
1899+stealKindForType tvb t@VarT{} = SigT t (tvbKind tvb)
1900+stealKindForType _ t = t
1901+
1902+-- | Extracts the kind from a type variable binder.
1903+tvbKind :: TyVarBndr -> Kind
1904+#if MIN_VERSION_template_haskell(2,8,0)
1905+tvbKind (PlainTV _ ) = StarT
1906+#else
1907+tvbKind (PlainTV _ ) = StarK
1908+#endif
1909+tvbKind (KindedTV _ k) = k
1910+
1911+tvbToType :: TyVarBndr -> Type
1912+tvbToType (PlainTV n) = VarT n
1913+tvbToType (KindedTV n k) = SigT (VarT n) k
1914+
1603-- | Returns True if a Type has kind *.
1915-- | Returns True if a Type has kind *.
1604hasKindStar :: Type -> Bool
1916hasKindStar :: Type -> Bool
1605hasKindStar VarT{} = True
1917hasKindStar VarT{} = True
1918+#if MIN_VERSION_template_haskell(2,8,0)
1606hasKindStar (SigT _ StarT) = True
1919hasKindStar (SigT _ StarT) = True
1920+#else
1921+hasKindStar (SigT _ StarK) = True
1922+#endif
1607hasKindStar _ = False
1923hasKindStar _ = False
1608
1924
1609-- Returns True is a kind is equal to *, or if it is a kind variable.
1925-- Returns True is a kind is equal to *, or if it is a kind variable.
1610isStarOrVar :: Kind -> Bool
1926isStarOrVar :: Kind -> Bool
1927+#if MIN_VERSION_template_haskell(2,8,0)
1611isStarOrVar StarT = True
1928isStarOrVar StarT = True
1612isStarOrVar VarT{} = True
1929isStarOrVar VarT{} = True
1930+#else
1931+isStarOrVar StarK = True
1932+#endif
1613isStarOrVar _ = False
1933isStarOrVar _ = False
1614
1934
1615-- Generate a list of fresh names with a common prefix, and numbered suffixes.
1935-- Generate a list of fresh names with a common prefix, and numbered suffixes.
1616newNameList :: String -> Int -> Q [Name]
1936newNameList :: String -> Int -> Q [Name]
1617newNameList prefix len = mapM newName [prefix ++ show n | n <- [1..len]]
1937newNameList prefix len = mapM newName [prefix ++ show n | n <- [1..len]]
1618
1938
1939+-- Gets all of the type/kind variable names mentioned somewhere in a Type.
1940+tyVarNamesOfType :: Type -> [Name]
1941+tyVarNamesOfType = go
1942+ where
1943+ go :: Type -> [Name]
1944+ go (AppT t1 t2) = go t1 ++ go t2
1945+ go (SigT t _k) = go t
1946+#if MIN_VERSION_template_haskell(2,8,0)
1947+ ++ go _k
1948+#endif
1949+ go (VarT n) = [n]
1950+ go _ = []
1951+
1952+-- | Gets all of the type/kind variable names mentioned somewhere in a Kind.
1953+tyVarNamesOfKind :: Kind -> [Name]
1954+#if MIN_VERSION_template_haskell(2,8,0)
1955+tyVarNamesOfKind = tyVarNamesOfType
1956+#else
1957+tyVarNamesOfKind _ = [] -- There are no kind variables
1958+#endif
1959+
1619-- | @hasKindVarChain n kind@ Checks if @kind@ is of the form
1960-- | @hasKindVarChain n kind@ Checks if @kind@ is of the form
1620-- k_0 -> k_1 -> ... -> k_(n-1), where k0, k1, ..., and k_(n-1) can be * or
1961-- k_0 -> k_1 -> ... -> k_(n-1), where k0, k1, ..., and k_(n-1) can be * or
1621-- kind variables.
1962-- kind variables.
@@ -1623,7 +1964,7 @@ hasKindVarChain :: Int -> Type -> Maybe [Name]
1623hasKindVarChain kindArrows t =
1964hasKindVarChain kindArrows t =
1624 let uk = uncurryKind (tyKind t)
1965 let uk = uncurryKind (tyKind t)
1625 in if (NE.length uk - 1 == kindArrows) && F.all isStarOrVar uk
1966 in if (NE.length uk - 1 == kindArrows) && F.all isStarOrVar uk
1626− then Just (concatMap freeVariables uk)
1967+ then Just (concatMap tyVarNamesOfKind uk)
1627 else Nothing
1968 else Nothing
1628
1969
1629-- | If a Type is a SigT, returns its kind signature. Otherwise, return *.
1970-- | If a Type is a SigT, returns its kind signature. Otherwise, return *.
@@ -1643,6 +1984,17 @@ varTToNameMaybe _ = Nothing
1643varTToName :: Type -> Name
1984varTToName :: Type -> Name
1644varTToName = fromMaybe (error "Not a type variable!") . varTToNameMaybe
1985varTToName = fromMaybe (error "Not a type variable!") . varTToNameMaybe
1645
1986
1987+-- | Extracts the name from a constructor.
1988+getConName :: Con -> Name
1989+getConName (NormalC name _) = name
1990+getConName (RecC name _) = name
1991+getConName (InfixC _ name _) = name
1992+getConName (ForallC _ _ con) = getConName con
1993+#if MIN_VERSION_template_haskell(2,11,0)
1994+getConName (GadtC names _ _) = head names
1995+getConName (RecGadtC names _ _) = head names
1996+#endif
1997+
1646interleave :: [a] -> [a] -> [a]
1998interleave :: [a] -> [a] -> [a]
1647interleave (a1:a1s) (a2:a2s) = a1:a2:interleave a1s a2s
1999interleave (a1:a1s) (a2:a2s) = a1:a2:interleave a1s a2s
1648interleave _ _ = []
2000interleave _ _ = []
@@ -1667,7 +2019,9 @@ isTyFamily (ConT n) = do
1667#else
2019#else
1668 FamilyI (FamilyD TypeFam _ _ _) _ -> True
2020 FamilyI (FamilyD TypeFam _ _ _) _ -> True
1669#endif
2021#endif
2022+#if MIN_VERSION_template_haskell(2,9,0)
1670 FamilyI ClosedTypeFamilyD{} _ -> True
2023 FamilyI ClosedTypeFamilyD{} _ -> True
2024+#endif
1671 _ -> False
2025 _ -> False
1672isTyFamily _ = return False
2026isTyFamily _ = return False
1673
2027
@@ -1695,7 +2049,9 @@ mentionsName = go
1695 go :: Type -> [Name] -> Bool
2049 go :: Type -> [Name] -> Bool
1696 go (AppT t1 t2) names = go t1 names || go t2 names
2050 go (AppT t1 t2) names = go t1 names || go t2 names
1697 go (SigT t _k) names = go t names
2051 go (SigT t _k) names = go t names
2052+#if MIN_VERSION_template_haskell(2,8,0)
1698 || go _k names
2053 || go _k names
2054+#endif
1699 go (VarT n) names = n `elem` names
2055 go (VarT n) names = n `elem` names
1700 go _ _ = False
2056 go _ _ = False
1701
2057
@@ -1751,28 +2107,37 @@ uncurryTy t = ([], t :| [])
1751
2107
1752-- | Like uncurryType, except on a kind level.
2108-- | Like uncurryType, except on a kind level.
1753uncurryKind :: Kind -> NonEmpty Kind
2109uncurryKind :: Kind -> NonEmpty Kind
2110+#if MIN_VERSION_template_haskell(2,8,0)
1754uncurryKind = snd . uncurryTy
2111uncurryKind = snd . uncurryTy
2112+#else
2113+uncurryKind (ArrowK k1 k2) = k1 <| uncurryKind k2
2114+uncurryKind k = k :| []
2115+#endif
1755
2116
1756createKindChain :: Int -> Kind
2117createKindChain :: Int -> Kind
1757createKindChain = go starK
2118createKindChain = go starK
1758 where
2119 where
1759 go :: Kind -> Int -> Kind
2120 go :: Kind -> Int -> Kind
1760 go k 0 = k
2121 go k 0 = k
2122+#if MIN_VERSION_template_haskell(2,8,0)
1761 go k !n = go (AppT (AppT ArrowT StarT) k) (n - 1)
2123 go k !n = go (AppT (AppT ArrowT StarT) k) (n - 1)
2124+#else
2125+ go k !n = go (ArrowK StarK k) (n - 1)
2126+#endif
1762
2127
1763-- | Makes a string literal expression from a constructor's name.
2128-- | Makes a string literal expression from a constructor's name.
1764−conNameExp :: Options -> ConstructorInfo -> Q Exp
2129+conNameExp :: Options -> Con -> Q Exp
1765conNameExp opts = litE
2130conNameExp opts = litE
1766 . stringL
2131 . stringL
1767 . constructorTagModifier opts
2132 . constructorTagModifier opts
1768 . nameBase
2133 . nameBase
1769− . constructorName
2134+ . getConName
1770
2135
1771−-- | Extracts a record field label.
2136+-- | Creates a string literal expression from a record field label.
1772−fieldLabel :: Options -- ^ Encoding options
2137+fieldLabelExp :: Options -- ^ Encoding options
1773− -> Name
2138+ -> Name
1774− -> String
2139+ -> Q Exp
1775−fieldLabel opts = fieldLabelModifier opts . nameBase
2140+fieldLabelExp opts = litE . stringL . fieldLabelModifier opts . nameBase
1776
2141
1777-- | The name of the outermost 'Value' constructor.
2142-- | The name of the outermost 'Value' constructor.
1778valueConName :: Value -> String
2143valueConName :: Value -> String
@@ -1811,11 +2176,73 @@ canEtaReduce remaining dropped =
1811-- Expanding type synonyms
2176-- Expanding type synonyms
1812-------------------------------------------------------------------------------
2177-------------------------------------------------------------------------------
1813
2178
1814−applySubstitutionKind :: Map Name Kind -> Type -> Type
2179+-- | Expands all type synonyms in a type. Written by Dan Rosén in the
1815−applySubstitutionKind = applySubstitution
2180+-- @genifunctors@ package (licensed under BSD3).
2181+expandSyn :: Type -> Q Type
2182+expandSyn (ForallT tvs ctx t) = ForallT tvs ctx <$> expandSyn t
2183+expandSyn t@AppT{} = expandSynApp t []
2184+expandSyn t@ConT{} = expandSynApp t []
2185+expandSyn (SigT t k) = do t' <- expandSyn t
2186+ k' <- expandSynKind k
2187+ return (SigT t' k')
2188+expandSyn t = return t
2189+
2190+expandSynKind :: Kind -> Q Kind
2191+#if MIN_VERSION_template_haskell(2,8,0)
2192+expandSynKind = expandSyn
2193+#else
2194+expandSynKind = return -- There are no kind synonyms to deal with
2195+#endif
2196+
2197+expandSynApp :: Type -> [Type] -> Q Type
2198+expandSynApp (AppT t1 t2) ts = do
2199+ t2' <- expandSyn t2
2200+ expandSynApp t1 (t2':ts)
2201+expandSynApp (ConT n) ts | nameBase n == "[]" = return $ foldl' AppT ListT ts
2202+expandSynApp t@(ConT n) ts = do
2203+ info <- reify n
2204+ case info of
2205+ TyConI (TySynD _ tvs rhs) ->
2206+ let (ts', ts'') = splitAt (length tvs) ts
2207+ subs = mkSubst tvs ts'
2208+ rhs' = substType subs rhs
2209+ in expandSynApp rhs' ts''
2210+ _ -> return $ foldl' AppT t ts
2211+expandSynApp t ts = do
2212+ t' <- expandSyn t
2213+ return $ foldl' AppT t' ts
2214+
2215+type TypeSubst = Map Name Type
2216+type KindSubst = Map Name Kind
2217+
2218+mkSubst :: [TyVarBndr] -> [Type] -> TypeSubst
2219+mkSubst vs ts =
2220+ let vs' = map un vs
2221+ un (PlainTV v) = v
2222+ un (KindedTV v _) = v
2223+ in M.fromList $ zip vs' ts
2224+
2225+substType :: TypeSubst -> Type -> Type
2226+substType subs (ForallT v c t) = ForallT v c $ substType subs t
2227+substType subs t@(VarT n) = M.findWithDefault t n subs
2228+substType subs (AppT t1 t2) = AppT (substType subs t1) (substType subs t2)
2229+substType subs (SigT t k) = SigT (substType subs t)
2230+#if MIN_VERSION_template_haskell(2,8,0)
2231+ (substType subs k)
2232+#else
2233+ k
2234+#endif
2235+substType _ t = t
2236+
2237+substKind :: KindSubst -> Type -> Type
2238+#if MIN_VERSION_template_haskell(2,8,0)
2239+substKind = substType
2240+#else
2241+substKind _ t = t -- There are no kind variables!
2242+#endif
1816
2243
1817substNameWithKind :: Name -> Kind -> Type -> Type
2244substNameWithKind :: Name -> Kind -> Type -> Type
1818−substNameWithKind n k = applySubstitutionKind (M.singleton n k)
2245+substNameWithKind n k = substKind (M.singleton n k)
1819
2246
1820substNamesWithKindStar :: [Name] -> Type -> Type
2247substNamesWithKindStar :: [Name] -> Type -> Type
1821substNamesWithKindStar ns t = foldr' (`substNameWithKind` starK) t ns
2248substNamesWithKindStar ns t = foldr' (`substNameWithKind` starK) t ns
@@ -1901,13 +2328,6 @@ data Direction = To | From
1901-- | A representation of which typeclass method is being spliced in.
2328-- | A representation of which typeclass method is being spliced in.
1902data JSONFun = ToJSON | ToEncoding | ParseJSON
2329data JSONFun = ToJSON | ToEncoding | ParseJSON
1903
2330
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−
1911-- | A representation of which typeclass is being derived.
2331-- | A representation of which typeclass is being derived.
1912data JSONClass = JSONClass { direction :: Direction, arity :: Arity }
2332data JSONClass = JSONClass { direction :: Direction, arity :: Arity }
1913
2333
@@ -1976,7 +2396,9 @@ data StarKindStatus = NotKindStar
1976canRealizeKindStar :: Type -> StarKindStatus
2396canRealizeKindStar :: Type -> StarKindStatus
1977canRealizeKindStar t = case t of
2397canRealizeKindStar t = case t of
1978 _ | hasKindStar t -> KindStar
2398 _ | hasKindStar t -> KindStar
2399+#if MIN_VERSION_template_haskell(2,8,0)
1979 SigT _ (VarT k) -> IsKindVar k
2400 SigT _ (VarT k) -> IsKindVar k
2401+#endif
1980 _ -> NotKindStar
2402 _ -> NotKindStar
1981
2403
1982-- | Returns 'Just' the kind variable 'Name' of a 'StarKindStatus' if it exists.
2404-- | Returns 'Just' the kind variable 'Name' of a 'StarKindStatus' if it exists.
Data/Aeson/Text.hs+4−5
@@ -1,5 +1,4 @@
1{-# LANGUAGE BangPatterns #-}
1{-# LANGUAGE BangPatterns #-}
2−{-# LANGUAGE NoImplicitPrelude #-}
3{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE OverloadedStrings #-}
4-- |
3-- |
5-- Module: Data.Aeson.Text
4-- Module: Data.Aeson.Text
@@ -15,18 +14,18 @@
15--
14--
16-- You can use the conversions to 'Builder's when embedding JSON messages as
15-- You can use the conversions to 'Builder's when embedding JSON messages as
17-- parts of a protocol.
16-- parts of a protocol.
18−
19module Data.Aeson.Text
17module Data.Aeson.Text
20 (
18 (
21 encodeToLazyText
19 encodeToLazyText
22 , encodeToTextBuilder
20 , encodeToTextBuilder
23 ) where
21 ) where
24
22
23+import Prelude ()
25import Prelude.Compat
24import Prelude.Compat
26
25
27import Data.Aeson.Types (Value(..), ToJSON(..))
26import Data.Aeson.Types (Value(..), ToJSON(..))
28import Data.Aeson.Encoding (encodingToLazyByteString)
27import Data.Aeson.Encoding (encodingToLazyByteString)
29−import Data.Semigroup ((<>))
28+import Data.Monoid ((<>))
30import Data.Scientific (FPFormat(..), Scientific, base10Exponent)
29import Data.Scientific (FPFormat(..), Scientific, base10Exponent)
31import Data.Text.Lazy.Builder
30import Data.Text.Lazy.Builder
32import Data.Text.Lazy.Builder.Scientific (formatScientificBuilder)
31import Data.Text.Lazy.Builder.Scientific (formatScientificBuilder)
@@ -47,8 +46,8 @@ encodeToLazyText = LT.decodeUtf8 . encodingToLazyByteString . toEncoding
47-- embedded efficiently in a text-based protocol.
46-- embedded efficiently in a text-based protocol.
48--
47--
49-- If you are going to immediately encode straight to a
48-- If you are going to immediately encode straight to a
50−-- 'L.ByteString', it is more efficient to use 'encode' (lazy ByteString)
49+-- 'L.ByteString', it is more efficient to use 'encodeToBuilder'
51−-- or @'fromEncoding' . 'toEncoding'@ (ByteString.Builder) instead.
50+-- instead.
52--
51--
53-- /Note:/ Uses 'toJSON'
52-- /Note:/ Uses 'toJSON'
54encodeToTextBuilder :: ToJSON a => a -> Builder
53encodeToTextBuilder :: ToJSON a => a -> Builder
Data/Aeson/Types.hs+5−43
@@ -1,4 +1,3 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
2-- |
1-- |
3-- Module: Data.Aeson.Types
2-- Module: Data.Aeson.Types
4-- Copyright: (c) 2011-2016 Bryan O'Sullivan
3-- Copyright: (c) 2011-2016 Bryan O'Sullivan
@@ -26,7 +25,6 @@ module Data.Aeson.Types
26 -- * Convenience types and functions
25 -- * Convenience types and functions
27 , DotNetTime(..)
26 , DotNetTime(..)
28 , typeMismatch
27 , typeMismatch
29− , unexpected
30 -- * Type conversion
28 -- * Type conversion
31 , Parser
29 , Parser
32 , Result(..)
30 , Result(..)
@@ -38,9 +36,6 @@ module Data.Aeson.Types
38 , ToJSON(..)
36 , ToJSON(..)
39 , KeyValue(..)
37 , KeyValue(..)
40 , modifyFailure
38 , modifyFailure
41− , prependFailure
42− , parserThrowError
43− , parserCatchError
44
39
45 -- ** Keys for maps
40 -- ** Keys for maps
46 , ToJSONKey(..)
41 , ToJSONKey(..)
@@ -53,12 +48,6 @@ module Data.Aeson.Types
53 , coerceFromJSONKeyFunction
48 , coerceFromJSONKeyFunction
54 , mapFromJSONKeyFunction
49 , mapFromJSONKeyFunction
55
50
56− -- *** Generic keys
57− , GToJSONKey()
58− , genericToJSONKey
59− , GFromJSONKey()
60− , genericFromJSONKey
61−
62 -- ** Liftings to unary and binary type constructors
51 -- ** Liftings to unary and binary type constructors
63 , FromJSON1(..)
52 , FromJSON1(..)
64 , parseJSON1
53 , parseJSON1
@@ -74,8 +63,8 @@ module Data.Aeson.Types
74 -- ** Generic JSON classes
63 -- ** Generic JSON classes
75 , GFromJSON(..)
64 , GFromJSON(..)
76 , FromArgs(..)
65 , FromArgs(..)
77− , GToJSON
66+ , GToJSON(..)
78− , GToEncoding
67+ , GToEncoding(..)
79 , ToArgs(..)
68 , ToArgs(..)
80 , Zero
69 , Zero
81 , One
70 , One
@@ -90,9 +79,9 @@ module Data.Aeson.Types
90 , withObject
79 , withObject
91 , withText
80 , withText
92 , withArray
81 , withArray
82+ , withNumber
93 , withScientific
83 , withScientific
94 , withBool
84 , withBool
95− , withEmbeddedJSON
96
85
97 , pairs
86 , pairs
98 , foldable
87 , foldable
@@ -113,39 +102,15 @@ module Data.Aeson.Types
113 , listParser
102 , listParser
114
103
115 -- * Generic and TH encoding configuration
104 -- * Generic and TH encoding configuration
116− , Options
105+ , 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
130 , SumEncoding(..)
106 , SumEncoding(..)
131 , camelTo
107 , camelTo
132 , camelTo2
108 , camelTo2
133 , defaultOptions
109 , defaultOptions
134 , defaultTaggedObject
110 , 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
147 ) where
111 ) where
148
112
113+import Prelude ()
149import Prelude.Compat
114import Prelude.Compat
150
115
151import Data.Aeson.Encoding (Encoding, unsafeToEncoding, fromEncoding, Series, pairs)
116import Data.Aeson.Encoding (Encoding, unsafeToEncoding, fromEncoding, Series, pairs)
@@ -157,6 +122,3 @@ import Data.Foldable (toList)
157foldable :: (Foldable t, ToJSON a) => t a -> Encoding
122foldable :: (Foldable t, ToJSON a) => t a -> Encoding
158foldable = toEncoding . toList
123foldable = toEncoding . toList
159{-# INLINE foldable #-}
124{-# INLINE foldable #-}
160−
161−-- $optionsFields
162−-- The functions here are in fact record fields of the 'Options' type.
Data/Aeson/Types/Class.hs+6−18
@@ -1,11 +1,10 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2−{-# LANGUAGE ConstraintKinds #-}
3{-# LANGUAGE FlexibleContexts #-}
2{-# LANGUAGE FlexibleContexts #-}
4{-# LANGUAGE FlexibleInstances #-}
3{-# LANGUAGE FlexibleInstances #-}
5{-# LANGUAGE GADTs #-}
4{-# LANGUAGE GADTs #-}
6{-# LANGUAGE MultiParamTypeClasses #-}
5{-# LANGUAGE MultiParamTypeClasses #-}
7−{-# LANGUAGE NoImplicitPrelude #-}
8{-# LANGUAGE ScopedTypeVariables #-}
6{-# LANGUAGE ScopedTypeVariables #-}
7+{-# LANGUAGE TypeSynonymInstances #-}
9
8
10-- |
9-- |
11-- Module: Data.Aeson.Types.Class
10-- Module: Data.Aeson.Types.Class
@@ -37,8 +36,8 @@ module Data.Aeson.Types.Class
37 -- * Generic JSON classes
36 -- * Generic JSON classes
38 , GFromJSON(..)
37 , GFromJSON(..)
39 , FromArgs(..)
38 , FromArgs(..)
40− , GToJSON
39+ , GToJSON(..)
41− , GToEncoding
40+ , GToEncoding(..)
42 , ToArgs(..)
41 , ToArgs(..)
43 , Zero
42 , Zero
44 , One
43 , One
@@ -58,11 +57,6 @@ module Data.Aeson.Types.Class
58 , fromJSONKeyCoerce
57 , fromJSONKeyCoerce
59 , coerceFromJSONKeyFunction
58 , coerceFromJSONKeyFunction
60 , mapFromJSONKeyFunction
59 , mapFromJSONKeyFunction
61− -- ** Generic keys
62− , GToJSONKey()
63− , genericToJSONKey
64− , GFromJSONKey()
65− , genericFromJSONKey
66 -- * Object key-value pairs
60 -- * Object key-value pairs
67 , KeyValue(..)
61 , KeyValue(..)
68
62
@@ -75,15 +69,14 @@ module Data.Aeson.Types.Class
75 , withObject
69 , withObject
76 , withText
70 , withText
77 , withArray
71 , withArray
72+ , withNumber
78 , withScientific
73 , withScientific
79 , withBool
74 , withBool
80− , withEmbeddedJSON
81
75
82 -- * Functions
76 -- * Functions
83 , fromJSON
77 , fromJSON
84 , ifromJSON
78 , ifromJSON
85 , typeMismatch
79 , typeMismatch
86− , unexpected
87 , parseField
80 , parseField
88 , parseFieldMaybe
81 , parseFieldMaybe
89 , parseFieldMaybe'
82 , parseFieldMaybe'
@@ -97,13 +90,8 @@ module Data.Aeson.Types.Class
97 , (.!=)
90 , (.!=)
98 ) where
91 ) where
99
92
93+import Prelude ()
100
94
101import Data.Aeson.Types.FromJSON
95import Data.Aeson.Types.FromJSON
102import Data.Aeson.Types.Generic (One, Zero)
96import Data.Aeson.Types.Generic (One, Zero)
103−import Data.Aeson.Types.ToJSON hiding (GToJSON)
97+import Data.Aeson.Types.ToJSON
104−import qualified Data.Aeson.Types.ToJSON as ToJSON
105−import Data.Aeson.Types.Internal (Value)
106−import Data.Aeson.Encoding (Encoding)
107−
108−type GToJSON = ToJSON.GToJSON Value
109−type GToEncoding = ToJSON.GToJSON Encoding
Data/Aeson/Types/FromJSON.hs+420−863
@@ -5,16 +5,19 @@
5{-# LANGUAGE FlexibleInstances #-}
5{-# LANGUAGE FlexibleInstances #-}
6{-# LANGUAGE GADTs #-}
6{-# LANGUAGE GADTs #-}
7{-# LANGUAGE MultiParamTypeClasses #-}
7{-# LANGUAGE MultiParamTypeClasses #-}
8−{-# LANGUAGE NoImplicitPrelude #-}
8+{-# LANGUAGE NamedFieldPuns #-}
9{-# LANGUAGE OverloadedStrings #-}
9{-# LANGUAGE OverloadedStrings #-}
10−{-# LANGUAGE PolyKinds #-}
11{-# LANGUAGE RecordWildCards #-}
10{-# LANGUAGE RecordWildCards #-}
12{-# LANGUAGE ScopedTypeVariables #-}
11{-# LANGUAGE ScopedTypeVariables #-}
13{-# LANGUAGE TypeOperators #-}
12{-# LANGUAGE TypeOperators #-}
14−{-# LANGUAGE TupleSections #-}
13+{-# LANGUAGE TypeSynonymInstances #-}
15{-# LANGUAGE UndecidableInstances #-}
14{-# LANGUAGE UndecidableInstances #-}
16{-# LANGUAGE ViewPatterns #-}
15{-# LANGUAGE ViewPatterns #-}
17
16
17+#if __GLASGOW_HASKELL__ >= 706
18+{-# LANGUAGE PolyKinds #-}
19+#endif
20+
18#include "incoherent-compat.h"
21#include "incoherent-compat.h"
19#include "overlapping-compat.h"
22#include "overlapping-compat.h"
20
23
@@ -42,9 +45,6 @@ module Data.Aeson.Types.FromJSON
42 , coerceFromJSONKeyFunction
45 , coerceFromJSONKeyFunction
43 , mapFromJSONKeyFunction
46 , mapFromJSONKeyFunction
44
47
45− , GFromJSONKey()
46− , genericFromJSONKey
47−
48 -- * List functions
48 -- * List functions
49 , listParser
49 , listParser
50
50
@@ -52,22 +52,20 @@ module Data.Aeson.Types.FromJSON
52 , withObject
52 , withObject
53 , withText
53 , withText
54 , withArray
54 , withArray
55+ , withNumber
55 , withScientific
56 , withScientific
56 , withBool
57 , withBool
57− , withEmbeddedJSON
58
58
59 -- * Functions
59 -- * Functions
60 , fromJSON
60 , fromJSON
61 , ifromJSON
61 , ifromJSON
62 , typeMismatch
62 , typeMismatch
63− , unexpected
64 , parseField
63 , parseField
65 , parseFieldMaybe
64 , parseFieldMaybe
66 , parseFieldMaybe'
65 , parseFieldMaybe'
67 , explicitParseField
66 , explicitParseField
68 , explicitParseFieldMaybe
67 , explicitParseFieldMaybe
69 , explicitParseFieldMaybe'
68 , explicitParseFieldMaybe'
70− , parseIndexedJSON
71 -- ** Operators
69 -- ** Operators
72 , (.:)
70 , (.:)
73 , (.:?)
71 , (.:?)
@@ -78,16 +76,17 @@ module Data.Aeson.Types.FromJSON
78 , parseOptionalFieldWith
76 , parseOptionalFieldWith
79 ) where
77 ) where
80
78
79+import Prelude ()
81import Prelude.Compat
80import Prelude.Compat
82
81
83−import Control.Applicative ((<|>), Const(..), liftA2)
82+import Control.Applicative ((<|>), Const(..))
84−import Control.Monad (zipWithM)
83+import Control.Monad ((<=<), zipWithM)
85import Data.Aeson.Internal.Functions (mapKey)
84import Data.Aeson.Internal.Functions (mapKey)
86−import Data.Aeson.Parser.Internal (eitherDecodeWith, jsonEOF)
87import Data.Aeson.Types.Generic
85import Data.Aeson.Types.Generic
88import Data.Aeson.Types.Internal
86import Data.Aeson.Types.Internal
87+import Data.Attoparsec.Number (Number(..))
89import Data.Bits (unsafeShiftR)
88import Data.Bits (unsafeShiftR)
90−import Data.Fixed (Fixed, HasResolution (resolution), Nano)
89+import Data.Fixed (Fixed, HasResolution)
91import Data.Functor.Compose (Compose(..))
90import Data.Functor.Compose (Compose(..))
92import Data.Functor.Identity (Identity(..))
91import Data.Functor.Identity (Identity(..))
93import Data.Functor.Product (Product(..))
92import Data.Functor.Product (Product(..))
@@ -96,31 +95,26 @@ import Data.Hashable (Hashable(..))
96import Data.Int (Int16, Int32, Int64, Int8)
95import Data.Int (Int16, Int32, Int64, Int8)
97import Data.List.NonEmpty (NonEmpty(..))
96import Data.List.NonEmpty (NonEmpty(..))
98import Data.Maybe (fromMaybe)
97import Data.Maybe (fromMaybe)
99−import Data.Semigroup ((<>))
98+import Data.Monoid ((<>))
100import Data.Proxy (Proxy(..))
99import Data.Proxy (Proxy(..))
101import Data.Ratio ((%), Ratio)
100import Data.Ratio ((%), Ratio)
102−import Data.Scientific (Scientific, base10Exponent)
101+import Data.Scientific (Scientific)
103import Data.Tagged (Tagged(..))
102import Data.Tagged (Tagged(..))
104import Data.Text (Text, pack, unpack)
103import Data.Text (Text, pack, unpack)
105−import Data.Time (Day, DiffTime, LocalTime, NominalDiffTime, TimeOfDay, UTCTime, ZonedTime)
104+import Data.Time (Day, LocalTime, NominalDiffTime, TimeOfDay, UTCTime, ZonedTime)
106−import Data.Time.Calendar.Compat (CalendarDiffDays (..), DayOfWeek (..))
105+import Data.Time.Format (parseTime)
107−import Data.Time.LocalTime.Compat (CalendarDiffTime (..))
108−import Data.Time.Clock.System.Compat (SystemTime (..))
109−import Data.Time.Format.Compat (parseTimeM, defaultTimeLocale)
106+import Data.Time.Locale.Compat (defaultTimeLocale)
110import Data.Traversable as Tr (sequence)
107import Data.Traversable as Tr (sequence)
111import Data.Vector (Vector)
108import Data.Vector (Vector)
112import Data.Version (Version, parseVersion)
109import Data.Version (Version, parseVersion)
113−import Data.Void (Void)
114import Data.Word (Word16, Word32, Word64, Word8)
110import Data.Word (Word16, Word32, Word64, Word8)
115import Foreign.Storable (Storable)
111import Foreign.Storable (Storable)
116−import Foreign.C.Types (CTime (..))
117import GHC.Generics
112import GHC.Generics
118import Numeric.Natural (Natural)
113import Numeric.Natural (Natural)
119import Text.ParserCombinators.ReadP (readP_to_S)
114import Text.ParserCombinators.ReadP (readP_to_S)
120import Unsafe.Coerce (unsafeCoerce)
115import Unsafe.Coerce (unsafeCoerce)
121import qualified Data.Aeson.Parser.Time as Time
116import qualified Data.Aeson.Parser.Time as Time
122import qualified Data.Attoparsec.ByteString.Char8 as A (endOfInput, parseOnly, scientific)
117import qualified Data.Attoparsec.ByteString.Char8 as A (endOfInput, parseOnly, scientific)
123−import qualified Data.ByteString.Lazy as L
124import qualified Data.DList as DList
118import qualified Data.DList as DList
125import qualified Data.HashMap.Strict as H
119import qualified Data.HashMap.Strict as H
126import qualified Data.HashSet as HashSet
120import qualified Data.HashSet as HashSet
@@ -143,20 +137,18 @@ import qualified Data.Vector.Primitive as VP
143import qualified Data.Vector.Storable as VS
137import qualified Data.Vector.Storable as VS
144import qualified Data.Vector.Unboxed as VU
138import qualified Data.Vector.Unboxed as VU
145
139
146−import qualified GHC.Exts as Exts
140+#ifndef HAS_COERCIBLE
147−import qualified Data.Primitive.Array as PM
141+#define HAS_COERCIBLE (__GLASGOW_HASKELL__ >= 707)
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
154#endif
142#endif
155−import qualified Data.Primitive.PrimArray as PM
156−#endif
157−
158
143
144+#if HAS_COERCIBLE
159import Data.Coerce (Coercible, coerce)
145import 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
160
152
161parseIndexedJSON :: (Value -> Parser a) -> Int -> Value -> Parser a
153parseIndexedJSON :: (Value -> Parser a) -> Int -> Value -> Parser a
162parseIndexedJSON p idx value = p value <?> Index idx
154parseIndexedJSON p idx value = p value <?> Index idx
@@ -165,7 +157,7 @@ parseIndexedJSON p idx value = p value <?> Index idx
165parseIndexedJSONPair :: (Value -> Parser a) -> (Value -> Parser b) -> Int -> Value -> Parser (a, b)
157parseIndexedJSONPair :: (Value -> Parser a) -> (Value -> Parser b) -> Int -> Value -> Parser (a, b)
166parseIndexedJSONPair keyParser valParser idx value = p value <?> Index idx
158parseIndexedJSONPair keyParser valParser idx value = p value <?> Index idx
167 where
159 where
168− p = withArray "(k, v)" $ \ab ->
160+ p = withArray "(k,v)" $ \ab ->
169 let n = V.length ab
161 let n = V.length ab
170 in if n == 2
162 in if n == 2
171 then (,) <$> parseJSONElemAtIndex keyParser 0 ab
163 then (,) <$> parseJSONElemAtIndex keyParser 0 ab
@@ -177,34 +169,43 @@ parseIndexedJSONPair keyParser valParser idx value = p value <?> Index idx
177parseJSONElemAtIndex :: (Value -> Parser a) -> Int -> V.Vector Value -> Parser a
169parseJSONElemAtIndex :: (Value -> Parser a) -> Int -> V.Vector Value -> Parser a
178parseJSONElemAtIndex p idx ary = p (V.unsafeIndex ary idx) <?> Index idx
170parseJSONElemAtIndex p idx ary = p (V.unsafeIndex ary idx) <?> Index idx
179
171
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+
180parseRealFloat :: RealFloat a => String -> Value -> Parser a
181parseRealFloat :: RealFloat a => String -> Value -> Parser a
181−parseRealFloat _ (Number s) = pure $ Scientific.toRealFloat s
182+parseRealFloat _ (Number s) = pure $ Scientific.toRealFloat s
182−parseRealFloat _ Null = pure (0/0)
183+parseRealFloat _ Null = pure (0/0)
183−parseRealFloat name v = prependContext name (unexpected v)
184+parseRealFloat expected v = typeMismatch expected v
184{-# INLINE parseRealFloat #-}
185{-# INLINE parseRealFloat #-}
185
186
186−parseIntegralFromScientific :: forall a. Integral a => Scientific -> Parser a
187+parseIntegralFromScientific :: forall a. Integral a => String -> Scientific -> Parser a
187−parseIntegralFromScientific s =
188+parseIntegralFromScientific expected s =
188 case Scientific.floatingOrInteger s :: Either Double a of
189 case Scientific.floatingOrInteger s :: Either Double a of
189 Right x -> pure x
190 Right x -> pure x
190− Left _ -> fail $ "unexpected floating number " ++ show s
191+ Left _ -> fail $ "Floating number specified for " ++ expected ++ ": " ++ show s
191{-# INLINE parseIntegralFromScientific #-}
192{-# INLINE parseIntegralFromScientific #-}
192
193
193parseIntegral :: Integral a => String -> Value -> Parser a
194parseIntegral :: Integral a => String -> Value -> Parser a
194−parseIntegral name =
195+parseIntegral expected =
195− prependContext name . withBoundedScientific' parseIntegralFromScientific
196+ withScientific expected $ parseIntegralFromScientific expected
196{-# INLINE parseIntegral #-}
197{-# INLINE parseIntegral #-}
197
198
198−parseBoundedIntegralFromScientific :: (Bounded a, Integral a) => Scientific -> Parser a
199+parseBoundedIntegralFromScientific :: (Bounded a, Integral a) => String -> Scientific -> Parser a
199−parseBoundedIntegralFromScientific s = maybe
200+parseBoundedIntegralFromScientific expected s = maybe
200− (fail $ "value is either floating or will cause over or underflow " ++ show s)
201+ (fail $ expected ++ " is either floating or will cause over or underflow: " ++ show s)
201 pure
202 pure
202 (Scientific.toBoundedInteger s)
203 (Scientific.toBoundedInteger s)
203{-# INLINE parseBoundedIntegralFromScientific #-}
204{-# INLINE parseBoundedIntegralFromScientific #-}
204
205
205parseBoundedIntegral :: (Bounded a, Integral a) => String -> Value -> Parser a
206parseBoundedIntegral :: (Bounded a, Integral a) => String -> Value -> Parser a
206−parseBoundedIntegral name =
207+parseBoundedIntegral expected =
207− prependContext name . withScientific' parseBoundedIntegralFromScientific
208+ withScientific expected $ parseBoundedIntegralFromScientific expected
208{-# INLINE parseBoundedIntegral #-}
209{-# INLINE parseBoundedIntegral #-}
209
210
210parseScientificText :: Text -> Parser Scientific
211parseScientificText :: Text -> Parser Scientific
@@ -214,20 +215,13 @@ parseScientificText
214 . T.encodeUtf8
215 . T.encodeUtf8
215
216
216parseIntegralText :: Integral a => String -> Text -> Parser a
217parseIntegralText :: Integral a => String -> Text -> Parser a
217−parseIntegralText name t =
218+parseIntegralText expected t =
218− prependContext name $
219− parseScientificText t
220− >>= rejectLargeExponent
221− >>= parseIntegralFromScientific
219+ parseScientificText t >>= parseIntegralFromScientific expected
222− where
223− rejectLargeExponent :: Scientific -> Parser Scientific
224− rejectLargeExponent s = withBoundedScientific' pure (Number s)
225{-# INLINE parseIntegralText #-}
220{-# INLINE parseIntegralText #-}
226
221
227parseBoundedIntegralText :: (Bounded a, Integral a) => String -> Text -> Parser a
222parseBoundedIntegralText :: (Bounded a, Integral a) => String -> Text -> Parser a
228−parseBoundedIntegralText name t =
223+parseBoundedIntegralText expected t =
229− prependContext name $
230− parseScientificText t >>= parseBoundedIntegralFromScientific
224+ parseScientificText t >>= parseBoundedIntegralFromScientific expected
231
225
232parseOptionalFieldWith :: (Value -> Parser (Maybe a))
226parseOptionalFieldWith :: (Value -> Parser (Maybe a))
233 -> Object -> Text -> Parser (Maybe a)
227 -> Object -> Text -> Parser (Maybe a)
@@ -287,21 +281,14 @@ genericLiftParseJSON opts pj pjl = fmap to1 . gParseJSON opts (From1Args pj pjl)
287--
281--
288-- The basic ways to signal a failed conversion are as follows:
282-- The basic ways to signal a failed conversion are as follows:
289--
283--
290−-- * 'fail' yields a custom error message: it is the recommended way of
284+-- * 'empty' and 'mzero' work, but are terse and uninformative;
291−-- reporting a failure;
292--
285--
293−-- * 'Control.Applicative.empty' (or 'Control.Monad.mzero') is uninformative:
286+-- * 'fail' yields a custom error message;
294−-- use it when the error is meant to be caught by some @('<|>')@;
295--
287--
296−-- * 'typeMismatch' can be used to report a failure when the encountered value
288+-- * 'typeMismatch' produces an informative message for cases when the
297−-- is not of the expected JSON type; 'unexpected' is an appropriate alternative
289+-- value encountered is not of the expected type.
298−-- when more than one type may be expected, or to keep the expected type
299−-- implicit.
300--
290--
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':
291+-- An example type and instance using 'typeMismatch':
305--
292--
306-- @
293-- @
307-- \-- Allow ourselves to write 'Text' literals.
294-- \-- Allow ourselves to write 'Text' literals.
@@ -315,22 +302,20 @@ genericLiftParseJSON opts pj pjl = fmap to1 . gParseJSON opts (From1Args pj pjl)
315-- '<*>' v '.:' \"y\"
302-- '<*>' v '.:' \"y\"
316--
303--
317-- \-- We do not expect a non-'Object' value here.
304-- \-- We do not expect a non-'Object' value here.
318−-- \-- We could use 'Control.Applicative.empty' to fail, but 'typeMismatch'
305+-- \-- We could use 'mzero' to fail, but 'typeMismatch'
319-- \-- gives a much more informative error message.
306-- \-- gives a much more informative error message.
320−-- 'parseJSON' invalid =
307+-- 'parseJSON' invalid = 'typeMismatch' \"Coord\" invalid
321−-- 'prependFailure' "parsing Coord failed, "
322−-- ('typeMismatch' \"Object\" invalid)
323-- @
308-- @
324--
309--
325-- For this common case of only being concerned with a single
310-- For this common case of only being concerned with a single
326−-- type of JSON value, the functions 'withObject', 'withScientific', etc.
311+-- type of JSON value, the functions 'withObject', 'withNumber', etc.
327-- are provided. Their use is to be preferred when possible, since
312-- are provided. Their use is to be preferred when possible, since
328-- they are more terse. Using 'withObject', we can rewrite the above instance
313-- they are more terse. Using 'withObject', we can rewrite the above instance
329-- (assuming the same language extension and data type) as:
314-- (assuming the same language extension and data type) as:
330--
315--
331-- @
316-- @
332-- instance 'FromJSON' Coord where
317-- instance 'FromJSON' Coord where
333−-- 'parseJSON' = 'withObject' \"Coord\" $ \\v -> Coord
318+-- 'parseJSON' = 'withObject' \"Coord\" $ \v -> Coord
334-- '<$>' v '.:' \"x\"
319-- '<$>' v '.:' \"x\"
335-- '<*>' v '.:' \"y\"
320-- '<*>' v '.:' \"y\"
336-- @
321-- @
@@ -362,7 +347,7 @@ genericLiftParseJSON opts pj pjl = fmap to1 . gParseJSON opts (From1Args pj pjl)
362-- @
347-- @
363--
348--
364-- The default implementation will be equivalent to
349-- The default implementation will be equivalent to
365−-- @parseJSON = 'genericParseJSON' 'defaultOptions'@; if you need different
350+-- @parseJSON = 'genericParseJSON' 'defaultOptions'@; If you need different
366-- options, you can customize the generic decoding by defining:
351-- options, you can customize the generic decoding by defining:
367--
352--
368-- @
353-- @
@@ -380,11 +365,13 @@ class FromJSON a where
380 parseJSON = genericParseJSON defaultOptions
365 parseJSON = genericParseJSON defaultOptions
381
366
382 parseJSONList :: Value -> Parser [a]
367 parseJSONList :: Value -> Parser [a]
383− parseJSONList = withArray "[]" $ \a ->
368+ parseJSONList (Array a)
384− zipWithM (parseIndexedJSON parseJSON) [0..]
369+ = zipWithM (parseIndexedJSON parseJSON) [0..]
385 . V.toList
370 . V.toList
386 $ a
371 $ a
387
372
373+ parseJSONList v = typeMismatch "[a]" v
374+
388-------------------------------------------------------------------------------
375-------------------------------------------------------------------------------
389-- Classes and types for map keys
376-- Classes and types for map keys
390-------------------------------------------------------------------------------
377-------------------------------------------------------------------------------
@@ -396,16 +383,6 @@ class FromJSON a where
396-- > newtype SomeId = SomeId { getSomeId :: Text }
383-- > newtype SomeId = SomeId { getSomeId :: Text }
397-- > deriving (Eq,Ord,Hashable,FromJSONKey)
384-- > deriving (Eq,Ord,Hashable,FromJSONKey)
398--
385--
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−-- @
409class FromJSONKey a where
386class FromJSONKey a where
410 -- | Strategy for parsing the key of a map-like container.
387 -- | Strategy for parsing the key of a map-like container.
411 fromJSONKey :: FromJSONKeyFunction a
388 fromJSONKey :: FromJSONKeyFunction a
@@ -428,7 +405,11 @@ class FromJSONKey a where
428-- At the moment this type is intentionally not exported. 'FromJSONKeyFunction'
405-- At the moment this type is intentionally not exported. 'FromJSONKeyFunction'
429-- can be inspected, but cannot be constructed.
406-- can be inspected, but cannot be constructed.
430data CoerceText a where
407data CoerceText a where
408+#if HAS_COERCIBLE
431 CoerceText :: Coercible Text a => CoerceText a
409 CoerceText :: Coercible Text a => CoerceText a
410+#else
411+ CoerceText :: CoerceText a
412+#endif
432
413
433-- | This type is related to 'ToJSONKeyFunction'. If 'FromJSONKeyValue' is used in the
414-- | This type is related to 'ToJSONKeyFunction'. If 'FromJSONKeyValue' is used in the
434-- 'FromJSONKey' instance, then 'ToJSONKeyValue' should be used in the 'ToJSONKey'
415-- 'FromJSONKey' instance, then 'ToJSONKeyValue' should be used in the 'ToJSONKey'
@@ -448,7 +429,7 @@ data FromJSONKeyFunction a
448
429
449-- | Only law abiding up to interpretation
430-- | Only law abiding up to interpretation
450instance Functor FromJSONKeyFunction where
431instance Functor FromJSONKeyFunction where
451− fmap h (FromJSONKeyCoerce CoerceText) = FromJSONKeyText (h . coerce)
432+ fmap h (FromJSONKeyCoerce CoerceText) = FromJSONKeyText (h . coerce')
452 fmap h (FromJSONKeyText f) = FromJSONKeyText (h . f)
433 fmap h (FromJSONKeyText f) = FromJSONKeyText (h . f)
453 fmap h (FromJSONKeyTextParser f) = FromJSONKeyTextParser (fmap h . f)
434 fmap h (FromJSONKeyTextParser f) = FromJSONKeyTextParser (fmap h . f)
454 fmap h (FromJSONKeyValue f) = FromJSONKeyValue (fmap h . f)
435 fmap h (FromJSONKeyValue f) = FromJSONKeyValue (fmap h . f)
@@ -462,7 +443,9 @@ instance Functor FromJSONKeyFunction where
462--
443--
463-- On pre GHC 7.8 this is unconstrainted function.
444-- On pre GHC 7.8 this is unconstrainted function.
464fromJSONKeyCoerce ::
445fromJSONKeyCoerce ::
446+#if HAS_COERCIBLE
465 Coercible Text a =>
447 Coercible Text a =>
448+#endif
466 FromJSONKeyFunction a
449 FromJSONKeyFunction a
467fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText
450fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText
468
451
@@ -470,91 +453,60 @@ fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText
470--
453--
471-- See note on 'fromJSONKeyCoerce'.
454-- See note on 'fromJSONKeyCoerce'.
472coerceFromJSONKeyFunction ::
455coerceFromJSONKeyFunction ::
456+#if HAS_COERCIBLE
473 Coercible a b =>
457 Coercible a b =>
458+#endif
474 FromJSONKeyFunction a -> FromJSONKeyFunction b
459 FromJSONKeyFunction a -> FromJSONKeyFunction b
460+#if HAS_COERCIBLE
475coerceFromJSONKeyFunction = coerce
461coerceFromJSONKeyFunction = 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
476
468
477{-# RULES
469{-# RULES
478 "FromJSONKeyCoerce: fmap id" forall (x :: FromJSONKeyFunction a).
470 "FromJSONKeyCoerce: fmap id" forall (x :: FromJSONKeyFunction a).
479 fmap id x = x
471 fmap id x = x
480 #-}
472 #-}
473+#if HAS_COERCIBLE
481{-# RULES
474{-# RULES
482 "FromJSONKeyCoerce: fmap coerce" forall x .
475 "FromJSONKeyCoerce: fmap coerce" forall x .
483 fmap coerce x = coerceFromJSONKeyFunction x
476 fmap coerce x = coerceFromJSONKeyFunction x
484 #-}
477 #-}
478+#endif
485
479
486-- | Same as 'fmap'. Provided for the consistency with 'ToJSONKeyFunction'.
480-- | Same as 'fmap'. Provided for the consistency with 'ToJSONKeyFunction'.
487mapFromJSONKeyFunction :: (a -> b) -> FromJSONKeyFunction a -> FromJSONKeyFunction b
481mapFromJSONKeyFunction :: (a -> b) -> FromJSONKeyFunction a -> FromJSONKeyFunction b
488mapFromJSONKeyFunction = fmap
482mapFromJSONKeyFunction = fmap
489
483
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−
519-------------------------------------------------------------------------------
484-------------------------------------------------------------------------------
520-- Functions needed for documentation
485-- Functions needed for documentation
521-------------------------------------------------------------------------------
486-------------------------------------------------------------------------------
522
487
523-- | Fail parsing due to a type mismatch, with a descriptive message.
488-- | Fail parsing due to a type mismatch, with a descriptive message.
524--
489--
525−-- The following wrappers should generally be prefered:
490+-- Example usage:
526−-- 'withObject', 'withArray', 'withText', 'withBool'.
527−--
528−-- ==== Error message example
529--
491--
530−-- > typeMismatch "Object" (String "oops")
492+-- @
531−-- > -- Error: "expected Object, but encountered String"
493+-- instance FromJSON Coord where
494+-- parseJSON ('Object' v) = {- type matches, life is good -}
495+-- parseJSON wat = 'typeMismatch' \"Coord\" wat
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\"@).
535 -> Value -- ^ The actual value encountered.
498 -> Value -- ^ The actual value encountered.
536 -> Parser a
499 -> Parser a
537typeMismatch expected actual =
500typeMismatch expected actual =
538− fail $ "expected " ++ expected ++ ", but encountered " ++ typeOf actual
501+ fail $ "expected " ++ expected ++ ", encountered " ++ name
539−
502+ where
540−-- | Fail parsing due to a type mismatch, when the expected types are implicit.
541−--
542−-- ==== Error message example
543−--
544−-- > unexpected (String "oops")
545−-- > -- Error: "unexpected String"
546−unexpected :: Value -> Parser a
547−unexpected actual = fail $ "unexpected " ++ typeOf actual
548−
549−-- | JSON type of a value, name of the head constructor.
550−typeOf :: Value -> String
551−typeOf v = case v of
503+ name = case actual of
552− Object _ -> "Object"
504+ Object _ -> "Object"
553− Array _ -> "Array"
505+ Array _ -> "Array"
554− String _ -> "String"
506+ String _ -> "String"
555− Number _ -> "Number"
507+ Number _ -> "Number"
556− Bool _ -> "Boolean"
508+ Bool _ -> "Boolean"
557− Null -> "Null"
509+ Null -> "Null"
558
510
559-------------------------------------------------------------------------------
511-------------------------------------------------------------------------------
560-- Lifings of FromJSON and ToJSON to unary and binary type constructors
512-- Lifings of FromJSON and ToJSON to unary and binary type constructors
@@ -635,8 +587,9 @@ class FromJSON2 f where
635 -> (Value -> Parser b)
587 -> (Value -> Parser b)
636 -> (Value -> Parser [b])
588 -> (Value -> Parser [b])
637 -> Value -> Parser [f a b]
589 -> Value -> Parser [f a b]
638− liftParseJSONList2 fa ga fb gb = withArray "[]" $ \vals ->
590+ liftParseJSONList2 fa ga fb gb v = case v of
639− fmap V.toList (V.mapM (liftParseJSON2 fa ga fb gb) vals)
591+ Array vals -> fmap V.toList (V.mapM (liftParseJSON2 fa ga fb gb) vals)
592+ _ -> typeMismatch "[a]" v
640
593
641-- | Lift the standard 'parseJSON' function through the type constructor.
594-- | Lift the standard 'parseJSON' function through the type constructor.
642parseJSON2 :: (FromJSON2 f, FromJSON a, FromJSON b) => Value -> Parser (f a b)
595parseJSON2 :: (FromJSON2 f, FromJSON a, FromJSON b) => Value -> Parser (f a b)
@@ -650,7 +603,7 @@ parseJSON2 = liftParseJSON2 parseJSON parseJSONList parseJSON parseJSONList
650-- | Helper function to use with 'liftParseJSON'. See 'Data.Aeson.ToJSON.listEncoding'.
603-- | Helper function to use with 'liftParseJSON'. See 'Data.Aeson.ToJSON.listEncoding'.
651listParser :: (Value -> Parser a) -> Value -> Parser [a]
604listParser :: (Value -> Parser a) -> Value -> Parser [a]
652listParser f (Array xs) = fmap V.toList (V.mapM f xs)
605listParser f (Array xs) = fmap V.toList (V.mapM f xs)
653−listParser _ v = typeMismatch "Array" v
606+listParser _ v = typeMismatch "[a]" v
654{-# INLINE listParser #-}
607{-# INLINE listParser #-}
655
608
656-------------------------------------------------------------------------------
609-------------------------------------------------------------------------------
@@ -668,139 +621,49 @@ instance (FromJSON a) => FromJSON [a] where
668-- Functions
621-- Functions
669-------------------------------------------------------------------------------
622-------------------------------------------------------------------------------
670
623
671−-- | Add context to a failure message, indicating the name of the structure
672−-- being parsed.
673−--
674−-- > prependContext "MyType" (fail "[error message]")
675−-- > -- Error: "parsing MyType failed, [error message]"
676−prependContext :: String -> Parser a -> Parser a
677−prependContext name = prependFailure ("parsing " ++ name ++ " failed, ")
678−
679−-- | @'withObject' name f value@ applies @f@ to the 'Object' when @value@
624+-- | @'withObject' expected f value@ applies @f@ to the 'Object' when @value@
680−-- is an 'Data.Aeson.Object' and fails otherwise.
625+-- is an 'Object' and fails using @'typeMismatch' expected@ otherwise.
681−--
682−-- ==== Error message example
683−--
684−-- > withObject "MyType" f (String "oops")
685−-- > -- Error: "parsing MyType failed, expected Object, but encountered String"
686withObject :: String -> (Object -> Parser a) -> Value -> Parser a
626withObject :: String -> (Object -> Parser a) -> Value -> Parser a
687−withObject _ f (Object obj) = f obj
627+withObject _ f (Object obj) = f obj
688−withObject name _ v = prependContext name (typeMismatch "Object" v)
628+withObject expected _ v = typeMismatch expected v
689{-# INLINE withObject #-}
629{-# INLINE withObject #-}
690
630
691−-- | @'withText' name f value@ applies @f@ to the 'Text' when @value@ is a
631+-- | @'withText' expected f value@ applies @f@ to the 'Text' when @value@ is a
692−-- 'Data.Aeson.String' and fails otherwise.
632+-- 'String' and fails using @'typeMismatch' expected@ otherwise.
693−--
694−-- ==== Error message example
695−--
696−-- > withText "MyType" f Null
697−-- > -- Error: "parsing MyType failed, expected String, but encountered Null"
698withText :: String -> (Text -> Parser a) -> Value -> Parser a
633withText :: String -> (Text -> Parser a) -> Value -> Parser a
699−withText _ f (String txt) = f txt
634+withText _ f (String txt) = f txt
700−withText name _ v = prependContext name (typeMismatch "String" v)
635+withText expected _ v = typeMismatch expected v
701{-# INLINE withText #-}
636{-# INLINE withText #-}
702
637
703-- | @'withArray' expected f value@ applies @f@ to the 'Array' when @value@ is
638-- | @'withArray' expected f value@ applies @f@ to the 'Array' when @value@ is
704−-- an 'Data.Aeson.Array' and fails otherwise.
639+-- an 'Array' and fails using @'typeMismatch' expected@ otherwise.
705−--
706−-- ==== Error message example
707−--
708−-- > withArray "MyType" f (String "oops")
709−-- > -- Error: "parsing MyType failed, expected Array, but encountered String"
710withArray :: String -> (Array -> Parser a) -> Value -> Parser a
640withArray :: String -> (Array -> Parser a) -> Value -> Parser a
711−withArray _ f (Array arr) = f arr
641+withArray _ f (Array arr) = f arr
712−withArray name _ v = prependContext name (typeMismatch "Array" v)
642+withArray expected _ v = typeMismatch expected v
713{-# INLINE withArray #-}
643{-# INLINE withArray #-}
714
644
645+-- | @'withNumber' expected f value@ applies @f@ to the 'Number' when @value@
646+-- is a 'Number' and fails using @'typeMismatch' expected@ otherwise.
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+
715−-- | @'withScientific' name f value@ applies @f@ to the 'Scientific' number
652+-- | @'withScientific' expected f value@ applies @f@ to the 'Scientific' number
716−-- when @value@ is a 'Data.Aeson.Number' and fails using 'typeMismatch'
653+-- when @value@ is a 'Number' and fails using @'typeMismatch' expected@
717-- otherwise.
654-- 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"
728withScientific :: String -> (Scientific -> Parser a) -> Value -> Parser a
655withScientific :: String -> (Scientific -> Parser a) -> Value -> Parser a
729−withScientific _ f (Number scientific) = f scientific
656+withScientific _ f (Number scientific) = f scientific
730−withScientific name _ v = prependContext name (typeMismatch "Number" v)
657+withScientific expected _ v = typeMismatch expected v
731{-# INLINE withScientific #-}
658{-# INLINE withScientific #-}
732
659
733−-- | A variant of 'withScientific' which doesn't use 'prependContext', so that
734−-- such context can be added separately in a way that also applies when the
735−-- continuation @f :: Scientific -> Parser a@ fails.
736−--
737−-- /Warning/: If you are converting from a scientific to an unbounded
738−-- type such as 'Integer' you may want to add a restriction on the
739−-- size of the exponent (see 'withBoundedScientific') to prevent
740−-- malicious input from filling up the memory of the target system.
741−--
742−-- ==== Error message examples
743−--
744−-- > withScientific' f (String "oops")
745−-- > -- Error: "unexpected String"
746−-- >
747−-- > prependContext "MyType" (withScientific' f (String "oops"))
748−-- > -- Error: "parsing MyType failed, unexpected String"
749−withScientific' :: (Scientific -> Parser a) -> Value -> Parser a
750−withScientific' f v = case v of
751− Number n -> f n
752− _ -> typeMismatch "Number" v
753−{-# INLINE withScientific' #-}
754−
755−-- | @'withBoundedScientific' name f value@ applies @f@ to the 'Scientific' number
756−-- when @value@ is a 'Number' with exponent less than or equal to 1024.
757−withBoundedScientific :: String -> (Scientific -> Parser a) -> Value -> Parser a
758−withBoundedScientific name f v = withBoundedScientific_ (prependContext name) f v
759−{-# INLINE withBoundedScientific #-}
760−
761−-- | A variant of 'withBoundedScientific' which doesn't use 'prependContext',
762−-- so that such context can be added separately in a way that also applies
763−-- when the continuation @f :: Scientific -> Parser a@ fails.
764−withBoundedScientific' :: (Scientific -> Parser a) -> Value -> Parser a
765−withBoundedScientific' f v = withBoundedScientific_ id f v
766−{-# INLINE withBoundedScientific' #-}
767−
768−-- | A variant of 'withBoundedScientific_' parameterized by a function to apply
769−-- to the 'Parser' in case of failure.
770−withBoundedScientific_ :: (Parser a -> Parser a) -> (Scientific -> Parser a) -> Value -> Parser a
771−withBoundedScientific_ whenFail f (Number scientific) =
772− if exp10 > 1024
773− then whenFail (fail msg)
774− else f scientific
775− where
776− exp10 = base10Exponent scientific
777− msg = "found a number with exponent " ++ show exp10 ++ ", but it must not be greater than 1024"
778−withBoundedScientific_ whenFail _ v =
779− whenFail (typeMismatch "Number" v)
780−{-# INLINE withBoundedScientific_ #-}
781−
782-- | @'withBool' expected f value@ applies @f@ to the 'Bool' when @value@ is a
660-- | @'withBool' expected f value@ applies @f@ to the 'Bool' when @value@ is a
783−-- 'Boolean' and fails otherwise.
661+-- 'Bool' and fails using @'typeMismatch' expected@ otherwise.
784−--
785−-- ==== Error message example
786−--
787−-- > withBool "MyType" f (String "oops")
788−-- > -- Error: "parsing MyType failed, expected Boolean, but encountered String"
789withBool :: String -> (Bool -> Parser a) -> Value -> Parser a
662withBool :: String -> (Bool -> Parser a) -> Value -> Parser a
790−withBool _ f (Bool arr) = f arr
663+withBool _ f (Bool arr) = f arr
791−withBool name _ v = prependContext name (typeMismatch "Boolean" v)
664+withBool expected _ v = typeMismatch expected v
792{-# INLINE withBool #-}
665{-# INLINE withBool #-}
793
666
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−
804-- | Convert a value from JSON, failing if the types do not match.
667-- | Convert a value from JSON, failing if the types do not match.
805fromJSON :: (FromJSON a) => Value -> Result a
668fromJSON :: (FromJSON a) => Value -> Result a
806fromJSON = parse parseJSON
669fromJSON = parse parseJSON
@@ -863,7 +726,7 @@ parseFieldMaybe' = (.:!)
863-- E.g. @'explicitParseField' 'parseJSON1' :: ('FromJSON1' f, 'FromJSON' a) -> 'Object' -> 'Text' -> 'Parser' (f a)@
726-- E.g. @'explicitParseField' 'parseJSON1' :: ('FromJSON1' f, 'FromJSON' a) -> 'Object' -> 'Text' -> 'Parser' (f a)@
864explicitParseField :: (Value -> Parser a) -> Object -> Text -> Parser a
727explicitParseField :: (Value -> Parser a) -> Object -> Text -> Parser a
865explicitParseField p obj key = case H.lookup key obj of
728explicitParseField p obj key = case H.lookup key obj of
866− Nothing -> fail $ "key " ++ show key ++ " not found"
729+ Nothing -> fail $ "key " ++ show key ++ " not present"
867 Just v -> p v <?> Key key
730 Just v -> p v <?> Key key
868{-# INLINE explicitParseField #-}
731{-# INLINE explicitParseField #-}
869
732
@@ -903,47 +766,11 @@ pmval .!= val = fromMaybe val <$> pmval
903-- Generic parseJSON
766-- Generic parseJSON
904-------------------------------------------------------------------------------
767-------------------------------------------------------------------------------
905
768
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−
911instance OVERLAPPABLE_ (GFromJSON arity a) => GFromJSON arity (M1 i c a) where
769instance OVERLAPPABLE_ (GFromJSON arity a) => GFromJSON arity (M1 i c a) where
912 -- Meta-information, which is not handled elsewhere, is just added to the
770 -- Meta-information, which is not handled elsewhere, is just added to the
913 -- parsed value:
771 -- parsed value:
914 gParseJSON opts fargs = fmap M1 . gParseJSON opts fargs
772 gParseJSON opts fargs = fmap M1 . gParseJSON opts fargs
915
773
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−
947instance (FromJSON a) => GFromJSON arity (K1 i a) where
774instance (FromJSON a) => GFromJSON arity (K1 i a) where
948 -- Constant values are decoded using their FromJSON instance:
775 -- Constant values are decoded using their FromJSON instance:
949 gParseJSON _opts _ = fmap K1 . parseJSON
776 gParseJSON _opts _ = fmap K1 . parseJSON
@@ -958,499 +785,326 @@ instance (FromJSON1 f) => GFromJSON One (Rec1 f) where
958 -- FromJSON1 instance:
785 -- FromJSON1 instance:
959 gParseJSON _opts (From1Args pj pjl) = fmap Rec1 . liftParseJSON pj pjl
786 gParseJSON _opts (From1Args pj pjl) = fmap Rec1 . liftParseJSON pj pjl
960
787
788+instance GFromJSON arity U1 where
789+ -- Empty constructors are expected to be encoded as an empty array:
790+ gParseJSON _opts _ v
791+ | isEmptyArray v = pure U1
792+ | otherwise = typeMismatch "unit constructor (U1)" v
793+
794+instance (ConsFromJSON arity a) => GFromJSON arity (C1 c a) where
795+ -- Constructors need to be decoded differently depending on whether they're
796+ -- a record or not. This distinction is made by consParseJSON:
797+ gParseJSON opts fargs = fmap M1 . consParseJSON opts fargs
798+
799+instance ( FromProduct arity a, FromProduct arity b
800+ , ProductSize a, ProductSize b
801+ ) => GFromJSON arity (a :*: b) where
802+ -- Products are expected to be encoded to an array. Here we check whether we
803+ -- got an array of the same size as the product, then parse each of the
804+ -- product's elements using parseProduct:
805+ gParseJSON opts fargs = withArray "product (:*:)" $ \arr ->
806+ let lenArray = V.length arr
807+ lenProduct = (unTagged2 :: Tagged2 (a :*: b) Int -> Int)
808+ productSize in
809+ if lenArray == lenProduct
810+ then parseProduct opts fargs arr 0 lenProduct
811+ else fail $ "When expecting a product of " ++ show lenProduct ++
812+ " values, encountered an Array of " ++ show lenArray ++
813+ " elements instead"
814+
815+instance ( AllNullary (a :+: b) allNullary
816+ , ParseSum arity (a :+: b) allNullary
817+ ) => GFromJSON arity (a :+: b) where
818+ -- If all constructors of a sum datatype are nullary and the
819+ -- 'allNullaryToStringTag' option is set they are expected to be
820+ -- encoded as strings. This distinction is made by 'parseSum':
821+ gParseJSON opts fargs =
822+ (unTagged :: Tagged allNullary (Parser ((a :+: b) d)) ->
823+ Parser ((a :+: b) d))
824+ . parseSum opts fargs
825+
961instance (FromJSON1 f, GFromJSON One g) => GFromJSON One (f :.: g) where
826instance (FromJSON1 f, GFromJSON One g) => GFromJSON One (f :.: g) where
962 -- If an occurrence of the last type parameter is nested inside two
827 -- If an occurrence of the last type parameter is nested inside two
963 -- composed types, it is decoded by using the outermost type's FromJSON1
828 -- composed types, it is decoded by using the outermost type's FromJSON1
964 -- instance to generically decode the innermost type:
829 -- instance to generically decode the innermost type:
965 gParseJSON opts fargs =
830 gParseJSON opts fargs =
966− let gpj = gParseJSON opts fargs in
831+ let gpj = gParseJSON opts fargs in
967− fmap Comp1 . liftParseJSON gpj (listParser gpj)
832+ fmap Comp1 . liftParseJSON gpj (listParser gpj)
968−
969−--------------------------------------------------------------------------------
970−
971−instance (GFromJSON' arity a, Datatype d) => GFromJSON arity (D1 d a) where
972− -- Meta-information, which is not handled elsewhere, is just added to the
973− -- parsed value:
974− gParseJSON opts fargs = fmap M1 . gParseJSON' (tname :* opts :* fargs)
975− where
976− tname = moduleName proxy ++ "." ++ datatypeName proxy
977− proxy = undefined :: M1 _i d _f _p
978−
979−-- | 'GFromJSON', after unwrapping the 'D1' constructor, now carrying the data
980−-- type's name.
981−class GFromJSON' arity f where
982− gParseJSON' :: TypeName :* Options :* FromArgs arity a
983− -> Value
984− -> Parser (f a)
985−
986−-- | Single constructor.
987−instance ( ConsFromJSON arity a
988− , AllNullary (C1 c a) allNullary
989− , ParseSum arity (C1 c a) allNullary
990− , Constructor c
991− ) => GFromJSON' arity (C1 c a) where
992− -- The option 'tagSingleConstructors' determines whether to wrap
993− -- a single-constructor type.
994− gParseJSON' p@(_ :* opts :* _)
995− | tagSingleConstructors opts
996− = (unTagged :: Tagged allNullary (Parser (C1 c a p)) -> Parser (C1 c a p))
997− . parseSum p
998− | otherwise = fmap M1 . consParseJSON (cname :* p)
999− where
1000− cname = conName (undefined :: M1 _i c _f _p)
1001−
1002−-- | Multiple constructors.
1003−instance ( AllNullary (a :+: b) allNullary
1004− , ParseSum arity (a :+: b) allNullary
1005− ) => GFromJSON' arity (a :+: b) where
1006− -- If all constructors of a sum datatype are nullary and the
1007− -- 'allNullaryToStringTag' option is set they are expected to be
1008− -- encoded as strings. This distinction is made by 'parseSum':
1009− gParseJSON' p =
1010− (unTagged :: Tagged allNullary (Parser ((a :+: b) _d)) ->
1011− Parser ((a :+: b) _d))
1012− . parseSum p
1013
833
1014--------------------------------------------------------------------------------
834--------------------------------------------------------------------------------
1015
835
1016class ParseSum arity f allNullary where
836class ParseSum arity f allNullary where
1017− parseSum :: TypeName :* Options :* FromArgs arity a
837+ parseSum :: Options -> FromArgs arity a
1018− -> Value
1019− -> Tagged allNullary (Parser (f a))
838+ -> Value -> Tagged allNullary (Parser (f a))
1020−
839+
1021−instance ( ConstructorNames f
1022− , SumFromString f
840+instance ( SumFromString (a :+: b)
1023− , FromPair arity f
841+ , FromPair arity (a :+: b)
1024− , FromTaggedObject arity f
842+ , FromTaggedObject arity (a :+: b)
1025− , FromUntaggedValue arity f
843+ , FromUntaggedValue arity (a :+: b)
1026− ) => ParseSum arity f True where
844+ ) => ParseSum arity (a :+: b) True where
1027− parseSum p@(tname :* opts :* _)
845+ parseSum opts fargs
1028− | allNullaryToStringTag opts = Tagged . parseAllNullarySum tname opts
846+ | allNullaryToStringTag opts = Tagged . parseAllNullarySum opts
1029− | otherwise = Tagged . parseNonAllNullarySum p
847+ | otherwise = Tagged . parseNonAllNullarySum opts fargs
1030−
848+
1031−instance ( ConstructorNames f
1032− , FromPair arity f
849+instance ( FromPair arity (a :+: b)
1033− , FromTaggedObject arity f
850+ , FromTaggedObject arity (a :+: b)
1034− , FromUntaggedValue arity f
851+ , FromUntaggedValue arity (a :+: b)
1035− ) => ParseSum arity f False where
852+ ) => ParseSum arity (a :+: b) False where
1036− parseSum p = Tagged . parseNonAllNullarySum p
853+ parseSum opts fargs = Tagged . parseNonAllNullarySum opts fargs
1037
854
1038--------------------------------------------------------------------------------
855--------------------------------------------------------------------------------
1039
856
1040−parseAllNullarySum :: (SumFromString f, ConstructorNames f)
857+parseAllNullarySum :: SumFromString f => Options -> Value -> Parser (f a)
1041− => TypeName -> Options -> Value -> Parser (f a)
1042−parseAllNullarySum tname opts =
858+parseAllNullarySum opts = withText "Text" $ \key ->
1043− withText tname $ \tag ->
1044− maybe (badTag tag) return $
859+ maybe (notFound key) return $
1045− parseSumFromString modifier tag
860+ parseSumFromString opts key
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])
1062
861
1063class SumFromString f where
862class SumFromString f where
1064− parseSumFromString :: (String -> String) -> Text -> Maybe (f a)
863+ parseSumFromString :: Options -> Text -> Maybe (f a)
1065
864
1066instance (SumFromString a, SumFromString b) => SumFromString (a :+: b) where
865instance (SumFromString a, SumFromString b) => SumFromString (a :+: b) where
1067 parseSumFromString opts key = (L1 <$> parseSumFromString opts key) <|>
866 parseSumFromString opts key = (L1 <$> parseSumFromString opts key) <|>
1068 (R1 <$> parseSumFromString opts key)
867 (R1 <$> parseSumFromString opts key)
1069
868
1070instance (Constructor c) => SumFromString (C1 c U1) where
869instance (Constructor c) => SumFromString (C1 c U1) where
1071− parseSumFromString modifier key
870+ parseSumFromString opts key | key == name = Just $ M1 U1
1072− | key == name = Just $ M1 U1
1073− | otherwise = Nothing
871+ | otherwise = Nothing
1074− where
872+ where
1075− name = pack $ modifier $ conName (undefined :: M1 _i c _f _p)
873+ name = pack $ constructorTagModifier opts $
1076−
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)
1090−
1091−instance (ConstructorNames a, ConstructorNames b) => ConstructorNames (a :+: b) where
1092− constructorNames' = liftA2 append constructorNames' constructorNames'
1093− where
1094− append
1095− :: Tagged2 a (DList.DList t)
1096− -> Tagged2 b (DList.DList t)
1097− -> Tagged2 (a :+: b) (DList.DList t)
1098− append (Tagged2 xs) (Tagged2 ys) = Tagged2 (DList.append xs ys)
1099−
1100−instance Constructor c => ConstructorNames (C1 c a) where
1101− constructorNames' f = Tagged2 (pure (f cname))
1102− where
1103− cname = conName (undefined :: M1 _i c _f _p)
874+ conName (undefined :: t c U1 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
875
1112--------------------------------------------------------------------------------
876--------------------------------------------------------------------------------
877+
1113−parseNonAllNullarySum :: forall f c arity.
878+parseNonAllNullarySum :: ( FromPair arity (a :+: b)
1114− ( FromPair arity f
1115− , FromTaggedObject arity f
879+ , FromTaggedObject arity (a :+: b)
1116− , FromUntaggedValue arity f
880+ , FromUntaggedValue arity (a :+: b)
1117− , ConstructorNames f
1118− ) => TypeName :* Options :* FromArgs arity c
881+ ) => Options -> FromArgs arity c
1119− -> Value -> Parser (f c)
882+ -> Value -> Parser ((a :+: b) c)
1120−parseNonAllNullarySum p@(tname :* opts :* _) =
883+parseNonAllNullarySum opts fargs =
1121 case sumEncoding opts of
884 case sumEncoding opts of
1122 TaggedObject{..} ->
885 TaggedObject{..} ->
1123− withObject tname $ \obj -> do
886+ withObject "Object" $ \obj -> do
1124− tag <- contextType tname . contextTag tagKey cnames_ $ obj .: tagKey
1125− fromMaybe (badTag tag <?> Key tagKey) $
1126− parseFromTaggedObject (tag :* contentsFieldName :* p) obj
1127− where
1128− tagKey = pack tagFieldName
887+ tag <- obj .: pack tagFieldName
1129− badTag tag = failWith_ $ \cnames ->
888+ fromMaybe (notFound tag) $
1130− "expected tag field to be one of " ++ show cnames ++
889+ parseFromTaggedObject opts fargs contentsFieldName obj tag
1131− ", but found tag " ++ show tag
1132− cnames_ = unTagged2 (constructorTags (constructorTagModifier opts) :: Tagged2 f [String])
1133
890
1134 ObjectWithSingleField ->
891 ObjectWithSingleField ->
892+ withObject "Object" $ \obj ->
1135− withObject tname $ \obj -> case H.toList obj of
893+ case H.toList obj of
1136− [(tag, v)] -> maybe (badTag tag) (<?> Key tag) $
894+ [pair@(tag, _)] -> fromMaybe (notFound tag) $
1137− parsePair (tag :* p) v
895+ parsePair opts fargs pair
1138− _ -> contextType tname . fail $
896+ _ -> 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
1145
897
1146 TwoElemArray ->
898 TwoElemArray ->
1147− withArray tname $ \arr -> case V.length arr of
899+ withArray "Array" $ \arr ->
900+ if V.length arr == 2
1148− 2 | String tag <- V.unsafeIndex arr 0 ->
901+ then case V.unsafeIndex arr 0 of
1149− maybe (badTag tag <?> Index 0) (<?> Index 1) $
902+ String tag -> fromMaybe (notFound tag) $
1150− parsePair (tag :* p) (V.unsafeIndex arr 1)
903+ parsePair opts fargs (tag, V.unsafeIndex arr 1)
1151− | otherwise ->
1152− contextType tname $
1153− fail "tag element is not a String" <?> Index 0
904+ _ -> fail "First element is not a String"
1154− len -> contextType tname . fail $
905+ else fail "Array doesn't have 2 elements"
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
1161
906
1162− UntaggedValue -> parseUntaggedValue p
907+ UntaggedValue -> parseUntaggedValue opts fargs
1163− where
1164− failWith_ = failWithCTags tname (constructorTagModifier opts)
1165
908
1166--------------------------------------------------------------------------------
909--------------------------------------------------------------------------------
1167
910
1168class FromTaggedObject arity f where
911class FromTaggedObject arity f where
1169− -- The first two components of the parameter tuple are: the constructor tag
1170− -- to match against, and the contents field name.
1171− parseFromTaggedObject
912+ parseFromTaggedObject :: Options -> FromArgs arity a
1172− :: Text :* String :* TypeName :* Options :* FromArgs arity a
1173− -> Object
913+ -> String -> Object
1174− -> Maybe (Parser (f a))
914+ -> Text -> Maybe (Parser (f a))
1175
915
1176instance ( FromTaggedObject arity a, FromTaggedObject arity b) =>
916instance ( FromTaggedObject arity a, FromTaggedObject arity b) =>
1177 FromTaggedObject arity (a :+: b) where
917 FromTaggedObject arity (a :+: b) where
1178− parseFromTaggedObject p obj =
918+ parseFromTaggedObject opts fargs contentsFieldName obj tag =
1179− (fmap L1 <$> parseFromTaggedObject p obj) <|>
919+ (fmap L1 <$> parseFromTaggedObject opts fargs contentsFieldName obj tag) <|>
1180− (fmap R1 <$> parseFromTaggedObject p obj)
920+ (fmap R1 <$> parseFromTaggedObject opts fargs contentsFieldName obj tag)
1181
921
1182−instance ( IsRecord f isRecord
1183− , FromTaggedObject' arity f isRecord
922+instance ( FromTaggedObject' arity f
1184 , Constructor c
923 , Constructor c
1185 ) => FromTaggedObject arity (C1 c f) where
924 ) => FromTaggedObject arity (C1 c f) where
1186− parseFromTaggedObject (tag :* contentsFieldName :* p@(_ :* opts :* _))
925+ parseFromTaggedObject opts fargs contentsFieldName obj tag
1187− | tag == tag'
1188− = Just . fmap M1 .
1189− (unTagged :: Tagged isRecord (Parser (f a)) -> Parser (f a)) .
1190− parseFromTaggedObject' (contentsFieldName :* cname :* p)
926+ | tag == name = Just $ M1 <$> parseFromTaggedObject'
927+ opts fargs contentsFieldName obj
1191− | otherwise = const Nothing
928+ | otherwise = Nothing
1192− where
929+ where
1193− tag' = pack $ constructorTagModifier opts cname
930+ name = pack $ constructorTagModifier opts $
1194− cname = conName (undefined :: M1 _i c _f _p)
931+ conName (undefined :: t c f p)
1195
932
1196--------------------------------------------------------------------------------
933--------------------------------------------------------------------------------
1197
934
1198−class FromTaggedObject' arity f isRecord where
935+class FromTaggedObject' arity f where
1199− -- The first component of the parameter tuple is the contents field name.
1200− parseFromTaggedObject'
936+ parseFromTaggedObject' :: Options -> FromArgs arity a -> String
1201− :: String :* ConName :* TypeName :* Options :* FromArgs arity a
1202− -> Object -> Tagged isRecord (Parser (f a))
937+ -> Object -> Parser (f a)
1203−
938+
1204−instance (RecordFromJSON arity f, FieldNames f) => FromTaggedObject' arity f True where
939+class FromTaggedObject'' arity f isRecord where
1205− -- Records are unpacked in the tagged object
1206− parseFromTaggedObject' (_ :* p) = Tagged . recordParseJSON (True :* p)
940+ parseFromTaggedObject'' :: Options -> FromArgs arity a -> String
1207−
941+ -> Object -> Tagged isRecord (Parser (f a))
1208−instance (ConsFromJSON arity f) => FromTaggedObject' arity f False where
1209− -- Nonnullary nonrecords are encoded in the contents field
1210− parseFromTaggedObject' p obj = Tagged $ do
1211− contents <- contextCons cname tname (obj .: key)
1212− consParseJSON p' contents <?> Key key
1213− where
1214− key = pack contentsFieldName
1215− contentsFieldName :* p'@(cname :* tname :* _) = p
1216
942
943+instance ( IsRecord f isRecord
944+ , FromTaggedObject'' arity f isRecord
945+ ) => FromTaggedObject' arity f where
946+ parseFromTaggedObject' opts fargs contentsFieldName =
947+ (unTagged :: Tagged isRecord (Parser (f a)) -> Parser (f a)) .
948+ parseFromTaggedObject'' opts fargs contentsFieldName
949+
950+instance (FromRecord arity f) => FromTaggedObject'' arity f True where
951+ parseFromTaggedObject'' opts fargs _ =
952+ Tagged . parseRecord opts fargs Nothing
953+
954+instance (GFromJSON arity f) => FromTaggedObject'' arity f False where
955+ parseFromTaggedObject'' opts fargs contentsFieldName = Tagged .
956+ (gParseJSON opts fargs <=< (.: pack contentsFieldName))
957+
1217−instance OVERLAPPING_ FromTaggedObject' arity U1 False where
958+instance OVERLAPPING_ FromTaggedObject'' arity U1 False where
1218− -- Nullary constructors don't need a contents field
959+ parseFromTaggedObject'' _ _ _ _ = Tagged (pure U1)
1219− parseFromTaggedObject' _ _ = Tagged (pure U1)
1220
960
1221--------------------------------------------------------------------------------
961--------------------------------------------------------------------------------
1222
962
1223−-- | Constructors need to be decoded differently depending on whether they're
1224−-- a record or not. This distinction is made by 'ConsParseJSON'.
1225class ConsFromJSON arity f where
963class ConsFromJSON arity f where
1226− consParseJSON
1227− :: ConName :* TypeName :* Options :* FromArgs arity a
964+ consParseJSON :: Options -> FromArgs arity a
1228− -> Value -> Parser (f a)
965+ -> Value -> Parser (f a)
1229
966
1230class ConsFromJSON' arity f isRecord where
967class ConsFromJSON' arity f isRecord where
1231− consParseJSON'
1232− :: ConName :* TypeName :* Options :* FromArgs arity a
968+ consParseJSON' :: Options -> FromArgs arity a
969+ -> Maybe Text -- ^ A dummy label
970+ -- (Nothing to use proper label)
1233− -> Value -> Tagged isRecord (Parser (f a))
971+ -> Value -> Tagged isRecord (Parser (f a))
1234
972
1235instance ( IsRecord f isRecord
973instance ( IsRecord f isRecord
1236 , ConsFromJSON' arity f isRecord
974 , ConsFromJSON' arity f isRecord
1237 ) => ConsFromJSON arity f where
975 ) => ConsFromJSON arity f where
1238− consParseJSON p =
976+ consParseJSON opts fargs v = let
977+ (v2,lab) = case (unwrapUnaryRecords opts,isUnary (undefined :: f a)) of
978+ -- use a dummy object with a dummy label
979+ (True,True) -> (object [(pack "dummy",v)], Just $ pack "dummy")
980+ _ ->(v,Nothing)
1239− (unTagged :: Tagged isRecord (Parser (f a)) -> Parser (f a))
981+ in (unTagged :: Tagged isRecord (Parser (f a)) -> Parser (f a))
1240− . consParseJSON' p
982+ $ consParseJSON' opts fargs lab v2
1241
983
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
984
1249−instance RecordFromJSON arity f => ConsFromJSON' arity f True where
985+instance (FromRecord arity f) => ConsFromJSON' arity f True where
1250− consParseJSON' p@(cname :* tname :* _) =
986+ consParseJSON' opts fargs mlab = Tagged . withObject "record (:*:)"
1251− Tagged . withObject (showCons cname tname) (recordParseJSON (False :* p))
987+ (parseRecord opts fargs mlab)
1252
988
1253−instance OVERLAPPING_
1254− ConsFromJSON' arity U1 False where
1255− -- Empty constructors are expected to be encoded as an empty array:
1256− consParseJSON' (cname :* tname :* _) v =
1257− Tagged . contextCons cname tname $ case v of
1258− Array a | V.null a -> pure U1
1259− | otherwise -> fail_ a
1260− _ -> typeMismatch "Array" v
1261− where
1262− fail_ a = fail $
1263− "expected an empty Array, but encountered an Array of length " ++
1264− show (V.length a)
1265−
1266−instance OVERLAPPING_
1267− GFromJSON arity f => ConsFromJSON' arity (S1 s f) False where
989+instance (GFromJSON arity f) => ConsFromJSON' arity f False where
1268− consParseJSON' (_ :* _ :* opts :* fargs) =
1269− Tagged . fmap M1 . gParseJSON opts fargs
990+ consParseJSON' opts fargs _ = Tagged . gParseJSON opts fargs
1270−
1271−instance (ProductFromJSON arity f, ProductSize f
1272− ) => ConsFromJSON' arity f False where
1273− consParseJSON' p = Tagged . productParseJSON0 p
1274
991
1275--------------------------------------------------------------------------------
992--------------------------------------------------------------------------------
1276
993
1277−class FieldNames f where
994+class FromRecord arity f where
1278− fieldNames :: f a -> [Text] -> [Text]
995+ parseRecord :: Options -> FromArgs arity a
1279−
996+ -> Maybe Text -- ^ A dummy label
1280−instance (FieldNames a, FieldNames b) => FieldNames (a :*: b) where
997+ -- (Nothing to use proper label)
1281− fieldNames _ =
998+ -> Object -> Parser (f a)
1282− fieldNames (undefined :: a x) .
1283− fieldNames (undefined :: b y)
1284
999
1285−instance (Selector s) => FieldNames (S1 s f) where
1000+instance ( FromRecord arity a
1286− fieldNames _ = (pack (selName (undefined :: M1 _i s _f _p)) :)
1001+ , FromRecord arity b
1287−
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
1298− where
1299− knownFields :: H.HashMap Text ()
1300− knownFields = H.fromList $ map (,()) $
1301− fieldNames (undefined :: f a)
1302− [pack (tagFieldName (sumEncoding opts)) | fromTaggedSum]
1303− checkUnknown =
1304− if not (rejectUnknownFields opts)
1305− then \_ -> return ()
1306− else \obj -> case H.keys (H.difference obj knownFields) of
1307− [] -> return ()
1308− unknownFields -> contextCons cname tname $
1309− fail ("unknown fields: " ++ show unknownFields)
1310−
1311−class RecordFromJSON' arity f where
1312− recordParseJSON'
1313− :: ConName :* TypeName :* Options :* FromArgs arity a
1314− -> Object -> Parser (f a)
1315−
1316−instance ( RecordFromJSON' arity a
1317− , RecordFromJSON' arity b
1318− ) => RecordFromJSON' arity (a :*: b) where
1002+ ) => FromRecord arity (a :*: b) where
1319− recordParseJSON' p obj =
1003+ parseRecord opts fargs _ obj =
1320− (:*:) <$> recordParseJSON' p obj
1004+ (:*:) <$> parseRecord opts fargs Nothing obj
1321− <*> recordParseJSON' p obj
1005+ <*> parseRecord opts fargs Nothing obj
1322
1006
1323instance OVERLAPPABLE_ (Selector s, GFromJSON arity a) =>
1007instance OVERLAPPABLE_ (Selector s, GFromJSON arity a) =>
1324− RecordFromJSON' arity (S1 s a) where
1008+ FromRecord arity (S1 s a) where
1325− recordParseJSON' (cname :* tname :* opts :* fargs) obj = do
1009+ parseRecord opts fargs lab =
1326− fv <- contextCons cname tname (obj .: label)
1010+ (<?> Key label) . gParseJSON opts fargs <=< (.: label)
1327− M1 <$> gParseJSON opts fargs fv <?> Key label
1011+ where
1328− where
1012+ label = fromMaybe defLabel lab
1329− label = pack $ fieldLabelModifier opts sname
1330− sname = selName (undefined :: M1 _i s _f _p)
1331−
1332−instance INCOHERENT_ (Selector s, FromJSON a) =>
1333− RecordFromJSON' arity (S1 s (K1 i (Maybe a))) where
1334− recordParseJSON' (_ :* _ :* opts :* _) obj = M1 . K1 <$> obj .:? pack label
1335− where
1336− label = fieldLabelModifier opts sname
1013+ defLabel = pack . fieldLabelModifier opts $
1337− sname = selName (undefined :: M1 _i s _f _p)
1014+ selName (undefined :: t s a p)
1338
1015
1339−-- Parse an Option like a Maybe.
1340instance INCOHERENT_ (Selector s, FromJSON a) =>
1016instance INCOHERENT_ (Selector s, FromJSON a) =>
1341− RecordFromJSON' arity (S1 s (K1 i (Semigroup.Option a))) where
1017+ FromRecord arity (S1 s (K1 i (Maybe a))) where
1342− recordParseJSON' p obj = wrap <$> recordParseJSON' p obj
1018+ parseRecord _ _ (Just lab) obj = (M1 . K1) <$> obj .:? lab
1019+ parseRecord opts _ Nothing obj = (M1 . K1) <$> obj .:? pack label
1343− where
1020+ where
1344− wrap :: S1 s (K1 i (Maybe a)) p -> S1 s (K1 i (Semigroup.Option a)) p
1021+ label = fieldLabelModifier opts $
1345− wrap (M1 (K1 a)) = M1 (K1 (Semigroup.Option a))
1022+ selName (undefined :: t s (K1 i (Maybe a)) p)
1346
1023
1347--------------------------------------------------------------------------------
1024--------------------------------------------------------------------------------
1348
1025
1349−productParseJSON0
1350− :: forall f arity a. (ProductFromJSON arity f, ProductSize f)
1351− => ConName :* TypeName :* Options :* FromArgs arity a
1352− -> Value -> Parser (f a)
1353− -- Products are expected to be encoded to an array. Here we check whether we
1354− -- got an array of the same size as the product, then parse each of the
1355− -- product's elements using productParseJSON:
1356−productParseJSON0 p@(cname :* tname :* _ :* _) =
1357− withArray (showCons cname tname) $ \arr ->
1358− let lenArray = V.length arr
1359− lenProduct = (unTagged2 :: Tagged2 f Int -> Int)
1360− productSize in
1361− if lenArray == lenProduct
1362− then productParseJSON p arr 0 lenProduct
1363− else contextCons cname tname $
1364− fail $ "expected an Array of length " ++ show lenProduct ++
1365− ", but encountered an Array of length " ++ show lenArray
1366−
1367−--
1368−
1369−class ProductFromJSON arity f where
1026+class FromProduct arity f where
1370− productParseJSON :: ConName :* TypeName :* Options :* FromArgs arity a
1027+ parseProduct :: Options -> FromArgs arity a
1371 -> Array -> Int -> Int
1028 -> Array -> Int -> Int
1372 -> Parser (f a)
1029 -> Parser (f a)
1373
1030
1374−instance ( ProductFromJSON arity a
1031+instance ( FromProduct arity a
1375− , ProductFromJSON arity b
1032+ , FromProduct arity b
1376− ) => ProductFromJSON arity (a :*: b) where
1033+ ) => FromProduct arity (a :*: b) where
1377− productParseJSON p arr ix len =
1034+ parseProduct opts fargs arr ix len =
1378− (:*:) <$> productParseJSON p arr ix lenL
1035+ (:*:) <$> parseProduct opts fargs arr ix lenL
1379− <*> productParseJSON p arr ixR lenR
1036+ <*> parseProduct opts fargs arr ixR lenR
1380 where
1037 where
1381 lenL = len `unsafeShiftR` 1
1038 lenL = len `unsafeShiftR` 1
1382 ixR = ix + lenL
1039 ixR = ix + lenL
1383 lenR = len - lenL
1040 lenR = len - lenL
1384
1041
1385−instance (GFromJSON arity a) => ProductFromJSON arity (S1 s a) where
1042+instance (GFromJSON arity a) => FromProduct arity (S1 s a) where
1386− productParseJSON (_ :* _ :* opts :* fargs) arr ix _ =
1043+ parseProduct opts fargs arr ix _ =
1387− M1 <$> gParseJSON opts fargs (V.unsafeIndex arr ix) <?> Index ix
1044+ gParseJSON opts fargs $ V.unsafeIndex arr ix
1388
1045
1389--------------------------------------------------------------------------------
1046--------------------------------------------------------------------------------
1390
1047
1391class FromPair arity f where
1048class FromPair arity f where
1392− -- The first component of the parameter tuple is the tag to match.
1393− parsePair :: Text :* TypeName :* Options :* FromArgs arity a
1049+ parsePair :: Options -> FromArgs arity a
1394− -> Value
1395− -> Maybe (Parser (f a))
1050+ -> Pair -> Maybe (Parser (f a))
1396
1051
1397instance ( FromPair arity a
1052instance ( FromPair arity a
1398 , FromPair arity b
1053 , FromPair arity b
1399 ) => FromPair arity (a :+: b) where
1054 ) => FromPair arity (a :+: b) where
1400− parsePair p pair =
1401− (fmap L1 <$> parsePair p pair) <|>
1055+ parsePair opts fargs pair = (fmap L1 <$> parsePair opts fargs pair) <|>
1402− (fmap R1 <$> parsePair p pair)
1056+ (fmap R1 <$> parsePair opts fargs pair)
1403
1057
1404instance ( Constructor c
1058instance ( Constructor c
1059+ , GFromJSON arity a
1405 , ConsFromJSON arity a
1060 , ConsFromJSON arity a
1406 ) => FromPair arity (C1 c a) where
1061 ) => FromPair arity (C1 c a) where
1407− parsePair (tag :* p@(_ :* opts :* _)) v
1062+ parsePair opts fargs (tag, value)
1408− | tag == tag' = Just $ M1 <$> consParseJSON (cname :* p) v
1063+ | tag == tag' = Just $ gParseJSON opts fargs value
1409 | otherwise = Nothing
1064 | otherwise = Nothing
1410− where
1065+ where
1411− tag' = pack $ constructorTagModifier opts cname
1066+ tag' = pack $ constructorTagModifier opts $
1412− cname = conName (undefined :: M1 _i c _a _p)
1067+ conName (undefined :: t c a p)
1413
1068
1414--------------------------------------------------------------------------------
1069--------------------------------------------------------------------------------
1415
1070
1416class FromUntaggedValue arity f where
1071class FromUntaggedValue arity f where
1417− parseUntaggedValue :: TypeName :* Options :* FromArgs arity a
1072+ parseUntaggedValue :: Options -> FromArgs arity a
1418− -> Value
1419− -> Parser (f a)
1073+ -> Value -> Parser (f a)
1420
1074
1421instance
1075instance
1422 ( FromUntaggedValue arity a
1076 ( FromUntaggedValue arity a
1423 , FromUntaggedValue arity b
1077 , FromUntaggedValue arity b
1424 ) => FromUntaggedValue arity (a :+: b)
1078 ) => FromUntaggedValue arity (a :+: b)
1425 where
1079 where
1426− parseUntaggedValue p value =
1080+ parseUntaggedValue opts fargs value =
1427− L1 <$> parseUntaggedValue p value <|>
1081+ L1 <$> parseUntaggedValue opts fargs value <|>
1428− R1 <$> parseUntaggedValue p value
1082+ R1 <$> parseUntaggedValue opts fargs value
1429
1083
1430instance OVERLAPPABLE_
1084instance OVERLAPPABLE_
1431− ( ConsFromJSON arity a
1085+ ( GFromJSON arity a
1432− , Constructor c
1086+ , ConsFromJSON arity a
1433 ) => FromUntaggedValue arity (C1 c a)
1087 ) => FromUntaggedValue arity (C1 c a)
1434 where
1088 where
1435− parseUntaggedValue p = fmap M1 . consParseJSON (cname :* p)
1089+ parseUntaggedValue = gParseJSON
1436− where
1437− cname = conName (undefined :: M1 _i c _f _p)
1438
1090
1439instance OVERLAPPING_
1091instance OVERLAPPING_
1440 ( Constructor c )
1092 ( Constructor c )
1441 => FromUntaggedValue arity (C1 c U1)
1093 => FromUntaggedValue arity (C1 c U1)
1442 where
1094 where
1443− parseUntaggedValue (tname :* opts :* _) v =
1095+ parseUntaggedValue opts _ (String s)
1444− contextCons cname tname $ case v of
1096+ | s == pack (constructorTagModifier opts (conName (undefined :: t c U1 p))) =
1445− String tag
1446− | tag == tag' -> pure $ M1 U1
1097+ pure $ M1 U1
1447− | otherwise -> fail_ tag
1098+ | otherwise =
1448− _ -> typeMismatch "String" v
1099+ fail $ "Invalid tag: " ++ unpack s
1449− where
1100+ parseUntaggedValue _ _ v = typeMismatch (conName (undefined :: t c U1 p)) v
1450− tag' = pack $ constructorTagModifier opts cname
1101+
1451− cname = conName (undefined :: M1 _i c _f _p)
1102+
1452− fail_ tag = fail $
1103+--------------------------------------------------------------------------------
1453− "expected tag " ++ show tag' ++ ", but found tag " ++ show tag
1104+
1105+notFound :: Text -> Parser a
1106+notFound key = fail $ "The key \"" ++ unpack key ++ "\" was not found"
1107+{-# INLINE notFound #-}
1454
1108
1455-------------------------------------------------------------------------------
1109-------------------------------------------------------------------------------
1456-- Instances
1110-- Instances
@@ -1508,20 +1162,17 @@ instance (FromJSON a, FromJSON b) => FromJSON (Either a b) where
1508 parseJSON = parseJSON2
1162 parseJSON = parseJSON2
1509 {-# INLINE parseJSON #-}
1163 {-# INLINE parseJSON #-}
1510
1164
1511−instance FromJSON Void where
1165+
1512− parseJSON _ = fail "Cannot parse Void"
1513− {-# INLINE parseJSON #-}
1514
1166
1515instance FromJSON Bool where
1167instance FromJSON Bool where
1516− parseJSON (Bool b) = pure b
1168+ parseJSON = withBool "Bool" pure
1517− parseJSON v = typeMismatch "Bool" v
1518 {-# INLINE parseJSON #-}
1169 {-# INLINE parseJSON #-}
1519
1170
1520instance FromJSONKey Bool where
1171instance FromJSONKey Bool where
1521 fromJSONKey = FromJSONKeyTextParser $ \t -> case t of
1172 fromJSONKey = FromJSONKeyTextParser $ \t -> case t of
1522 "true" -> pure True
1173 "true" -> pure True
1523 "false" -> pure False
1174 "false" -> pure False
1524− _ -> fail $ "cannot parse key " ++ show t ++ " into Bool"
1175+ _ -> fail $ "Cannot parse key into Bool: " ++ T.unpack t
1525
1176
1526instance FromJSON Ordering where
1177instance FromJSON Ordering where
1527 parseJSON = withText "Ordering" $ \s ->
1178 parseJSON = withText "Ordering" $ \s ->
@@ -1529,30 +1180,25 @@ instance FromJSON Ordering where
1529 "LT" -> return LT
1180 "LT" -> return LT
1530 "EQ" -> return EQ
1181 "EQ" -> return EQ
1531 "GT" -> return GT
1182 "GT" -> return GT
1532− _ -> fail $ "parsing Ordering failed, unexpected " ++ show s ++
1533− " (expected \"LT\", \"EQ\", or \"GT\")"
1183+ _ -> fail "Parsing Ordering value failed: expected \"LT\", \"EQ\", or \"GT\""
1534
1184
1535instance FromJSON () where
1185instance FromJSON () where
1536 parseJSON = withArray "()" $ \v ->
1186 parseJSON = withArray "()" $ \v ->
1537 if V.null v
1187 if V.null v
1538 then pure ()
1188 then pure ()
1539− else prependContext "()" $ fail "expected an empty array"
1189+ else fail "Expected an empty array"
1540 {-# INLINE parseJSON #-}
1190 {-# INLINE parseJSON #-}
1541
1191
1542instance FromJSON Char where
1192instance FromJSON Char where
1543− parseJSON = withText "Char" parseChar
1193+ parseJSON = withText "Char" $ \t ->
1194+ if T.compareLength t 1 == EQ
1195+ then pure $ T.head t
1196+ else fail "Expected a string of length 1"
1544 {-# INLINE parseJSON #-}
1197 {-# INLINE parseJSON #-}
1545
1198
1546− parseJSONList (String s) = pure (T.unpack s)
1199+ parseJSONList = withText "String" $ pure . T.unpack
1547− parseJSONList v = typeMismatch "String" v
1548 {-# INLINE parseJSONList #-}
1200 {-# INLINE parseJSONList #-}
1549
1201
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−
1556instance FromJSON Double where
1202instance FromJSON Double where
1557 parseJSON = parseRealFloat "Double"
1203 parseJSON = parseRealFloat "Double"
1558 {-# INLINE parseJSON #-}
1204 {-# INLINE parseJSON #-}
@@ -1564,6 +1210,12 @@ instance FromJSONKey Double where
1564 "-Infinity" -> pure (negate 1/0)
1210 "-Infinity" -> pure (negate 1/0)
1565 _ -> Scientific.toRealFloat <$> parseScientificText t
1211 _ -> Scientific.toRealFloat <$> parseScientificText t
1566
1212
1213+instance FromJSON Number where
1214+ parseJSON (Number s) = pure $ scientificToNumber s
1215+ parseJSON Null = pure (D (0/0))
1216+ parseJSON v = typeMismatch "Number" v
1217+ {-# INLINE parseJSON #-}
1218+
1567instance FromJSON Float where
1219instance FromJSON Float where
1568 parseJSON = parseRealFloat "Float"
1220 parseJSON = parseRealFloat "Float"
1569 {-# INLINE parseJSON #-}
1221 {-# INLINE parseJSON #-}
@@ -1576,30 +1228,17 @@ instance FromJSONKey Float where
1576 _ -> Scientific.toRealFloat <$> parseScientificText t
1228 _ -> Scientific.toRealFloat <$> parseScientificText t
1577
1229
1578instance (FromJSON a, Integral a) => FromJSON (Ratio a) where
1230instance (FromJSON a, Integral a) => FromJSON (Ratio a) where
1579− parseJSON (Number x)
1580− | exp10 <= 1024
1581− , exp10 >= -1024 = return $! realToFrac x
1582− | otherwise = prependContext "Ratio" $ fail msg
1583− where
1584− exp10 = base10Exponent x
1585− msg = "found a number with exponent " ++ show exp10
1586− ++ ", but it must not be greater than 1024 or less than -1024"
1587− parseJSON o = objParser o
1588− where
1589− objParser = withObject "Rational" $ \obj -> do
1231+ parseJSON = withObject "Rational" $ \obj ->
1590− numerator <- obj .: "numerator"
1232+ (%) <$> obj .: "numerator"
1591− denominator <- obj .: "denominator"
1592− if denominator == 0
1593− then fail "Ratio denominator was 0"
1594− else pure $ numerator % denominator
1233+ <*> obj .: "denominator"
1595− {-# INLINE parseJSON #-}
1234+ {-# INLINE parseJSON #-}
1596−
1235+
1597−-- | This instance includes a bounds check to prevent maliciously
1236+-- | /WARNING:/ Only parse fixed-precision numbers from trusted input
1598−-- large inputs to fill up the memory of the target system. You can
1237+-- since an attacker could easily fill up the memory of the target
1599−-- newtype 'Scientific' and provide your own instance using
1238+-- system by specifying a scientific number with a big exponent like
1600−-- 'withScientific' if you want to allow larger inputs.
1239+-- @1e1000000000@.
1601instance HasResolution a => FromJSON (Fixed a) where
1240instance HasResolution a => FromJSON (Fixed a) where
1602− parseJSON = prependContext "Fixed" . withBoundedScientific' (pure . realToFrac)
1241+ parseJSON = withScientific "Fixed" $ pure . realToFrac
1603 {-# INLINE parseJSON #-}
1242 {-# INLINE parseJSON #-}
1604
1243
1605instance FromJSON Int where
1244instance FromJSON Int where
@@ -1609,10 +1248,10 @@ instance FromJSON Int where
1609instance FromJSONKey Int where
1248instance FromJSONKey Int where
1610 fromJSONKey = FromJSONKeyTextParser $ parseBoundedIntegralText "Int"
1249 fromJSONKey = FromJSONKeyTextParser $ parseBoundedIntegralText "Int"
1611
1250
1612−-- | This instance includes a bounds check to prevent maliciously
1251+-- | /WARNING:/ Only parse Integers from trusted input since an
1613−-- large inputs to fill up the memory of the target system. You can
1252+-- attacker could easily fill up the memory of the target system by
1614−-- newtype 'Scientific' and provide your own instance using
1253+-- specifying a scientific number with a big exponent like
1615−-- 'withScientific' if you want to allow larger inputs.
1254+-- @1e1000000000@.
1616instance FromJSON Integer where
1255instance FromJSON Integer where
1617 parseJSON = parseIntegral "Integer"
1256 parseJSON = parseIntegral "Integer"
1618 {-# INLINE parseJSON #-}
1257 {-# INLINE parseJSON #-}
@@ -1621,21 +1260,16 @@ instance FromJSONKey Integer where
1621 fromJSONKey = FromJSONKeyTextParser $ parseIntegralText "Integer"
1260 fromJSONKey = FromJSONKeyTextParser $ parseIntegralText "Integer"
1622
1261
1623instance FromJSON Natural where
1262instance FromJSON Natural where
1624− parseJSON value = do
1263+ parseJSON = withScientific "Natural" $ \s ->
1625− integer <- parseIntegral "Natural" value
1264+ if Scientific.coefficient s < 0
1626− parseNatural integer
1265+ then fail $ "Expected a Natural number but got the negative number: " <> show s
1266+ else pure $ truncate s
1627
1267
1628instance FromJSONKey Natural where
1268instance FromJSONKey Natural where
1629− fromJSONKey = FromJSONKeyTextParser $ \text -> do
1269+ fromJSONKey = FromJSONKeyTextParser $ \t -> parseScientificText t >>= \s ->
1630− integer <- parseIntegralText "Natural" text
1270+ if Scientific.coefficient s < 0
1631− parseNatural integer
1632−
1633−parseNatural :: Integer -> Parser Natural
1634−parseNatural integer =
1635− if integer < 0 then
1636− fail $ "parsing Natural failed, unexpected negative number " <> show integer
1271+ then fail $ "Expected a Natural number but got the negative number: " <> show s
1637− else
1272+ else pure $ truncate s
1638− pure $ fromIntegral integer
1639
1273
1640instance FromJSON Int8 where
1274instance FromJSON Int8 where
1641 parseJSON = parseBoundedIntegral "Int8"
1275 parseJSON = parseBoundedIntegral "Int8"
@@ -1700,9 +1334,6 @@ instance FromJSON Word64 where
1700instance FromJSONKey Word64 where
1334instance FromJSONKey Word64 where
1701 fromJSONKey = FromJSONKeyTextParser $ parseBoundedIntegralText "Word64"
1335 fromJSONKey = FromJSONKeyTextParser $ parseBoundedIntegralText "Word64"
1702
1336
1703−instance FromJSON CTime where
1704− parseJSON = fmap CTime . parseJSON
1705− {-# INLINE parseJSON #-}
1706
1337
1707instance FromJSON Text where
1338instance FromJSON Text where
1708 parseJSON = withText "Text" pure
1339 parseJSON = withText "Text" pure
@@ -1732,17 +1363,17 @@ parseVersionText = go . readP_to_S parseVersion . unpack
1732 where
1363 where
1733 go [(v,[])] = return v
1364 go [(v,[])] = return v
1734 go (_ : xs) = go xs
1365 go (_ : xs) = go xs
1735− go _ = fail "parsing Version failed"
1366+ go _ = fail "could not parse Version"
1736
1367
1737-------------------------------------------------------------------------------
1368-------------------------------------------------------------------------------
1738-- semigroups NonEmpty
1369-- semigroups NonEmpty
1739-------------------------------------------------------------------------------
1370-------------------------------------------------------------------------------
1740
1371
1741instance FromJSON1 NonEmpty where
1372instance FromJSON1 NonEmpty where
1742− liftParseJSON p _ = withArray "NonEmpty" $
1373+ liftParseJSON p _ = withArray "NonEmpty a" $
1743 (>>= ne) . Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1374 (>>= ne) . Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1744 where
1375 where
1745− ne [] = fail "parsing NonEmpty failed, unexpected empty list"
1376+ ne [] = fail "Expected a NonEmpty but got an empty list"
1746 ne (x:xs) = pure (x :| xs)
1377 ne (x:xs) = pure (x :| xs)
1747 {-# INLINE liftParseJSON #-}
1378 {-# INLINE liftParseJSON #-}
1748
1379
@@ -1763,7 +1394,7 @@ instance FromJSON Scientific where
1763-------------------------------------------------------------------------------
1394-------------------------------------------------------------------------------
1764
1395
1765instance FromJSON1 DList.DList where
1396instance FromJSON1 DList.DList where
1766− liftParseJSON p _ = withArray "DList" $
1397+ liftParseJSON p _ = withArray "DList a" $
1767 fmap DList.fromList .
1398 fmap DList.fromList .
1768 Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1399 Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1769 {-# INLINE liftParseJSON #-}
1400 {-# INLINE liftParseJSON #-}
@@ -1840,7 +1471,7 @@ instance (FromJSON1 f, FromJSON1 g) => FromJSON1 (Sum f g) where
1840 inr = "InR"
1471 inr = "InR"
1841
1472
1842 liftParseJSON _ _ _ = fail $
1473 liftParseJSON _ _ _ = fail $
1843− "parsing Sum failed, expected an object with a single property " ++
1474+ "expected an object with a single property " ++
1844 "where the property key should be either " ++
1475 "where the property key should be either " ++
1845 "\"InL\" or \"InR\""
1476 "\"InL\" or \"InR\""
1846 {-# INLINE liftParseJSON #-}
1477 {-# INLINE liftParseJSON #-}
@@ -1854,7 +1485,7 @@ instance (FromJSON1 f, FromJSON1 g, FromJSON a) => FromJSON (Sum f g a) where
1854-------------------------------------------------------------------------------
1485-------------------------------------------------------------------------------
1855
1486
1856instance FromJSON1 Seq.Seq where
1487instance FromJSON1 Seq.Seq where
1857− liftParseJSON p _ = withArray "Seq" $
1488+ liftParseJSON p _ = withArray "Seq a" $
1858 fmap Seq.fromList .
1489 fmap Seq.fromList .
1859 Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1490 Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1860 {-# INLINE liftParseJSON #-}
1491 {-# INLINE liftParseJSON #-}
@@ -1888,15 +1519,15 @@ instance FromJSON a => FromJSON (IntMap.IntMap a) where
1888
1519
1889instance (FromJSONKey k, Ord k) => FromJSON1 (M.Map k) where
1520instance (FromJSONKey k, Ord k) => FromJSON1 (M.Map k) where
1890 liftParseJSON p _ = case fromJSONKey of
1521 liftParseJSON p _ = case fromJSONKey of
1891− FromJSONKeyCoerce _ -> withObject "Map" $
1522+ FromJSONKeyCoerce _-> withObject "Map k v" $
1892 fmap (H.foldrWithKey (M.insert . unsafeCoerce) M.empty) . H.traverseWithKey (\k v -> p v <?> Key k)
1523 fmap (H.foldrWithKey (M.insert . unsafeCoerce) M.empty) . H.traverseWithKey (\k v -> p v <?> Key k)
1893− FromJSONKeyText f -> withObject "Map" $
1524+ FromJSONKeyText f -> withObject "Map k v" $
1894 fmap (H.foldrWithKey (M.insert . f) M.empty) . H.traverseWithKey (\k v -> p v <?> Key k)
1525 fmap (H.foldrWithKey (M.insert . f) M.empty) . H.traverseWithKey (\k v -> p v <?> Key k)
1895− FromJSONKeyTextParser f -> withObject "Map" $
1526+ FromJSONKeyTextParser f -> withObject "Map k v" $
1896 H.foldrWithKey (\k v m -> M.insert <$> f k <?> Key k <*> p v <?> Key k <*> m) (pure M.empty)
1527 H.foldrWithKey (\k v m -> M.insert <$> f k <?> Key k <*> p v <?> Key k <*> m) (pure M.empty)
1897− FromJSONKeyValue f -> withArray "Map" $ \arr ->
1528+ FromJSONKeyValue f -> withArray "Map k v" $ \arr ->
1898− fmap M.fromList . Tr.sequence .
1529+ M.fromList <$> (Tr.sequence .
1899− zipWith (parseIndexedJSONPair f p) [0..] . V.toList $ arr
1530+ zipWith (parseIndexedJSONPair f p) [0..] . V.toList $ arr)
1900 {-# INLINE liftParseJSON #-}
1531 {-# INLINE liftParseJSON #-}
1901
1532
1902instance (FromJSONKey k, Ord k, FromJSON v) => FromJSON (M.Map k v) where
1533instance (FromJSONKey k, Ord k, FromJSON v) => FromJSON (M.Map k v) where
@@ -1922,18 +1553,18 @@ instance (FromJSON v) => FromJSON (Tree.Tree v) where
1922
1553
1923instance FromJSON UUID.UUID where
1554instance FromJSON UUID.UUID where
1924 parseJSON = withText "UUID" $
1555 parseJSON = withText "UUID" $
1925− maybe (fail "invalid UUID") pure . UUID.fromText
1556+ maybe (fail "Invalid UUID") pure . UUID.fromText
1926
1557
1927instance FromJSONKey UUID.UUID where
1558instance FromJSONKey UUID.UUID where
1928 fromJSONKey = FromJSONKeyTextParser $
1559 fromJSONKey = FromJSONKeyTextParser $
1929− maybe (fail "invalid UUID") pure . UUID.fromText
1560+ maybe (fail "Invalid UUID") pure . UUID.fromText
1930
1561
1931-------------------------------------------------------------------------------
1562-------------------------------------------------------------------------------
1932-- vector
1563-- vector
1933-------------------------------------------------------------------------------
1564-------------------------------------------------------------------------------
1934
1565
1935instance FromJSON1 Vector where
1566instance FromJSON1 Vector where
1936− liftParseJSON p _ = withArray "Vector" $
1567+ liftParseJSON p _ = withArray "Vector a" $
1937 V.mapM (uncurry $ parseIndexedJSON p) . V.indexed
1568 V.mapM (uncurry $ parseIndexedJSON p) . V.indexed
1938 {-# INLINE liftParseJSON #-}
1569 {-# INLINE liftParseJSON #-}
1939
1570
@@ -1947,14 +1578,14 @@ vectorParseJSON s = withArray s $ fmap V.convert . V.mapM (uncurry $ parseIndexe
1947{-# INLINE vectorParseJSON #-}
1578{-# INLINE vectorParseJSON #-}
1948
1579
1949instance (Storable a, FromJSON a) => FromJSON (VS.Vector a) where
1580instance (Storable a, FromJSON a) => FromJSON (VS.Vector a) where
1950− parseJSON = vectorParseJSON "Data.Vector.Storable.Vector"
1581+ parseJSON = vectorParseJSON "Data.Vector.Storable.Vector a"
1951
1582
1952instance (VP.Prim a, FromJSON a) => FromJSON (VP.Vector a) where
1583instance (VP.Prim a, FromJSON a) => FromJSON (VP.Vector a) where
1953− parseJSON = vectorParseJSON "Data.Vector.Primitive.Vector"
1584+ parseJSON = vectorParseJSON "Data.Vector.Primitive.Vector a"
1954 {-# INLINE parseJSON #-}
1585 {-# INLINE parseJSON #-}
1955
1586
1956instance (VG.Vector VU.Vector a, FromJSON a) => FromJSON (VU.Vector a) where
1587instance (VG.Vector VU.Vector a, FromJSON a) => FromJSON (VU.Vector a) where
1957− parseJSON = vectorParseJSON "Data.Vector.Unboxed.Vector"
1588+ parseJSON = vectorParseJSON "Data.Vector.Unboxed.Vector a"
1958 {-# INLINE parseJSON #-}
1589 {-# INLINE parseJSON #-}
1959
1590
1960-------------------------------------------------------------------------------
1591-------------------------------------------------------------------------------
@@ -1968,15 +1599,15 @@ instance (Eq a, Hashable a, FromJSON a) => FromJSON (HashSet.HashSet a) where
1968
1599
1969instance (FromJSONKey k, Eq k, Hashable k) => FromJSON1 (H.HashMap k) where
1600instance (FromJSONKey k, Eq k, Hashable k) => FromJSON1 (H.HashMap k) where
1970 liftParseJSON p _ = case fromJSONKey of
1601 liftParseJSON p _ = case fromJSONKey of
1971− FromJSONKeyCoerce _ -> withObject "HashMap ~Text" $
1602+ FromJSONKeyCoerce _ -> withObject "HashMap ~Text v" $
1972 uc . H.traverseWithKey (\k v -> p v <?> Key k)
1603 uc . H.traverseWithKey (\k v -> p v <?> Key k)
1973− FromJSONKeyText f -> withObject "HashMap" $
1604+ FromJSONKeyText f -> withObject "HashMap k v" $
1974 fmap (mapKey f) . H.traverseWithKey (\k v -> p v <?> Key k)
1605 fmap (mapKey f) . H.traverseWithKey (\k v -> p v <?> Key k)
1975− FromJSONKeyTextParser f -> withObject "HashMap" $
1606+ FromJSONKeyTextParser f -> withObject "HashMap k v" $
1976 H.foldrWithKey (\k v m -> H.insert <$> f k <?> Key k <*> p v <?> Key k <*> m) (pure H.empty)
1607 H.foldrWithKey (\k v m -> H.insert <$> f k <?> Key k <*> p v <?> Key k <*> m) (pure H.empty)
1977− FromJSONKeyValue f -> withArray "Map" $ \arr ->
1608+ FromJSONKeyValue f -> withArray "Map k v" $ \arr ->
1978− fmap H.fromList . Tr.sequence .
1609+ H.fromList <$> (Tr.sequence .
1979− zipWith (parseIndexedJSONPair f p) [0..] . V.toList $ arr
1610+ zipWith (parseIndexedJSONPair f p) [0..] . V.toList $ arr)
1980 where
1611 where
1981 uc :: Parser (H.HashMap Text v) -> Parser (H.HashMap k v)
1612 uc :: Parser (H.HashMap Text v) -> Parser (H.HashMap k v)
1982 uc = unsafeCoerce
1613 uc = unsafeCoerce
@@ -1997,33 +1628,11 @@ instance FromJSON DotNetTime where
1997 parseJSON = withText "DotNetTime" $ \t ->
1628 parseJSON = withText "DotNetTime" $ \t ->
1998 let (s,m) = T.splitAt (T.length t - 5) t
1629 let (s,m) = T.splitAt (T.length t - 5) t
1999 t' = T.concat [s,".",m]
1630 t' = T.concat [s,".",m]
2000− in case parseTimeM True defaultTimeLocale "/Date(%s%Q)/" (unpack t') of
1631+ in case parseTime defaultTimeLocale "/Date(%s%Q)/" (unpack t') of
2001 Just d -> pure (DotNetTime d)
1632 Just d -> pure (DotNetTime d)
2002 _ -> fail "could not parse .NET time"
1633 _ -> fail "could not parse .NET time"
2003 {-# INLINE parseJSON #-}
1634 {-# INLINE parseJSON #-}
2004
1635
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−
2027-------------------------------------------------------------------------------
1636-------------------------------------------------------------------------------
2028-- time
1637-- time
2029-------------------------------------------------------------------------------
1638-------------------------------------------------------------------------------
@@ -2049,17 +1658,6 @@ instance FromJSONKey LocalTime where
2049 fromJSONKey = FromJSONKeyTextParser (Time.run Time.localTime)
1658 fromJSONKey = FromJSONKeyTextParser (Time.run Time.localTime)
2050
1659
2051
1660
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.
2063instance FromJSON ZonedTime where
1661instance FromJSON ZonedTime where
2064 parseJSON = withText "ZonedTime" (Time.run Time.zonedTime)
1662 parseJSON = withText "ZonedTime" (Time.run Time.zonedTime)
2065
1663
@@ -2074,57 +1672,14 @@ instance FromJSONKey UTCTime where
2074 fromJSONKey = FromJSONKeyTextParser (Time.run Time.utcTime)
1672 fromJSONKey = FromJSONKeyTextParser (Time.run Time.utcTime)
2075
1673
2076
1674
2077−-- | This instance includes a bounds check to prevent maliciously
1675+-- | /WARNING:/ Only parse lengths of time from trusted input
2078−-- large inputs to fill up the memory of the target system. You can
1676+-- since an attacker could easily fill up the memory of the target
2079−-- newtype 'Scientific' and provide your own instance using
1677+-- system by specifying a scientific number with a big exponent like
2080−-- 'withScientific' if you want to allow larger inputs.
1678+-- @1e1000000000@.
2081instance FromJSON NominalDiffTime where
1679instance FromJSON NominalDiffTime where
2082− parseJSON = withBoundedScientific "NominalDiffTime" $ pure . realToFrac
1680+ parseJSON = withScientific "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
2092 {-# INLINE parseJSON #-}
1681 {-# INLINE parseJSON #-}
2093
1682
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−
2128-------------------------------------------------------------------------------
1683-------------------------------------------------------------------------------
2129-- base Monoid/Semigroup
1684-- base Monoid/Semigroup
2130-------------------------------------------------------------------------------
1685-------------------------------------------------------------------------------
@@ -2245,15 +1800,14 @@ instance FromJSON a => FromJSON (Semigroup.Option a) where
2245
1800
2246instance FromJSON1 Proxy where
1801instance FromJSON1 Proxy where
2247 {-# INLINE liftParseJSON #-}
1802 {-# INLINE liftParseJSON #-}
2248− liftParseJSON _ _ = fromNull "Proxy" Proxy
1803+ liftParseJSON _ _ Null = pure Proxy
1804+ liftParseJSON _ _ v = typeMismatch "Proxy" v
2249
1805
2250instance FromJSON (Proxy a) where
1806instance FromJSON (Proxy a) where
2251 {-# INLINE parseJSON #-}
1807 {-# INLINE parseJSON #-}
2252− parseJSON = fromNull "Proxy" Proxy
1808+ parseJSON Null = pure Proxy
1809+ parseJSON v = typeMismatch "Proxy" v
2253
1810
2254−fromNull :: String -> a -> Value -> Parser a
2255−fromNull _ a Null = pure a
2256−fromNull c _ v = prependContext c (typeMismatch "Null" v)
2257
1811
2258instance FromJSON2 Tagged where
1812instance FromJSON2 Tagged where
2259 liftParseJSON2 _ _ p _ = fmap Tagged . p
1813 liftParseJSON2 _ _ p _ = fmap Tagged . p
@@ -2280,7 +1834,10 @@ instance (FromJSON a, FromJSON b, FromJSON c) => FromJSONKey (a,b,c)
2280instance (FromJSON a, FromJSON b, FromJSON c, FromJSON d) => FromJSONKey (a,b,c,d)
1834instance (FromJSON a, FromJSON b, FromJSON c, FromJSON d) => FromJSONKey (a,b,c,d)
2281
1835
2282instance FromJSONKey Char where
1836instance FromJSONKey Char where
2283− fromJSONKey = FromJSONKeyTextParser parseChar
1837+ fromJSONKey = FromJSONKeyTextParser $ \t ->
1838+ if T.length t == 1
1839+ then return (T.index t 0)
1840+ else typeMismatch "Expected Char but String didn't contain exactly one character" (String t)
2284 fromJSONKeyList = FromJSONKeyText T.unpack
1841 fromJSONKeyList = FromJSONKeyText T.unpack
2285
1842
2286instance (FromJSONKey a, FromJSON a) => FromJSONKey [a] where
1843instance (FromJSONKey a, FromJSON a) => FromJSONKey [a] where
Data/Aeson/Types/Generic.hs+8−12
@@ -1,11 +1,10 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2{-# LANGUAGE DataKinds #-}
2{-# LANGUAGE DataKinds #-}
3−{-# LANGUAGE DeriveFunctor #-}
4{-# LANGUAGE EmptyDataDecls #-}
3{-# LANGUAGE EmptyDataDecls #-}
5{-# LANGUAGE FlexibleInstances #-}
4{-# LANGUAGE FlexibleInstances #-}
6{-# LANGUAGE FunctionalDependencies #-}
5{-# LANGUAGE FunctionalDependencies #-}
7{-# LANGUAGE KindSignatures #-}
6{-# LANGUAGE KindSignatures #-}
8−{-# LANGUAGE NoImplicitPrelude #-}
7+{-# LANGUAGE MultiParamTypeClasses #-}
9{-# LANGUAGE ScopedTypeVariables #-}
8{-# LANGUAGE ScopedTypeVariables #-}
10{-# LANGUAGE TypeOperators #-}
9{-# LANGUAGE TypeOperators #-}
11{-# LANGUAGE UndecidableInstances #-}
10{-# LANGUAGE UndecidableInstances #-}
@@ -26,7 +25,7 @@
26
25
27module Data.Aeson.Types.Generic
26module Data.Aeson.Types.Generic
28 (
27 (
29− IsRecord
28+ IsRecord(..)
30 , AllNullary
29 , AllNullary
31 , Tagged2(..)
30 , Tagged2(..)
32 , True
31 , True
@@ -35,9 +34,9 @@ module Data.Aeson.Types.Generic
35 , Zero
34 , Zero
36 , One
35 , One
37 , ProductSize(..)
36 , ProductSize(..)
38− , (:*)(..)
39 ) where
37 ) where
40
38
39+import Prelude ()
41import Prelude.Compat
40import Prelude.Compat
42
41
43import GHC.Generics
42import GHC.Generics
@@ -45,8 +44,12 @@ import GHC.Generics
45--------------------------------------------------------------------------------
44--------------------------------------------------------------------------------
46
45
47class IsRecord (f :: * -> *) isRecord | f -> isRecord
46class IsRecord (f :: * -> *) isRecord | f -> isRecord
47+ where
48+ isUnary :: f a -> Bool
49+ isUnary = const True
48
50
49instance (IsRecord f isRecord) => IsRecord (f :*: g) isRecord
51instance (IsRecord f isRecord) => IsRecord (f :*: g) isRecord
52+ where isUnary = const False
50#if MIN_VERSION_base(4,9,0)
53#if MIN_VERSION_base(4,9,0)
51instance OVERLAPPING_ IsRecord (M1 S ('MetaSel 'Nothing u ss ds) f) False
54instance OVERLAPPING_ IsRecord (M1 S ('MetaSel 'Nothing u ss ds) f) False
52#else
55#else
@@ -58,6 +61,7 @@ instance IsRecord Par1 True
58instance IsRecord (Rec1 f) True
61instance IsRecord (Rec1 f) True
59instance IsRecord (f :.: g) True
62instance IsRecord (f :.: g) True
60instance IsRecord U1 False
63instance IsRecord U1 False
64+ where isUnary = const False
61
65
62--------------------------------------------------------------------------------
66--------------------------------------------------------------------------------
63
67
@@ -76,7 +80,6 @@ instance AllNullary (Rec1 f) False
76instance AllNullary U1 True
80instance AllNullary U1 True
77
81
78newtype Tagged2 (s :: * -> *) b = Tagged2 {unTagged2 :: b}
82newtype Tagged2 (s :: * -> *) b = Tagged2 {unTagged2 :: b}
79− deriving Functor
80
83
81--------------------------------------------------------------------------------
84--------------------------------------------------------------------------------
82
85
@@ -109,10 +112,3 @@ instance (ProductSize a, ProductSize b) => ProductSize (a :*: b) where
109
112
110instance ProductSize (S1 s a) where
113instance ProductSize (S1 s a) where
111 productSize = Tagged2 1
114 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+13−161
@@ -1,8 +1,6 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2{-# LANGUAGE DeriveDataTypeable #-}
2{-# LANGUAGE DeriveDataTypeable #-}
3−{-# LANGUAGE DeriveGeneric #-}
4{-# LANGUAGE GeneralizedNewtypeDeriving #-}
3{-# LANGUAGE GeneralizedNewtypeDeriving #-}
5−{-# LANGUAGE NoImplicitPrelude #-}
6{-# LANGUAGE Rank2Types #-}
4{-# LANGUAGE Rank2Types #-}
7#if __GLASGOW_HASKELL__ >= 800
5#if __GLASGOW_HASKELL__ >= 800
8-- a) THQ works on cross-compilers and unregisterised GHCs
6-- a) THQ works on cross-compilers and unregisterised GHCs
@@ -45,33 +43,16 @@ module Data.Aeson.Types.Internal
45 , parseEither
43 , parseEither
46 , parseMaybe
44 , parseMaybe
47 , modifyFailure
45 , modifyFailure
48− , prependFailure
49− , parserThrowError
50− , parserCatchError
51 , formatError
46 , formatError
52− , formatPath
53− , formatRelativePath
54 , (<?>)
47 , (<?>)
55 -- * Constructors and accessors
48 -- * Constructors and accessors
56 , object
49 , object
57
50
58 -- * Generic and TH encoding configuration
51 -- * Generic and TH encoding configuration
59− , Options(
52+ , Options(..)
60− fieldLabelModifier
61− , constructorTagModifier
62− , allNullaryToStringTag
63− , omitNothingFields
64− , sumEncoding
65− , unwrapUnaryRecords
66− , tagSingleConstructors
67− , rejectUnknownFields
68− )
69−
70 , SumEncoding(..)
53 , SumEncoding(..)
71− , JSONKeyOptions(keyModifier)
72 , defaultOptions
54 , defaultOptions
73 , defaultTaggedObject
55 , defaultTaggedObject
74− , defaultJSONKeyOptions
75
56
76 -- * Used for changing CamelCase names into something else.
57 -- * Used for changing CamelCase names into something else.
77 , camelTo
58 , camelTo
@@ -81,6 +62,7 @@ module Data.Aeson.Types.Internal
81 , DotNetTime(..)
62 , DotNetTime(..)
82 ) where
63 ) where
83
64
65+import Prelude ()
84import Prelude.Compat
66import Prelude.Compat
85
67
86import Control.Applicative (Alternative(..))
68import Control.Applicative (Alternative(..))
@@ -101,8 +83,6 @@ import Data.Time (UTCTime)
101import Data.Time.Format (FormatTime)
83import Data.Time.Format (FormatTime)
102import Data.Typeable (Typeable)
84import Data.Typeable (Typeable)
103import Data.Vector (Vector)
85import Data.Vector (Vector)
104−import GHC.Generics (Generic)
105−import qualified Control.Monad as Monad
106import qualified Control.Monad.Fail as Fail
86import qualified Control.Monad.Fail as Fail
107import qualified Data.HashMap.Strict as H
87import qualified Data.HashMap.Strict as H
108import qualified Data.Scientific as S
88import qualified Data.Scientific as S
@@ -121,7 +101,7 @@ data JSONPathElement = Key Text
121 | Index {-# UNPACK #-} !Int
101 | Index {-# UNPACK #-} !Int
122 -- ^ JSON path element of an index into an
102 -- ^ JSON path element of an index into an
123 -- array, \"array[index]\".
103 -- array, \"array[index]\".
124− deriving (Eq, Show, Typeable, Ord)
104+ deriving (Eq, Show, Typeable)
125type JSONPath = [JSONPathElement]
105type JSONPath = [JSONPathElement]
126
106
127-- | The internal result of running a 'Parser'.
107-- | The internal result of running a 'Parser'.
@@ -156,7 +136,7 @@ instance Functor Result where
156 fmap _ (Error err) = Error err
136 fmap _ (Error err) = Error err
157 {-# INLINE fmap #-}
137 {-# INLINE fmap #-}
158
138
159−instance Monad.Monad IResult where
139+instance Monad IResult where
160 return = pure
140 return = pure
161 {-# INLINE return #-}
141 {-# INLINE return #-}
162
142
@@ -164,16 +144,14 @@ instance Monad.Monad IResult where
164 IError path err >>= _ = IError path err
144 IError path err >>= _ = IError path err
165 {-# INLINE (>>=) #-}
145 {-# INLINE (>>=) #-}
166
146
167−#if !(MIN_VERSION_base(4,13,0))
168 fail = Fail.fail
147 fail = Fail.fail
169 {-# INLINE fail #-}
148 {-# INLINE fail #-}
170−#endif
171
149
172instance Fail.MonadFail IResult where
150instance Fail.MonadFail IResult where
173 fail err = IError [] err
151 fail err = IError [] err
174 {-# INLINE fail #-}
152 {-# INLINE fail #-}
175
153
176−instance Monad.Monad Result where
154+instance Monad Result where
177 return = pure
155 return = pure
178 {-# INLINE return #-}
156 {-# INLINE return #-}
179
157
@@ -181,10 +159,8 @@ instance Monad.Monad Result where
181 Error err >>= _ = Error err
159 Error err >>= _ = Error err
182 {-# INLINE (>>=) #-}
160 {-# INLINE (>>=) #-}
183
161
184−#if !(MIN_VERSION_base(4,13,0))
185 fail = Fail.fail
162 fail = Fail.fail
186 {-# INLINE fail #-}
163 {-# INLINE fail #-}
187−#endif
188
164
189instance Fail.MonadFail Result where
165instance Fail.MonadFail Result where
190 fail err = Error err
166 fail err = Error err
@@ -281,9 +257,7 @@ type Failure f r = JSONPath -> String -> f r
281-- | Success continuation.
257-- | Success continuation.
282type Success a f r = a -> f r
258type Success a f r = a -> f r
283
259
284−-- | A JSON parser. N.B. This might not fit your usual understanding of
260+-- | A JSON parser.
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.
287newtype Parser a = Parser {
261newtype Parser a = Parser {
288 runParser :: forall f r.
262 runParser :: forall f r.
289 JSONPath
263 JSONPath
@@ -292,17 +266,14 @@ newtype Parser a = Parser {
292 -> f r
266 -> f r
293 }
267 }
294
268
295−instance Monad.Monad Parser where
269+instance Monad Parser where
296 m >>= g = Parser $ \path kf ks -> let ks' a = runParser (g a) path kf ks
270 m >>= g = Parser $ \path kf ks -> let ks' a = runParser (g a) path kf ks
297 in runParser m path kf ks'
271 in runParser m path kf ks'
298 {-# INLINE (>>=) #-}
272 {-# INLINE (>>=) #-}
299 return = pure
273 return = pure
300 {-# INLINE return #-}
274 {-# INLINE return #-}
301−
302−#if !(MIN_VERSION_base(4,13,0))
303 fail = Fail.fail
275 fail = Fail.fail
304 {-# INLINE fail #-}
276 {-# INLINE fail #-}
305−#endif
306
277
307instance Fail.MonadFail Parser where
278instance Fail.MonadFail Parser where
308 fail msg = Parser $ \path kf _ks -> kf (reverse path) msg
279 fail msg = Parser $ \path kf _ks -> kf (reverse path) msg
@@ -345,7 +316,8 @@ instance Monoid (Parser a) where
345apP :: Parser (a -> b) -> Parser a -> Parser b
316apP :: Parser (a -> b) -> Parser a -> Parser b
346apP d e = do
317apP d e = do
347 b <- d
318 b <- d
348− b <$> e
319+ a <- e
320+ return (b a)
349{-# INLINE apP #-}
321{-# INLINE apP #-}
350
322
351-- | A JSON \"object\" (key\/value map).
323-- | A JSON \"object\" (key\/value map).
@@ -361,7 +333,7 @@ data Value = Object !Object
361 | Number !Scientific
333 | Number !Scientific
362 | Bool !Bool
334 | Bool !Bool
363 | Null
335 | Null
364− deriving (Eq, Read, Show, Typeable, Data, Generic)
336+ deriving (Eq, Read, Show, Typeable, Data)
365
337
366-- | A newtype wrapper for 'UTCTime' that uses the same non-standard
338-- | A newtype wrapper for 'UTCTime' that uses the same non-standard
367-- serialization format as Microsoft .NET, whose
339-- serialization format as Microsoft .NET, whose
@@ -461,17 +433,7 @@ parseEither m v = runParser (m v) [] onError Right
461-- | Annotate an error message with a
433-- | Annotate an error message with a
462-- <http://goessner.net/articles/JsonPath/ JSONPath> error location.
434-- <http://goessner.net/articles/JsonPath/ JSONPath> error location.
463formatError :: JSONPath -> String -> String
435formatError :: JSONPath -> String -> String
464−formatError path msg = "Error in " ++ formatPath path ++ ": " ++ msg
436+formatError path msg = "Error in " ++ format "$" 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
475 where
437 where
476 format :: String -> JSONPath -> String
438 format :: String -> JSONPath -> String
477 format pfx [] = pfx
439 format pfx [] = pfx
@@ -534,40 +496,13 @@ p <?> pathElem = Parser $ \path kf ks -> runParser p (pathElem:path) kf ks
534--
496--
535-- Since 0.6.2.0
497-- Since 0.6.2.0
536modifyFailure :: (String -> String) -> Parser a -> Parser a
498modifyFailure :: (String -> String) -> Parser a -> Parser a
537−modifyFailure f (Parser p) = Parser $ \path kf ks ->
499+modifyFailure f (Parser p) = Parser $ \path kf ks -> p path (\p' m -> kf p' (f m)) 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
562
500
563--------------------------------------------------------------------------------
501--------------------------------------------------------------------------------
564-- Generic and TH encoding configuration
502-- Generic and TH encoding configuration
565--------------------------------------------------------------------------------
503--------------------------------------------------------------------------------
566
504
567-- | Options that specify how to encode\/decode your datatype to\/from JSON.
505-- | 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.
571data Options = Options
506data Options = Options
572 { fieldLabelModifier :: String -> String
507 { fieldLabelModifier :: String -> String
573 -- ^ Function applied to field labels.
508 -- ^ Function applied to field labels.
@@ -584,55 +519,15 @@ data Options = Options
584 -- ^ If 'True' record fields with a 'Nothing' value will be
519 -- ^ If 'True' record fields with a 'Nothing' value will be
585 -- omitted from the resulting object. If 'False' the resulting
520 -- omitted from the resulting object. If 'False' the resulting
586 -- object will include those fields mapping to @null@.
521 -- 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− -- @
620 , sumEncoding :: SumEncoding
522 , sumEncoding :: SumEncoding
621 -- ^ Specifies how to encode constructors of a sum datatype.
523 -- ^ Specifies how to encode constructors of a sum datatype.
622 , unwrapUnaryRecords :: Bool
524 , unwrapUnaryRecords :: Bool
623 -- ^ Hide the field name when a record constructor has only one
525 -- ^ Hide the field name when a record constructor has only one
624 -- field, like a newtype.
526 -- field, like a newtype.
625− , tagSingleConstructors :: Bool
626− -- ^ Encode types with a single constructor as sums,
627− -- so that `allNullaryToStringTag` and `sumEncoding` apply.
628− , rejectUnknownFields :: Bool
629− -- ^ Applies only to 'Data.Aeson.FromJSON' instances. If a field appears in
630− -- the parsed object map, but does not appear in the target object, parsing
631− -- will fail, with an error message indicating which fields were unknown.
632 }
527 }
633
528
634instance Show Options where
529instance Show Options where
635− show (Options f c a o s u t r) =
530+ show (Options f c a o s u) =
636 "Options {"
531 "Options {"
637 ++ intercalate ", "
532 ++ intercalate ", "
638 [ "fieldLabelModifier =~ " ++ show (f "exampleField")
533 [ "fieldLabelModifier =~ " ++ show (f "exampleField")
@@ -641,8 +536,6 @@ instance Show Options where
641 , "omitNothingFields = " ++ show o
536 , "omitNothingFields = " ++ show o
642 , "sumEncoding = " ++ show s
537 , "sumEncoding = " ++ show s
643 , "unwrapUnaryRecords = " ++ show u
538 , "unwrapUnaryRecords = " ++ show u
644− , "tagSingleConstructors = " ++ show t
645− , "rejectUnknownFields = " ++ show r
646 ]
539 ]
647 ++ "}"
540 ++ "}"
648
541
@@ -686,33 +579,6 @@ data SumEncoding =
686 -- contents of the constructor.
579 -- contents of the constructor.
687 deriving (Eq, Show)
580 deriving (Eq, Show)
688
581
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−
716-- | Default encoding 'Options':
582-- | Default encoding 'Options':
717--
583--
718-- @
584-- @
@@ -723,8 +589,6 @@ data JSONKeyOptions = JSONKeyOptions
723-- , 'omitNothingFields' = False
589-- , 'omitNothingFields' = False
724-- , 'sumEncoding' = 'defaultTaggedObject'
590-- , 'sumEncoding' = 'defaultTaggedObject'
725-- , 'unwrapUnaryRecords' = False
591-- , 'unwrapUnaryRecords' = False
726−-- , 'tagSingleConstructors' = False
727−-- , 'rejectUnknownFields' = False
728-- }
592-- }
729-- @
593-- @
730defaultOptions :: Options
594defaultOptions :: Options
@@ -735,8 +599,6 @@ defaultOptions = Options
735 , omitNothingFields = False
599 , omitNothingFields = False
736 , sumEncoding = defaultTaggedObject
600 , sumEncoding = defaultTaggedObject
737 , unwrapUnaryRecords = False
601 , unwrapUnaryRecords = False
738− , tagSingleConstructors = False
739− , rejectUnknownFields = False
740 }
602 }
741
603
742-- | Default 'TaggedObject' 'SumEncoding' options:
604-- | Default 'TaggedObject' 'SumEncoding' options:
@@ -753,16 +615,6 @@ defaultTaggedObject = TaggedObject
753 , contentsFieldName = "contents"
615 , contentsFieldName = "contents"
754 }
616 }
755
617
756−-- | Default 'JSONKeyOptions':
757−--
758−-- @
759−-- defaultJSONKeyOptions = 'JSONKeyOptions'
760−-- { 'keyModifier' = 'id'
761−-- }
762−-- @
763−defaultJSONKeyOptions :: JSONKeyOptions
764−defaultJSONKeyOptions = JSONKeyOptions id
765−
766-- | Converts from CamelCase to another lower case, interspersing
618-- | Converts from CamelCase to another lower case, interspersing
767-- the character between all capital letters and their previous
619-- the character between all capital letters and their previous
768-- entries, except those capital letters that appear together,
620-- entries, except those capital letters that appear together,
Data/Aeson/Types/ToJSON.hs+497−533
@@ -1,21 +1,24 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2+{-# LANGUAGE DataKinds #-}
2{-# LANGUAGE DefaultSignatures #-}
3{-# LANGUAGE DefaultSignatures #-}
3−{-# LANGUAGE EmptyDataDecls #-}
4{-# LANGUAGE FlexibleContexts #-}
4{-# LANGUAGE FlexibleContexts #-}
5{-# LANGUAGE FlexibleInstances #-}
5{-# LANGUAGE FlexibleInstances #-}
6−{-# LANGUAGE FunctionalDependencies #-}
7{-# LANGUAGE GADTs #-}
6{-# LANGUAGE GADTs #-}
8−{-# LANGUAGE NoImplicitPrelude #-}
7+{-# LANGUAGE MultiParamTypeClasses #-}
8+{-# LANGUAGE NamedFieldPuns #-}
9{-# LANGUAGE OverloadedStrings #-}
9{-# LANGUAGE OverloadedStrings #-}
10{-# LANGUAGE PatternGuards #-}
10{-# LANGUAGE PatternGuards #-}
11−{-# LANGUAGE PolyKinds #-}
12{-# LANGUAGE RecordWildCards #-}
11{-# LANGUAGE RecordWildCards #-}
13{-# LANGUAGE ScopedTypeVariables #-}
12{-# LANGUAGE ScopedTypeVariables #-}
14{-# LANGUAGE TypeOperators #-}
13{-# LANGUAGE TypeOperators #-}
14+{-# LANGUAGE TypeSynonymInstances #-}
15{-# LANGUAGE UndecidableInstances #-}
15{-# LANGUAGE UndecidableInstances #-}
16
16
17+#if __GLASGOW_HASKELL__ >= 706
18+{-# LANGUAGE PolyKinds #-}
19+#endif
20+
17#include "overlapping-compat.h"
21#include "overlapping-compat.h"
18−#include "incoherent-compat.h"
19
22
20-- TODO: Drop this when we remove support for Data.Attoparsec.Number
23-- TODO: Drop this when we remove support for Data.Attoparsec.Number
21{-# OPTIONS_GHC -fno-warn-deprecations #-}
24{-# OPTIONS_GHC -fno-warn-deprecations #-}
@@ -33,6 +36,7 @@ module Data.Aeson.Types.ToJSON
33 , toEncoding2
36 , toEncoding2
34 -- * Generic JSON classes
37 -- * Generic JSON classes
35 , GToJSON(..)
38 , GToJSON(..)
39+ , GToEncoding(..)
36 , ToArgs(..)
40 , ToArgs(..)
37 , genericToJSON
41 , genericToJSON
38 , genericToEncoding
42 , genericToEncoding
@@ -43,63 +47,54 @@ module Data.Aeson.Types.ToJSON
43 , ToJSONKeyFunction(..)
47 , ToJSONKeyFunction(..)
44 , toJSONKeyText
48 , toJSONKeyText
45 , contramapToJSONKeyFunction
49 , 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(..)
54 -- * Functions needed for documentation
52 -- * Functions needed for documentation
55 -- * Encoding functions
53 -- * Encoding functions
56 , listEncoding
54 , listEncoding
57 , listValue
55 , listValue
58 ) where
56 ) where
59
57
58+import Prelude ()
60import Prelude.Compat
59import Prelude.Compat
61
60
62import Control.Applicative (Const(..))
61import Control.Applicative (Const(..))
63import Control.Monad.ST (ST)
62import Control.Monad.ST (ST)
64import Data.Aeson.Encoding (Encoding, Encoding', Series, dict, emptyArray_)
63import Data.Aeson.Encoding (Encoding, Encoding', Series, dict, emptyArray_)
65−import Data.Aeson.Encoding.Internal ((>*<))
64+import Data.Aeson.Encoding.Internal ((>*<), (><))
66import Data.Aeson.Internal.Functions (mapHashKeyVal, mapKeyVal)
65import Data.Aeson.Internal.Functions (mapHashKeyVal, mapKeyVal)
67−import Data.Aeson.Types.Generic (AllNullary, False, IsRecord, One, ProductSize, Tagged2(..), True, Zero, productSize)
66+import Data.Aeson.Types.Generic (AllNullary, False, IsRecord(..), One, ProductSize, Tagged2(..), True, Zero, productSize)
68import Data.Aeson.Types.Internal
67import Data.Aeson.Types.Internal
69import Data.Attoparsec.Number (Number(..))
68import Data.Attoparsec.Number (Number(..))
70import Data.Bits (unsafeShiftR)
69import Data.Bits (unsafeShiftR)
71import Data.DList (DList)
70import Data.DList (DList)
72−import Data.Fixed (Fixed, HasResolution, Nano)
71+import Data.Fixed (Fixed, HasResolution)
73import Data.Foldable (toList)
72import Data.Foldable (toList)
74import Data.Functor.Compose (Compose(..))
73import Data.Functor.Compose (Compose(..))
75−import Data.Functor.Contravariant (Contravariant (..))
76import Data.Functor.Identity (Identity(..))
74import Data.Functor.Identity (Identity(..))
77import Data.Functor.Product (Product(..))
75import Data.Functor.Product (Product(..))
78import Data.Functor.Sum (Sum(..))
76import Data.Functor.Sum (Sum(..))
79import Data.Int (Int16, Int32, Int64, Int8)
77import Data.Int (Int16, Int32, Int64, Int8)
80import Data.List (intersperse)
78import Data.List (intersperse)
81import Data.List.NonEmpty (NonEmpty(..))
79import Data.List.NonEmpty (NonEmpty(..))
82−import Data.Semigroup ((<>))
80+import Data.Monoid ((<>))
83import Data.Proxy (Proxy(..))
81import Data.Proxy (Proxy(..))
84import Data.Ratio (Ratio, denominator, numerator)
82import Data.Ratio (Ratio, denominator, numerator)
85import Data.Scientific (Scientific)
83import Data.Scientific (Scientific)
86import Data.Tagged (Tagged(..))
84import Data.Tagged (Tagged(..))
87import Data.Text (Text, pack)
85import Data.Text (Text, pack)
88−import Data.Time (Day, DiffTime, LocalTime, NominalDiffTime, TimeOfDay, UTCTime, ZonedTime)
86+import Data.Time (Day, LocalTime, NominalDiffTime, TimeOfDay, UTCTime, ZonedTime)
89−import Data.Time.Calendar.Compat (CalendarDiffDays (..), DayOfWeek (..))
90−import Data.Time.LocalTime.Compat (CalendarDiffTime (..))
91−import Data.Time.Clock.System.Compat (SystemTime (..))
92−import Data.Time.Format.Compat (FormatTime, formatTime, defaultTimeLocale)
87+import Data.Time.Format (FormatTime, formatTime)
88+import Data.Time.Locale.Compat (defaultTimeLocale)
93import Data.Vector (Vector)
89import Data.Vector (Vector)
94import Data.Version (Version, showVersion)
90import Data.Version (Version, showVersion)
95−import Data.Void (Void, absurd)
96import Data.Word (Word16, Word32, Word64, Word8)
91import Data.Word (Word16, Word32, Word64, Word8)
97import Foreign.Storable (Storable)
92import Foreign.Storable (Storable)
98−import Foreign.C.Types (CTime (..))
99import GHC.Generics
93import GHC.Generics
100import Numeric.Natural (Natural)
94import Numeric.Natural (Natural)
101import qualified Data.Aeson.Encoding as E
95import qualified Data.Aeson.Encoding as E
102−import qualified Data.Aeson.Encoding.Internal as E (InArray, comma, econcat, retagEncoding)
96+import qualified Data.Aeson.Encoding.Internal as E (InArray, colon, comma, econcat, empty, retagEncoding, wrapObject)
97+import qualified Data.ByteString as S
103import qualified Data.ByteString.Lazy as L
98import qualified Data.ByteString.Lazy as L
104import qualified Data.DList as DList
99import qualified Data.DList as DList
105import qualified Data.HashMap.Strict as H
100import qualified Data.HashMap.Strict as H
@@ -128,18 +123,16 @@ import qualified Data.Vector.Unboxed as VU
128import qualified Data.Aeson.Encoding.Builder as EB
123import qualified Data.Aeson.Encoding.Builder as EB
129import qualified Data.ByteString.Builder as B
124import qualified Data.ByteString.Builder as B
130
125
131−import qualified GHC.Exts as Exts
126+#if !(MIN_VERSION_bytestring(0,10,0))
132−import qualified Data.Primitive.Array as PM
127+import Foreign.ForeignPtr (withForeignPtr)
133−import qualified Data.Primitive.SmallArray as PM
128+import Foreign.Marshal.Utils (copyBytes)
134−import qualified Data.Primitive.Types as PM
129+import Foreign.Ptr (plusPtr)
135−
130+import qualified Data.ByteString.Internal as S
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
131+import qualified Data.ByteString.Lazy.Internal as L
141#endif
132#endif
142
133
134+{-# ANN module ("HLint: ignore Reduce duplication"::String) #-}
135+
143toJSONPair :: (a -> Value) -> (b -> Value) -> (a, b) -> Value
136toJSONPair :: (a -> Value) -> (b -> Value) -> (a, b) -> Value
144toJSONPair a b = liftToJSON2 a (listValue a) b (listValue b)
137toJSONPair a b = liftToJSON2 a (listValue a) b (listValue b)
145{-# INLINE toJSONPair #-}
138{-# INLINE toJSONPair #-}
@@ -156,16 +149,19 @@ realFloatToJSON d
156
149
157-- | Class of generic representation types that can be converted to
150-- | Class of generic representation types that can be converted to
158-- JSON.
151-- JSON.
159−class GToJSON enc arity f where
152+class GToJSON arity f where
160 -- | This method (applied to 'defaultOptions') is used as the
153 -- | This method (applied to 'defaultOptions') is used as the
161− -- default generic implementation of 'toJSON'
154+ -- default generic implementation of 'toJSON' (if the @arity@ is 'Zero')
162− -- (with @enc ~ 'Value'@ and @arity ~ 'Zero'@)
163− -- and 'liftToJSON' (if the @arity@ is 'One').
155+ -- or 'liftToJSON' (if the @arity@ is 'One').
164− --
156+ gToJSON :: Options -> ToArgs Value arity a -> f a -> Value
157+
158+-- | Class of generic representation types that can be converted to
159+-- a JSON 'Encoding'.
160+class GToEncoding arity f where
161+ -- | This method (applied to 'defaultOptions') can be used as the
165− -- It also provides a generic implementation of 'toEncoding'
162+ -- default generic implementation of 'toEncoding' (if the @arity@ is 'Zero')
166− -- (with @enc ~ 'Encoding'@ and @arity ~ 'Zero'@)
167− -- and 'liftToEncoding' (if the @arity@ is 'One').
163+ -- or 'liftToEncoding' (if the @arity@ is 'One').
168− gToJSON :: Options -> ToArgs enc arity a -> f a -> enc
164+ gToEncoding :: Options -> ToArgs Encoding arity a -> f a -> Encoding
169
165
170-- | A 'ToArgs' value either stores nothing (for 'ToJSON') or it stores the two
166-- | A 'ToArgs' value either stores nothing (for 'ToJSON') or it stores the two
171-- function arguments that encode occurrences of the type parameter (for
167-- function arguments that encode occurrences of the type parameter (for
@@ -177,14 +173,14 @@ data ToArgs res arity a where
177-- | A configurable generic JSON creator. This function applied to
173-- | A configurable generic JSON creator. This function applied to
178-- 'defaultOptions' is used as the default for 'toJSON' when the type
174-- 'defaultOptions' is used as the default for 'toJSON' when the type
179-- is an instance of 'Generic'.
175-- is an instance of 'Generic'.
180−genericToJSON :: (Generic a, GToJSON Value Zero (Rep a))
176+genericToJSON :: (Generic a, GToJSON Zero (Rep a))
181 => Options -> a -> Value
177 => Options -> a -> Value
182genericToJSON opts = gToJSON opts NoToArgs . from
178genericToJSON opts = gToJSON opts NoToArgs . from
183
179
184-- | A configurable generic JSON creator. This function applied to
180-- | A configurable generic JSON creator. This function applied to
185-- 'defaultOptions' is used as the default for 'liftToJSON' when the type
181-- 'defaultOptions' is used as the default for 'liftToJSON' when the type
186-- is an instance of 'Generic1'.
182-- is an instance of 'Generic1'.
187−genericLiftToJSON :: (Generic1 f, GToJSON Value One (Rep1 f))
183+genericLiftToJSON :: (Generic1 f, GToJSON One (Rep1 f))
188 => Options -> (a -> Value) -> ([a] -> Value)
184 => Options -> (a -> Value) -> ([a] -> Value)
189 -> f a -> Value
185 -> f a -> Value
190genericLiftToJSON opts tj tjl = gToJSON opts (To1Args tj tjl) . from1
186genericLiftToJSON opts tj tjl = gToJSON opts (To1Args tj tjl) . from1
@@ -192,17 +188,17 @@ genericLiftToJSON opts tj tjl = gToJSON opts (To1Args tj tjl) . from1
192-- | A configurable generic JSON encoder. This function applied to
188-- | A configurable generic JSON encoder. This function applied to
193-- 'defaultOptions' is used as the default for 'toEncoding' when the type
189-- 'defaultOptions' is used as the default for 'toEncoding' when the type
194-- is an instance of 'Generic'.
190-- is an instance of 'Generic'.
195−genericToEncoding :: (Generic a, GToJSON Encoding Zero (Rep a))
191+genericToEncoding :: (Generic a, GToEncoding Zero (Rep a))
196 => Options -> a -> Encoding
192 => Options -> a -> Encoding
197−genericToEncoding opts = gToJSON opts NoToArgs . from
193+genericToEncoding opts = gToEncoding opts NoToArgs . from
198
194
199-- | A configurable generic JSON encoder. This function applied to
195-- | A configurable generic JSON encoder. This function applied to
200-- 'defaultOptions' is used as the default for 'liftToEncoding' when the type
196-- 'defaultOptions' is used as the default for 'liftToEncoding' when the type
201-- is an instance of 'Generic1'.
197-- is an instance of 'Generic1'.
202−genericLiftToEncoding :: (Generic1 f, GToJSON Encoding One (Rep1 f))
198+genericLiftToEncoding :: (Generic1 f, GToEncoding One (Rep1 f))
203 => Options -> (a -> Encoding) -> ([a] -> Encoding)
199 => Options -> (a -> Encoding) -> ([a] -> Encoding)
204 -> f a -> Encoding
200 -> f a -> Encoding
205−genericLiftToEncoding opts te tel = gToJSON opts (To1Args te tel) . from1
201+genericLiftToEncoding opts te tel = gToEncoding opts (To1Args te tel) . from1
206
202
207-------------------------------------------------------------------------------
203-------------------------------------------------------------------------------
208-- Class
204-- Class
@@ -267,7 +263,7 @@ genericLiftToEncoding opts te tel = gToJSON opts (To1Args te tel) . from1
267-- @
263-- @
268--
264--
269-- Previous versions of this library only had the 'toJSON' method. Adding
265-- Previous versions of this library only had the 'toJSON' method. Adding
270−-- 'toEncoding' had two reasons:
266+-- 'toEncoding' had to reasons:
271--
267--
272-- 1. toEncoding is more efficient for the common case that the output of
268-- 1. toEncoding is more efficient for the common case that the output of
273-- 'toJSON' is directly serialized to a @ByteString@.
269-- 'toJSON' is directly serialized to a @ByteString@.
@@ -288,7 +284,7 @@ class ToJSON a where
288 -- | Convert a Haskell value to a JSON-friendly intermediate type.
284 -- | Convert a Haskell value to a JSON-friendly intermediate type.
289 toJSON :: a -> Value
285 toJSON :: a -> Value
290
286
291− default toJSON :: (Generic a, GToJSON Value Zero (Rep a)) => a -> Value
287+ default toJSON :: (Generic a, GToJSON Zero (Rep a)) => a -> Value
292 toJSON = genericToJSON defaultOptions
288 toJSON = genericToJSON defaultOptions
293
289
294 -- | Encode a Haskell value as JSON.
290 -- | Encode a Haskell value as JSON.
@@ -338,13 +334,6 @@ instance KeyValue Pair where
338 name .= value = (name, toJSON value)
334 name .= value = (name, toJSON value)
339 {-# INLINE (.=) #-}
335 {-# INLINE (.=) #-}
340
336
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−
348-------------------------------------------------------------------------------
337-------------------------------------------------------------------------------
349-- Classes and types for map keys
338-- Classes and types for map keys
350-------------------------------------------------------------------------------
339-------------------------------------------------------------------------------
@@ -402,7 +391,7 @@ instance KeyValue Object where
402-- newtype wrapper around 'Text'. The recommended approach is to use
391-- newtype wrapper around 'Text'. The recommended approach is to use
403-- generalized newtype deriving:
392-- generalized newtype deriving:
404--
393--
405−-- > newtype RecordId = RecordId { getRecordId :: Text }
394+-- > newtype RecordId = RecordId { getRecordId :: Text}
406-- > deriving (Eq,Ord,ToJSONKey)
395-- > deriving (Eq,Ord,ToJSONKey)
407--
396--
408-- Then we may write:
397-- Then we may write:
@@ -417,18 +406,8 @@ instance KeyValue Object where
417--
406--
418-- It is possible to get the 'ToJSONKey' instance for free as we did
407-- It is possible to get the 'ToJSONKey' instance for free as we did
419-- with 'Foo'. However, in this case, we have a natural way to go to
408-- with 'Foo'. However, in this case, we have a natural way to go to
420−-- and from 'Text' that does not require any escape sequences. So
409+-- and from 'Text' that does not require any escape sequences. So, in
421−-- 'ToJSONKeyText' can be used instead of 'ToJSONKeyValue' to encode maps
410+-- this example, 'ToJSONKeyText' will be used instead of 'ToJSONKeyValue'.
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−--
432-- The 'Show' instance can be used to help write 'ToJSONKey':
411-- The 'Show' instance can be used to help write 'ToJSONKey':
433--
412--
434-- > instance ToJSONKey Color where
413-- > instance ToJSONKey Color where
@@ -503,42 +482,16 @@ toJSONKeyTextEnc e = ToJSONKeyText tot e
503 -- TODO: dropAround is also used in stringEncoding, which is unfortunate atm
482 -- TODO: dropAround is also used in stringEncoding, which is unfortunate atm
504 tot = T.dropAround (== '"')
483 tot = T.dropAround (== '"')
505 . T.decodeLatin1
484 . T.decodeLatin1
506− . L.toStrict
485+ . lazyToStrictByteString
507 . E.encodingToLazyByteString
486 . E.encodingToLazyByteString
508 . e
487 . e
509
488
510−instance Contravariant ToJSONKeyFunction where
511− contramap = contramapToJSONKeyFunction
512−
513-- | Contravariant map, as 'ToJSONKeyFunction' is a contravariant functor.
489-- | Contravariant map, as 'ToJSONKeyFunction' is a contravariant functor.
514contramapToJSONKeyFunction :: (b -> a) -> ToJSONKeyFunction a -> ToJSONKeyFunction b
490contramapToJSONKeyFunction :: (b -> a) -> ToJSONKeyFunction a -> ToJSONKeyFunction b
515contramapToJSONKeyFunction h x = case x of
491contramapToJSONKeyFunction h x = case x of
516 ToJSONKeyText f g -> ToJSONKeyText (f . h) (g . h)
492 ToJSONKeyText f g -> ToJSONKeyText (f . h) (g . h)
517 ToJSONKeyValue f g -> ToJSONKeyValue (f . h) (g . h)
493 ToJSONKeyValue f g -> ToJSONKeyValue (f . h) (g . h)
518
494
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−
542-------------------------------------------------------------------------------
495-------------------------------------------------------------------------------
543-- Lifings of FromJSON and ToJSON to unary and binary type constructors
496-- Lifings of FromJSON and ToJSON to unary and binary type constructors
544-------------------------------------------------------------------------------
497-------------------------------------------------------------------------------
@@ -591,7 +544,7 @@ instance GetConName f => GToJSONKey f
591class ToJSON1 f where
544class ToJSON1 f where
592 liftToJSON :: (a -> Value) -> ([a] -> Value) -> f a -> Value
545 liftToJSON :: (a -> Value) -> ([a] -> Value) -> f a -> Value
593
546
594− default liftToJSON :: (Generic1 f, GToJSON Value One (Rep1 f))
547+ default liftToJSON :: (Generic1 f, GToJSON One (Rep1 f))
595 => (a -> Value) -> ([a] -> Value) -> f a -> Value
548 => (a -> Value) -> ([a] -> Value) -> f a -> Value
596 liftToJSON = genericLiftToJSON defaultOptions
549 liftToJSON = genericLiftToJSON defaultOptions
597
550
@@ -600,7 +553,7 @@ class ToJSON1 f where
600
553
601 liftToEncoding :: (a -> Encoding) -> ([a] -> Encoding) -> f a -> Encoding
554 liftToEncoding :: (a -> Encoding) -> ([a] -> Encoding) -> f a -> Encoding
602
555
603− default liftToEncoding :: (Generic1 f, GToJSON Encoding One (Rep1 f))
556+ default liftToEncoding :: (Generic1 f, GToEncoding One (Rep1 f))
604 => (a -> Encoding) -> ([a] -> Encoding)
557 => (a -> Encoding) -> ([a] -> Encoding)
605 -> f a -> Encoding
558 -> f a -> Encoding
606 liftToEncoding = genericLiftToEncoding defaultOptions
559 liftToEncoding = genericLiftToEncoding defaultOptions
@@ -700,80 +653,39 @@ instance (ToJSON a) => ToJSON [a] where
700-- Generic toJSON / toEncoding
653-- Generic toJSON / toEncoding
701-------------------------------------------------------------------------------
654-------------------------------------------------------------------------------
702
655
703−instance OVERLAPPABLE_ (GToJSON enc arity a) => GToJSON enc arity (M1 i c a) where
704− -- Meta-information, which is not handled elsewhere, is ignored:
705− gToJSON opts targs = gToJSON opts targs . unM1
706− {-# INLINE gToJSON #-}
707−
708−instance GToJSON enc One Par1 where
709− -- Direct occurrences of the last type parameter are encoded with the
710− -- function passed in as an argument:
711− gToJSON _opts (To1Args tj _) = tj . unPar1
712− {-# INLINE gToJSON #-}
713−
714−instance ( ConsToJSON enc arity a
715− , AllNullary (C1 c a) allNullary
716− , SumToJSON enc arity (C1 c a) allNullary
717− ) => GToJSON enc arity (D1 d (C1 c a)) where
718− -- The option 'tagSingleConstructors' determines whether to wrap
719− -- a single-constructor type.
720− gToJSON opts targs
721− | tagSingleConstructors opts = (unTagged :: Tagged allNullary enc -> enc)
722− . sumToJSON opts targs
723− . unM1
724− | otherwise = consToJSON opts targs . unM1 . unM1
725− {-# INLINE gToJSON #-}
726−
727−instance (ConsToJSON enc arity a) => GToJSON enc arity (C1 c a) where
728− -- Constructors need to be encoded differently depending on whether they're
729− -- a record or not. This distinction is made by 'consToJSON':
730− gToJSON opts targs = consToJSON opts targs . unM1
731− {-# INLINE gToJSON #-}
732−
733−instance ( AllNullary (a :+: b) allNullary
734− , SumToJSON enc arity (a :+: b) allNullary
735− ) => GToJSON enc arity (a :+: b)
736− where
737− -- If all constructors of a sum datatype are nullary and the
738− -- 'allNullaryToStringTag' option is set they are encoded to
739− -- strings. This distinction is made by 'sumToJSON':
740− gToJSON opts targs = (unTagged :: Tagged allNullary enc -> enc)
741− . sumToJSON opts targs
742− {-# INLINE gToJSON #-}
743−
744--------------------------------------------------------------------------------
656--------------------------------------------------------------------------------
745-- Generic toJSON
657-- Generic toJSON
746
658
747−-- Note: Refactoring 'ToJSON a' to 'ToJSON enc a' (and 'ToJSON1' similarly) is
748−-- possible but makes error messages a bit harder to understand for missing
749−-- instances.
750−
751−instance GToJSON Value arity V1 where
659+instance OVERLAPPABLE_ (GToJSON arity a) => GToJSON arity (M1 i c a) where
752− -- Empty values do not exist, which makes the job of formatting them
660+ -- Meta-information, which is not handled elsewhere, is ignored:
753− -- rather easy:
661+ gToJSON opts targs = gToJSON opts targs . unM1
754− gToJSON _ _ x = x `seq` error "case: V1"
755− {-# INLINE gToJSON #-}
756
662
757−instance ToJSON a => GToJSON Value arity (K1 i a) where
663+instance (ToJSON a) => GToJSON arity (K1 i a) where
758 -- Constant values are encoded using their ToJSON instance:
664 -- Constant values are encoded using their ToJSON instance:
759 gToJSON _opts _ = toJSON . unK1
665 gToJSON _opts _ = toJSON . unK1
760− {-# INLINE gToJSON #-}
761
666
667+instance GToJSON One Par1 where
668+ -- Direct occurrences of the last type parameter are encoded with the
669+ -- function passed in as an argument:
670+ gToJSON _opts (To1Args tj _) = tj . unPar1
671+
762−instance ToJSON1 f => GToJSON Value One (Rec1 f) where
672+instance (ToJSON1 f) => GToJSON One (Rec1 f) where
763 -- Recursive occurrences of the last type parameter are encoded using their
673 -- Recursive occurrences of the last type parameter are encoded using their
764 -- ToJSON1 instance:
674 -- ToJSON1 instance:
765 gToJSON _opts (To1Args tj tjl) = liftToJSON tj tjl . unRec1
675 gToJSON _opts (To1Args tj tjl) = liftToJSON tj tjl . unRec1
766− {-# INLINE gToJSON #-}
767
676
768−instance GToJSON Value arity U1 where
677+instance GToJSON arity U1 where
769 -- Empty constructors are encoded to an empty array:
678 -- Empty constructors are encoded to an empty array:
770 gToJSON _opts _ _ = emptyArray
679 gToJSON _opts _ _ = emptyArray
771− {-# INLINE gToJSON #-}
680+
681+instance (ConsToJSON arity a) => GToJSON arity (C1 c a) where
682+ -- Constructors need to be encoded differently depending on whether they're
683+ -- a record or not. This distinction is made by 'consToJSON':
684+ gToJSON opts targs = consToJSON opts targs . unM1
772
685
773instance ( WriteProduct arity a, WriteProduct arity b
686instance ( WriteProduct arity a, WriteProduct arity b
774 , ProductSize a, ProductSize b
687 , ProductSize a, ProductSize b
775− ) => GToJSON Value arity (a :*: b)
688+ ) => GToJSON arity (a :*: b) where
776− where
777 -- Products are encoded to an array. Here we allocate a mutable vector of
689 -- Products are encoded to an array. Here we allocate a mutable vector of
778 -- the same size as the product and write the product's elements to it using
690 -- the same size as the product and write the product's elements to it using
779 -- 'writeProduct':
691 -- 'writeProduct':
@@ -785,175 +697,237 @@ instance ( WriteProduct arity a, WriteProduct arity b
785 where
697 where
786 lenProduct = (unTagged2 :: Tagged2 (a :*: b) Int -> Int)
698 lenProduct = (unTagged2 :: Tagged2 (a :*: b) Int -> Int)
787 productSize
699 productSize
788− {-# INLINE gToJSON #-}
789
700
790−instance ( ToJSON1 f
701+instance ( AllNullary (a :+: b) allNullary
791− , GToJSON Value One g
702+ , SumToJSON arity (a :+: b) allNullary
792− ) => GToJSON Value One (f :.: g)
703+ ) => GToJSON arity (a :+: b) where
793− where
704+ -- If all constructors of a sum datatype are nullary and the
705+ -- 'allNullaryToStringTag' option is set they are encoded to
706+ -- strings. This distinction is made by 'sumToJSON':
707+ gToJSON opts targs = (unTagged :: Tagged allNullary Value -> Value)
708+ . sumToJSON opts targs
709+
710+instance (ToJSON1 f, GToJSON One g) => GToJSON One (f :.: g) where
794 -- If an occurrence of the last type parameter is nested inside two
711 -- If an occurrence of the last type parameter is nested inside two
795 -- composed types, it is encoded by using the outermost type's ToJSON1
712 -- composed types, it is encoded by using the outermost type's ToJSON1
796 -- instance to generically encode the innermost type:
713 -- instance to generically encode the innermost type:
797 gToJSON opts targs =
714 gToJSON opts targs =
798 let gtj = gToJSON opts targs in
715 let gtj = gToJSON opts targs in
799 liftToJSON gtj (listValue gtj) . unComp1
716 liftToJSON gtj (listValue gtj) . unComp1
800− {-# INLINE gToJSON #-}
801
717
802--------------------------------------------------------------------------------
718--------------------------------------------------------------------------------
803-- Generic toEncoding
719-- Generic toEncoding
804
720
721+instance OVERLAPPABLE_ (GToEncoding arity a) => GToEncoding arity (M1 i c a) where
722+ -- Meta-information, which is not handled elsewhere, is ignored:
723+ gToEncoding opts targs = gToEncoding opts targs . unM1
724+
805−instance ToJSON a => GToJSON Encoding arity (K1 i a) where
725+instance (ToJSON a) => GToEncoding arity (K1 i a) where
806 -- Constant values are encoded using their ToJSON instance:
726 -- Constant values are encoded using their ToJSON instance:
807− gToJSON _opts _ = toEncoding . unK1
727+ gToEncoding _opts _ = toEncoding . unK1
808− {-# INLINE gToJSON #-}
728+
729+instance GToEncoding One Par1 where
730+ -- Direct occurrences of the last type parameter are encoded with the
731+ -- function passed in as an argument:
732+ gToEncoding _opts (To1Args te _) = te . unPar1
809
733
810−instance ToJSON1 f => GToJSON Encoding One (Rec1 f) where
734+instance (ToJSON1 f) => GToEncoding One (Rec1 f) where
811 -- Recursive occurrences of the last type parameter are encoded using their
735 -- Recursive occurrences of the last type parameter are encoded using their
812 -- ToEncoding1 instance:
736 -- ToEncoding1 instance:
813− gToJSON _opts (To1Args te tel) = liftToEncoding te tel . unRec1
737+ gToEncoding _opts (To1Args te tel) = liftToEncoding te tel . unRec1
814− {-# INLINE gToJSON #-}
815
738
816−instance GToJSON Encoding arity U1 where
739+instance GToEncoding arity U1 where
817 -- Empty constructors are encoded to an empty array:
740 -- Empty constructors are encoded to an empty array:
818− gToJSON _opts _ _ = E.emptyArray_
741+ gToEncoding _opts _ _ = E.emptyArray_
819− {-# INLINE gToJSON #-}
742+
743+instance (ConsToEncoding arity a) => GToEncoding arity (C1 c a) where
744+ -- Constructors need to be encoded differently depending on whether they're
745+ -- a record or not. This distinction is made by 'consToEncoding':
746+ gToEncoding opts targs = consToEncoding opts targs . unM1
820
747
821instance ( EncodeProduct arity a
748instance ( EncodeProduct arity a
822 , EncodeProduct arity b
749 , EncodeProduct arity b
823− ) => GToJSON Encoding arity (a :*: b)
750+ ) => GToEncoding arity (a :*: b) where
824− where
825 -- Products are encoded to an array. Here we allocate a mutable vector of
751 -- Products are encoded to an array. Here we allocate a mutable vector of
826 -- the same size as the product and write the product's elements to it using
752 -- the same size as the product and write the product's elements to it using
827 -- 'encodeProduct':
753 -- 'encodeProduct':
828− gToJSON opts targs p = E.list E.retagEncoding [encodeProduct opts targs p]
754+ gToEncoding opts targs p = E.list E.retagEncoding [encodeProduct opts targs p]
829− {-# INLINE gToJSON #-}
830
755
831−instance ( ToJSON1 f
756+instance ( AllNullary (a :+: b) allNullary
832− , GToJSON Encoding One g
757+ , SumToEncoding arity (a :+: b) allNullary
833− ) => GToJSON Encoding One (f :.: g)
758+ ) => GToEncoding arity (a :+: b) where
834− where
759+ -- If all constructors of a sum datatype are nullary and the
760+ -- 'allNullaryToStringTag' option is set they are encoded to
761+ -- strings. This distinction is made by 'sumToEncoding':
762+ gToEncoding opts targs
763+ = (unTagged :: Tagged allNullary Encoding -> Encoding)
764+ . sumToEncoding opts targs
765+
766+instance (ToJSON1 f, GToEncoding One g) => GToEncoding One (f :.: g) where
835 -- If an occurrence of the last type parameter is nested inside two
767 -- If an occurrence of the last type parameter is nested inside two
836 -- composed types, it is encoded by using the outermost type's ToJSON1
768 -- composed types, it is encoded by using the outermost type's ToJSON1
837 -- instance to generically encode the innermost type:
769 -- instance to generically encode the innermost type:
838− gToJSON opts targs =
770+ gToEncoding opts targs =
839− let gte = gToJSON opts targs in
771+ let gte = gToEncoding opts targs in
840 liftToEncoding gte (listEncoding gte) . unComp1
772 liftToEncoding gte (listEncoding gte) . unComp1
841− {-# INLINE gToJSON #-}
842
773
843--------------------------------------------------------------------------------
774--------------------------------------------------------------------------------
844
775
845−class SumToJSON enc arity f allNullary where
776+class SumToJSON arity f allNullary where
846− sumToJSON :: Options -> ToArgs enc arity a
777+ sumToJSON :: Options -> ToArgs Value arity a
847− -> f a -> Tagged allNullary enc
778+ -> f a -> Tagged allNullary Value
848−
779+
849−instance ( GetConName f
780+instance ( GetConName f
850− , FromString enc
781+ , TaggedObjectPairs arity f
851− , TaggedObject enc arity f
782+ , ObjectWithSingleFieldObj arity f
852− , SumToJSON' ObjectWithSingleField enc arity f
783+ , TwoElemArrayObj arity f
853− , SumToJSON' TwoElemArray enc arity f
784+ , UntaggedValueObj arity f
854− , SumToJSON' UntaggedValue enc arity f
855− ) => SumToJSON enc arity f True
785+ ) => SumToJSON arity f True where
856− where
857 sumToJSON opts targs
786 sumToJSON opts targs
858− | allNullaryToStringTag opts = Tagged . fromString
787+ | allNullaryToStringTag opts = Tagged . String . pack
859 . constructorTagModifier opts . getConName
788 . constructorTagModifier opts . getConName
860 | otherwise = Tagged . nonAllNullarySumToJSON opts targs
789 | otherwise = Tagged . nonAllNullarySumToJSON opts targs
861
790
862−instance ( TaggedObject enc arity f
791+instance ( TwoElemArrayObj arity f
863− , SumToJSON' ObjectWithSingleField enc arity f
792+ , TaggedObjectPairs arity f
864− , SumToJSON' TwoElemArray enc arity f
793+ , ObjectWithSingleFieldObj arity f
865− , SumToJSON' UntaggedValue enc arity f
794+ , UntaggedValueObj arity f
866− ) => SumToJSON enc arity f False
795+ ) => SumToJSON arity f False where
867− where
868 sumToJSON opts targs = Tagged . nonAllNullarySumToJSON opts targs
796 sumToJSON opts targs = Tagged . nonAllNullarySumToJSON opts targs
869
797
870−nonAllNullarySumToJSON :: ( TaggedObject enc arity f
798+nonAllNullarySumToJSON :: ( TwoElemArrayObj arity f
871− , SumToJSON' ObjectWithSingleField enc arity f
799+ , TaggedObjectPairs arity f
872− , SumToJSON' TwoElemArray enc arity f
800+ , ObjectWithSingleFieldObj arity f
873− , SumToJSON' UntaggedValue enc arity f
801+ , UntaggedValueObj arity f
874− ) => Options -> ToArgs enc arity a
802+ ) => Options -> ToArgs Value arity a
875− -> f a -> enc
803+ -> f a -> Value
876nonAllNullarySumToJSON opts targs =
804nonAllNullarySumToJSON opts targs =
877 case sumEncoding opts of
805 case sumEncoding opts of
878−
879 TaggedObject{..} ->
806 TaggedObject{..} ->
880− taggedObject opts targs tagFieldName contentsFieldName
807+ object . taggedObjectPairs opts targs tagFieldName contentsFieldName
881−
882− ObjectWithSingleField ->
808+ ObjectWithSingleField -> Object . objectWithSingleFieldObj opts targs
883− (unTagged :: Tagged ObjectWithSingleField enc -> enc)
809+ TwoElemArray -> Array . twoElemArrayObj opts targs
884− . sumToJSON' opts targs
810+ UntaggedValue -> untaggedValueObj opts targs
885
811
886− TwoElemArray ->
812+--------------------------------------------------------------------------------
887− (unTagged :: Tagged TwoElemArray enc -> enc)
888− . sumToJSON' opts targs
889
813
890− UntaggedValue ->
814+class SumToEncoding arity f allNullary where
891− (unTagged :: Tagged UntaggedValue enc -> enc)
815+ sumToEncoding :: Options -> ToArgs Encoding arity a
892− . sumToJSON' opts targs
816+ -> f a -> Tagged allNullary Encoding
817+
818+instance ( GetConName f
819+ , TaggedObjectEnc arity f
820+ , ObjectWithSingleFieldEnc arity f
821+ , TwoElemArrayEnc arity f
822+ , UntaggedValueEnc arity f
823+ ) => SumToEncoding arity f True where
824+ sumToEncoding opts targs
825+ | allNullaryToStringTag opts = Tagged . toEncoding .
826+ constructorTagModifier opts . getConName
827+ | otherwise = Tagged . nonAllNullarySumToEncoding opts targs
828+
829+instance ( TwoElemArrayEnc arity f
830+ , TaggedObjectEnc arity f
831+ , ObjectWithSingleFieldEnc arity f
832+ , UntaggedValueEnc arity f
833+ ) => SumToEncoding arity f False where
834+ sumToEncoding opts targs = Tagged . nonAllNullarySumToEncoding opts targs
835+
836+nonAllNullarySumToEncoding :: ( TwoElemArrayEnc arity f
837+ , TaggedObjectEnc arity f
838+ , ObjectWithSingleFieldEnc arity f
839+ , UntaggedValueEnc arity f
840+ ) => Options -> ToArgs Encoding arity a
841+ -> f a -> Encoding
842+nonAllNullarySumToEncoding opts targs =
843+ case sumEncoding opts of
844+ TaggedObject{..} ->
845+ taggedObjectEnc opts targs tagFieldName contentsFieldName
846+ ObjectWithSingleField -> objectWithSingleFieldEnc opts targs
847+ TwoElemArray -> twoElemArrayEnc opts targs
848+ UntaggedValue -> untaggedValueEnc opts targs
893
849
894--------------------------------------------------------------------------------
850--------------------------------------------------------------------------------
895
851
896−class FromString enc where
852+class TaggedObjectPairs arity f where
897− fromString :: String -> enc
853+ taggedObjectPairs :: Options -> ToArgs Value arity a
854+ -> String -> String
855+ -> f a -> [Pair]
856+
857+instance ( TaggedObjectPairs arity a
858+ , TaggedObjectPairs arity b
859+ ) => TaggedObjectPairs arity (a :+: b) where
860+ taggedObjectPairs opts targs tagFieldName contentsFieldName (L1 x) =
861+ taggedObjectPairs opts targs tagFieldName contentsFieldName x
862+ taggedObjectPairs opts targs tagFieldName contentsFieldName (R1 x) =
863+ taggedObjectPairs opts targs tagFieldName contentsFieldName x
864+
865+instance ( IsRecord a isRecord
866+ , TaggedObjectPairs' arity a isRecord
867+ , Constructor c
868+ ) => TaggedObjectPairs arity (C1 c a) where
869+ taggedObjectPairs opts targs tagFieldName contentsFieldName =
870+ (pack tagFieldName .= constructorTagModifier opts
871+ (conName (undefined :: t c a p)) :) .
872+ (unTagged :: Tagged isRecord [Pair] -> [Pair]) .
873+ taggedObjectPairs' opts targs contentsFieldName . unM1
898
874
899−instance FromString Encoding where
875+class TaggedObjectPairs' arity f isRecord where
900− fromString = toEncoding
876+ taggedObjectPairs' :: Options -> ToArgs Value arity a
877+ -> String -> f a -> Tagged isRecord [Pair]
901
878
902−instance FromString Value where
879+instance OVERLAPPING_ TaggedObjectPairs' arity U1 False where
903− fromString = String . pack
880+ taggedObjectPairs' _ _ _ _ = Tagged []
904
881
905−--------------------------------------------------------------------------------
882+instance (RecordToPairs arity f) => TaggedObjectPairs' arity f True where
883+ taggedObjectPairs' opts targs _ =
884+ Tagged . toList . recordToPairs opts targs
906
885
907−class TaggedObject enc arity f where
886+instance (GToJSON arity f) => TaggedObjectPairs' arity f False where
908− taggedObject :: Options -> ToArgs enc arity a
887+ taggedObjectPairs' opts targs contentsFieldName =
909− -> String -> String
888+ Tagged . (:[]) . (pack contentsFieldName .=) . gToJSON opts targs
910− -> f a -> enc
911
889
912−instance ( TaggedObject enc arity a
890+--------------------------------------------------------------------------------
913− , TaggedObject enc arity b
891+
914− ) => TaggedObject enc arity (a :+: b)
892+class TaggedObjectEnc arity f where
915− where
893+ taggedObjectEnc :: Options -> ToArgs Encoding arity a
894+ -> String -> String
895+ -> f a -> Encoding
896+
897+instance ( TaggedObjectEnc arity a
898+ , TaggedObjectEnc arity b
899+ ) => TaggedObjectEnc arity (a :+: b) where
916− taggedObject opts targs tagFieldName contentsFieldName (L1 x) =
900+ taggedObjectEnc opts targs tagFieldName contentsFieldName (L1 x) =
917− taggedObject opts targs tagFieldName contentsFieldName x
901+ taggedObjectEnc opts targs tagFieldName contentsFieldName x
918− taggedObject opts targs tagFieldName contentsFieldName (R1 x) =
902+ taggedObjectEnc opts targs tagFieldName contentsFieldName (R1 x) =
919− taggedObject opts targs tagFieldName contentsFieldName x
903+ taggedObjectEnc opts targs tagFieldName contentsFieldName x
920−
904+
921−instance ( IsRecord a isRecord
905+instance ( IsRecord a isRecord
922− , TaggedObject' enc pairs arity a isRecord
906+ , TaggedObjectEnc' arity a isRecord
923− , FromPairs enc pairs
924− , FromString enc
925− , KeyValuePair enc pairs
926 , Constructor c
907 , Constructor c
927− ) => TaggedObject enc arity (C1 c a)
908+ ) => TaggedObjectEnc arity (C1 c a) where
928− where
929− taggedObject opts targs tagFieldName contentsFieldName =
909+ taggedObjectEnc opts targs tagFieldName contentsFieldName v = E.pairs (E.pair key val)
930− fromPairs . mappend tag . contents
931 where
910 where
911+ key :: Text
932− tag = tagFieldName `pair`
912+ key = pack tagFieldName
933− (fromString (constructorTagModifier opts (conName (undefined :: t c a p)))
913+ val = toEncoding (constructorTagModifier opts (conName (undefined :: t c a p)))
934− :: enc)
935− contents =
936− (unTagged :: Tagged isRecord pairs -> pairs) .
937− taggedObject' opts targs contentsFieldName . unM1
914+ >< ((unTagged :: Tagged isRecord Encoding -> Encoding) . taggedObjectEnc' opts targs contentsFieldName . unM1 $ v)
938−
939−class TaggedObject' enc pairs arity f isRecord where
940− taggedObject' :: Options -> ToArgs enc arity a
941− -> String -> f a -> Tagged isRecord pairs
942−
943−instance ( GToJSON enc arity f
944− , KeyValuePair enc pairs
945− ) => TaggedObject' enc pairs arity f False
946− where
947− taggedObject' opts targs contentsFieldName =
948− Tagged . (contentsFieldName `pair`) . gToJSON opts targs
949
915
950−instance OVERLAPPING_ Monoid pairs => TaggedObject' enc pairs arity U1 False where
916+class TaggedObjectEnc' arity f isRecord where
951− taggedObject' _ _ _ _ = Tagged mempty
917+ taggedObjectEnc' :: Options -> ToArgs Encoding arity a
918+ -> String -> f a -> Tagged isRecord Encoding
952
919
953−instance ( RecordToPairs enc pairs arity f
920+instance OVERLAPPING_ TaggedObjectEnc' arity U1 False where
954− ) => TaggedObject' enc pairs arity f True
921+ taggedObjectEnc' _ _ _ _ = Tagged E.empty
955− where
922+
956− taggedObject' opts targs _ = Tagged . recordToPairs opts targs
923+instance (RecordToEncoding arity f) => TaggedObjectEnc' arity f True where
924+ taggedObjectEnc' opts targs _ = Tagged . (E.comma ><) . fst
925+ . recordToEncoding opts targs
926+
927+instance (GToEncoding arity f) => TaggedObjectEnc' arity f False where
928+ taggedObjectEnc' opts targs contentsFieldName =
929+ Tagged . (\z -> E.comma >< toEncoding contentsFieldName >< E.colon >< z) .
930+ gToEncoding opts targs
957
931
958--------------------------------------------------------------------------------
932--------------------------------------------------------------------------------
959
933
@@ -968,38 +942,23 @@ instance (GetConName a, GetConName b) => GetConName (a :+: b) where
968instance (Constructor c) => GetConName (C1 c a) where
942instance (Constructor c) => GetConName (C1 c a) where
969 getConName = conName
943 getConName = conName
970
944
971−-- For genericToJSONKey
972−instance GetConName a => GetConName (D1 d a) where
973− getConName (M1 x) = getConName x
974−
975−--------------------------------------------------------------------------------
976−
977−-- Reflection of SumEncoding variants
978−
979−data ObjectWithSingleField
980−data TwoElemArray
981−data UntaggedValue
982−
983--------------------------------------------------------------------------------
945--------------------------------------------------------------------------------
984
946
985−class SumToJSON' s enc arity f where
947+class TwoElemArrayObj arity f where
986− sumToJSON' :: Options -> ToArgs enc arity a
948+ twoElemArrayObj :: Options -> ToArgs Value arity a
987− -> f a -> Tagged s enc
949+ -> f a -> V.Vector Value
988
950
989−instance ( SumToJSON' s enc arity a
951+instance ( TwoElemArrayObj arity a
990− , SumToJSON' s enc arity b
952+ , TwoElemArrayObj arity b
991− ) => SumToJSON' s enc arity (a :+: b)
953+ ) => TwoElemArrayObj arity (a :+: b) where
992− where
993− sumToJSON' opts targs (L1 x) = sumToJSON' opts targs x
954+ twoElemArrayObj opts targs (L1 x) = twoElemArrayObj opts targs x
994− sumToJSON' opts targs (R1 x) = sumToJSON' opts targs x
955+ twoElemArrayObj opts targs (R1 x) = twoElemArrayObj opts targs x
995
956
996−--------------------------------------------------------------------------------
997−
998−instance ( GToJSON Value arity a
957+instance ( GToJSON arity a
999− , ConsToJSON Value arity a
958+ , ConsToJSON arity a
1000 , Constructor c
959 , Constructor c
1001− ) => SumToJSON' TwoElemArray Value arity (C1 c a) where
960+ ) => TwoElemArrayObj arity (C1 c a) where
1002− sumToJSON' opts targs x = Tagged $ Array $ V.create $ do
961+ twoElemArrayObj opts targs x = V.create $ do
1003 mv <- VM.unsafeNew 2
962 mv <- VM.unsafeNew 2
1004 VM.unsafeWrite mv 0 $ String $ pack $ constructorTagModifier opts
963 VM.unsafeWrite mv 0 $ String $ pack $ constructorTagModifier opts
1005 $ conName (undefined :: t c a p)
964 $ conName (undefined :: t c a p)
@@ -1008,121 +967,149 @@ instance ( GToJSON Value arity a
1008
967
1009--------------------------------------------------------------------------------
968--------------------------------------------------------------------------------
1010
969
1011−instance ( GToJSON Encoding arity a
970+class TwoElemArrayEnc arity f where
1012− , ConsToJSON Encoding arity a
971+ twoElemArrayEnc :: Options -> ToArgs Encoding arity a
972+ -> f a -> Encoding
973+
974+instance ( TwoElemArrayEnc arity a
975+ , TwoElemArrayEnc arity b
976+ ) => TwoElemArrayEnc arity (a :+: b) where
977+ twoElemArrayEnc opts targs (L1 x) = twoElemArrayEnc opts targs x
978+ twoElemArrayEnc opts targs (R1 x) = twoElemArrayEnc opts targs x
979+
980+instance ( GToEncoding arity a
981+ , ConsToEncoding arity a
1013 , Constructor c
982 , Constructor c
1014− ) => SumToJSON' TwoElemArray Encoding arity (C1 c a)
983+ ) => TwoElemArrayEnc arity (C1 c a) where
1015− where
1016− sumToJSON' opts targs x = Tagged $ E.list id
984+ twoElemArrayEnc opts targs x = E.list id
1017 [ toEncoding (constructorTagModifier opts (conName (undefined :: t c a p)))
985 [ toEncoding (constructorTagModifier opts (conName (undefined :: t c a p)))
1018− , gToJSON opts targs x
986+ , gToEncoding opts targs x
1019 ]
987 ]
1020
988
1021--------------------------------------------------------------------------------
989--------------------------------------------------------------------------------
1022
990
1023−class ConsToJSON enc arity f where
991+class ConsToJSON arity f where
1024− consToJSON :: Options -> ToArgs enc arity a
992+ consToJSON :: Options -> ToArgs Value arity a
1025− -> f a -> enc
993+ -> f a -> Value
1026
994
1027−class ConsToJSON' enc arity f isRecord where
995+class ConsToJSON' arity f isRecord where
1028− consToJSON' :: Options -> ToArgs enc arity a
996+ consToJSON' :: Options -> ToArgs Value arity a
997+ -> Bool -- ^ Are we a record with one field?
1029− -> f a -> Tagged isRecord enc
998+ -> f a -> Tagged isRecord Value
1030
999
1031−instance ( IsRecord f isRecord
1000+instance ( IsRecord f isRecord
1032− , ConsToJSON' enc arity f isRecord
1001+ , ConsToJSON' arity f isRecord
1033− ) => ConsToJSON enc arity f
1002+ ) => ConsToJSON arity f where
1034− where
1035 consToJSON opts targs =
1003 consToJSON opts targs =
1036− (unTagged :: Tagged isRecord enc -> enc)
1004+ (unTagged :: Tagged isRecord Value -> Value)
1037− . consToJSON' opts targs
1005+ . consToJSON' opts targs (isUnary (undefined :: f a))
1038− {-# INLINE consToJSON #-}
1039
1006
1040−instance OVERLAPPING_
1041− ( RecordToPairs enc pairs arity (S1 s f)
1042− , FromPairs enc pairs
1043− , GToJSON enc arity f
1044− ) => ConsToJSON' enc arity (S1 s f) True
1007+instance (RecordToPairs arity f) => ConsToJSON' arity f True where
1045− where
1046− consToJSON' opts targs
1008+ consToJSON' opts targs isUn f = let
1009+ vals = toList $ recordToPairs opts targs f
1047− | unwrapUnaryRecords opts = Tagged . gToJSON opts targs
1010+ in case (unwrapUnaryRecords opts,isUn,vals) of
1048− | otherwise = Tagged . fromPairs . recordToPairs opts targs
1011+ (True,True,[(_,val)]) -> Tagged val
1049− {-# INLINE consToJSON' #-}
1012+ _ -> Tagged $ object vals
1050−
1051−instance ( RecordToPairs enc pairs arity f
1052− , FromPairs enc pairs
1053− ) => ConsToJSON' enc arity f True
1054− where
1055− consToJSON' opts targs = Tagged . fromPairs . recordToPairs opts targs
1056− {-# INLINE consToJSON' #-}
1057
1013
1058−instance GToJSON enc arity f => ConsToJSON' enc arity f False where
1014+instance GToJSON arity f => ConsToJSON' arity f False where
1059− consToJSON' opts targs = Tagged . gToJSON opts targs
1015+ consToJSON' opts targs _ = Tagged . gToJSON opts targs
1060− {-# INLINE consToJSON' #-}
1061
1016
1062--------------------------------------------------------------------------------
1017--------------------------------------------------------------------------------
1063
1018
1064−class RecordToPairs enc pairs arity f where
1019+class ConsToEncoding arity f where
1065− -- 1st element: whole thing
1066− -- 2nd element: in case the record has only 1 field, just the value
1067− -- of the field (without the key); 'Nothing' otherwise
1068− recordToPairs :: Options -> ToArgs enc arity a
1020+ consToEncoding :: Options -> ToArgs Encoding arity a
1069− -> f a -> pairs
1021+ -> f a -> Encoding
1070
1022
1071−instance ( Monoid pairs
1023+class ConsToEncoding' arity f isRecord where
1072− , RecordToPairs enc pairs arity a
1024+ consToEncoding' :: Options -> ToArgs Encoding arity a
1073− , RecordToPairs enc pairs arity b
1025+ -> Bool -- ^ Are we a record with one field?
1074− ) => RecordToPairs enc pairs arity (a :*: b)
1026+ -> f a -> Tagged isRecord Encoding
1075− where
1027+
1076− recordToPairs opts (targs :: ToArgs enc arity p) (a :*: b) =
1028+instance ( IsRecord f isRecord
1077− pairsOf a `mappend` pairsOf b
1029+ , ConsToEncoding' arity f isRecord
1078− where
1030+ ) => ConsToEncoding arity f where
1079− pairsOf :: (RecordToPairs enc pairs arity f) => f p -> pairs
1031+ consToEncoding opts targs =
1032+ (unTagged :: Tagged isRecord Encoding -> Encoding)
1033+ . consToEncoding' opts targs (isUnary (undefined :: f a))
1034+
1035+instance (RecordToEncoding arity f) => ConsToEncoding' arity f True where
1036+ consToEncoding' opts targs isUn x =
1037+ let (enc, mbVal) = recordToEncoding opts targs x
1038+ in case (unwrapUnaryRecords opts, isUn, mbVal) of
1039+ (True, True, Just val) -> Tagged val
1040+ _ -> Tagged $ E.wrapObject enc
1041+
1042+instance GToEncoding arity f => ConsToEncoding' arity f False where
1043+ consToEncoding' opts targs _ = Tagged . gToEncoding opts targs
1044+
1045+--------------------------------------------------------------------------------
1046+
1047+class RecordToPairs arity f where
1048+ recordToPairs :: Options -> ToArgs Value arity a
1049+ -> f a -> DList Pair
1050+
1051+instance ( RecordToPairs arity a
1052+ , RecordToPairs arity b
1053+ ) => RecordToPairs arity (a :*: b) where
1080− pairsOf = recordToPairs opts targs
1054+ recordToPairs opts targs (a :*: b) = recordToPairs opts targs a <>
1081− {-# INLINE recordToPairs #-}
1055+ recordToPairs opts targs b
1082−
1056+
1083−instance ( Selector s
1084− , GToJSON enc arity a
1085− , KeyValuePair enc pairs
1086− ) => RecordToPairs enc pairs arity (S1 s a)
1057+instance (Selector s, GToJSON arity a) => RecordToPairs arity (S1 s a) where
1087− where
1088 recordToPairs = fieldToPair
1058 recordToPairs = fieldToPair
1089− {-# INLINE recordToPairs #-}
1059+
1090−
1091−instance INCOHERENT_
1092− ( Selector s
1060+instance OVERLAPPING_ (Selector s, ToJSON a) =>
1093− , GToJSON enc arity (K1 i (Maybe a))
1094− , KeyValuePair enc pairs
1095− , Monoid pairs
1096− ) => RecordToPairs enc pairs arity (S1 s (K1 i (Maybe a)))
1061+ RecordToPairs arity (S1 s (K1 i (Maybe a))) where
1097− where
1098 recordToPairs opts _ (M1 k1) | omitNothingFields opts
1062 recordToPairs opts _ (M1 k1) | omitNothingFields opts
1099− , K1 Nothing <- k1 = mempty
1063+ , K1 Nothing <- k1 = DList.empty
1100 recordToPairs opts targs m1 = fieldToPair opts targs m1
1064 recordToPairs opts targs m1 = fieldToPair opts targs m1
1101− {-# INLINE recordToPairs #-}
1065+
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−
1116−fieldToPair :: (Selector s
1066+fieldToPair :: (Selector s, GToJSON arity a)
1117− , GToJSON enc arity a
1118− , KeyValuePair enc pairs)
1119− => Options -> ToArgs enc arity p
1067+ => Options -> ToArgs Value arity p
1120− -> S1 s a p -> pairs
1068+ -> S1 s a p -> DList Pair
1121−fieldToPair opts targs m1 =
1122− let key = fieldLabelModifier opts (selName m1)
1069+fieldToPair opts targs m1 = pure ( pack $ fieldLabelModifier opts $ selName m1
1123− value = gToJSON opts targs (unM1 m1)
1070+ , gToJSON opts targs (unM1 m1)
1124− in key `pair` value
1071+ )
1125−{-# INLINE fieldToPair #-}
1072+
1073+--------------------------------------------------------------------------------
1074+
1075+class RecordToEncoding arity f where
1076+ -- 1st element: whole thing
1077+ -- 2nd element: in case the record has only 1 field, just the value
1078+ -- of the field (without the key); 'Nothing' otherwise
1079+ recordToEncoding :: Options -> ToArgs Encoding arity a
1080+ -> f a -> (Encoding, Maybe Encoding)
1081+
1082+instance ( RecordToEncoding arity a
1083+ , RecordToEncoding arity b
1084+ ) => RecordToEncoding arity (a :*: b) where
1085+ recordToEncoding opts targs (a :*: b) | omitNothingFields opts =
1086+ (E.econcat $ intersperse E.comma $
1087+ filter (not . E.nullEncoding)
1088+ [ fst (recordToEncoding opts targs a)
1089+ , fst (recordToEncoding opts targs b) ]
1090+ , Nothing)
1091+ recordToEncoding opts targs (a :*: b) =
1092+ (fst (recordToEncoding opts targs a) >< E.comma ><
1093+ fst (recordToEncoding opts targs b),
1094+ Nothing)
1095+
1096+
1097+instance (Selector s, GToEncoding arity a) => RecordToEncoding arity (S1 s a) where
1098+ recordToEncoding = fieldToEncoding
1099+
1100+instance OVERLAPPING_ (Selector s, ToJSON a) =>
1101+ RecordToEncoding arity (S1 s (K1 i (Maybe a))) where
1102+ recordToEncoding opts _ (M1 k1) | omitNothingFields opts
1103+ , K1 Nothing <- k1 = (E.empty, Nothing)
1104+ recordToEncoding opts targs m1 = fieldToEncoding opts targs m1
1105+
1106+fieldToEncoding :: (Selector s, GToEncoding arity a)
1107+ => Options -> ToArgs Encoding arity p
1108+ -> S1 s a p -> (Encoding, Maybe Encoding)
1109+fieldToEncoding opts targs m1 =
1110+ let keyBuilder = toEncoding (fieldLabelModifier opts $ selName m1)
1111+ valueBuilder = gToEncoding opts targs (unM1 m1)
1112+ in (keyBuilder >< E.colon >< valueBuilder, Just valueBuilder)
1126
1113
1127--------------------------------------------------------------------------------
1114--------------------------------------------------------------------------------
1128
1115
@@ -1145,12 +1132,10 @@ instance ( WriteProduct arity a
1145 lenL = len `unsafeShiftR` 1
1132 lenL = len `unsafeShiftR` 1
1146 lenR = len - lenL
1133 lenR = len - lenL
1147 ixR = ix + lenL
1134 ixR = ix + lenL
1148− {-# INLINE writeProduct #-}
1149
1135
1150−instance OVERLAPPABLE_ (GToJSON Value arity a) => WriteProduct arity a where
1136+instance OVERLAPPABLE_ (GToJSON arity a) => WriteProduct arity a where
1151 writeProduct opts targs mv ix _ =
1137 writeProduct opts targs mv ix _ =
1152 VM.unsafeWrite mv ix . gToJSON opts targs
1138 VM.unsafeWrite mv ix . gToJSON opts targs
1153− {-# INLINE writeProduct #-}
1154
1139
1155--------------------------------------------------------------------------------
1140--------------------------------------------------------------------------------
1156
1141
@@ -1168,41 +1153,110 @@ instance ( EncodeProduct arity a
1168 encodeProduct opts targs (a :*: b) =
1153 encodeProduct opts targs (a :*: b) =
1169 encodeProduct opts targs a >*<
1154 encodeProduct opts targs a >*<
1170 encodeProduct opts targs b
1155 encodeProduct opts targs b
1171− {-# INLINE encodeProduct #-}
1172
1156
1173−instance OVERLAPPABLE_ (GToJSON Encoding arity a) => EncodeProduct arity a where
1157+instance OVERLAPPABLE_ (GToEncoding arity a) => EncodeProduct arity a where
1174− encodeProduct opts targs a = E.retagEncoding $ gToJSON opts targs a
1158+ encodeProduct opts targs a = E.retagEncoding $ gToEncoding opts targs a
1175− {-# INLINE encodeProduct #-}
1176
1159
1177--------------------------------------------------------------------------------
1160--------------------------------------------------------------------------------
1178
1161
1162+class ObjectWithSingleFieldObj arity f where
1163+ objectWithSingleFieldObj :: Options -> ToArgs Value arity a
1164+ -> f a -> Object
1165+
1166+instance ( ObjectWithSingleFieldObj arity a
1167+ , ObjectWithSingleFieldObj arity b
1168+ ) => ObjectWithSingleFieldObj arity (a :+: b) where
1169+ objectWithSingleFieldObj opts targs (L1 x) =
1170+ objectWithSingleFieldObj opts targs x
1171+ objectWithSingleFieldObj opts targs (R1 x) =
1172+ objectWithSingleFieldObj opts targs x
1173+
1179−instance ( GToJSON enc arity a
1174+instance ( GToJSON arity a
1180− , ConsToJSON enc arity a
1175+ , ConsToJSON arity a
1181− , FromPairs enc pairs
1182− , KeyValuePair enc pairs
1183 , Constructor c
1176 , Constructor c
1184− ) => SumToJSON' ObjectWithSingleField enc arity (C1 c a)
1177+ ) => ObjectWithSingleFieldObj arity (C1 c a) where
1185− where
1178+ objectWithSingleFieldObj opts targs = H.singleton typ . gToJSON opts targs
1186− sumToJSON' opts targs =
1187− Tagged . fromPairs . (typ `pair`) . gToJSON opts targs
1188 where
1179 where
1189− typ = constructorTagModifier opts $
1180+ typ = pack $ constructorTagModifier opts $
1190 conName (undefined :: t c a p)
1181 conName (undefined :: t c a p)
1191
1182
1192--------------------------------------------------------------------------------
1183--------------------------------------------------------------------------------
1193
1184
1185+class ObjectWithSingleFieldEnc arity f where
1186+ objectWithSingleFieldEnc :: Options -> ToArgs Encoding arity a
1187+ -> f a -> Encoding
1188+
1189+instance ( ObjectWithSingleFieldEnc arity a
1190+ , ObjectWithSingleFieldEnc arity b
1191+ ) => ObjectWithSingleFieldEnc arity (a :+: b) where
1192+ objectWithSingleFieldEnc opts targs (L1 x) =
1193+ objectWithSingleFieldEnc opts targs x
1194+ objectWithSingleFieldEnc opts targs (R1 x) =
1195+ objectWithSingleFieldEnc opts targs x
1196+
1197+instance ( GToEncoding arity a
1198+ , ConsToEncoding arity a
1199+ , Constructor c
1200+ ) => ObjectWithSingleFieldEnc arity (C1 c a) where
1201+ objectWithSingleFieldEnc opts targs v = E.pairs (E.pair key val)
1202+ where
1203+ key :: Text
1204+ key = pack (constructorTagModifier opts (conName (undefined :: t c a p)))
1205+ val :: Encoding' Value
1206+ val = gToEncoding opts targs v
1207+
1208+--------------------------------------------------------------------------------
1209+
1210+class UntaggedValueObj arity f where
1211+ untaggedValueObj :: Options -> ToArgs Value arity a
1212+ -> f a -> Value
1213+
1214+instance
1215+ ( UntaggedValueObj arity a
1216+ , UntaggedValueObj arity b
1217+ ) => UntaggedValueObj arity (a :+: b)
1218+ where
1219+ untaggedValueObj opts targs (L1 x) = untaggedValueObj opts targs x
1220+ untaggedValueObj opts targs (R1 x) = untaggedValueObj opts targs x
1221+
1222+instance OVERLAPPABLE_
1223+ ( GToJSON arity a
1224+ , ConsToJSON arity a
1225+ ) => UntaggedValueObj arity (C1 c a) where
1226+ untaggedValueObj = gToJSON
1227+
1228+instance OVERLAPPING_
1229+ ( Constructor c )
1230+ => UntaggedValueObj arity (C1 c U1)
1231+ where
1232+ untaggedValueObj opts _ _ = toJSON $
1233+ constructorTagModifier opts $ conName (undefined :: t c U1 p)
1234+
1235+--------------------------------------------------------------------------------
1236+
1237+class UntaggedValueEnc arity f where
1238+ untaggedValueEnc :: Options -> ToArgs Encoding arity a
1239+ -> f a -> Encoding
1240+instance
1241+ ( UntaggedValueEnc arity a
1242+ , UntaggedValueEnc arity b
1243+ ) => UntaggedValueEnc arity (a :+: b)
1244+ where
1245+ untaggedValueEnc opts targs (L1 x) = untaggedValueEnc opts targs x
1246+ untaggedValueEnc opts targs (R1 x) = untaggedValueEnc opts targs x
1247+
1194instance OVERLAPPABLE_
1248instance OVERLAPPABLE_
1195− ( ConsToJSON enc arity a
1249+ ( GToEncoding arity a
1196− ) => SumToJSON' UntaggedValue enc arity (C1 c a)
1250+ , ConsToEncoding arity a
1251+ ) => UntaggedValueEnc arity (C1 c a)
1197 where
1252 where
1198− sumToJSON' opts targs = Tagged . gToJSON opts targs
1253+ untaggedValueEnc = gToEncoding
1199
1254
1200instance OVERLAPPING_
1255instance OVERLAPPING_
1201− ( Constructor c
1256+ ( Constructor c )
1202− , FromString enc
1257+ => UntaggedValueEnc arity (C1 c U1)
1203− ) => SumToJSON' UntaggedValue enc arity (C1 c U1)
1204 where
1258 where
1205− sumToJSON' opts _ _ = Tagged . fromString $
1259+ untaggedValueEnc opts _ _ = toEncoding $
1206 constructorTagModifier opts $ conName (undefined :: t c U1 p)
1260 constructorTagModifier opts $ conName (undefined :: t c U1 p)
1207
1261
1208-------------------------------------------------------------------------------
1262-------------------------------------------------------------------------------
@@ -1276,13 +1330,6 @@ instance (ToJSON a, ToJSON b) => ToJSON (Either a b) where
1276 toEncoding = toEncoding2
1330 toEncoding = toEncoding2
1277 {-# INLINE toEncoding #-}
1331 {-# INLINE toEncoding #-}
1278
1332
1279−instance ToJSON Void where
1280− toJSON = absurd
1281− {-# INLINE toJSON #-}
1282−
1283− toEncoding = absurd
1284− {-# INLINE toEncoding #-}
1285−
1286
1333
1287instance ToJSON Bool where
1334instance ToJSON Bool where
1288 toJSON = Bool
1335 toJSON = Bool
@@ -1468,6 +1515,7 @@ instance ToJSONKey Int64 where
1468 toJSONKey = toJSONKeyTextEnc E.int64Text
1515 toJSONKey = toJSONKeyTextEnc E.int64Text
1469 {-# INLINE toJSONKey #-}
1516 {-# INLINE toJSONKey #-}
1470
1517
1518+
1471instance ToJSON Word where
1519instance ToJSON Word where
1472 toJSON = Number . fromIntegral
1520 toJSON = Number . fromIntegral
1473 {-# INLINE toJSON #-}
1521 {-# INLINE toJSON #-}
@@ -1527,12 +1575,6 @@ instance ToJSONKey Word64 where
1527 toJSONKey = toJSONKeyTextEnc E.word64Text
1575 toJSONKey = toJSONKeyTextEnc E.word64Text
1528 {-# INLINE toJSONKey #-}
1576 {-# INLINE toJSONKey #-}
1529
1577
1530−instance ToJSON CTime where
1531− toJSON (CTime i) = toJSON i
1532− {-# INLINE toJSON #-}
1533−
1534− toEncoding (CTime i) = toEncoding i
1535− {-# INLINE toEncoding #-}
1536
1578
1537instance ToJSON Text where
1579instance ToJSON Text where
1538 toJSON = String
1580 toJSON = String
@@ -1966,32 +2008,6 @@ dotNetTime (DotNetTime t) = secs ++ formatMillis t ++ ")/"
1966formatMillis :: (FormatTime t) => t -> String
2008formatMillis :: (FormatTime t) => t -> String
1967formatMillis = take 3 . formatTime defaultTimeLocale "%q"
2009formatMillis = take 3 . formatTime defaultTimeLocale "%q"
1968
2010
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−
1995-------------------------------------------------------------------------------
2011-------------------------------------------------------------------------------
1996-- time
2012-- time
1997-------------------------------------------------------------------------------
2013-------------------------------------------------------------------------------
@@ -2040,11 +2056,10 @@ stringEncoding :: Encoding' Text -> Value
2040stringEncoding = String
2056stringEncoding = String
2041 . T.dropAround (== '"')
2057 . T.dropAround (== '"')
2042 . T.decodeLatin1
2058 . T.decodeLatin1
2043− . L.toStrict
2059+ . lazyToStrictByteString
2044 . E.encodingToLazyByteString
2060 . E.encodingToLazyByteString
2045{-# INLINE stringEncoding #-}
2061{-# INLINE stringEncoding #-}
2046
2062
2047−
2048instance ToJSON NominalDiffTime where
2063instance ToJSON NominalDiffTime where
2049 toJSON = Number . realToFrac
2064 toJSON = Number . realToFrac
2050 {-# INLINE toJSON #-}
2065 {-# INLINE toJSON #-}
@@ -2052,58 +2067,6 @@ instance ToJSON NominalDiffTime where
2052 toEncoding = E.scientific . realToFrac
2067 toEncoding = E.scientific . realToFrac
2053 {-# INLINE toEncoding #-}
2068 {-# INLINE toEncoding #-}
2054
2069
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−
2107-------------------------------------------------------------------------------
2070-------------------------------------------------------------------------------
2108-- base Monoid/Semigroup
2071-- base Monoid/Semigroup
2109-------------------------------------------------------------------------------
2072-------------------------------------------------------------------------------
@@ -2847,26 +2810,27 @@ instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f, ToJSON g,
2847 toEncoding = toEncoding2
2810 toEncoding = toEncoding2
2848 {-# INLINE toEncoding #-}
2811 {-# INLINE toEncoding #-}
2849
2812
2850−--------------------------------------------------------------------------------
2813+-------------------------------------------------------------------------------
2851−
2814+-- pre-bytestring-0.10 compatibility
2852−-- | Wrap a list of pairs as an object.
2815+-------------------------------------------------------------------------------
2853−class Monoid pairs => FromPairs enc pairs | enc -> pairs where
2854− fromPairs :: pairs -> enc
2855−
2856−instance (a ~ Value) => FromPairs (Encoding' a) Series where
2857− fromPairs = E.pairs
2858−
2859−instance FromPairs Value (DList Pair) where
2860− fromPairs = object . toList
2861
2816
2862−-- | Like 'KeyValue' but the value is already converted to JSON
2817+{-# INLINE lazyToStrictByteString #-}
2863−-- ('Value' or 'Encoding'), and the result actually represents lists of pairs
2818+lazyToStrictByteString :: L.ByteString -> S.ByteString
2864−-- so it can be readily concatenated.
2819+#if MIN_VERSION_bytestring(0,10,0)
2865−class Monoid kv => KeyValuePair v kv where
2820+lazyToStrictByteString = L.toStrict
2866− pair :: String -> v -> kv
2821+#else
2822+lazyToStrictByteString = packChunks
2867
2823
2868−instance (v ~ Value) => KeyValuePair v (DList Pair) where
2824+-- packChunks is taken from the blaze-builder package.
2869− pair k v = DList.singleton (pack k .= v)
2870
2825
2871−instance (e ~ Encoding) => KeyValuePair e Series where
2826+-- | Pack the chunks of a lazy bytestring into a single strict bytestring.
2872− pair = E.pairStr
2827+packChunks :: L.ByteString -> S.ByteString
2828+packChunks lbs =
2829+ S.unsafeCreate (fromIntegral $ L.length lbs) (copyChunks lbs)
2830+ where
2831+ copyChunks L.Empty _pf = return ()
2832+ copyChunks (L.Chunk (S.PS fpbuf o l) lbs') pf = do
2833+ withForeignPtr fpbuf $ \pbuf ->
2834+ copyBytes pf (pbuf `plusPtr` o) l
2835+ copyChunks lbs' (pf `plusPtr` l)
2836+#endif
HLint.hsnew file+10
@@ -0,0 +1,10 @@
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− ./run-hlint.sh --cpp-include include/ --cpp-file travis/cabal_macros.h Data/ attoparsec-iso8601/ benchmarks/ examples/ ffi/ pure/ tests/
2+ hlint --cpp-include include/ --cpp-file .stack-work/dist/*/*Cabal-*/build/autogen/cabal_macros.h .
README.markdown+2−1
@@ -24,4 +24,5 @@ See what's changed in recent (and upcoming) releases:
24
24
25# Authors
25# Authors
26
26
27−This library was originally written by Bryan O'Sullivan.
27+This library is written and maintained by Bryan O'Sullivan,
28+<bos@serpentine.com>.
aeson.cabal+56−71
@@ -1,5 +1,5 @@
1name: aeson
1name: aeson
2−version: 1.4.6.0
2+version: 1.1.2.0
3license: BSD3
3license: BSD3
4license-file: LICENSE
4license-file: LICENSE
5category: Text, Web, JSON
5category: Text, Web, JSON
@@ -21,6 +21,20 @@ 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+ .
24 (A note on naming: in Greek mythology, Aeson was the father of Jason.)
38 (A note on naming: in Greek mythology, Aeson was the father of Jason.)
25
39
26extra-source-files:
40extra-source-files:
@@ -42,7 +56,6 @@ extra-source-files:
42 include/*.h
56 include/*.h
43 tests/JSONTestSuite/test_parsing/*.json
57 tests/JSONTestSuite/test_parsing/*.json
44 tests/JSONTestSuite/test_transform/*.json
58 tests/JSONTestSuite/test_transform/*.json
45− tests/golden/*.expected
46 pure/Data/Aeson/Parser/*.hs
59 pure/Data/Aeson/Parser/*.hs
47
60
48flag developer
61flag developer
@@ -61,13 +74,13 @@ flag bytestring-builder
61 manual: False
74 manual: False
62
75
63flag cffi
76flag cffi
64− description: Controls whether to include c-ffi bits or pure haskell. Default to False for security.
77+ description: Controls whether to include c-ffi bits or pure haskell
65− default: False
78+ default: True
66 manual: True
79 manual: True
67
80
68library
81library
69 default-language: Haskell2010
82 default-language: Haskell2010
70− hs-source-dirs: . attoparsec-iso8601/
83+ hs-source-dirs: .
71
84
72 exposed-modules:
85 exposed-modules:
73 Data.Aeson
86 Data.Aeson
@@ -76,12 +89,10 @@ library
76 Data.Aeson.Text
89 Data.Aeson.Text
77 Data.Aeson.Types
90 Data.Aeson.Types
78 Data.Aeson.TH
91 Data.Aeson.TH
79− Data.Aeson.QQ.Simple
80
92
81 Data.Aeson.Encoding.Internal
93 Data.Aeson.Encoding.Internal
82 Data.Aeson.Internal
94 Data.Aeson.Internal
83 Data.Aeson.Internal.Time
95 Data.Aeson.Internal.Time
84− Data.Aeson.Parser.Internal
85
96
86 -- Deprecated modules
97 -- Deprecated modules
87 exposed-modules:
98 exposed-modules:
@@ -90,6 +101,7 @@ library
90 other-modules:
101 other-modules:
91 Data.Aeson.Encoding.Builder
102 Data.Aeson.Encoding.Builder
92 Data.Aeson.Internal.Functions
103 Data.Aeson.Internal.Functions
104+ Data.Aeson.Parser.Internal
93 Data.Aeson.Parser.Unescape
105 Data.Aeson.Parser.Unescape
94 Data.Aeson.Parser.Time
106 Data.Aeson.Parser.Time
95 Data.Aeson.Types.FromJSON
107 Data.Aeson.Types.FromJSON
@@ -97,62 +109,43 @@ library
97 Data.Aeson.Types.ToJSON
109 Data.Aeson.Types.ToJSON
98 Data.Aeson.Types.Class
110 Data.Aeson.Types.Class
99 Data.Aeson.Types.Internal
111 Data.Aeson.Types.Internal
100− Data.Attoparsec.Time
101− Data.Attoparsec.Time.Internal
102−
103− -- GHC bundled libs
104− build-depends:
105− base >= 4.7.0.0 && < 5,
106− bytestring >= 0.10.4.0 && < 0.11,
107− containers >= 0.5.5.1 && < 0.7,
108− deepseq >= 1.3.0.0 && < 1.5,
109− ghc-prim >= 0.2 && < 0.6,
110− template-haskell >= 2.9.0.0 && < 2.16,
111− text >= 1.2.3.0 && < 1.3,
112− time >= 1.4 && < 1.10
113−
114− if impl(ghc >= 8.0)
115− build-depends: bytestring >= 0.10.8.1
116
112
117− -- Compat
118 build-depends:
113 build-depends:
119− base-compat >= 0.9.1 && < 0.12,
114+ attoparsec >= 0.13.0.1,
115+ base >= 4.5 && < 5,
120− time-compat >= 1.9.2.2 && < 1.10
116+ base-compat >= 0.9.1 && < 0.10,
117+ containers >= 0.4.2,
118+ deepseq >= 1.3 && < 1.5,
119+ dlist >= 0.6,
120+ ghc-prim >= 0.2,
121+ hashable >= 1.1.2.0,
122+ scientific >= 0.3.4.7 && < 0.4,
123+ tagged >=0.8.3 && <0.9,
124+ template-haskell >= 2.7,
125+ text >= 1.1.1.0,
126+ time >= 1.1.1.4,
127+ time-locale-compat >= 0.1.1 && < 0.2,
128+ unordered-containers >= 0.2.5.0 && < 0.3,
129+ uuid-types >= 1.0.3 && <1.1,
130+ vector >= 0.8
121
131
122− if !impl(ghc >= 8.6)
132+ if flag(bytestring-builder)
123− build-depends:
133+ build-depends: bytestring >= 0.9.2 && < 0.10.4,
124− contravariant >=1.4.1 && <1.6
134+ bytestring-builder >= 0.10.4 && < 1
135+ else
136+ build-depends: bytestring >= 0.10.4 && < 0.11
125
137
126 if !impl(ghc >= 8.0)
138 if !impl(ghc >= 8.0)
127 -- `Data.Semigroup` and `Control.Monad.Fail` and `Control.Monad.IO.Class` are available in base only since GHC 8.0 / base 4.9
139 -- `Data.Semigroup` and `Control.Monad.Fail` and `Control.Monad.IO.Class` are available in base only since GHC 8.0 / base 4.9
128 build-depends:
140 build-depends:
129− semigroups >= 0.18.5 && < 0.20,
141+ semigroups >= 0.18.2 && < 0.19,
130− transformers >= 0.3.0.0 && < 0.6,
142+ transformers >= 0.2.2.0,
131− transformers-compat >= 0.6.2 && < 0.7,
143+ transformers-compat >= 0.3,
132 fail == 4.9.*
144 fail == 4.9.*
133
145
134 if !impl(ghc >= 7.10)
146 if !impl(ghc >= 7.10)
135 -- `Numeric.Natural` is available in base only since GHC 7.10 / base 4.8
147 -- `Numeric.Natural` is available in base only since GHC 7.10 / base 4.8
136− build-depends: nats >= 1.1.1 && < 1.2,
148+ build-depends: nats >= 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
156
149
157 ghc-options: -Wall
150 ghc-options: -Wall
158
151
@@ -195,49 +188,42 @@ test-suite tests
195 Functions
188 Functions
196 Instances
189 Instances
197 Options
190 Options
198− PropUtils
199 Properties
191 Properties
200− PropertyGeneric
201− PropertyKeys
202− PropertyRoundTrip
203− PropertyRTFunctors
204− PropertyTH
205 SerializationFormatSpec
192 SerializationFormatSpec
206 Types
193 Types
207 UnitTests
194 UnitTests
208 UnitTests.NullaryConstructors
195 UnitTests.NullaryConstructors
209
196
210 build-depends:
197 build-depends:
198+ HUnit,
211− QuickCheck >= 2.10.0.1 && < 2.14,
199+ QuickCheck >= 2.8 && <2.9.3,
212 aeson,
200 aeson,
213 integer-logarithms >= 1 && <1.1,
201 integer-logarithms >= 1 && <1.1,
214 attoparsec,
202 attoparsec,
215 base,
203 base,
216 base-compat,
204 base-compat,
217− base-orphans >= 0.5.3 && <0.9,
205+ base-orphans >= 0.5.3 && <0.6,
218 base16-bytestring,
206 base16-bytestring,
219 containers,
207 containers,
220 directory,
208 directory,
221 dlist,
209 dlist,
222− Diff >= 0.4 && < 0.5,
223 filepath,
210 filepath,
224− generic-deriving >= 1.10 && < 1.14,
211+ generic-deriving >= 1.10 && < 1.12,
225 ghc-prim >= 0.2,
212 ghc-prim >= 0.2,
226 hashable >= 1.2.4.0,
213 hashable >= 1.2.4.0,
227 scientific,
214 scientific,
228 tagged,
215 tagged,
229 template-haskell,
216 template-haskell,
230− tasty,
217+ test-framework,
231− tasty-golden,
218+ test-framework-hunit,
232− tasty-hunit,
219+ test-framework-quickcheck2,
233− tasty-quickcheck,
234 text,
220 text,
235 time,
221 time,
236− time-compat,
222+ time-locale-compat,
237 unordered-containers,
223 unordered-containers,
238 uuid-types,
224 uuid-types,
239 vector,
225 vector,
240− quickcheck-instances >= 0.3.21 && <0.4
226+ quickcheck-instances >=0.3.12
241
227
242 if flag(bytestring-builder)
228 if flag(bytestring-builder)
243 build-depends: bytestring >= 0.9 && < 0.10.4,
229 build-depends: bytestring >= 0.9 && < 0.10.4,
@@ -247,13 +233,12 @@ test-suite tests
247
233
248 if !impl(ghc >= 8.0)
234 if !impl(ghc >= 8.0)
249 build-depends:
235 build-depends:
250− semigroups >= 0.18.2 && < 0.20,
236+ semigroups >= 0.18.2 && < 0.19,
251 transformers >= 0.2.2.0,
237 transformers >= 0.2.2.0,
252 transformers-compat >= 0.3
238 transformers-compat >= 0.3
253
239
254 if !impl(ghc >= 7.10)
240 if !impl(ghc >= 7.10)
255− build-depends: nats >=1 && <1.2,
241+ build-depends: nats >=1 && <1.2
256− void >=0.7.2 && <0.8
257
242
258 if impl(ghc >= 7.8)
243 if impl(ghc >= 7.8)
259 build-depends: hashable-time >= 0.2 && <0.3
244 build-depends: hashable-time >= 0.2 && <0.3
attoparsec-iso8601/Data/Attoparsec/Time.hsdeleted−148
@@ -1,148 +0,0 @@
1−{-# LANGUAGE BangPatterns #-}
2−{-# LANGUAGE NoImplicitPrelude #-}
3−{-# LANGUAGE ScopedTypeVariables #-}
4−-- |
5−-- Module: Data.Aeson.Parser.Time
6−-- Copyright: (c) 2015-2016 Bryan O'Sullivan
7−-- License: BSD3
8−-- Maintainer: Bryan O'Sullivan <bos@serpentine.com>
9−-- Stability: experimental
10−-- Portability: portable
11−--
12−-- Parsers for parsing dates and times.
13−
14−module Data.Attoparsec.Time
15− (
16− day
17− , localTime
18− , timeOfDay
19− , timeZone
20− , utcTime
21− , zonedTime
22− ) where
23−
24−import Prelude.Compat
25−
26−import Control.Applicative ((<|>))
27−import Control.Monad (void, when)
28−import Data.Attoparsec.Text as A
29−import Data.Attoparsec.Time.Internal (toPico)
30−import Data.Bits ((.&.))
31−import Data.Char (isDigit, ord)
32−import Data.Fixed (Pico)
33−import Data.Int (Int64)
34−import Data.Maybe (fromMaybe)
35−import Data.Time.Calendar (Day, fromGregorianValid)
36−import Data.Time.Clock (UTCTime(..))
37−import qualified Data.Text as T
38−import qualified Data.Time.LocalTime as Local
39−
40−-- | Parse a date of the form @[+,-]YYYY-MM-DD@.
41−day :: Parser Day
42−day = do
43− absOrNeg <- negate <$ char '-' <|> id <$ char '+' <|> pure id
44− y <- (decimal <* char '-') <|> fail "date must be of form [+,-]YYYY-MM-DD"
45− m <- (twoDigits <* char '-') <|> fail "date must be of form [+,-]YYYY-MM-DD"
46− d <- twoDigits <|> fail "date must be of form [+,-]YYYY-MM-DD"
47− maybe (fail "invalid date") return (fromGregorianValid (absOrNeg y) m d)
48−
49−-- | Parse a two-digit integer (e.g. day of month, hour).
50−twoDigits :: Parser Int
51−twoDigits = do
52− a <- digit
53− b <- digit
54− let c2d c = ord c .&. 15
55− return $! c2d a * 10 + c2d b
56−
57−-- | Parse a time of the form @HH:MM[:SS[.SSS]]@.
58−timeOfDay :: Parser Local.TimeOfDay
59−timeOfDay = do
60− h <- twoDigits
61− m <- char ':' *> twoDigits
62− s <- option 0 (char ':' *> seconds)
63− if h < 24 && m < 60 && s < 61
64− then return (Local.TimeOfDay h m s)
65− else fail "invalid time"
66−
67−data T = T {-# UNPACK #-} !Int {-# UNPACK #-} !Int64
68−
69−-- | Parse a count of seconds, with the integer part being two digits
70−-- long.
71−seconds :: Parser Pico
72−seconds = do
73− real <- twoDigits
74− mc <- peekChar
75− case mc of
76− Just '.' -> do
77− t <- anyChar *> takeWhile1 isDigit
78− return $! parsePicos real t
79− _ -> return $! fromIntegral real
80− where
81− parsePicos a0 t = toPico (fromIntegral (t' * 10^n))
82− where T n t' = T.foldl' step (T 12 (fromIntegral a0)) t
83− step ma@(T m a) c
84− | m <= 0 = ma
85− | otherwise = T (m-1) (10 * a + fromIntegral (ord c) .&. 15)
86−
87−-- | Parse a time zone, and return 'Nothing' if the offset from UTC is
88−-- zero. (This makes some speedups possible.)
89−timeZone :: Parser (Maybe Local.TimeZone)
90−timeZone = do
91− let maybeSkip c = do ch <- peekChar'; when (ch == c) (void anyChar)
92− maybeSkip ' '
93− ch <- satisfy $ \c -> c == 'Z' || c == '+' || c == '-'
94− if ch == 'Z'
95− then return Nothing
96− else do
97− h <- twoDigits
98− mm <- peekChar
99− m <- case mm of
100− Just ':' -> anyChar *> twoDigits
101− Just d | isDigit d -> twoDigits
102− _ -> return 0
103− let off | ch == '-' = negate off0
104− | otherwise = off0
105− off0 = h * 60 + m
106− case undefined of
107− _ | off == 0 ->
108− return Nothing
109− | off < -720 || off > 840 || m > 59 ->
110− fail "invalid time zone offset"
111− | otherwise ->
112− let !tz = Local.minutesToTimeZone off
113− in return (Just tz)
114−
115−-- | Parse a date and time, of the form @YYYY-MM-DD HH:MM[:SS[.SSS]]@.
116−-- The space may be replaced with a @T@. The number of seconds is optional
117−-- and may be followed by a fractional component.
118−localTime :: Parser Local.LocalTime
119−localTime = Local.LocalTime <$> day <* daySep <*> timeOfDay
120− where daySep = satisfy (\c -> c == 'T' || c == ' ')
121−
122−-- | Behaves as 'zonedTime', but converts any time zone offset into a
123−-- UTC time.
124−utcTime :: Parser UTCTime
125−utcTime = do
126− lt@(Local.LocalTime d t) <- localTime
127− mtz <- timeZone
128− case mtz of
129− Nothing -> let !tt = Local.timeOfDayToTime t
130− in return (UTCTime d tt)
131− Just tz -> return $! Local.localTimeToUTC tz lt
132−
133−-- | Parse a date with time zone info. Acceptable formats:
134−--
135−-- @YYYY-MM-DD HH:MM Z@
136−-- @YYYY-MM-DD HH:MM:SS Z@
137−-- @YYYY-MM-DD HH:MM:SS.SSS Z@
138−--
139−-- The first space may instead be a @T@, and the second space is
140−-- optional. The @Z@ represents UTC. The @Z@ may be replaced with a
141−-- time zone offset of the form @+0000@ or @-08:00@, where the first
142−-- two digits are hours, the @:@ is optional and the second two digits
143−-- (also optional) are minutes.
144−zonedTime :: Parser Local.ZonedTime
145−zonedTime = Local.ZonedTime <$> localTime <*> (fromMaybe utc <$> timeZone)
146−
147−utc :: Local.TimeZone
148−utc = Local.TimeZone 0 False ""
attoparsec-iso8601/Data/Attoparsec/Time/Internal.hsdeleted−64
@@ -1,64 +0,0 @@
1−{-# LANGUAGE CPP #-}
2−{-# LANGUAGE NoImplicitPrelude #-}
3−-- |
4−-- Module: Data.Aeson.Internal.Time
5−-- Copyright: (c) 2015-2016 Bryan O'Sullivan
6−-- License: BSD3
7−-- Maintainer: Bryan O'Sullivan <bos@serpentine.com>
8−-- Stability: experimental
9−-- Portability: portable
10−
11−module Data.Attoparsec.Time.Internal
12− (
13− TimeOfDay64(..)
14− , fromPico
15− , toPico
16− , diffTimeOfDay64
17− , toTimeOfDay64
18− ) where
19−
20−import Prelude.Compat
21−
22−import Data.Int (Int64)
23−import Data.Time
24−import Unsafe.Coerce (unsafeCoerce)
25−
26−#if MIN_VERSION_time(1,6,0)
27−
28−import Data.Time.Clock (diffTimeToPicoseconds)
29−
30−#endif
31−
32−import Data.Fixed (Pico, Fixed(MkFixed))
33−
34−#if !MIN_VERSION_time(1,6,0)
35−
36−diffTimeToPicoseconds :: DiffTime -> Integer
37−diffTimeToPicoseconds = unsafeCoerce
38−
39−#endif
40−
41−toPico :: Integer -> Pico
42−toPico = MkFixed
43−
44−fromPico :: Pico -> Integer
45−fromPico (MkFixed i) = i
46−
47−-- | Like TimeOfDay, but using a fixed-width integer for seconds.
48−data TimeOfDay64 = TOD {-# UNPACK #-} !Int
49− {-# UNPACK #-} !Int
50− {-# UNPACK #-} !Int64
51−
52−posixDayLength :: DiffTime
53−posixDayLength = 86400
54−
55−diffTimeOfDay64 :: DiffTime -> TimeOfDay64
56−diffTimeOfDay64 t
57− | t >= posixDayLength = TOD 23 59 (60000000000000 + pico (t - posixDayLength))
58− | otherwise = TOD (fromIntegral h) (fromIntegral m) s
59− where (h,mp) = pico t `quotRem` 3600000000000000
60− (m,s) = mp `quotRem` 60000000000000
61− pico = fromIntegral . diffTimeToPicoseconds
62−
63−toTimeOfDay64 :: TimeOfDay -> TimeOfDay64
64−toTimeOfDay64 (TimeOfDay h m s) = TOD h m (fromIntegral (fromPico s))
attoparsec-iso8601/LICENSEdeleted−30
@@ -1,30 +0,0 @@
1−Copyright (c) 2011, MailRank, Inc.
2−
3−All rights reserved.
4−
5−Redistribution and use in source and binary forms, with or without
6−modification, are permitted provided that the following conditions
7−are met:
8−
9−1. Redistributions of source code must retain the above copyright
10− notice, this list of conditions and the following disclaimer.
11−
12−2. Redistributions in binary form must reproduce the above copyright
13− notice, this list of conditions and the following disclaimer in the
14− documentation and/or other materials provided with the distribution.
15−
16−3. Neither the name of the author nor the names of his contributors
17− may be used to endorse or promote products derived from this software
18− without specific prior written permission.
19−
20−THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND ANY EXPRESS
21−OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
22−WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
23−DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
24−ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25−DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26−OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27−HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
28−STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
29−ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30−POSSIBILITY OF SUCH DAMAGE.
attoparsec-iso8601/README.mddeleted−19
@@ -1,19 +0,0 @@
1−Parsing of ISO 8601 dates.
2−
3−This package is used to parse dates in aeson. It is split into a
4−separate package to be shared by other projects that want to parse
5−dates like aeson does.
6−
7−For now, this project is located in the aeson repository and aeson
8−itself uses the source of this package without pulling in the package
9−as a dependency.
10−
11−## Stability
12−
13−Since aeson depends on this package we want to be very careful about
14−changing the format.
15−
16−There may be breaking changes if we find that the format is
17−incorrectly too lenient. We consider widening of the allowed input a
18−non-breaking addition since all previously valid input will still
19−parse correctly.
attoparsec-iso8601/attoparsec-iso8601.cabaldeleted−55
@@ -1,55 +0,0 @@
1−name: attoparsec-iso8601
2−version: 1.0.1.0
3−synopsis: Parsing of ISO 8601 dates, originally from aeson.
4−description: Parsing of ISO 8601 dates, originally from aeson.
5−license: BSD3
6−license-file: LICENSE
7−category: Parsing
8−copyright: (c) 2011-2016 Bryan O'Sullivan
9− (c) 2011 MailRank, Inc.
10−author: Bryan O'Sullivan <bos@serpentine.com>
11−maintainer: Adam Bergmark <adam@bergmark.nl>
12−stability: experimental
13−cabal-version: >=1.10
14−homepage: https://github.com/bos/aeson
15−bug-reports: https://github.com/bos/aeson/issues
16−build-type: Simple
17−extra-source-files:
18− README.md
19−
20−flag developer
21− description: operate in developer mode
22− default: False
23− manual: True
24−
25−flag fast
26− description: compile without optimizations
27− default: False
28− manual: True
29−
30−library
31− hs-source-dirs: .
32− default-language: Haskell2010
33− ghc-options: -Wall
34− exposed-modules:
35− Data.Attoparsec.Time.Internal
36− Data.Attoparsec.Time
37− build-depends:
38− attoparsec >= 0.13.0.1,
39− base >= 4.7 && < 5,
40− base-compat >= 0.9.1 && < 0.12,
41− text >= 1.1.1.0,
42− time >= 1.1.1.4
43−
44− if flag(fast)
45− ghc-options: -O0
46− else
47− ghc-options: -O2
48−
49− if flag(developer)
50− ghc-options: -Werror
51− ghc-prof-options: -auto-all
52−
53−source-repository head
54− type: git
55− location: git://github.com/bos/aeson.git
attoparsec-iso8601/changelog.mddeleted−5
@@ -1,5 +0,0 @@
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.hsnew file+229
@@ -0,0 +1,229 @@
1+{-# LANGUAGE DeriveDataTypeable #-}
2+{-# LANGUAGE DeriveGeneric #-}
3+{-# LANGUAGE TemplateHaskell #-}
4+
5+module Main (main) where
6+
7+import Prelude ()
8+import Prelude.Compat
9+
10+import Control.DeepSeq (NFData, rnf, deepseq)
11+import Criterion.Main hiding (defaultOptions)
12+import Data.Aeson.Encode
13+import Data.Aeson.TH
14+import Data.Aeson.Types
15+import Data.Data (Data)
16+import Data.Typeable (Typeable)
17+import GHC.Generics (Generic)
18+import Options
19+import qualified Data.Aeson.Generic as G (fromJSON, toJSON)
20+
21+--------------------------------------------------------------------------------
22+
23+data D a = Nullary
24+ | Unary Int
25+ | Product String Char a
26+ | Record { testOne :: Double
27+ , testTwo :: Bool
28+ , testThree :: D a
29+ }
30+ deriving (Show, Eq, Data, Typeable)
31+
32+deriveJSON opts ''D
33+
34+instance NFData a => NFData (D a) where
35+ rnf Nullary = ()
36+ rnf (Unary n) = rnf n
37+ rnf (Product s c x) = s `deepseq` c `deepseq` rnf x
38+ rnf (Record d b y) = d `deepseq` b `deepseq` rnf y
39+
40+type T = D (D (D ()))
41+
42+d :: T
43+d = Record
44+ { testOne = 1234.56789
45+ , testTwo = True
46+ , testThree = Product "Hello World!" 'a'
47+ Record
48+ { testOne = 9876.54321
49+ , testTwo = False
50+ , testThree = Product "Yeehaa!!!" '\n' Nullary
51+ }
52+ }
53+
54+--------------------------------------------------------------------------------
55+
56+data D' a = Nullary'
57+ | Unary' Int
58+ | Product' String Char a
59+ | Record' { testOne' :: Double
60+ , testTwo' :: Bool
61+ , testThree' :: D' a
62+ }
63+ deriving (Show, Eq, Generic, Data, Typeable)
64+
65+instance ToJSON a => ToJSON (D' a) where
66+ toJSON = genericToJSON opts
67+
68+instance FromJSON a => FromJSON (D' a) where
69+ parseJSON = genericParseJSON opts
70+
71+instance NFData a => NFData (D' a) where
72+ rnf Nullary' = ()
73+ rnf (Unary' n) = rnf n
74+ rnf (Product' s c x) = s `deepseq` c `deepseq` rnf x
75+ rnf (Record' d b y) = d `deepseq` b `deepseq` rnf y
76+
77+type T' = D' (D' (D' ()))
78+
79+d' :: T'
80+d' = Record'
81+ { testOne' = 1234.56789
82+ , testTwo' = True
83+ , testThree' = Product' "Hello World!" 'a'
84+ Record'
85+ { testOne' = 9876.54321
86+ , testTwo' = False
87+ , testThree' = Product' "Yeehaa!!!" '\n' Nullary'
88+ }
89+ }
90+
91+--------------------------------------------------------------------------------
92+
93+data BigRecord = BigRecord
94+ { field01 :: !Int, field02 :: !Int, field03 :: !Int, field04 :: !Int, field05 :: !Int
95+ , field06 :: !Int, field07 :: !Int, field08 :: !Int, field09 :: !Int, field10 :: !Int
96+ , field11 :: !Int, field12 :: !Int, field13 :: !Int, field14 :: !Int, field15 :: !Int
97+ , field16 :: !Int, field17 :: !Int, field18 :: !Int, field19 :: !Int, field20 :: !Int
98+ , field21 :: !Int, field22 :: !Int, field23 :: !Int, field24 :: !Int, field25 :: !Int
99+ } deriving (Show, Eq, Generic, Data, Typeable)
100+
101+instance NFData BigRecord
102+
103+bigRecord = BigRecord 1 2 3 4 5
104+ 6 7 8 9 10
105+ 11 12 13 14 15
106+ 16 17 18 19 20
107+ 21 22 23 24 25
108+
109+gBigRecordToJSON :: BigRecord -> Value
110+gBigRecordToJSON = genericToJSON opts
111+
112+gBigRecordFromJSON :: Value -> Result BigRecord
113+gBigRecordFromJSON = parse $ genericParseJSON opts
114+
115+thBigRecordToJSON :: BigRecord -> Value
116+thBigRecordToJSON = $(mkToJSON opts ''BigRecord)
117+
118+thBigRecordFromJSON :: Value -> Result BigRecord
119+thBigRecordFromJSON = parse $(mkParseJSON opts ''BigRecord)
120+
121+--------------------------------------------------------------------------------
122+
123+data BigProduct = BigProduct
124+ !Int !Int !Int !Int !Int
125+ !Int !Int !Int !Int !Int
126+ !Int !Int !Int !Int !Int
127+ !Int !Int !Int !Int !Int
128+ !Int !Int !Int !Int !Int
129+ deriving (Show, Eq, Generic, Data, Typeable)
130+
131+instance NFData BigProduct
132+
133+bigProduct = BigProduct 1 2 3 4 5
134+ 6 7 8 9 10
135+ 11 12 13 14 15
136+ 16 17 18 19 20
137+ 21 22 23 24 25
138+
139+gBigProductToJSON :: BigProduct -> Value
140+gBigProductToJSON = genericToJSON opts
141+
142+gBigProductFromJSON :: Value -> Result BigProduct
143+gBigProductFromJSON = parse $ genericParseJSON opts
144+
145+thBigProductToJSON :: BigProduct -> Value
146+thBigProductToJSON = $(mkToJSON opts ''BigProduct)
147+
148+thBigProductFromJSON :: Value -> Result BigProduct
149+thBigProductFromJSON = parse $(mkParseJSON opts ''BigProduct)
150+
151+--------------------------------------------------------------------------------
152+
153+data BigSum = F01 | F02 | F03 | F04 | F05
154+ | F06 | F07 | F08 | F09 | F10
155+ | F11 | F12 | F13 | F14 | F15
156+ | F16 | F17 | F18 | F19 | F20
157+ | F21 | F22 | F23 | F24 | F25
158+ deriving (Show, Eq, Generic, Data, Typeable)
159+
160+instance NFData BigSum
161+
162+bigSum = F25
163+
164+gBigSumToJSON :: BigSum -> Value
165+gBigSumToJSON = genericToJSON opts
166+
167+gBigSumFromJSON :: Value -> Result BigSum
168+gBigSumFromJSON = parse $ genericParseJSON opts
169+
170+thBigSumToJSON :: BigSum -> Value
171+thBigSumToJSON = $(mkToJSON opts ''BigSum)
172+
173+thBigSumFromJSON :: Value -> Result BigSum
174+thBigSumFromJSON = parse $(mkParseJSON opts ''BigSum)
175+
176+--------------------------------------------------------------------------------
177+
178+type FJ a = Value -> Result a
179+
180+main :: IO ()
181+main = defaultMain
182+ [ let v = toJSON d
183+ in (d, d', v) `deepseq`
184+ bgroup "D"
185+ [ group "toJSON" (nf toJSON d)
186+ (nf G.toJSON d)
187+ (nf toJSON d')
188+ , group "fromJSON" (nf ( fromJSON :: FJ T ) v)
189+ (nf (G.fromJSON :: FJ T ) v)
190+ (nf ( fromJSON :: FJ T') v)
191+ ]
192+ , let v = thBigRecordToJSON bigRecord
193+ in bigRecord `deepseq` v `deepseq`
194+ bgroup "BigRecord"
195+ [ group "toJSON" (nf thBigRecordToJSON bigRecord)
196+ (nf G.toJSON bigRecord)
197+ (nf gBigRecordToJSON bigRecord)
198+ , group "fromJSON" (nf (thBigRecordFromJSON :: FJ BigRecord) v)
199+ (nf (G.fromJSON :: FJ BigRecord) v)
200+ (nf (gBigRecordFromJSON :: FJ BigRecord) v)
201+ ]
202+ , let v = thBigProductToJSON bigProduct
203+ in bigProduct `deepseq` v `deepseq`
204+ bgroup "BigProduct"
205+ [ group "toJSON" (nf thBigProductToJSON bigProduct)
206+ (nf G.toJSON bigProduct)
207+ (nf gBigProductToJSON bigProduct)
208+ , group "fromJSON" (nf (thBigProductFromJSON :: FJ BigProduct) v)
209+ (nf (G.fromJSON :: FJ BigProduct) v)
210+ (nf (gBigProductFromJSON :: FJ BigProduct) v)
211+ ]
212+ , let v = thBigSumToJSON bigSum
213+ in bigSum `deepseq` v `deepseq`
214+ bgroup "BigSum"
215+ [ group "toJSON" (nf thBigSumToJSON bigSum)
216+ (nf G.toJSON bigSum)
217+ (nf gBigSumToJSON bigSum)
218+ , group "fromJSON" (nf (thBigSumFromJSON :: FJ BigSum) v)
219+ (nf (G.fromJSON :: FJ BigSum) v)
220+ (nf (gBigSumFromJSON :: FJ BigSum) v)
221+ ]
222+ ]
223+
224+group n th syb gen = bcompare
225+ [ bgroup n [ bench "th" th
226+ , bench "syb" syb
227+ , bench "generic" gen
228+ ]
229+ ]
benchmarks/AesonEncode.hs+2−2
@@ -1,13 +1,13 @@
1{-# LANGUAGE BangPatterns #-}
1{-# LANGUAGE BangPatterns #-}
2−{-# LANGUAGE NoImplicitPrelude #-}
3{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE OverloadedStrings #-}
4
3
5module Main (main) where
4module Main (main) where
6
5
6+import Prelude ()
7import Prelude.Compat
7import Prelude.Compat
8
8
9import Control.DeepSeq
9import Control.DeepSeq
10−import Control.Monad (forM_)
10+import Control.Monad
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+42−14
@@ -1,14 +1,16 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
2{-# LANGUAGE OverloadedStrings #-}
1{-# 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 ()
8import Prelude.Compat
9import Prelude.Compat
9
10
10import Data.Foldable (toList)
11import Data.Foldable (toList)
11−import qualified Data.Aeson as A
12+import qualified "aeson" Data.Aeson as A
13+import qualified "aeson-benchmarks" Data.Aeson as B
12import qualified Data.Sequence as S
14import qualified Data.Sequence as S
13import qualified Data.Vector as V
15import qualified Data.Vector as V
14import qualified Data.Vector.Unboxed as U
16import qualified Data.Vector.Unboxed as U
@@ -19,6 +21,10 @@ import qualified Data.Vector.Unboxed as U
19
21
20newtype L f = L { getL :: f Int }
22newtype L f = L { getL :: f Int }
21
23
24+instance Foldable f => B.ToJSON (L f) where
25+ toJSON = error "do not use this"
26+ toEncoding = B.toEncoding . toList . getL
27+
22instance Foldable f => A.ToJSON (L f) where
28instance Foldable f => A.ToJSON (L f) where
23 toJSON = error "do not use this"
29 toJSON = error "do not use this"
24 toEncoding = A.toEncoding . toList . getL
30 toEncoding = A.toEncoding . toList . getL
@@ -29,6 +35,10 @@ instance Foldable f => A.ToJSON (L f) where
29
35
30newtype F f = F { getF :: f Int }
36newtype F f = F { getF :: f Int }
31
37
38+instance Foldable f => B.ToJSON (F f) where
39+ toJSON = error "do not use this"
40+ toEncoding = B.foldable . getF
41+
32instance Foldable f => A.ToJSON (F f) where
42instance Foldable f => A.ToJSON (F f) where
33 toJSON = error "do not use this"
43 toJSON = error "do not use this"
34 toEncoding = A.foldable . getF
44 toEncoding = A.foldable . getF
@@ -53,34 +63,52 @@ valueUVector = U.fromList valueList
53-- Main
63-- Main
54-------------------------------------------------------------------------------
64-------------------------------------------------------------------------------
55
65
56−benchEncode
66+benchEncodeA
57 :: A.ToJSON a
67 :: A.ToJSON a
58 => String
68 => String
59 -> a
69 -> a
60 -> Benchmark
70 -> Benchmark
61−benchEncode name val
71+benchEncodeA name val
62 = bench ("A " ++ name) $ nf A.encode val
72 = bench ("A " ++ name) $ nf A.encode val
63
73
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+
64main :: IO ()
82main :: IO ()
65main = defaultMain
83main = defaultMain
66 [ bgroup "encode"
84 [ bgroup "encode"
67 [ bgroup "List"
85 [ bgroup "List"
68− [ benchEncode "-" valueList
86+ [ benchEncodeB "-" valueList
69− , benchEncode "L" $ L valueList
87+ , benchEncodeB "L" $ L valueList
88+ , benchEncodeB "F" $ F valueList
89+ , benchEncodeA "-" valueList
90+ , benchEncodeA "L" $ L valueList
70− , benchEncode "F" $ F valueList
91+ , benchEncodeA "F" $ F valueList
71 ]
92 ]
72 , bgroup "Seq"
93 , bgroup "Seq"
73− [ benchEncode "-" valueSeq
94+ [ benchEncodeB "-" valueSeq
74− , benchEncode "L" $ L valueSeq
95+ , benchEncodeB "L" $ L valueSeq
96+ , benchEncodeB "F" $ F valueSeq
97+ , benchEncodeA "-" valueSeq
98+ , benchEncodeA "L" $ L valueSeq
75− , benchEncode "F" $ F valueSeq
99+ , benchEncodeA "F" $ F valueSeq
76 ]
100 ]
77 , bgroup "Vector"
101 , bgroup "Vector"
78− [ benchEncode "-" valueVector
102+ [ benchEncodeB "-" valueVector
79− , benchEncode "L" $ L valueVector
103+ , benchEncodeB "L" $ L valueVector
104+ , benchEncodeB "F" $ F valueVector
105+ , benchEncodeA "-" valueVector
106+ , benchEncodeA "L" $ L valueVector
80− , benchEncode "F" $ F valueVector
107+ , benchEncodeA "F" $ F valueVector
81 ]
108 ]
82 , bgroup "Vector.Unboxed"
109 , bgroup "Vector.Unboxed"
110+ [ benchEncodeB "-" valueUVector
83− [ benchEncode "-" valueUVector
111+ , benchEncodeA "-" valueUVector
84 ]
112 ]
85 ]
113 ]
86 ]
114 ]
benchmarks/AesonMap.hs+56−39
@@ -1,11 +1,13 @@
1{-# LANGUAGE FlexibleContexts #-}
1{-# LANGUAGE FlexibleContexts #-}
2−{-# LANGUAGE NoImplicitPrelude #-}
2+{-# LANGUAGE OverloadedStrings #-}
3+{-# LANGUAGE PackageImports #-}
3{-# LANGUAGE RankNTypes #-}
4{-# LANGUAGE RankNTypes #-}
4
5
5{-# OPTIONS_GHC -fno-warn-orphans #-}
6{-# OPTIONS_GHC -fno-warn-orphans #-}
6
7
7module Main (main) where
8module Main (main) where
8
9
10+import Prelude ()
9import Prelude.Compat
11import Prelude.Compat
10
12
11import Control.DeepSeq
13import Control.DeepSeq
@@ -13,8 +15,9 @@ import Criterion.Main
13import Data.Hashable
15import Data.Hashable
14import Data.Proxy (Proxy (..))
16import Data.Proxy (Proxy (..))
15import Data.Tagged (Tagged (..))
17import Data.Tagged (Tagged (..))
16−import Data.Aeson
18+import qualified "aeson" Data.Aeson as A
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)
18import qualified Data.ByteString.Lazy as LBS
21import qualified Data.ByteString.Lazy as LBS
19import qualified Data.HashMap.Strict as HM
22import qualified Data.HashMap.Strict as HM
20import qualified Data.Map as M
23import qualified Data.Map as M
@@ -44,10 +47,10 @@ instance NFData T1 where
44instance Hashable T1 where
47instance Hashable T1 where
45 hashWithSalt salt (T1 t) = hashWithSalt salt t
48 hashWithSalt salt (T1 t) = hashWithSalt salt t
46
49
47−instance FromJSON T1 where
50+instance B.FromJSON T1 where
48− parseJSON = withText "T1" $ pure . T1
51+ parseJSON = B.withText "T1" $ pure . T1
49−instance FromJSONKey T1 where
52+instance B.FromJSONKey T1 where
50− fromJSONKey = FromJSONKeyText T1
53+ fromJSONKey = B.FromJSONKeyText T1
51
54
52-------------------------------------------------------------------------------
55-------------------------------------------------------------------------------
53-- Coerce
56-- Coerce
@@ -61,10 +64,10 @@ instance NFData T2 where
61instance Hashable T2 where
64instance Hashable T2 where
62 hashWithSalt salt (T2 t) = hashWithSalt salt t
65 hashWithSalt salt (T2 t) = hashWithSalt salt t
63
66
64−instance FromJSON T2 where
67+instance B.FromJSON T2 where
65− parseJSON = withText "T2" $ pure . T2
68+ parseJSON = B.withText "T2" $ pure . T2
66−instance FromJSONKey T2 where
69+instance B.FromJSONKey T2 where
67− fromJSONKey = fromJSONKeyCoerce
70+ fromJSONKey = B.fromJSONKeyCoerce
68
71
69-------------------------------------------------------------------------------
72-------------------------------------------------------------------------------
70-- TextParser
73-- TextParser
@@ -78,10 +81,10 @@ instance NFData T3 where
78instance Hashable T3 where
81instance Hashable T3 where
79 hashWithSalt salt (T3 t) = hashWithSalt salt t
82 hashWithSalt salt (T3 t) = hashWithSalt salt t
80
83
81−instance FromJSON T3 where
84+instance B.FromJSON T3 where
82− parseJSON = withText "T3" $ pure . T3
85+ parseJSON = B.withText "T3" $ pure . T3
83−instance FromJSONKey T3 where
86+instance B.FromJSONKey T3 where
84− fromJSONKey = FromJSONKeyTextParser (pure . T3)
87+ fromJSONKey = B.FromJSONKeyTextParser (pure . T3)
85
88
86-------------------------------------------------------------------------------
89-------------------------------------------------------------------------------
87-- Values
90-- Values
@@ -94,30 +97,40 @@ value1000 = value 1000
94value10000 = value 10000
97value10000 = value 10000
95
98
96encodedValue10 :: LBS.ByteString
99encodedValue10 :: LBS.ByteString
97−encodedValue10 = encode value10
100+encodedValue10 = B.encode value10
98
101
99encodedValue100 :: LBS.ByteString
102encodedValue100 :: LBS.ByteString
100−encodedValue100 = encode value100
103+encodedValue100 = B.encode value100
101
104
102encodedValue1000 :: LBS.ByteString
105encodedValue1000 :: LBS.ByteString
103−encodedValue1000 = encode value1000
106+encodedValue1000 = B.encode value1000
104
107
105encodedValue10000 :: LBS.ByteString
108encodedValue10000 :: LBS.ByteString
106−encodedValue10000 = encode value10000
109+encodedValue10000 = B.encode value10000
107
110
108-------------------------------------------------------------------------------
111-------------------------------------------------------------------------------
109-- Helpers
112-- Helpers
110-------------------------------------------------------------------------------
113-------------------------------------------------------------------------------
111
114
112−decodeHM
115+decodeHMB
113− :: (FromJSON (HM.HashMap k T.Text), Eq k, Hashable k)
116+ :: (B.FromJSONKey k, Eq k, Hashable k)
114 => Proxy k -> LBS.ByteString -> Maybe (HM.HashMap k T.Text)
117 => Proxy k -> LBS.ByteString -> Maybe (HM.HashMap k T.Text)
115−decodeHM _ = decode
118+decodeHMB _ = B.decode
116
119
117−decodeMap
120+decodeHMA
121+ :: (A.FromJSON (HM.HashMap k T.Text), Eq k, Hashable k)
122+ => Proxy k -> LBS.ByteString -> Maybe (HM.HashMap k T.Text)
123+decodeHMA _ = A.decode
124+
125+decodeMapB
126+ :: (B.FromJSONKey k, Ord k)
127+ => Proxy k -> LBS.ByteString -> Maybe (M.Map k T.Text)
128+decodeMapB _ = B.decode
129+
130+decodeMapA
118− :: (FromJSON (M.Map k T.Text), Ord k)
131+ :: (A.FromJSON (M.Map k T.Text), Ord k)
119 => Proxy k -> LBS.ByteString -> Maybe (M.Map k T.Text)
132 => Proxy k -> LBS.ByteString -> Maybe (M.Map k T.Text)
120−decodeMap _ = decode
133+decodeMapA _ = A.decode
121
134
122proxyText :: Proxy T.Text
135proxyText :: Proxy T.Text
123proxyText = Proxy
136proxyText = Proxy
@@ -143,14 +156,15 @@ benchDecodeHM
143 -> LBS.ByteString
156 -> LBS.ByteString
144 -> Benchmark
157 -> Benchmark
145benchDecodeHM name val = bgroup name
158benchDecodeHM name val = bgroup name
146− [ bench "Text" $ nf (decodeHM proxyText) val
159+ [ bench "Text" $ nf (decodeHMB proxyText) val
147− , bench "Identity" $ nf (decodeHM proxyT1) val
160+ , bench "Identity" $ nf (decodeHMB proxyT1) val
148− , bench "Coerce" $ nf (decodeHM proxyT2) val
161+ , bench "Coerce" $ nf (decodeHMB proxyT2) val
149− , bench "Parser" $ nf (decodeHM proxyT3) val
162+ , bench "Parser" $ nf (decodeHMB 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
154 ]
168 ]
155
169
156benchDecodeMap
170benchDecodeMap
@@ -158,10 +172,11 @@ benchDecodeMap
158 -> LBS.ByteString
172 -> LBS.ByteString
159 -> Benchmark
173 -> Benchmark
160benchDecodeMap name val = bgroup name
174benchDecodeMap name val = bgroup name
161− [ bench "Text" $ nf (decodeMap proxyText) val
175+ [ bench "Text" $ nf (decodeMapB proxyText) val
162− , bench "Identity" $ nf (decodeMap proxyT1) val
176+ , bench "Identity" $ nf (decodeMapB proxyT1) val
163− , bench "Coerce" $ nf (decodeMap proxyT2) val
177+ , bench "Coerce" $ nf (decodeMapB proxyT2) val
164− , bench "Parser" $ nf (decodeMap proxyT3) val
178+ , bench "Parser" $ nf (decodeMapB proxyT3) val
179+ , bench "aeson-0.11" $ nf (decodeMapA proxyText) val
165 ]
180 ]
166
181
167benchEncodeHM
182benchEncodeHM
@@ -169,7 +184,8 @@ benchEncodeHM
169 -> HM.HashMap T.Text T.Text
184 -> HM.HashMap T.Text T.Text
170 -> Benchmark
185 -> Benchmark
171benchEncodeHM name val = bgroup name
186benchEncodeHM name val = bgroup name
172− [ bench "Text" $ nf encode val
187+ [ bench "Text" $ nf B.encode val
188+ , bench "aeson-0.11" $ nf A.encode val
173 ]
189 ]
174
190
175benchEncodeMap
191benchEncodeMap
@@ -177,7 +193,8 @@ benchEncodeMap
177 -> HM.HashMap T.Text T.Text
193 -> HM.HashMap T.Text T.Text
178 -> Benchmark
194 -> Benchmark
179benchEncodeMap name val = bgroup name
195benchEncodeMap name val = bgroup name
180− [ bench "Text" $ nf encode val'
196+ [ bench "Text" $ nf B.encode val'
197+ , bench "aeson-0.11" $ nf A.encode val'
181 ]
198 ]
182 where
199 where
183 val' :: M.Map T.Text T.Text
200 val' :: M.Map T.Text T.Text
benchmarks/AesonParse.hs+3−2
@@ -1,12 +1,13 @@
1{-# LANGUAGE BangPatterns #-}
1{-# LANGUAGE BangPatterns #-}
2−{-# LANGUAGE NoImplicitPrelude #-}
3{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE OverloadedStrings #-}
3+{-# LANGUAGE PackageImports #-}
4
4
5module Main (main) where
5module Main (main) where
6
6
7+import Prelude ()
7import Prelude.Compat
8import Prelude.Compat
8
9
9−import Data.Aeson
10+import "aeson-benchmarks" Data.Aeson
10import Control.Monad
11import Control.Monad
11import Data.Attoparsec.ByteString (IResult(..), parseWith)
12import Data.Attoparsec.ByteString (IResult(..), parseWith)
12import Data.Time.Clock
13import Data.Time.Clock
benchmarks/AesonTuples.hs+1−2
@@ -1,7 +1,6 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
2−
3module Main (main) where
1module Main (main) where
4
2
3+import Prelude ()
5import Prelude.Compat
4import Prelude.Compat
6
5
7import Control.DeepSeq (deepseq)
6import Control.DeepSeq (deepseq)
benchmarks/Auto/G/BigProduct.hsdeleted−33
@@ -1,33 +0,0 @@
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.hsdeleted−33
@@ -1,33 +0,0 @@
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.hsdeleted−28
@@ -1,28 +0,0 @@
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.hsdeleted−44
@@ -1,44 +0,0 @@
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.hsdeleted−27
@@ -1,27 +0,0 @@
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.hsdeleted−27
@@ -1,27 +0,0 @@
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.hsdeleted−22
@@ -1,22 +0,0 @@
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.hsdeleted−38
@@ -1,38 +0,0 @@
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.hsdeleted−73
@@ -1,73 +0,0 @@
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+5−10
@@ -1,25 +1,22 @@
1−{-# LANGUAGE CPP #-}
1+{-# LANGUAGE PackageImports #-}
2−{-# LANGUAGE NoImplicitPrelude #-}
3{-# LANGUAGE ScopedTypeVariables #-}
2{-# LANGUAGE ScopedTypeVariables #-}
4
3
5module Main (main) where
4module Main (main) where
6
5
6+import Prelude ()
7import Prelude.Compat
7import Prelude.Compat
8
8
9import Compare.BufferBuilder ()
9import Compare.BufferBuilder ()
10+import Compare.JsonBuilder ()
10import Criterion.Main
11import Criterion.Main
11import Data.BufferBuilder.Json
12import Data.BufferBuilder.Json
13+import Data.Json.Builder
12import Twitter
14import Twitter
13import Twitter.Manual ()
15import Twitter.Manual ()
14import Typed.Common
16import Typed.Common
15−import qualified Data.Aeson as Aeson
17+import qualified "aeson-benchmarks" Data.Aeson as Aeson
16import qualified Compare.JsonBench as JsonBench
18import qualified Compare.JsonBench as JsonBench
17
19
18−#ifdef MIN_VERSION_json_builder
19−import Data.Json.Builder
20−import Compare.JsonBuilder ()
21−#endif
22−
23main :: IO ()
20main :: IO ()
24main =
21main =
25 defaultMain [
22 defaultMain [
@@ -27,9 +24,7 @@ main =
27 bgroup "twitter" [
24 bgroup "twitter" [
28 bench "aeson" $ nf Aeson.encode twtr
25 bench "aeson" $ nf Aeson.encode twtr
29 , bench "buffer-builder" $ nf encodeJson twtr
26 , bench "buffer-builder" $ nf encodeJson twtr
30−#ifdef MIN_VERSION_json_builder
31 , bench "json-builder" $ nf toJsonLBS twtr
27 , bench "json-builder" $ nf toJsonLBS twtr
32−#endif
33 ]
28 ]
34 , JsonBench.benchmarks
29 , JsonBench.benchmarks
35 ]
30 ]
benchmarks/Compare/BufferBuilder.hs+3−2
@@ -1,4 +1,3 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
2{-# LANGUAGE OverloadedStrings #-}
1{-# LANGUAGE OverloadedStrings #-}
3{-# LANGUAGE RecordWildCards #-}
2{-# LANGUAGE RecordWildCards #-}
4
3
@@ -7,11 +6,13 @@
7
6
8module Compare.BufferBuilder () where
7module Compare.BufferBuilder () where
9
8
10−import Prelude.Compat hiding ((<>))
9+import Prelude ()
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)
15import Twitter
16import Twitter
16import qualified Data.BufferBuilder.Utf8 as UB
17import qualified Data.BufferBuilder.Utf8 as UB
17
18
benchmarks/Compare/JsonBench.hs+9−18
@@ -1,18 +1,17 @@
1−{-# LANGUAGE CPP #-}
1+-- Adapted from a buffer-builder benchmark:
2+--
3+-- https://github.com/chadaustin/buffer-builder/blob/master/test.json
4+
2{-# LANGUAGE BangPatterns #-}
5{-# LANGUAGE BangPatterns #-}
3{-# LANGUAGE MagicHash #-}
6{-# LANGUAGE MagicHash #-}
4−{-# LANGUAGE NoImplicitPrelude #-}
5{-# LANGUAGE OverloadedStrings #-}
7{-# LANGUAGE OverloadedStrings #-}
6{-# LANGUAGE RecordWildCards #-}
8{-# LANGUAGE RecordWildCards #-}
7{-# LANGUAGE ScopedTypeVariables #-}
9{-# LANGUAGE ScopedTypeVariables #-}
8
10
9−-- Adapted from a buffer-builder benchmark:
10−--
11−-- https://github.com/chadaustin/buffer-builder/blob/master/test.json
12−
13module Compare.JsonBench (benchmarks) where
11module Compare.JsonBench (benchmarks) where
14
12
15−import Prelude.Compat hiding ((<>))
13+import Prelude ()
14+import Prelude.Compat
16
15
17import Control.DeepSeq (NFData(..))
16import Control.DeepSeq (NFData(..))
18import Criterion
17import Criterion
@@ -20,13 +19,9 @@ import Data.Aeson ((.:))
20import Data.Monoid ((<>))
19import Data.Monoid ((<>))
21import Data.Text (Text)
20import Data.Text (Text)
22import Typed.Common (load)
21import Typed.Common (load)
23−import qualified Control.Monad.Fail as Fail
24import qualified Data.Aeson as Aeson
22import qualified Data.Aeson as Aeson
25import qualified Data.BufferBuilder.Json as Json
23import qualified Data.BufferBuilder.Json as Json
26−
27−#ifdef MIN_VERSION_json_builder
28import qualified Data.Json.Builder as JB
24import qualified Data.Json.Builder as JB
29−#endif
30
25
31data EyeColor = Green | Blue | Brown
26data EyeColor = Green | Blue | Brown
32 deriving (Eq, Show)
27 deriving (Eq, Show)
@@ -69,10 +64,10 @@ instance NFData Gender where rnf !_ = ()
69instance NFData Fruit where rnf !_ = ()
64instance NFData Fruit where rnf !_ = ()
70
65
71instance NFData Friend where
66instance NFData Friend where
72− rnf Friend {..} = rnf fId `seq` rnf fName
67+ rnf Friend {..} = rnf fId `seq` rnf fName `seq` ()
73
68
74instance NFData User where
69instance NFData User where
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
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` ()
76
71
77eyeColorTable :: [(Text, EyeColor)]
72eyeColorTable :: [(Text, EyeColor)]
78eyeColorTable = [("brown", Brown), ("green", Green), ("blue", Blue)]
73eyeColorTable = [("brown", Brown), ("green", Green), ("blue", Blue)]
@@ -83,7 +78,7 @@ genderTable = [("male", Male), ("female", Female)]
83fruitTable :: [(Text, Fruit)]
78fruitTable :: [(Text, Fruit)]
84fruitTable = [("apple", Apple), ("strawberry", Strawberry), ("banana", Banana)]
79fruitTable = [("apple", Apple), ("strawberry", Strawberry), ("banana", Banana)]
85
80
86−enumFromJson :: Fail.MonadFail m => String -> [(Text, enum)] -> (json -> m Text) -> json -> m enum
81+enumFromJson :: Monad m => String -> [(Text, enum)] -> (json -> m Text) -> json -> m enum
87enumFromJson enumName table extract v = do
82enumFromJson enumName table extract v = do
88 s <- extract v
83 s <- extract v
89 case lookup s table of
84 case lookup s table of
@@ -273,7 +268,6 @@ instance Json.ToJson User where
273 <> "greeting"# Json..=# uGreeting
268 <> "greeting"# Json..=# uGreeting
274 <> "favoriteFruit"# Json..=# uFavouriteFruit
269 <> "favoriteFruit"# Json..=# uFavouriteFruit
275
270
276−#ifdef MIN_VERSION_json_builder
277---- json-builder instances ----
271---- json-builder instances ----
278
272
279instance JB.Value EyeColor where
273instance JB.Value EyeColor where
@@ -325,7 +319,6 @@ instance JB.Value User where
325 <> t "friends" `JB.row` uFriends
319 <> t "friends" `JB.row` uFriends
326 <> t "greeting" `JB.row` uGreeting
320 <> t "greeting" `JB.row` uGreeting
327 <> t "favoriteFruit" `JB.row` uFavouriteFruit
321 <> t "favoriteFruit" `JB.row` uFavouriteFruit
328−#endif
329
322
330benchmarks :: Benchmark
323benchmarks :: Benchmark
331benchmarks = env (load "json-data/buffer-builder.json") $
324benchmarks = env (load "json-data/buffer-builder.json") $
@@ -333,7 +326,5 @@ benchmarks = env (load "json-data/buffer-builder.json") $
333 bgroup "json-bench" [
326 bgroup "json-bench" [
334 bench "aeson" $ nf Aeson.encode parsedUserList
327 bench "aeson" $ nf Aeson.encode parsedUserList
335 , bench "buffer-builder" $ nf Json.encodeJson parsedUserList
328 , bench "buffer-builder" $ nf Json.encodeJson parsedUserList
336−#ifdef MIN_VERSION_json_builder
337 , bench "json-builder" $ nf JB.toJsonLBS parsedUserList
329 , bench "json-builder" $ nf JB.toJsonLBS parsedUserList
338−#endif
339 ]
330 ]
benchmarks/Compare/JsonBuilder.hs+3−2
@@ -1,4 +1,3 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
2{-# LANGUAGE RecordWildCards #-}
1{-# LANGUAGE RecordWildCards #-}
3
2
4{-# OPTIONS_GHC -fno-warn-name-shadowing #-}
3{-# OPTIONS_GHC -fno-warn-name-shadowing #-}
@@ -6,10 +5,12 @@
6
5
7module Compare.JsonBuilder () where
6module Compare.JsonBuilder () where
8
7
9−import Prelude.Compat hiding ((<>))
8+import Prelude ()
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)
13import Twitter
14import Twitter
14
15
15instance JsObject Metadata where
16instance JsObject Metadata where
benchmarks/CompareWithJSON.hs+17−32
@@ -1,9 +1,8 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
2−
3{-# OPTIONS_GHC -fno-warn-orphans #-}
1{-# OPTIONS_GHC -fno-warn-orphans #-}
4
2
5module Main (main) where
3module Main (main) where
6
4
5+import Prelude ()
7import Prelude.Compat
6import Prelude.Compat
8
7
9import Blaze.ByteString.Builder (toLazyByteString)
8import Blaze.ByteString.Builder (toLazyByteString)
@@ -13,8 +12,6 @@ import Criterion.Main
13import Data.Maybe (fromMaybe)
12import Data.Maybe (fromMaybe)
14import qualified Data.Aeson as A
13import qualified Data.Aeson as A
15import qualified Data.Aeson.Text as A
14import qualified Data.Aeson.Text as A
16−import qualified Data.Aeson.Parser.Internal as I
17−import qualified Data.ByteString as BS
18import qualified Data.ByteString.Lazy as BL
15import qualified Data.ByteString.Lazy as BL
19import qualified Data.Text.Lazy as TL
16import qualified Data.Text.Lazy as TL
20import qualified Data.Text.Lazy.Builder as TLB
17import qualified Data.Text.Lazy.Builder as TLB
@@ -27,7 +24,7 @@ instance (NFData v) => NFData (J.JSObject v) where
27instance NFData J.JSValue where
24instance NFData J.JSValue where
28 rnf J.JSNull = ()
25 rnf J.JSNull = ()
29 rnf (J.JSBool b) = rnf b
26 rnf (J.JSBool b) = rnf b
30− rnf (J.JSRational a b) = rnf a `seq` rnf b
27+ rnf (J.JSRational a b) = rnf a `seq` rnf b `seq` ()
31 rnf (J.JSString s) = rnf (J.fromJSString s)
28 rnf (J.JSString s) = rnf (J.fromJSString s)
32 rnf (J.JSArray lst) = rnf lst
29 rnf (J.JSArray lst) = rnf lst
33 rnf (J.JSObject o) = rnf o
30 rnf (J.JSObject o) = rnf o
@@ -38,18 +35,11 @@ decodeJ s =
38 J.Ok v -> v
35 J.Ok v -> v
39 J.Error _ -> error "fail to parse via JSON"
36 J.Error _ -> error "fail to parse via JSON"
40
37
41−decode :: BL.ByteString -> A.Value
42−decode s = fromMaybe (error "fail to parse via Aeson") $ A.decode s
43−
44−decode' :: BL.ByteString -> A.Value
38+decodeA :: BL.ByteString -> A.Value
45−decode' s = fromMaybe (error "fail to parse via Aeson") $ A.decode' s
39+decodeA 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
49
40
50−decodeIP :: BL.ByteString -> A.Value
41+decodeA' :: BL.ByteString -> A.Value
51−decodeIP s = fromMaybe (error "fail to parse via Parser.decodeWith") $
42+decodeA' s = fromMaybe (error "fail to parse via Aeson") $ A.decode' s
52− I.decodeWith I.jsonEOF A.fromJSON s
53
43
54encodeJ :: J.JSValue -> BL.ByteString
44encodeJ :: J.JSValue -> BL.ByteString
55encodeJ = toLazyByteString . fromString . J.encode
45encodeJ = toLazyByteString . fromString . J.encode
@@ -65,37 +55,32 @@ main = do
65 let enFile = "json-data/twitter100.json"
55 let enFile = "json-data/twitter100.json"
66 jpFile = "json-data/jp100.json"
56 jpFile = "json-data/jp100.json"
67 enA <- BL.readFile enFile
57 enA <- BL.readFile enFile
68− enS <- BS.readFile enFile
69 enJ <- readFile enFile
58 enJ <- readFile enFile
70 jpA <- BL.readFile jpFile
59 jpA <- BL.readFile jpFile
71− jpS <- BS.readFile jpFile
72 jpJ <- readFile jpFile
60 jpJ <- readFile jpFile
73 defaultMain [
61 defaultMain [
74 bgroup "decode" [
62 bgroup "decode" [
75 bgroup "en" [
63 bgroup "en" [
76− bench "aeson/lazy" $ nf decode enA
64+ bench "aeson/lazy" $ nf decodeA enA
77− , bench "aeson/strict" $ nf decode' enA
65+ , bench "aeson/strict" $ nf decodeA' enA
78− , bench "aeson/stricter" $ nf decodeS enS
79− , bench "aeson/parser" $ nf decodeIP enA
80− , bench "json" $ nf decodeJ enJ
66+ , bench "json" $ nf decodeJ enJ
81 ]
67 ]
82 , bgroup "jp" [
68 , bgroup "jp" [
83− bench "aeson" $ nf decode jpA
69+ bench "aeson" $ nf decodeA jpA
84− , bench "aeson/stricter" $ nf decodeS jpS
85− , bench "json" $ nf decodeJ jpJ
70+ , bench "json" $ nf decodeJ jpJ
86 ]
71 ]
87 ]
72 ]
88 , bgroup "encode" [
73 , bgroup "encode" [
89 bgroup "en" [
74 bgroup "en" [
90− bench "aeson-to-bytestring" $ nf A.encode (decode enA)
75+ bench "aeson-to-bytestring" $ nf A.encode (decodeA enA)
91− , bench "aeson-via-text-to-bytestring" $ nf encodeViaText (decode enA)
76+ , bench "aeson-via-text-to-bytestring" $ nf encodeViaText (decodeA enA)
92− , bench "aeson-to-text" $ nf encodeToText (decode enA)
77+ , bench "aeson-to-text" $ nf encodeToText (decodeA enA)
93 , bench "json" $ nf encodeJ (decodeJ enJ)
78 , bench "json" $ nf encodeJ (decodeJ enJ)
94 ]
79 ]
95 , bgroup "jp" [
80 , bgroup "jp" [
96− bench "aeson-to-bytestring" $ nf A.encode (decode jpA)
81+ bench "aeson-to-bytestring" $ nf A.encode (decodeA jpA)
97− , bench "aeson-via-text-to-bytestring" $ nf encodeViaText (decode jpA)
82+ , bench "aeson-via-text-to-bytestring" $ nf encodeViaText (decodeA jpA)
98− , bench "aeson-to-text" $ nf encodeToText (decode jpA)
83+ , bench "aeson-to-text" $ nf encodeToText (decodeA jpA)
99 , bench "json" $ nf encodeJ (decodeJ jpJ)
84 , bench "json" $ nf encodeJ (decodeJ jpJ)
100 ]
85 ]
101 ]
86 ]
benchmarks/Dates.hs+1−2
@@ -1,7 +1,6 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
2−
3module Main (main) where
1module Main (main) where
4
2
3+import Prelude ()
5import Prelude.Compat
4import Prelude.Compat
6
5
7import Criterion.Main
6import Criterion.Main
benchmarks/Escape.hsdeleted−32
@@ -1,32 +0,0 @@
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.hsdeleted−165
@@ -1,165 +0,0 @@
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+2−3
@@ -1,11 +1,10 @@
1{-# LANGUAGE BangPatterns #-}
1{-# LANGUAGE BangPatterns #-}
2−{-# LANGUAGE NoImplicitPrelude #-}
3{-# LANGUAGE ScopedTypeVariables #-}
2{-# LANGUAGE ScopedTypeVariables #-}
4−
5{-# OPTIONS_GHC -fno-warn-orphans #-}
3{-# OPTIONS_GHC -fno-warn-orphans #-}
6
4
7module Main (main) where
5module Main (main) where
8
6
7+import Prelude ()
9import Prelude.Compat
8import Prelude.Compat
10
9
11import Control.DeepSeq
10import Control.DeepSeq
@@ -17,7 +16,7 @@ import Text.JSON
17instance NFData JSValue where
16instance NFData JSValue where
18 rnf JSNull = ()
17 rnf JSNull = ()
19 rnf (JSBool b) = rnf b
18 rnf (JSBool b) = rnf b
20− rnf (JSRational b r) = rnf b `seq` rnf r
19+ rnf (JSRational b r) = rnf b `seq` rnf r `seq` ()
21 rnf (JSString s) = rnf (fromJSString s)
20 rnf (JSString s) = rnf (fromJSString s)
22 rnf (JSArray vs) = rnf vs
21 rnf (JSArray vs) = rnf vs
23 rnf (JSObject kvs) = rnf (fromJSObject kvs)
22 rnf (JSObject kvs) = rnf (fromJSObject kvs)
benchmarks/Micro.hs+6−8
@@ -1,13 +1,11 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
2−
3module Main (main) where
1module Main (main) where
4
2
3+import Prelude ()
5import Prelude.Compat
4import Prelude.Compat
6
5
7import Criterion.Main
6import Criterion.Main
8−
9−-- Encoding is a newtype wrapper around Builder
10−import Data.Aeson.Encoding (text, string, encodingToLazyByteString)
7+import qualified Data.Aeson.Encoding.Builder as AB
8+import qualified Data.ByteString.Builder as B
11import qualified Data.Text as T
9import qualified Data.Text as T
12
10
13main :: IO ()
11main :: IO ()
@@ -15,8 +13,8 @@ main = do
15 let txt = "append (append b (primBounded w1 x1)) (primBounded w2 x2)"
13 let txt = "append (append b (primBounded w1 x1)) (primBounded w2 x2)"
16 defaultMain [
14 defaultMain [
17 bgroup "string" [
15 bgroup "string" [
18− bench "text" $ nf (encodingToLazyByteString . text) (T.pack txt)
16+ bench "text" $ nf (B.toLazyByteString . AB.text) (T.pack txt)
19− , bench "string direct" $ nf (encodingToLazyByteString . string) txt
17+ , bench "string direct" $ nf (B.toLazyByteString . AB.string) txt
20− , bench "string via text" $ nf (encodingToLazyByteString . text . T.pack) txt
18+ , bench "string via text" $ nf (B.toLazyByteString . AB.text . T.pack) txt
21 ]
19 ]
22 ]
20 ]
benchmarks/Options.hs+4−1
@@ -1,4 +1,7 @@
1−module Options (opts) where
1+module Options () where
2+
3+import Prelude ()
4+import Prelude.Compat
2
5
3import Data.Aeson.Types
6import Data.Aeson.Types
4
7
benchmarks/ReadFile.hs+1−1
@@ -1,9 +1,9 @@
1{-# LANGUAGE BangPatterns #-}
1{-# LANGUAGE BangPatterns #-}
2−{-# LANGUAGE NoImplicitPrelude #-}
3{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE OverloadedStrings #-}
4
3
5module Main (main) where
4module Main (main) where
6
5
6+import Prelude ()
7import Prelude.Compat
7import Prelude.Compat
8
8
9import Control.DeepSeq
9import Control.DeepSeq
benchmarks/Typed.hs+1−5
@@ -1,7 +1,6 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
2−
3module Main (main) where
1module Main (main) where
4
2
3+import Prelude ()
5import Prelude.Compat
4import Prelude.Compat
6
5
7import Criterion.Main
6import Criterion.Main
@@ -14,7 +13,4 @@ main = defaultMain [
14 Generic.benchmarks
13 Generic.benchmarks
15 , Manual.benchmarks
14 , Manual.benchmarks
16 , TH.benchmarks
15 , TH.benchmarks
17− , Generic.decodeBenchmarks
18− , Manual.decodeBenchmarks
19− , TH.decodeBenchmarks
20 ]
16 ]
benchmarks/Typed/Common.hs+10−1
@@ -1,16 +1,25 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
1+{-# LANGUAGE CPP #-}
2+#ifdef HAS_BOTH_AESON_AND_BENCHMARKS
3+{-# LANGUAGE PackageImports #-}
4+#endif
2
5
3{-# OPTIONS_GHC -fno-warn-unused-imports #-}
6{-# OPTIONS_GHC -fno-warn-unused-imports #-}
4
7
5module Typed.Common (load) where
8module Typed.Common (load) where
6
9
10+import Prelude ()
7import Prelude.Compat
11import Prelude.Compat
8
12
9import Data.ByteString.Lazy as L
13import Data.ByteString.Lazy as L
10import System.Exit
14import System.Exit
11import System.IO
15import System.IO
12
16
17+#ifndef HAS_BOTH_AESON_AND_BENCHMARKS
13import Data.Aeson hiding (Result)
18import Data.Aeson hiding (Result)
19+#else
20+import "aeson" Data.Aeson hiding (Result)
21+import qualified "aeson-benchmarks" Data.Aeson as B
22+#endif
14
23
15load :: FromJSON a => FilePath -> IO a
24load :: FromJSON a => FilePath -> IO a
16load fileName = do
25load fileName = do
benchmarks/Typed/Generic.hs+25−27
@@ -1,44 +1,42 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
1+{-# LANGUAGE PackageImports #-}
2−
3−module Typed.Generic (benchmarks, decodeBenchmarks) where
2+module Typed.Generic (benchmarks) where
4
3
4+import Prelude ()
5import Prelude.Compat
5import Prelude.Compat
6
6
7−import Data.Aeson hiding (Result)
7+import "aeson" Data.Aeson hiding (Result)
8import Criterion
8import Criterion
9import Data.ByteString.Lazy as L
9import Data.ByteString.Lazy as L
10−import Twitter.Generic
10+import 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
12
16
13−encodeDirect :: Result -> L.ByteString
17+encodeViaValueA :: Result -> L.ByteString
14−encodeDirect = encode
18+encodeViaValueA = encode . toJSON
15
19
16−encodeViaValue :: Result -> L.ByteString
20+encodeDirectB :: Result -> L.ByteString
17−encodeViaValue = encode . toJSON
21+encodeDirectB = B.encode
22+
23+encodeViaValueB :: Result -> L.ByteString
24+encodeViaValueB = B.encode . B.toJSON
18
25
19benchmarks :: Benchmark
26benchmarks :: Benchmark
20benchmarks =
27benchmarks =
21 env ((,) <$> load "json-data/twitter100.json" <*> load "json-data/jp100.json") $ \ ~(twitter100, jp100) ->
28 env ((,) <$> load "json-data/twitter100.json" <*> load "json-data/jp100.json") $ \ ~(twitter100, jp100) ->
22− bgroup "encodeGeneric" [
29+ bgroup "generic" [
23 bgroup "direct" [
30 bgroup "direct" [
24− bench "twitter100" $ nf encodeDirect twitter100
31+ bench "twitter100" $ nf encodeDirectB twitter100
32+ , bench "jp100" $ nf encodeDirectB jp100
33+ , bench "twitter100 baseline" $ nf encodeDirectA twitter100
25− , bench "jp100" $ nf encodeDirect jp100
34+ , bench "jp100 baseline" $ nf encodeDirectA jp100
26 ]
35 ]
27 , bgroup "viaValue" [
36 , bgroup "viaValue" [
28− bench "twitter100" $ nf encodeViaValue twitter100
37+ bench "twitter100" $ nf encodeViaValueB twitter100
29− , bench "jp100" $ nf encodeViaValue jp100
38+ , bench "jp100" $ nf encodeViaValueB jp100
30− ]
31− ]
32−
33−decodeDirect :: L.ByteString -> Maybe Result
34−decodeDirect = decode
35−
36−decodeBenchmarks :: Benchmark
37−decodeBenchmarks =
38− env ((,) <$> L.readFile "json-data/twitter100.json" <*> L.readFile "json-data/jp100.json") $ \ ~(twitter100, jp100) ->
39− bgroup "decodeGeneric"
40− [ bgroup "direct"
41− [ bench "twitter100" $ nf decodeDirect twitter100
39+ , bench "twitter100 baseline" $ nf encodeViaValueA twitter100
42− , bench "jp100" $ nf decodeDirect jp100
40+ , bench "jp100 baseline" $ nf encodeViaValueA jp100
43 ]
41 ]
44 ]
42 ]
benchmarks/Typed/Manual.hs+24−26
@@ -1,44 +1,42 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
1+{-# LANGUAGE PackageImports #-}
2−
3−module Typed.Manual (benchmarks, decodeBenchmarks) where
2+module Typed.Manual (benchmarks) where
4
3
4+import Prelude ()
5import Prelude.Compat
5import Prelude.Compat
6
6
7−import Data.Aeson hiding (Result)
7+import "aeson" 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
12
16
13−encodeDirect :: Result -> L.ByteString
17+encodeViaValueA :: Result -> L.ByteString
14−encodeDirect = encode
18+encodeViaValueA = encode . toJSON
15
19
16−encodeViaValue :: Result -> L.ByteString
20+encodeDirectB :: Result -> L.ByteString
17−encodeViaValue = encode . toJSON
21+encodeDirectB = B.encode
22+
23+encodeViaValueB :: Result -> L.ByteString
24+encodeViaValueB = B.encode . B.toJSON
18
25
19benchmarks :: Benchmark
26benchmarks :: Benchmark
20benchmarks =
27benchmarks =
21 env ((,) <$> load "json-data/twitter100.json" <*> load "json-data/jp100.json") $ \ ~(twitter100, jp100) ->
28 env ((,) <$> load "json-data/twitter100.json" <*> load "json-data/jp100.json") $ \ ~(twitter100, jp100) ->
22− bgroup "encodeManual" [
29+ bgroup "manual" [
23 bgroup "direct" [
30 bgroup "direct" [
24− bench "twitter100" $ nf encodeDirect twitter100
31+ bench "twitter100" $ nf encodeDirectB twitter100
32+ , bench "jp100" $ nf encodeDirectB jp100
33+ , bench "twitter100 baseline" $ nf encodeDirectA twitter100
25− , bench "jp100" $ nf encodeDirect jp100
34+ , bench "jp100 baseline" $ nf encodeDirectA jp100
26 ]
35 ]
27 , bgroup "viaValue" [
36 , bgroup "viaValue" [
28− bench "twitter100" $ nf encodeViaValue twitter100
37+ bench "twitter100" $ nf encodeViaValueB twitter100
29− , bench "jp100" $ nf encodeViaValue jp100
38+ , bench "jp100" $ nf encodeViaValueB jp100
30− ]
31− ]
32−
33−decodeDirect :: L.ByteString -> Maybe Result
34−decodeDirect = decode
35−
36−decodeBenchmarks :: Benchmark
37−decodeBenchmarks =
38− env ((,) <$> L.readFile "json-data/twitter100.json" <*> L.readFile "json-data/jp100.json") $ \ ~(twitter100, jp100) ->
39− bgroup "decodeManual"
40− [ bgroup "direct"
41− [ bench "twitter100" $ nf decodeDirect twitter100
39+ , bench "twitter100 baseline" $ nf encodeViaValueA twitter100
42− , bench "jp100" $ nf decodeDirect jp100
40+ , bench "jp100 baseline" $ nf encodeViaValueA jp100
43 ]
41 ]
44 ]
42 ]
benchmarks/Typed/TH.hs+24−26
@@ -1,44 +1,42 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
1+{-# LANGUAGE PackageImports #-}
2−
3−module Typed.TH (benchmarks, decodeBenchmarks) where
2+module Typed.TH (benchmarks) where
4
3
4+import Prelude ()
5import Prelude.Compat
5import Prelude.Compat
6
6
7−import Data.Aeson hiding (Result)
7+import "aeson" 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
12
16
13−encodeDirect :: Result -> L.ByteString
17+encodeViaValueA :: Result -> L.ByteString
14−encodeDirect = encode
18+encodeViaValueA = encode . toJSON
15
19
16−encodeViaValue :: Result -> L.ByteString
20+encodeDirectB :: Result -> L.ByteString
17−encodeViaValue = encode . toJSON
21+encodeDirectB = B.encode
22+
23+encodeViaValueB :: Result -> L.ByteString
24+encodeViaValueB = B.encode . B.toJSON
18
25
19benchmarks :: Benchmark
26benchmarks :: Benchmark
20benchmarks =
27benchmarks =
21 env ((,) <$> load "json-data/twitter100.json" <*> load "json-data/jp100.json") $ \ ~(twitter100, jp100) ->
28 env ((,) <$> load "json-data/twitter100.json" <*> load "json-data/jp100.json") $ \ ~(twitter100, jp100) ->
22− bgroup "encodeTH" [
29+ bgroup "th" [
23 bgroup "direct" [
30 bgroup "direct" [
24− bench "twitter100" $ nf encodeDirect twitter100
31+ bench "twitter100" $ nf encodeDirectB twitter100
32+ , bench "jp100" $ nf encodeDirectB jp100
33+ , bench "twitter100 baseline" $ nf encodeDirectA twitter100
25− , bench "jp100" $ nf encodeDirect jp100
34+ , bench "jp100 baseline" $ nf encodeDirectA jp100
26 ]
35 ]
27 , bgroup "viaValue" [
36 , bgroup "viaValue" [
28− bench "twitter100" $ nf encodeViaValue twitter100
37+ bench "twitter100" $ nf encodeViaValueA twitter100
29− , bench "jp100" $ nf encodeViaValue jp100
38+ , bench "jp100" $ nf encodeViaValueA jp100
30− ]
31− ]
32−
33−decodeDirect :: L.ByteString -> Maybe Result
34−decodeDirect = decode
35−
36−decodeBenchmarks :: Benchmark
37−decodeBenchmarks =
38− env ((,) <$> L.readFile "json-data/twitter100.json" <*> L.readFile "json-data/jp100.json") $ \ ~(twitter100, jp100) ->
39− bgroup "decodeTH"
40− [ bgroup "direct"
41− [ bench "twitter100" $ nf decodeDirect twitter100
39+ , bench "twitter100 baseline" $ nf encodeViaValueB twitter100
42− , bench "jp100" $ nf decodeDirect jp100
40+ , bench "jp100 baseline" $ nf encodeViaValueB jp100
43 ]
41 ]
44 ]
42 ]
benchmarks/aeson-benchmarks.cabal+64−183
@@ -1,21 +1,62 @@
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
5
6
6flag bytestring-builder
7flag bytestring-builder
7 description: Depend on the bytestring-builder package for backwards compatibility.
8 description: Depend on the bytestring-builder package for backwards compatibility.
8 default: False
9 default: False
9 manual: False
10 manual: False
10
11
11−flag local-aeson
12− description: Build the local version of aeson, to avoid rebuilding aeson's
13− reverse dependencies for benchmarking (statistics, criterion).
14− default: True
15− manual: True
16−
17library
12library
18− default-language: Haskell2010
13+ hs-source-dirs: .. . ../ffi ../pure
14+ c-sources: ../cbits/unescape_string.c
15+ exposed-modules:
16+ Data.Aeson
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+
38+ build-depends:
39+ attoparsec >= 0.13.0.1,
40+ base == 4.*,
41+ base-compat >= 0.9.1 && <0.10,
42+ time-locale-compat >=0.1.1 && <0.2,
43+ containers,
44+ deepseq,
45+ dlist >= 0.2,
46+ fail == 4.9.*,
47+ ghc-prim >= 0.2,
48+ hashable >= 1.1.2.0,
49+ mtl,
50+ scientific >= 0.3.4.7 && < 0.4,
51+ syb,
52+ tagged >=0.8.3 && <0.9,
53+ template-haskell >= 2.4,
54+ text >= 1.1.1.0,
55+ time,
56+ transformers,
57+ unordered-containers >= 0.2.3.0,
58+ uuid-types >= 1.0.3 && <1.1,
59+ vector >= 0.7.1
19
60
20 if flag(bytestring-builder)
61 if flag(bytestring-builder)
21 build-depends: bytestring >= 0.9 && < 0.10.4,
62 build-depends: bytestring >= 0.9 && < 0.10.4,
@@ -23,142 +64,22 @@ library
23 else
64 else
24 build-depends: bytestring >= 0.10.4
65 build-depends: bytestring >= 0.10.4
25
66
26− if flag(local-aeson)
27−
28− hs-source-dirs: .. ../ffi ../pure ../attoparsec-iso8601
29− c-sources: ../cbits/unescape_string.c
30− build-depends:
31− attoparsec,
32− base,
33− base-compat,
34− containers,
35− deepseq,
36− dlist,
37− fail,
38− ghc-prim,
39− hashable,
40− mtl,
41− primitive,
42− scientific,
43− syb,
44− tagged,
45− template-haskell,
46− text,
47− th-abstraction,
48− time-compat,
49− time,
50− transformers,
51− unordered-containers,
52− uuid-types,
53− vector
54−
55− if !impl(ghc >= 8.6)
67+ if impl(ghc >=7.8)
56− build-depends: contravariant
68+ cpp-options: -DHAS_COERCIBLE
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
62
69
63− if !impl(ghc >= 7.10)
70+ if !impl(ghc >= 8.0)
64− -- `Numeric.Natural` is available in base only since GHC 7.10 / base 4.8
71+ -- `Data.Semigroup` is available in base only since GHC 8.0 / base 4.9
65− build-depends: nats,
72+ build-depends: semigroups >= 0.18.2 && < 0.19
66− void
67
73
68− include-dirs: ../include
74+ include-dirs: ../include
69
75
70− ghc-options: -O2 -Wall
76+ ghc-options: -O2 -Wall
71− cpp-options: -DGENERICS
77+ 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
150
78
151executable aeson-benchmark-compare
79executable aeson-benchmark-compare
152− default-language: Haskell2010
153 main-is: Compare.hs
80 main-is: Compare.hs
154 hs-source-dirs: ../examples .
81 hs-source-dirs: ../examples .
155 ghc-options: -Wall -O2 -rtsopts
82 ghc-options: -Wall -O2 -rtsopts
156− other-modules:
157− Compare.BufferBuilder
158− Compare.JsonBench
159− Twitter
160− Twitter.Manual
161− Typed.Common
162 build-depends:
83 build-depends:
163 aeson-benchmarks,
84 aeson-benchmarks,
164 base,
85 base,
@@ -168,19 +89,10 @@ executable aeson-benchmark-compare
168 criterion >= 1.0,
89 criterion >= 1.0,
169 deepseq,
90 deepseq,
170 ghc-prim,
91 ghc-prim,
92+ json-builder,
171 text
93 text
172
94
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−
182executable aeson-benchmark-micro
95executable aeson-benchmark-micro
183− default-language: Haskell2010
184 main-is: Micro.hs
96 main-is: Micro.hs
185 hs-source-dirs: ../examples .
97 hs-source-dirs: ../examples .
186 ghc-options: -Wall -O2 -rtsopts
98 ghc-options: -Wall -O2 -rtsopts
@@ -195,21 +107,14 @@ executable aeson-benchmark-micro
195 text
107 text
196
108
197executable aeson-benchmark-typed
109executable aeson-benchmark-typed
198− default-language: Haskell2010
199 main-is: Typed.hs
110 main-is: Typed.hs
200 hs-source-dirs: ../examples .
111 hs-source-dirs: ../examples .
201 ghc-options: -Wall -O2 -rtsopts
112 ghc-options: -Wall -O2 -rtsopts
202− other-modules:
113+ -- We must help ourself in situations when there is both
203− Twitter
114+ -- aeson and aeson-benchmakrs
204− Twitter.Generic
115+ cpp-options: -DHAS_BOTH_AESON_AND_BENCHMARKS
205− Twitter.Manual
206− Twitter.Options
207− Twitter.TH
208− Typed.Common
209− Typed.Generic
210− Typed.Manual
211− Typed.TH
212 build-depends:
116 build-depends:
117+ aeson,
213 aeson-benchmarks,
118 aeson-benchmarks,
214 base,
119 base,
215 base-compat,
120 base-compat,
@@ -224,11 +129,8 @@ executable aeson-benchmark-typed
224 bytestring-builder >= 0.10.4 && < 1
129 bytestring-builder >= 0.10.4 && < 1
225 else
130 else
226 build-depends: bytestring >= 0.10.4
131 build-depends: bytestring >= 0.10.4
227− if impl(ghc < 8.0)
228− build-depends: semigroups
229
132
230executable aeson-benchmark-compare-with-json
133executable aeson-benchmark-compare-with-json
231− default-language: Haskell2010
232 main-is: CompareWithJSON.hs
134 main-is: CompareWithJSON.hs
233 ghc-options: -Wall -O2 -rtsopts
135 ghc-options: -Wall -O2 -rtsopts
234 build-depends:
136 build-depends:
@@ -243,7 +145,6 @@ executable aeson-benchmark-compare-with-json
243 text
145 text
244
146
245executable aeson-benchmark-aeson-encode
147executable aeson-benchmark-aeson-encode
246− default-language: Haskell2010
247 main-is: AesonEncode.hs
148 main-is: AesonEncode.hs
248 ghc-options: -Wall -O2 -rtsopts
149 ghc-options: -Wall -O2 -rtsopts
249 build-depends:
150 build-depends:
@@ -256,7 +157,6 @@ executable aeson-benchmark-aeson-encode
256 time
157 time
257
158
258executable aeson-benchmark-aeson-parse
159executable aeson-benchmark-aeson-parse
259− default-language: Haskell2010
260 main-is: AesonParse.hs
160 main-is: AesonParse.hs
261 ghc-options: -Wall -O2 -rtsopts
161 ghc-options: -Wall -O2 -rtsopts
262 build-depends:
162 build-depends:
@@ -268,7 +168,6 @@ executable aeson-benchmark-aeson-parse
268 time
168 time
269
169
270executable aeson-benchmark-json-parse
170executable aeson-benchmark-json-parse
271− default-language: Haskell2010
272 main-is: JsonParse.hs
171 main-is: JsonParse.hs
273 ghc-options: -Wall -O2 -rtsopts
172 ghc-options: -Wall -O2 -rtsopts
274 build-depends:
173 build-depends:
@@ -279,7 +178,6 @@ executable aeson-benchmark-json-parse
279 time
178 time
280
179
281executable aeson-benchmark-dates
180executable aeson-benchmark-dates
282− default-language: Haskell2010
283 main-is: Dates.hs
181 main-is: Dates.hs
284 ghc-options: -Wall -O2 -rtsopts
182 ghc-options: -Wall -O2 -rtsopts
285 build-depends:
183 build-depends:
@@ -291,14 +189,12 @@ executable aeson-benchmark-dates
291 aeson-benchmarks,
189 aeson-benchmarks,
292 text,
190 text,
293 time
191 time
294− if impl(ghc >= 8.2)
295− ghc-options: -Wno-simplifiable-class-constraints
296
192
297executable aeson-benchmark-map
193executable aeson-benchmark-map
298− default-language: Haskell2010
299 main-is: AesonMap.hs
194 main-is: AesonMap.hs
300 ghc-options: -Wall -O2 -rtsopts
195 ghc-options: -Wall -O2 -rtsopts
301 build-depends:
196 build-depends:
197+ aeson,
302 aeson-benchmarks,
198 aeson-benchmarks,
303 base,
199 base,
304 base-compat,
200 base-compat,
@@ -312,10 +208,10 @@ executable aeson-benchmark-map
312 unordered-containers
208 unordered-containers
313
209
314executable aeson-benchmark-foldable
210executable aeson-benchmark-foldable
315− default-language: Haskell2010
316 main-is: AesonFoldable.hs
211 main-is: AesonFoldable.hs
317 ghc-options: -Wall -O2 -rtsopts
212 ghc-options: -Wall -O2 -rtsopts
318 build-depends:
213 build-depends:
214+ aeson,
319 aeson-benchmarks,
215 aeson-benchmarks,
320 base,
216 base,
321 base-compat,
217 base-compat,
@@ -328,18 +224,3 @@ executable aeson-benchmark-foldable
328 text,
224 text,
329 unordered-containers,
225 unordered-containers,
330 vector
226 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.projectdeleted−5
@@ -1,5 +0,0 @@
1−with-compiler: ghc
2−packages: .
3−packages: attoparsec-iso8601
4−-- packages: benchmarks
5−tests: true
changelog.md−173
@@ -1,178 +1,5 @@
1For the latest version of this document, please see [https://github.com/bos/aeson/blob/master/changelog.md](https://github.com/bos/aeson/blob/master/changelog.md).
1For the latest version of this document, please see [https://github.com/bos/aeson/blob/master/changelog.md](https://github.com/bos/aeson/blob/master/changelog.md).
2
2
3−### upcoming
4−
5−* `FromJSON` instance of `Ratio a` now parses numbers in addtion to
6− standard `{numerator=..., denumerator=...}` encoding.
7−
8−### 1.4.6.0
9−
10−* Provide a clearer error message when a required tagKey for a constructor is missing, thanks to Guru Devanla.
11− The error message now looks like this: `Error in $: parsing Types.SomeType failed, expected Object with key "tag" containing one of ["nullary","unary","product","record","list"], key "tag" not found`
12−
13−* Add `formatPath` and `formatRelativePath` functions to turn a `JSONPath` into a `String`, thanks to Robbie McMichael
14−
15−
16−### 1.4.5.0
17−
18−* Expose `(<?>)`, `JSONPath` and `JSONPathElement(..)` from `Data.Aeson.Types`. Previously only available through internal modules. Thanks to Luke Clifton.
19−
20−* Support for base-compat 0.11, thanks to Ryan Scott.
21−
22−* Travis build for GHC 8.8, thanks to Oleg Grenrus.
23−
24−### 1.4.4.0
25−
26−**New features**:
27−
28−* Adds a parameterized parser `jsonWith` that can be used to choose how to handle duplicate keys in objects, thanks to Xia Li-Yao.
29−
30−* Add generic implementations of `FromJSONKey` and `ToJSONKey`, thanks to Xia Li-Yao. Example:
31−
32−```haskell
33−data Foo = Bar
34− deriving Generic
35−
36−opts :: JSONKeyOptions
37−opts = defaultJSONKeyOptions { keyModifier = toLower }
38−
39−instance ToJSONKey Foo where
40− toJSONKey = genericToJSONKey opts
41−
42−instance FromJSONKey Foo where
43− fromJSONKey = genericFromJSONKey opts
44−```
45−
46−**Minor**:
47−* aeson now uses `time-compat` instead of `time-locale-compat`, thanks to Oleg Grenrus.
48−* Prepare for `MonadFail` breakages in GHC 8.8, thanks to Oleg Grenrus.
49−* Require `bytestring >= 0.10.8.1` for newer GHCs to avoid build failures, thanks to Oleg Grenrus.
50−* Support `primitive 0.7.*`, thanks to Adam Bergmark.
51−* Allow `semigroups 0.19.*` and `hashable 1.3.*`, thanks to Oleg Grenrus.
52−* Fix a typo in the error message when parsing `NonEmpty`, thanks to Colin Woodbury.
53−* Document surprising behavior when using `omitNothingFields` with type variables, thanks to Xia Li-Yao.
54−
55−**Internal changes**:
56−* Code cleanup by Oleg Grenrus
57−* Fix dependencies of the benchmarks on older GHC's, thanks to Xia Li-Yao.
58−
59−### 1.4.3.0
60−* Improve error messages for FromJSON in existing instances and GHC Generic implementation. Thanks to Xia Li-Yao & Igor Pashev.
61−* Tweak error-reporting combinators and their documentation. Thanks to Xia Li-Yao.
62− * `typeMismatch` is now about comparing JSON types (i.e., the expected and actual names of the Value constructor).
63− * `withObject` and other `with*` combinators now also mention the JSON types they expect
64− * New `unexpected` and `prependFailure` combinators.
65−* Add `Contravariant` `ToJSONKeyFunction` instance. Thanks to Oleg Grenrus.
66−* Add `KeyValue` instance for `Object`. Thanks to Robert Hensing.
67−* Improve performance when parsing certain large numbers, thanks to Oleg Grenrus.
68−* Add `Data.Aeson.QQ.Simple` - A limited version of aeson-qq. Thanks to Oleg Grenrus.
69−* Exposes internal helper functions like `<?>`, `JSONPath`, and `parseIndexedJSON` from `Data.Aeson` module. Thanks to Abid Uzair.
70−* Better error messages when there are syntax errors parsing objects and arrays. Thanks to Fintan Halpenny.
71−* Support building with `th-abstraction-0.3.0.0` or later. Thanks to Ryan Scott.
72−
73−### 1.4.2.0
74−
75−* Add `Data.Aeson.QQ.Simple` which is a simpler version of the `aeson-qq` package, it does not support interpolation, thanks to Oleg Grenrus.
76−* Add `Contravariant ToJSONKeyFunction` instance, thanks to Oleg Grenrus.
77−* Add `KeyValue Object` instance, thanks to Robert Hensing
78−* Improved performance when parsing large numbers, thanks to Oleg Grenrus.
79−
80−### 1.4.1.0
81−
82−* Optimizations of generics, thanks to Rémy Oudompheng, here are some numbers for GHC 8.4:
83− * Compilation time: G/BigProduct.hs is 25% faster, G/BigRecord.hs is 2x faster.
84− * Runtime performance: BigRecord/toJSON/generic and BigProduct/encode/generic are more than 2x faster.
85−* Added To/FromJSON instances for `Void` and Generics's `V1`, thanks to Will Yager
86−* Added To/FromJSON instances for `primitive`'s `Array`, `SmallArray`, `PrimArray` and `UnliftedArray`, thanks to Andrew Thad.
87−* Fixes handling of `UTCTime` wrt. leap seconds , thanks to Adam Schønemann
88−* Warning and documentation fixes thanks to tom-bop, Gabor Greif, Ian Jeffries, and Mateusz Curyło.
89−
90−## 1.4.0.0
91−
92−This release introduces bounds on the size of `Scientific` numbers when they are converted to other arbitrary precision types that do not represent them efficiently in memory.
93−
94−This means that trying to decode a number such as `1e1000000000` into an `Integer` will now fail instead of using a lot of memory. If you need to represent large numbers you can add a newtype (preferably over `Scientific`) and providing a parser using `withScientific`.
95−
96−The following instances are affected by this:
97−* `FromJSON Natural`
98−* `FromJSONKey Natural`
99−* `FromJSON Integer`
100−* `FromJSONKey Integer`
101−* `FromJSON NominalDiffTime`
102−
103−For the same reasons the following instances & functions have been removed:
104−* Remove `FromJSON Data.Attoparsec.Number` instance. Note that `Data.Attoparsec.Number` is deprecated.
105−* Remove deprecated `withNumber`, use `withScientific` instead.
106−
107−Finally, encoding integral values with large exponents now uses scientific notation, this saves space for large numbers.
108−
109−#### 1.3.1.1
110−
111−* Catch 0 denominators when parsing Ratio
112−
113−### 1.3.1.0
114−
115−* Fix bug in generically derived `FromJSON` instances that are using `unwrapUnaryRecords`, thanks to Xia Li-yao
116−* Allow base-compat 0.10.*, thanks to Oleg Grenrus
117−
118−## 1.3.0.0
119−
120−Breaking changes:
121−* `GKeyValue` has been renamed to `KeyValuePair`, thanks to Xia Li-yao
122−* Removed unused `FromJSON` constraint in `withEmbeddedJson`, thanks to Tristan Seligmann
123−
124−Other improvements:
125−* Optimizations of TH toEncoding, thanks to Xia Li-yao
126−* Optimizations of hex decoding when using the default/pure unescape implementation, thanks to Xia Li-yao
127−* Improved error message on `Day` parse failures, thanks to Gershom Bazerman
128−* Add `encodeFile` as well as `decodeFile*` variants, thanks to Markus Hauck
129−* Documentation fixes, thanks to Lennart Spitzner
130−* CPP cleanup, thanks to Ryan Scott
131−
132−### 1.2.4.0
133−
134−* Add `Ord` instance for `JSONPathElement`, thanks to Simon Hengel.
135−
136−
137−### 1.2.3.0
138−
139−* Added `withEmbeddedJSON` to help parse JSON embedded inside a JSON string, thanks to Jesse Kempf.
140−* Memory usage improvements to the default (pure) parser, thanks to Jonathan Paugh. Also thanks to Neil Mitchell & Oleg Grenrus for contributing a benchmark.
141−* `omitNothingFields` now works for the `Option` newtype, thanks to Xia Li-yao.
142−* Some documentation fixes, thanks to Jonathan Paug & Philippe Crama.
143−
144−### 1.2.2.0
145−
146−* Add `FromJSON` and `ToJSON` instances for
147− * `DiffTime`, thanks to Víctor López Juan.
148− * `CTime`, thanks to Daniel Díaz.
149−* Fix handling of fractions when parsing Natural, thanks to Yuriy Syrovetskiy.
150−* Change text in error messages for Integral types to make them follow the common pattern, thanks to Yuriy Syrovetskiy.
151−* Add missing `INCOHERENT` pragma for `RecordToPair`, thanks to Xia Li-yao.
152−* Everything related to `Options` is now exported from `Data.Aeson`, thanks to Xia Li-yao.
153−* Optimizations to not escape text in clear cases, thanks to Oleg Grenrus.
154−* Some documentation fixes, thanks to Phil de Joux & Xia Li-yao.
155−
156−### 1.2.1.0
157−
158−* Add `parserThrowError` and `parserCatchError` combinators, thanks to Oleg Grenrus.
159−
160−* Add `Generic` instance for `Value`, thanks to Xia Li-yao.
161−
162−* Fix a mistake in the 1.2.0.0 changelog, the `cffi` flag is disabled by default! Thanks to dbaynard.
163−
164−## 1.2.0.0
165−
166−* `tagSingleConstructors`, an option to encode single-constructor types as tagged sums was added to `Options`. It is disabled by default for backward compatibility.
167−
168−* The `cffi` flag is now turned off (`False`) by default, this means C FFI code is no longer used by default. You can flip the flag to get C implementation.
169−
170−* The `Options` constructor is no longer exposed to prevent new options from being breaking changes, use `defaultOptions` instead.
171−
172−* The contents of `GToJSON` and `GToEncoding` are no longer exposed.
173−
174−* Some INLINE pragmas were removed to avoid GHC running out of simplifier ticks.
175−
176### 1.1.2.0
3### 1.1.2.0
177
4
178* Fix an accidental change in the format of `deriveJSON`. Thanks to Xia Li-yao!
5* 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 #-}
10{-# LANGUAGE OverloadedStrings #-}
9{-# LANGUAGE OverloadedStrings #-}
11
10
12module Main (main) where
11module Main (main) where
13
12
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 #-}
2{-# LANGUAGE OverloadedStrings #-}
1{-# LANGUAGE OverloadedStrings #-}
3{-# LANGUAGE RecordWildCards #-}
2{-# LANGUAGE RecordWildCards #-}
4
3
5module Main (main) where
4module Main (main) where
6
5
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 #-}
5{-# LANGUAGE OverloadedStrings #-}
4{-# LANGUAGE OverloadedStrings #-}
6{-# LANGUAGE TemplateHaskell #-}
5{-# LANGUAGE TemplateHaskell #-}
7
6
8module Main (main) where
7module Main (main) where
9
8
9+import Prelude ()
10import Prelude.Compat
10import Prelude.Compat
11
11
12import Data.Aeson (decode, encode)
12import Data.Aeson (decode, encode)
examples/Twitter.hs+2−1
@@ -10,7 +10,6 @@
10
10
11{-# LANGUAGE DeriveDataTypeable #-}
11{-# LANGUAGE DeriveDataTypeable #-}
12{-# LANGUAGE DeriveGeneric #-}
12{-# LANGUAGE DeriveGeneric #-}
13−{-# LANGUAGE NoImplicitPrelude #-}
14
13
15module Twitter
14module Twitter
16 (
15 (
@@ -20,6 +19,7 @@ module Twitter
20 , Result(..)
19 , Result(..)
21 ) where
20 ) where
22
21
22+import Prelude ()
23import Prelude.Compat
23import Prelude.Compat
24
24
25import Control.DeepSeq
25import Control.DeepSeq
@@ -27,6 +27,7 @@ import Data.Data (Typeable, Data)
27import Data.Int (Int64)
27import Data.Int (Int64)
28import Data.Text (Text)
28import Data.Text (Text)
29import GHC.Generics (Generic)
29import GHC.Generics (Generic)
30+import Prelude hiding (id)
30
31
31{-# ANN module "Hlint: ignore Use camelCase" #-}
32{-# ANN module "Hlint: ignore Use camelCase" #-}
32{-# ANN module "Hlint: ignore Use newtype instead of data" #-}
33{-# ANN module "Hlint: ignore Use newtype instead of data" #-}
examples/Twitter/Generic.hs+36−31
@@ -1,7 +1,5 @@
1-- Use GHC generics to automatically generate good instances.
1-- Use GHC generics to automatically generate good instances.
2−
3−{-# LANGUAGE NoImplicitPrelude #-}
2+{-# LANGUAGE CPP #-}
4−
5{-# OPTIONS_GHC -fno-warn-orphans #-}
3{-# OPTIONS_GHC -fno-warn-orphans #-}
6
4
7module Twitter.Generic
5module Twitter.Generic
@@ -12,33 +10,40 @@ module Twitter.Generic
12 , Result(..)
10 , Result(..)
13 ) where
11 ) where
14
12
15−import Prelude.Compat ()
13+import Prelude ()
14+import Prelude.Compat
16
15
17import Twitter
16import Twitter
18−import Twitter.Options
17+
19−
18+#ifndef HAS_BOTH_AESON_AND_BENCHMARKS
20−import Data.Aeson (ToJSON (..), FromJSON (..), genericToJSON, genericToEncoding, genericParseJSON)
19+import Data.Aeson (ToJSON, FromJSON)
21−
20+#else
22−instance ToJSON Metadata where
21+import "aeson" Data.Aeson (ToJSON, FromJSON)
23− toJSON = genericToJSON twitterOptions
22+import qualified "aeson-benchmarks" Data.Aeson as B
24− toEncoding = genericToEncoding twitterOptions
23+#endif
24+
25+instance ToJSON Metadata
25−instance FromJSON Metadata where
26+instance FromJSON Metadata
26− parseJSON = genericParseJSON twitterOptions
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+#ifdef HAS_BOTH_AESON_AND_BENCHMARKS
38+instance B.ToJSON Metadata
37−instance FromJSON Story where
39+instance B.FromJSON Metadata
38− parseJSON = genericParseJSON twitterOptions
40+
39−
41+instance B.ToJSON Geo
42+instance B.FromJSON Geo
43+
40−instance ToJSON Result where
44+instance B.ToJSON Story
41− toJSON = genericToJSON twitterOptions
45+instance B.FromJSON Story
42− toEncoding = genericToEncoding twitterOptions
46+
47+instance B.ToJSON Result
43−instance FromJSON Result where
48+instance B.FromJSON Result
44− parseJSON = genericParseJSON twitterOptions
49+#endif
examples/Twitter/Manual.hs+139−3
@@ -1,10 +1,14 @@
1-- Manually write instances.
1-- Manually write instances.
2+
2−{-# LANGUAGE NoImplicitPrelude #-}
3+{-# LANGUAGE CPP #-}
3{-# LANGUAGE OverloadedStrings #-}
4{-# LANGUAGE OverloadedStrings #-}
4{-# LANGUAGE RecordWildCards #-}
5{-# LANGUAGE RecordWildCards #-}
5−
6{-# OPTIONS_GHC -fno-warn-orphans #-}
6{-# OPTIONS_GHC -fno-warn-orphans #-}
7
7
8+#ifdef HAS_BOTH_AESON_AND_BENCHMARKS
9+{-# LANGUAGE PackageImports #-}
10+#endif
11+
8module Twitter.Manual
12module Twitter.Manual
9 (
13 (
10 Metadata(..)
14 Metadata(..)
@@ -13,13 +17,20 @@ module Twitter.Manual
13 , Result(..)
17 , Result(..)
14 ) where
18 ) where
15
19
20+import Prelude ()
16import Prelude.Compat
21import Prelude.Compat
17
22
18import Control.Applicative
23import Control.Applicative
19−import Data.Semigroup ((<>))
24+import Data.Monoid ((<>))
25+import Prelude hiding (id)
20import Twitter
26import Twitter
21
27
28+#ifndef HAS_BOTH_AESON_AND_BENCHMARKS
22import Data.Aeson hiding (Result)
29import Data.Aeson hiding (Result)
30+#else
31+import "aeson" Data.Aeson hiding (Result)
32+import qualified "aeson-benchmarks" Data.Aeson as B
33+#endif
23
34
24instance ToJSON Metadata where
35instance ToJSON Metadata where
25
36
@@ -144,3 +155,128 @@ instance FromJSON Result where
144 <*> v .: "max_id_str"
155 <*> v .: "max_id_str"
145 <*> v .: "query"
156 <*> v .: "query"
146 parseJSON _ = empty
157 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.hsdeleted−10
@@ -1,10 +0,0 @@
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+19−7
@@ -1,8 +1,8 @@
1-- Use Template Haskell to generate good instances.
1-- Use Template Haskell to generate good instances.
2
2
3−{-# LANGUAGE NoImplicitPrelude #-}
3+{-# LANGUAGE CPP #-}
4+{-# LANGUAGE PackageImports #-}
4{-# LANGUAGE TemplateHaskell #-}
5{-# LANGUAGE TemplateHaskell #-}
5−
6{-# OPTIONS_GHC -fno-warn-orphans #-}
6{-# OPTIONS_GHC -fno-warn-orphans #-}
7
7
8module Twitter.TH
8module Twitter.TH
@@ -13,13 +13,25 @@ module Twitter.TH
13 , Result(..)
13 , Result(..)
14 ) where
14 ) where
15
15
16+import Prelude ()
16
17
17import Twitter
18import Twitter
18−import Twitter.Options
19
19
20+#ifndef HAS_BOTH_AESON_AND_BENCHMARKS
20import Data.Aeson.TH
21import 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)
21
31
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
13+import Data.ByteString.Internal as B hiding (c2w)
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+40−22
@@ -1,10 +1,3 @@
1−-- WARNING: This file is security sensitive as it uses unsafeWrite which does
2−-- not check bounds. Any changes should be made with care and we would love to
3−-- get informed about them, just cc us in any PR targetting this file: @eskimor @jprider63
4−-- We would be happy to review the changes!
5−
6−-- The security check at the end (pos > length) only works if pos grows
7−-- monotonously, if this condition does not hold, the check is flawed.
8module Data.Aeson.Parser.UnescapePure
1module Data.Aeson.Parser.UnescapePure
9 (
2 (
10 unescapeText
3 unescapeText
@@ -119,21 +112,41 @@ decode UtfTail1 point word = case word of
119 w | 0x80 <= w && w <= 0xbf -> (UtfGround, setByte1 point word)
112 w | 0x80 <= w && w <= 0xbf -> (UtfGround, setByte1 point word)
120 _ -> throwDecodeError
113 _ -> throwDecodeError
121
114
115+{-# INLINE decode #-}
116+
122decodeHex :: Word8 -> Word16
117decodeHex :: Word8 -> Word16
123−decodeHex x
118+decodeHex 48 = 0 -- '0'
124− | 48 <= x && x <= 57 = fromIntegral x - 48 -- 0-9
119+decodeHex 49 = 1 -- '1'
125− | 65 <= x && x <= 70 = fromIntegral x - 55 -- A-F
120+decodeHex 50 = 2 -- '2'
126− | 97 <= x && x <= 102 = fromIntegral x - 87 -- a-f
121+decodeHex 51 = 3 -- '3'
122+decodeHex 52 = 4 -- '4'
123+decodeHex 53 = 5 -- '5'
124+decodeHex 54 = 6 -- '6'
125+decodeHex 55 = 7 -- '7'
126+decodeHex 56 = 8 -- '8'
127+decodeHex 57 = 9 -- '9'
128+decodeHex 65 = 10 -- 'A'
129+decodeHex 97 = 10 -- 'a'
130+decodeHex 66 = 11 -- 'B'
131+decodeHex 98 = 11 -- 'b'
132+decodeHex 67 = 12 -- 'C'
133+decodeHex 99 = 12 -- 'c'
134+decodeHex 68 = 13 -- 'D'
135+decodeHex 100 = 13 -- 'd'
136+decodeHex 69 = 14 -- 'E'
137+decodeHex 101 = 14 -- 'e'
138+decodeHex 70 = 15 -- 'F'
139+decodeHex 102 = 15 -- 'f'
127− | otherwise = throwDecodeError
140+decodeHex _ = throwDecodeError
141+{-# INLINE decodeHex #-}
128
142
129unescapeText' :: ByteString -> Text
143unescapeText' :: ByteString -> Text
130unescapeText' bs = runText $ \done -> do
144unescapeText' bs = runText $ \done -> do
131 dest <- A.new len
145 dest <- A.new len
146+ (pos, finalState) <- B.foldl' (f' dest) (return (0, StateNone)) bs
132
147
133− (pos, finalState) <- loop dest (0, StateNone) 0
148+ -- Check final state.
134−
135− -- Check final state. Currently pos gets only increased over time, so this check should catch overflows.
136− when ( finalState /= StateNone || pos > len)
149+ when ( finalState /= StateNone)
137 throwDecodeError
150 throwDecodeError
138
151
139 done dest pos -- TODO: pos, pos-1??? XXX
152 done dest pos -- TODO: pos, pos-1??? XXX
@@ -152,12 +165,11 @@ unescapeText' bs = runText $ \done -> do
152 (st', p) ->
165 (st', p) ->
153 return (pos, StateUtf st' p)
166 return (pos, StateUtf st' p)
154
167
155− loop :: A.MArray s -> (Int, State) -> Int -> ST s (Int, State)
168+ {-# INLINE runUtf #-}
156− loop _ ps i | i >= len = return ps
169+
157− loop dest ps i = do
158− let c = B.index bs i -- JP: We can use unsafe index once we prove bounds with Liquid Haskell.
159− ps' <- f dest ps c
170+ f' dest m c = m >>= \s -> f dest s c
160− loop dest ps' $ i+1
171+
172+ {-# INLINE f' #-}
161
173
162 -- No pending state.
174 -- No pending state.
163 f dest (pos, StateNone) c = runUtf dest pos UtfGround 0 c
175 f dest (pos, StateNone) c = runUtf dest pos UtfGround 0 c
@@ -234,6 +246,10 @@ unescapeText' bs = runText $ \done -> do
234 else
246 else
235 writeAndReturn dest pos u StateNone
247 writeAndReturn dest pos u StateNone
236
248
249+ {-# INLINE f #-}
250+
251+{-# INLINE unescapeText' #-}
252+
237write :: A.MArray s -> Int -> Word16 -> ST s ()
253write :: A.MArray s -> Int -> Word16 -> ST s ()
238write dest pos char =
254write dest pos char =
239 A.unsafeWrite dest pos char
255 A.unsafeWrite dest pos char
@@ -249,6 +265,8 @@ throwDecodeError :: a
249throwDecodeError =
265throwDecodeError =
250 let desc = "Data.Text.Internal.Encoding.decodeUtf8: Invalid UTF-8 stream" in
266 let desc = "Data.Text.Internal.Encoding.decodeUtf8: Invalid UTF-8 stream" in
251 throw (DecodeError desc Nothing)
267 throw (DecodeError desc Nothing)
268+{-# INLINE throwDecodeError #-}
252
269
253unescapeText :: ByteString -> Either UnicodeException Text
270unescapeText :: ByteString -> Either UnicodeException Text
254unescapeText = unsafeDupablePerformIO . try . evaluate . unescapeText'
271unescapeText = unsafeDupablePerformIO . try . evaluate . unescapeText'
272+{-# INLINE unescapeText #-}
run-hlint.shdeleted−7
@@ -1,7 +0,0 @@
1−#!/bin/bash
2−
3−if hash hlint 2>/dev/null; then
4− hlint "$@"
5−else
6− ./hlint.sh "$@"
7−fi
stack-bench.yaml+2−10
@@ -1,12 +1,4 @@
1−resolver: nightly-2019-09-21
1+resolver: lts-8.5
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
10packages:
2packages:
3+- '.'
11- benchmarks
4- benchmarks
12−extra-deps: []
stack-lts12.yamldeleted−15
@@ -1,15 +0,0 @@
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.yamlnew file+11
@@ -0,0 +1,11 @@
1+resolver: lts-6.30
2+packages:
3+- '.'
4+extra-deps:
5+- semigroups-0.18.2
6+- integer-logarithms-1
7+flags:
8+ aeson:
9+ fast: true
10+ semigroups:
11+ bytestring-builder: false
stack-ffi-unescape.yaml → stack-lts7.yamlrenamed+3−4
@@ -1,9 +1,8 @@
1−resolver: nightly-2019-09-21
1+resolver: lts-7.19
2packages:
2packages:
3- '.'
3- '.'
4+extra-deps:
5+- integer-logarithms-1
4flags:
6flags:
5 aeson:
7 aeson:
6 fast: true
8 fast: true
7− cffi: true
8−extra-deps:
9−- Diff-0.4.0
stack-lts8.yamlnew file+6
@@ -0,0 +1,6 @@
1+resolver: lts-8.1
2+packages:
3+- '.'
4+flags:
5+ aeson:
6+ fast: true
stack-nightly.yaml+3−6
@@ -1,11 +1,8 @@
1−resolver: nightly-2019-10-14
1+resolver: nightly-2017-02-29
2packages:
2packages:
3- '.'
3- '.'
4−- attoparsec-iso8601
4+extra-deps:
5+- integer-logarithms-1
5flags:
6flags:
6 aeson:
7 aeson:
7 fast: true
8 fast: true
8− attoparsec-iso8601:
9− fast: true
10−extra-deps:
11−- generic-deriving-1.12.4
stack-pure-unescape.yamlnew file+7
@@ -0,0 +1,7 @@
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 #-}
4{-# LANGUAGE TemplateHaskell #-}
3{-# LANGUAGE TemplateHaskell #-}
5
4
6−module DataFamilies.Encoders (module DataFamilies.Encoders) where
5+module DataFamilies.Encoders where
7
6
7+import Prelude ()
8import Prelude.Compat
8import Prelude.Compat
9
9
10import Data.Aeson.TH
10import Data.Aeson.TH
tests/DataFamilies/Instances.hs+1−2
@@ -1,13 +1,12 @@
1{-# LANGUAGE FlexibleInstances #-}
1{-# LANGUAGE FlexibleInstances #-}
2{-# LANGUAGE GADTs #-}
2{-# LANGUAGE GADTs #-}
3−{-# LANGUAGE NoImplicitPrelude #-}
4{-# LANGUAGE TemplateHaskell #-}
3{-# LANGUAGE TemplateHaskell #-}
5{-# LANGUAGE TypeFamilies #-}
4{-# LANGUAGE TypeFamilies #-}
6−
7{-# OPTIONS_GHC -fno-warn-orphans #-}
5{-# OPTIONS_GHC -fno-warn-orphans #-}
8
6
9module DataFamilies.Instances () where
7module DataFamilies.Instances () where
10
8
9+import Prelude ()
11import Prelude.Compat
10import Prelude.Compat
12
11
13import Data.Aeson.TH
12import Data.Aeson.TH
tests/DataFamilies/Properties.hs+5−6
@@ -1,21 +1,20 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2−{-# LANGUAGE NoImplicitPrelude #-}
3
2
4module DataFamilies.Properties (tests) where
3module DataFamilies.Properties (tests) where
5
4
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 PropUtils
10+import Properties hiding (tests)
11
11
12−
13−import Test.Tasty (TestTree, testGroup)
12+import Test.Framework (Test, testGroup)
14−import Test.Tasty.QuickCheck (testProperty)
13+import Test.Framework.Providers.QuickCheck2 (testProperty)
15
14
16--------------------------------------------------------------------------------
15--------------------------------------------------------------------------------
17
16
18−tests :: TestTree
17+tests :: Test
19tests = testGroup "data families" [
18tests = testGroup "data families" [
20 testGroup "template-haskell" [
19 testGroup "template-haskell" [
21 testGroup "toJSON" [
20 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 #-}
8{-# LANGUAGE StandaloneDeriving #-}
7{-# LANGUAGE StandaloneDeriving #-}
9{-# LANGUAGE TemplateHaskell #-}
8{-# LANGUAGE TemplateHaskell #-}
10{-# LANGUAGE TypeFamilies #-}
9{-# LANGUAGE TypeFamilies #-}
11
10
12−module DataFamilies.Types (module DataFamilies.Types) where
11+module DataFamilies.Types where
13
12
13+import Prelude ()
14import Prelude.Compat
14import Prelude.Compat
15
15
16import Generics.Deriving.TH (deriveAll0)
16import Generics.Deriving.TH (deriveAll0)
tests/Encoders.hs+8−110
@@ -1,12 +1,11 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2{-# LANGUAGE GADTs #-}
2{-# LANGUAGE GADTs #-}
3−{-# LANGUAGE NoImplicitPrelude #-}
4{-# LANGUAGE TemplateHaskell #-}
3{-# LANGUAGE TemplateHaskell #-}
5
4
6−module Encoders (module Encoders) where
5+module Encoders where
7
6
7+import Prelude ()
8import Prelude.Compat
8import Prelude.Compat
9−import Data.Text (Text)
10
9
11import Data.Aeson.TH
10import Data.Aeson.TH
12import Data.Aeson.Types
11import Data.Aeson.Types
@@ -97,18 +96,6 @@ gNullaryToEncodingObjectWithSingleField = genericToEncoding optsObjectWithSingle
97gNullaryParseJSONObjectWithSingleField :: Value -> Parser Nullary
96gNullaryParseJSONObjectWithSingleField :: Value -> Parser Nullary
98gNullaryParseJSONObjectWithSingleField = genericParseJSON optsObjectWithSingleField
97gNullaryParseJSONObjectWithSingleField = genericParseJSON optsObjectWithSingleField
99
98
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"
112
99
113--------------------------------------------------------------------------------
100--------------------------------------------------------------------------------
114-- SomeType encoders/decoders
101-- SomeType encoders/decoders
@@ -188,6 +175,7 @@ gSomeTypeToEncoding2ElemArray = genericToEncoding opts2ElemArray
188gSomeTypeParseJSON2ElemArray :: Value -> Parser (SomeType Int)
175gSomeTypeParseJSON2ElemArray :: Value -> Parser (SomeType Int)
189gSomeTypeParseJSON2ElemArray = genericParseJSON opts2ElemArray
176gSomeTypeParseJSON2ElemArray = genericParseJSON opts2ElemArray
190
177
178+#if __GLASGOW_HASKELL__ >= 706
191gSomeTypeLiftToEncoding2ElemArray :: LiftToEncoding SomeType a
179gSomeTypeLiftToEncoding2ElemArray :: LiftToEncoding SomeType a
192gSomeTypeLiftToEncoding2ElemArray = genericLiftToEncoding opts2ElemArray
180gSomeTypeLiftToEncoding2ElemArray = genericLiftToEncoding opts2ElemArray
193
181
@@ -196,6 +184,7 @@ gSomeTypeLiftToJSON2ElemArray = genericLiftToJSON opts2ElemArray
196
184
197gSomeTypeLiftParseJSON2ElemArray :: LiftParseJSON SomeType a
185gSomeTypeLiftParseJSON2ElemArray :: LiftParseJSON SomeType a
198gSomeTypeLiftParseJSON2ElemArray = genericLiftParseJSON opts2ElemArray
186gSomeTypeLiftParseJSON2ElemArray = genericLiftParseJSON opts2ElemArray
187+#endif
199
188
200
189
201gSomeTypeToJSONTaggedObject :: SomeType Int -> Value
190gSomeTypeToJSONTaggedObject :: SomeType Int -> Value
@@ -207,6 +196,7 @@ gSomeTypeToEncodingTaggedObject = genericToEncoding optsTaggedObject
207gSomeTypeParseJSONTaggedObject :: Value -> Parser (SomeType Int)
196gSomeTypeParseJSONTaggedObject :: Value -> Parser (SomeType Int)
208gSomeTypeParseJSONTaggedObject = genericParseJSON optsTaggedObject
197gSomeTypeParseJSONTaggedObject = genericParseJSON optsTaggedObject
209
198
199+#if __GLASGOW_HASKELL__ >= 706
210gSomeTypeLiftToEncodingTaggedObject :: LiftToEncoding SomeType a
200gSomeTypeLiftToEncodingTaggedObject :: LiftToEncoding SomeType a
211gSomeTypeLiftToEncodingTaggedObject = genericLiftToEncoding optsTaggedObject
201gSomeTypeLiftToEncodingTaggedObject = genericLiftToEncoding optsTaggedObject
212
202
@@ -215,6 +205,7 @@ gSomeTypeLiftToJSONTaggedObject = genericLiftToJSON optsTaggedObject
215
205
216gSomeTypeLiftParseJSONTaggedObject :: LiftParseJSON SomeType a
206gSomeTypeLiftParseJSONTaggedObject :: LiftParseJSON SomeType a
217gSomeTypeLiftParseJSONTaggedObject = genericLiftParseJSON optsTaggedObject
207gSomeTypeLiftParseJSONTaggedObject = genericLiftParseJSON optsTaggedObject
208+#endif
218
209
219
210
220gSomeTypeToJSONObjectWithSingleField :: SomeType Int -> Value
211gSomeTypeToJSONObjectWithSingleField :: SomeType Int -> Value
@@ -226,6 +217,7 @@ gSomeTypeToEncodingObjectWithSingleField = genericToEncoding optsObjectWithSingl
226gSomeTypeParseJSONObjectWithSingleField :: Value -> Parser (SomeType Int)
217gSomeTypeParseJSONObjectWithSingleField :: Value -> Parser (SomeType Int)
227gSomeTypeParseJSONObjectWithSingleField = genericParseJSON optsObjectWithSingleField
218gSomeTypeParseJSONObjectWithSingleField = genericParseJSON optsObjectWithSingleField
228
219
220+#if __GLASGOW_HASKELL__ >= 706
229gSomeTypeLiftToEncodingObjectWithSingleField :: LiftToEncoding SomeType a
221gSomeTypeLiftToEncodingObjectWithSingleField :: LiftToEncoding SomeType a
230gSomeTypeLiftToEncodingObjectWithSingleField = genericLiftToEncoding optsObjectWithSingleField
222gSomeTypeLiftToEncodingObjectWithSingleField = genericLiftToEncoding optsObjectWithSingleField
231
223
@@ -234,6 +226,7 @@ gSomeTypeLiftToJSONObjectWithSingleField = genericLiftToJSON optsObjectWithSingl
234
226
235gSomeTypeLiftParseJSONObjectWithSingleField :: LiftParseJSON SomeType a
227gSomeTypeLiftParseJSONObjectWithSingleField :: LiftParseJSON SomeType a
236gSomeTypeLiftParseJSONObjectWithSingleField = genericLiftParseJSON optsObjectWithSingleField
228gSomeTypeLiftParseJSONObjectWithSingleField = genericLiftParseJSON optsObjectWithSingleField
229+#endif
237
230
238
231
239gSomeTypeToJSONOmitNothingFields :: SomeType Int -> Value
232gSomeTypeToJSONOmitNothingFields :: SomeType Int -> Value
@@ -242,58 +235,6 @@ gSomeTypeToJSONOmitNothingFields = genericToJSON optsOmitNothingFields
242gSomeTypeToEncodingOmitNothingFields :: SomeType Int -> Encoding
235gSomeTypeToEncodingOmitNothingFields :: SomeType Int -> Encoding
243gSomeTypeToEncodingOmitNothingFields = genericToEncoding optsOmitNothingFields
236gSomeTypeToEncodingOmitNothingFields = genericToEncoding optsOmitNothingFields
244
237
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−
297--------------------------------------------------------------------------------
238--------------------------------------------------------------------------------
298-- IncoherentInstancesNeeded
239-- IncoherentInstancesNeeded
299--------------------------------------------------------------------------------
240--------------------------------------------------------------------------------
@@ -311,11 +252,6 @@ incoherentInstancesNeededParseJSONString :: FromJSON a => Value -> Parser (Incoh
311incoherentInstancesNeededParseJSONString = case () of
252incoherentInstancesNeededParseJSONString = case () of
312 _ | True -> $(mkParseJSON defaultOptions ''IncoherentInstancesNeeded)
253 _ | True -> $(mkParseJSON defaultOptions ''IncoherentInstancesNeeded)
313 | False -> genericParseJSON defaultOptions
254 | False -> genericParseJSON defaultOptions
314−
315−incoherentInstancesNeededToJSON :: ToJSON a => IncoherentInstancesNeeded a -> Value
316−incoherentInstancesNeededToJSON = case () of
317− _ | True -> $(mkToJSON defaultOptions ''IncoherentInstancesNeeded)
318− | False -> genericToJSON defaultOptions
319#endif
255#endif
320
256
321-------------------------------------------------------------------------------
257-------------------------------------------------------------------------------
@@ -418,41 +354,3 @@ thOneConstructorToEncodingDefault = $(mkToEncoding defaultOptions ''OneConstruct
418
354
419thOneConstructorParseJSONDefault :: Value -> Parser OneConstructor
355thOneConstructorParseJSONDefault :: Value -> Parser OneConstructor
420thOneConstructorParseJSONDefault = $(mkParseJSON defaultOptions ''OneConstructor)
356thOneConstructorParseJSONDefault = $(mkParseJSON defaultOptions ''OneConstructor)
421−
422−thOneConstructorToJSONTagged :: OneConstructor -> Value
423−thOneConstructorToJSONTagged = $(mkToJSON optsTagSingleConstructors ''OneConstructor)
424−
425−thOneConstructorToEncodingTagged :: OneConstructor -> Encoding
426−thOneConstructorToEncodingTagged = $(mkToEncoding optsTagSingleConstructors ''OneConstructor)
427−
428−thOneConstructorParseJSONTagged :: Value -> Parser OneConstructor
429−thOneConstructorParseJSONTagged = $(mkParseJSON optsTagSingleConstructors ''OneConstructor)
430−
431−
432−gOneConstructorToJSONDefault :: OneConstructor -> Value
433−gOneConstructorToJSONDefault = genericToJSON defaultOptions
434−
435−gOneConstructorToEncodingDefault :: OneConstructor -> Encoding
436−gOneConstructorToEncodingDefault = genericToEncoding defaultOptions
437−
438−gOneConstructorParseJSONDefault :: Value -> Parser OneConstructor
439−gOneConstructorParseJSONDefault = genericParseJSON defaultOptions
440−
441−gOneConstructorToJSONTagged :: OneConstructor -> Value
442−gOneConstructorToJSONTagged = genericToJSON optsTagSingleConstructors
443−
444−gOneConstructorToEncodingTagged :: OneConstructor -> Encoding
445−gOneConstructorToEncodingTagged = genericToEncoding optsTagSingleConstructors
446−
447−gOneConstructorParseJSONTagged :: Value -> Parser OneConstructor
448−gOneConstructorParseJSONTagged = genericParseJSON optsTagSingleConstructors
449−
450−--------------------------------------------------------------------------------
451−-- Product2 encoders/decoders
452−--------------------------------------------------------------------------------
453−
454−thProduct2ParseJSON :: Value -> Parser (Product2 Int Bool)
455−thProduct2ParseJSON = $(mkParseJSON defaultOptions ''Product2)
456−
457−gProduct2ParseJSON :: Value -> Parser (Product2 Int Bool)
458−gProduct2ParseJSON = genericParseJSON defaultOptions
tests/ErrorMessages.hs+41−208
@@ -1,4 +1,3 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
2{-# LANGUAGE OverloadedStrings #-}
1{-# LANGUAGE OverloadedStrings #-}
3{-# LANGUAGE ScopedTypeVariables #-}
2{-# LANGUAGE ScopedTypeVariables #-}
4
3
@@ -7,218 +6,52 @@ module ErrorMessages
7 tests
6 tests
8 ) where
7 ) where
9
8
9+import Prelude ()
10import Prelude.Compat
10import Prelude.Compat
11
11
12−import Data.Aeson (FromJSON(..), Value, json)
12+import Data.Aeson (FromJSON(..), eitherDecode)
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)
17import Data.Proxy (Proxy(..))
13import Data.Proxy (Proxy(..))
18−import Data.Semigroup ((<>))
19−import Data.Sequence (Seq)
20import Instances ()
14import Instances ()
21−import Numeric.Natural (Natural)
15+import Test.Framework (Test)
22−import Test.Tasty (TestTree, TestName)
16+import Test.Framework.Providers.HUnit (testCase)
23−import Test.Tasty.Golden.Advanced (goldenTest)
17+import Test.HUnit (Assertion, assertFailure, assertEqual)
24import qualified Data.ByteString.Lazy.Char8 as L
18import qualified Data.ByteString.Lazy.Char8 as L
25import qualified Data.HashMap.Strict as HM
19import qualified Data.HashMap.Strict as HM
26
20
27−import Encoders
28−import Types
29−
30−tests :: [TestTree]
21+tests :: [Test]
31tests =
22tests =
32− [ aesonGoldenTest "simple" "tests/golden/simple.expected" output
23+ [
33− , aesonGoldenTest "generic" "tests/golden/generic.expected" (outputGeneric G)
24+ testCase "Int" int
25+ , testCase "String" string
26+ , testCase "HashMap" hashMap
34− ]
27+ ]
35−
28+
36−output :: Output
29+int :: Assertion
37−output = concat
30+int = do
38− [ testFor "Int" (Proxy :: Proxy Int)
31+ let t = test (Proxy :: Proxy Int)
39− [ "\"\""
32+ t "\"\"" $ expected "Int" "String"
40− , "[]"
33+ t "[]" $ expected "Int" "Array"
41− , "{}"
34+ t "{}" $ expected "Int" "Object"
42− , "null"
35+ t "null" $ expected "Int" "Null"
43− ]
36+
44−
37+string :: Assertion
45− , testFor "Integer" (Proxy :: Proxy Integer)
38+string = do
46− [ "44.44"
47− ]
48−
49− , testFor "Natural" (Proxy :: Proxy Natural)
50− [ "44.44"
51− , "-50"
52− ]
53−
54− , testFor "String" (Proxy :: Proxy String)
39+ let t = test (Proxy :: Proxy String)
55− [ "1"
40+ t "1" $ expected "String" "Number"
56− , "[]"
41+ t "[]" $ expected "String" "Array"
57− , "{}"
42+ t "{}" $ expected "String" "Object"
58− , "null"
43+ t "null" $ expected "String" "Null"
59− ]
44+
60−
45+hashMap :: Assertion
46+hashMap = do
61− , testFor "HashMap" (Proxy :: Proxy (HM.HashMap String Int))
47+ let t = test (Proxy :: Proxy (HM.HashMap String Int))
62− [ "\"\""
48+ t "\"\"" $ expected "HashMap k v" "String"
63− , "[]"
49+ t "[]" $ expected "HashMap k v" "Array"
64− ]
50+
65−
51+expected :: String -> String -> String
66− -- issue #356
52+expected ex enc = "Error in $: expected " ++ ex ++ ", encountered " ++ enc
67− , testFor "Either" (Proxy :: Proxy (Int, Either (Int, Bool) ()))
53+
68− [ "[1,{\"Left\":[2,3]}]"
54+test :: forall a proxy . (FromJSON a, Show a) => proxy a -> L.ByteString -> String -> Assertion
69− ]
55+test _ v msg = case eitherDecode v of
70−
56+ Left e -> assertEqual "Invalid error message" msg e
71− -- issue #358
57+ Right (x :: a) -> assertFailure $ "Expected parsing to fail but it suceeded with: " ++ show x
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+1−2
@@ -1,11 +1,10 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
2−
3module Functions
1module Functions
4 (
2 (
5 approxEq
3 approxEq
6 , approxEqWith
4 , approxEqWith
7 ) where
5 ) where
8
6
7+import Prelude ()
9import Prelude.Compat
8import Prelude.Compat
10
9
11approxEq :: (Fractional a, Ord a) => a -> a -> Bool
10approxEq :: (Fractional a, Ord a) => a -> a -> Bool
tests/Instances.hs+69−7
@@ -1,19 +1,22 @@
1+{-# LANGUAGE CPP #-}
1{-# LANGUAGE FlexibleContexts #-}
2{-# LANGUAGE FlexibleContexts #-}
2{-# LANGUAGE FlexibleInstances #-}
3{-# LANGUAGE FlexibleInstances #-}
3−{-# LANGUAGE NoImplicitPrelude #-}
4{-# LANGUAGE OverloadedStrings #-}
4{-# LANGUAGE OverloadedStrings #-}
5{-# LANGUAGE RecordWildCards #-}
5{-# LANGUAGE RecordWildCards #-}
6−
7{-# OPTIONS_GHC -fno-warn-orphans #-}
6{-# OPTIONS_GHC -fno-warn-orphans #-}
8
7
9module Instances () where
8module Instances () where
10
9
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(..))
17import Data.Time (ZonedTime(..), TimeZone(..))
20import Data.Time (ZonedTime(..), TimeZone(..))
18import Data.Time.Clock (UTCTime(..))
21import Data.Time.Clock (UTCTime(..))
19import Functions
22import Functions
@@ -21,15 +24,32 @@ import Test.QuickCheck (Arbitrary(..), elements, oneof)
21import Types
24import Types
22import qualified Data.DList as DList
25import qualified Data.DList as DList
23import qualified Data.HashMap.Strict as HM
26import 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
24
36
25import Data.Orphans ()
37import Data.Orphans ()
26import Test.QuickCheck.Instances ()
38import Test.QuickCheck.Instances ()
39+#if MIN_VERSION_base(4,7,0)
27import Data.Hashable.Time ()
40import 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) #-}
28
48
29-- "System" types.
49-- "System" types.
30
50
31instance Arbitrary DotNetTime where
51instance Arbitrary DotNetTime where
32− arbitrary = DotNetTime `fmap` arbitrary
52+ arbitrary = DotNetTime `liftM` arbitrary
33 shrink = map DotNetTime . shrink . fromDotNetTime
53 shrink = map DotNetTime . shrink . fromDotNetTime
34
54
35-- | Compare timezone part only on 'timeZoneMinutes'
55-- | Compare timezone part only on 'timeZoneMinutes'
@@ -153,15 +173,57 @@ instance Arbitrary EitherTextInt where
153instance Arbitrary (GADT String) where
173instance Arbitrary (GADT String) where
154 arbitrary = GADT <$> arbitrary
174 arbitrary = GADT <$> arbitrary
155
175
156−instance Arbitrary OptionField where
157− arbitrary = OptionField <$> arbitrary
158−
159−
160instance ApproxEq Char where
176instance ApproxEq Char where
161 (=~) = (==)
177 (=~) = (==)
162
178
163instance (ApproxEq a) => ApproxEq [a] where
179instance (ApproxEq a) => ApproxEq [a] where
164 a =~ b = length a == length b && all (uncurry (=~)) (zip a b)
180 a =~ b = length a == length b && all (uncurry (=~)) (zip a b)
165
181
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+
166instance Arbitrary a => Arbitrary (DList.DList a) where
199instance Arbitrary a => Arbitrary (DList.DList a) where
167 arbitrary = DList.fromList <$> arbitrary
200 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 (main) where
3+module 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+3−5
@@ -1,8 +1,6 @@
1−-- This file has been generated from package.yaml by hpack version 0.28.2.
1+-- This file has been generated from package.yaml by hpack version 0.14.0.
2--
2--
3-- see: https://github.com/sol/hpack
3-- see: https://github.com/sol/hpack
4−--
5−-- hash: 716ef4c3e64849526f097b85ed05015e0072c2e2afcc1f91e58d8bea68b123b2
6
4
7name: testaeson
5name: testaeson
8version: 0.0.0
6version: 0.0.0
@@ -14,8 +12,8 @@ executable testaeson
14 hs-source-dirs:
12 hs-source-dirs:
15 src
13 src
16 build-depends:
14 build-depends:
17− aeson
18− , base >=4.7 && <5
15+ base >= 4.7 && < 5
16+ , aeson
19 , base-prelude
17 , base-prelude
20 , bytestring
18 , bytestring
21 default-language: Haskell2010
19 default-language: Haskell2010
tests/Options.hs+2−26
@@ -1,7 +1,6 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
2−
3−module Options (module Options) where
1+module Options where
4
2
3+import Prelude ()
5import Prelude.Compat
4import Prelude.Compat
6
5
7import Data.Aeson.Types
6import Data.Aeson.Types
@@ -43,26 +42,3 @@ optsUntaggedValue :: Options
43optsUntaggedValue = optsDefault
42optsUntaggedValue = optsDefault
44 { sumEncoding = UntaggedValue
43 { sumEncoding = UntaggedValue
45 }
44 }
46−
47−optsTagSingleConstructors :: Options
48−optsTagSingleConstructors = optsDefault
49− { tagSingleConstructors = True
50− , allNullaryToStringTag = False
51− }
52−
53−optsOptionField :: Options
54−optsOptionField = optsDefault
55− { fieldLabelModifier = const "field"
56− , omitNothingFields = True
57− }
58−
59−optsRejectUnknownFields :: Options
60−optsRejectUnknownFields = optsDefault
61− { rejectUnknownFields = True
62− }
63−
64−optsRejectUnknownFieldsTagged :: Options
65−optsRejectUnknownFieldsTagged = optsDefault
66− { rejectUnknownFields = True
67− , tagSingleConstructors = True
68− }
tests/PropUtils.hsdeleted−208
@@ -1,208 +0,0 @@
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+468−17
@@ -1,28 +1,299 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE FlexibleContexts #-} -- For arbitrary Compose
3+{-# LANGUAGE OverloadedStrings #-}
4+{-# LANGUAGE RankNTypes #-}
5+{-# LANGUAGE ScopedTypeVariables #-}
2
6
3−module Properties (module Properties) where
7+module Properties where
4
8
9+import Prelude ()
5import Prelude.Compat
10import Prelude.Compat
6
11
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
7import Instances ()
32import 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
16
46
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
17
52
53+encodeInteger :: Integer -> Property
54+encodeInteger i = encode i === L.pack (show i)
55+
56+toParseJSON :: (Eq a, Show a) =>
57+ (Value -> Parser a) -> (a -> Value) -> a -> Property
58+toParseJSON parsejson tojson x =
59+ case iparse parsejson . tojson $ x of
60+ IError path msg -> failure "parse" (formatError path msg) x
61+ ISuccess x' -> x === x'
62+
63+toParseJSON1
64+ :: (Eq (f Int), Show (f Int))
65+ => (forall a. LiftParseJSON f a)
66+ -> (forall a. LiftToJSON f a)
67+ -> f Int
68+ -> Property
69+toParseJSON1 parsejson1 tojson1 = toParseJSON parsejson tojson
70+ where
71+ parsejson = parsejson1 parseJSON (listParser parseJSON)
72+ tojson = tojson1 toJSON (listValue toJSON)
73+
74+roundTripEnc :: (FromJSON a, ToJSON a, Show a) =>
75+ (a -> a -> Property) -> a -> a -> Property
76+roundTripEnc eq _ i =
77+ case fmap ifromJSON . L.parse value . encode $ i of
78+ L.Done _ (ISuccess v) -> v `eq` i
79+ L.Done _ (IError path err) -> failure "fromJSON" (formatError path err) i
80+ L.Fail _ _ err -> failure "parse" err i
81+
82+roundTripNoEnc :: (FromJSON a, ToJSON a, Show a) =>
83+ (a -> a -> Property) -> a -> a -> Property
84+roundTripNoEnc eq _ i =
85+ case ifromJSON . toJSON $ i of
86+ (ISuccess v) -> v `eq` i
87+ (IError path err) -> failure "fromJSON" (formatError path err) i
88+
89+roundTripEq :: (Eq a, FromJSON a, ToJSON a, Show a) => a -> a -> Property
90+roundTripEq x y = roundTripEnc (===) x y .&&. roundTripNoEnc (===) x y
91+
92+-- We test keys by encoding HashMap and Map with it
93+roundTripKey
94+ :: (Ord a, Hashable a, FromJSONKey a, ToJSONKey a, Show a)
95+ => a -> HashMap a Int -> Map a Int -> Property
96+roundTripKey _ h m = roundTripEq h h .&&. roundTripEq m m
97+
98+infix 4 ==~
99+(==~) :: (ApproxEq a, Show a) => a -> a -> Property
100+x ==~ y =
101+ counterexample (show x ++ " /= " ++ show y) (x =~ y)
102+
103+toFromJSON :: (Arbitrary a, Eq a, FromJSON a, ToJSON a, Show a) => a -> Property
104+toFromJSON x = case ifromJSON (toJSON x) of
105+ IError path err -> failure "fromJSON" (formatError path err) x
106+ ISuccess x' -> x === x'
107+
108+modifyFailureProp :: String -> String -> Bool
109+modifyFailureProp orig added =
110+ result == Error (added ++ orig)
111+ where
112+ parser = const $ modifyFailure (added ++) $ fail orig
113+ result :: Result ()
114+ result = parse parser ()
115+
116+-- | Perform a structural comparison of the results of two encoding
117+-- methods. Compares decoded values to account for HashMap-driven
118+-- variation in JSON object key ordering.
119+sameAs :: (a -> Value) -> (a -> Encoding) -> a -> Property
120+sameAs toVal toEnc v =
121+ eitherDecode (encodingToLazyByteString (toEnc v)) === Right (toVal v)
122+
123+sameAs1
124+ :: (forall a. LiftToJSON f a)
125+ -> (forall a. LiftToEncoding f a)
126+ -> f Int
127+ -> Property
128+sameAs1 toVal1 toEnc1 v = lhs === rhs
129+ where
130+ rhs = Right $ toVal1 toJSON (listValue toJSON) v
131+ lhs = eitherDecode . encodingToLazyByteString $
132+ toEnc1 toEncoding (listEncoding toEncoding) v
133+
134+sameAs1Agree
135+ :: ToJSON a
136+ => (f a -> Encoding)
137+ -> (forall b. LiftToEncoding f b)
138+ -> f a
139+ -> Property
140+sameAs1Agree toEnc toEnc1 v = rhs === lhs
141+ where
142+ rhs = encodingToLazyByteString $ toEnc v
143+ lhs = encodingToLazyByteString $ toEnc1 toEncoding (listEncoding toEncoding) v
144+
145+type P6 = Product6 Int Bool String (Approx Double) (Int, Approx Double) ()
146+type S4 = Sum4 Int8 ZonedTime T.Text (Map.Map String Int)
147+
148+--------------------------------------------------------------------------------
149+-- Value properties
150+--------------------------------------------------------------------------------
151+
152+-- | 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 -> Bool
174+isTaggedObject (Object obj) = "tag" `H.member` obj
175+isTaggedObject _ = False
176+
177+isObjectWithSingleField :: Value -> Bool
178+isObjectWithSingleField (Object obj) = H.size obj == 1
179+isObjectWithSingleField _ = False
180+
181+-- | is untaggedValue of EitherTextInt
182+isUntaggedValueETI :: Value -> Bool
183+isUntaggedValueETI (String s)
184+ | s == "nonenullary" = True
185+isUntaggedValueETI (Bool _) = True
186+isUntaggedValueETI (Number _) = True
187+isUntaggedValueETI (Array a) = length a == 2
188+isUntaggedValueETI _ = False
189+
190+isEmptyArray :: Value -> Property
191+isEmptyArray = checkValue isEmptyArray'
192+
193+isEmptyArray' :: Value -> Bool
194+isEmptyArray' = (Array mempty ==)
195+
196+
197+--------------------------------------------------------------------------------
198+
199+
18−tests :: TestTree
200+tests :: Test
19tests = testGroup "properties" [
201tests = testGroup "properties" [
20 testGroup "encode" [
202 testGroup "encode" [
21 testProperty "encodeDouble" encodeDouble
203 testProperty "encodeDouble" encodeDouble
22 , testProperty "encodeInteger" encodeInteger
204 , testProperty "encodeInteger" encodeInteger
23 ]
205 ]
24− , roundTripTests
206+ , testGroup "roundTrip" [
25− , keysTests
207+ testProperty "Bool" $ roundTripEq True
208+ , testProperty "Double" $ roundTripEq (1 :: Approx Double)
209+ , testProperty "Int" $ roundTripEq (1 :: Int)
210+ , testProperty "NonEmpty Char" $ roundTripEq (undefined :: NonEmpty Char)
211+ , testProperty "Integer" $ roundTripEq (1 :: Integer)
212+ , testProperty "String" $ roundTripEq ("" :: String)
213+ , testProperty "Text" $ roundTripEq T.empty
214+ , testProperty "Lazy Text" $ roundTripEq LT.empty
215+ , testProperty "Foo" $ roundTripEq (undefined :: Foo)
216+ , testProperty "Day" $ roundTripEq (undefined :: Day)
217+ , testProperty "BCE Day" $ roundTripEq (undefined :: BCEDay)
218+ , testProperty "DotNetTime" $ roundTripEq (undefined :: Approx DotNetTime)
219+ , testProperty "LocalTime" $ roundTripEq (undefined :: LocalTime)
220+ , testProperty "TimeOfDay" $ roundTripEq (undefined :: TimeOfDay)
221+ , testProperty "UTCTime" $ roundTripEq (undefined :: UTCTime)
222+ , testProperty "ZonedTime" $ roundTripEq (undefined :: ZonedTime)
223+ , testProperty "NominalDiffTime" $ roundTripEq (undefined :: NominalDiffTime)
224+ , testProperty "Version" $ roundTripEq (undefined :: Version)
225+ , testProperty "Natural" $ roundTripEq (undefined :: Natural)
226+ , testProperty "Proxy" $ roundTripEq (undefined :: Proxy Int)
227+ , testProperty "Tagged" $ roundTripEq (undefined :: Tagged Int Char)
228+ , testProperty "Const" $ roundTripEq (undefined :: Const Int Char)
229+ , testProperty "DList" $ roundTripEq (undefined :: DList Int)
230+ , testProperty "Seq" $ roundTripEq (undefined :: Seq Int)
231+ , testProperty "Rational" $ roundTripEq (undefined :: Rational)
232+ , testProperty "Ratio Int" $ roundTripEq (undefined :: Ratio Int)
233+ , testProperty "UUID" $ roundTripEq UUID.nil
234+ , testGroup "functors"
235+ [ testProperty "Identity Char" $ roundTripEq (undefined :: I Int)
236+
237+ , testProperty "Identity Char" $ roundTripEq (undefined :: I Char)
238+ , testProperty "Identity [Char]" $ roundTripEq (undefined :: I String)
239+ , testProperty "[Identity Char]" $ roundTripEq (undefined :: [I Char])
240+
241+ , testProperty "Compose I I Int" $ roundTripEq (undefined :: LogScaled (Compose I I Int))
242+ , testProperty "Compose [] I Int" $ roundTripEq (undefined :: LogScaled (Compose [] I Int))
243+ , testProperty "Compose I [] Int" $ roundTripEq (undefined :: LogScaled (Compose I [] Int))
244+ , testProperty "Compose [] [] Int" $ roundTripEq (undefined :: LogScaled (Compose [] [] Int))
245+
246+ , testProperty "Compose I I Char" $ roundTripEq (undefined :: LogScaled (Compose I I Char))
247+ , testProperty "Compose [] I Char" $ roundTripEq (undefined :: LogScaled (Compose [] I Char))
248+ , testProperty "Compose I [] Char" $ roundTripEq (undefined :: LogScaled (Compose I [] Char))
249+ , testProperty "Compose [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose [] [] Char))
250+
251+ , testProperty "Compose3 I I I Char" $ roundTripEq (undefined :: LogScaled (Compose3 I I I Char))
252+ , testProperty "Compose3 I [] I Char" $ roundTripEq (undefined :: LogScaled (Compose3 I [] I Char))
253+ , testProperty "Compose3 I I [] Char" $ roundTripEq (undefined :: LogScaled (Compose3 I I [] Char))
254+ , testProperty "Compose3 I [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose3 I [] [] Char))
255+ , testProperty "Compose3 [] I I Char" $ roundTripEq (undefined :: LogScaled (Compose3 [] I I Char))
256+ , testProperty "Compose3 [] [] I Char" $ roundTripEq (undefined :: LogScaled (Compose3 [] [] I Char))
257+ , testProperty "Compose3 [] I [] Char" $ roundTripEq (undefined :: LogScaled (Compose3 [] I [] Char))
258+ , testProperty "Compose3 [] [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose3 [] [] [] Char))
259+
260+ , testProperty "Compose3' I I I Char" $ roundTripEq (undefined :: LogScaled (Compose3' I I I Char))
261+ , testProperty "Compose3' I [] I Char" $ roundTripEq (undefined :: LogScaled (Compose3' I [] I Char))
262+ , testProperty "Compose3' I I [] Char" $ roundTripEq (undefined :: LogScaled (Compose3' I I [] Char))
263+ , testProperty "Compose3' I [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose3' I [] [] Char))
264+ , testProperty "Compose3' [] I I Char" $ roundTripEq (undefined :: LogScaled (Compose3' [] I I Char))
265+ , testProperty "Compose3' [] [] I Char" $ roundTripEq (undefined :: LogScaled (Compose3' [] [] I Char))
266+ , testProperty "Compose3' [] I [] Char" $ roundTripEq (undefined :: LogScaled (Compose3' [] I [] Char))
267+ , testProperty "Compose3' [] [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose3' [] [] [] Char))
268+ ]
269+ , testGroup "ghcGenerics" [
270+ testProperty "OneConstructor" $ roundTripEq OneConstructor
271+ , testProperty "Product2" $ roundTripEq (undefined :: Product2 Int Bool)
272+ , testProperty "Product6" $ roundTripEq (undefined :: P6)
273+ , testProperty "Sum4" $ roundTripEq (undefined :: S4)
274+ ]
275+ ]
276+ , testGroup "roundTrip Key"
277+ [ testProperty "Bool" $ roundTripKey True
278+ , testProperty "Text" $ roundTripKey (undefined :: T.Text)
279+ , testProperty "String" $ roundTripKey (undefined :: String)
280+ , testProperty "Int" $ roundTripKey (undefined :: Int)
281+ , testProperty "[Text]" $ roundTripKey (undefined :: LogScaled [T.Text])
282+ , testProperty "(Int,Char)" $ roundTripKey (undefined :: (Int,Char))
283+ , testProperty "Integer" $ roundTripKey (undefined :: Integer)
284+ , testProperty "Natural" $ roundTripKey (undefined :: Natural)
285+ , testProperty "Float" $ roundTripKey (undefined :: Float)
286+ , testProperty "Double" $ roundTripKey (undefined :: Double)
287+#if MIN_VERSION_base(4,7,0)
288+ , testProperty "Day" $ roundTripKey (undefined :: Day)
289+ , testProperty "LocalTime" $ roundTripKey (undefined :: LocalTime)
290+ , testProperty "TimeOfDay" $ roundTripKey (undefined :: TimeOfDay)
291+ , testProperty "UTCTime" $ roundTripKey (undefined :: UTCTime)
292+#endif
293+ , testProperty "Version" $ roundTripKey (undefined :: Version)
294+ , testProperty "Lazy Text" $ roundTripKey (undefined :: LT.Text)
295+ , testProperty "UUID" $ roundTripKey UUID.nil
296+ ]
26 , testGroup "toFromJSON" [
297 , testGroup "toFromJSON" [
27 testProperty "Integer" (toFromJSON :: Integer -> Property)
298 testProperty "Integer" (toFromJSON :: Integer -> Property)
28 , testProperty "Double" (toFromJSON :: Double -> Property)
299 , testProperty "Double" (toFromJSON :: Double -> Property)
@@ -32,9 +303,189 @@ tests = testGroup "properties" [
32 ]
303 ]
33 , testGroup "failure messages" [
304 , testGroup "failure messages" [
34 testProperty "modify failure" modifyFailureProp
305 testProperty "modify failure" modifyFailureProp
35− , testProperty "parserThrowError" parserThrowErrorProp
36− , testProperty "parserCatchError" parserCatchErrorProp
37 ]
306 ]
38− , genericTests
307+ , testGroup "generic" [
39− , templateHaskellTests
308+ testGroup "toJSON" [
309+ testGroup "Nullary" [
310+ testProperty "string" (isString . gNullaryToJSONString)
311+ , testProperty "2ElemArray" (is2ElemArray . gNullaryToJSON2ElemArray)
312+ , testProperty "TaggedObject" (isNullaryTaggedObject . gNullaryToJSONTaggedObject)
313+ , testProperty "ObjectWithSingleField" (isObjectWithSingleField . gNullaryToJSONObjectWithSingleField)
314+ , testGroup "roundTrip" [
315+ testProperty "string" (toParseJSON gNullaryParseJSONString gNullaryToJSONString)
316+ , testProperty "2ElemArray" (toParseJSON gNullaryParseJSON2ElemArray gNullaryToJSON2ElemArray)
317+ , testProperty "TaggedObject" (toParseJSON gNullaryParseJSONTaggedObject gNullaryToJSONTaggedObject)
318+ , testProperty "ObjectWithSingleField" (toParseJSON gNullaryParseJSONObjectWithSingleField gNullaryToJSONObjectWithSingleField)
319+ ]
320+ ]
321+ , testGroup "EitherTextInt" [
322+ testProperty "UntaggedValue" (isUntaggedValueETI . gEitherTextIntToJSONUntaggedValue)
323+ , testProperty "roundtrip" (toParseJSON gEitherTextIntParseJSONUntaggedValue gEitherTextIntToJSONUntaggedValue)
324+ ]
325+ , testGroup "SomeType" [
326+ testProperty "2ElemArray" (is2ElemArray . gSomeTypeToJSON2ElemArray)
327+ , testProperty "TaggedObject" (isTaggedObject . gSomeTypeToJSONTaggedObject)
328+ , testProperty "ObjectWithSingleField" (isObjectWithSingleField . gSomeTypeToJSONObjectWithSingleField)
329+ , testGroup "roundTrip" [
330+ testProperty "2ElemArray" (toParseJSON gSomeTypeParseJSON2ElemArray gSomeTypeToJSON2ElemArray)
331+ , testProperty "TaggedObject" (toParseJSON gSomeTypeParseJSONTaggedObject gSomeTypeToJSONTaggedObject)
332+ , testProperty "ObjectWithSingleField" (toParseJSON gSomeTypeParseJSONObjectWithSingleField gSomeTypeToJSONObjectWithSingleField)
333+
334+#if __GLASGOW_HASKELL__ >= 706
335+ , testProperty "2ElemArray unary" (toParseJSON1 gSomeTypeLiftParseJSON2ElemArray gSomeTypeLiftToJSON2ElemArray)
336+ , testProperty "TaggedObject unary" (toParseJSON1 gSomeTypeLiftParseJSONTaggedObject gSomeTypeLiftToJSONTaggedObject)
337+ , testProperty "ObjectWithSingleField unary" (toParseJSON1 gSomeTypeLiftParseJSONObjectWithSingleField gSomeTypeLiftToJSONObjectWithSingleField)
338+#endif
339+ ]
340+ ]
341+ ]
342+ , testGroup "toEncoding" [
343+ testProperty "NullaryString" $
344+ gNullaryToJSONString `sameAs` gNullaryToEncodingString
345+ , testProperty "Nullary2ElemArray" $
346+ gNullaryToJSON2ElemArray `sameAs` gNullaryToEncoding2ElemArray
347+ , testProperty "NullaryTaggedObject" $
348+ gNullaryToJSONTaggedObject `sameAs` gNullaryToEncodingTaggedObject
349+ , testProperty "NullaryObjectWithSingleField" $
350+ gNullaryToJSONObjectWithSingleField `sameAs`
351+ gNullaryToEncodingObjectWithSingleField
352+ -- , testProperty "ApproxUnwrap" $
353+ -- gApproxToJSONUnwrap `sameAs` gApproxToEncodingUnwrap
354+ , testProperty "ApproxDefault" $
355+ gApproxToJSONDefault `sameAs` gApproxToEncodingDefault
356+
357+ , testProperty "EitherTextInt UntaggedValue" $
358+ gEitherTextIntToJSONUntaggedValue `sameAs` gEitherTextIntToEncodingUntaggedValue
359+
360+ , testProperty "SomeType2ElemArray" $
361+ gSomeTypeToJSON2ElemArray `sameAs` gSomeTypeToEncoding2ElemArray
362+#if __GLASGOW_HASKELL__ >= 706
363+ , testProperty "SomeType2ElemArray unary" $
364+ gSomeTypeLiftToJSON2ElemArray `sameAs1` gSomeTypeLiftToEncoding2ElemArray
365+ , testProperty "SomeType2ElemArray unary agree" $
366+ gSomeTypeToEncoding2ElemArray `sameAs1Agree` gSomeTypeLiftToEncoding2ElemArray
367+#endif
368+
369+ , testProperty "SomeTypeTaggedObject" $
370+ gSomeTypeToJSONTaggedObject `sameAs` gSomeTypeToEncodingTaggedObject
371+#if __GLASGOW_HASKELL__ >= 706
372+ , testProperty "SomeTypeTaggedObject unary" $
373+ gSomeTypeLiftToJSONTaggedObject `sameAs1` gSomeTypeLiftToEncodingTaggedObject
374+ , testProperty "SomeTypeTaggedObject unary agree" $
375+ gSomeTypeToEncodingTaggedObject `sameAs1Agree` gSomeTypeLiftToEncodingTaggedObject
376+#endif
377+
378+ , testProperty "SomeTypeObjectWithSingleField" $
379+ gSomeTypeToJSONObjectWithSingleField `sameAs` gSomeTypeToEncodingObjectWithSingleField
380+#if __GLASGOW_HASKELL__ >= 706
381+ , testProperty "SomeTypeObjectWithSingleField unary" $
382+ gSomeTypeLiftToJSONObjectWithSingleField `sameAs1` gSomeTypeLiftToEncodingObjectWithSingleField
383+ , testProperty "SomeTypeObjectWithSingleField unary agree" $
384+ gSomeTypeToEncodingObjectWithSingleField `sameAs1Agree` gSomeTypeLiftToEncodingObjectWithSingleField
385+#endif
386+
387+ , testProperty "SomeTypeOmitNothingFields" $
388+ gSomeTypeToJSONOmitNothingFields `sameAs` gSomeTypeToEncodingOmitNothingFields
389+ ]
390+ ]
391+ , testGroup "template-haskell" [
392+ testGroup "toJSON" [
393+ testGroup "Nullary" [
394+ testProperty "string" (isString . thNullaryToJSONString)
395+ , testProperty "2ElemArray" (is2ElemArray . thNullaryToJSON2ElemArray)
396+ , testProperty "TaggedObject" (isNullaryTaggedObject . thNullaryToJSONTaggedObject)
397+ , testProperty "ObjectWithSingleField" (isObjectWithSingleField . thNullaryToJSONObjectWithSingleField)
398+
399+ , testGroup "roundTrip" [
400+ testProperty "string" (toParseJSON thNullaryParseJSONString thNullaryToJSONString)
401+ , testProperty "2ElemArray" (toParseJSON thNullaryParseJSON2ElemArray thNullaryToJSON2ElemArray)
402+ , testProperty "TaggedObject" (toParseJSON thNullaryParseJSONTaggedObject thNullaryToJSONTaggedObject)
403+ , testProperty "ObjectWithSingleField" (toParseJSON thNullaryParseJSONObjectWithSingleField thNullaryToJSONObjectWithSingleField)
404+ ]
405+ ]
406+ , testGroup "EitherTextInt" [
407+ testProperty "UntaggedValue" (isUntaggedValueETI . thEitherTextIntToJSONUntaggedValue)
408+ , testProperty "roundtrip" (toParseJSON thEitherTextIntParseJSONUntaggedValue thEitherTextIntToJSONUntaggedValue)
409+ ]
410+ , testGroup "SomeType" [
411+ testProperty "2ElemArray" (is2ElemArray . thSomeTypeToJSON2ElemArray)
412+ , testProperty "TaggedObject" (isTaggedObject . thSomeTypeToJSONTaggedObject)
413+ , testProperty "ObjectWithSingleField" (isObjectWithSingleField . thSomeTypeToJSONObjectWithSingleField)
414+ , testGroup "roundTrip" [
415+ testProperty "2ElemArray" (toParseJSON thSomeTypeParseJSON2ElemArray thSomeTypeToJSON2ElemArray)
416+ , testProperty "TaggedObject" (toParseJSON thSomeTypeParseJSONTaggedObject thSomeTypeToJSONTaggedObject)
417+ , testProperty "ObjectWithSingleField" (toParseJSON thSomeTypeParseJSONObjectWithSingleField thSomeTypeToJSONObjectWithSingleField)
418+
419+ , testProperty "2ElemArray unary" (toParseJSON1 thSomeTypeLiftParseJSON2ElemArray thSomeTypeLiftToJSON2ElemArray)
420+ , testProperty "TaggedObject unary" (toParseJSON1 thSomeTypeLiftParseJSONTaggedObject thSomeTypeLiftToJSONTaggedObject)
421+ , testProperty "ObjectWithSingleField unary" (toParseJSON1 thSomeTypeLiftParseJSONObjectWithSingleField thSomeTypeLiftToJSONObjectWithSingleField)
422+
423+ ]
424+ ]
425+ , testGroup "Approx" [
426+ testProperty "string" (isString . thApproxToJSONUnwrap)
427+ , testProperty "ObjectWithSingleField" (isObjectWithSingleField . thApproxToJSONDefault)
428+ , testGroup "roundTrip" [
429+ testProperty "string" (toParseJSON thApproxParseJSONUnwrap thApproxToJSONUnwrap)
430+ , testProperty "ObjectWithSingleField" (toParseJSON thApproxParseJSONDefault thApproxToJSONDefault)
431+ ]
432+ ]
433+ , testGroup "GADT" [
434+ testProperty "string" (isString . thGADTToJSONUnwrap)
435+ , testProperty "ObjectWithSingleField" (isObjectWithSingleField . thGADTToJSONDefault)
436+ , testGroup "roundTrip" [
437+ testProperty "string" (toParseJSON thGADTParseJSONUnwrap thGADTToJSONUnwrap)
438+ , testProperty "ObjectWithSingleField" (toParseJSON thGADTParseJSONDefault thGADTToJSONDefault)
439+ ]
440+ ]
441+ , testGroup "OneConstructor" [
442+ testProperty "default" (isEmptyArray . thOneConstructorToJSONDefault)
443+ , testGroup "roundTrip" [
444+ testProperty "default" (toParseJSON thOneConstructorParseJSONDefault thOneConstructorToJSONDefault)
445+ ]
446+ ]
447+ ]
448+ , testGroup "toEncoding" [
449+ testProperty "NullaryString" $
450+ thNullaryToJSONString `sameAs` thNullaryToEncodingString
451+ , testProperty "Nullary2ElemArray" $
452+ thNullaryToJSON2ElemArray `sameAs` thNullaryToEncoding2ElemArray
453+ , testProperty "NullaryTaggedObject" $
454+ thNullaryToJSONTaggedObject `sameAs` thNullaryToEncodingTaggedObject
455+ , testProperty "NullaryObjectWithSingleField" $
456+ thNullaryToJSONObjectWithSingleField `sameAs`
457+ thNullaryToEncodingObjectWithSingleField
458+ , testProperty "ApproxUnwrap" $
459+ thApproxToJSONUnwrap `sameAs` thApproxToEncodingUnwrap
460+ , testProperty "ApproxDefault" $
461+ thApproxToJSONDefault `sameAs` thApproxToEncodingDefault
462+
463+ , testProperty "EitherTextInt UntaggedValue" $
464+ thEitherTextIntToJSONUntaggedValue `sameAs` thEitherTextIntToEncodingUntaggedValue
465+
466+ , testProperty "SomeType2ElemArray" $
467+ thSomeTypeToJSON2ElemArray `sameAs` thSomeTypeToEncoding2ElemArray
468+ , testProperty "SomeType2ElemArray unary" $
469+ thSomeTypeLiftToJSON2ElemArray `sameAs1` thSomeTypeLiftToEncoding2ElemArray
470+ , testProperty "SomeType2ElemArray unary agree" $
471+ thSomeTypeToEncoding2ElemArray `sameAs1Agree` thSomeTypeLiftToEncoding2ElemArray
472+
473+ , testProperty "SomeTypeTaggedObject" $
474+ thSomeTypeToJSONTaggedObject `sameAs` thSomeTypeToEncodingTaggedObject
475+ , testProperty "SomeTypeTaggedObject unary" $
476+ thSomeTypeLiftToJSONTaggedObject `sameAs1` thSomeTypeLiftToEncodingTaggedObject
477+ , testProperty "SomeTypeTaggedObject unary agree" $
478+ thSomeTypeToEncodingTaggedObject `sameAs1Agree` thSomeTypeLiftToEncodingTaggedObject
479+
480+ , testProperty "SomeTypeObjectWithSingleField" $
481+ thSomeTypeToJSONObjectWithSingleField `sameAs` thSomeTypeToEncodingObjectWithSingleField
482+ , testProperty "SomeTypeObjectWithSingleField unary" $
483+ thSomeTypeLiftToJSONObjectWithSingleField `sameAs1` thSomeTypeLiftToEncodingObjectWithSingleField
484+ , testProperty "SomeTypeObjectWithSingleField unary agree" $
485+ thSomeTypeToEncodingObjectWithSingleField `sameAs1Agree` thSomeTypeLiftToEncodingObjectWithSingleField
486+
487+ , testProperty "OneConstructor" $
488+ thOneConstructorToJSONDefault `sameAs` thOneConstructorToEncodingDefault
489+ ]
490+ ]
40 ]
491 ]
tests/PropertyGeneric.hsdeleted−116
@@ -1,116 +0,0 @@
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.hsdeleted−40
@@ -1,40 +0,0 @@
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.hsdeleted−51
@@ -1,51 +0,0 @@
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.hsdeleted−74
@@ -1,74 +0,0 @@
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.hsdeleted−130
@@ -1,130 +0,0 @@
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+132−181
@@ -1,9 +1,10 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2{-# LANGUAGE DeriveGeneric #-}
2{-# LANGUAGE DeriveGeneric #-}
3{-# LANGUAGE GADTs #-}
3{-# LANGUAGE GADTs #-}
4−{-# LANGUAGE NoImplicitPrelude #-}
5{-# LANGUAGE OverloadedStrings #-}
4{-# LANGUAGE OverloadedStrings #-}
5+#if __GLASGOW_HASKELL__ >= 708
6{-# LANGUAGE DataKinds #-}
6{-# LANGUAGE DataKinds #-}
7+#endif
7
8
8------------------------------------------------------------------------------
9------------------------------------------------------------------------------
9-- These tests assert that the JSON serialization doesn't change by accident.
10-- These tests assert that the JSON serialization doesn't change by accident.
@@ -14,13 +15,13 @@ module SerializationFormatSpec
14 tests
15 tests
15 ) where
16 ) where
16
17
18+import Prelude ()
17import Prelude.Compat
19import Prelude.Compat
18
20
19import Control.Applicative (Const(..))
21import Control.Applicative (Const(..))
20import Data.Aeson (FromJSON(..), decode, encode, genericParseJSON, genericToEncoding, genericToJSON)
22import Data.Aeson (FromJSON(..), decode, encode, genericParseJSON, genericToEncoding, genericToJSON)
21import Data.Aeson.Types (Options(..), SumEncoding(..), ToJSON(..), defaultOptions)
23import Data.Aeson.Types (Options(..), SumEncoding(..), ToJSON(..), defaultOptions)
22import Data.Fixed (Pico)
24import Data.Fixed (Pico)
23−import Data.Foldable (for_, toList)
24import Data.Functor.Compose (Compose(..))
25import Data.Functor.Compose (Compose(..))
25import Data.Functor.Identity (Identity(..))
26import Data.Functor.Identity (Identity(..))
26import Data.Functor.Product (Product(..))
27import Data.Functor.Product (Product(..))
@@ -30,14 +31,12 @@ import Data.Proxy (Proxy(..))
30import Data.Scientific (Scientific)
31import Data.Scientific (Scientific)
31import Data.Tagged (Tagged(..))
32import Data.Tagged (Tagged(..))
32import Data.Time (fromGregorian)
33import 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 (..))
36import Data.Word (Word8)
34import Data.Word (Word8)
37import GHC.Generics (Generic)
35import GHC.Generics (Generic)
38import Instances ()
36import Instances ()
39−import Test.Tasty (TestTree, testGroup)
37+import Test.Framework (Test, testGroup)
38+import Test.Framework.Providers.HUnit (testCase)
40−import Test.Tasty.HUnit (assertFailure, assertEqual, testCase)
39+import Test.HUnit (assertFailure, assertEqual)
41import Types (Approx(..), Compose3, Compose3', I)
40import Types (Approx(..), Compose3, Compose3', I)
42import qualified Data.ByteString.Lazy.Char8 as L
41import qualified Data.ByteString.Lazy.Char8 as L
43import qualified Data.DList as DList
42import qualified Data.DList as DList
@@ -54,7 +53,7 @@ import qualified Data.Tree as Tree
54import qualified Data.UUID.Types as UUID
53import qualified Data.UUID.Types as UUID
55import qualified Data.Vector as Vector
54import qualified Data.Vector as Vector
56
55
57−tests :: [TestTree]
56+tests :: [Test]
58tests =
57tests =
59 [
58 [
60 testGroup "To JSON representation" $ fmap assertJsonEncodingExample jsonEncodingExamples
59 testGroup "To JSON representation" $ fmap assertJsonEncodingExample jsonEncodingExamples
@@ -66,156 +65,132 @@ tests =
66jsonExamples :: [Example]
65jsonExamples :: [Example]
67jsonExamples =
66jsonExamples =
68 [
67 [
69− example "Either Left" "{\"Left\":1}" (Left 1 :: Either Int Int)
68+ Example "Either Left" "{\"Left\":1}" (Left 1 :: Either Int Int)
70− , example "Either Right" "{\"Right\":1}" (Right 1 :: Either Int Int)
69+ , Example "Either Right" "{\"Right\":1}" (Right 1 :: Either Int Int)
71− , example "Nothing" "null" (Nothing :: Maybe Int)
70+ , Example "Nothing" "null" (Nothing :: Maybe Int)
72− -- Maybe serialising is lossy
73− -- https://github.com/bos/aeson/issues/376
74− , Example "Just Nothing" ["null"] (Just Nothing :: Maybe (Maybe Int)) Nothing
75− , example "Just" "1" (Just 1 :: Maybe Int)
71+ , Example "Just" "1" (Just 1 :: Maybe Int)
76− , example "Proxy Int" "null" (Proxy :: Proxy Int)
72+ , Example "Proxy Int" "null" (Proxy :: Proxy Int)
77− , example "Tagged Char Int" "1" (Tagged 1 :: Tagged Char Int)
73+ , Example "Tagged Char Int" "1" (Tagged 1 :: Tagged Char Int)
74+#if __GLASGOW_HASKELL__ >= 708
78 -- Test Tagged instance is polykinded
75 -- Test Tagged instance is polykinded
79− , example "Tagged 123 Int" "1" (Tagged 1 :: Tagged 123 Int)
76+ , 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"
88− [ "{\"0\":1,\"2\":3}", "{\"2\":3,\"0\":1}"]
89− (HM.fromList [(0,1),(2,3)] :: HM.HashMap Int Int)
85+ , Example "HashMap Int Int" "{\"0\":1,\"2\":3}" (HM.fromList [(0,1),(2,3)] :: HM.HashMap Int Int)
90− , ndExample "Map Int Int"
91− [ "{\"0\":1,\"2\":3}", "{\"2\":3,\"0\":1}"]
92− (M.fromList [(0,1),(2,3)] :: M.Map Int Int)
86+ , Example "Map Int Int" "{\"0\":1,\"2\":3}" (M.fromList [(0,1),(2,3)] :: M.Map Int Int)
93− , ndExample "Map (Tagged Int Int) Int"
94− [ "{\"0\":1,\"2\":3}", "{\"2\":3,\"0\":1}"]
95− (M.fromList [(Tagged 0,1),(Tagged 2,3)] :: M.Map (Tagged Int 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)
96− , example "Map [Int] Int"
97− "[[[0],1],[[2],3]]"
98− (M.fromList [([0],1),([2],3)] :: M.Map [Int] Int)
88+ , Example "Map [Int] Int" "[[[0],1],[[2],3]]" (M.fromList [([0],1),([2],3)] :: M.Map [Int] Int)
99− , ndExample "Map [Char] Int"
100− [ "{\"ab\":1,\"cd\":3}", "{\"cd\":3,\"ab\":1}" ]
101− (M.fromList [("ab",1),("cd",3)] :: M.Map String Int)
89+ , Example "Map [Char] Int" "{\"ab\":1,\"cd\":3}" (M.fromList [("ab",1),("cd",3)] :: M.Map String Int)
102− , ndExample "Map [I Char] Int"
103− [ "{\"ab\":1,\"cd\":3}", "{\"cd\":3,\"ab\":1}" ]
104− (M.fromList [(map pure "ab",1),(map pure "cd",3)] :: M.Map [I Char] 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)
105−
91+
106− , example "nan :: Double" "null" (Approx $ 0/0 :: Approx Double)
92+ , Example "nan :: Double" "null" (Approx $ 0/0 :: Approx Double)
107−
93+
108− , example "Ordering LT" "\"LT\"" LT
94+ , Example "Ordering LT" "\"LT\"" LT
109− , example "Ordering EQ" "\"EQ\"" EQ
95+ , Example "Ordering EQ" "\"EQ\"" EQ
110− , example "Ordering GT" "\"GT\"" GT
96+ , Example "Ordering GT" "\"GT\"" GT
111−
97+
112− , example "Float" "3.14" (3.14 :: Float)
98+ , Example "Float" "3.14" (3.14 :: Float)
113− , example "Pico" "3.14" (3.14 :: Pico)
99+ , Example "Pico" "3.14" (3.14 :: Pico)
114− , example "Scientific" "3.14" (3.14 :: Scientific)
100+ , Example "Scientific" "3.14" (3.14 :: Scientific)
115−
101+
116− , example "UUID" "\"c2cc10e1-57d6-4b6f-9899-38d972112d8c\"" $ UUID.fromWords
102+ , Example "UUID" "\"c2cc10e1-57d6-4b6f-9899-38d972112d8c\"" $ UUID.fromWords
117 0xc2cc10e1 0x57d64b6f 0x989938d9 0x72112d8c
103 0xc2cc10e1 0x57d64b6f 0x989938d9 0x72112d8c
118
104
119− , example "Set Int" "[1,2,3]" (Set.fromList [3, 2, 1] :: Set.Set Int)
105+ , Example "Set Int" "[1,2,3]" (Set.fromList [3, 2, 1] :: Set.Set Int)
120− , example "IntSet" "[1,2,3]" (IntSet.fromList [3, 2, 1])
106+ , Example "IntSet" "[1,2,3]" (IntSet.fromList [3, 2, 1])
121− , example "IntMap" "[[1,2],[3,4]]" (IntMap.fromList [(3,4), (1,2)] :: IntMap.IntMap Int)
107+ , Example "IntMap" "[[1,2],[3,4]]" (IntMap.fromList [(3,4), (1,2)] :: IntMap.IntMap Int)
122− , example "Vector" "[1,2,3]" (Vector.fromList [1, 2, 3] :: Vector.Vector Int)
108+ , Example "Vector" "[1,2,3]" (Vector.fromList [1, 2, 3] :: Vector.Vector Int)
123− , example "HashSet Int" "[1,2,3]" (HashSet.fromList [3, 2, 1] :: HashSet.HashSet Int)
109+ , Example "HashSet Int" "[1,2,3]" (HashSet.fromList [3, 2, 1] :: HashSet.HashSet 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)
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)
125
111
126 -- Three separate cases, as ordering in HashMap is not defined
112 -- Three separate cases, as ordering in HashMap is not defined
127− , example "HashMap Float Int, NaN" "{\"NaN\":1}" (Approx $ HM.singleton (0/0) 1 :: Approx (HM.HashMap Float Int))
113+ , Example "HashMap Float Int, NaN" "{\"NaN\":1}" (Approx $ HM.singleton (0/0) 1 :: Approx (HM.HashMap Float Int))
128− , example "HashMap Float Int, Infinity" "{\"Infinity\":1}" (HM.singleton (1/0) 1 :: HM.HashMap Float Int)
114+ , Example "HashMap Float Int, Infinity" "{\"Infinity\":1}" (HM.singleton (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)
115+ , Example "HashMap Float Int, +Infinity" "{\"-Infinity\":1}" (HM.singleton (negate 1/0) 1 :: HM.HashMap Float Int)
130
116
131 -- Functors
117 -- Functors
132− , example "Identity Int" "1" (pure 1 :: Identity Int)
118+ , Example "Identity Int" "1" (pure 1 :: Identity Int)
133−
119+
134− , example "Identity Char" "\"x\"" (pure 'x' :: Identity Char)
120+ , Example "Identity Char" "\"x\"" (pure 'x' :: Identity Char)
135− , example "Identity String" "\"foo\"" (pure "foo" :: Identity String)
121+ , Example "Identity String" "\"foo\"" (pure "foo" :: Identity String)
136− , example "[Identity Char]" "\"xy\"" ([pure 'x', pure 'y'] :: [Identity Char])
122+ , Example "[Identity Char]" "\"xy\"" ([pure 'x', pure 'y'] :: [Identity Char])
137−
123+
138− , example "Maybe Char" "\"x\"" (pure 'x' :: Maybe Char)
124+ , Example "Maybe Char" "\"x\"" (pure 'x' :: Maybe Char)
139− , example "Maybe String" "\"foo\"" (pure "foo" :: Maybe String)
125+ , Example "Maybe String" "\"foo\"" (pure "foo" :: Maybe String)
140− , example "Maybe [Identity Char]" "\"xy\"" (pure [pure 'x', pure 'y'] :: Maybe [Identity Char])
126+ , Example "Maybe [Identity Char]" "\"xy\"" (pure [pure 'x', pure 'y'] :: Maybe [Identity Char])
141−
127+
142− , example "Day; year >= 1000" "\"1999-10-12\"" (fromGregorian 1999 10 12)
128+ , Example "Day; year >= 1000" "\"1999-10-12\"" (fromGregorian 1999 10 12)
143− , example "Day; year > 0 && < 1000" "\"0500-03-04\"" (fromGregorian 500 3 4)
129+ , Example "Day; year > 0 && < 1000" "\"0500-03-04\"" (fromGregorian 500 3 4)
144− , example "Day; year == 0" "\"0000-02-20\"" (fromGregorian 0 2 20)
130+ , Example "Day; year == 0" "\"0000-02-20\"" (fromGregorian 0 2 20)
145− , example "Day; year < 0" "\"-0234-01-01\"" (fromGregorian (-234) 1 1)
131+ , Example "Day; year < 0" "\"-0234-01-01\"" (fromGregorian (-234) 1 1)
146− , example "Day; year < -1000" "\"-1234-01-01\"" (fromGregorian (-1234) 1 1)
132+ , Example "Day; year < -1000" "\"-1234-01-01\"" (fromGregorian (-1234) 1 1)
147−
133+
148− , example "Product I Maybe Int" "[1,2]" (Pair (pure 1) (pure 2) :: Product I Maybe Int)
134+ , Example "Product I Maybe Int" "[1,2]" (Pair (pure 1) (pure 2) :: Product I Maybe Int)
149− , example "Product I Maybe Int" "[1,null]" (Pair (pure 1) Nothing :: Product I Maybe Int)
135+ , Example "Product I Maybe Int" "[1,null]" (Pair (pure 1) Nothing :: Product I Maybe Int)
150− , example "Product I [] Char" "[\"a\",\"foo\"]" (Pair (pure 'a') "foo" :: Product I [] Char)
136+ , Example "Product I [] Char" "[\"a\",\"foo\"]" (Pair (pure 'a') "foo" :: Product I [] Char)
151−
137+
152− , example "Sum I [] Int: InL" "{\"InL\":1}" (InL (pure 1) :: Sum I [] Int)
138+ , Example "Sum I [] Int: InL" "{\"InL\":1}" (InL (pure 1) :: Sum I [] Int)
153− , example "Sum I [] Int: InR" "{\"InR\":[1,2]}" (InR [1, 2] :: Sum I [] Int)
139+ , Example "Sum I [] Int: InR" "{\"InR\":[1,2]}" (InR [1, 2] :: Sum I [] Int)
154− , example "Sum I [] Char: InR" "{\"InR\":\"foo\"}" (InR "foo" :: Sum I [] Char)
140+ , Example "Sum I [] Char: InR" "{\"InR\":\"foo\"}" (InR "foo" :: Sum I [] Char)
155−
141+
156− , example "Compose I I Int" "1" (pure 1 :: Compose I I Int)
142+ , Example "Compose I I Int" "1" (pure 1 :: Compose I I Int)
157− , example "Compose I [] Int" "[1]" (pure 1 :: Compose I [] Int)
143+ , Example "Compose I [] Int" "[1]" (pure 1 :: Compose I [] Int)
158− , example "Compose [] I Int" "[1]" (pure 1 :: Compose [] I Int)
144+ , Example "Compose [] I Int" "[1]" (pure 1 :: Compose [] I Int)
159− , example "Compose [] [] Int" "[[1]]" (pure 1 :: Compose [] [] Int)
145+ , Example "Compose [] [] Int" "[[1]]" (pure 1 :: Compose [] [] Int)
160−
146+
161− , example "Compose I I Char" "\"x\"" (pure 'x' :: Compose I I Char)
147+ , Example "Compose I I Char" "\"x\"" (pure 'x' :: Compose I I Char)
162− , example "Compose I [] Char" "\"x\"" (pure 'x' :: Compose I [] Char)
148+ , Example "Compose I [] Char" "\"x\"" (pure 'x' :: Compose I [] Char)
163− , example "Compose [] I Char" "\"x\"" (pure 'x' :: Compose [] I Char)
149+ , Example "Compose [] I Char" "\"x\"" (pure 'x' :: Compose [] I Char)
164− , example "Compose [] [] Char" "[\"x\"]" (pure 'x' :: Compose [] [] Char)
150+ , Example "Compose [] [] Char" "[\"x\"]" (pure 'x' :: Compose [] [] Char)
165−
151+
166− , example "Compose3 I I I Char" "\"x\"" (pure 'x' :: Compose3 I I I Char)
152+ , Example "Compose3 I I I Char" "\"x\"" (pure 'x' :: Compose3 I I I Char)
167− , example "Compose3 I I [] Char" "\"x\"" (pure 'x' :: Compose3 I I [] Char)
153+ , 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)
154+ , Example "Compose3 I [] I Char" "\"x\"" (pure 'x' :: Compose3 I [] I Char)
169− , example "Compose3 I [] [] Char" "[\"x\"]" (pure 'x' :: Compose3 I [] [] Char)
155+ , Example "Compose3 I [] [] Char" "[\"x\"]" (pure 'x' :: Compose3 I [] [] Char)
170− , example "Compose3 [] I I Char" "\"x\"" (pure 'x' :: Compose3 [] I I Char)
156+ , Example "Compose3 [] I I Char" "\"x\"" (pure 'x' :: Compose3 [] I I Char)
171− , example "Compose3 [] I [] Char" "[\"x\"]" (pure 'x' :: Compose3 [] I [] Char)
157+ , Example "Compose3 [] I [] Char" "[\"x\"]" (pure 'x' :: Compose3 [] I [] Char)
172− , example "Compose3 [] [] I Char" "[\"x\"]" (pure 'x' :: Compose3 [] [] I Char)
158+ , Example "Compose3 [] [] I Char" "[\"x\"]" (pure 'x' :: Compose3 [] [] I Char)
173− , example "Compose3 [] [] [] Char" "[[\"x\"]]" (pure 'x' :: Compose3 [] [] [] Char)
159+ , Example "Compose3 [] [] [] Char" "[[\"x\"]]" (pure 'x' :: Compose3 [] [] [] Char)
174−
160+
175− , example "Compose3' I I I Char" "\"x\"" (pure 'x' :: Compose3' I I I Char)
161+ , Example "Compose3' I I I Char" "\"x\"" (pure 'x' :: Compose3' I I I Char)
176− , example "Compose3' I I [] Char" "\"x\"" (pure 'x' :: Compose3' I I [] Char)
162+ , 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)
163+ , Example "Compose3' I [] I Char" "\"x\"" (pure 'x' :: Compose3' I [] I Char)
178− , example "Compose3' I [] [] Char" "[\"x\"]" (pure 'x' :: Compose3' I [] [] Char)
164+ , Example "Compose3' I [] [] Char" "[\"x\"]" (pure 'x' :: Compose3' I [] [] Char)
179− , example "Compose3' [] I I Char" "\"x\"" (pure 'x' :: Compose3' [] I I Char)
165+ , Example "Compose3' [] I I Char" "\"x\"" (pure 'x' :: Compose3' [] I I Char)
180− , example "Compose3' [] I [] Char" "[\"x\"]" (pure 'x' :: Compose3' [] I [] Char)
166+ , Example "Compose3' [] I [] Char" "[\"x\"]" (pure 'x' :: Compose3' [] I [] Char)
181− , example "Compose3' [] [] I Char" "[\"x\"]" (pure 'x' :: Compose3' [] [] I Char)
167+ , Example "Compose3' [] [] I Char" "[\"x\"]" (pure 'x' :: Compose3' [] [] I Char)
182− , example "Compose3' [] [] [] Char" "[[\"x\"]]" (pure 'x' :: Compose3' [] [] [] Char)
168+ , Example "Compose3' [] [] [] Char" "[[\"x\"]]" (pure 'x' :: Compose3' [] [] [] Char)
183−
169+
184− , example "MyEither Int String: Left" "42" (MyLeft 42 :: MyEither Int String)
170+ , Example "MyEither Int String: Left" "42" (MyLeft 42 :: MyEither Int String)
185− , example "MyEither Int String: Right" "\"foo\"" (MyRight "foo" :: MyEither Int String)
171+ , Example "MyEither Int String: Right" "\"foo\"" (MyRight "foo" :: MyEither Int String)
186
172
187 -- newtypes from Monoid/Semigroup
173 -- newtypes from Monoid/Semigroup
188− , example "Monoid.Dual Int" "2" (pure 2 :: Monoid.Dual Int)
174+ , Example "Monoid.Dual Int" "2" (pure 2 :: Monoid.Dual Int)
189− , example "Monoid.First Int" "2" (pure 2 :: Monoid.First Int)
175+ , Example "Monoid.First Int" "2" (pure 2 :: Monoid.First Int)
190− , example "Monoid.Last Int" "2" (pure 2 :: Monoid.Last Int)
176+ , Example "Monoid.Last Int" "2" (pure 2 :: Monoid.Last Int)
191− , example "Semigroup.Min Int" "2" (pure 2 :: Semigroup.Min Int)
177+ , Example "Semigroup.Min Int" "2" (pure 2 :: Semigroup.Min Int)
192− , example "Semigroup.Max Int" "2" (pure 2 :: Semigroup.Max Int)
178+ , Example "Semigroup.Max Int" "2" (pure 2 :: Semigroup.Max Int)
193− , example "Semigroup.First Int" "2" (pure 2 :: Semigroup.First Int)
179+ , Example "Semigroup.First Int" "2" (pure 2 :: Semigroup.First Int)
194− , example "Semigroup.Last Int" "2" (pure 2 :: Semigroup.Last Int)
180+ , Example "Semigroup.Last Int" "2" (pure 2 :: Semigroup.Last Int)
195− , example "Semigroup.WrappedMonoid Int" "2" (Semigroup.WrapMonoid 2 :: Semigroup.WrappedMonoid Int)
181+ , Example "Semigroup.WrappedMonoid Int" "2" (Semigroup.WrapMonoid 2 :: Semigroup.WrappedMonoid Int)
196− , example "Semigroup.Option Just" "2" (pure 2 :: Semigroup.Option Int)
182+ , Example "Semigroup.Option Just" "2" (pure 2 :: Semigroup.Option Int)
197− , example "Semigroup.Option Nothing" "null" (Semigroup.Option (Nothing :: Maybe Bool))
183+ , 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
211 ]
184 ]
212
185
213jsonEncodingExamples :: [Example]
186jsonEncodingExamples :: [Example]
214jsonEncodingExamples =
187jsonEncodingExamples =
215 [
188 [
189+ -- Maybe serialising is lossy
190+ -- https://github.com/bos/aeson/issues/376
191+ Example "Just Nothing" "null" (Just Nothing :: Maybe (Maybe Int))
216 -- infinities cannot be recovered, null is decoded as NaN
192 -- infinities cannot be recovered, null is decoded as NaN
217− example "inf :: Double" "null" (Approx $ 1/0 :: Approx Double)
218− , example "-inf :: Double" "null" (Approx $ -1/0 :: Approx Double)
193+ , Example "inf :: Double" "null" (Approx $ 1/0 :: Approx Double)
219 ]
194 ]
220
195
221jsonDecodingExamples :: [Example]
196jsonDecodingExamples :: [Example]
@@ -237,27 +212,12 @@ jsonDecodingExamples = [
237 ]
212 ]
238
213
239data Example where
214data Example where
240− Example
215+ Example
241− :: (Eq a, Show a, ToJSON a, FromJSON a)
242− => String -- name
243− -> [L.ByteString] -- encoded variants
244− -> a -- input
245− -> a -- decoded
246− -> Example -- empty bytestring will fail, any p [] == False
247−
248− MaybeExample
249− :: (Eq a, Show a, FromJSON a)
250− => String -> L.ByteString -> Maybe a -> Example
251−
252−example :: (Eq a, Show a, ToJSON a, FromJSON a)
216+ :: (Eq a, Show a, ToJSON a, FromJSON a)
253 => String -> L.ByteString -> a -> Example
217 => String -> L.ByteString -> a -> Example
254−example n bs x = Example n [bs] x x
218+ MaybeExample
255−
256−-- | Non-deterministic example, input encodes to some of bytestrings.
257−ndExample :: (Eq a, Show a, ToJSON a, FromJSON a)
219+ :: (Eq a, Show a, FromJSON a)
258− => String -> [L.ByteString] -> a -> Example
220+ => String -> L.ByteString -> Maybe a -> Example
259−ndExample n bss x = Example n bss x x
260−
261
221
262data MyEither a b = MyLeft a | MyRight b
222data MyEither a b = MyLeft a | MyRight b
263 deriving (Generic, Show, Eq)
223 deriving (Generic, Show, Eq)
@@ -269,26 +229,17 @@ instance (ToJSON a, ToJSON b) => ToJSON (MyEither a b) where
269instance (FromJSON a, FromJSON b) => FromJSON (MyEither a b) where
229instance (FromJSON a, FromJSON b) => FromJSON (MyEither a b) where
270 parseJSON = genericParseJSON defaultOptions { sumEncoding = UntaggedValue }
230 parseJSON = genericParseJSON defaultOptions { sumEncoding = UntaggedValue }
271
231
272−assertJsonExample :: Example -> TestTree
232+assertJsonExample :: Example -> Test
273−assertJsonExample (Example name bss val val') = testCase name $ do
233+assertJsonExample (Example name bs val) = testCase name $ do
274− assertSomeEqual "encode" bss (encode val)
234+ assertEqual "encode" bs (encode val)
275− assertSomeEqual "encode/via value" bss (encode $ toJSON val)
235+ assertEqual "encode/via value" bs (encode $ toJSON val)
276− for_ bss $ \bs ->
277− assertEqual "decode" (Just val') (decode bs)
236+ assertEqual "decode" (Just val) (decode bs)
278assertJsonExample (MaybeExample name bs mval) = testCase name $
237assertJsonExample (MaybeExample name bs mval) = testCase name $
279 assertEqual "decode" mval (decode bs)
238 assertEqual "decode" mval (decode bs)
280
239
281−assertJsonEncodingExample :: Example -> TestTree
240+assertJsonEncodingExample :: Example -> Test
282−assertJsonEncodingExample (Example name bss val _) = testCase name $ do
241+assertJsonEncodingExample (Example name bs val) = testCase name $ do
283− assertSomeEqual "encode" bss (encode val)
242+ assertEqual "encode" bs (encode val)
284− assertSomeEqual "encode/via value" bss (encode $ toJSON val)
243+ assertEqual "encode/via value" bs (encode $ toJSON val)
285assertJsonEncodingExample (MaybeExample name _ _) = testCase name $
244assertJsonEncodingExample (MaybeExample name _ _) = testCase name $
286 assertFailure "cannot encode MaybeExample"
245 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+3−5
@@ -1,10 +1,9 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
2−
3module Main (main) where
1module Main (main) where
4
2
3+import Prelude ()
5import Prelude.Compat
4import Prelude.Compat
6
5
7−import Test.Tasty (defaultMain, testGroup)
6+import Test.Framework (defaultMain)
8import qualified DataFamilies.Properties as DF
7import qualified DataFamilies.Properties as DF
9import qualified Properties
8import qualified Properties
10import qualified UnitTests
9import qualified UnitTests
@@ -12,5 +11,4 @@ import qualified UnitTests
12main :: IO ()
11main :: IO ()
13main = do
12main = do
14 ioTests <- UnitTests.ioTests
13 ioTests <- UnitTests.ioTests
15− let allTests = DF.tests : Properties.tests : UnitTests.tests : ioTests
14+ defaultMain (DF.tests : Properties.tests : UnitTests.tests : ioTests)
16− defaultMain (testGroup "tests" allTests)
tests/Types.hs+6−11
@@ -4,21 +4,19 @@
4{-# LANGUAGE FlexibleInstances #-}
4{-# LANGUAGE FlexibleInstances #-}
5{-# LANGUAGE GADTs #-}
5{-# LANGUAGE GADTs #-}
6{-# LANGUAGE GeneralizedNewtypeDeriving #-}
6{-# LANGUAGE GeneralizedNewtypeDeriving #-}
7−{-# LANGUAGE NoImplicitPrelude #-}
8−{-# LANGUAGE ScopedTypeVariables #-}
9{-# LANGUAGE StandaloneDeriving #-}
7{-# LANGUAGE StandaloneDeriving #-}
8+{-# LANGUAGE ScopedTypeVariables #-}
10
9
11−module Types (module Types) where
10+module Types where
12
11
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 ((<$>))
17import Data.Data
16import Data.Data
18import Data.Functor.Compose (Compose (..))
17import Data.Functor.Compose (Compose (..))
19import Data.Functor.Identity (Identity (..))
18import Data.Functor.Identity (Identity (..))
20import Data.Hashable (Hashable (..))
19import Data.Hashable (Hashable (..))
21−import Data.Semigroup (Option)
22import Data.Text
20import Data.Text
23import Data.Time (Day (..), fromGregorian)
21import Data.Time (Day (..), fromGregorian)
24import GHC.Generics
22import GHC.Generics
@@ -106,10 +104,6 @@ deriving instance Data (GADT String)
106deriving instance Eq (GADT a)
104deriving instance Eq (GADT a)
107deriving instance Show (GADT a)
105deriving instance Show (GADT a)
108
106
109−newtype MaybeField = MaybeField { maybeField :: Maybe Int }
110−newtype OptionField = OptionField { optionField :: Option Int }
111− deriving (Eq, Show)
112−
113deriving instance Generic Foo
107deriving instance Generic Foo
114deriving instance Generic UFoo
108deriving instance Generic UFoo
115deriving instance Generic OneConstructor
109deriving instance Generic OneConstructor
@@ -119,8 +113,9 @@ deriving instance Generic (Sum4 a b c d)
119deriving instance Generic (Approx a)
113deriving instance Generic (Approx a)
120deriving instance Generic Nullary
114deriving instance Generic Nullary
121deriving instance Generic (SomeType a)
115deriving instance Generic (SomeType a)
116+#if __GLASGOW_HASKELL__ >= 706
122deriving instance Generic1 SomeType
117deriving instance Generic1 SomeType
123−deriving instance Generic OptionField
118+#endif
124deriving instance Generic EitherTextInt
119deriving instance Generic EitherTextInt
125
120
126failure :: Show a => String -> String -> a -> Property
121failure :: Show a => String -> String -> a -> Property
@@ -151,7 +146,7 @@ instance Hashable a => Hashable (LogScaled a) where
151 hashWithSalt salt (LogScaled a) = hashWithSalt salt a
146 hashWithSalt salt (LogScaled a) = hashWithSalt salt a
152
147
153instance Arbitrary a => Arbitrary (LogScaled a) where
148instance Arbitrary a => Arbitrary (LogScaled a) where
154− arbitrary = LogScaled <$> scale (\x -> intLog2 $ x + 1) arbitrary
149+ arbitrary = fmap LogScaled $ scale (\x -> intLog2 $ x + 1) arbitrary
155 shrink = fmap LogScaled . shrink . getLogScaled
150 shrink = fmap LogScaled . shrink . getLogScaled
156
151
157instance ToJSON a => ToJSON (LogScaled a) where
152instance ToJSON a => ToJSON (LogScaled a) where
tests/UnitTests.hs+38−296
@@ -1,72 +1,55 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2{-# LANGUAGE DeriveGeneric #-}
2{-# LANGUAGE DeriveGeneric #-}
3{-# LANGUAGE GeneralizedNewtypeDeriving #-}
3{-# LANGUAGE GeneralizedNewtypeDeriving #-}
4−{-# LANGUAGE NoImplicitPrelude #-}
5{-# LANGUAGE OverloadedStrings #-}
4{-# LANGUAGE OverloadedStrings #-}
6{-# LANGUAGE ScopedTypeVariables #-}
5{-# LANGUAGE ScopedTypeVariables #-}
7{-# LANGUAGE TemplateHaskell #-}
6{-# LANGUAGE TemplateHaskell #-}
8−{-# LANGUAGE QuasiQuotes #-}
9
7
10-- For Data.Aeson.Types.camelTo
8-- For Data.Aeson.Types.camelTo
11{-# OPTIONS_GHC -fno-warn-deprecations #-}
9{-# OPTIONS_GHC -fno-warn-deprecations #-}
12
10
13−#if MIN_VERSION_base(4,9,0)
14−{-# OPTIONS_GHC -fno-warn-unused-top-binds #-}
15−#endif
16−
17module UnitTests
11module UnitTests
18 (
12 (
19 ioTests
13 ioTests
20 , tests
14 , tests
21− , withEmbeddedJSONTest
22 ) where
15 ) where
23
16
17+import Prelude ()
24import Prelude.Compat
18import Prelude.Compat
25
19
26import Control.Monad (forM, forM_)
20import Control.Monad (forM, forM_)
27−import Data.Aeson ((.=), (.:), (.:?), (.:!), FromJSON(..), FromJSONKeyFunction(..), FromJSONKey(..), ToJSON1(..), decode, eitherDecode, encode, fromJSON, genericParseJSON, genericToEncoding, genericToJSON, object, withObject, withEmbeddedJSON)
21+import Data.Aeson ((.=), (.:), (.:?), (.:!), FromJSON(..), FromJSONKeyFunction(..), FromJSONKey(..), ToJSON1(..), decode, eitherDecode, encode, genericToEncoding, genericToJSON, object, withObject)
28import Data.Aeson.Internal (JSONPathElement(..), formatError)
22import Data.Aeson.Internal (JSONPathElement(..), formatError)
29−import Data.Aeson.QQ.Simple (aesonQQ)
30import Data.Aeson.TH (deriveJSON, deriveToJSON, deriveToJSON1)
23import Data.Aeson.TH (deriveJSON, deriveToJSON, deriveToJSON1)
31import Data.Aeson.Text (encodeToTextBuilder)
24import Data.Aeson.Text (encodeToTextBuilder)
32−import Data.Aeson.Parser
33− ( json, jsonLast, jsonAccum, jsonNoDup
34− , json', jsonLast', jsonAccum', jsonNoDup')
35−import Data.Aeson.Types
36− ( Options(..), Result(Success, Error), ToJSON(..)
37− , Value(Array, Bool, Null, Number, Object, String), camelTo, camelTo2
38− , defaultOptions, formatPath, formatRelativePath, omitNothingFields, parse)
25+import Data.Aeson.Types (Options(..), ToJSON(..), Value, camelTo, camelTo2, defaultOptions, omitNothingFields)
39−import Data.Attoparsec.ByteString (Parser, parseOnly)
40import Data.Char (toUpper)
26import Data.Char (toUpper)
41import Data.Either.Compat (isLeft, isRight)
27import Data.Either.Compat (isLeft, isRight)
42import Data.Hashable (hash)
28import Data.Hashable (hash)
43−import Data.HashMap.Strict (HashMap)
29+import Data.List (sort)
44−import Data.List (sort, isSuffixOf)
45import Data.Maybe (fromMaybe)
30import Data.Maybe (fromMaybe)
46−import Data.Scientific (Scientific, scientific)
31+import Data.Sequence (Seq)
47import Data.Tagged (Tagged(..))
32import Data.Tagged (Tagged(..))
48import Data.Text (Text)
33import Data.Text (Text)
49import Data.Time (UTCTime)
34import Data.Time (UTCTime)
50−import Data.Time.Format.Compat (parseTimeM, defaultTimeLocale)
35+import Data.Time.Format (parseTime)
36+import Data.Time.Locale.Compat (defaultTimeLocale)
51import GHC.Generics (Generic)
37import GHC.Generics (Generic)
52import Instances ()
38import Instances ()
53−import Numeric.Natural (Natural)
54import System.Directory (getDirectoryContents)
39import System.Directory (getDirectoryContents)
55import System.FilePath ((</>), takeExtension, takeFileName)
40import System.FilePath ((</>), takeExtension, takeFileName)
56−import Test.Tasty (TestTree, testGroup)
41+import Test.Framework (Test, 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)
58import Text.Printf (printf)
44import Text.Printf (printf)
59import UnitTests.NullaryConstructors (nullaryConstructors)
45import UnitTests.NullaryConstructors (nullaryConstructors)
60−import qualified Data.ByteString as S
61import qualified Data.ByteString.Base16.Lazy as LBase16
46import qualified Data.ByteString.Base16.Lazy as LBase16
62import qualified Data.ByteString.Lazy.Char8 as L
47import qualified Data.ByteString.Lazy.Char8 as L
63import qualified Data.HashSet as HashSet
48import qualified Data.HashSet as HashSet
64−import qualified Data.HashMap.Lazy as HashMap
65import qualified Data.Text.Lazy as LT
49import qualified Data.Text.Lazy as LT
66import qualified Data.Text.Lazy.Builder as TLB
50import qualified Data.Text.Lazy.Builder as TLB
67import qualified Data.Text.Lazy.Encoding as LT
51import qualified Data.Text.Lazy.Encoding as LT
68import qualified Data.Text.Lazy.Encoding as TLE
52import qualified Data.Text.Lazy.Encoding as TLE
69−import qualified Data.Vector as Vector
70import qualified ErrorMessages
53import qualified ErrorMessages
71import qualified SerializationFormatSpec
54import qualified SerializationFormatSpec
72
55
@@ -74,7 +57,7 @@ import qualified SerializationFormatSpec
74import Data.Aeson.Parser.UnescapeFFI ()
57import Data.Aeson.Parser.UnescapeFFI ()
75import Data.Aeson.Parser.UnescapePure ()
58import Data.Aeson.Parser.UnescapePure ()
76
59
77−tests :: TestTree
60+tests :: Test
78tests = testGroup "unit" [
61tests = testGroup "unit" [
79 testGroup "SerializationFormatSpec" SerializationFormatSpec.tests
62 testGroup "SerializationFormatSpec" SerializationFormatSpec.tests
80 , testGroup "ErrorMessages" ErrorMessages.tests
63 , testGroup "ErrorMessages" ErrorMessages.tests
@@ -101,31 +84,14 @@ tests = testGroup "unit" [
101 testCase "example 1" formatErrorExample
84 testCase "example 1" formatErrorExample
102 ]
85 ]
103 , testGroup ".:, .:?, .:!" $ fmap (testCase "-") dotColonMark
86 , testGroup ".:, .:?, .:!" $ fmap (testCase "-") dotColonMark
87+ , testGroup "JSONPath" $ fmap (testCase "-") jsonPath
104 , testGroup "Hashable laws" $ fmap (testCase "-") hashableLaws
88 , testGroup "Hashable laws" $ fmap (testCase "-") hashableLaws
105− , testGroup "Object construction" $ fmap (testCase "-") objectConstruction
106 , testGroup "Issue #351" $ fmap (testCase "-") issue351
89 , testGroup "Issue #351" $ fmap (testCase "-") issue351
107 , testGroup "Nullary constructors" $ fmap (testCase "-") nullaryConstructors
90 , testGroup "Nullary constructors" $ fmap (testCase "-") nullaryConstructors
108 , testGroup "FromJSONKey" $ fmap (testCase "-") fromJSONKeyAssertions
91 , testGroup "FromJSONKey" $ fmap (testCase "-") fromJSONKeyAssertions
109 , testCase "PR #455" pr455
92 , testCase "PR #455" pr455
110 , testCase "Unescape string (PR #477)" unescapeString
93 , testCase "Unescape string (PR #477)" unescapeString
111 , testCase "Show Options" showOptions
94 , testCase "Show Options" showOptions
112− , testGroup "SingleMaybeField" singleMaybeField
113− , testCase "withEmbeddedJSON" withEmbeddedJSONTest
114− , testCase "SingleFieldCon" singleFieldCon
115− , testGroup "UnknownFields" unknownFields
116− , testGroup "Ordering of object keys" keyOrdering
117− , testCase "Ratio with denominator 0" ratioDenominator0
118− , testCase "Rational parses number" rationalNumber
119− , testCase "Big rational" bigRationalDecoding
120− , testCase "Small rational" smallRationalDecoding
121− , testCase "Big scientific exponent" bigScientificExponent
122− , testCase "Big integer decoding" bigIntegerDecoding
123− , testCase "Big natural decading" bigNaturalDecoding
124− , testCase "Big integer key decoding" bigIntegerKeyDecoding
125− , testGroup "QQ.Simple"
126− [ testCase "example" $
127− assertEqual "" (object ["foo" .= True]) [aesonQQ| {"foo": true } |]
128− ]
129 ]
95 ]
130
96
131roundTripCamel :: String -> Assertion
97roundTripCamel :: String -> Assertion
@@ -218,18 +184,10 @@ utcTimeGood = do
218 assertEqual "utctime" (parseWithRead "%F %H:%MZ" ts11) t11
184 assertEqual "utctime" (parseWithRead "%F %H:%MZ" ts11) t11
219 assertEqual "utctime" (parseWithRead "%FT%T%QZ" "2015-01-01T14:30:00Z") t12
185 assertEqual "utctime" (parseWithRead "%FT%T%QZ" "2015-01-01T14:30:00Z") t12
220
186
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−
229 where
187 where
230 parseWithRead :: String -> LT.Text -> UTCTime
188 parseWithRead :: String -> LT.Text -> UTCTime
231 parseWithRead f s =
189 parseWithRead f s =
232− fromMaybe (error "parseTime input malformed") . parseTimeM True defaultTimeLocale f . LT.unpack $ s
190+ fromMaybe (error "parseTime input malformed") . parseTime defaultTimeLocale f . LT.unpack $ s
233 parseWithAeson :: LT.Text -> Maybe UTCTime
191 parseWithAeson :: LT.Text -> Maybe UTCTime
234 parseWithAeson s = decode . LT.encodeUtf8 $ LT.concat ["\"", s, "\""]
192 parseWithAeson s = decode . LT.encodeUtf8 $ LT.concat ["\"", s, "\""]
235
193
@@ -245,7 +203,6 @@ utcTimeBad = do
245 verifyFailParse "2015-01-01T12:30:00.00+00:00Z" -- no Zulu if offset given
203 verifyFailParse "2015-01-01T12:30:00.00+00:00Z" -- no Zulu if offset given
246 verifyFailParse "2015-01-03 12:13:00.Z" -- decimal at the end but no digits
204 verifyFailParse "2015-01-03 12:13:00.Z" -- decimal at the end but no digits
247 verifyFailParse "2015-01-03 12:13.000Z" -- decimal at the end, but no seconds
205 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
249 where
206 where
250 verifyFailParse (s :: LT.Text) =
207 verifyFailParse (s :: LT.Text) =
251 let (dec :: Maybe UTCTime) = decode . LT.encodeUtf8 $ LT.concat ["\"", s, "\""] in
208 let (dec :: Maybe UTCTime) = decode . LT.encodeUtf8 $ LT.concat ["\"", s, "\""] in
@@ -258,18 +215,6 @@ formatErrorExample =
258 lhs = "Error in $[0].foo.bar['a.b.c']['']['\\'\\\\'].end: error msg"
215 lhs = "Error in $[0].foo.bar['a.b.c']['']['\\'\\\\'].end: error msg"
259 in assertEqual "formatError example" lhs rhs
216 in assertEqual "formatError example" lhs rhs
260
217
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−
273------------------------------------------------------------------------------
218------------------------------------------------------------------------------
274-- Comparison (.:?) and (.:!)
219-- Comparison (.:?) and (.:!)
275------------------------------------------------------------------------------
220------------------------------------------------------------------------------
@@ -300,6 +245,27 @@ dotColonMark = [
300 ex2 = "{\"value\": 42 }"
245 ex2 = "{\"value\": 42 }"
301 ex3 = "{\"value\": null }"
246 ex3 = "{\"value\": null }"
302
247
248+------------------------------------------------------------------------------
249+-- These tests check that JSONPath is tracked correctly
250+-----------------------------------------------------------------------------
251+
252+jsonPath :: [Assertion]
253+jsonPath = [
254+ -- issue #356
255+ assertEqual "Either"
256+ (Left "Error in $[1].Left[1]: expected Bool, encountered Number")
257+ (eitherDecode "[1,{\"Left\":[2,3]}]"
258+ :: Either String (Int, Either (Int, Bool) ()))
259+ -- issue #358
260+ , assertEqual "Seq a"
261+ (Left "Error in $[2]: expected Int, encountered Boolean")
262+ (eitherDecode "[0,1,true]" :: Either String (Seq Int))
263+ , assertEqual "Wibble"
264+ (Left "Error in $.wibbleInt: expected Int, encountered Boolean")
265+ (eitherDecode "{\"wibbleString\":\"\",\"wibbleInt\":true}"
266+ :: Either String Wibble)
267+ ]
268+
303------------------------------------------------------------------------------
269------------------------------------------------------------------------------
304-- Check that the hashes of two equal Value are the same
270-- Check that the hashes of two equal Value are the same
305------------------------------------------------------------------------------
271------------------------------------------------------------------------------
@@ -312,18 +278,6 @@ hashableLaws = [
312 a = object ["223" .= False, "807882556" .= True]
278 a = object ["223" .= False, "807882556" .= True]
313 b = object ["807882556" .= True, "223" .= False]
279 b = object ["807882556" .= True, "223" .= False]
314
280
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−
327-------------------------------------------------------------------------------
281-------------------------------------------------------------------------------
328-- ToJSONKey
282-- ToJSONKey
329-------------------------------------------------------------------------------
283-------------------------------------------------------------------------------
@@ -384,13 +338,13 @@ issue351 = [
384-- Comparison between bytestring and text encoders
338-- Comparison between bytestring and text encoders
385------------------------------------------------------------------------------
339------------------------------------------------------------------------------
386
340
387−ioTests :: IO [TestTree]
341+ioTests :: IO [Test]
388ioTests = do
342ioTests = do
389 enc <- encoderComparisonTests
343 enc <- encoderComparisonTests
390 js <- jsonTestSuite
344 js <- jsonTestSuite
391 return [enc, js]
345 return [enc, js]
392
346
393−encoderComparisonTests :: IO TestTree
347+encoderComparisonTests :: IO Test
394encoderComparisonTests = do
348encoderComparisonTests = do
395 encoderTests <- forM testFiles $ \file0 -> do
349 encoderTests <- forM testFiles $ \file0 -> do
396 let file = "benchmarks/json-data/" ++ file0
350 let file = "benchmarks/json-data/" ++ file0
@@ -450,7 +404,7 @@ unescapeString = do
450
404
451-- JSONTestSuite
405-- JSONTestSuite
452
406
453−jsonTestSuiteTest :: FilePath -> TestTree
407+jsonTestSuiteTest :: FilePath -> Test
454jsonTestSuiteTest path = testCase fileName $ do
408jsonTestSuiteTest path = testCase fileName $ do
455 payload <- L.readFile path
409 payload <- L.readFile path
456 let result = eitherDecode payload :: Either String Value
410 let result = eitherDecode payload :: Either String Value
@@ -465,7 +419,7 @@ jsonTestSuiteTest path = testCase fileName $ do
465-- Build a collection of tests based on the current contents of the
419-- Build a collection of tests based on the current contents of the
466-- JSONTestSuite test directories.
420-- JSONTestSuite test directories.
467
421
468−jsonTestSuite :: IO TestTree
422+jsonTestSuite :: IO Test
469jsonTestSuite = do
423jsonTestSuite = do
470 let suitePath = "tests/JSONTestSuite"
424 let suitePath = "tests/JSONTestSuite"
471 let suites = ["test_parsing", "test_transform"]
425 let suites = ["test_parsing", "test_transform"]
@@ -539,222 +493,10 @@ showOptions =
539 ++ ", omitNothingFields = False"
493 ++ ", omitNothingFields = False"
540 ++ ", sumEncoding = TaggedObject {tagFieldName = \"tag\", contentsFieldName = \"contents\"}"
494 ++ ", sumEncoding = TaggedObject {tagFieldName = \"tag\", contentsFieldName = \"contents\"}"
541 ++ ", unwrapUnaryRecords = False"
495 ++ ", unwrapUnaryRecords = False"
542− ++ ", tagSingleConstructors = False"
543− ++ ", rejectUnknownFields = False"
544 ++ "}")
496 ++ "}")
545 (show defaultOptions)
497 (show defaultOptions)
546
498
547−newtype SingleMaybeField = SingleMaybeField { smf :: Maybe Int }
548− deriving (Eq, Show, Generic)
549−
550−singleMaybeField :: [TestTree]
551−singleMaybeField = do
552− (gName, gToJSON, gToEncoding, gFromJSON) <-
553− [ ("generic", genericToJSON opts, genericToEncoding opts, parse (genericParseJSON opts))
554− , ("th", toJSON, toEncoding, fromJSON) ]
555− return $
556− testCase gName $ do
557− assertEqual "toJSON" Null (gToJSON v)
558− assertEqual "toEncoding" (toEncoding (gToJSON v)) (gToEncoding v)
559− assertEqual "fromJSON" (Success v) (gFromJSON Null)
560− where
561− v = SingleMaybeField Nothing
562− opts = defaultOptions{omitNothingFields=True,unwrapUnaryRecords=True}
563−
564−
565−newtype EmbeddedJSONTest = EmbeddedJSONTest Int
566− deriving (Eq, Show)
567−
568−instance FromJSON EmbeddedJSONTest where
569− parseJSON =
570− withObject "Object" $ \o ->
571− EmbeddedJSONTest <$> (o .: "prop" >>= withEmbeddedJSON "Quoted Int" parseJSON)
572−
573−withEmbeddedJSONTest :: Assertion
574−withEmbeddedJSONTest =
575− assertEqual "Unquote embedded JSON" (Right $ EmbeddedJSONTest 1) (eitherDecode "{\"prop\":\"1\"}")
576−
577−-- Regression test for https://github.com/bos/aeson/issues/627
578−newtype SingleFieldCon = SingleFieldCon Int deriving (Eq, Show, Generic)
579−
580−instance FromJSON SingleFieldCon where
581− parseJSON = genericParseJSON defaultOptions{unwrapUnaryRecords=True}
582− -- This option should have no effect on this type
583−
584−singleFieldCon :: Assertion
585−singleFieldCon =
586− assertEqual "fromJSON" (Right (SingleFieldCon 0)) (eitherDecode "0")
587−
588−newtype UnknownFields = UnknownFields { knownField :: Int }
589− deriving (Eq, Show, Generic)
590−newtype UnknownFieldsTag = UnknownFieldsTag { tag :: Int }
591− deriving (Eq, Show, Generic)
592−newtype UnknownFieldsUnaryTagged = UnknownFieldsUnaryTagged { knownFieldUnaryTagged :: Int }
593− deriving (Eq, Show, Generic)
594−data UnknownFieldsSum
595− = UnknownFields1 { knownField1 :: Int }
596− | UnknownFields2 { knownField2 :: Int }
597− deriving (Eq, Show, Generic)
598−
599−unknownFields :: [TestTree]
600−unknownFields = concat
601− [ testsUnary
602− "unary-unknown"
603− (object [("knownField", Number 1), ("unknownField", Number 1)])
604− (Error "nknown fields: [\"unknownField\"]" :: Result UnknownFields)
605− , testsUnary
606− "unary-unknown-tag"
607− (object [("knownField", Number 1), ("tag", String "UnknownFields")])
608− (Error "nknown fields: [\"tag\"]" :: Result UnknownFields)
609− , testsUnaryTag
610− "unary-explicit-tag"
611− (object [("tag", Number 1)])
612− (Success $ UnknownFieldsTag 1)
613− , testsSum
614− "sum-tag"
615− (object [("knownField1", Number 1), ("tag", String "UnknownFields1")])
616− (Success $ UnknownFields1 1)
617− , testsSum
618− "sum-unknown-in-branch"
619− (object [("knownField1", Number 1), ("knownField2", Number 1), ("tag", String "UnknownFields1")])
620− (Error "nknown fields: [\"knownField2\"]" :: Result UnknownFieldsSum)
621− , testsSum
622− "sum-unknown"
623− (object [("knownField1", Number 1), ("unknownField", Number 1), ("tag", String "UnknownFields1")])
624− (Error "nknown fields: [\"unknownField\"]" :: Result UnknownFieldsSum)
625− , testsTagged
626− "unary-tagged"
627− (object [("knownFieldUnaryTagged", Number 1), ("tag", String "UnknownFieldsUnaryTagged")])
628− (Success $ UnknownFieldsUnaryTagged 1)
629− , -- Just a case to verify that the tag isn't optional, this is likely already tested by other unit tests
630− testsTagged
631− "unary-tagged-notag"
632− (object [("knownFieldUnaryTagged", Number 1)])
633− (Error "key \"tag\" not found" :: Result UnknownFieldsUnaryTagged)
634− , testsTagged
635− "unary-tagged-unknown"
636− (object [ ("knownFieldUnaryTagged", Number 1), ("unknownField", Number 1)
637− , ("tag", String "UnknownFieldsUnaryTagged")])
638− (Error "nknown fields: [\"unknownField\"]" :: Result UnknownFieldsUnaryTagged)
639− ]
640− where
641− opts = defaultOptions{rejectUnknownFields=True}
642− taggedOpts = opts{tagSingleConstructors=True}
643− assertApprox :: (Show a, Eq a) => Result a -> Result a -> IO ()
644− assertApprox (Error expected) (Error actual) | expected `isSuffixOf` actual = return ()
645− assertApprox expected actual = assertEqual "fromJSON" expected actual
646− testsBase :: (Show a, Eq a) => (Value -> Result a) -> (Value -> Result a)
647− -> String -> Value -> Result a -> [TestTree]
648− testsBase th g name value expected =
649− [ testCase (name ++ "-th") $ assertApprox expected (th value)
650− , testCase (name ++ "-generic") $ assertApprox expected (g value)
651− ]
652− testsUnary :: String -> Value -> Result UnknownFields -> [TestTree]
653− testsUnary = testsBase fromJSON (parse (genericParseJSON opts))
654− testsUnaryTag :: String -> Value -> Result UnknownFieldsTag -> [TestTree]
655− testsUnaryTag = testsBase fromJSON (parse (genericParseJSON opts))
656− testsSum :: String -> Value -> Result UnknownFieldsSum -> [TestTree]
657− testsSum = testsBase fromJSON (parse (genericParseJSON opts))
658− testsTagged :: String -> Value -> Result UnknownFieldsUnaryTagged -> [TestTree]
659− testsTagged = testsBase fromJSON (parse (genericParseJSON taggedOpts))
660−
661−testParser :: (Eq a, Show a)
662− => String -> Parser a -> S.ByteString -> Either String a -> TestTree
663−testParser name json_ s expected =
664− testCase name (parseOnly json_ s @?= expected)
665−
666−keyOrdering :: [TestTree]
667−keyOrdering =
668− [ testParser "json" json
669− "{\"k\":true,\"k\":false}" $
670− Right (Object (HashMap.fromList [("k", Bool True)]))
671− , testParser "jsonLast" jsonLast
672− "{\"k\":true,\"k\":false}" $
673− Right (Object (HashMap.fromList [("k", Bool False)]))
674− , testParser "jsonAccum" jsonAccum
675− "{\"k\":true,\"k\":false}" $
676− Right (Object (HashMap.fromList [("k", Array (Vector.fromList [Bool True, Bool False]))]))
677− , testParser "jsonNoDup" jsonNoDup
678− "{\"k\":true,\"k\":false}" $
679− Left "Failed reading: found duplicate key: \"k\""
680−
681− , testParser "json'" json'
682− "{\"k\":true,\"k\":false}" $
683− Right (Object (HashMap.fromList [("k", Bool True)]))
684− , testParser "jsonLast'" jsonLast'
685− "{\"k\":true,\"k\":false}" $
686− Right (Object (HashMap.fromList [("k", Bool False)]))
687− , testParser "jsonAccum'" jsonAccum'
688− "{\"k\":true,\"k\":false}" $
689− Right (Object (HashMap.fromList [("k", Array (Vector.fromList [Bool True, Bool False]))]))
690− , testParser "jsonNoDup'" jsonNoDup'
691− "{\"k\":true,\"k\":false}" $
692− Left "Failed reading: found duplicate key: \"k\""
693− ]
694−
695−ratioDenominator0 :: Assertion
696−ratioDenominator0 =
697− assertEqual "Ratio with denominator 0"
698− (Left "Error in $: Ratio denominator was 0")
699− (eitherDecode "{ \"numerator\": 1, \"denominator\": 0 }" :: Either String Rational)
700−
701−rationalNumber :: Assertion
702−rationalNumber =
703− assertEqual "Ratio with denominator 0"
704− (Right 1.37)
705− (eitherDecode "1.37" :: Either String Rational)
706−
707−bigRationalDecoding :: Assertion
708−bigRationalDecoding =
709− assertEqual "Decoding an Integer with a large exponent should fail"
710− (Left "Error in $: parsing Ratio failed, found a number with exponent 2000, but it must not be greater than 1024 or less than -1024")
711− ((eitherDecode :: L.ByteString -> Either String Rational) "1e2000")
712−
713−smallRationalDecoding :: Assertion
714−smallRationalDecoding =
715− assertEqual "Decoding an Integer with a large exponent should fail"
716− (Left "Error in $: parsing Ratio failed, found a number with exponent -2000, but it must not be greater than 1024 or less than -1024")
717− ((eitherDecode :: L.ByteString -> Either String Rational) "1e-2000")
718−
719−
720−bigScientificExponent :: Assertion
721−bigScientificExponent =
722− assertEqual "Encoding an integral scientific with a large exponent should normalize it"
723− "1.0e2000"
724− (encode (scientific 1 2000 :: Scientific))
725−
726−bigIntegerDecoding :: Assertion
727−bigIntegerDecoding =
728− assertEqual "Decoding an Integer with a large exponent should fail"
729− (Left "Error in $: parsing Integer failed, found a number with exponent 2000, but it must not be greater than 1024")
730− ((eitherDecode :: L.ByteString -> Either String Integer) "1e2000")
731−
732−bigNaturalDecoding :: Assertion
733−bigNaturalDecoding =
734− assertEqual "Decoding a Natural with a large exponent should fail"
735− (Left "Error in $: parsing Natural failed, found a number with exponent 2000, but it must not be greater than 1024")
736− ((eitherDecode :: L.ByteString -> Either String Natural) "1e2000")
737−
738−bigIntegerKeyDecoding :: Assertion
739−bigIntegerKeyDecoding =
740− assertEqual "Decoding an Integer key with a large exponent should fail"
741− (Left "Error in $['1e2000']: parsing Integer failed, found a number with exponent 2000, but it must not be greater than 1024")
742− ((eitherDecode :: L.ByteString -> Either String (HashMap Integer Value)) "{ \"1e2000\": null }")
743−
744−bigNaturalKeyDecoding :: Assertion
745−bigNaturalKeyDecoding =
746− assertEqual "Decoding an Integer key with a large exponent should fail"
747− (Left "Error in $['1e2000']: found a number with exponent 2000, but it must not be greater than 1024")
748− ((eitherDecode :: L.ByteString -> Either String (HashMap Natural Value)) "{ \"1e2000\": null }")
749−
750deriveJSON defaultOptions{omitNothingFields=True} ''MyRecord
499deriveJSON defaultOptions{omitNothingFields=True} ''MyRecord
751
500
752deriveToJSON defaultOptions ''Foo
501deriveToJSON defaultOptions ''Foo
753deriveToJSON1 defaultOptions ''Foo
502deriveToJSON1 defaultOptions ''Foo
754−
755−deriveJSON defaultOptions{omitNothingFields=True,unwrapUnaryRecords=True} ''SingleMaybeField
756−
757−deriveJSON defaultOptions{rejectUnknownFields=True} ''UnknownFields
758−deriveJSON defaultOptions{rejectUnknownFields=True} ''UnknownFieldsTag
759−deriveJSON defaultOptions{tagSingleConstructors=True,rejectUnknownFields=True} ''UnknownFieldsUnaryTagged
760−deriveJSON defaultOptions{rejectUnknownFields=True} ''UnknownFieldsSum
tests/UnitTests/NullaryConstructors.hs+3−8
@@ -1,5 +1,4 @@
1−{-# LANGUAGE NoImplicitPrelude #-}
2−{-# LANGUAGE OverloadedStrings #-}
1+{-# LANGUAGE OverloadedStrings #-}
3
2
4{-# OPTIONS_GHC -fno-warn-deprecations #-}
3{-# OPTIONS_GHC -fno-warn-deprecations #-}
5
4
@@ -8,16 +7,16 @@ module UnitTests.NullaryConstructors
8 nullaryConstructors
7 nullaryConstructors
9 ) where
8 ) where
10
9
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_)
18import Data.Maybe (fromJust)
17import Data.Maybe (fromJust)
19import Encoders
18import Encoders
20−import Test.Tasty.HUnit ((@=?), Assertion)
19+import Test.HUnit ((@=?), Assertion)
21import Types
20import Types
22import qualified Data.ByteString.Lazy.Char8 as L
21import qualified Data.ByteString.Lazy.Char8 as L
23
22
@@ -53,10 +52,6 @@ nullaryConstructors =
53 -- Make sure that the old `"contents" : []' is still allowed
52 -- Make sure that the old `"contents" : []' is still allowed
54 , ISuccess C1 @=? parse thNullaryParseJSONTaggedObject (dec "{\"tag\":\"c1\",\"contents\":[]}")
53 , ISuccess C1 @=? parse thNullaryParseJSONTaggedObject (dec "{\"tag\":\"c1\",\"contents\":[]}")
55 , ISuccess C1 @=? parse gNullaryParseJSONTaggedObject (dec "{\"tag\":\"c1\",\"contents\":[]}")
54 , 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
60 ]
55 ]
61 where
56 where
62 enc = eitherDecode . toLazyByteString . fromEncoding
57 enc = eitherDecode . toLazyByteString . fromEncoding
tests/golden/generic.expecteddeleted−48
@@ -1,48 +0,0 @@
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.expecteddeleted−22
@@ -1,22 +0,0 @@
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.hdeleted−448
@@ -1,448 +0,0 @@
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,11 +7,6 @@ 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− ;;
15 stack)
10 stack)
16 stack --no-terminal --skip-ghc-check setup
11 stack --no-terminal --skip-ghc-check setup
17 stack --no-terminal --skip-ghc-check test --only-snapshot
12 stack --no-terminal --skip-ghc-check test --only-snapshot
@@ -49,10 +44,4 @@ case $BUILD in
49 cp -a $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin installplan.txt $HOME/.cabsnap/;
44 cp -a $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin installplan.txt $HOME/.cabsnap/;
50 fi
45 fi
51 ;;
46 ;;
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− ;;
58esac
47esac
travis/script.sh+2−4
@@ -19,11 +19,9 @@ case $BUILD in
19 SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&
19 SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&
20 (cd dist && cabal install --force-reinstalls "$SRC_TGZ")
20 (cd dist && cabal install --force-reinstalls "$SRC_TGZ")
21 ;;
21 ;;
22− cabal2)
23− cabal v2-build --enable-tests --enable-benchmarks
24− cabal v2-test --enable-tests --enable-benchmarks
25− ;;
26 hlint)
22 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
27 make lint
25 make lint
28 ;;
26 ;;
29esac
27esac