on master help sign in
112 files changed+4996−2812
since splitsnapshots
unifiedsplit
.gitignore+4 .hlint.yaml+11 .travis.yml+42−21 CONTRIBUTING.md+39−1 Data/Aeson.hs+77−5 Data/Aeson/Encode.hs+2−1 Data/Aeson/Encoding.hs+2−1 Data/Aeson/Encoding/Builder.hs+6−79 Data/Aeson/Encoding/Internal.hs+3−2 Data/Aeson/Internal.hs+1−1 Data/Aeson/Internal/Functions.hs+1−1 Data/Aeson/Parser.hs+12−2 Data/Aeson/Parser/Internal.hs+219−51 Data/Aeson/Parser/Time.hs+2−1 Data/Aeson/QQ/Simple.hs+25 Data/Aeson/TH.hs+248−363 Data/Aeson/Text.hs+5−4 Data/Aeson/Types.hs+39−3 Data/Aeson/Types/Class.hs+8−3 Data/Aeson/Types/FromJSON.hs+831−412 Data/Aeson/Types/Generic.hs+12−8 Data/Aeson/Types/Internal.hs+124−10 Data/Aeson/Types/ToJSON.hs+250−84 HLint.hs−10 Makefile+1−1 README.markdown+1−2 aeson.cabal+65−53 attoparsec-iso8601/Data/Attoparsec/Time.hs+4−5 attoparsec-iso8601/Data/Attoparsec/Time/Internal.hs+21−18 attoparsec-iso8601/attoparsec-iso8601.cabal+3−3 attoparsec-iso8601/changelog.md+5 benchmarks/AesonCompareAutoInstances.hs−282 benchmarks/AesonEncode.hs+2−2 benchmarks/AesonFoldable.hs+14−42 benchmarks/AesonMap.hs+39−56 benchmarks/AesonParse.hs+2−3 benchmarks/AesonTuples.hs+2−1 benchmarks/Auto/G/BigProduct.hs+33 benchmarks/Auto/G/BigRecord.hs+33 benchmarks/Auto/G/BigSum.hs+28 benchmarks/Auto/G/D.hs+44 benchmarks/Auto/T/BigProduct.hs+27 benchmarks/Auto/T/BigRecord.hs+27 benchmarks/Auto/T/BigSum.hs+22 benchmarks/Auto/T/D.hs+38 benchmarks/AutoCompare.hs+73 benchmarks/Compare.hs+10−5 benchmarks/Compare/BufferBuilder.hs+2−3 benchmarks/Compare/JsonBench.hs+18−9 benchmarks/Compare/JsonBuilder.hs+2−3 benchmarks/CompareWithJSON.hs+23−33 benchmarks/Dates.hs+2−2 benchmarks/Escape.hs+32 benchmarks/Issue673.hs+165 benchmarks/JsonParse.hs+3−2 benchmarks/Micro.hs+8−6 benchmarks/Options.hs−3 benchmarks/ReadFile.hs+1−1 benchmarks/Typed.hs+2−1 benchmarks/Typed/Common.hs+1−10 benchmarks/Typed/Generic.hs+15−31 benchmarks/Typed/Manual.hs+15−31 benchmarks/Typed/TH.hs+15−31 benchmarks/aeson-benchmarks.cabal+167−70 cabal.project+3 changelog.md+154−1 examples/Generic.hs+1−1 examples/Simplest.hs+1−1 examples/TemplateHaskell.hs+1−1 examples/Twitter.hs+1−2 examples/Twitter/Generic.hs+2−37 examples/Twitter/Manual.hs+3−139 examples/Twitter/Options.hs−23 examples/Twitter/TH.hs+2−18 ffi/Data/Aeson/Parser/UnescapeFFI.hs+1−1 pure/Data/Aeson/Parser/UnescapePure.hs+13−36 run-hlint.sh+7 stack-bench.yaml+2−5 stack-ffi-unescape.yaml+9 stack-lts12.yaml+15 stack-lts6.yaml−20 stack-lts7.yaml−13 stack-lts8.yaml−12 stack-nightly.yaml+3−4 stack-pure-unescape.yaml−10 tests/DataFamilies/Encoders.hs+1−1 tests/DataFamilies/Instances.hs+2−1 tests/DataFamilies/Properties.hs+6−5 tests/DataFamilies/Types.hs+1−1 tests/Encoders.hs+81−7 tests/ErrorMessages.hs+208−41 tests/Functions.hs+2−1 tests/Instances.hs+7−62 tests/JSONTestSuite/parsers/test_haskell-aeson/testaeson.cabal+5−3 tests/Options.hs+19−1 tests/PropUtils.hs+208 tests/Properties.hs+14−511 tests/PropertyGeneric.hs+116 tests/PropertyKeys.hs+40 tests/PropertyRTFunctors.hs+51 tests/PropertyRoundTrip.hs+74 tests/PropertyTH.hs+130 tests/SerializationFormatSpec.hs+53−30 tests/Tests.hs+5−3 tests/Types.hs+10−5 tests/UnitTests.hs+276−39 tests/UnitTests/NullaryConstructors.hs+8−3 tests/golden/generic.expected+48 tests/golden/simple.expected+22 travis/cabal_macros.h+448 travis/install.sh+11 travis/script.sh+4−2
.gitignore+4
@@ -5,6 +5,7 @@ dist-newstyle
55cabal.sandbox.config
66.stack-work/
77.stack-work-bench/
8+*.yaml.lock
89
910*.o
1011*.hi
@@ -13,6 +14,9 @@ cabal.sandbox.config
1314.\#*
1415\#*
1516
17+# Emacs backup files
18+*~
19+
1620benchmarks/AesonEncode
1721
1822tests/qc
.hlint.yamlnew file+11
@@ -0,0 +1,11 @@
1+# Ignore some builtin hints
2+- ignore:
3+ name: "Reduce duplication"
4+ within:
5+ - Data.Aeson.Types.ToJSON
6+- ignore:
7+ name: "Eta reduce"
8+- ignore:
9+ name: "Use newtype instead of data"
10+ within:
11+ - Data.Aeson.Types.Internal
.travis.yml+42−21
@@ -12,38 +12,59 @@ cache:
1212 - $HOME/.stack
1313 - $HOME/.cabsnap
1414 - $HOME/.cabal/packages
15+ - $HOME/.cabal/store
1516
1617before_cache:
1718 - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
18− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.tar
19+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*
20+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json
21+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache
22+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
23+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
1924
2025matrix:
2126 include:
22− - env: BUILD=hlint CABALVER=1.24 GHCVER=8.0.2
23− compiler: ": #GHC 8.0.2"
24− addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
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
27+
28+ - env: BUILD=hlint CABALVER=2.2 GHCVER=8.4.4
29+ compiler: ": #GHC 8.4.4"
30+ addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.4], sources: [hvr-ghc]}}
31+
32+ - env: BUILD=stack CABALVER=2.4 GHCVER=8.6.5 STACK_YAML=stack-bench.yaml
33+ compiler: ": #GHC 8.6.5"
34+ addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.5], sources: [hvr-ghc]}}
35+
36+ - env: BUILD=stack CABALVER=2.2 GHCVER=8.6.5 STACK_YAML=stack-ffi-unescape.yaml
37+ compiler: ": #GHC 8.6.5"
38+ addons: {apt: {packages: [cabal-install-2.2,ghc-8.6.5], sources: [hvr-ghc]}}
39+
40+ - env: BUILD=cabal2 CABALVER=3.0 GHCVER=8.8.1
41+ compiler: ": #GHC 8.8.1"
42+ addons: {apt: {packages: [cabal-install-3.0,ghc-8.8.1], sources: [hvr-ghc]}}
43+
44+ - env: BUILD=cabal CABALVER=2.4 GHCVER=8.6.5
45+ compiler: ": #GHC 8.6.5"
46+ addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.5], sources: [hvr-ghc]}}
47+
48+ - env: BUILD=cabal CABALVER=2.2 GHCVER=8.4.4
49+ compiler: ": #GHC 8.4.4"
50+ addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.4], sources: [hvr-ghc]}}
51+
52+ - env: BUILD=cabal CABALVER=2.0 GHCVER=8.2.2
53+ compiler: ": #GHC 8.2.2"
54+ addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}
55+
56+ - env: BUILD=cabal CABALVER=2.0 GHCVER=8.0.2
3257 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]}}
37− - env: BUILD=cabal CABALVER=1.18 GHCVER=7.6.3
38− compiler: ": #GHC 7.6.3"
39− addons: {apt: {packages: [cabal-install-1.18,ghc-7.6.3], sources: [hvr-ghc]}}
40− - env: BUILD=cabal CABALVER=1.18 GHCVER=7.8.4
41− compiler: ": #GHC 7.8.4"
42− addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
58+ addons: {apt: {packages: [cabal-install-2.0,ghc-8.0.2], sources: [hvr-ghc]}}
59+
4360 - env: BUILD=cabal CABALVER=1.22 GHCVER=7.10.3
4461 compiler: ": #GHC 7.10.3"
4562 addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
4663
64+ - env: BUILD=cabal CABALVER=1.18 GHCVER=7.8.4
65+ compiler: ": #GHC 7.8.4"
66+ addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
67+
4768before_install:
4869 - unset CC
4970 - export PATH=$HOME/.local/bin:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
CONTRIBUTING.md+39−1
@@ -8,7 +8,7 @@ Changes that affect users of aeson should be mentioned in `changelog.md`. It sho
88 * When it should be used
99 * What it supersedes
1010
11−Add this entry under an `# Upcoming` header above existing releases.
11+Add this entry under an `## Upcoming` header above existing releases.
1212
1313The exact format of entries is not important as we'll go through everything before a release is made.
1414
@@ -58,3 +58,41 @@ import Foo as F
5858import Qux (Q(..), q)
5959import qualified A
6060```
61+
62+## Development Workflow (If you plan on using Stack)
63+
64+Here we outline a general workflow new contributors could adopt for a nice incremental development experience.
65+
66+The root folder consists of two stack-*.yaml config files.
67+
68+1. stack-nightly.yaml - Config file defines all the settings to build and test any changes.
69+2. stack-bench.yaml - Used to run benchmark tests.
70+3. stack-ffi-unescape.yaml - This is for replacing certain parts with a C-implementation.
71+
72+Therefore, a ghci development experience would be:
73+
74+1. `stack ghci --stack-yaml stack-nightly.yaml --test`
75+2. :r to recompile
76+3. `main` to run all tests, or `:main --pattern Foo` to run specific tests matched by pattern.
77+
78+Some discussion on this topic can also be found here [here](https://github.com/bos/aeson/issues/733)
79+
80+Of course before submitting a PR, the following steps are recommended:
81+
82+1. 'stack test --stack-yaml stack-nightly.yaml` - Run the entire suite of tests
83+2. `make hlint` - Run hlint on the source folders.
84+3. 'stack test --stack-yaml stack-bench.yaml` - Run the benchmark tests if you believe your changes could affect the benchmarks.
85+
86+## Development Workflow (If you plan on using Cabal)
87+
88+A ghci development experience would be:
89+
90+1. `cabal new-repl test:tests`
91+2. `:r` to recompile
92+3. `Main.main` to run all tests, or `:m Main; :main --pattern Foo` to run specific tests matched by pattern.
93+
94+Of course before submitting a PR, the following steps are recommended:
95+
96+1. `cabal new-test` - Run the entire suite of tests
97+2. `make hlint` - Run hlint on the source folders.
98+3. Uncomment the `benchmarks` line in `cabal.project` - Run the benchmark tests if you believe your changes could affect the benchmarks.
Data/Aeson.hs+77−5
@@ -1,3 +1,4 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
12-- |
23-- Module: Data.Aeson
34-- Copyright: (c) 2011-2016 Bryan O'Sullivan
@@ -38,11 +39,16 @@ module Data.Aeson
3839 , eitherDecode
3940 , eitherDecode'
4041 , encode
42+ , encodeFile
4143 -- ** Variants for strict bytestrings
4244 , decodeStrict
45+ , decodeFileStrict
4346 , decodeStrict'
47+ , decodeFileStrict'
4448 , eitherDecodeStrict
49+ , eitherDecodeFileStrict
4550 , eitherDecodeStrict'
51+ , eitherDecodeFileStrict'
4652 -- * Core JSON types
4753 , Value(..)
4854 , Encoding
@@ -57,11 +63,18 @@ module Data.Aeson
5763 , fromJSON
5864 , ToJSON(..)
5965 , KeyValue(..)
66+ , (<?>)
67+ , JSONPath
6068 -- ** Keys for maps
6169 , ToJSONKey(..)
6270 , ToJSONKeyFunction(..)
6371 , FromJSONKey(..)
6472 , FromJSONKeyFunction(..)
73+ -- *** Generic keys
74+ , GToJSONKey()
75+ , genericToJSONKey
76+ , GFromJSONKey()
77+ , genericFromJSONKey
6578 -- ** Liftings to unary and binary type constructors
6679 , FromJSON1(..)
6780 , parseJSON1
@@ -87,15 +100,34 @@ module Data.Aeson
87100 , genericLiftToEncoding
88101 , genericParseJSON
89102 , genericLiftParseJSON
103+ -- ** Generic and TH encoding configuration
104+ , Options
90105 , 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
91123
92124 -- * Inspecting @'Value's@
93125 , withObject
94126 , withText
95127 , withArray
96− , withNumber
97128 , withScientific
98129 , withBool
130+ , withEmbeddedJSON
99131 -- * Constructors and accessors
100132 , Series
101133 , pairs
@@ -108,16 +140,16 @@ module Data.Aeson
108140 -- * Parsing
109141 , json
110142 , json'
143+ , parseIndexedJSON
111144 ) where
112145
113−import Prelude ()
114146import Prelude.Compat
115147
116−import Data.Aeson.Types.FromJSON (ifromJSON)
148+import Data.Aeson.Types.FromJSON (ifromJSON, parseIndexedJSON)
117149import Data.Aeson.Encoding (encodingToLazyByteString)
118150import Data.Aeson.Parser.Internal (decodeWith, decodeStrictWith, eitherDecodeWith, eitherDecodeStrictWith, jsonEOF, json, jsonEOF', json')
119151import Data.Aeson.Types
120−import Data.Aeson.Types.Internal (JSONPath, formatError)
152+import Data.Aeson.Types.Internal (JSONPath, formatError, (<?>))
121153import qualified Data.ByteString as B
122154import qualified Data.ByteString.Lazy as L
123155
@@ -127,6 +159,10 @@ import qualified Data.ByteString.Lazy as L
127159encode :: (ToJSON a) => a -> L.ByteString
128160encode = encodingToLazyByteString . toEncoding
129161
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+
130166-- | Efficiently deserialize a JSON value from a lazy 'L.ByteString'.
131167-- If this fails due to incomplete or invalid input, 'Nothing' is
132168-- returned.
@@ -153,6 +189,18 @@ decodeStrict :: (FromJSON a) => B.ByteString -> Maybe a
153189decodeStrict = decodeStrictWith jsonEOF fromJSON
154190{-# INLINE decodeStrict #-}
155191
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+
156204-- | Efficiently deserialize a JSON value from a lazy 'L.ByteString'.
157205-- If this fails due to incomplete or invalid input, 'Nothing' is
158206-- returned.
@@ -179,6 +227,18 @@ decodeStrict' :: (FromJSON a) => B.ByteString -> Maybe a
179227decodeStrict' = decodeStrictWith jsonEOF' fromJSON
180228{-# INLINE decodeStrict' #-}
181229
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+
182242eitherFormatError :: Either (JSONPath, String) a -> Either String a
183243eitherFormatError = either (Left . uncurry formatError) Right
184244{-# INLINE eitherFormatError #-}
@@ -194,6 +254,12 @@ eitherDecodeStrict =
194254 eitherFormatError . eitherDecodeStrictWith jsonEOF ifromJSON
195255{-# INLINE eitherDecodeStrict #-}
196256
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+
197263-- | Like 'decode'' but returns an error message when decoding fails.
198264eitherDecode' :: (FromJSON a) => L.ByteString -> Either String a
199265eitherDecode' = eitherFormatError . eitherDecodeWith jsonEOF' ifromJSON
@@ -205,6 +271,12 @@ eitherDecodeStrict' =
205271 eitherFormatError . eitherDecodeStrictWith jsonEOF' ifromJSON
206272{-# INLINE eitherDecodeStrict' #-}
207273
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+
208280-- $use
209281--
210282-- This section contains basic information on the different ways to
@@ -366,7 +438,7 @@ eitherDecodeStrict' =
366438-- The 'Object' type contains JSON objects:
367439--
368440-- > λ> decode "{\"name\":\"Dave\",\"age\":2}" :: Maybe Object
369−-- > Just (fromList) [("name",String "Dave"),("age",Number 2)]
441+-- > Just (fromList [("name",String "Dave"),("age",Number 2)])
370442--
371443-- You can extract values from it with a parser using 'parse',
372444-- 'parseEither' or, in this example, 'parseMaybe':
Data/Aeson/Encode.hs+2−1
@@ -1,3 +1,4 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
12-- |
23-- Module: Data.Aeson.Encode
34-- Copyright: (c) 2012-2016 Bryan O'Sullivan
@@ -8,13 +9,13 @@
89-- Portability: portable
910--
1011-- This module is left to supply limited backwards-compatibility.
12+
1113module Data.Aeson.Encode {-# DEPRECATED "Use Data.Aeson or Data.Aeson.Text instead" #-}
1214 (
1315 encode
1416 , encodeToTextBuilder
1517 ) where
1618
17−import Prelude ()
1819
1920import Data.ByteString.Lazy (ByteString)
2021import Data.Text.Lazy.Builder (Builder)
Data/Aeson/Encoding.hs+2−1
@@ -1,8 +1,10 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
12-- |
23--
34-- Functions in this module return well-formed 'Encoding''.
45-- Polymorphic variants, which return @'Encoding' a@, return a textual JSON
56-- value, so it can be used as both @'Encoding'' 'Text'@ and @'Encoding' = 'Encoding'' 'Value'@.
7+
68module Data.Aeson.Encoding
79 (
810 -- * Encoding
@@ -49,6 +51,5 @@ module Data.Aeson.Encoding
4951 , value
5052 ) where
5153
52−import Prelude ()
5354
5455import Data.Aeson.Encoding.Internal
Data/Aeson/Encoding/Builder.hs+6−79
@@ -1,6 +1,6 @@
11{-# LANGUAGE BangPatterns #-}
2−{-# LANGUAGE CPP #-}
3−
2+{-# LANGUAGE NoImplicitPrelude #-}
3+{-# LANGUAGE TupleSections #-}
44-- |
55-- Module: Data.Aeson.Encoding.Builder
66-- Copyright: (c) 2011 MailRank, Inc.
@@ -36,7 +36,6 @@ module Data.Aeson.Encoding.Builder
3636 , ascii5
3737 ) where
3838
39−import Prelude ()
4039import Prelude.Compat
4140
4241import Data.Aeson.Internal.Time
@@ -45,8 +44,9 @@ import Data.ByteString.Builder as B
4544import Data.ByteString.Builder.Prim as BP
4645import Data.ByteString.Builder.Scientific (scientificBuilder)
4746import Data.Char (chr, ord)
48−import Data.Monoid ((<>))
47+import Data.Semigroup ((<>))
4948import Data.Scientific (Scientific, base10Exponent, coefficient)
49+import Data.Text.Encoding (encodeUtf8BuilderEscaped)
5050import Data.Time (UTCTime(..))
5151import Data.Time.Calendar (Day(..), toGregorian)
5252import Data.Time.LocalTime
@@ -55,20 +55,6 @@ import qualified Data.HashMap.Strict as HMS
5555import qualified Data.Text as T
5656import qualified Data.Vector as V
5757
58−#if MIN_VERSION_bytestring(0,10,4)
59−import Data.Text.Encoding (encodeUtf8BuilderEscaped)
60−#else
61−import Data.Bits ((.&.))
62−import Data.Text.Internal (Text(..))
63−import Data.Text.Internal.Unsafe.Shift (shiftR)
64−import Foreign.Ptr (minusPtr, plusPtr)
65−import Foreign.Storable (poke)
66−import qualified Data.ByteString.Builder.Internal as B
67−import qualified Data.ByteString.Builder.Prim.Internal as BP
68−import qualified Data.Text.Array as A
69−import qualified Data.Text.Internal.Encoding.Utf16 as U16
70−#endif
71−
7258-- | Encode a JSON value to a "Data.ByteString" 'B.Builder'.
7359--
7460-- Use this function if you are encoding over the wire, or need to
@@ -147,7 +133,7 @@ c2w c = fromIntegral (ord c)
147133-- | Encode a JSON number.
148134scientific :: Scientific -> Builder
149135scientific s
150− | e < 0 = scientificBuilder s
136+ | e < 0 || e > 1024 = scientificBuilder s
151137 | otherwise = B.integerDec (coefficient s * 10 ^ e)
152138 where
153139 e = base10Exponent s
@@ -215,7 +201,7 @@ timeOfDay64 (TOD h m s)
215201 !(T mh ml) = twoDigits m
216202 !(T sh sl) = twoDigits (fromIntegral real)
217203 (real,frac) = s `quotRem` pico
218− showFrac = (\x -> ('.', x)) >$< (BP.liftFixedToBounded BP.char7 >*< trunc12)
204+ showFrac = ('.',) >$< (BP.liftFixedToBounded BP.char7 >*< trunc12)
219205 trunc12 = (`quotRem` micro) >$<
220206 BP.condB (\(_,y) -> y == 0) (fst >$< trunc6) (digits6 >*< trunc6)
221207 digits6 = ((`quotRem` milli) . fromIntegral) >$< (digits3 >*< digits3)
@@ -268,62 +254,3 @@ twoDigits a = T (digit hi) (digit lo)
268254
269255digit :: Int -> Char
270256digit x = chr (x + 48)
271−
272−#if !(MIN_VERSION_bytestring(0,10,4))
273−-- | Encode text using UTF-8 encoding and escape the ASCII characters using
274−-- a 'BP.BoundedPrim'.
275−--
276−-- Use this function is to implement efficient encoders for text-based formats
277−-- like JSON or HTML.
278−{-# INLINE encodeUtf8BuilderEscaped #-}
279−-- TODO: Extend documentation with references to source code in @blaze-html@
280−-- or @aeson@ that uses this function.
281−encodeUtf8BuilderEscaped :: BP.BoundedPrim Word8 -> Text -> B.Builder
282−encodeUtf8BuilderEscaped be =
283− -- manual eta-expansion to ensure inlining works as expected
284− \txt -> B.builder (mkBuildstep txt)
285− where
286− bound = max 4 $ BP.sizeBound be
287−
288− mkBuildstep (Text arr off len) !k =
289− outerLoop off
290− where
291− iend = off + len
292−
293− outerLoop !i0 br@(B.BufferRange op0 ope)
294− | i0 >= iend = k br
295− | outRemaining > 0 = goPartial (i0 + min outRemaining inpRemaining)
296− -- TODO: Use a loop with an integrated bound's check if outRemaining
297− -- is smaller than 8, as this will save on divisions.
298− | otherwise = return $ B.bufferFull bound op0 (outerLoop i0)
299− where
300− outRemaining = (ope `minusPtr` op0) `div` bound
301− inpRemaining = iend - i0
302−
303− goPartial !iendTmp = go i0 op0
304− where
305− go !i !op
306− | i < iendTmp = case A.unsafeIndex arr i of
307− w | w <= 0x7F ->
308− BP.runB be (fromIntegral w) op >>= go (i + 1)
309− | w <= 0x7FF -> do
310− poke8 0 $ (w `shiftR` 6) + 0xC0
311− poke8 1 $ (w .&. 0x3f) + 0x80
312− go (i + 1) (op `plusPtr` 2)
313− | 0xD800 <= w && w <= 0xDBFF -> do
314− let c = ord $ U16.chr2 w (A.unsafeIndex arr (i+1))
315− poke8 0 $ (c `shiftR` 18) + 0xF0
316− poke8 1 $ ((c `shiftR` 12) .&. 0x3F) + 0x80
317− poke8 2 $ ((c `shiftR` 6) .&. 0x3F) + 0x80
318− poke8 3 $ (c .&. 0x3F) + 0x80
319− go (i + 2) (op `plusPtr` 4)
320− | otherwise -> do
321− poke8 0 $ (w `shiftR` 12) + 0xE0
322− poke8 1 $ ((w `shiftR` 6) .&. 0x3F) + 0x80
323− poke8 2 $ (w .&. 0x3F) + 0x80
324− go (i + 1) (op `plusPtr` 3)
325− | otherwise =
326− outerLoop i (B.BufferRange op ope)
327− where
328− poke8 j v = poke (op `plusPtr` j) (fromIntegral v :: Word8)
329−#endif
Data/Aeson/Encoding/Internal.hs+3−2
@@ -1,7 +1,9 @@
11{-# LANGUAGE DeriveDataTypeable #-}
22{-# LANGUAGE EmptyDataDecls #-}
3+{-# LANGUAGE NoImplicitPrelude #-}
34{-# LANGUAGE OverloadedStrings #-}
45{-# LANGUAGE RankNTypes #-}
6+
57module Data.Aeson.Encoding.Internal
68 (
79 -- * Encoding
@@ -55,7 +57,6 @@ module Data.Aeson.Encoding.Internal
5557 , comma, colon, openBracket, closeBracket, openCurly, closeCurly
5658 ) where
5759
58−import Prelude ()
5960import Prelude.Compat
6061
6162import Data.Aeson.Types.Internal (Value)
@@ -81,7 +82,7 @@ newtype Encoding' tag = Encoding {
8182 -- ^ Acquire the underlying bytestring builder.
8283 } deriving (Typeable)
8384
84−-- | Often used synonnym for 'Encoding''.
85+-- | Often used synonym for 'Encoding''.
8586type Encoding = Encoding' Value
8687
8788-- | Make Encoding from Builder.
Data/Aeson/Internal.hs+1−1
@@ -1,3 +1,4 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
12-- |
23-- Module: Data.Aeson.Internal
34-- Copyright: (c) 2015-2016 Bryan O'Sullivan
@@ -22,7 +23,6 @@ module Data.Aeson.Internal
2223 , iparse
2324 ) where
2425
25−import Prelude ()
2626
2727import Data.Aeson.Types.Internal
2828import Data.Aeson.Types.FromJSON (ifromJSON)
Data/Aeson/Internal/Functions.hs+1−1
@@ -1,3 +1,4 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
12-- |
23-- Module: Data.Aeson.Functions
34-- Copyright: (c) 2011-2016 Bryan O'Sullivan
@@ -14,7 +15,6 @@ module Data.Aeson.Internal.Functions
1415 , mapKey
1516 ) where
1617
17−import Prelude ()
1818import Prelude.Compat
1919
2020import Data.Hashable (Hashable)
Data/Aeson/Parser.hs+12−2
@@ -1,3 +1,4 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
12-- |
23-- Module: Data.Aeson.Parser
34-- Copyright: (c) 2012-2016 Bryan O'Sullivan
@@ -34,10 +35,20 @@ module Data.Aeson.Parser
3435 , value
3536 , jstring
3637 , scientific
38+ -- ** Handling objects with duplicate keys
39+ , jsonWith
40+ , jsonLast
41+ , jsonAccum
42+ , jsonNoDup
3743 -- * Strict parsers
3844 -- $strict
3945 , json'
4046 , value'
47+ -- ** Handling objects with duplicate keys
48+ , jsonWith'
49+ , jsonLast'
50+ , jsonAccum'
51+ , jsonNoDup'
4152 -- * Decoding without FromJSON instances
4253 , decodeWith
4354 , decodeStrictWith
@@ -45,9 +56,8 @@ module Data.Aeson.Parser
4556 , eitherDecodeStrictWith
4657 ) where
4758
48−import Prelude ()
4959
50−import Data.Aeson.Parser.Internal (decodeStrictWith, decodeWith, eitherDecodeStrictWith, eitherDecodeWith, json, json', jstring, scientific, value, value')
60+import Data.Aeson.Parser.Internal
5161
5262-- $lazy
5363--
Data/Aeson/Parser/Internal.hs+219−51
@@ -1,10 +1,14 @@
11{-# LANGUAGE BangPatterns #-}
22{-# LANGUAGE CPP #-}
3+{-# LANGUAGE NoImplicitPrelude #-}
34{-# LANGUAGE OverloadedStrings #-}
45#if MIN_VERSION_ghc_prim(0,3,1)
56{-# LANGUAGE MagicHash #-}
67#endif
7−
8+#if __GLASGOW_HASKELL__ <= 710 && __GLASGOW_HASKELL__ >= 706
9+-- Work around a compiler bug
10+{-# OPTIONS_GHC -fsimpl-tick-factor=200 #-}
11+#endif
812-- |
913-- Module: Data.Aeson.Parser.Internal
1014-- Copyright: (c) 2011-2016 Bryan O'Sullivan
@@ -21,30 +25,43 @@ module Data.Aeson.Parser.Internal
2125 (
2226 -- * Lazy parsers
2327 json, jsonEOF
28+ , jsonWith
29+ , jsonLast
30+ , jsonAccum
31+ , jsonNoDup
2432 , value
2533 , jstring
2634 , jstring_
2735 , scientific
2836 -- * Strict parsers
2937 , json', jsonEOF'
38+ , jsonWith'
39+ , jsonLast'
40+ , jsonAccum'
41+ , jsonNoDup'
3042 , value'
3143 -- * Helpers
3244 , decodeWith
3345 , decodeStrictWith
3446 , eitherDecodeWith
3547 , eitherDecodeStrictWith
48+ -- ** Handling objects with duplicate keys
49+ , fromListAccum
50+ , parseListNoDup
3651 ) where
3752
38−import Prelude ()
3953import Prelude.Compat
4054
4155import Control.Applicative ((<|>))
4256import Control.Monad (void, when)
43−import Data.Aeson.Types.Internal (IResult(..), JSONPath, Result(..), Value(..))
57+import Data.Aeson.Types.Internal (IResult(..), JSONPath, Object, Result(..), Value(..))
4458import Data.Attoparsec.ByteString.Char8 (Parser, char, decimal, endOfInput, isDigit_w8, signed, string)
59+import Data.Function (fix)
60+import Data.Functor.Compat (($>))
4561import Data.Scientific (Scientific)
4662import Data.Text (Text)
47−import Data.Vector as Vector (Vector, empty, fromListN, reverse)
63+import Data.Vector (Vector)
64+import qualified Data.Vector as Vector (empty, fromList, fromListN, reverse)
4865import qualified Data.Attoparsec.ByteString as A
4966import qualified Data.Attoparsec.Lazy as L
5067import qualified Data.ByteString as B
@@ -76,7 +93,7 @@ import qualified Data.Text.Encoding as TE
7693#define C_n 110
7794#define C_t 116
7895
79−-- | Parse a top-level JSON value.
96+-- | Parse any JSON value.
8097--
8198-- The conversion of a parsed value to a Haskell value is deferred
8299-- until the Haskell value is needed. This may improve performance if
@@ -86,10 +103,15 @@ import qualified Data.Text.Encoding as TE
86103-- This function is an alias for 'value'. In aeson 0.8 and earlier, it
87104-- parsed only object or array types, in conformance with the
88105-- 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'.
89111json :: Parser Value
90112json = value
91113
92−-- | Parse a top-level JSON value.
114+-- | Parse any JSON value.
93115--
94116-- This is a strict version of 'json' which avoids building up thunks
95117-- during parsing; it performs all conversions immediately. Prefer
@@ -98,23 +120,35 @@ json = value
98120-- This function is an alias for 'value''. In aeson 0.8 and earlier, it
99121-- parsed only object or array types, in conformance with the
100122-- 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''.
101128json' :: Parser Value
102129json' = value'
103130
104−object_ :: Parser Value
105−object_ = {-# SCC "object_" #-} Object <$> objectValues jstring value
131+-- Open recursion: object_, object_', array_, array_' are parameterized by the
132+-- toplevel Value parser to be called recursively, to keep the parameter
133+-- mkObject outside of the recursive loop for proper inlining.
134+
135+object_ :: ([(Text, Value)] -> Either String Object) -> Parser Value -> Parser Value
136+object_ mkObject val = {-# SCC "object_" #-} Object <$> objectValues mkObject jstring val
137+{-# INLINE object_ #-}
106138
107−object_' :: Parser Value
108−object_' = {-# SCC "object_'" #-} do
109− !vals <- objectValues jstring' value'
139+object_' :: ([(Text, Value)] -> Either String Object) -> Parser Value -> Parser Value
140+object_' mkObject val' = {-# SCC "object_'" #-} do
141+ !vals <- objectValues mkObject jstring' val'
110142 return (Object vals)
111143 where
112144 jstring' = do
113145 !s <- jstring
114146 return s
147+{-# INLINE object_' #-}
115148
116−objectValues :: Parser Text -> Parser Value -> Parser (H.HashMap Text Value)
117−objectValues str val = do
149+objectValues :: ([(Text, Value)] -> Either String Object)
150+ -> Parser Text -> Parser Value -> Parser (H.HashMap Text Value)
151+objectValues mkObject str val = do
118152 skipSpace
119153 w <- A.peekWord8'
120154 if w == CLOSE_CURLY
@@ -124,22 +158,26 @@ objectValues str val = do
124158 -- Why use acc pattern here, you may ask? because 'H.fromList' use 'unsafeInsert'
125159 -- and it's much faster because it's doing in place update to the 'HashMap'!
126160 loop acc = do
127− k <- str <* skipSpace <* char ':'
128− v <- val <* skipSpace
129− ch <- A.satisfy $ \w -> w == COMMA || w == CLOSE_CURLY
161+ k <- (str A.<?> "object key") <* skipSpace <* (char ':' A.<?> "':'")
162+ v <- (val A.<?> "object value") <* skipSpace
163+ ch <- A.satisfy (\w -> w == COMMA || w == CLOSE_CURLY) A.<?> "',' or '}'"
130164 let acc' = (k, v) : acc
131165 if ch == COMMA
132166 then skipSpace >> loop acc'
133− else return (H.fromList acc')
167+ else case mkObject acc' of
168+ Left err -> fail err
169+ Right obj -> pure obj
134170{-# INLINE objectValues #-}
135171
136−array_ :: Parser Value
137−array_ = {-# SCC "array_" #-} Array <$> arrayValues value
172+array_ :: Parser Value -> Parser Value
173+array_ val = {-# SCC "array_" #-} Array <$> arrayValues val
174+{-# INLINE array_ #-}
138175
139−array_' :: Parser Value
140−array_' = {-# SCC "array_'" #-} do
141− !vals <- arrayValues value'
176+array_' :: Parser Value -> Parser Value
177+array_' val = {-# SCC "array_'" #-} do
178+ !vals <- arrayValues val
142179 return (Array vals)
180+{-# INLINE array_' #-}
143181
144182arrayValues :: Parser Value -> Parser (Vector Value)
145183arrayValues val = do
@@ -150,57 +188,133 @@ arrayValues val = do
150188 else loop [] 1
151189 where
152190 loop acc !len = do
153− v <- val <* skipSpace
154− ch <- A.satisfy $ \w -> w == COMMA || w == CLOSE_SQUARE
191+ v <- (val A.<?> "json list value") <* skipSpace
192+ ch <- A.satisfy (\w -> w == COMMA || w == CLOSE_SQUARE) A.<?> "',' or ']'"
155193 if ch == COMMA
156194 then skipSpace >> loop (v:acc) (len+1)
157195 else return (Vector.reverse (Vector.fromListN len (v:acc)))
158196{-# INLINE arrayValues #-}
159197
160−-- | Parse any JSON value. You should usually 'json' in preference to
161−-- this function, as this function relaxes the object-or-array
162−-- requirement of RFC 4627.
163−--
164−-- In particular, be careful in using this function if you think your
165−-- code might interoperate with Javascript. A na&#xef;ve Javascript
166−-- library that parses JSON data using @eval@ is vulnerable to attack
167−-- unless the encoded data represents an object or an array. JSON
168−-- implementations in other languages conform to that same restriction
169−-- to preserve interoperability and security.
198+-- | Parse any JSON value. Synonym of 'json'.
170199value :: Parser Value
171−value = do
200+value = jsonWith (pure . H.fromList)
201+
202+-- | Parse any JSON value.
203+--
204+-- This parser is parameterized by a function to construct an 'Object'
205+-- from a raw list of key-value pairs, where duplicates are preserved.
206+-- The pairs appear in __reverse order__ from the source.
207+--
208+-- ==== __Examples__
209+--
210+-- 'json' keeps only the first occurence of each key, using 'HashMap.Lazy.fromList'.
211+--
212+-- @
213+-- 'json' = 'jsonWith' ('Right' '.' 'H.fromList')
214+-- @
215+--
216+-- 'jsonLast' keeps the last occurence of each key, using
217+-- @'HashMap.Lazy.fromListWith' ('const' 'id')@.
218+--
219+-- @
220+-- 'jsonLast' = 'jsonWith' ('Right' '.' 'HashMap.Lazy.fromListWith' ('const' 'id'))
221+-- @
222+--
223+-- 'jsonAccum' keeps wraps all values in arrays to keep duplicates, using
224+-- 'fromListAccum'.
225+--
226+-- @
227+-- 'jsonAccum' = 'jsonWith' ('Right' . 'fromListAccum')
228+-- @
229+--
230+-- 'jsonNoDup' fails if any object contains duplicate keys, using 'parseListNoDup'.
231+--
232+-- @
233+-- 'jsonNoDup' = 'jsonWith' 'parseListNoDup'
234+-- @
235+jsonWith :: ([(Text, Value)] -> Either String Object) -> Parser Value
236+jsonWith mkObject = fix $ \value_ -> do
172237 skipSpace
173238 w <- A.peekWord8'
174239 case w of
175240 DOUBLE_QUOTE -> A.anyWord8 *> (String <$> jstring_)
176− OPEN_CURLY -> A.anyWord8 *> object_
177− OPEN_SQUARE -> A.anyWord8 *> array_
178− C_f -> string "false" *> pure (Bool False)
179− C_t -> string "true" *> pure (Bool True)
180− C_n -> string "null" *> pure Null
241+ OPEN_CURLY -> A.anyWord8 *> object_ mkObject value_
242+ OPEN_SQUARE -> A.anyWord8 *> array_ value_
243+ C_f -> string "false" $> Bool False
244+ C_t -> string "true" $> Bool True
245+ C_n -> string "null" $> Null
181246 _ | w >= 48 && w <= 57 || w == 45
182247 -> Number <$> scientific
183248 | 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))
184254
185−-- | Strict version of 'value'. See also 'json''.
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+
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''.
186282value' :: Parser Value
187−value' = do
283+value' = jsonWith' (pure . H.fromList)
284+
285+-- | Strict version of 'jsonWith'.
286+jsonWith' :: ([(Text, Value)] -> Either String Object) -> Parser Value
287+jsonWith' mkObject = fix $ \value_ -> do
188288 skipSpace
189289 w <- A.peekWord8'
190290 case w of
191291 DOUBLE_QUOTE -> do
192292 !s <- A.anyWord8 *> jstring_
193293 return (String s)
194− OPEN_CURLY -> A.anyWord8 *> object_'
195− OPEN_SQUARE -> A.anyWord8 *> array_'
196− C_f -> string "false" *> pure (Bool False)
197− C_t -> string "true" *> pure (Bool True)
198− C_n -> string "null" *> pure Null
294+ OPEN_CURLY -> A.anyWord8 *> object_' mkObject value_
295+ OPEN_SQUARE -> A.anyWord8 *> array_' value_
296+ C_f -> string "false" $> Bool False
297+ C_t -> string "true" $> Bool True
298+ C_n -> string "null" $> Null
199299 _ | w >= 48 && w <= 57 || w == 45
200300 -> do
201301 !n <- scientific
202302 return (Number n)
203303 | 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
204318
205319-- | Parse a quoted JSON string.
206320jstring :: Parser Text
@@ -276,7 +390,12 @@ eitherDecodeWith p to s =
276390 L.Done _ v -> case to v of
277391 ISuccess a -> Right a
278392 IError path msg -> Left (path, msg)
279− L.Fail _ _ msg -> Left ([], msg)
393+ L.Fail _ ctx msg -> Left ([], buildMsg ctx msg)
394+ where
395+ buildMsg :: [String] -> String -> String
396+ buildMsg [] msg = msg
397+ buildMsg (expectation:_) msg =
398+ msg ++ ". Expecting " ++ expectation
280399{-# INLINE eitherDecodeWith #-}
281400
282401eitherDecodeStrictWith :: Parser Value -> (Value -> IResult a) -> B.ByteString
@@ -329,12 +448,11 @@ data SP = SP !Integer {-# UNPACK #-}!Int
329448
330449decimal0 :: Parser Integer
331450decimal0 = do
332− let step a w = a * 10 + fromIntegral (w - zero)
333− zero = 48
451+ let zero = 48
334452 digits <- A.takeWhile1 isDigit_w8
335453 if B.length digits > 1 && B.unsafeHead digits == zero
336454 then fail "leading zero"
337− else return (B.foldl' step 0 digits)
455+ else return (bsToInteger digits)
338456
339457-- | Parse a JSON number.
340458scientific :: Parser Scientific
@@ -367,3 +485,53 @@ scientific = do
367485 fmap (Sci.scientific signedCoeff . (e +)) (signed decimal)) <|>
368486 return (Sci.scientific signedCoeff e)
369487{-# INLINE scientific #-}
488+
489+------------------ Copy-pasted and adapted from base ------------------------
490+
491+bsToInteger :: B.ByteString -> Integer
492+bsToInteger bs
493+ | l > 40 = valInteger 10 l [ fromIntegral (w - 48) | w <- B.unpack bs ]
494+ | otherwise = bsToIntegerSimple bs
495+ where
496+ l = B.length bs
497+
498+bsToIntegerSimple :: B.ByteString -> Integer
499+bsToIntegerSimple = B.foldl' step 0 where
500+ step a b = a * 10 + fromIntegral (b - 48) -- 48 = '0'
501+
502+-- A sub-quadratic algorithm for Integer. Pairs of adjacent radix b
503+-- digits are combined into a single radix b^2 digit. This process is
504+-- repeated until we are left with a single digit. This algorithm
505+-- performs well only on large inputs, so we use the simple algorithm
506+-- for smaller inputs.
507+valInteger :: Integer -> Int -> [Integer] -> Integer
508+valInteger = go
509+ where
510+ go :: Integer -> Int -> [Integer] -> Integer
511+ go _ _ [] = 0
512+ go _ _ [d] = d
513+ go b l ds
514+ | l > 40 = b' `seq` go b' l' (combine b ds')
515+ | otherwise = valSimple b ds
516+ where
517+ -- ensure that we have an even number of digits
518+ -- before we call combine:
519+ ds' = if even l then ds else 0 : ds
520+ b' = b * b
521+ l' = (l + 1) `quot` 2
522+
523+ combine b (d1 : d2 : ds) = d `seq` (d : combine b ds)
524+ where
525+ d = d1 * b + d2
526+ combine _ [] = []
527+ combine _ [_] = errorWithoutStackTrace "this should not happen"
528+
529+-- The following algorithm is only linear for types whose Num operations
530+-- are in constant time.
531+valSimple :: Integer -> [Integer] -> Integer
532+valSimple base = go 0
533+ where
534+ go r [] = r
535+ go r (d : ds) = r' `seq` go r' ds
536+ where
537+ r' = r * base + fromIntegral d
Data/Aeson/Parser/Time.hs+2−1
@@ -1,3 +1,5 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
13module Data.Aeson.Parser.Time
24 (
35 run
@@ -9,7 +11,6 @@ module Data.Aeson.Parser.Time
911 , zonedTime
1012 ) where
1113
12−import Prelude ()
1314import Prelude.Compat
1415
1516import Data.Attoparsec.Text (Parser)
Data/Aeson/QQ/Simple.hsnew file+25
@@ -0,0 +1,25 @@
1+-- | Like "Data.Aeson.QQ" but without interpolation.
2+module Data.Aeson.QQ.Simple (aesonQQ) where
3+
4+import Data.Aeson
5+import qualified Data.Text as T
6+import qualified Data.Text.Encoding as TE
7+import Language.Haskell.TH
8+import Language.Haskell.TH.Quote
9+import Language.Haskell.TH.Syntax (Lift (..))
10+import Prelude ()
11+import Prelude.Compat
12+
13+aesonQQ :: QuasiQuoter
14+aesonQQ = QuasiQuoter
15+ { quoteExp = aesonExp
16+ , quotePat = const $ error "No quotePat defined for jsonQQ"
17+ , quoteType = const $ error "No quoteType defined for jsonQQ"
18+ , quoteDec = const $ error "No quoteDec defined for jsonQQ"
19+ }
20+
21+aesonExp :: String -> ExpQ
22+aesonExp txt =
23+ case eitherDecodeStrict $ TE.encodeUtf8 $ T.pack txt of
24+ Left err -> error $ "Error in aesonExp: " ++ show err
25+ Right val -> lift (val :: Value)
Data/Aeson/TH.hs+248−363
@@ -85,7 +85,6 @@ $('deriveJSON' 'defaultOptions' ''(,,,))
8585@
8686
8787-}
88−
8988module Data.Aeson.TH
9089 (
9190 -- * Encoding configuration
@@ -117,49 +116,42 @@ module Data.Aeson.TH
117116 , mkLiftParseJSON2
118117 ) where
119118
120−import Prelude ()
121−import Prelude.Compat hiding (exp)
119+import Prelude.Compat
122120
123121import Control.Applicative ((<|>))
124−import Data.Aeson (Object, (.=), (.:), FromJSON(..), FromJSON1(..), FromJSON2(..), ToJSON(..), ToJSON1(..), ToJSON2(..))
122+import Data.Aeson (Object, (.:), FromJSON(..), FromJSON1(..), FromJSON2(..), ToJSON(..), ToJSON1(..), ToJSON2(..))
125123import Data.Aeson.Types (Options(..), Parser, SumEncoding(..), Value(..), defaultOptions, defaultTaggedObject)
126−import Data.Aeson.Types.Internal ((<?>), Pair, JSONPathElement(Key))
124+import Data.Aeson.Types.Internal ((<?>), JSONPathElement(Key))
127125import Data.Aeson.Types.FromJSON (parseOptionalFieldWith)
126+import Data.Aeson.Types.ToJSON (fromPairs, pair)
128127import Control.Monad (liftM2, unless, when)
129128import Data.Foldable (foldr')
130129#if MIN_VERSION_template_haskell(2,8,0) && !MIN_VERSION_template_haskell(2,10,0)
131130import Data.List (nub)
132131#endif
133−import Data.List (foldl', genericLength , intercalate , intersperse, partition, union)
132+import Data.List (foldl', genericLength, intercalate, partition, union)
134133import Data.List.NonEmpty ((<|), NonEmpty((:|)))
135134import Data.Map (Map)
136135import Data.Maybe (catMaybes, fromMaybe, mapMaybe)
136+import qualified Data.Monoid as Monoid
137137import Data.Set (Set)
138−#if MIN_VERSION_template_haskell(2,8,0)
139138import Language.Haskell.TH hiding (Arity)
140−#else
141−import Language.Haskell.TH
142−#endif
143139import Language.Haskell.TH.Datatype
144−#if MIN_VERSION_template_haskell(2,7,0) && !(MIN_VERSION_template_haskell(2,8,0))
145−import Language.Haskell.TH.Lib (starK)
146−#endif
147140#if MIN_VERSION_template_haskell(2,8,0) && !(MIN_VERSION_template_haskell(2,10,0))
148141import Language.Haskell.TH.Syntax (mkNameG_tc)
149142#endif
150143import Text.Printf (printf)
151−import qualified Data.Aeson as A
152144import qualified Data.Aeson.Encoding.Internal as E
153145import qualified Data.Foldable as F (all)
154−import qualified Data.HashMap.Strict as H (lookup, toList)
146+import qualified Data.HashMap.Strict as H (difference, fromList, keys, lookup, toList)
155147import qualified Data.List.NonEmpty as NE (length, reverse)
156148import qualified Data.Map as M (fromList, keys, lookup , singleton, size)
149+import qualified Data.Semigroup as Semigroup (Option(..))
157150import qualified Data.Set as Set (empty, insert, member)
158151import qualified Data.Text as T (Text, pack, unpack)
159−import qualified Data.Vector as V (unsafeIndex, null, length, create, fromList)
152+import qualified Data.Vector as V (unsafeIndex, null, length, create, empty)
160153import qualified Data.Vector.Mutable as VM (unsafeNew, unsafeWrite)
161154
162−
163155--------------------------------------------------------------------------------
164156-- Convenience
165157--------------------------------------------------------------------------------
@@ -253,8 +245,8 @@ deriveToJSONCommon :: JSONClass
253245 -> Name
254246 -- ^ Name of the type for which to generate an instance.
255247 -> Q [Dec]
256−deriveToJSONCommon = deriveJSONClass [ (ToJSON, \jc _ -> consToValue jc)
257− , (ToEncoding, \jc _ -> consToEncoding jc)
248+deriveToJSONCommon = deriveJSONClass [ (ToJSON, \jc _ -> consToValue Value jc)
249+ , (ToEncoding, \jc _ -> consToValue Encoding jc)
258250 ]
259251
260252-- | Generates a lambda expression which encodes the given data type or
@@ -284,7 +276,7 @@ mkToJSONCommon :: JSONClass -- ^ Which class's method is being derived.
284276 -> Options -- ^ Encoding options.
285277 -> Name -- ^ Name of the encoded type.
286278 -> Q Exp
287−mkToJSONCommon = mkFunCommon (\jc _ -> consToValue jc)
279+mkToJSONCommon = mkFunCommon (\jc _ -> consToValue Value jc)
288280
289281-- | Generates a lambda expression which encodes the given data type or
290282-- data family instance constructor as a JSON string.
@@ -313,12 +305,14 @@ mkToEncodingCommon :: JSONClass -- ^ Which class's method is being derived.
313305 -> Options -- ^ Encoding options.
314306 -> Name -- ^ Name of the encoded type.
315307 -> Q Exp
316−mkToEncodingCommon = mkFunCommon (\jc _ -> consToEncoding jc)
308+mkToEncodingCommon = mkFunCommon (\jc _ -> consToValue Encoding jc)
317309
318310-- | Helper function used by both 'deriveToJSON' and 'mkToJSON'. Generates
319−-- code to generate a 'Value' of a number of constructors. All constructors
320−-- must be from the same type.
321−consToValue :: JSONClass
311+-- code to generate a 'Value' or 'Encoding' of a number of constructors. All
312+-- constructors must be from the same type.
313+consToValue :: ToJSONFun
314+ -- ^ The method ('toJSON' or 'toEncoding') being derived.
315+ -> JSONClass
322316 -- ^ The ToJSON variant being derived.
323317 -> Options
324318 -- ^ Encoding options.
@@ -328,16 +322,16 @@ consToValue :: JSONClass
328322 -- ^ Constructors for which to generate JSON generating code.
329323 -> Q Exp
330324
331−consToValue _ _ _ [] = error $ "Data.Aeson.TH.consToValue: "
325+consToValue _ _ _ _ [] = error $ "Data.Aeson.TH.consToValue: "
332326 ++ "Not a single constructor given!"
333327
334−consToValue jc opts vars cons = do
328+consToValue target jc opts instTys cons = do
335329 value <- newName "value"
336330 tjs <- newNameList "_tj" $ arityInt jc
337331 tjls <- newNameList "_tjl" $ arityInt jc
338332 let zippedTJs = zip tjs tjls
339333 interleavedTJs = interleave tjs tjls
340− lastTyVars = map varTToName $ drop (length vars - arityInt jc) vars
334+ lastTyVars = map varTToName $ drop (length instTys - arityInt jc) instTys
341335 tvMap = M.fromList $ zip lastTyVars zippedTJs
342336 lamE (map varP $ interleavedTJs ++ [value]) $
343337 caseE (varE value) (matches tvMap)
@@ -345,66 +339,26 @@ consToValue jc opts vars cons = do
345339 matches tvMap = case cons of
346340 -- A single constructor is directly encoded. The constructor itself may be
347341 -- forgotten.
348− [con] | not (tagSingleConstructors opts) -> [argsToValue jc tvMap opts False con]
342+ [con] | not (tagSingleConstructors opts) -> [argsToValue target jc tvMap opts False con]
349343 _ | allNullaryToStringTag opts && all isNullary cons ->
350− [ match (conP conName []) (normalB $ conStr opts conName) []
344+ [ match (conP conName []) (normalB $ conStr target opts conName) []
351345 | con <- cons
352346 , let conName = constructorName con
353347 ]
354− | otherwise -> [argsToValue jc tvMap opts True con | con <- cons]
348+ | otherwise -> [argsToValue target jc tvMap opts True con | con <- cons]
355349
356−conStr :: Options -> Name -> Q Exp
357−conStr opts = appE [|String|] . conTxt opts
350+-- | Name of the constructor as a quoted 'Value' or 'Encoding'.
351+conStr :: ToJSONFun -> Options -> Name -> Q Exp
352+conStr Value opts = appE [|String|] . conTxt opts
353+conStr Encoding opts = appE [|E.text|] . conTxt opts
358354
355+-- | Name of the constructor as a quoted 'Text'.
359356conTxt :: Options -> Name -> Q Exp
360−conTxt opts = appE [|T.pack|] . conStringE opts
361−
362−conStringE :: Options -> Name -> Q Exp
363−conStringE opts = stringE . constructorTagModifier opts . nameBase
364−
365−-- | Helper function used by both 'deriveToJSON' and 'mkToEncoding'. Generates
366−-- code to write out a value for a number of constructors. All constructors
367−-- must be from the same type.
368−consToEncoding :: JSONClass
369− -- ^ The ToJSON variant being derived.
370− -> Options
371− -- ^ Encoding options.
372− -> [Type]
373− -- ^ The types from the data type/data family instance declaration
374− -> [ConstructorInfo]
375− -- ^ Constructors for which to generate JSON generating code.
376− -> Q Exp
377−
378−consToEncoding _ _ _ [] = error $ "Data.Aeson.TH.consToEncoding: "
379− ++ "Not a single constructor given!"
357+conTxt opts = appE [|T.pack|] . stringE . conString opts
380358
381−consToEncoding jc opts vars cons = do
382− value <- newName "value"
383− tes <- newNameList "_te" $ arityInt jc
384− tels <- newNameList "_tel" $ arityInt jc
385− let zippedTEs = zip tes tels
386− interleavedTEs = interleave tes tels
387− lastTyVars = map varTToName $ drop (length vars - arityInt jc) vars
388− tvMap = M.fromList $ zip lastTyVars zippedTEs
389− lamE (map varP $ interleavedTEs ++ [value]) $
390− caseE (varE value) (matches tvMap)
391− where
392− matches tvMap = case cons of
393− -- A single constructor is directly encoded. The constructor itself may be
394− -- forgotten.
395− [con] | not (tagSingleConstructors opts) -> [argsToEncoding jc tvMap opts False con]
396− -- Encode just the name of the constructor of a sum type iff all the
397− -- constructors are nullary.
398− _ | allNullaryToStringTag opts && all isNullary cons ->
399− [ match (conP conName [])
400− (normalB $ encStr opts conName) []
401− | con <- cons
402− , let conName = constructorName con
403− ]
404− | otherwise -> [argsToEncoding jc tvMap opts True con | con <- cons]
405−
406−encStr :: Options -> Name -> Q Exp
407−encStr opts = appE [|E.text|] . conTxt opts
359+-- | Name of the constructor.
360+conString :: Options -> Name -> String
361+conString opts = constructorTagModifier opts . nameBase
408362
409363-- | If constructor is nullary.
410364isNullary :: ConstructorInfo -> Bool
@@ -412,127 +366,133 @@ isNullary ConstructorInfo { constructorVariant = NormalConstructor
412366 , constructorFields = tys } = null tys
413367isNullary _ = False
414368
415−sumToValue :: Options -> Bool -> Bool -> Name -> Q Exp -> Q Exp
416−sumToValue opts multiCons nullary conName exp
369+-- | Wrap fields of a non-record constructor. See 'sumToValue'.
370+opaqueSumToValue :: ToJSONFun -> Options -> Bool -> Bool -> Name -> ExpQ -> ExpQ
371+opaqueSumToValue target opts multiCons nullary conName value =
372+ sumToValue target opts multiCons nullary conName
373+ value
374+ pairs
375+ where
376+ pairs contentsFieldName = pairE contentsFieldName value
377+
378+-- | Wrap fields of a record constructor. See 'sumToValue'.
379+recordSumToValue :: ToJSONFun -> Options -> Bool -> Bool -> Name -> ExpQ -> ExpQ
380+recordSumToValue target opts multiCons nullary conName pairs =
381+ sumToValue target opts multiCons nullary conName
382+ (fromPairsE pairs)
383+ (const pairs)
384+
385+-- | Wrap fields of a constructor.
386+sumToValue
387+ :: ToJSONFun
388+ -- ^ The method being derived.
389+ -> Options
390+ -- ^ Deriving options.
391+ -> Bool
392+ -- ^ Does this type have multiple constructors.
393+ -> Bool
394+ -- ^ Is this constructor nullary.
395+ -> Name
396+ -- ^ Constructor name.
397+ -> ExpQ
398+ -- ^ Fields of the constructor as a 'Value' or 'Encoding'.
399+ -> (String -> ExpQ)
400+ -- ^ Representation of an 'Object' fragment used for the 'TaggedObject'
401+ -- variant; of type @[(Text,Value)]@ or @[Encoding]@, depending on the method
402+ -- being derived.
403+ --
404+ -- - For non-records, produces a pair @"contentsFieldName":value@,
405+ -- given a @contentsFieldName@ as an argument. See 'opaqueSumToValue'.
406+ -- - For records, produces the list of pairs corresponding to fields of the
407+ -- encoded value (ignores the argument). See 'recordSumToValue'.
408+ -> ExpQ
409+sumToValue target opts multiCons nullary conName value pairs
417410 | multiCons =
418411 case sumEncoding opts of
419412 TwoElemArray ->
420− [|Array|] `appE` ([|V.fromList|] `appE` listE [conStr opts conName, exp])
413+ array target [conStr target opts conName, value]
421414 TaggedObject{tagFieldName, contentsFieldName} ->
422− let tag = infixApp [|T.pack tagFieldName|] [|(.=)|] (conStr opts conName)
423− contents = infixApp [|T.pack contentsFieldName|] [|(.=)|] exp
424− in
425− [|A.object|] `appE` listE (if nullary then [tag] else [tag, contents])
415+ -- TODO: Maybe throw an error in case
416+ -- tagFieldName overwrites a field in pairs.
417+ let tag = pairE tagFieldName (conStr target opts conName)
418+ content = pairs contentsFieldName
419+ in fromPairsE $
420+ if nullary then tag else infixApp tag [|(Monoid.<>)|] content
426421 ObjectWithSingleField ->
427− [|A.object|] `appE` listE
428− [ infixApp (conTxt opts conName) [|(.=)|] exp
429− ]
430− UntaggedValue | nullary -> conStr opts conName
431− UntaggedValue -> exp
432− | otherwise = exp
422+ objectE [(conString opts conName, value)]
423+ UntaggedValue | nullary -> conStr target opts conName
424+ UntaggedValue -> value
425+ | otherwise = value
433426
434427-- | Generates code to generate the JSON encoding of a single constructor.
435−argsToValue :: JSONClass -> TyVarMap -> Options -> Bool -> ConstructorInfo -> Q Match
428+argsToValue :: ToJSONFun -> JSONClass -> TyVarMap -> Options -> Bool -> ConstructorInfo -> Q Match
436429
437430-- Polyadic constructors with special case for unary constructors.
438−argsToValue jc tvMap opts multiCons
431+argsToValue target jc tvMap opts multiCons
439432 ConstructorInfo { constructorName = conName
440433 , constructorVariant = NormalConstructor
441434 , constructorFields = argTys } = do
442435 argTys' <- mapM resolveTypeSynonyms argTys
443436 let len = length argTys'
444437 args <- newNameList "arg" len
445− js <- case [ dispatchToJSON jc conName tvMap argTy
446− `appE` varE arg
447− | (arg, argTy) <- zip args argTys'
448− ] of
449− -- Single argument is directly converted.
450− [e] -> return e
451− -- Multiple arguments are converted to a JSON array.
452− es -> do
453− mv <- newName "mv"
454− let newMV = bindS (varP mv)
455− ([|VM.unsafeNew|] `appE`
456− litE (integerL $ fromIntegral len))
457− stmts = [ noBindS $
458− [|VM.unsafeWrite|] `appE`
459− varE mv `appE`
460− litE (integerL ix) `appE`
461− e
462− | (ix, e) <- zip [(0::Integer)..] es
463− ]
464− ret = noBindS $ [|return|] `appE` varE mv
465− return $ [|Array|] `appE`
466− (varE 'V.create `appE`
467− doE (newMV:stmts++[ret]))
438+ let js = case [ dispatchToJSON target jc conName tvMap argTy
439+ `appE` varE arg
440+ | (arg, argTy) <- zip args argTys'
441+ ] of
442+ -- Single argument is directly converted.
443+ [e] -> e
444+ -- Zero and multiple arguments are converted to a JSON array.
445+ es -> array target es
446+
468447 match (conP conName $ map varP args)
469− (normalB $ sumToValue opts multiCons (null argTys') conName js)
448+ (normalB $ opaqueSumToValue target opts multiCons (null argTys') conName js)
470449 []
471450
472451-- Records.
473−argsToValue jc tvMap opts multiCons
452+argsToValue target jc tvMap opts multiCons
474453 info@ConstructorInfo { constructorName = conName
475454 , constructorVariant = RecordConstructor fields
476455 , constructorFields = argTys } =
477456 case (unwrapUnaryRecords opts, not multiCons, argTys) of
478− (True,True,[_]) -> argsToValue jc tvMap opts multiCons
457+ (True,True,[_]) -> argsToValue target jc tvMap opts multiCons
479458 (info{constructorVariant = NormalConstructor})
480459 _ -> do
481460 argTys' <- mapM resolveTypeSynonyms argTys
482461 args <- newNameList "arg" $ length argTys'
483− let exp = [|A.object|] `appE` pairs
484−
485− pairs | omitNothingFields opts = infixApp maybeFields
486− [|(++)|]
462+ let pairs | omitNothingFields opts = infixApp maybeFields
463+ [|(Monoid.<>)|]
487464 restFields
488− | otherwise = listE $ map toPair argCons
465+ | otherwise = mconcatE (map pureToPair argCons)
489466
490− argCons = zip3 args argTys' fields
467+ argCons = zip3 (map varE args) argTys' fields
491468
492− maybeFields = [|catMaybes|] `appE` listE (map maybeToPair maybes)
469+ maybeFields = mconcatE (map maybeToPair maybes)
493470
494− restFields = listE $ map toPair rest
471+ restFields = mconcatE (map pureToPair rest)
495472
496− (maybes, rest) = partition isMaybe argCons
473+ (maybes0, rest0) = partition isMaybe argCons
474+ (options, rest) = partition isOption rest0
475+ maybes = maybes0 ++ map optionToMaybe options
497476
498− maybeToPair (arg, argTy, field) =
499− infixApp ([|keyValuePairWith|]
500− `appE` dispatchToJSON jc conName tvMap argTy
501− `appE` toFieldName field)
502− [|(<$>)|]
503− (varE arg)
477+ maybeToPair = toPairLifted True
478+ pureToPair = toPairLifted False
504479
505− toPair (arg, argTy, field) =
506− [|keyValuePairWith|]
507− `appE` dispatchToJSON jc conName tvMap argTy
508− `appE` toFieldName field
509− `appE` varE arg
510−
511− toFieldName field = [|T.pack|] `appE` fieldLabelExp opts field
480+ toPairLifted lifted (arg, argTy, field) =
481+ let toValue = dispatchToJSON target jc conName tvMap argTy
482+ fieldName = fieldLabel opts field
483+ e arg' = pairE fieldName (toValue `appE` arg')
484+ in if lifted
485+ then do
486+ x <- newName "x"
487+ [|maybe mempty|] `appE` lam1E (varP x) (e (varE x)) `appE` arg
488+ else e arg
512489
513490 match (conP conName $ map varP args)
514− ( normalB
515− $ if multiCons
516− then case sumEncoding opts of
517− TwoElemArray -> [|toJSON|] `appE` tupE [conStr opts conName, exp]
518− TaggedObject{tagFieldName} ->
519− [|A.object|] `appE`
520− -- TODO: Maybe throw an error in case
521− -- tagFieldName overwrites a field in pairs.
522− infixApp (infixApp [|T.pack tagFieldName|]
523− [|(.=)|]
524− (conStr opts conName))
525− [|(:)|]
526− pairs
527− ObjectWithSingleField ->
528− [|A.object|] `appE` listE
529− [ infixApp (conTxt opts conName) [|(.=)|] exp ]
530− UntaggedValue -> exp
531− else exp
532− ) []
491+ (normalB $ recordSumToValue target opts multiCons (null argTys) conName pairs)
492+ []
533493
534494-- Infix constructors.
535−argsToValue jc tvMap opts multiCons
495+argsToValue target jc tvMap opts multiCons
536496 ConstructorInfo { constructorName = conName
537497 , constructorVariant = InfixConstructor
538498 , constructorFields = argTys } = do
@@ -541,11 +501,12 @@ argsToValue jc tvMap opts multiCons
541501 ar <- newName "argR"
542502 match (infixP (varP al) conName (varP ar))
543503 ( normalB
544− $ sumToValue opts multiCons False conName
545− $ [|toJSON|] `appE` listE [ dispatchToJSON jc conName tvMap aTy
546− `appE` varE a
547− | (a, aTy) <- [(al,alTy), (ar,arTy)]
548− ]
504+ $ opaqueSumToValue target opts multiCons False conName
505+ $ array target
506+ [ dispatchToJSON target jc conName tvMap aTy
507+ `appE` varE a
508+ | (a, aTy) <- [(al,alTy), (ar,arTy)]
509+ ]
549510 )
550511 []
551512
@@ -553,151 +514,63 @@ isMaybe :: (a, Type, b) -> Bool
553514isMaybe (_, AppT (ConT t) _, _) = t == ''Maybe
554515isMaybe _ = False
555516
517+isOption :: (a, Type, b) -> Bool
518+isOption (_, AppT (ConT t) _, _) = t == ''Semigroup.Option
519+isOption _ = False
520+
521+optionToMaybe :: (ExpQ, b, c) -> (ExpQ, b, c)
522+optionToMaybe (a, b, c) = ([|Semigroup.getOption|] `appE` a, b, c)
523+
556524(<^>) :: ExpQ -> ExpQ -> ExpQ
557525(<^>) a b = infixApp a [|(E.><)|] b
558526infixr 6 <^>
559527
560−(<:>) :: ExpQ -> ExpQ -> ExpQ
561−(<:>) a b = a <^> [|E.colon|] <^> b
562−infixr 5 <:>
563−
564528(<%>) :: ExpQ -> ExpQ -> ExpQ
565529(<%>) a b = a <^> [|E.comma|] <^> b
566530infixr 4 <%>
567531
568−array :: ExpQ -> ExpQ
569−array exp = [|E.wrapArray|] `appE` exp
570−
571−object :: ExpQ -> ExpQ
572−object exp = [|E.wrapObject|] `appE` exp
573−
574−sumToEncoding :: Options -> Bool -> Bool -> Name -> Q Exp -> Q Exp
575−sumToEncoding opts multiCons nullary conName exp
576− | multiCons =
577− let fexp = exp in
578− case sumEncoding opts of
579− TwoElemArray ->
580− array (encStr opts conName <%> fexp)
581− TaggedObject{tagFieldName, contentsFieldName} ->
582− let tag = [|E.text (T.pack tagFieldName)|] <:> encStr opts conName
583− contents = [|E.text (T.pack contentsFieldName)|] <:> fexp
584− in
585− object $
586− if nullary then tag else tag <%> contents
587− ObjectWithSingleField ->
588− object (encStr opts conName <:> fexp)
589− UntaggedValue | nullary -> encStr opts conName
590− UntaggedValue -> exp
591− | otherwise = exp
592−
593−-- | Generates code to generate the JSON encoding of a single constructor.
594−argsToEncoding :: JSONClass -> TyVarMap -> Options -> Bool -> ConstructorInfo -> Q Match
595−
596−-- Polyadic constructors with special case for unary constructors.
597−argsToEncoding jc tvMap opts multiCons
598− ConstructorInfo { constructorName = conName
599− , constructorVariant = NormalConstructor
600− , constructorFields = argTys } = do
601− argTys' <- mapM resolveTypeSynonyms argTys
602− args <- newNameList "arg" $ length argTys'
603− js <- case zip args argTys' of
604− -- Nullary constructors are converted to an empty array.
605− [] -> return [| E.emptyArray_ |]
606−
607− -- Single argument is directly converted.
608− [(e,eTy)] -> return (dispatchToEncoding jc conName tvMap eTy
609− `appE` varE e)
610− -- Multiple arguments are converted to a JSON array.
611− es ->
612− return (array (foldr1 (<%>) [ dispatchToEncoding jc conName tvMap xTy
613− `appE` varE x
614− | (x,xTy) <- es
615− ]))
616− match (conP conName $ map varP args)
617− (normalB $ sumToEncoding opts multiCons (null argTys') conName js)
618− []
619−
620−-- Records.
621−argsToEncoding jc tvMap opts multiCons
622− info@ConstructorInfo { constructorName = conName
623− , constructorVariant = RecordConstructor fields
624− , constructorFields = argTys } =
625− case (unwrapUnaryRecords opts, not multiCons, argTys) of
626− (True,True,[_]) -> argsToEncoding jc tvMap opts multiCons
627− (info{constructorVariant = NormalConstructor})
628− _ -> do
629− argTys' <- mapM resolveTypeSynonyms argTys
630− args <- newNameList "arg" $ length argTys'
631− let exp = object objBody
632−
633− objBody = [|E.econcat|] `appE`
634− ([|intersperse E.comma|] `appE` pairs)
635− pairs | omitNothingFields opts = infixApp maybeFields
636− [|(++)|]
637− restFields
638− | otherwise = listE (map toPair argCons)
639−
640− argCons = zip3 args argTys' fields
641−
642− maybeFields = [|catMaybes|] `appE` listE (map maybeToPair maybes)
643−
644− restFields = listE (map toPair rest)
645−
646− (maybes, rest) = partition isMaybe argCons
647−
648− maybeToPair (arg, argTy, field) =
649− infixApp
650− (infixApp
651− (infixE
652− (Just $ toFieldName field <^> [|E.colon|])
653− [|(E.><)|]
654− Nothing)
655− [|(.)|]
656− (dispatchToEncoding jc conName tvMap argTy))
657− [|(<$>)|]
658− (varE arg)
532+-- | Wrap a list of quoted 'Value's in a quoted 'Array' (of type 'Value').
533+array :: ToJSONFun -> [ExpQ] -> ExpQ
534+array Encoding [] = [|E.emptyArray_|]
535+array Value [] = [|Array V.empty|]
536+array Encoding es = [|E.wrapArray|] `appE` foldr1 (<%>) es
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]))
659553
660− toPair (arg, argTy, field) =
661− toFieldName field
662− <:> dispatchToEncoding jc conName tvMap argTy
663− `appE` varE arg
554+-- | Wrap an associative list of keys and quoted values in a quoted 'Object'.
555+objectE :: [(String, ExpQ)] -> ExpQ
556+objectE = fromPairsE . mconcatE . fmap (uncurry pairE)
664557
665− toFieldName field = [|E.text|] `appE`
666− ([|T.pack|] `appE` fieldLabelExp opts field)
558+-- | 'mconcat' a list of fixed length.
559+--
560+-- > mconcatE [ [|x|], [|y|], [|z|] ] = [| x <> (y <> z) |]
561+mconcatE :: [ExpQ] -> ExpQ
562+mconcatE [] = [|Monoid.mempty|]
563+mconcatE [x] = x
564+mconcatE (x : xs) = infixApp x [|(Monoid.<>)|] (mconcatE xs)
667565
668− match (conP conName $ map varP args)
669− ( normalB
670− $ if multiCons
671− then case sumEncoding opts of
672− TwoElemArray -> array $
673− encStr opts conName <%> exp
674− TaggedObject{tagFieldName} -> object $
675− ([|E.text (T.pack tagFieldName)|] <:>
676− encStr opts conName) <%>
677− objBody
678− ObjectWithSingleField -> object $
679− encStr opts conName <:> exp
680− UntaggedValue -> exp
681− else exp
682− ) []
566+fromPairsE :: ExpQ -> ExpQ
567+fromPairsE = ([|fromPairs|] `appE`)
683568
684−-- Infix constructors.
685−argsToEncoding jc tvMap opts multiCons
686− ConstructorInfo { constructorName = conName
687− , constructorVariant = InfixConstructor
688− , constructorFields = argTys } = do
689− al <- newName "argL"
690− ar <- newName "argR"
691− [alTy,arTy] <- mapM resolveTypeSynonyms argTys
692− match (infixP (varP al) conName (varP ar))
693− ( normalB
694− $ sumToEncoding opts multiCons False conName
695− $ array (foldr1 (<%>) [ dispatchToEncoding jc conName tvMap aTy
696− `appE` varE a
697− | (a,aTy) <- [(al,alTy), (ar,arTy)]
698− ])
699− )
700− []
569+-- | Create (an encoding of) a key-value pair.
570+--
571+-- > pairE "k" [|v|] = [|pair "k" v|]
572+pairE :: String -> ExpQ -> ExpQ
573+pairE k v = [|pair k|] `appE` v
701574
702575--------------------------------------------------------------------------------
703576-- FromJSON
@@ -790,13 +663,13 @@ consFromJSON :: JSONClass
790663consFromJSON _ _ _ _ [] = error $ "Data.Aeson.TH.consFromJSON: "
791664 ++ "Not a single constructor given!"
792665
793−consFromJSON jc tName opts vars cons = do
666+consFromJSON jc tName opts instTys cons = do
794667 value <- newName "value"
795668 pjs <- newNameList "_pj" $ arityInt jc
796669 pjls <- newNameList "_pjl" $ arityInt jc
797670 let zippedPJs = zip pjs pjls
798671 interleavedPJs = interleave pjs pjls
799− lastTyVars = map varTToName $ drop (length vars - arityInt jc) vars
672+ lastTyVars = map varTToName $ drop (length instTys - arityInt jc) instTys
800673 tvMap = M.fromList $ zip lastTyVars zippedPJs
801674 lamE (map varP $ interleavedPJs ++ [value]) $ lamExpr value tvMap
802675
@@ -824,8 +697,7 @@ consFromJSON jc tName opts vars cons = do
824697 [ liftM2 (,) (normalG $
825698 infixApp (varE txt)
826699 [|(==)|]
827− ([|T.pack|] `appE`
828− conStringE opts conName)
700+ (conTxt opts conName)
829701 )
830702 ([|pure|] `appE` conE conName)
831703 | con <- cons
@@ -917,7 +789,7 @@ consFromJSON jc tName opts vars cons = do
917789 caseE (varE conVal)
918790 [ match (conP 'String [varP str])
919791 (guardedB
920− [ liftM2 (,) (normalG $ infixApp (varE str) [|(==)|] ([|T.pack|] `appE` conStringE opts conName)
792+ [ liftM2 (,) (normalG $ infixApp (varE str) [|(==)|] (conTxt opts conName)
921793 )
922794 ([|pure|] `appE` conE conName)
923795 ]
@@ -1050,18 +922,38 @@ parseRecord :: JSONClass
1050922 -> Name
1051923 -> [Name]
1052924 -> Name
925+ -> Bool
1053926 -> ExpQ
1054−parseRecord jc tvMap argTys opts tName conName fields obj =
927+parseRecord jc tvMap argTys opts tName conName fields obj inTaggedObject =
928+ (if rejectUnknownFields opts
929+ then infixApp checkUnknownRecords [|(>>)|]
930+ else id) $
1055931 foldl' (\a b -> infixApp a [|(<*>)|] b)
1056932 (infixApp (conE conName) [|(<$>)|] x)
1057933 xs
1058934 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+ ]
1059951 x:xs = [ [|lookupField|]
1060952 `appE` dispatchParseJSON jc conName tvMap argTy
1061953 `appE` litE (stringL $ show tName)
1062954 `appE` litE (stringL $ constructorTagModifier opts $ nameBase conName)
1063955 `appE` varE obj
1064− `appE` ( [|T.pack|] `appE` fieldLabelExp opts field
956+ `appE` ( [|T.pack|] `appE` stringE (fieldLabel opts field)
1065957 )
1066958 | (field, argTy) <- zip fields argTys
1067959 ]
@@ -1130,7 +1022,7 @@ parseArgs jc tvMap tName opts
11301022 , constructorFields = argTys }
11311023 (Left (_, obj)) = do
11321024 argTys' <- mapM resolveTypeSynonyms argTys
1133− parseRecord jc tvMap argTys' opts tName conName fields obj
1025+ parseRecord jc tvMap argTys' opts tName conName fields obj True
11341026parseArgs jc tvMap tName opts
11351027 info@ConstructorInfo { constructorName = conName
11361028 , constructorVariant = RecordConstructor fields
@@ -1145,7 +1037,7 @@ parseArgs jc tvMap tName opts
11451037 argTys' <- mapM resolveTypeSynonyms argTys
11461038 caseE (varE valName)
11471039 [ match (conP 'Object [varP obj]) (normalB $
1148− parseRecord jc tvMap argTys' opts tName conName fields obj) []
1040+ parseRecord jc tvMap argTys' opts tName conName fields obj False) []
11491041 , matchFailed tName conName "Object"
11501042 ]
11511043
@@ -1234,6 +1126,11 @@ instance OVERLAPPABLE_ LookupField a where
12341126instance INCOHERENT_ LookupField (Maybe a) where
12351127 lookupField pj _ _ = parseOptionalFieldWith pj
12361128
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+
12371134lookupFieldWith :: (Value -> Parser a) -> String -> String
12381135 -> Object -> T.Text -> Parser a
12391136lookupFieldWith pj tName rec obj key =
@@ -1241,9 +1138,6 @@ lookupFieldWith pj tName rec obj key =
12411138 Nothing -> unknownFieldFail tName rec (T.unpack key)
12421139 Just v -> pj v <?> Key key
12431140
1244−keyValuePairWith :: (v -> Value) -> T.Text -> v -> Pair
1245−keyValuePairWith tj name value = (name, tj value)
1246−
12471141unknownFieldFail :: String -> String -> String -> Parser fail
12481142unknownFieldFail tName rec key =
12491143 fail $ printf "When parsing the record %s of type %s the key %s was not present."
@@ -1326,23 +1220,27 @@ deriveJSONClass :: [(JSONFun, JSONClass -> Name -> Options -> [Type]
13261220deriveJSONClass consFuns jc opts name = do
13271221 info <- reifyDatatype name
13281222 case info of
1329− DatatypeInfo { datatypeContext = ctxt
1330− , datatypeName = parentName
1331− , datatypeVars = vars
1332− , datatypeVariant = variant
1333− , datatypeCons = cons
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
13341232 } -> do
13351233 (instanceCxt, instanceType)
1336− <- buildTypeInstance parentName jc ctxt vars variant
1234+ <- buildTypeInstance parentName jc ctxt instTys variant
13371235 (:[]) <$> instanceD (return instanceCxt)
13381236 (return instanceType)
1339− (methodDecs parentName vars cons)
1237+ (methodDecs parentName instTys cons)
13401238 where
13411239 methodDecs :: Name -> [Type] -> [ConstructorInfo] -> [Q Dec]
1342− methodDecs parentName vars cons = flip map consFuns $ \(jf, jfMaker) ->
1240+ methodDecs parentName instTys cons = flip map consFuns $ \(jf, jfMaker) ->
13431241 funD (jsonFunValName jf (arity jc))
13441242 [ clause []
1345− (normalB $ jfMaker jc parentName opts vars cons)
1243+ (normalB $ jfMaker jc parentName opts instTys cons)
13461244 []
13471245 ]
13481246
@@ -1358,17 +1256,21 @@ mkFunCommon :: (JSONClass -> Name -> Options -> [Type] -> [ConstructorInfo] -> Q
13581256mkFunCommon consFun jc opts name = do
13591257 info <- reifyDatatype name
13601258 case info of
1361− DatatypeInfo { datatypeContext = ctxt
1362− , datatypeName = parentName
1363− , datatypeVars = vars
1364− , datatypeVariant = variant
1365− , datatypeCons = cons
1259+ DatatypeInfo { datatypeContext = ctxt
1260+ , datatypeName = parentName
1261+#if MIN_VERSION_th_abstraction(0,3,0)
1262+ , datatypeInstTypes = instTys
1263+#else
1264+ , datatypeVars = instTys
1265+#endif
1266+ , datatypeVariant = variant
1267+ , datatypeCons = cons
13661268 } -> do
13671269 -- We force buildTypeInstance here since it performs some checks for whether
13681270 -- or not the provided datatype's kind matches the derived method's
13691271 -- typeclass, and produces errors if it can't.
1370− !_ <- buildTypeInstance parentName jc ctxt vars variant
1371− consFun jc parentName opts vars cons
1272+ !_ <- buildTypeInstance parentName jc ctxt instTys variant
1273+ consFun jc parentName opts instTys cons
13721274
13731275dispatchFunByType :: JSONClass
13741276 -> JSONFun
@@ -1413,10 +1315,13 @@ dispatchFunByType jc jf conName tvMap list ty = do
14131315 (interleave rhsArgs rhsArgs)
14141316 else varE $ jsonFunValOrListName list jf Arity0
14151317
1416−dispatchToJSON, dispatchToEncoding, dispatchParseJSON
1318+dispatchToJSON
1319+ :: ToJSONFun -> JSONClass -> Name -> TyVarMap -> Type -> Q Exp
1320+dispatchToJSON target jc n tvMap =
1321+ dispatchFunByType jc (targetToJSONFun target) n tvMap False
1322+
1323+dispatchParseJSON
14171324 :: JSONClass -> Name -> TyVarMap -> Type -> Q Exp
1418−dispatchToJSON jc n tvMap = dispatchFunByType jc ToJSON n tvMap False
1419−dispatchToEncoding jc n tvMap = dispatchFunByType jc ToEncoding n tvMap False
14201325dispatchParseJSON jc n tvMap = dispatchFunByType jc ParseJSON n tvMap False
14211326
14221327--------------------------------------------------------------------------------
@@ -1698,21 +1603,13 @@ type TyVarMap = Map Name (Name, Name)
16981603-- | Returns True if a Type has kind *.
16991604hasKindStar :: Type -> Bool
17001605hasKindStar VarT{} = True
1701−#if MIN_VERSION_template_haskell(2,8,0)
17021606hasKindStar (SigT _ StarT) = True
1703−#else
1704−hasKindStar (SigT _ StarK) = True
1705−#endif
17061607hasKindStar _ = False
17071608
17081609-- Returns True is a kind is equal to *, or if it is a kind variable.
17091610isStarOrVar :: Kind -> Bool
1710−#if MIN_VERSION_template_haskell(2,8,0)
17111611isStarOrVar StarT = True
17121612isStarOrVar VarT{} = True
1713−#else
1714−isStarOrVar StarK = True
1715−#endif
17161613isStarOrVar _ = False
17171614
17181615-- Generate a list of fresh names with a common prefix, and numbered suffixes.
@@ -1770,9 +1667,7 @@ isTyFamily (ConT n) = do
17701667#else
17711668 FamilyI (FamilyD TypeFam _ _ _) _ -> True
17721669#endif
1773−#if MIN_VERSION_template_haskell(2,9,0)
17741670 FamilyI ClosedTypeFamilyD{} _ -> True
1775−#endif
17761671 _ -> False
17771672isTyFamily _ = return False
17781673
@@ -1800,9 +1695,7 @@ mentionsName = go
18001695 go :: Type -> [Name] -> Bool
18011696 go (AppT t1 t2) names = go t1 names || go t2 names
18021697 go (SigT t _k) names = go t names
1803−#if MIN_VERSION_template_haskell(2,8,0)
18041698 || go _k names
1805−#endif
18061699 go (VarT n) names = n `elem` names
18071700 go _ _ = False
18081701
@@ -1858,23 +1751,14 @@ uncurryTy t = ([], t :| [])
18581751
18591752-- | Like uncurryType, except on a kind level.
18601753uncurryKind :: Kind -> NonEmpty Kind
1861−#if MIN_VERSION_template_haskell(2,8,0)
18621754uncurryKind = snd . uncurryTy
1863−#else
1864−uncurryKind (ArrowK k1 k2) = k1 <| uncurryKind k2
1865−uncurryKind k = k :| []
1866−#endif
18671755
18681756createKindChain :: Int -> Kind
18691757createKindChain = go starK
18701758 where
18711759 go :: Kind -> Int -> Kind
18721760 go k 0 = k
1873−#if MIN_VERSION_template_haskell(2,8,0)
18741761 go k !n = go (AppT (AppT ArrowT StarT) k) (n - 1)
1875−#else
1876− go k !n = go (ArrowK StarK k) (n - 1)
1877−#endif
18781762
18791763-- | Makes a string literal expression from a constructor's name.
18801764conNameExp :: Options -> ConstructorInfo -> Q Exp
@@ -1884,11 +1768,11 @@ conNameExp opts = litE
18841768 . nameBase
18851769 . constructorName
18861770
1887−-- | Creates a string literal expression from a record field label.
1888−fieldLabelExp :: Options -- ^ Encoding options
1889− -> Name
1890− -> Q Exp
1891−fieldLabelExp opts = litE . stringL . fieldLabelModifier opts . nameBase
1771+-- | Extracts a record field label.
1772+fieldLabel :: Options -- ^ Encoding options
1773+ -> Name
1774+ -> String
1775+fieldLabel opts = fieldLabelModifier opts . nameBase
18921776
18931777-- | The name of the outermost 'Value' constructor.
18941778valueConName :: Value -> String
@@ -1928,11 +1812,7 @@ canEtaReduce remaining dropped =
19281812-------------------------------------------------------------------------------
19291813
19301814applySubstitutionKind :: Map Name Kind -> Type -> Type
1931−#if MIN_VERSION_template_haskell(2,8,0)
19321815applySubstitutionKind = applySubstitution
1933−#else
1934−applySubstitutionKind _ t = t
1935−#endif
19361816
19371817substNameWithKind :: Name -> Kind -> Type -> Type
19381818substNameWithKind n k = applySubstitutionKind (M.singleton n k)
@@ -2021,6 +1901,13 @@ data Direction = To | From
20211901-- | A representation of which typeclass method is being spliced in.
20221902data JSONFun = ToJSON | ToEncoding | ParseJSON
20231903
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+
20241911-- | A representation of which typeclass is being derived.
20251912data JSONClass = JSONClass { direction :: Direction, arity :: Arity }
20261913
@@ -2089,9 +1976,7 @@ data StarKindStatus = NotKindStar
20891976canRealizeKindStar :: Type -> StarKindStatus
20901977canRealizeKindStar t = case t of
20911978 _ | hasKindStar t -> KindStar
2092−#if MIN_VERSION_template_haskell(2,8,0)
20931979 SigT _ (VarT k) -> IsKindVar k
2094−#endif
20951980 _ -> NotKindStar
20961981
20971982-- | Returns 'Just' the kind variable 'Name' of a 'StarKindStatus' if it exists.
Data/Aeson/Text.hs+5−4
@@ -1,4 +1,5 @@
11{-# LANGUAGE BangPatterns #-}
2+{-# LANGUAGE NoImplicitPrelude #-}
23{-# LANGUAGE OverloadedStrings #-}
34-- |
45-- Module: Data.Aeson.Text
@@ -14,18 +15,18 @@
1415--
1516-- You can use the conversions to 'Builder's when embedding JSON messages as
1617-- parts of a protocol.
18+
1719module Data.Aeson.Text
1820 (
1921 encodeToLazyText
2022 , encodeToTextBuilder
2123 ) where
2224
23−import Prelude ()
2425import Prelude.Compat
2526
2627import Data.Aeson.Types (Value(..), ToJSON(..))
2728import Data.Aeson.Encoding (encodingToLazyByteString)
28−import Data.Monoid ((<>))
29+import Data.Semigroup ((<>))
2930import Data.Scientific (FPFormat(..), Scientific, base10Exponent)
3031import Data.Text.Lazy.Builder
3132import Data.Text.Lazy.Builder.Scientific (formatScientificBuilder)
@@ -46,8 +47,8 @@ encodeToLazyText = LT.decodeUtf8 . encodingToLazyByteString . toEncoding
4647-- embedded efficiently in a text-based protocol.
4748--
4849-- If you are going to immediately encode straight to a
49−-- 'L.ByteString', it is more efficient to use 'encodeToBuilder'
50−-- instead.
50+-- 'L.ByteString', it is more efficient to use 'encode' (lazy ByteString)
51+-- or @'fromEncoding' . 'toEncoding'@ (ByteString.Builder) instead.
5152--
5253-- /Note:/ Uses 'toJSON'
5354encodeToTextBuilder :: ToJSON a => a -> Builder
Data/Aeson/Types.hs+39−3
@@ -1,3 +1,4 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
12-- |
23-- Module: Data.Aeson.Types
34-- Copyright: (c) 2011-2016 Bryan O'Sullivan
@@ -25,6 +26,7 @@ module Data.Aeson.Types
2526 -- * Convenience types and functions
2627 , DotNetTime(..)
2728 , typeMismatch
29+ , unexpected
2830 -- * Type conversion
2931 , Parser
3032 , Result(..)
@@ -36,6 +38,7 @@ module Data.Aeson.Types
3638 , ToJSON(..)
3739 , KeyValue(..)
3840 , modifyFailure
41+ , prependFailure
3942 , parserThrowError
4043 , parserCatchError
4144
@@ -50,6 +53,12 @@ module Data.Aeson.Types
5053 , coerceFromJSONKeyFunction
5154 , mapFromJSONKeyFunction
5255
56+ -- *** Generic keys
57+ , GToJSONKey()
58+ , genericToJSONKey
59+ , GFromJSONKey()
60+ , genericFromJSONKey
61+
5362 -- ** Liftings to unary and binary type constructors
5463 , FromJSON1(..)
5564 , parseJSON1
@@ -81,9 +90,9 @@ module Data.Aeson.Types
8190 , withObject
8291 , withText
8392 , withArray
84− , withNumber
8593 , withScientific
8694 , withBool
95+ , withEmbeddedJSON
8796
8897 , pairs
8998 , foldable
@@ -104,15 +113,39 @@ module Data.Aeson.Types
104113 , listParser
105114
106115 -- * Generic and TH encoding configuration
107− , Options(..)
116+ , Options
117+
118+ -- ** Options fields
119+ -- $optionsFields
120+ , fieldLabelModifier
121+ , constructorTagModifier
122+ , allNullaryToStringTag
123+ , omitNothingFields
124+ , sumEncoding
125+ , unwrapUnaryRecords
126+ , tagSingleConstructors
127+ , rejectUnknownFields
128+
129+ -- ** Options utilities
108130 , SumEncoding(..)
109131 , camelTo
110132 , camelTo2
111133 , defaultOptions
112134 , 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
113147 ) where
114148
115−import Prelude ()
116149import Prelude.Compat
117150
118151import Data.Aeson.Encoding (Encoding, unsafeToEncoding, fromEncoding, Series, pairs)
@@ -124,3 +157,6 @@ import Data.Foldable (toList)
124157foldable :: (Foldable t, ToJSON a) => t a -> Encoding
125158foldable = toEncoding . toList
126159{-# INLINE foldable #-}
160+
161+-- $optionsFields
162+-- The functions here are in fact record fields of the 'Options' type.
Data/Aeson/Types/Class.hs+8−3
@@ -4,8 +4,8 @@
44{-# LANGUAGE FlexibleInstances #-}
55{-# LANGUAGE GADTs #-}
66{-# LANGUAGE MultiParamTypeClasses #-}
7+{-# LANGUAGE NoImplicitPrelude #-}
78{-# LANGUAGE ScopedTypeVariables #-}
8−{-# LANGUAGE TypeSynonymInstances #-}
99
1010-- |
1111-- Module: Data.Aeson.Types.Class
@@ -58,6 +58,11 @@ module Data.Aeson.Types.Class
5858 , fromJSONKeyCoerce
5959 , coerceFromJSONKeyFunction
6060 , mapFromJSONKeyFunction
61+ -- ** Generic keys
62+ , GToJSONKey()
63+ , genericToJSONKey
64+ , GFromJSONKey()
65+ , genericFromJSONKey
6166 -- * Object key-value pairs
6267 , KeyValue(..)
6368
@@ -70,14 +75,15 @@ module Data.Aeson.Types.Class
7075 , withObject
7176 , withText
7277 , withArray
73− , withNumber
7478 , withScientific
7579 , withBool
80+ , withEmbeddedJSON
7681
7782 -- * Functions
7883 , fromJSON
7984 , ifromJSON
8085 , typeMismatch
86+ , unexpected
8187 , parseField
8288 , parseFieldMaybe
8389 , parseFieldMaybe'
@@ -91,7 +97,6 @@ module Data.Aeson.Types.Class
9197 , (.!=)
9298 ) where
9399
94−import Prelude ()
95100
96101import Data.Aeson.Types.FromJSON
97102import Data.Aeson.Types.Generic (One, Zero)
Data/Aeson/Types/FromJSON.hs+831−412
@@ -5,19 +5,16 @@
55{-# LANGUAGE FlexibleInstances #-}
66{-# LANGUAGE GADTs #-}
77{-# LANGUAGE MultiParamTypeClasses #-}
8−{-# LANGUAGE NamedFieldPuns #-}
8+{-# LANGUAGE NoImplicitPrelude #-}
99{-# LANGUAGE OverloadedStrings #-}
10+{-# LANGUAGE PolyKinds #-}
1011{-# LANGUAGE RecordWildCards #-}
1112{-# LANGUAGE ScopedTypeVariables #-}
1213{-# LANGUAGE TypeOperators #-}
13−{-# LANGUAGE TypeSynonymInstances #-}
14+{-# LANGUAGE TupleSections #-}
1415{-# LANGUAGE UndecidableInstances #-}
1516{-# LANGUAGE ViewPatterns #-}
1617
17−#if __GLASGOW_HASKELL__ >= 706
18−{-# LANGUAGE PolyKinds #-}
19−#endif
20−
2118#include "incoherent-compat.h"
2219#include "overlapping-compat.h"
2320
@@ -45,6 +42,9 @@ module Data.Aeson.Types.FromJSON
4542 , coerceFromJSONKeyFunction
4643 , mapFromJSONKeyFunction
4744
45+ , GFromJSONKey()
46+ , genericFromJSONKey
47+
4848 -- * List functions
4949 , listParser
5050
@@ -52,20 +52,22 @@ module Data.Aeson.Types.FromJSON
5252 , withObject
5353 , withText
5454 , withArray
55− , withNumber
5655 , withScientific
5756 , withBool
57+ , withEmbeddedJSON
5858
5959 -- * Functions
6060 , fromJSON
6161 , ifromJSON
6262 , typeMismatch
63+ , unexpected
6364 , parseField
6465 , parseFieldMaybe
6566 , parseFieldMaybe'
6667 , explicitParseField
6768 , explicitParseFieldMaybe
6869 , explicitParseFieldMaybe'
70+ , parseIndexedJSON
6971 -- ** Operators
7072 , (.:)
7173 , (.:?)
@@ -76,17 +78,16 @@ module Data.Aeson.Types.FromJSON
7678 , parseOptionalFieldWith
7779 ) where
7880
79−import Prelude ()
8081import Prelude.Compat
8182
82−import Control.Applicative ((<|>), Const(..))
83−import Control.Monad ((<=<), zipWithM)
83+import Control.Applicative ((<|>), Const(..), liftA2)
84+import Control.Monad (zipWithM)
8485import Data.Aeson.Internal.Functions (mapKey)
86+import Data.Aeson.Parser.Internal (eitherDecodeWith, jsonEOF)
8587import Data.Aeson.Types.Generic
8688import Data.Aeson.Types.Internal
87−import Data.Attoparsec.Number (Number(..))
8889import Data.Bits (unsafeShiftR)
89−import Data.Fixed (Fixed, HasResolution)
90+import Data.Fixed (Fixed, HasResolution (resolution), Nano)
9091import Data.Functor.Compose (Compose(..))
9192import Data.Functor.Identity (Identity(..))
9293import Data.Functor.Product (Product(..))
@@ -95,26 +96,31 @@ import Data.Hashable (Hashable(..))
9596import Data.Int (Int16, Int32, Int64, Int8)
9697import Data.List.NonEmpty (NonEmpty(..))
9798import Data.Maybe (fromMaybe)
98−import Data.Monoid ((<>))
99+import Data.Semigroup ((<>))
99100import Data.Proxy (Proxy(..))
100101import Data.Ratio ((%), Ratio)
101−import Data.Scientific (Scientific)
102+import Data.Scientific (Scientific, base10Exponent)
102103import Data.Tagged (Tagged(..))
103104import Data.Text (Text, pack, unpack)
104−import Data.Time (Day, LocalTime, NominalDiffTime, TimeOfDay, UTCTime, ZonedTime)
105−import Data.Time.Format (parseTime)
106−import Data.Time.Locale.Compat (defaultTimeLocale)
105+import Data.Time (Day, DiffTime, LocalTime, NominalDiffTime, TimeOfDay, UTCTime, ZonedTime)
106+import Data.Time.Calendar.Compat (CalendarDiffDays (..), DayOfWeek (..))
107+import Data.Time.LocalTime.Compat (CalendarDiffTime (..))
108+import Data.Time.Clock.System.Compat (SystemTime (..))
109+import Data.Time.Format.Compat (parseTimeM, defaultTimeLocale)
107110import Data.Traversable as Tr (sequence)
108111import Data.Vector (Vector)
109112import Data.Version (Version, parseVersion)
113+import Data.Void (Void)
110114import Data.Word (Word16, Word32, Word64, Word8)
111115import Foreign.Storable (Storable)
116+import Foreign.C.Types (CTime (..))
112117import GHC.Generics
113118import Numeric.Natural (Natural)
114119import Text.ParserCombinators.ReadP (readP_to_S)
115120import Unsafe.Coerce (unsafeCoerce)
116121import qualified Data.Aeson.Parser.Time as Time
117122import qualified Data.Attoparsec.ByteString.Char8 as A (endOfInput, parseOnly, scientific)
123+import qualified Data.ByteString.Lazy as L
118124import qualified Data.DList as DList
119125import qualified Data.HashMap.Strict as H
120126import qualified Data.HashSet as HashSet
@@ -137,18 +143,20 @@ import qualified Data.Vector.Primitive as VP
137143import qualified Data.Vector.Storable as VS
138144import qualified Data.Vector.Unboxed as VU
139145
140−#ifndef HAS_COERCIBLE
141−#define HAS_COERCIBLE (__GLASGOW_HASKELL__ >= 707)
146+import qualified GHC.Exts as Exts
147+import qualified Data.Primitive.Array as PM
148+import qualified Data.Primitive.SmallArray as PM
149+import qualified Data.Primitive.Types as PM
150+
151+#if MIN_VERSION_primitive(0,6,4)
152+#if !MIN_VERSION_primitive(0,7,0)
153+import qualified Data.Primitive.UnliftedArray as PM
142154#endif
155+import qualified Data.Primitive.PrimArray as PM
156+#endif
157+
143158
144−#if HAS_COERCIBLE
145159import 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
152160
153161parseIndexedJSON :: (Value -> Parser a) -> Int -> Value -> Parser a
154162parseIndexedJSON p idx value = p value <?> Index idx
@@ -157,7 +165,7 @@ parseIndexedJSON p idx value = p value <?> Index idx
157165parseIndexedJSONPair :: (Value -> Parser a) -> (Value -> Parser b) -> Int -> Value -> Parser (a, b)
158166parseIndexedJSONPair keyParser valParser idx value = p value <?> Index idx
159167 where
160− p = withArray "(k,v)" $ \ab ->
168+ p = withArray "(k, v)" $ \ab ->
161169 let n = V.length ab
162170 in if n == 2
163171 then (,) <$> parseJSONElemAtIndex keyParser 0 ab
@@ -169,43 +177,34 @@ parseIndexedJSONPair keyParser valParser idx value = p value <?> Index idx
169177parseJSONElemAtIndex :: (Value -> Parser a) -> Int -> V.Vector Value -> Parser a
170178parseJSONElemAtIndex p idx ary = p (V.unsafeIndex ary idx) <?> Index idx
171179
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−
181180parseRealFloat :: RealFloat a => String -> Value -> Parser a
182−parseRealFloat _ (Number s) = pure $ Scientific.toRealFloat s
183−parseRealFloat _ Null = pure (0/0)
184−parseRealFloat expected v = typeMismatch expected v
181+parseRealFloat _ (Number s) = pure $ Scientific.toRealFloat s
182+parseRealFloat _ Null = pure (0/0)
183+parseRealFloat name v = prependContext name (unexpected v)
185184{-# INLINE parseRealFloat #-}
186185
187−parseIntegralFromScientific :: forall a. Integral a => String -> Scientific -> Parser a
188−parseIntegralFromScientific expected s =
186+parseIntegralFromScientific :: forall a. Integral a => Scientific -> Parser a
187+parseIntegralFromScientific s =
189188 case Scientific.floatingOrInteger s :: Either Double a of
190189 Right x -> pure x
191− Left _ -> fail $ "Floating number specified for " ++ expected ++ ": " ++ show s
190+ Left _ -> fail $ "unexpected floating number " ++ show s
192191{-# INLINE parseIntegralFromScientific #-}
193192
194193parseIntegral :: Integral a => String -> Value -> Parser a
195−parseIntegral expected =
196− withScientific expected $ parseIntegralFromScientific expected
194+parseIntegral name =
195+ prependContext name . withBoundedScientific' parseIntegralFromScientific
197196{-# INLINE parseIntegral #-}
198197
199−parseBoundedIntegralFromScientific :: (Bounded a, Integral a) => String -> Scientific -> Parser a
200−parseBoundedIntegralFromScientific expected s = maybe
201− (fail $ expected ++ " is either floating or will cause over or underflow: " ++ show s)
198+parseBoundedIntegralFromScientific :: (Bounded a, Integral a) => Scientific -> Parser a
199+parseBoundedIntegralFromScientific s = maybe
200+ (fail $ "value is either floating or will cause over or underflow " ++ show s)
202201 pure
203202 (Scientific.toBoundedInteger s)
204203{-# INLINE parseBoundedIntegralFromScientific #-}
205204
206205parseBoundedIntegral :: (Bounded a, Integral a) => String -> Value -> Parser a
207−parseBoundedIntegral expected =
208− withScientific expected $ parseBoundedIntegralFromScientific expected
206+parseBoundedIntegral name =
207+ prependContext name . withScientific' parseBoundedIntegralFromScientific
209208{-# INLINE parseBoundedIntegral #-}
210209
211210parseScientificText :: Text -> Parser Scientific
@@ -215,13 +214,20 @@ parseScientificText
215214 . T.encodeUtf8
216215
217216parseIntegralText :: Integral a => String -> Text -> Parser a
218−parseIntegralText expected t =
219− parseScientificText t >>= parseIntegralFromScientific expected
217+parseIntegralText name t =
218+ prependContext name $
219+ parseScientificText t
220+ >>= rejectLargeExponent
221+ >>= parseIntegralFromScientific
222+ where
223+ rejectLargeExponent :: Scientific -> Parser Scientific
224+ rejectLargeExponent s = withBoundedScientific' pure (Number s)
220225{-# INLINE parseIntegralText #-}
221226
222227parseBoundedIntegralText :: (Bounded a, Integral a) => String -> Text -> Parser a
223−parseBoundedIntegralText expected t =
224− parseScientificText t >>= parseBoundedIntegralFromScientific expected
228+parseBoundedIntegralText name t =
229+ prependContext name $
230+ parseScientificText t >>= parseBoundedIntegralFromScientific
225231
226232parseOptionalFieldWith :: (Value -> Parser (Maybe a))
227233 -> Object -> Text -> Parser (Maybe a)
@@ -281,14 +287,21 @@ genericLiftParseJSON opts pj pjl = fmap to1 . gParseJSON opts (From1Args pj pjl)
281287--
282288-- The basic ways to signal a failed conversion are as follows:
283289--
284−-- * 'empty' and 'mzero' work, but are terse and uninformative;
290+-- * 'fail' yields a custom error message: it is the recommended way of
291+-- reporting a failure;
285292--
286−-- * 'fail' yields a custom error message;
293+-- * 'Control.Applicative.empty' (or 'Control.Monad.mzero') is uninformative:
294+-- use it when the error is meant to be caught by some @('<|>')@;
287295--
288−-- * 'typeMismatch' produces an informative message for cases when the
289−-- value encountered is not of the expected type.
296+-- * 'typeMismatch' can be used to report a failure when the encountered value
297+-- is not of the expected JSON type; 'unexpected' is an appropriate alternative
298+-- when more than one type may be expected, or to keep the expected type
299+-- implicit.
290300--
291−-- An example type and instance using 'typeMismatch':
301+-- 'prependFailure' (or 'modifyFailure') add more information to a parser's
302+-- error messages.
303+--
304+-- An example type and instance using 'typeMismatch' and 'prependFailure':
292305--
293306-- @
294307-- \-- Allow ourselves to write 'Text' literals.
@@ -302,20 +315,22 @@ genericLiftParseJSON opts pj pjl = fmap to1 . gParseJSON opts (From1Args pj pjl)
302315-- '<*>' v '.:' \"y\"
303316--
304317-- \-- We do not expect a non-'Object' value here.
305−-- \-- We could use 'mzero' to fail, but 'typeMismatch'
318+-- \-- We could use 'Control.Applicative.empty' to fail, but 'typeMismatch'
306319-- \-- gives a much more informative error message.
307−-- 'parseJSON' invalid = 'typeMismatch' \"Coord\" invalid
320+-- 'parseJSON' invalid =
321+-- 'prependFailure' "parsing Coord failed, "
322+-- ('typeMismatch' \"Object\" invalid)
308323-- @
309324--
310325-- For this common case of only being concerned with a single
311−-- type of JSON value, the functions 'withObject', 'withNumber', etc.
326+-- type of JSON value, the functions 'withObject', 'withScientific', etc.
312327-- are provided. Their use is to be preferred when possible, since
313328-- they are more terse. Using 'withObject', we can rewrite the above instance
314329-- (assuming the same language extension and data type) as:
315330--
316331-- @
317332-- instance 'FromJSON' Coord where
318−-- 'parseJSON' = 'withObject' \"Coord\" $ \v -> Coord
333+-- 'parseJSON' = 'withObject' \"Coord\" $ \\v -> Coord
319334-- '<$>' v '.:' \"x\"
320335-- '<*>' v '.:' \"y\"
321336-- @
@@ -347,7 +362,7 @@ genericLiftParseJSON opts pj pjl = fmap to1 . gParseJSON opts (From1Args pj pjl)
347362-- @
348363--
349364-- The default implementation will be equivalent to
350−-- @parseJSON = 'genericParseJSON' 'defaultOptions'@; If you need different
365+-- @parseJSON = 'genericParseJSON' 'defaultOptions'@; if you need different
351366-- options, you can customize the generic decoding by defining:
352367--
353368-- @
@@ -365,13 +380,11 @@ class FromJSON a where
365380 parseJSON = genericParseJSON defaultOptions
366381
367382 parseJSONList :: Value -> Parser [a]
368− parseJSONList (Array a)
369− = zipWithM (parseIndexedJSON parseJSON) [0..]
383+ parseJSONList = withArray "[]" $ \a ->
384+ zipWithM (parseIndexedJSON parseJSON) [0..]
370385 . V.toList
371386 $ a
372387
373− parseJSONList v = typeMismatch "[a]" v
374−
375388-------------------------------------------------------------------------------
376389-- Classes and types for map keys
377390-------------------------------------------------------------------------------
@@ -383,6 +396,16 @@ class FromJSON a where
383396-- > newtype SomeId = SomeId { getSomeId :: Text }
384397-- > deriving (Eq,Ord,Hashable,FromJSONKey)
385398--
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+-- @
386409class FromJSONKey a where
387410 -- | Strategy for parsing the key of a map-like container.
388411 fromJSONKey :: FromJSONKeyFunction a
@@ -405,11 +428,7 @@ class FromJSONKey a where
405428-- At the moment this type is intentionally not exported. 'FromJSONKeyFunction'
406429-- can be inspected, but cannot be constructed.
407430data CoerceText a where
408−#if HAS_COERCIBLE
409431 CoerceText :: Coercible Text a => CoerceText a
410−#else
411− CoerceText :: CoerceText a
412−#endif
413432
414433-- | This type is related to 'ToJSONKeyFunction'. If 'FromJSONKeyValue' is used in the
415434-- 'FromJSONKey' instance, then 'ToJSONKeyValue' should be used in the 'ToJSONKey'
@@ -429,7 +448,7 @@ data FromJSONKeyFunction a
429448
430449-- | Only law abiding up to interpretation
431450instance Functor FromJSONKeyFunction where
432− fmap h (FromJSONKeyCoerce CoerceText) = FromJSONKeyText (h . coerce')
451+ fmap h (FromJSONKeyCoerce CoerceText) = FromJSONKeyText (h . coerce)
433452 fmap h (FromJSONKeyText f) = FromJSONKeyText (h . f)
434453 fmap h (FromJSONKeyTextParser f) = FromJSONKeyTextParser (fmap h . f)
435454 fmap h (FromJSONKeyValue f) = FromJSONKeyValue (fmap h . f)
@@ -443,9 +462,7 @@ instance Functor FromJSONKeyFunction where
443462--
444463-- On pre GHC 7.8 this is unconstrainted function.
445464fromJSONKeyCoerce ::
446−#if HAS_COERCIBLE
447465 Coercible Text a =>
448−#endif
449466 FromJSONKeyFunction a
450467fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText
451468
@@ -453,60 +470,91 @@ fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText
453470--
454471-- See note on 'fromJSONKeyCoerce'.
455472coerceFromJSONKeyFunction ::
456−#if HAS_COERCIBLE
457473 Coercible a b =>
458−#endif
459474 FromJSONKeyFunction a -> FromJSONKeyFunction b
460−#if HAS_COERCIBLE
461475coerceFromJSONKeyFunction = 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
468476
469477{-# RULES
470478 "FromJSONKeyCoerce: fmap id" forall (x :: FromJSONKeyFunction a).
471479 fmap id x = x
472480 #-}
473−#if HAS_COERCIBLE
474481{-# RULES
475482 "FromJSONKeyCoerce: fmap coerce" forall x .
476483 fmap coerce x = coerceFromJSONKeyFunction x
477484 #-}
478−#endif
479485
480486-- | Same as 'fmap'. Provided for the consistency with 'ToJSONKeyFunction'.
481487mapFromJSONKeyFunction :: (a -> b) -> FromJSONKeyFunction a -> FromJSONKeyFunction b
482488mapFromJSONKeyFunction = fmap
483489
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+
484519-------------------------------------------------------------------------------
485520-- Functions needed for documentation
486521-------------------------------------------------------------------------------
487522
488523-- | Fail parsing due to a type mismatch, with a descriptive message.
489524--
490−-- Example usage:
525+-- The following wrappers should generally be prefered:
526+-- 'withObject', 'withArray', 'withText', 'withBool'.
491527--
492−-- @
493−-- instance FromJSON Coord where
494−-- parseJSON ('Object' v) = {- type matches, life is good -}
495−-- parseJSON wat = 'typeMismatch' \"Coord\" wat
496−-- @
497−typeMismatch :: String -- ^ The name of the type you are trying to parse.
528+-- ==== Error message example
529+--
530+-- > typeMismatch "Object" (String "oops")
531+-- > -- Error: "expected Object, but encountered String"
532+typeMismatch :: String -- ^ The name of the JSON type being parsed
533+ -- (@\"Object\"@, @\"Array\"@, @\"String\"@, @\"Number\"@,
534+ -- @\"Boolean\"@, or @\"Null\"@).
498535 -> Value -- ^ The actual value encountered.
499536 -> Parser a
500537typeMismatch expected actual =
501− fail $ "expected " ++ expected ++ ", encountered " ++ name
502− where
503− name = case actual of
504− Object _ -> "Object"
505− Array _ -> "Array"
506− String _ -> "String"
507− Number _ -> "Number"
508− Bool _ -> "Boolean"
509− Null -> "Null"
538+ fail $ "expected " ++ expected ++ ", but encountered " ++ typeOf actual
539+
540+-- | Fail parsing due to a type mismatch, when the expected types are implicit.
541+--
542+-- ==== Error message example
543+--
544+-- > unexpected (String "oops")
545+-- > -- Error: "unexpected String"
546+unexpected :: Value -> Parser a
547+unexpected actual = fail $ "unexpected " ++ typeOf actual
548+
549+-- | JSON type of a value, name of the head constructor.
550+typeOf :: Value -> String
551+typeOf v = case v of
552+ Object _ -> "Object"
553+ Array _ -> "Array"
554+ String _ -> "String"
555+ Number _ -> "Number"
556+ Bool _ -> "Boolean"
557+ Null -> "Null"
510558
511559-------------------------------------------------------------------------------
512560-- Lifings of FromJSON and ToJSON to unary and binary type constructors
@@ -587,9 +635,8 @@ class FromJSON2 f where
587635 -> (Value -> Parser b)
588636 -> (Value -> Parser [b])
589637 -> Value -> Parser [f a b]
590− liftParseJSONList2 fa ga fb gb v = case v of
591− Array vals -> fmap V.toList (V.mapM (liftParseJSON2 fa ga fb gb) vals)
592− _ -> typeMismatch "[a]" v
638+ liftParseJSONList2 fa ga fb gb = withArray "[]" $ \vals ->
639+ fmap V.toList (V.mapM (liftParseJSON2 fa ga fb gb) vals)
593640
594641-- | Lift the standard 'parseJSON' function through the type constructor.
595642parseJSON2 :: (FromJSON2 f, FromJSON a, FromJSON b) => Value -> Parser (f a b)
@@ -603,7 +650,7 @@ parseJSON2 = liftParseJSON2 parseJSON parseJSONList parseJSON parseJSONList
603650-- | Helper function to use with 'liftParseJSON'. See 'Data.Aeson.ToJSON.listEncoding'.
604651listParser :: (Value -> Parser a) -> Value -> Parser [a]
605652listParser f (Array xs) = fmap V.toList (V.mapM f xs)
606−listParser _ v = typeMismatch "[a]" v
653+listParser _ v = typeMismatch "Array" v
607654{-# INLINE listParser #-}
608655
609656-------------------------------------------------------------------------------
@@ -621,49 +668,139 @@ instance (FromJSON a) => FromJSON [a] where
621668-- Functions
622669-------------------------------------------------------------------------------
623670
624−-- | @'withObject' expected f value@ applies @f@ to the 'Object' when @value@
625−-- is an 'Object' and fails using @'typeMismatch' expected@ otherwise.
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@
680+-- is an 'Data.Aeson.Object' and fails otherwise.
681+--
682+-- ==== Error message example
683+--
684+-- > withObject "MyType" f (String "oops")
685+-- > -- Error: "parsing MyType failed, expected Object, but encountered String"
626686withObject :: String -> (Object -> Parser a) -> Value -> Parser a
627−withObject _ f (Object obj) = f obj
628−withObject expected _ v = typeMismatch expected v
687+withObject _ f (Object obj) = f obj
688+withObject name _ v = prependContext name (typeMismatch "Object" v)
629689{-# INLINE withObject #-}
630690
631−-- | @'withText' expected f value@ applies @f@ to the 'Text' when @value@ is a
632−-- 'String' and fails using @'typeMismatch' expected@ otherwise.
691+-- | @'withText' name f value@ applies @f@ to the 'Text' when @value@ is a
692+-- 'Data.Aeson.String' and fails otherwise.
693+--
694+-- ==== Error message example
695+--
696+-- > withText "MyType" f Null
697+-- > -- Error: "parsing MyType failed, expected String, but encountered Null"
633698withText :: String -> (Text -> Parser a) -> Value -> Parser a
634−withText _ f (String txt) = f txt
635−withText expected _ v = typeMismatch expected v
699+withText _ f (String txt) = f txt
700+withText name _ v = prependContext name (typeMismatch "String" v)
636701{-# INLINE withText #-}
637702
638703-- | @'withArray' expected f value@ applies @f@ to the 'Array' when @value@ is
639−-- an 'Array' and fails using @'typeMismatch' expected@ otherwise.
704+-- an 'Data.Aeson.Array' and fails otherwise.
705+--
706+-- ==== Error message example
707+--
708+-- > withArray "MyType" f (String "oops")
709+-- > -- Error: "parsing MyType failed, expected Array, but encountered String"
640710withArray :: String -> (Array -> Parser a) -> Value -> Parser a
641−withArray _ f (Array arr) = f arr
642−withArray expected _ v = typeMismatch expected v
711+withArray _ f (Array arr) = f arr
712+withArray name _ v = prependContext name (typeMismatch "Array" v)
643713{-# INLINE withArray #-}
644714
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−
652−-- | @'withScientific' expected f value@ applies @f@ to the 'Scientific' number
653−-- when @value@ is a 'Number' and fails using @'typeMismatch' expected@
715+-- | @'withScientific' name f value@ applies @f@ to the 'Scientific' number
716+-- when @value@ is a 'Data.Aeson.Number' and fails using 'typeMismatch'
654717-- 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"
655728withScientific :: String -> (Scientific -> Parser a) -> Value -> Parser a
656−withScientific _ f (Number scientific) = f scientific
657−withScientific expected _ v = typeMismatch expected v
729+withScientific _ f (Number scientific) = f scientific
730+withScientific name _ v = prependContext name (typeMismatch "Number" v)
658731{-# INLINE withScientific #-}
659732
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+
660782-- | @'withBool' expected f value@ applies @f@ to the 'Bool' when @value@ is a
661−-- 'Bool' and fails using @'typeMismatch' expected@ otherwise.
783+-- 'Boolean' and fails otherwise.
784+--
785+-- ==== Error message example
786+--
787+-- > withBool "MyType" f (String "oops")
788+-- > -- Error: "parsing MyType failed, expected Boolean, but encountered String"
662789withBool :: String -> (Bool -> Parser a) -> Value -> Parser a
663−withBool _ f (Bool arr) = f arr
664−withBool expected _ v = typeMismatch expected v
790+withBool _ f (Bool arr) = f arr
791+withBool name _ v = prependContext name (typeMismatch "Boolean" v)
665792{-# INLINE withBool #-}
666793
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+
667804-- | Convert a value from JSON, failing if the types do not match.
668805fromJSON :: (FromJSON a) => Value -> Result a
669806fromJSON = parse parseJSON
@@ -726,7 +863,7 @@ parseFieldMaybe' = (.:!)
726863-- E.g. @'explicitParseField' 'parseJSON1' :: ('FromJSON1' f, 'FromJSON' a) -> 'Object' -> 'Text' -> 'Parser' (f a)@
727864explicitParseField :: (Value -> Parser a) -> Object -> Text -> Parser a
728865explicitParseField p obj key = case H.lookup key obj of
729− Nothing -> fail $ "key " ++ show key ++ " not present"
866+ Nothing -> fail $ "key " ++ show key ++ " not found"
730867 Just v -> p v <?> Key key
731868{-# INLINE explicitParseField #-}
732869
@@ -766,11 +903,47 @@ pmval .!= val = fromMaybe val <$> pmval
766903-- Generic parseJSON
767904-------------------------------------------------------------------------------
768905
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+
769911instance OVERLAPPABLE_ (GFromJSON arity a) => GFromJSON arity (M1 i c a) where
770912 -- Meta-information, which is not handled elsewhere, is just added to the
771913 -- parsed value:
772914 gParseJSON opts fargs = fmap M1 . gParseJSON opts fargs
773915
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+
774947instance (FromJSON a) => GFromJSON arity (K1 i a) where
775948 -- Constant values are decoded using their FromJSON instance:
776949 gParseJSON _opts _ = fmap K1 . parseJSON
@@ -785,339 +958,499 @@ instance (FromJSON1 f) => GFromJSON One (Rec1 f) where
785958 -- FromJSON1 instance:
786959 gParseJSON _opts (From1Args pj pjl) = fmap Rec1 . liftParseJSON pj pjl
787960
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
961+instance (FromJSON1 f, GFromJSON One g) => GFromJSON One (f :.: g) where
962+ -- 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
964+ -- instance to generically decode the innermost type:
965+ gParseJSON opts fargs =
966+ let gpj = gParseJSON opts fargs in
967+ fmap Comp1 . liftParseJSON gpj (listParser gpj)
968+
969+--------------------------------------------------------------------------------
793970
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.
794987instance ( ConsFromJSON arity a
795988 , AllNullary (C1 c a) allNullary
796989 , ParseSum arity (C1 c a) allNullary
797− ) => GFromJSON arity (D1 d (C1 c a)) where
990+ , Constructor c
991+ ) => GFromJSON' arity (C1 c a) where
798992 -- The option 'tagSingleConstructors' determines whether to wrap
799993 -- a single-constructor type.
800− gParseJSON opts fargs
994+ gParseJSON' p@(_ :* opts :* _)
801995 | tagSingleConstructors opts
802− = fmap M1
803− . (unTagged :: Tagged allNullary (Parser (C1 c a p)) -> Parser (C1 c a p))
804− . parseSum opts fargs
805− | otherwise = fmap M1 . fmap M1 . consParseJSON opts fargs
806−
807−instance (ConsFromJSON arity a) => GFromJSON arity (C1 c a) where
808− -- Constructors need to be decoded differently depending on whether they're
809− -- a record or not. This distinction is made by consParseJSON:
810− gParseJSON opts fargs = fmap M1 . consParseJSON opts fargs
811−
812−instance ( FromProduct arity a, FromProduct arity b
813− , ProductSize a, ProductSize b
814− ) => GFromJSON arity (a :*: b) where
815− -- Products are expected to be encoded to an array. Here we check whether we
816− -- got an array of the same size as the product, then parse each of the
817− -- product's elements using parseProduct:
818− gParseJSON opts fargs = withArray "product (:*:)" $ \arr ->
819− let lenArray = V.length arr
820− lenProduct = (unTagged2 :: Tagged2 (a :*: b) Int -> Int)
821− productSize in
822− if lenArray == lenProduct
823− then parseProduct opts fargs arr 0 lenProduct
824− else fail $ "When expecting a product of " ++ show lenProduct ++
825− " values, encountered an Array of " ++ show lenArray ++
826− " elements instead"
827−
828−instance ( AllNullary (a :+: b) allNullary
829− , ParseSum arity (a :+: b) allNullary
830− ) => GFromJSON arity (a :+: b) where
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
8311006 -- If all constructors of a sum datatype are nullary and the
8321007 -- 'allNullaryToStringTag' option is set they are expected to be
8331008 -- encoded as strings. This distinction is made by 'parseSum':
834− gParseJSON opts fargs =
835− (unTagged :: Tagged allNullary (Parser ((a :+: b) d)) ->
836− Parser ((a :+: b) d))
837− . parseSum opts fargs
838−
839−instance (FromJSON1 f, GFromJSON One g) => GFromJSON One (f :.: g) where
840− -- If an occurrence of the last type parameter is nested inside two
841− -- composed types, it is decoded by using the outermost type's FromJSON1
842− -- instance to generically decode the innermost type:
843− gParseJSON opts fargs =
844− let gpj = gParseJSON opts fargs in
845− fmap Comp1 . liftParseJSON gpj (listParser gpj)
1009+ gParseJSON' p =
1010+ (unTagged :: Tagged allNullary (Parser ((a :+: b) _d)) ->
1011+ Parser ((a :+: b) _d))
1012+ . parseSum p
8461013
8471014--------------------------------------------------------------------------------
8481015
8491016class ParseSum arity f allNullary where
850− parseSum :: Options -> FromArgs arity a
851− -> Value -> Tagged allNullary (Parser (f a))
1017+ parseSum :: TypeName :* Options :* FromArgs arity a
1018+ -> Value
1019+ -> Tagged allNullary (Parser (f a))
8521020
853−instance ( SumFromString f
1021+instance ( ConstructorNames f
1022+ , SumFromString f
8541023 , FromPair arity f
8551024 , FromTaggedObject arity f
8561025 , FromUntaggedValue arity f
8571026 ) => ParseSum arity f True where
858− parseSum opts fargs
859− | allNullaryToStringTag opts = Tagged . parseAllNullarySum opts
860− | otherwise = Tagged . parseNonAllNullarySum opts fargs
1027+ parseSum p@(tname :* opts :* _)
1028+ | allNullaryToStringTag opts = Tagged . parseAllNullarySum tname opts
1029+ | otherwise = Tagged . parseNonAllNullarySum p
8611030
862−instance ( FromPair arity f
1031+instance ( ConstructorNames f
1032+ , FromPair arity f
8631033 , FromTaggedObject arity f
8641034 , FromUntaggedValue arity f
8651035 ) => ParseSum arity f False where
866− parseSum opts fargs = Tagged . parseNonAllNullarySum opts fargs
1036+ parseSum p = Tagged . parseNonAllNullarySum p
8671037
8681038--------------------------------------------------------------------------------
8691039
870−parseAllNullarySum :: SumFromString f => Options -> Value -> Parser (f a)
871−parseAllNullarySum opts = withText "Text" $ \key ->
872− maybe (notFound key) return $
873− parseSumFromString opts key
1040+parseAllNullarySum :: (SumFromString f, ConstructorNames f)
1041+ => TypeName -> Options -> Value -> Parser (f a)
1042+parseAllNullarySum tname opts =
1043+ withText tname $ \tag ->
1044+ maybe (badTag tag) return $
1045+ parseSumFromString modifier tag
1046+ where
1047+ badTag tag = failWithCTags tname modifier $ \cnames ->
1048+ "expected one of the tags " ++ show cnames ++
1049+ ", but found tag " ++ show tag
1050+ modifier = constructorTagModifier opts
1051+
1052+-- | Fail with an informative error message about a mismatched tag.
1053+-- The error message is parameterized by the list of expected tags,
1054+-- to be inferred from the result type of the parser.
1055+failWithCTags
1056+ :: forall f a t. ConstructorNames f
1057+ => TypeName -> (String -> t) -> ([t] -> String) -> Parser (f a)
1058+failWithCTags tname modifier f =
1059+ contextType tname . fail $ f cnames
1060+ where
1061+ cnames = unTagged2 (constructorTags modifier :: Tagged2 f [t])
8741062
8751063class SumFromString f where
876− parseSumFromString :: Options -> Text -> Maybe (f a)
1064+ parseSumFromString :: (String -> String) -> Text -> Maybe (f a)
8771065
8781066instance (SumFromString a, SumFromString b) => SumFromString (a :+: b) where
8791067 parseSumFromString opts key = (L1 <$> parseSumFromString opts key) <|>
8801068 (R1 <$> parseSumFromString opts key)
8811069
8821070instance (Constructor c) => SumFromString (C1 c U1) where
883− parseSumFromString opts key | key == name = Just $ M1 U1
884− | otherwise = Nothing
885− where
886− name = pack $ constructorTagModifier opts $
887− conName (undefined :: t c U1 p)
1071+ parseSumFromString modifier key
1072+ | key == name = Just $ M1 U1
1073+ | otherwise = Nothing
1074+ where
1075+ name = pack $ modifier $ conName (undefined :: M1 _i c _f _p)
8881076
889−--------------------------------------------------------------------------------
1077+-- For genericFromJSONKey
1078+instance SumFromString a => SumFromString (D1 d a) where
1079+ parseSumFromString modifier key = M1 <$> parseSumFromString modifier key
1080+
1081+-- | List of all constructor tags.
1082+constructorTags :: ConstructorNames a => (String -> t) -> Tagged2 a [t]
1083+constructorTags modifier =
1084+ fmap DList.toList (constructorNames' modifier)
8901085
891−parseNonAllNullarySum :: ( FromPair arity f
1086+-- | List of all constructor names of an ADT, after a given conversion
1087+-- function. (Better inlining.)
1088+class ConstructorNames a where
1089+ constructorNames' :: (String -> t) -> Tagged2 a (DList.DList t)
1090+
1091+instance (ConstructorNames a, ConstructorNames b) => ConstructorNames (a :+: b) where
1092+ constructorNames' = liftA2 append constructorNames' constructorNames'
1093+ where
1094+ append
1095+ :: Tagged2 a (DList.DList t)
1096+ -> Tagged2 b (DList.DList t)
1097+ -> Tagged2 (a :+: b) (DList.DList t)
1098+ append (Tagged2 xs) (Tagged2 ys) = Tagged2 (DList.append xs ys)
1099+
1100+instance Constructor c => ConstructorNames (C1 c a) where
1101+ constructorNames' f = Tagged2 (pure (f cname))
1102+ where
1103+ cname = conName (undefined :: M1 _i c _f _p)
1104+
1105+-- For genericFromJSONKey
1106+instance ConstructorNames a => ConstructorNames (D1 d a) where
1107+ constructorNames' = retag . constructorNames'
1108+ where
1109+ retag :: Tagged2 a u -> Tagged2 (D1 d a) u
1110+ retag (Tagged2 x) = Tagged2 x
1111+
1112+--------------------------------------------------------------------------------
1113+parseNonAllNullarySum :: forall f c arity.
1114+ ( FromPair arity f
8921115 , FromTaggedObject arity f
8931116 , FromUntaggedValue arity f
894− ) => Options -> FromArgs arity c
1117+ , ConstructorNames f
1118+ ) => TypeName :* Options :* FromArgs arity c
8951119 -> Value -> Parser (f c)
896−parseNonAllNullarySum opts fargs =
1120+parseNonAllNullarySum p@(tname :* opts :* _) =
8971121 case sumEncoding opts of
8981122 TaggedObject{..} ->
899− withObject "Object" $ \obj -> do
900− tag <- obj .: pack tagFieldName
901− fromMaybe (notFound tag) $
902− parseFromTaggedObject opts fargs contentsFieldName obj tag
1123+ withObject tname $ \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
1129+ badTag tag = failWith_ $ \cnames ->
1130+ "expected tag field to be one of " ++ show cnames ++
1131+ ", but found tag " ++ show tag
1132+ cnames_ = unTagged2 (constructorTags (constructorTagModifier opts) :: Tagged2 f [String])
9031133
9041134 ObjectWithSingleField ->
905− withObject "Object" $ \obj ->
906− case H.toList obj of
907− [pair@(tag, _)] -> fromMaybe (notFound tag) $
908− parsePair opts fargs pair
909− _ -> fail "Object doesn't have a single field"
1135+ withObject tname $ \obj -> case H.toList obj of
1136+ [(tag, v)] -> maybe (badTag tag) (<?> Key tag) $
1137+ parsePair (tag :* p) v
1138+ _ -> contextType tname . fail $
1139+ "expected an Object with a single pair, but found " ++
1140+ show (H.size obj) ++ " pairs"
1141+ where
1142+ badTag tag = failWith_ $ \cnames ->
1143+ "expected an Object with a single pair where the tag is one of " ++
1144+ show cnames ++ ", but found tag " ++ show tag
9101145
9111146 TwoElemArray ->
912− withArray "Array" $ \arr ->
913− if V.length arr == 2
914− then case V.unsafeIndex arr 0 of
915− String tag -> fromMaybe (notFound tag) $
916− parsePair opts fargs (tag, V.unsafeIndex arr 1)
917− _ -> fail "First element is not a String"
918− else fail "Array doesn't have 2 elements"
1147+ withArray tname $ \arr -> case V.length arr of
1148+ 2 | String tag <- V.unsafeIndex arr 0 ->
1149+ maybe (badTag tag <?> Index 0) (<?> Index 1) $
1150+ parsePair (tag :* p) (V.unsafeIndex arr 1)
1151+ | otherwise ->
1152+ contextType tname $
1153+ fail "tag element is not a String" <?> Index 0
1154+ len -> contextType tname . fail $
1155+ "expected a 2-element Array, but encountered an Array of length " ++
1156+ show len
1157+ where
1158+ badTag tag = failWith_ $ \cnames ->
1159+ "expected tag of the 2-element Array to be one of " ++
1160+ show cnames ++ ", but found tag " ++ show tag
9191161
920− UntaggedValue -> parseUntaggedValue opts fargs
1162+ UntaggedValue -> parseUntaggedValue p
1163+ where
1164+ failWith_ = failWithCTags tname (constructorTagModifier opts)
9211165
9221166--------------------------------------------------------------------------------
9231167
9241168class FromTaggedObject arity f where
925− parseFromTaggedObject :: Options -> FromArgs arity a
926− -> String -> Object
927− -> Text -> Maybe (Parser (f a))
1169+ -- The first two components of the parameter tuple are: the constructor tag
1170+ -- to match against, and the contents field name.
1171+ parseFromTaggedObject
1172+ :: Text :* String :* TypeName :* Options :* FromArgs arity a
1173+ -> Object
1174+ -> Maybe (Parser (f a))
9281175
9291176instance ( FromTaggedObject arity a, FromTaggedObject arity b) =>
9301177 FromTaggedObject arity (a :+: b) where
931− parseFromTaggedObject opts fargs contentsFieldName obj tag =
932− (fmap L1 <$> parseFromTaggedObject opts fargs contentsFieldName obj tag) <|>
933− (fmap R1 <$> parseFromTaggedObject opts fargs contentsFieldName obj tag)
1178+ parseFromTaggedObject p obj =
1179+ (fmap L1 <$> parseFromTaggedObject p obj) <|>
1180+ (fmap R1 <$> parseFromTaggedObject p obj)
9341181
935−instance ( FromTaggedObject' arity f
1182+instance ( IsRecord f isRecord
1183+ , FromTaggedObject' arity f isRecord
9361184 , Constructor c
9371185 ) => FromTaggedObject arity (C1 c f) where
938− parseFromTaggedObject opts fargs contentsFieldName obj tag
939− | tag == name = Just $ M1 <$> parseFromTaggedObject'
940− opts fargs contentsFieldName obj
941− | otherwise = Nothing
942− where
943− name = pack $ constructorTagModifier opts $
944− conName (undefined :: t c f p)
1186+ parseFromTaggedObject (tag :* contentsFieldName :* p@(_ :* opts :* _))
1187+ | tag == tag'
1188+ = Just . fmap M1 .
1189+ (unTagged :: Tagged isRecord (Parser (f a)) -> Parser (f a)) .
1190+ parseFromTaggedObject' (contentsFieldName :* cname :* p)
1191+ | otherwise = const Nothing
1192+ where
1193+ tag' = pack $ constructorTagModifier opts cname
1194+ cname = conName (undefined :: M1 _i c _f _p)
9451195
9461196--------------------------------------------------------------------------------
9471197
948−class FromTaggedObject' arity f where
949− parseFromTaggedObject' :: Options -> FromArgs arity a -> String
950− -> Object -> Parser (f a)
951−
952−class FromTaggedObject'' arity f isRecord where
953− parseFromTaggedObject'' :: Options -> FromArgs arity a -> String
954− -> Object -> Tagged isRecord (Parser (f a))
955−
956−instance ( IsRecord f isRecord
957− , FromTaggedObject'' arity f isRecord
958− ) => FromTaggedObject' arity f where
959− parseFromTaggedObject' opts fargs contentsFieldName =
960− (unTagged :: Tagged isRecord (Parser (f a)) -> Parser (f a)) .
961− parseFromTaggedObject'' opts fargs contentsFieldName
962−
963−instance (FromRecord arity f) => FromTaggedObject'' arity f True where
964− parseFromTaggedObject'' opts fargs _ =
965− Tagged . parseRecord opts fargs Nothing
966−
967−instance (GFromJSON arity f) => FromTaggedObject'' arity f False where
968− parseFromTaggedObject'' opts fargs contentsFieldName = Tagged .
969− (gParseJSON opts fargs <=< (.: pack contentsFieldName))
1198+class FromTaggedObject' arity f isRecord where
1199+ -- The first component of the parameter tuple is the contents field name.
1200+ parseFromTaggedObject'
1201+ :: String :* ConName :* TypeName :* Options :* FromArgs arity a
1202+ -> Object -> Tagged isRecord (Parser (f a))
1203+
1204+instance (RecordFromJSON arity f, FieldNames f) => FromTaggedObject' arity f True where
1205+ -- Records are unpacked in the tagged object
1206+ parseFromTaggedObject' (_ :* p) = Tagged . recordParseJSON (True :* p)
1207+
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
9701216
971−instance OVERLAPPING_ FromTaggedObject'' arity U1 False where
972− parseFromTaggedObject'' _ _ _ _ = Tagged (pure U1)
1217+instance OVERLAPPING_ FromTaggedObject' arity U1 False where
1218+ -- Nullary constructors don't need a contents field
1219+ parseFromTaggedObject' _ _ = Tagged (pure U1)
9731220
9741221--------------------------------------------------------------------------------
9751222
1223+-- | Constructors need to be decoded differently depending on whether they're
1224+-- a record or not. This distinction is made by 'ConsParseJSON'.
9761225class ConsFromJSON arity f where
977− consParseJSON :: Options -> FromArgs arity a
978− -> Value -> Parser (f a)
1226+ consParseJSON
1227+ :: ConName :* TypeName :* Options :* FromArgs arity a
1228+ -> Value -> Parser (f a)
9791229
9801230class ConsFromJSON' arity f isRecord where
981− consParseJSON' :: Options -> FromArgs arity a
982− -> Maybe Text -- ^ A dummy label
983− -- (Nothing to use proper label)
984− -> Value -> Tagged isRecord (Parser (f a))
1231+ consParseJSON'
1232+ :: ConName :* TypeName :* Options :* FromArgs arity a
1233+ -> Value -> Tagged isRecord (Parser (f a))
9851234
9861235instance ( IsRecord f isRecord
9871236 , ConsFromJSON' arity f isRecord
9881237 ) => ConsFromJSON arity f where
989− consParseJSON opts fargs v = let
990− (v2,lab) = case (unwrapUnaryRecords opts,isUnary (undefined :: f a)) of
991− -- use a dummy object with a dummy label
992− (True,True) -> (object [(pack "dummy",v)], Just $ pack "dummy")
993− _ ->(v,Nothing)
994− in (unTagged :: Tagged isRecord (Parser (f a)) -> Parser (f a))
995− $ consParseJSON' opts fargs lab v2
1238+ consParseJSON p =
1239+ (unTagged :: Tagged isRecord (Parser (f a)) -> Parser (f a))
1240+ . consParseJSON' p
9961241
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))
9971248
998−instance (FromRecord arity f) => ConsFromJSON' arity f True where
999− consParseJSON' opts fargs mlab = Tagged . withObject "record (:*:)"
1000− (parseRecord opts fargs mlab)
1249+instance RecordFromJSON arity f => ConsFromJSON' arity f True where
1250+ consParseJSON' p@(cname :* tname :* _) =
1251+ Tagged . withObject (showCons cname tname) (recordParseJSON (False :* p))
10011252
1002−instance (GFromJSON arity f) => ConsFromJSON' arity f False where
1003− consParseJSON' opts fargs _ = Tagged . gParseJSON opts fargs
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
1268+ consParseJSON' (_ :* _ :* opts :* fargs) =
1269+ Tagged . fmap M1 . gParseJSON opts fargs
1270+
1271+instance (ProductFromJSON arity f, ProductSize f
1272+ ) => ConsFromJSON' arity f False where
1273+ consParseJSON' p = Tagged . productParseJSON0 p
10041274
10051275--------------------------------------------------------------------------------
10061276
1007−class FromRecord arity f where
1008− parseRecord :: Options -> FromArgs arity a
1009− -> Maybe Text -- ^ A dummy label
1010− -- (Nothing to use proper label)
1011− -> Object -> Parser (f a)
1277+class FieldNames f where
1278+ fieldNames :: f a -> [Text] -> [Text]
10121279
1013−instance ( FromRecord arity a
1014− , FromRecord arity b
1015− ) => FromRecord arity (a :*: b) where
1016− parseRecord opts fargs _ obj =
1017− (:*:) <$> parseRecord opts fargs Nothing obj
1018− <*> parseRecord opts fargs Nothing obj
1280+instance (FieldNames a, FieldNames b) => FieldNames (a :*: b) where
1281+ fieldNames _ =
1282+ fieldNames (undefined :: a x) .
1283+ fieldNames (undefined :: b y)
10191284
1020−instance OVERLAPPABLE_ (Selector s, GFromJSON arity a) =>
1021− FromRecord arity (S1 s a) where
1022− parseRecord opts fargs lab =
1023− (<?> Key label) . gParseJSON opts fargs <=< (.: label)
1285+instance (Selector s) => FieldNames (S1 s f) where
1286+ fieldNames _ = (pack (selName (undefined :: M1 _i s _f _p)) :)
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
10241298 where
1025− label = fromMaybe defLabel lab
1026− defLabel = pack . fieldLabelModifier opts $
1027− selName (undefined :: t s a p)
1299+ knownFields :: H.HashMap Text ()
1300+ knownFields = H.fromList $ map (,()) $
1301+ fieldNames (undefined :: f a)
1302+ [pack (tagFieldName (sumEncoding opts)) | fromTaggedSum]
1303+ checkUnknown =
1304+ if not (rejectUnknownFields opts)
1305+ then \_ -> return ()
1306+ else \obj -> case H.keys (H.difference obj knownFields) of
1307+ [] -> return ()
1308+ unknownFields -> contextCons cname tname $
1309+ fail ("unknown fields: " ++ show unknownFields)
1310+
1311+class RecordFromJSON' arity f where
1312+ recordParseJSON'
1313+ :: ConName :* TypeName :* Options :* FromArgs arity a
1314+ -> Object -> Parser (f a)
1315+
1316+instance ( RecordFromJSON' arity a
1317+ , RecordFromJSON' arity b
1318+ ) => RecordFromJSON' arity (a :*: b) where
1319+ recordParseJSON' p obj =
1320+ (:*:) <$> recordParseJSON' p obj
1321+ <*> recordParseJSON' p obj
1322+
1323+instance OVERLAPPABLE_ (Selector s, GFromJSON arity a) =>
1324+ RecordFromJSON' arity (S1 s a) where
1325+ recordParseJSON' (cname :* tname :* opts :* fargs) obj = do
1326+ fv <- contextCons cname tname (obj .: label)
1327+ M1 <$> gParseJSON opts fargs fv <?> Key label
1328+ where
1329+ label = pack $ fieldLabelModifier opts sname
1330+ sname = selName (undefined :: M1 _i s _f _p)
10281331
10291332instance INCOHERENT_ (Selector s, FromJSON a) =>
1030− FromRecord arity (S1 s (K1 i (Maybe a))) where
1031− parseRecord _ _ (Just lab) obj = (M1 . K1) <$> obj .:? lab
1032− parseRecord opts _ Nothing obj = (M1 . K1) <$> obj .:? pack label
1033− where
1034− label = fieldLabelModifier opts $
1035− selName (undefined :: t s (K1 i (Maybe a)) p)
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
1337+ sname = selName (undefined :: M1 _i s _f _p)
1338+
1339+-- Parse an Option like a Maybe.
1340+instance INCOHERENT_ (Selector s, FromJSON a) =>
1341+ RecordFromJSON' arity (S1 s (K1 i (Semigroup.Option a))) where
1342+ recordParseJSON' p obj = wrap <$> recordParseJSON' p obj
1343+ where
1344+ wrap :: S1 s (K1 i (Maybe a)) p -> S1 s (K1 i (Semigroup.Option a)) p
1345+ wrap (M1 (K1 a)) = M1 (K1 (Semigroup.Option a))
10361346
10371347--------------------------------------------------------------------------------
10381348
1039−class FromProduct arity f where
1040− parseProduct :: Options -> FromArgs arity a
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
1370+ productParseJSON :: ConName :* TypeName :* Options :* FromArgs arity a
10411371 -> Array -> Int -> Int
10421372 -> Parser (f a)
10431373
1044−instance ( FromProduct arity a
1045− , FromProduct arity b
1046− ) => FromProduct arity (a :*: b) where
1047− parseProduct opts fargs arr ix len =
1048− (:*:) <$> parseProduct opts fargs arr ix lenL
1049− <*> parseProduct opts fargs arr ixR lenR
1374+instance ( ProductFromJSON arity a
1375+ , ProductFromJSON arity b
1376+ ) => ProductFromJSON arity (a :*: b) where
1377+ productParseJSON p arr ix len =
1378+ (:*:) <$> productParseJSON p arr ix lenL
1379+ <*> productParseJSON p arr ixR lenR
10501380 where
10511381 lenL = len `unsafeShiftR` 1
10521382 ixR = ix + lenL
10531383 lenR = len - lenL
10541384
1055−instance (GFromJSON arity a) => FromProduct arity (S1 s a) where
1056− parseProduct opts fargs arr ix _ =
1057− gParseJSON opts fargs $ V.unsafeIndex arr ix
1385+instance (GFromJSON arity a) => ProductFromJSON arity (S1 s a) where
1386+ productParseJSON (_ :* _ :* opts :* fargs) arr ix _ =
1387+ M1 <$> gParseJSON opts fargs (V.unsafeIndex arr ix) <?> Index ix
10581388
10591389--------------------------------------------------------------------------------
10601390
10611391class FromPair arity f where
1062− parsePair :: Options -> FromArgs arity a
1063− -> Pair -> Maybe (Parser (f a))
1392+ -- The first component of the parameter tuple is the tag to match.
1393+ parsePair :: Text :* TypeName :* Options :* FromArgs arity a
1394+ -> Value
1395+ -> Maybe (Parser (f a))
10641396
10651397instance ( FromPair arity a
10661398 , FromPair arity b
10671399 ) => FromPair arity (a :+: b) where
1068− parsePair opts fargs pair = (fmap L1 <$> parsePair opts fargs pair) <|>
1069− (fmap R1 <$> parsePair opts fargs pair)
1400+ parsePair p pair =
1401+ (fmap L1 <$> parsePair p pair) <|>
1402+ (fmap R1 <$> parsePair p pair)
10701403
10711404instance ( Constructor c
1072− , GFromJSON arity a
10731405 , ConsFromJSON arity a
10741406 ) => FromPair arity (C1 c a) where
1075− parsePair opts fargs (tag, value)
1076− | tag == tag' = Just $ gParseJSON opts fargs value
1407+ parsePair (tag :* p@(_ :* opts :* _)) v
1408+ | tag == tag' = Just $ M1 <$> consParseJSON (cname :* p) v
10771409 | otherwise = Nothing
1078− where
1079− tag' = pack $ constructorTagModifier opts $
1080− conName (undefined :: t c a p)
1410+ where
1411+ tag' = pack $ constructorTagModifier opts cname
1412+ cname = conName (undefined :: M1 _i c _a _p)
10811413
10821414--------------------------------------------------------------------------------
10831415
10841416class FromUntaggedValue arity f where
1085− parseUntaggedValue :: Options -> FromArgs arity a
1086− -> Value -> Parser (f a)
1417+ parseUntaggedValue :: TypeName :* Options :* FromArgs arity a
1418+ -> Value
1419+ -> Parser (f a)
10871420
10881421instance
10891422 ( FromUntaggedValue arity a
10901423 , FromUntaggedValue arity b
10911424 ) => FromUntaggedValue arity (a :+: b)
10921425 where
1093− parseUntaggedValue opts fargs value =
1094− L1 <$> parseUntaggedValue opts fargs value <|>
1095− R1 <$> parseUntaggedValue opts fargs value
1426+ parseUntaggedValue p value =
1427+ L1 <$> parseUntaggedValue p value <|>
1428+ R1 <$> parseUntaggedValue p value
10961429
10971430instance OVERLAPPABLE_
1098− ( GFromJSON arity a
1099− , ConsFromJSON arity a
1431+ ( ConsFromJSON arity a
1432+ , Constructor c
11001433 ) => FromUntaggedValue arity (C1 c a)
11011434 where
1102− parseUntaggedValue = gParseJSON
1435+ parseUntaggedValue p = fmap M1 . consParseJSON (cname :* p)
1436+ where
1437+ cname = conName (undefined :: M1 _i c _f _p)
11031438
11041439instance OVERLAPPING_
11051440 ( Constructor c )
11061441 => FromUntaggedValue arity (C1 c U1)
11071442 where
1108− parseUntaggedValue opts _ (String s)
1109− | s == pack (constructorTagModifier opts (conName (undefined :: t c U1 p))) =
1110− pure $ M1 U1
1111− | otherwise =
1112− fail $ "Invalid tag: " ++ unpack s
1113− parseUntaggedValue _ _ v = typeMismatch (conName (undefined :: t c U1 p)) v
1114−
1115−
1116−--------------------------------------------------------------------------------
1117−
1118−notFound :: Text -> Parser a
1119−notFound key = fail $ "The key \"" ++ unpack key ++ "\" was not found"
1120−{-# INLINE notFound #-}
1443+ parseUntaggedValue (tname :* opts :* _) v =
1444+ contextCons cname tname $ case v of
1445+ String tag
1446+ | tag == tag' -> pure $ M1 U1
1447+ | otherwise -> fail_ tag
1448+ _ -> typeMismatch "String" v
1449+ where
1450+ tag' = pack $ constructorTagModifier opts cname
1451+ cname = conName (undefined :: M1 _i c _f _p)
1452+ fail_ tag = fail $
1453+ "expected tag " ++ show tag' ++ ", but found tag " ++ show tag
11211454
11221455-------------------------------------------------------------------------------
11231456-- Instances
@@ -1175,17 +1508,20 @@ instance (FromJSON a, FromJSON b) => FromJSON (Either a b) where
11751508 parseJSON = parseJSON2
11761509 {-# INLINE parseJSON #-}
11771510
1178−
1511+instance FromJSON Void where
1512+ parseJSON _ = fail "Cannot parse Void"
1513+ {-# INLINE parseJSON #-}
11791514
11801515instance FromJSON Bool where
1181− parseJSON = withBool "Bool" pure
1516+ parseJSON (Bool b) = pure b
1517+ parseJSON v = typeMismatch "Bool" v
11821518 {-# INLINE parseJSON #-}
11831519
11841520instance FromJSONKey Bool where
11851521 fromJSONKey = FromJSONKeyTextParser $ \t -> case t of
11861522 "true" -> pure True
11871523 "false" -> pure False
1188− _ -> fail $ "Cannot parse key into Bool: " ++ T.unpack t
1524+ _ -> fail $ "cannot parse key " ++ show t ++ " into Bool"
11891525
11901526instance FromJSON Ordering where
11911527 parseJSON = withText "Ordering" $ \s ->
@@ -1193,25 +1529,30 @@ instance FromJSON Ordering where
11931529 "LT" -> return LT
11941530 "EQ" -> return EQ
11951531 "GT" -> return GT
1196− _ -> fail "Parsing Ordering value failed: expected \"LT\", \"EQ\", or \"GT\""
1532+ _ -> fail $ "parsing Ordering failed, unexpected " ++ show s ++
1533+ " (expected \"LT\", \"EQ\", or \"GT\")"
11971534
11981535instance FromJSON () where
11991536 parseJSON = withArray "()" $ \v ->
12001537 if V.null v
12011538 then pure ()
1202− else fail "Expected an empty array"
1539+ else prependContext "()" $ fail "expected an empty array"
12031540 {-# INLINE parseJSON #-}
12041541
12051542instance FromJSON Char where
1206− parseJSON = withText "Char" $ \t ->
1207− if T.compareLength t 1 == EQ
1208− then pure $ T.head t
1209− else fail "Expected a string of length 1"
1543+ parseJSON = withText "Char" parseChar
12101544 {-# INLINE parseJSON #-}
12111545
1212− parseJSONList = withText "String" $ pure . T.unpack
1546+ parseJSONList (String s) = pure (T.unpack s)
1547+ parseJSONList v = typeMismatch "String" v
12131548 {-# INLINE parseJSONList #-}
12141549
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+
12151556instance FromJSON Double where
12161557 parseJSON = parseRealFloat "Double"
12171558 {-# INLINE parseJSON #-}
@@ -1223,12 +1564,6 @@ instance FromJSONKey Double where
12231564 "-Infinity" -> pure (negate 1/0)
12241565 _ -> Scientific.toRealFloat <$> parseScientificText t
12251566
1226−instance FromJSON Number where
1227− parseJSON (Number s) = pure $ scientificToNumber s
1228− parseJSON Null = pure (D (0/0))
1229− parseJSON v = typeMismatch "Number" v
1230− {-# INLINE parseJSON #-}
1231−
12321567instance FromJSON Float where
12331568 parseJSON = parseRealFloat "Float"
12341569 {-# INLINE parseJSON #-}
@@ -1241,17 +1576,30 @@ instance FromJSONKey Float where
12411576 _ -> Scientific.toRealFloat <$> parseScientificText t
12421577
12431578instance (FromJSON a, Integral a) => FromJSON (Ratio a) where
1244− parseJSON = withObject "Rational" $ \obj ->
1245− (%) <$> obj .: "numerator"
1246− <*> obj .: "denominator"
1247− {-# INLINE parseJSON #-}
1248−
1249−-- | /WARNING:/ Only parse fixed-precision numbers from trusted input
1250−-- since an attacker could easily fill up the memory of the target
1251−-- system by specifying a scientific number with a big exponent like
1252−-- @1e1000000000@.
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
1590+ numerator <- obj .: "numerator"
1591+ denominator <- obj .: "denominator"
1592+ if denominator == 0
1593+ then fail "Ratio denominator was 0"
1594+ else pure $ numerator % denominator
1595+ {-# INLINE parseJSON #-}
1596+
1597+-- | This instance includes a bounds check to prevent maliciously
1598+-- large inputs to fill up the memory of the target system. You can
1599+-- newtype 'Scientific' and provide your own instance using
1600+-- 'withScientific' if you want to allow larger inputs.
12531601instance HasResolution a => FromJSON (Fixed a) where
1254− parseJSON = withScientific "Fixed" $ pure . realToFrac
1602+ parseJSON = prependContext "Fixed" . withBoundedScientific' (pure . realToFrac)
12551603 {-# INLINE parseJSON #-}
12561604
12571605instance FromJSON Int where
@@ -1261,10 +1609,10 @@ instance FromJSON Int where
12611609instance FromJSONKey Int where
12621610 fromJSONKey = FromJSONKeyTextParser $ parseBoundedIntegralText "Int"
12631611
1264−-- | /WARNING:/ Only parse Integers from trusted input since an
1265−-- attacker could easily fill up the memory of the target system by
1266−-- specifying a scientific number with a big exponent like
1267−-- @1e1000000000@.
1612+-- | This instance includes a bounds check to prevent maliciously
1613+-- large inputs to fill up the memory of the target system. You can
1614+-- newtype 'Scientific' and provide your own instance using
1615+-- 'withScientific' if you want to allow larger inputs.
12681616instance FromJSON Integer where
12691617 parseJSON = parseIntegral "Integer"
12701618 {-# INLINE parseJSON #-}
@@ -1273,16 +1621,21 @@ instance FromJSONKey Integer where
12731621 fromJSONKey = FromJSONKeyTextParser $ parseIntegralText "Integer"
12741622
12751623instance FromJSON Natural where
1276− parseJSON = withScientific "Natural" $ \s ->
1277− if Scientific.coefficient s < 0
1278− then fail $ "Expected a Natural number but got the negative number: " <> show s
1279− else pure $ truncate s
1624+ parseJSON value = do
1625+ integer <- parseIntegral "Natural" value
1626+ parseNatural integer
12801627
12811628instance FromJSONKey Natural where
1282− fromJSONKey = FromJSONKeyTextParser $ \t -> parseScientificText t >>= \s ->
1283− if Scientific.coefficient s < 0
1284− then fail $ "Expected a Natural number but got the negative number: " <> show s
1285− else pure $ truncate s
1629+ fromJSONKey = FromJSONKeyTextParser $ \text -> do
1630+ integer <- parseIntegralText "Natural" text
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
1637+ else
1638+ pure $ fromIntegral integer
12861639
12871640instance FromJSON Int8 where
12881641 parseJSON = parseBoundedIntegral "Int8"
@@ -1347,6 +1700,9 @@ instance FromJSON Word64 where
13471700instance FromJSONKey Word64 where
13481701 fromJSONKey = FromJSONKeyTextParser $ parseBoundedIntegralText "Word64"
13491702
1703+instance FromJSON CTime where
1704+ parseJSON = fmap CTime . parseJSON
1705+ {-# INLINE parseJSON #-}
13501706
13511707instance FromJSON Text where
13521708 parseJSON = withText "Text" pure
@@ -1376,17 +1732,17 @@ parseVersionText = go . readP_to_S parseVersion . unpack
13761732 where
13771733 go [(v,[])] = return v
13781734 go (_ : xs) = go xs
1379− go _ = fail "could not parse Version"
1735+ go _ = fail "parsing Version failed"
13801736
13811737-------------------------------------------------------------------------------
13821738-- semigroups NonEmpty
13831739-------------------------------------------------------------------------------
13841740
13851741instance FromJSON1 NonEmpty where
1386− liftParseJSON p _ = withArray "NonEmpty a" $
1742+ liftParseJSON p _ = withArray "NonEmpty" $
13871743 (>>= ne) . Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
13881744 where
1389− ne [] = fail "Expected a NonEmpty but got an empty list"
1745+ ne [] = fail "parsing NonEmpty failed, unexpected empty list"
13901746 ne (x:xs) = pure (x :| xs)
13911747 {-# INLINE liftParseJSON #-}
13921748
@@ -1407,7 +1763,7 @@ instance FromJSON Scientific where
14071763-------------------------------------------------------------------------------
14081764
14091765instance FromJSON1 DList.DList where
1410− liftParseJSON p _ = withArray "DList a" $
1766+ liftParseJSON p _ = withArray "DList" $
14111767 fmap DList.fromList .
14121768 Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
14131769 {-# INLINE liftParseJSON #-}
@@ -1484,7 +1840,7 @@ instance (FromJSON1 f, FromJSON1 g) => FromJSON1 (Sum f g) where
14841840 inr = "InR"
14851841
14861842 liftParseJSON _ _ _ = fail $
1487− "expected an object with a single property " ++
1843+ "parsing Sum failed, expected an object with a single property " ++
14881844 "where the property key should be either " ++
14891845 "\"InL\" or \"InR\""
14901846 {-# INLINE liftParseJSON #-}
@@ -1498,7 +1854,7 @@ instance (FromJSON1 f, FromJSON1 g, FromJSON a) => FromJSON (Sum f g a) where
14981854-------------------------------------------------------------------------------
14991855
15001856instance FromJSON1 Seq.Seq where
1501− liftParseJSON p _ = withArray "Seq a" $
1857+ liftParseJSON p _ = withArray "Seq" $
15021858 fmap Seq.fromList .
15031859 Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
15041860 {-# INLINE liftParseJSON #-}
@@ -1532,13 +1888,13 @@ instance FromJSON a => FromJSON (IntMap.IntMap a) where
15321888
15331889instance (FromJSONKey k, Ord k) => FromJSON1 (M.Map k) where
15341890 liftParseJSON p _ = case fromJSONKey of
1535− FromJSONKeyCoerce _-> withObject "Map k v" $
1891+ FromJSONKeyCoerce _ -> withObject "Map" $
15361892 fmap (H.foldrWithKey (M.insert . unsafeCoerce) M.empty) . H.traverseWithKey (\k v -> p v <?> Key k)
1537− FromJSONKeyText f -> withObject "Map k v" $
1893+ FromJSONKeyText f -> withObject "Map" $
15381894 fmap (H.foldrWithKey (M.insert . f) M.empty) . H.traverseWithKey (\k v -> p v <?> Key k)
1539− FromJSONKeyTextParser f -> withObject "Map k v" $
1895+ FromJSONKeyTextParser f -> withObject "Map" $
15401896 H.foldrWithKey (\k v m -> M.insert <$> f k <?> Key k <*> p v <?> Key k <*> m) (pure M.empty)
1541− FromJSONKeyValue f -> withArray "Map k v" $ \arr ->
1897+ FromJSONKeyValue f -> withArray "Map" $ \arr ->
15421898 fmap M.fromList . Tr.sequence .
15431899 zipWith (parseIndexedJSONPair f p) [0..] . V.toList $ arr
15441900 {-# INLINE liftParseJSON #-}
@@ -1566,18 +1922,18 @@ instance (FromJSON v) => FromJSON (Tree.Tree v) where
15661922
15671923instance FromJSON UUID.UUID where
15681924 parseJSON = withText "UUID" $
1569− maybe (fail "Invalid UUID") pure . UUID.fromText
1925+ maybe (fail "invalid UUID") pure . UUID.fromText
15701926
15711927instance FromJSONKey UUID.UUID where
15721928 fromJSONKey = FromJSONKeyTextParser $
1573− maybe (fail "Invalid UUID") pure . UUID.fromText
1929+ maybe (fail "invalid UUID") pure . UUID.fromText
15741930
15751931-------------------------------------------------------------------------------
15761932-- vector
15771933-------------------------------------------------------------------------------
15781934
15791935instance FromJSON1 Vector where
1580− liftParseJSON p _ = withArray "Vector a" $
1936+ liftParseJSON p _ = withArray "Vector" $
15811937 V.mapM (uncurry $ parseIndexedJSON p) . V.indexed
15821938 {-# INLINE liftParseJSON #-}
15831939
@@ -1591,14 +1947,14 @@ vectorParseJSON s = withArray s $ fmap V.convert . V.mapM (uncurry $ parseIndexe
15911947{-# INLINE vectorParseJSON #-}
15921948
15931949instance (Storable a, FromJSON a) => FromJSON (VS.Vector a) where
1594− parseJSON = vectorParseJSON "Data.Vector.Storable.Vector a"
1950+ parseJSON = vectorParseJSON "Data.Vector.Storable.Vector"
15951951
15961952instance (VP.Prim a, FromJSON a) => FromJSON (VP.Vector a) where
1597− parseJSON = vectorParseJSON "Data.Vector.Primitive.Vector a"
1953+ parseJSON = vectorParseJSON "Data.Vector.Primitive.Vector"
15981954 {-# INLINE parseJSON #-}
15991955
16001956instance (VG.Vector VU.Vector a, FromJSON a) => FromJSON (VU.Vector a) where
1601− parseJSON = vectorParseJSON "Data.Vector.Unboxed.Vector a"
1957+ parseJSON = vectorParseJSON "Data.Vector.Unboxed.Vector"
16021958 {-# INLINE parseJSON #-}
16031959
16041960-------------------------------------------------------------------------------
@@ -1612,13 +1968,13 @@ instance (Eq a, Hashable a, FromJSON a) => FromJSON (HashSet.HashSet a) where
16121968
16131969instance (FromJSONKey k, Eq k, Hashable k) => FromJSON1 (H.HashMap k) where
16141970 liftParseJSON p _ = case fromJSONKey of
1615− FromJSONKeyCoerce _ -> withObject "HashMap ~Text v" $
1971+ FromJSONKeyCoerce _ -> withObject "HashMap ~Text" $
16161972 uc . H.traverseWithKey (\k v -> p v <?> Key k)
1617− FromJSONKeyText f -> withObject "HashMap k v" $
1973+ FromJSONKeyText f -> withObject "HashMap" $
16181974 fmap (mapKey f) . H.traverseWithKey (\k v -> p v <?> Key k)
1619− FromJSONKeyTextParser f -> withObject "HashMap k v" $
1975+ FromJSONKeyTextParser f -> withObject "HashMap" $
16201976 H.foldrWithKey (\k v m -> H.insert <$> f k <?> Key k <*> p v <?> Key k <*> m) (pure H.empty)
1621− FromJSONKeyValue f -> withArray "Map k v" $ \arr ->
1977+ FromJSONKeyValue f -> withArray "Map" $ \arr ->
16221978 fmap H.fromList . Tr.sequence .
16231979 zipWith (parseIndexedJSONPair f p) [0..] . V.toList $ arr
16241980 where
@@ -1641,11 +1997,33 @@ instance FromJSON DotNetTime where
16411997 parseJSON = withText "DotNetTime" $ \t ->
16421998 let (s,m) = T.splitAt (T.length t - 5) t
16431999 t' = T.concat [s,".",m]
1644− in case parseTime defaultTimeLocale "/Date(%s%Q)/" (unpack t') of
2000+ in case parseTimeM True defaultTimeLocale "/Date(%s%Q)/" (unpack t') of
16452001 Just d -> pure (DotNetTime d)
16462002 _ -> fail "could not parse .NET time"
16472003 {-# INLINE parseJSON #-}
16482004
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+
16492027-------------------------------------------------------------------------------
16502028-- time
16512029-------------------------------------------------------------------------------
@@ -1696,14 +2074,57 @@ instance FromJSONKey UTCTime where
16962074 fromJSONKey = FromJSONKeyTextParser (Time.run Time.utcTime)
16972075
16982076
1699−-- | /WARNING:/ Only parse lengths of time from trusted input
1700−-- since an attacker could easily fill up the memory of the target
1701−-- system by specifying a scientific number with a big exponent like
1702−-- @1e1000000000@.
2077+-- | This instance includes a bounds check to prevent maliciously
2078+-- large inputs to fill up the memory of the target system. You can
2079+-- newtype 'Scientific' and provide your own instance using
2080+-- 'withScientific' if you want to allow larger inputs.
17032081instance FromJSON NominalDiffTime where
1704− parseJSON = withScientific "NominalDiffTime" $ pure . realToFrac
2082+ parseJSON = withBoundedScientific "NominalDiffTime" $ pure . realToFrac
2083+ {-# INLINE parseJSON #-}
2084+
2085+
2086+-- | This instance includes a bounds check to prevent maliciously
2087+-- large inputs to fill up the memory of the target system. You can
2088+-- newtype 'Scientific' and provide your own instance using
2089+-- 'withScientific' if you want to allow larger inputs.
2090+instance FromJSON DiffTime where
2091+ parseJSON = withBoundedScientific "DiffTime" $ pure . realToFrac
17052092 {-# INLINE parseJSON #-}
17062093
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+
17072128-------------------------------------------------------------------------------
17082129-- base Monoid/Semigroup
17092130-------------------------------------------------------------------------------
@@ -1824,14 +2245,15 @@ instance FromJSON a => FromJSON (Semigroup.Option a) where
18242245
18252246instance FromJSON1 Proxy where
18262247 {-# INLINE liftParseJSON #-}
1827− liftParseJSON _ _ Null = pure Proxy
1828− liftParseJSON _ _ v = typeMismatch "Proxy" v
2248+ liftParseJSON _ _ = fromNull "Proxy" Proxy
18292249
18302250instance FromJSON (Proxy a) where
18312251 {-# INLINE parseJSON #-}
1832− parseJSON Null = pure Proxy
1833− parseJSON v = typeMismatch "Proxy" v
2252+ parseJSON = fromNull "Proxy" Proxy
18342253
2254+fromNull :: String -> a -> Value -> Parser a
2255+fromNull _ a Null = pure a
2256+fromNull c _ v = prependContext c (typeMismatch "Null" v)
18352257
18362258instance FromJSON2 Tagged where
18372259 liftParseJSON2 _ _ p _ = fmap Tagged . p
@@ -1858,10 +2280,7 @@ instance (FromJSON a, FromJSON b, FromJSON c) => FromJSONKey (a,b,c)
18582280instance (FromJSON a, FromJSON b, FromJSON c, FromJSON d) => FromJSONKey (a,b,c,d)
18592281
18602282instance FromJSONKey Char where
1861− fromJSONKey = FromJSONKeyTextParser $ \t ->
1862− if T.length t == 1
1863− then return (T.index t 0)
1864− else typeMismatch "Expected Char but String didn't contain exactly one character" (String t)
2283+ fromJSONKey = FromJSONKeyTextParser parseChar
18652284 fromJSONKeyList = FromJSONKeyText T.unpack
18662285
18672286instance (FromJSONKey a, FromJSON a) => FromJSONKey [a] where
Data/Aeson/Types/Generic.hs+12−8
@@ -1,10 +1,11 @@
11{-# LANGUAGE CPP #-}
22{-# LANGUAGE DataKinds #-}
3+{-# LANGUAGE DeriveFunctor #-}
34{-# LANGUAGE EmptyDataDecls #-}
45{-# LANGUAGE FlexibleInstances #-}
56{-# LANGUAGE FunctionalDependencies #-}
67{-# LANGUAGE KindSignatures #-}
7−{-# LANGUAGE MultiParamTypeClasses #-}
8+{-# LANGUAGE NoImplicitPrelude #-}
89{-# LANGUAGE ScopedTypeVariables #-}
910{-# LANGUAGE TypeOperators #-}
1011{-# LANGUAGE UndecidableInstances #-}
@@ -25,7 +26,7 @@
2526
2627module Data.Aeson.Types.Generic
2728 (
28− IsRecord(..)
29+ IsRecord
2930 , AllNullary
3031 , Tagged2(..)
3132 , True
@@ -34,9 +35,9 @@ module Data.Aeson.Types.Generic
3435 , Zero
3536 , One
3637 , ProductSize(..)
38+ , (:*)(..)
3739 ) where
3840
39−import Prelude ()
4041import Prelude.Compat
4142
4243import GHC.Generics
@@ -44,12 +45,8 @@ import GHC.Generics
4445--------------------------------------------------------------------------------
4546
4647class IsRecord (f :: * -> *) isRecord | f -> isRecord
47− where
48− isUnary :: f a -> Bool
49− isUnary = const True
5048
5149instance (IsRecord f isRecord) => IsRecord (f :*: g) isRecord
52− where isUnary = const False
5350#if MIN_VERSION_base(4,9,0)
5451instance OVERLAPPING_ IsRecord (M1 S ('MetaSel 'Nothing u ss ds) f) False
5552#else
@@ -61,7 +58,6 @@ instance IsRecord Par1 True
6158instance IsRecord (Rec1 f) True
6259instance IsRecord (f :.: g) True
6360instance IsRecord U1 False
64− where isUnary = const False
6561
6662--------------------------------------------------------------------------------
6763
@@ -80,6 +76,7 @@ instance AllNullary (Rec1 f) False
8076instance AllNullary U1 True
8177
8278newtype Tagged2 (s :: * -> *) b = Tagged2 {unTagged2 :: b}
79+ deriving Functor
8380
8481--------------------------------------------------------------------------------
8582
@@ -112,3 +109,10 @@ instance (ProductSize a, ProductSize b) => ProductSize (a :*: b) where
112109
113110instance ProductSize (S1 s a) where
114111 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+124−10
@@ -2,6 +2,7 @@
22{-# LANGUAGE DeriveDataTypeable #-}
33{-# LANGUAGE DeriveGeneric #-}
44{-# LANGUAGE GeneralizedNewtypeDeriving #-}
5+{-# LANGUAGE NoImplicitPrelude #-}
56{-# LANGUAGE Rank2Types #-}
67#if __GLASGOW_HASKELL__ >= 800
78-- a) THQ works on cross-compilers and unregisterised GHCs
@@ -44,9 +45,12 @@ module Data.Aeson.Types.Internal
4445 , parseEither
4546 , parseMaybe
4647 , modifyFailure
48+ , prependFailure
4749 , parserThrowError
4850 , parserCatchError
4951 , formatError
52+ , formatPath
53+ , formatRelativePath
5054 , (<?>)
5155 -- * Constructors and accessors
5256 , object
@@ -60,11 +64,14 @@ module Data.Aeson.Types.Internal
6064 , sumEncoding
6165 , unwrapUnaryRecords
6266 , tagSingleConstructors
67+ , rejectUnknownFields
6368 )
6469
6570 , SumEncoding(..)
71+ , JSONKeyOptions(keyModifier)
6672 , defaultOptions
6773 , defaultTaggedObject
74+ , defaultJSONKeyOptions
6875
6976 -- * Used for changing CamelCase names into something else.
7077 , camelTo
@@ -74,7 +81,6 @@ module Data.Aeson.Types.Internal
7481 , DotNetTime(..)
7582 ) where
7683
77−import Prelude ()
7884import Prelude.Compat
7985
8086import Control.Applicative (Alternative(..))
@@ -96,6 +102,7 @@ import Data.Time.Format (FormatTime)
96102import Data.Typeable (Typeable)
97103import Data.Vector (Vector)
98104import GHC.Generics (Generic)
105+import qualified Control.Monad as Monad
99106import qualified Control.Monad.Fail as Fail
100107import qualified Data.HashMap.Strict as H
101108import qualified Data.Scientific as S
@@ -114,7 +121,7 @@ data JSONPathElement = Key Text
114121 | Index {-# UNPACK #-} !Int
115122 -- ^ JSON path element of an index into an
116123 -- array, \"array[index]\".
117− deriving (Eq, Show, Typeable)
124+ deriving (Eq, Show, Typeable, Ord)
118125type JSONPath = [JSONPathElement]
119126
120127-- | The internal result of running a 'Parser'.
@@ -149,7 +156,7 @@ instance Functor Result where
149156 fmap _ (Error err) = Error err
150157 {-# INLINE fmap #-}
151158
152−instance Monad IResult where
159+instance Monad.Monad IResult where
153160 return = pure
154161 {-# INLINE return #-}
155162
@@ -157,14 +164,16 @@ instance Monad IResult where
157164 IError path err >>= _ = IError path err
158165 {-# INLINE (>>=) #-}
159166
167+#if !(MIN_VERSION_base(4,13,0))
160168 fail = Fail.fail
161169 {-# INLINE fail #-}
170+#endif
162171
163172instance Fail.MonadFail IResult where
164173 fail err = IError [] err
165174 {-# INLINE fail #-}
166175
167−instance Monad Result where
176+instance Monad.Monad Result where
168177 return = pure
169178 {-# INLINE return #-}
170179
@@ -172,8 +181,10 @@ instance Monad Result where
172181 Error err >>= _ = Error err
173182 {-# INLINE (>>=) #-}
174183
184+#if !(MIN_VERSION_base(4,13,0))
175185 fail = Fail.fail
176186 {-# INLINE fail #-}
187+#endif
177188
178189instance Fail.MonadFail Result where
179190 fail err = Error err
@@ -270,7 +281,9 @@ type Failure f r = JSONPath -> String -> f r
270281-- | Success continuation.
271282type Success a f r = a -> f r
272283
273−-- | A JSON parser.
284+-- | A JSON parser. N.B. This might not fit your usual understanding of
285+-- "parser". Instead you might like to think of 'Parser' as a "parse result",
286+-- i.e. a parser to which the input has already been applied.
274287newtype Parser a = Parser {
275288 runParser :: forall f r.
276289 JSONPath
@@ -279,14 +292,17 @@ newtype Parser a = Parser {
279292 -> f r
280293 }
281294
282−instance Monad Parser where
295+instance Monad.Monad Parser where
283296 m >>= g = Parser $ \path kf ks -> let ks' a = runParser (g a) path kf ks
284297 in runParser m path kf ks'
285298 {-# INLINE (>>=) #-}
286299 return = pure
287300 {-# INLINE return #-}
301+
302+#if !(MIN_VERSION_base(4,13,0))
288303 fail = Fail.fail
289304 {-# INLINE fail #-}
305+#endif
290306
291307instance Fail.MonadFail Parser where
292308 fail msg = Parser $ \path kf _ks -> kf (reverse path) msg
@@ -329,8 +345,7 @@ instance Monoid (Parser a) where
329345apP :: Parser (a -> b) -> Parser a -> Parser b
330346apP d e = do
331347 b <- d
332− a <- e
333− return (b a)
348+ b <$> e
334349{-# INLINE apP #-}
335350
336351-- | A JSON \"object\" (key\/value map).
@@ -446,7 +461,17 @@ parseEither m v = runParser (m v) [] onError Right
446461-- | Annotate an error message with a
447462-- <http://goessner.net/articles/JsonPath/ JSONPath> error location.
448463formatError :: JSONPath -> String -> String
449−formatError path msg = "Error in " ++ format "$" path ++ ": " ++ msg
464+formatError path msg = "Error in " ++ formatPath path ++ ": " ++ msg
465+
466+-- | Format a <http://goessner.net/articles/JsonPath/ JSONPath> as a 'String',
467+-- representing the root object as @$@.
468+formatPath :: JSONPath -> String
469+formatPath path = "$" ++ formatRelativePath path
470+
471+-- | Format a <http://goessner.net/articles/JsonPath/ JSONPath> as a 'String'
472+-- which represents the path relative to some root object.
473+formatRelativePath :: JSONPath -> String
474+formatRelativePath path = format "" path
450475 where
451476 format :: String -> JSONPath -> String
452477 format pfx [] = pfx
@@ -512,6 +537,15 @@ modifyFailure :: (String -> String) -> Parser a -> Parser a
512537modifyFailure f (Parser p) = Parser $ \path kf ks ->
513538 p path (\p' m -> kf p' (f m)) ks
514539
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+
515549-- | Throw a parser error with an additional path.
516550--
517551-- @since 1.2.1.0
@@ -531,6 +565,9 @@ parserCatchError (Parser p) handler = Parser $ \path kf ks ->
531565--------------------------------------------------------------------------------
532566
533567-- | 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.
534571data Options = Options
535572 { fieldLabelModifier :: String -> String
536573 -- ^ Function applied to field labels.
@@ -547,6 +584,39 @@ data Options = Options
547584 -- ^ If 'True' record fields with a 'Nothing' value will be
548585 -- omitted from the resulting object. If 'False' the resulting
549586 -- 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+ -- @
550620 , sumEncoding :: SumEncoding
551621 -- ^ Specifies how to encode constructors of a sum datatype.
552622 , unwrapUnaryRecords :: Bool
@@ -555,10 +625,14 @@ data Options = Options
555625 , tagSingleConstructors :: Bool
556626 -- ^ Encode types with a single constructor as sums,
557627 -- 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.
558632 }
559633
560634instance Show Options where
561− show (Options f c a o s u t) =
635+ show (Options f c a o s u t r) =
562636 "Options {"
563637 ++ intercalate ", "
564638 [ "fieldLabelModifier =~ " ++ show (f "exampleField")
@@ -568,6 +642,7 @@ instance Show Options where
568642 , "sumEncoding = " ++ show s
569643 , "unwrapUnaryRecords = " ++ show u
570644 , "tagSingleConstructors = " ++ show t
645+ , "rejectUnknownFields = " ++ show r
571646 ]
572647 ++ "}"
573648
@@ -611,6 +686,33 @@ data SumEncoding =
611686 -- contents of the constructor.
612687 deriving (Eq, Show)
613688
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+
614716-- | Default encoding 'Options':
615717--
616718-- @
@@ -622,6 +724,7 @@ data SumEncoding =
622724-- , 'sumEncoding' = 'defaultTaggedObject'
623725-- , 'unwrapUnaryRecords' = False
624726-- , 'tagSingleConstructors' = False
727+-- , 'rejectUnknownFields' = False
625728-- }
626729-- @
627730defaultOptions :: Options
@@ -633,6 +736,7 @@ defaultOptions = Options
633736 , sumEncoding = defaultTaggedObject
634737 , unwrapUnaryRecords = False
635738 , tagSingleConstructors = False
739+ , rejectUnknownFields = False
636740 }
637741
638742-- | Default 'TaggedObject' 'SumEncoding' options:
@@ -649,6 +753,16 @@ defaultTaggedObject = TaggedObject
649753 , contentsFieldName = "contents"
650754 }
651755
756+-- | Default 'JSONKeyOptions':
757+--
758+-- @
759+-- defaultJSONKeyOptions = 'JSONKeyOptions'
760+-- { 'keyModifier' = 'id'
761+-- }
762+-- @
763+defaultJSONKeyOptions :: JSONKeyOptions
764+defaultJSONKeyOptions = JSONKeyOptions id
765+
652766-- | Converts from CamelCase to another lower case, interspersing
653767-- the character between all capital letters and their previous
654768-- entries, except those capital letters that appear together,
Data/Aeson/Types/ToJSON.hs+250−84
@@ -5,21 +5,17 @@
55{-# LANGUAGE FlexibleInstances #-}
66{-# LANGUAGE FunctionalDependencies #-}
77{-# LANGUAGE GADTs #-}
8−{-# LANGUAGE MultiParamTypeClasses #-}
9−{-# LANGUAGE NamedFieldPuns #-}
8+{-# LANGUAGE NoImplicitPrelude #-}
109{-# LANGUAGE OverloadedStrings #-}
1110{-# LANGUAGE PatternGuards #-}
11+{-# LANGUAGE PolyKinds #-}
1212{-# LANGUAGE RecordWildCards #-}
1313{-# LANGUAGE ScopedTypeVariables #-}
1414{-# LANGUAGE TypeOperators #-}
15−{-# LANGUAGE TypeSynonymInstances #-}
1615{-# LANGUAGE UndecidableInstances #-}
1716
18−#if __GLASGOW_HASKELL__ >= 706
19−{-# LANGUAGE PolyKinds #-}
20−#endif
21−
2217#include "overlapping-compat.h"
18+#include "incoherent-compat.h"
2319
2420-- TODO: Drop this when we remove support for Data.Attoparsec.Number
2521{-# OPTIONS_GHC -fno-warn-deprecations #-}
@@ -47,15 +43,20 @@ module Data.Aeson.Types.ToJSON
4743 , ToJSONKeyFunction(..)
4844 , toJSONKeyText
4945 , contramapToJSONKeyFunction
46+
47+ , GToJSONKey()
48+ , genericToJSONKey
49+
5050 -- * Object key-value pairs
5151 , KeyValue(..)
52+ , KeyValuePair(..)
53+ , FromPairs(..)
5254 -- * Functions needed for documentation
5355 -- * Encoding functions
5456 , listEncoding
5557 , listValue
5658 ) where
5759
58−import Prelude ()
5960import Prelude.Compat
6061
6162import Control.Applicative (Const(..))
@@ -63,38 +64,42 @@ import Control.Monad.ST (ST)
6364import Data.Aeson.Encoding (Encoding, Encoding', Series, dict, emptyArray_)
6465import Data.Aeson.Encoding.Internal ((>*<))
6566import Data.Aeson.Internal.Functions (mapHashKeyVal, mapKeyVal)
66−import Data.Aeson.Types.Generic (AllNullary, False, IsRecord(..), One, ProductSize, Tagged2(..), True, Zero, productSize)
67+import Data.Aeson.Types.Generic (AllNullary, False, IsRecord, One, ProductSize, Tagged2(..), True, Zero, productSize)
6768import Data.Aeson.Types.Internal
6869import Data.Attoparsec.Number (Number(..))
6970import Data.Bits (unsafeShiftR)
7071import Data.DList (DList)
71−import Data.Fixed (Fixed, HasResolution)
72+import Data.Fixed (Fixed, HasResolution, Nano)
7273import Data.Foldable (toList)
7374import Data.Functor.Compose (Compose(..))
75+import Data.Functor.Contravariant (Contravariant (..))
7476import Data.Functor.Identity (Identity(..))
7577import Data.Functor.Product (Product(..))
7678import Data.Functor.Sum (Sum(..))
7779import Data.Int (Int16, Int32, Int64, Int8)
7880import Data.List (intersperse)
7981import Data.List.NonEmpty (NonEmpty(..))
80−import Data.Monoid ((<>))
82+import Data.Semigroup ((<>))
8183import Data.Proxy (Proxy(..))
8284import Data.Ratio (Ratio, denominator, numerator)
8385import Data.Scientific (Scientific)
8486import Data.Tagged (Tagged(..))
8587import Data.Text (Text, pack)
86−import Data.Time (Day, LocalTime, NominalDiffTime, TimeOfDay, UTCTime, ZonedTime)
87−import Data.Time.Format (FormatTime, formatTime)
88−import Data.Time.Locale.Compat (defaultTimeLocale)
88+import Data.Time (Day, DiffTime, LocalTime, NominalDiffTime, TimeOfDay, UTCTime, ZonedTime)
89+import Data.Time.Calendar.Compat (CalendarDiffDays (..), DayOfWeek (..))
90+import Data.Time.LocalTime.Compat (CalendarDiffTime (..))
91+import Data.Time.Clock.System.Compat (SystemTime (..))
92+import Data.Time.Format.Compat (FormatTime, formatTime, defaultTimeLocale)
8993import Data.Vector (Vector)
9094import Data.Version (Version, showVersion)
95+import Data.Void (Void, absurd)
9196import Data.Word (Word16, Word32, Word64, Word8)
9297import Foreign.Storable (Storable)
98+import Foreign.C.Types (CTime (..))
9399import GHC.Generics
94100import Numeric.Natural (Natural)
95101import qualified Data.Aeson.Encoding as E
96102import qualified Data.Aeson.Encoding.Internal as E (InArray, comma, econcat, retagEncoding)
97−import qualified Data.ByteString as S
98103import qualified Data.ByteString.Lazy as L
99104import qualified Data.DList as DList
100105import qualified Data.HashMap.Strict as H
@@ -123,15 +128,17 @@ import qualified Data.Vector.Unboxed as VU
123128import qualified Data.Aeson.Encoding.Builder as EB
124129import qualified Data.ByteString.Builder as B
125130
126−#if !(MIN_VERSION_bytestring(0,10,0))
127−import Foreign.ForeignPtr (withForeignPtr)
128−import Foreign.Marshal.Utils (copyBytes)
129−import Foreign.Ptr (plusPtr)
130−import qualified Data.ByteString.Internal as S
131−import qualified Data.ByteString.Lazy.Internal as L
132−#endif
131+import qualified GHC.Exts as Exts
132+import qualified Data.Primitive.Array as PM
133+import qualified Data.Primitive.SmallArray as PM
134+import qualified Data.Primitive.Types as PM
133135
134−{-# ANN module ("HLint: ignore Reduce duplication"::String) #-}
136+#if MIN_VERSION_primitive(0,6,4)
137+#if !MIN_VERSION_primitive(0,7,0)
138+import qualified Data.Primitive.UnliftedArray as PM
139+#endif
140+import qualified Data.Primitive.PrimArray as PM
141+#endif
135142
136143toJSONPair :: (a -> Value) -> (b -> Value) -> (a, b) -> Value
137144toJSONPair a b = liftToJSON2 a (listValue a) b (listValue b)
@@ -260,7 +267,7 @@ genericLiftToEncoding opts te tel = gToJSON opts (To1Args te tel) . from1
260267-- @
261268--
262269-- Previous versions of this library only had the 'toJSON' method. Adding
263−-- 'toEncoding' had to reasons:
270+-- 'toEncoding' had two reasons:
264271--
265272-- 1. toEncoding is more efficient for the common case that the output of
266273-- 'toJSON' is directly serialized to a @ByteString@.
@@ -331,6 +338,13 @@ instance KeyValue Pair where
331338 name .= value = (name, toJSON value)
332339 {-# INLINE (.=) #-}
333340
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+
334348-------------------------------------------------------------------------------
335349-- Classes and types for map keys
336350-------------------------------------------------------------------------------
@@ -388,7 +402,7 @@ instance KeyValue Pair where
388402-- newtype wrapper around 'Text'. The recommended approach is to use
389403-- generalized newtype deriving:
390404--
391−-- > newtype RecordId = RecordId { getRecordId :: Text}
405+-- > newtype RecordId = RecordId { getRecordId :: Text }
392406-- > deriving (Eq,Ord,ToJSONKey)
393407--
394408-- Then we may write:
@@ -403,8 +417,18 @@ instance KeyValue Pair where
403417--
404418-- It is possible to get the 'ToJSONKey' instance for free as we did
405419-- with 'Foo'. However, in this case, we have a natural way to go to
406−-- and from 'Text' that does not require any escape sequences. So, in
407−-- this example, 'ToJSONKeyText' will be used instead of 'ToJSONKeyValue'.
420+-- and from 'Text' that does not require any escape sequences. So
421+-- 'ToJSONKeyText' can be used instead of 'ToJSONKeyValue' to encode maps
422+-- as objects instead of arrays of pairs. This instance may be
423+-- implemented using generics as follows:
424+--
425+-- @
426+-- instance 'ToJSONKey' Color where
427+-- 'toJSONKey' = 'genericToJSONKey' 'defaultJSONKeyOptions'
428+-- @
429+--
430+-- === __Low-level implementations__
431+--
408432-- The 'Show' instance can be used to help write 'ToJSONKey':
409433--
410434-- > instance ToJSONKey Color where
@@ -479,16 +503,42 @@ toJSONKeyTextEnc e = ToJSONKeyText tot e
479503 -- TODO: dropAround is also used in stringEncoding, which is unfortunate atm
480504 tot = T.dropAround (== '"')
481505 . T.decodeLatin1
482− . lazyToStrictByteString
506+ . L.toStrict
483507 . E.encodingToLazyByteString
484508 . e
485509
510+instance Contravariant ToJSONKeyFunction where
511+ contramap = contramapToJSONKeyFunction
512+
486513-- | Contravariant map, as 'ToJSONKeyFunction' is a contravariant functor.
487514contramapToJSONKeyFunction :: (b -> a) -> ToJSONKeyFunction a -> ToJSONKeyFunction b
488515contramapToJSONKeyFunction h x = case x of
489516 ToJSONKeyText f g -> ToJSONKeyText (f . h) (g . h)
490517 ToJSONKeyValue f g -> ToJSONKeyValue (f . h) (g . h)
491518
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+
492542-------------------------------------------------------------------------------
493543-- Lifings of FromJSON and ToJSON to unary and binary type constructors
494544-------------------------------------------------------------------------------
@@ -653,11 +703,13 @@ instance (ToJSON a) => ToJSON [a] where
653703instance OVERLAPPABLE_ (GToJSON enc arity a) => GToJSON enc arity (M1 i c a) where
654704 -- Meta-information, which is not handled elsewhere, is ignored:
655705 gToJSON opts targs = gToJSON opts targs . unM1
706+ {-# INLINE gToJSON #-}
656707
657708instance GToJSON enc One Par1 where
658709 -- Direct occurrences of the last type parameter are encoded with the
659710 -- function passed in as an argument:
660711 gToJSON _opts (To1Args tj _) = tj . unPar1
712+ {-# INLINE gToJSON #-}
661713
662714instance ( ConsToJSON enc arity a
663715 , AllNullary (C1 c a) allNullary
@@ -670,11 +722,13 @@ instance ( ConsToJSON enc arity a
670722 . sumToJSON opts targs
671723 . unM1
672724 | otherwise = consToJSON opts targs . unM1 . unM1
725+ {-# INLINE gToJSON #-}
673726
674727instance (ConsToJSON enc arity a) => GToJSON enc arity (C1 c a) where
675728 -- Constructors need to be encoded differently depending on whether they're
676729 -- a record or not. This distinction is made by 'consToJSON':
677730 gToJSON opts targs = consToJSON opts targs . unM1
731+ {-# INLINE gToJSON #-}
678732
679733instance ( AllNullary (a :+: b) allNullary
680734 , SumToJSON enc arity (a :+: b) allNullary
@@ -685,6 +739,7 @@ instance ( AllNullary (a :+: b) allNullary
685739 -- strings. This distinction is made by 'sumToJSON':
686740 gToJSON opts targs = (unTagged :: Tagged allNullary enc -> enc)
687741 . sumToJSON opts targs
742+ {-# INLINE gToJSON #-}
688743
689744--------------------------------------------------------------------------------
690745-- Generic toJSON
@@ -693,18 +748,27 @@ instance ( AllNullary (a :+: b) allNullary
693748-- possible but makes error messages a bit harder to understand for missing
694749-- instances.
695750
751+instance GToJSON Value arity V1 where
752+ -- Empty values do not exist, which makes the job of formatting them
753+ -- rather easy:
754+ gToJSON _ _ x = x `seq` error "case: V1"
755+ {-# INLINE gToJSON #-}
756+
696757instance ToJSON a => GToJSON Value arity (K1 i a) where
697758 -- Constant values are encoded using their ToJSON instance:
698759 gToJSON _opts _ = toJSON . unK1
760+ {-# INLINE gToJSON #-}
699761
700762instance ToJSON1 f => GToJSON Value One (Rec1 f) where
701763 -- Recursive occurrences of the last type parameter are encoded using their
702764 -- ToJSON1 instance:
703765 gToJSON _opts (To1Args tj tjl) = liftToJSON tj tjl . unRec1
766+ {-# INLINE gToJSON #-}
704767
705768instance GToJSON Value arity U1 where
706769 -- Empty constructors are encoded to an empty array:
707770 gToJSON _opts _ _ = emptyArray
771+ {-# INLINE gToJSON #-}
708772
709773instance ( WriteProduct arity a, WriteProduct arity b
710774 , ProductSize a, ProductSize b
@@ -721,6 +785,7 @@ instance ( WriteProduct arity a, WriteProduct arity b
721785 where
722786 lenProduct = (unTagged2 :: Tagged2 (a :*: b) Int -> Int)
723787 productSize
788+ {-# INLINE gToJSON #-}
724789
725790instance ( ToJSON1 f
726791 , GToJSON Value One g
@@ -732,6 +797,7 @@ instance ( ToJSON1 f
732797 gToJSON opts targs =
733798 let gtj = gToJSON opts targs in
734799 liftToJSON gtj (listValue gtj) . unComp1
800+ {-# INLINE gToJSON #-}
735801
736802--------------------------------------------------------------------------------
737803-- Generic toEncoding
@@ -739,15 +805,18 @@ instance ( ToJSON1 f
739805instance ToJSON a => GToJSON Encoding arity (K1 i a) where
740806 -- Constant values are encoded using their ToJSON instance:
741807 gToJSON _opts _ = toEncoding . unK1
808+ {-# INLINE gToJSON #-}
742809
743810instance ToJSON1 f => GToJSON Encoding One (Rec1 f) where
744811 -- Recursive occurrences of the last type parameter are encoded using their
745812 -- ToEncoding1 instance:
746813 gToJSON _opts (To1Args te tel) = liftToEncoding te tel . unRec1
814+ {-# INLINE gToJSON #-}
747815
748816instance GToJSON Encoding arity U1 where
749817 -- Empty constructors are encoded to an empty array:
750818 gToJSON _opts _ _ = E.emptyArray_
819+ {-# INLINE gToJSON #-}
751820
752821instance ( EncodeProduct arity a
753822 , EncodeProduct arity b
@@ -757,6 +826,7 @@ instance ( EncodeProduct arity a
757826 -- the same size as the product and write the product's elements to it using
758827 -- 'encodeProduct':
759828 gToJSON opts targs p = E.list E.retagEncoding [encodeProduct opts targs p]
829+ {-# INLINE gToJSON #-}
760830
761831instance ( ToJSON1 f
762832 , GToJSON Encoding One g
@@ -768,6 +838,7 @@ instance ( ToJSON1 f
768838 gToJSON opts targs =
769839 let gte = gToJSON opts targs in
770840 liftToEncoding gte (listEncoding gte) . unComp1
841+ {-# INLINE gToJSON #-}
771842
772843--------------------------------------------------------------------------------
773844
@@ -851,14 +922,14 @@ instance ( IsRecord a isRecord
851922 , TaggedObject' enc pairs arity a isRecord
852923 , FromPairs enc pairs
853924 , FromString enc
854− , GKeyValue enc pairs
925+ , KeyValuePair enc pairs
855926 , Constructor c
856927 ) => TaggedObject enc arity (C1 c a)
857928 where
858929 taggedObject opts targs tagFieldName contentsFieldName =
859− fromPairs . (tag <>) . contents
930+ fromPairs . mappend tag . contents
860931 where
861− tag = tagFieldName `gPair`
932+ tag = tagFieldName `pair`
862933 (fromString (constructorTagModifier opts (conName (undefined :: t c a p)))
863934 :: enc)
864935 contents =
@@ -870,11 +941,11 @@ class TaggedObject' enc pairs arity f isRecord where
870941 -> String -> f a -> Tagged isRecord pairs
871942
872943instance ( GToJSON enc arity f
873− , GKeyValue enc pairs
944+ , KeyValuePair enc pairs
874945 ) => TaggedObject' enc pairs arity f False
875946 where
876947 taggedObject' opts targs contentsFieldName =
877− Tagged . (contentsFieldName `gPair`) . gToJSON opts targs
948+ Tagged . (contentsFieldName `pair`) . gToJSON opts targs
878949
879950instance OVERLAPPING_ Monoid pairs => TaggedObject' enc pairs arity U1 False where
880951 taggedObject' _ _ _ _ = Tagged mempty
@@ -897,6 +968,9 @@ instance (GetConName a, GetConName b) => GetConName (a :+: b) where
897968instance (Constructor c) => GetConName (C1 c a) where
898969 getConName = conName
899970
971+-- For genericToJSONKey
972+instance GetConName a => GetConName (D1 d a) where
973+ getConName (M1 x) = getConName x
900974
901975--------------------------------------------------------------------------------
902976
@@ -952,7 +1026,6 @@ class ConsToJSON enc arity f where
9521026
9531027class ConsToJSON' enc arity f isRecord where
9541028 consToJSON' :: Options -> ToArgs enc arity a
955− -> Bool -- ^ Are we a record with one field?
9561029 -> f a -> Tagged isRecord enc
9571030
9581031instance ( IsRecord f isRecord
@@ -961,23 +1034,29 @@ instance ( IsRecord f isRecord
9611034 where
9621035 consToJSON opts targs =
9631036 (unTagged :: Tagged isRecord enc -> enc)
964− . consToJSON' opts targs (isUnary (undefined :: f a))
1037+ . consToJSON' opts targs
9651038 {-# INLINE consToJSON #-}
9661039
967−instance ( RecordToPairs enc pairs arity f
1040+instance OVERLAPPING_
1041+ ( RecordToPairs enc pairs arity (S1 s f)
9681042 , FromPairs enc pairs
9691043 , GToJSON enc arity f
1044+ ) => ConsToJSON' enc arity (S1 s f) True
1045+ where
1046+ consToJSON' opts targs
1047+ | unwrapUnaryRecords opts = Tagged . gToJSON opts targs
1048+ | otherwise = Tagged . fromPairs . recordToPairs opts targs
1049+ {-# INLINE consToJSON' #-}
1050+
1051+instance ( RecordToPairs enc pairs arity f
1052+ , FromPairs enc pairs
9701053 ) => ConsToJSON' enc arity f True
9711054 where
972− consToJSON' opts targs isUn =
973− Tagged .
974− case (isUn, unwrapUnaryRecords opts) of
975− (True, True) -> gToJSON opts targs
976− _ -> fromPairs . recordToPairs opts targs
1055+ consToJSON' opts targs = Tagged . fromPairs . recordToPairs opts targs
9771056 {-# INLINE consToJSON' #-}
9781057
9791058instance GToJSON enc arity f => ConsToJSON' enc arity f False where
980− consToJSON' opts targs _ = Tagged . gToJSON opts targs
1059+ consToJSON' opts targs = Tagged . gToJSON opts targs
9811060 {-# INLINE consToJSON' #-}
9821061
9831062--------------------------------------------------------------------------------
@@ -995,7 +1074,7 @@ instance ( Monoid pairs
9951074 ) => RecordToPairs enc pairs arity (a :*: b)
9961075 where
9971076 recordToPairs opts (targs :: ToArgs enc arity p) (a :*: b) =
998− pairsOf a <> pairsOf b
1077+ pairsOf a `mappend` pairsOf b
9991078 where
10001079 pairsOf :: (RecordToPairs enc pairs arity f) => f p -> pairs
10011080 pairsOf = recordToPairs opts targs
@@ -1003,16 +1082,16 @@ instance ( Monoid pairs
10031082
10041083instance ( Selector s
10051084 , GToJSON enc arity a
1006− , GKeyValue enc pairs
1085+ , KeyValuePair enc pairs
10071086 ) => RecordToPairs enc pairs arity (S1 s a)
10081087 where
10091088 recordToPairs = fieldToPair
10101089 {-# INLINE recordToPairs #-}
10111090
1012−instance OVERLAPPING_
1091+instance INCOHERENT_
10131092 ( Selector s
10141093 , GToJSON enc arity (K1 i (Maybe a))
1015− , GKeyValue enc pairs
1094+ , KeyValuePair enc pairs
10161095 , Monoid pairs
10171096 ) => RecordToPairs enc pairs arity (S1 s (K1 i (Maybe a)))
10181097 where
@@ -1021,15 +1100,28 @@ instance OVERLAPPING_
10211100 recordToPairs opts targs m1 = fieldToPair opts targs m1
10221101 {-# INLINE recordToPairs #-}
10231102
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+
10241116fieldToPair :: (Selector s
10251117 , GToJSON enc arity a
1026− , GKeyValue enc pairs)
1118+ , KeyValuePair enc pairs)
10271119 => Options -> ToArgs enc arity p
10281120 -> S1 s a p -> pairs
10291121fieldToPair opts targs m1 =
10301122 let key = fieldLabelModifier opts (selName m1)
10311123 value = gToJSON opts targs (unM1 m1)
1032− in key `gPair` value
1124+ in key `pair` value
10331125{-# INLINE fieldToPair #-}
10341126
10351127--------------------------------------------------------------------------------
@@ -1053,10 +1145,12 @@ instance ( WriteProduct arity a
10531145 lenL = len `unsafeShiftR` 1
10541146 lenR = len - lenL
10551147 ixR = ix + lenL
1148+ {-# INLINE writeProduct #-}
10561149
10571150instance OVERLAPPABLE_ (GToJSON Value arity a) => WriteProduct arity a where
10581151 writeProduct opts targs mv ix _ =
10591152 VM.unsafeWrite mv ix . gToJSON opts targs
1153+ {-# INLINE writeProduct #-}
10601154
10611155--------------------------------------------------------------------------------
10621156
@@ -1074,21 +1168,23 @@ instance ( EncodeProduct arity a
10741168 encodeProduct opts targs (a :*: b) =
10751169 encodeProduct opts targs a >*<
10761170 encodeProduct opts targs b
1171+ {-# INLINE encodeProduct #-}
10771172
10781173instance OVERLAPPABLE_ (GToJSON Encoding arity a) => EncodeProduct arity a where
10791174 encodeProduct opts targs a = E.retagEncoding $ gToJSON opts targs a
1175+ {-# INLINE encodeProduct #-}
10801176
10811177--------------------------------------------------------------------------------
10821178
10831179instance ( GToJSON enc arity a
10841180 , ConsToJSON enc arity a
10851181 , FromPairs enc pairs
1086− , GKeyValue enc pairs
1182+ , KeyValuePair enc pairs
10871183 , Constructor c
10881184 ) => SumToJSON' ObjectWithSingleField enc arity (C1 c a)
10891185 where
10901186 sumToJSON' opts targs =
1091− Tagged . fromPairs . (typ `gPair`) . gToJSON opts targs
1187+ Tagged . fromPairs . (typ `pair`) . gToJSON opts targs
10921188 where
10931189 typ = constructorTagModifier opts $
10941190 conName (undefined :: t c a p)
@@ -1180,6 +1276,13 @@ instance (ToJSON a, ToJSON b) => ToJSON (Either a b) where
11801276 toEncoding = toEncoding2
11811277 {-# INLINE toEncoding #-}
11821278
1279+instance ToJSON Void where
1280+ toJSON = absurd
1281+ {-# INLINE toJSON #-}
1282+
1283+ toEncoding = absurd
1284+ {-# INLINE toEncoding #-}
1285+
11831286
11841287instance ToJSON Bool where
11851288 toJSON = Bool
@@ -1365,7 +1468,6 @@ instance ToJSONKey Int64 where
13651468 toJSONKey = toJSONKeyTextEnc E.int64Text
13661469 {-# INLINE toJSONKey #-}
13671470
1368−
13691471instance ToJSON Word where
13701472 toJSON = Number . fromIntegral
13711473 {-# INLINE toJSON #-}
@@ -1425,6 +1527,12 @@ instance ToJSONKey Word64 where
14251527 toJSONKey = toJSONKeyTextEnc E.word64Text
14261528 {-# INLINE toJSONKey #-}
14271529
1530+instance ToJSON CTime where
1531+ toJSON (CTime i) = toJSON i
1532+ {-# INLINE toJSON #-}
1533+
1534+ toEncoding (CTime i) = toEncoding i
1535+ {-# INLINE toEncoding #-}
14281536
14291537instance ToJSON Text where
14301538 toJSON = String
@@ -1858,6 +1966,32 @@ dotNetTime (DotNetTime t) = secs ++ formatMillis t ++ ")/"
18581966formatMillis :: (FormatTime t) => t -> String
18591967formatMillis = take 3 . formatTime defaultTimeLocale "%q"
18601968
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+
18611995-------------------------------------------------------------------------------
18621996-- time
18631997-------------------------------------------------------------------------------
@@ -1906,10 +2040,11 @@ stringEncoding :: Encoding' Text -> Value
19062040stringEncoding = String
19072041 . T.dropAround (== '"')
19082042 . T.decodeLatin1
1909− . lazyToStrictByteString
2043+ . L.toStrict
19102044 . E.encodingToLazyByteString
19112045{-# INLINE stringEncoding #-}
19122046
2047+
19132048instance ToJSON NominalDiffTime where
19142049 toJSON = Number . realToFrac
19152050 {-# INLINE toJSON #-}
@@ -1917,6 +2052,58 @@ instance ToJSON NominalDiffTime where
19172052 toEncoding = E.scientific . realToFrac
19182053 {-# INLINE toEncoding #-}
19192054
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+
19202107-------------------------------------------------------------------------------
19212108-- base Monoid/Semigroup
19222109-------------------------------------------------------------------------------
@@ -2660,47 +2847,26 @@ instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f, ToJSON g,
26602847 toEncoding = toEncoding2
26612848 {-# INLINE toEncoding #-}
26622849
2663−-------------------------------------------------------------------------------
2664−-- pre-bytestring-0.10 compatibility
2665−-------------------------------------------------------------------------------
2666−
2667−{-# INLINE lazyToStrictByteString #-}
2668−lazyToStrictByteString :: L.ByteString -> S.ByteString
2669−#if MIN_VERSION_bytestring(0,10,0)
2670−lazyToStrictByteString = L.toStrict
2671−#else
2672−lazyToStrictByteString = packChunks
2673−
2674−-- packChunks is taken from the blaze-builder package.
2675−
2676−-- | Pack the chunks of a lazy bytestring into a single strict bytestring.
2677−packChunks :: L.ByteString -> S.ByteString
2678−packChunks lbs =
2679− S.unsafeCreate (fromIntegral $ L.length lbs) (copyChunks lbs)
2680− where
2681− copyChunks L.Empty _pf = return ()
2682− copyChunks (L.Chunk (S.PS fpbuf o l) lbs') pf = do
2683− withForeignPtr fpbuf $ \pbuf ->
2684− copyBytes pf (pbuf `plusPtr` o) l
2685− copyChunks lbs' (pf `plusPtr` l)
2686−#endif
2687−
26882850--------------------------------------------------------------------------------
26892851
2852+-- | Wrap a list of pairs as an object.
26902853class Monoid pairs => FromPairs enc pairs | enc -> pairs where
26912854 fromPairs :: pairs -> enc
26922855
2693−instance FromPairs Encoding Series where
2856+instance (a ~ Value) => FromPairs (Encoding' a) Series where
26942857 fromPairs = E.pairs
26952858
26962859instance FromPairs Value (DList Pair) where
26972860 fromPairs = object . toList
26982861
2699−class Monoid kv => GKeyValue v kv where
2700− gPair :: String -> v -> kv
2862+-- | Like 'KeyValue' but the value is already converted to JSON
2863+-- ('Value' or 'Encoding'), and the result actually represents lists of pairs
2864+-- so it can be readily concatenated.
2865+class Monoid kv => KeyValuePair v kv where
2866+ pair :: String -> v -> kv
27012867
2702−instance ToJSON v => GKeyValue v (DList Pair) where
2703− gPair k v = DList.singleton (pack k .= v)
2868+instance (v ~ Value) => KeyValuePair v (DList Pair) where
2869+ pair k v = DList.singleton (pack k .= v)
27042870
2705−instance GKeyValue Encoding Series where
2706− gPair = E.pairStr
2871+instance (e ~ Encoding) => KeyValuePair e Series where
2872+ pair = E.pairStr
HLint.hsdeleted−10
@@ -1,10 +0,0 @@
1−module HLint.HLint where
2−
3−import "hint" HLint.Default
4−import "hint" HLint.Builtin.All
5−import "hint" HLint.Dollar
6−
7−ignore "Avoid lambda"
8−ignore "Eta reduce"
9−ignore "Functor law"
10−ignore "Use >=>"
Makefile+1−1
@@ -1,2 +1,2 @@
11lint:
2− hlint --cpp-include include/ --cpp-file .stack-work/dist/*/*Cabal-*/build/autogen/cabal_macros.h Data/ attoparsec-iso8601/ benchmarks/ examples/ ffi/ pure/ tests/
2+ ./run-hlint.sh --cpp-include include/ --cpp-file travis/cabal_macros.h Data/ attoparsec-iso8601/ benchmarks/ examples/ ffi/ pure/ tests/
README.markdown+1−2
@@ -24,5 +24,4 @@ See what's changed in recent (and upcoming) releases:
2424
2525# Authors
2626
27−This library is written and maintained by Bryan O'Sullivan,
28−<bos@serpentine.com>.
27+This library was originally written by Bryan O'Sullivan.
aeson.cabal+65−53
@@ -1,5 +1,5 @@
11name: aeson
2−version: 1.2.1.0
2+version: 1.4.6.0
33license: BSD3
44license-file: LICENSE
55category: Text, Web, JSON
@@ -21,20 +21,6 @@ description:
2121 To get started, see the documentation for the @Data.Aeson@ module
2222 below.
2323 .
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− .
3824 (A note on naming: in Greek mythology, Aeson was the father of Jason.)
3925
4026extra-source-files:
@@ -56,6 +42,7 @@ extra-source-files:
5642 include/*.h
5743 tests/JSONTestSuite/test_parsing/*.json
5844 tests/JSONTestSuite/test_transform/*.json
45+ tests/golden/*.expected
5946 pure/Data/Aeson/Parser/*.hs
6047
6148flag developer
@@ -89,6 +76,7 @@ library
8976 Data.Aeson.Text
9077 Data.Aeson.Types
9178 Data.Aeson.TH
79+ Data.Aeson.QQ.Simple
9280
9381 Data.Aeson.Encoding.Internal
9482 Data.Aeson.Internal
@@ -112,43 +100,59 @@ library
112100 Data.Attoparsec.Time
113101 Data.Attoparsec.Time.Internal
114102
103+ -- GHC bundled libs
115104 build-depends:
116− attoparsec >= 0.13.0.1,
117− base >= 4.5 && < 5,
118− base-compat >= 0.9.1 && < 0.10,
119− containers >= 0.4.2,
120− deepseq >= 1.3 && < 1.5,
121− dlist >= 0.6,
122− ghc-prim >= 0.2,
123− hashable >= 1.1.2.0,
124− scientific >= 0.3.4.7 && < 0.4,
125− tagged >=0.8.3 && <0.9,
126− template-haskell >= 2.7,
127− text >= 1.1.1.0,
128− th-abstraction >= 0.2.2 && < 0.3,
129− time >= 1.1.1.4,
130− time-locale-compat >= 0.1.1 && < 0.2,
131− unordered-containers >= 0.2.5.0 && < 0.3,
132− uuid-types >= 1.0.3 && <1.1,
133− vector >= 0.8
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
134113
135− if flag(bytestring-builder)
136− build-depends: bytestring >= 0.9.2 && < 0.10.4,
137− bytestring-builder >= 0.10.4 && < 1
138− else
139− build-depends: bytestring >= 0.10.4 && < 0.11
114+ if impl(ghc >= 8.0)
115+ build-depends: bytestring >= 0.10.8.1
116+
117+ -- Compat
118+ build-depends:
119+ base-compat >= 0.9.1 && < 0.12,
120+ time-compat >= 1.9.2.2 && < 1.10
121+
122+ if !impl(ghc >= 8.6)
123+ build-depends:
124+ contravariant >=1.4.1 && <1.6
140125
141126 if !impl(ghc >= 8.0)
142127 -- `Data.Semigroup` and `Control.Monad.Fail` and `Control.Monad.IO.Class` are available in base only since GHC 8.0 / base 4.9
143128 build-depends:
144− semigroups >= 0.18.2 && < 0.19,
145− transformers >= 0.2.2.0,
146− transformers-compat >= 0.3,
129+ semigroups >= 0.18.5 && < 0.20,
130+ transformers >= 0.3.0.0 && < 0.6,
131+ transformers-compat >= 0.6.2 && < 0.7,
147132 fail == 4.9.*
148133
149134 if !impl(ghc >= 7.10)
150135 -- `Numeric.Natural` is available in base only since GHC 7.10 / base 4.8
151− build-depends: nats >= 1 && < 1.2
136+ build-depends: nats >= 1.1.1 && < 1.2,
137+ void >= 0.7.2 && < 0.8
138+
139+ -- cannot use latest version
140+ build-depends:
141+ unordered-containers >= 0.2.8.0 && < 0.3,
142+
143+ -- not in LTS-12.10
144+ tagged >= 0.8.5 && < 0.9,
145+ primitive >= 0.6.3.0 && < 0.8
146+
147+ -- Other dependencies
148+ build-depends:
149+ attoparsec >= 0.13.2.2 && < 0.14,
150+ dlist >= 0.8.0.4 && < 0.9,
151+ hashable >= 1.2.7.0 && < 1.4,
152+ scientific >= 0.3.6.2 && < 0.4,
153+ th-abstraction >= 0.2.8.0 && < 0.4,
154+ uuid-types >= 1.0.3 && < 1.1,
155+ vector >= 0.12.0.1 && < 0.13
152156
153157 ghc-options: -Wall
154158
@@ -191,42 +195,49 @@ test-suite tests
191195 Functions
192196 Instances
193197 Options
198+ PropUtils
194199 Properties
200+ PropertyGeneric
201+ PropertyKeys
202+ PropertyRoundTrip
203+ PropertyRTFunctors
204+ PropertyTH
195205 SerializationFormatSpec
196206 Types
197207 UnitTests
198208 UnitTests.NullaryConstructors
199209
200210 build-depends:
201− HUnit,
202− QuickCheck >= 2.8 && <2.11,
211+ QuickCheck >= 2.10.0.1 && < 2.14,
203212 aeson,
204213 integer-logarithms >= 1 && <1.1,
205214 attoparsec,
206215 base,
207216 base-compat,
208− base-orphans >= 0.5.3 && <0.7,
217+ base-orphans >= 0.5.3 && <0.9,
209218 base16-bytestring,
210219 containers,
211220 directory,
212221 dlist,
222+ Diff >= 0.4 && < 0.5,
213223 filepath,
214− generic-deriving >= 1.10 && < 1.12,
224+ generic-deriving >= 1.10 && < 1.14,
215225 ghc-prim >= 0.2,
216226 hashable >= 1.2.4.0,
217227 scientific,
218228 tagged,
219229 template-haskell,
220− test-framework,
221− test-framework-hunit,
222− test-framework-quickcheck2,
230+ tasty,
231+ tasty-golden,
232+ tasty-hunit,
233+ tasty-quickcheck,
223234 text,
224235 time,
225− time-locale-compat,
236+ time-compat,
226237 unordered-containers,
227238 uuid-types,
228239 vector,
229− quickcheck-instances >=0.3.14
240+ quickcheck-instances >= 0.3.21 && <0.4
230241
231242 if flag(bytestring-builder)
232243 build-depends: bytestring >= 0.9 && < 0.10.4,
@@ -236,12 +247,13 @@ test-suite tests
236247
237248 if !impl(ghc >= 8.0)
238249 build-depends:
239− semigroups >= 0.18.2 && < 0.19,
250+ semigroups >= 0.18.2 && < 0.20,
240251 transformers >= 0.2.2.0,
241252 transformers-compat >= 0.3
242253
243254 if !impl(ghc >= 7.10)
244− build-depends: nats >=1 && <1.2
255+ build-depends: nats >=1 && <1.2,
256+ void >=0.7.2 && <0.8
245257
246258 if impl(ghc >= 7.8)
247259 build-depends: hashable-time >= 0.2 && <0.3
attoparsec-iso8601/Data/Attoparsec/Time.hs+4−5
@@ -1,6 +1,6 @@
11{-# LANGUAGE BangPatterns #-}
2+{-# LANGUAGE NoImplicitPrelude #-}
23{-# LANGUAGE ScopedTypeVariables #-}
3−
44-- |
55-- Module: Data.Aeson.Parser.Time
66-- Copyright: (c) 2015-2016 Bryan O'Sullivan
@@ -21,7 +21,6 @@ module Data.Attoparsec.Time
2121 , zonedTime
2222 ) where
2323
24−import Prelude ()
2524import Prelude.Compat
2625
2726import Control.Applicative ((<|>))
@@ -42,9 +41,9 @@ import qualified Data.Time.LocalTime as Local
4241day :: Parser Day
4342day = do
4443 absOrNeg <- negate <$ char '-' <|> id <$ char '+' <|> pure id
45− y <- decimal <* char '-'
46− m <- twoDigits <* char '-'
47− d <- twoDigits
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"
4847 maybe (fail "invalid date") return (fromGregorianValid (absOrNeg y) m d)
4948
5049-- | Parse a two-digit integer (e.g. day of month, hour).
attoparsec-iso8601/Data/Attoparsec/Time/Internal.hs+21−18
@@ -1,5 +1,5 @@
11{-# LANGUAGE CPP #-}
2−
2+{-# LANGUAGE NoImplicitPrelude #-}
33-- |
44-- Module: Data.Aeson.Internal.Time
55-- Copyright: (c) 2015-2016 Bryan O'Sullivan
@@ -17,45 +17,48 @@ module Data.Attoparsec.Time.Internal
1717 , toTimeOfDay64
1818 ) where
1919
20−import Prelude ()
2120import Prelude.Compat
2221
2322import Data.Int (Int64)
2423import Data.Time
2524import Unsafe.Coerce (unsafeCoerce)
2625
27−#if MIN_VERSION_base(4,7,0)
26+#if MIN_VERSION_time(1,6,0)
2827
29−import Data.Fixed (Pico, Fixed(MkFixed))
28+import Data.Time.Clock (diffTimeToPicoseconds)
3029
31−toPico :: Integer -> Pico
32−toPico = MkFixed
30+#endif
3331
34−fromPico :: Pico -> Integer
35−fromPico (MkFixed i) = i
32+import Data.Fixed (Pico, Fixed(MkFixed))
3633
37−#else
34+#if !MIN_VERSION_time(1,6,0)
3835
39−import Data.Fixed (Pico)
36+diffTimeToPicoseconds :: DiffTime -> Integer
37+diffTimeToPicoseconds = unsafeCoerce
38+
39+#endif
4040
4141toPico :: Integer -> Pico
42−toPico = unsafeCoerce
42+toPico = MkFixed
4343
4444fromPico :: Pico -> Integer
45−fromPico = unsafeCoerce
46−
47−#endif
45+fromPico (MkFixed i) = i
4846
4947-- | Like TimeOfDay, but using a fixed-width integer for seconds.
5048data TimeOfDay64 = TOD {-# UNPACK #-} !Int
5149 {-# UNPACK #-} !Int
5250 {-# UNPACK #-} !Int64
5351
52+posixDayLength :: DiffTime
53+posixDayLength = 86400
54+
5455diffTimeOfDay64 :: 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
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
5962
6063toTimeOfDay64 :: TimeOfDay -> TimeOfDay64
6164toTimeOfDay64 (TimeOfDay h m s) = TOD h m (fromIntegral (fromPico s))
attoparsec-iso8601/attoparsec-iso8601.cabal+3−3
@@ -1,5 +1,5 @@
11name: attoparsec-iso8601
2−version: 1.0.0.0
2+version: 1.0.1.0
33synopsis: Parsing of ISO 8601 dates, originally from aeson.
44description: Parsing of ISO 8601 dates, originally from aeson.
55license: BSD3
@@ -36,8 +36,8 @@ library
3636 Data.Attoparsec.Time
3737 build-depends:
3838 attoparsec >= 0.13.0.1,
39− base >= 4.5 && < 5,
40− base-compat >= 0.9.1 && < 0.10,
39+ base >= 4.7 && < 5,
40+ base-compat >= 0.9.1 && < 0.12,
4141 text >= 1.1.1.0,
4242 time >= 1.1.1.4
4343
attoparsec-iso8601/changelog.mdnew file+5
@@ -0,0 +1,5 @@
1+For the latest version of this document, please see [https://github.com/bos/aeson/blob/master/attoparsec-iso8601/changelog.md](https://github.com/bos/aeson/blob/master/attoparsec-iso8601/changelog.md).
2+
3+### 1.0.1.0
4+
5+* Fixes handling of `UTCTime` wrt. leap seconds , thanks to Adam Schønemann
benchmarks/AesonCompareAutoInstances.hsdeleted−282
@@ -1,282 +0,0 @@
1−{-# LANGUAGE DeriveGeneric #-}
2−{-# LANGUAGE FlexibleContexts #-}
3−{-# LANGUAGE TemplateHaskell #-}
4−
5−module Main (main) where
6−
7−import Prelude ()
8−import Prelude.Compat
9−
10−import Control.Monad
11−import Control.DeepSeq (NFData, rnf, deepseq)
12−import Criterion.Main hiding (defaultOptions)
13−import Data.Aeson
14−import Data.Aeson.Encoding
15−import Data.Aeson.TH
16−import Data.Aeson.Types
17−import Data.ByteString.Lazy (ByteString)
18−import Data.Data (Data)
19−import Data.Typeable (Typeable)
20−import GHC.Generics (Generic, Rep)
21−import Options
22−
23−toBS :: Encoding -> ByteString
24−toBS = encodingToLazyByteString
25−
26−gEncode :: (Generic a, GToEncoding Zero (Rep a)) => a -> ByteString
27−gEncode = toBS . genericToEncoding opts
28−
29−--------------------------------------------------------------------------------
30−
31−data D a = Nullary
32− | Unary Int
33− | Product String Char a
34− | Record { testOne :: Double
35− , testTwo :: Bool
36− , testThree :: D a
37− }
38− deriving (Show, Eq)
39−
40−deriveJSON opts ''D
41−
42−instance NFData a => NFData (D a) where
43− rnf Nullary = ()
44− rnf (Unary n) = rnf n
45− rnf (Product s c x) = s `deepseq` c `deepseq` rnf x
46− rnf (Record d b y) = d `deepseq` b `deepseq` rnf y
47−
48−type T = D (D (D ()))
49−
50−d :: T
51−d = Record
52− { testOne = 1234.56789
53− , testTwo = True
54− , testThree = Product "Hello World!" 'a'
55− Record
56− { testOne = 9876.54321
57− , testTwo = False
58− , testThree = Product "Yeehaa!!!" '\n' Nullary
59− }
60− }
61−
62−--------------------------------------------------------------------------------
63−
64−data D' a = Nullary'
65− | Unary' Int
66− | Product' String Char a
67− | Record' { testOne' :: Double
68− , testTwo' :: Bool
69− , testThree' :: D' a
70− }
71− deriving (Show, Eq, Generic)
72−
73−instance ToJSON a => ToJSON (D' a) where
74− toJSON = genericToJSON opts
75−
76−instance FromJSON a => FromJSON (D' a) where
77− parseJSON = genericParseJSON opts
78−
79−instance NFData a => NFData (D' a) where
80− rnf Nullary' = ()
81− rnf (Unary' n) = rnf n
82− rnf (Product' s c x) = s `deepseq` c `deepseq` rnf x
83− rnf (Record' d b y) = d `deepseq` b `deepseq` rnf y
84−
85−type T' = D' (D' (D' ()))
86−
87−d' :: T'
88−d' = Record'
89− { testOne' = 1234.56789
90− , testTwo' = True
91− , testThree' = Product' "Hello World!" 'a'
92− Record'
93− { testOne' = 9876.54321
94− , testTwo' = False
95− , testThree' = Product' "Yeehaa!!!" '\n' Nullary'
96− }
97− }
98−
99−--------------------------------------------------------------------------------
100−
101−data BigRecord = BigRecord
102− { field01 :: !Int, field02 :: !Int, field03 :: !Int, field04 :: !Int, field05 :: !Int
103− , field06 :: !Int, field07 :: !Int, field08 :: !Int, field09 :: !Int, field10 :: !Int
104− , field11 :: !Int, field12 :: !Int, field13 :: !Int, field14 :: !Int, field15 :: !Int
105− , field16 :: !Int, field17 :: !Int, field18 :: !Int, field19 :: !Int, field20 :: !Int
106− , field21 :: !Int, field22 :: !Int, field23 :: !Int, field24 :: !Int, field25 :: !Int
107− } deriving (Show, Eq, Generic)
108−
109−instance NFData BigRecord
110−
111−bigRecord = BigRecord 1 2 3 4 5
112− 6 7 8 9 10
113− 11 12 13 14 15
114− 16 17 18 19 20
115− 21 22 23 24 25
116−
117−return []
118−
119−gBigRecordToJSON :: BigRecord -> Value
120−gBigRecordToJSON = genericToJSON opts
121−
122−gBigRecordEncode :: BigRecord -> ByteString
123−gBigRecordEncode = gEncode
124−
125−gBigRecordFromJSON :: Value -> Result BigRecord
126−gBigRecordFromJSON = parse $ genericParseJSON opts
127−
128−thBigRecordToJSON :: BigRecord -> Value
129−thBigRecordToJSON = $(mkToJSON opts ''BigRecord)
130−
131−thBigRecordEncode :: BigRecord -> ByteString
132−thBigRecordEncode = toBS . $(mkToEncoding opts ''BigRecord)
133−
134−thBigRecordFromJSON :: Value -> Result BigRecord
135−thBigRecordFromJSON = parse $(mkParseJSON opts ''BigRecord)
136−
137−--------------------------------------------------------------------------------
138−
139−data BigProduct = BigProduct
140− !Int !Int !Int !Int !Int
141− !Int !Int !Int !Int !Int
142− !Int !Int !Int !Int !Int
143− !Int !Int !Int !Int !Int
144− !Int !Int !Int !Int !Int
145− deriving (Show, Eq, Generic)
146−
147−instance NFData BigProduct
148−
149−bigProduct = BigProduct 1 2 3 4 5
150− 6 7 8 9 10
151− 11 12 13 14 15
152− 16 17 18 19 20
153− 21 22 23 24 25
154−
155−return []
156−
157−gBigProductToJSON :: BigProduct -> Value
158−gBigProductToJSON = genericToJSON opts
159−
160−gBigProductEncode :: BigProduct -> ByteString
161−gBigProductEncode = gEncode
162−
163−gBigProductFromJSON :: Value -> Result BigProduct
164−gBigProductFromJSON = parse $ genericParseJSON opts
165−
166−thBigProductToJSON :: BigProduct -> Value
167−thBigProductToJSON = $(mkToJSON opts ''BigProduct)
168−
169−thBigProductEncode :: BigProduct -> ByteString
170−thBigProductEncode = toBS . $(mkToEncoding opts ''BigProduct)
171−
172−thBigProductFromJSON :: Value -> Result BigProduct
173−thBigProductFromJSON = parse $(mkParseJSON opts ''BigProduct)
174−
175−--------------------------------------------------------------------------------
176−
177−data BigSum = F01 | F02 | F03 | F04 | F05
178− | F06 | F07 | F08 | F09 | F10
179− | F11 | F12 | F13 | F14 | F15
180− | F16 | F17 | F18 | F19 | F20
181− | F21 | F22 | F23 | F24 | F25
182− deriving (Show, Eq, Generic)
183−
184−instance NFData BigSum
185−
186−bigSum = F25
187−
188−return []
189−
190−gBigSumToJSON :: BigSum -> Value
191−gBigSumToJSON = genericToJSON opts
192−
193−gBigSumEncode :: BigSum -> ByteString
194−gBigSumEncode = gEncode
195−
196−gBigSumFromJSON :: Value -> Result BigSum
197−gBigSumFromJSON = parse $ genericParseJSON opts
198−
199−thBigSumToJSON :: BigSum -> Value
200−thBigSumToJSON = $(mkToJSON opts ''BigSum)
201−
202−thBigSumEncode :: BigSum -> ByteString
203−thBigSumEncode = toBS . $(mkToEncoding opts ''BigSum)
204−
205−thBigSumFromJSON :: Value -> Result BigSum
206−thBigSumFromJSON = parse $(mkParseJSON opts ''BigSum)
207−
208−--------------------------------------------------------------------------------
209−
210−type FJ a = Value -> Result a
211−
212−runBench :: IO ()
213−runBench = defaultMain
214− [ let v = toJSON d
215− in (d, d', v) `deepseq`
216− bgroup "D"
217− [ group "toJSON" (nf toJSON d)
218− (nf toJSON d')
219− , group "encode" (nf encode d)
220− (nf encode d')
221− , group "fromJSON" (nf ( fromJSON :: FJ T ) v)
222− (nf ( fromJSON :: FJ T') v)
223− ]
224− , let v = thBigRecordToJSON bigRecord
225− in bigRecord `deepseq` v `deepseq`
226− bgroup "BigRecord"
227− [ group "toJSON" (nf thBigRecordToJSON bigRecord)
228− (nf gBigRecordToJSON bigRecord)
229− , group "encode" (nf thBigRecordEncode bigRecord)
230− (nf gBigRecordEncode bigRecord)
231− , group "fromJSON" (nf (thBigRecordFromJSON :: FJ BigRecord) v)
232− (nf ( gBigRecordFromJSON :: FJ BigRecord) v)
233− ]
234− , let v = thBigProductToJSON bigProduct
235− in bigProduct `deepseq` v `deepseq`
236− bgroup "BigProduct"
237− [ group "toJSON" (nf thBigProductToJSON bigProduct)
238− (nf gBigProductToJSON bigProduct)
239− , group "encode" (nf thBigProductEncode bigProduct)
240− (nf gBigProductEncode bigProduct)
241− , group "fromJSON" (nf (thBigProductFromJSON :: FJ BigProduct) v)
242− (nf (gBigProductFromJSON :: FJ BigProduct) v)
243− ]
244− , let v = thBigSumToJSON bigSum
245− in bigSum `deepseq` v `deepseq`
246− bgroup "BigSum"
247− [ group "toJSON" (nf thBigSumToJSON bigSum)
248− (nf gBigSumToJSON bigSum)
249− , group "encode" (nf thBigSumEncode bigSum)
250− (nf gBigSumEncode bigSum)
251− , group "fromJSON" (nf (thBigSumFromJSON :: FJ BigSum) v)
252− (nf (gBigSumFromJSON :: FJ BigSum) v)
253− ]
254− ]
255−
256−group n th gen = bgroup n [ bench "th" th
257− , bench "generic" gen
258− ]
259−
260−sanityCheck = do
261− check d toJSON fromJSON encode
262− check d' toJSON fromJSON encode
263− check bigRecord thBigRecordToJSON thBigRecordFromJSON thBigRecordEncode
264− check bigRecord gBigRecordToJSON gBigRecordFromJSON gBigRecordEncode
265− check bigProduct thBigProductToJSON thBigProductFromJSON thBigProductEncode
266− check bigProduct gBigProductToJSON gBigProductFromJSON gBigProductEncode
267− check bigSum thBigSumToJSON thBigSumFromJSON thBigSumEncode
268− check bigSum gBigSumToJSON gBigSumFromJSON gBigSumEncode
269−
270−check :: (Show a, Eq a)
271− => a -> (a -> Value) -> (Value -> Result a) -> (a -> ByteString) -> IO ()
272−check x toJSON fromJSON encode = do
273− unless (Success x == (fromJSON . toJSON) x) $ fail $ "toJSON: " ++ show x
274− unless (Success x == (decode' . encode) x) $ fail $ "encode: " ++ show x
275− where
276− decode' s = case decode s of
277− Just v -> fromJSON v
278− Nothing -> fail ""
279−
280−main = do
281− sanityCheck
282− runBench
benchmarks/AesonEncode.hs+2−2
@@ -1,13 +1,13 @@
11{-# LANGUAGE BangPatterns #-}
2+{-# LANGUAGE NoImplicitPrelude #-}
23{-# LANGUAGE OverloadedStrings #-}
34
45module Main (main) where
56
6−import Prelude ()
77import Prelude.Compat
88
99import Control.DeepSeq
10−import Control.Monad
10+import Control.Monad (forM_)
1111import Data.Aeson
1212import Data.Attoparsec.ByteString (IResult(..), parseWith)
1313import Data.Char (isDigit)
benchmarks/AesonFoldable.hs+14−42
@@ -1,16 +1,14 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
12{-# LANGUAGE OverloadedStrings #-}
2−{-# LANGUAGE PackageImports #-}
33
44module Main (main) where
55
66import Criterion.Main
77
8−import Prelude ()
98import Prelude.Compat
109
1110import Data.Foldable (toList)
12−import qualified "aeson" Data.Aeson as A
13−import qualified "aeson-benchmarks" Data.Aeson as B
11+import qualified Data.Aeson as A
1412import qualified Data.Sequence as S
1513import qualified Data.Vector as V
1614import qualified Data.Vector.Unboxed as U
@@ -21,10 +19,6 @@ import qualified Data.Vector.Unboxed as U
2119
2220newtype L f = L { getL :: f Int }
2321
24−instance Foldable f => B.ToJSON (L f) where
25− toJSON = error "do not use this"
26− toEncoding = B.toEncoding . toList . getL
27−
2822instance Foldable f => A.ToJSON (L f) where
2923 toJSON = error "do not use this"
3024 toEncoding = A.toEncoding . toList . getL
@@ -35,10 +29,6 @@ instance Foldable f => A.ToJSON (L f) where
3529
3630newtype F f = F { getF :: f Int }
3731
38−instance Foldable f => B.ToJSON (F f) where
39− toJSON = error "do not use this"
40− toEncoding = B.foldable . getF
41−
4232instance Foldable f => A.ToJSON (F f) where
4333 toJSON = error "do not use this"
4434 toEncoding = A.foldable . getF
@@ -63,52 +53,34 @@ valueUVector = U.fromList valueList
6353-- Main
6454-------------------------------------------------------------------------------
6555
66−benchEncodeA
56+benchEncode
6757 :: A.ToJSON a
6858 => String
6959 -> a
7060 -> Benchmark
71−benchEncodeA name val
61+benchEncode name val
7262 = bench ("A " ++ name) $ nf A.encode val
7363
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−
8264main :: IO ()
8365main = defaultMain
8466 [ bgroup "encode"
8567 [ bgroup "List"
86− [ benchEncodeB "-" valueList
87− , benchEncodeB "L" $ L valueList
88− , benchEncodeB "F" $ F valueList
89− , benchEncodeA "-" valueList
90− , benchEncodeA "L" $ L valueList
91− , benchEncodeA "F" $ F valueList
68+ [ benchEncode "-" valueList
69+ , benchEncode "L" $ L valueList
70+ , benchEncode "F" $ F valueList
9271 ]
9372 , bgroup "Seq"
94− [ benchEncodeB "-" valueSeq
95− , benchEncodeB "L" $ L valueSeq
96− , benchEncodeB "F" $ F valueSeq
97− , benchEncodeA "-" valueSeq
98− , benchEncodeA "L" $ L valueSeq
99− , benchEncodeA "F" $ F valueSeq
73+ [ benchEncode "-" valueSeq
74+ , benchEncode "L" $ L valueSeq
75+ , benchEncode "F" $ F valueSeq
10076 ]
10177 , bgroup "Vector"
102− [ benchEncodeB "-" valueVector
103− , benchEncodeB "L" $ L valueVector
104− , benchEncodeB "F" $ F valueVector
105− , benchEncodeA "-" valueVector
106− , benchEncodeA "L" $ L valueVector
107− , benchEncodeA "F" $ F valueVector
78+ [ benchEncode "-" valueVector
79+ , benchEncode "L" $ L valueVector
80+ , benchEncode "F" $ F valueVector
10881 ]
10982 , bgroup "Vector.Unboxed"
110− [ benchEncodeB "-" valueUVector
111− , benchEncodeA "-" valueUVector
83+ [ benchEncode "-" valueUVector
11284 ]
11385 ]
11486 ]
benchmarks/AesonMap.hs+39−56
@@ -1,13 +1,11 @@
11{-# LANGUAGE FlexibleContexts #-}
2−{-# LANGUAGE OverloadedStrings #-}
3−{-# LANGUAGE PackageImports #-}
2+{-# LANGUAGE NoImplicitPrelude #-}
43{-# LANGUAGE RankNTypes #-}
54
65{-# OPTIONS_GHC -fno-warn-orphans #-}
76
87module Main (main) where
98
10−import Prelude ()
119import Prelude.Compat
1210
1311import Control.DeepSeq
@@ -15,9 +13,8 @@ import Criterion.Main
1513import Data.Hashable
1614import Data.Proxy (Proxy (..))
1715import Data.Tagged (Tagged (..))
18−import qualified "aeson" Data.Aeson as A
19−import qualified "aeson-benchmarks" Data.Aeson as B
20−import qualified "aeson-benchmarks" Data.Aeson.Types as B (fromJSONKeyCoerce)
16+import Data.Aeson
17+import Data.Aeson.Types (fromJSONKeyCoerce)
2118import qualified Data.ByteString.Lazy as LBS
2219import qualified Data.HashMap.Strict as HM
2320import qualified Data.Map as M
@@ -47,10 +44,10 @@ instance NFData T1 where
4744instance Hashable T1 where
4845 hashWithSalt salt (T1 t) = hashWithSalt salt t
4946
50−instance B.FromJSON T1 where
51− parseJSON = B.withText "T1" $ pure . T1
52−instance B.FromJSONKey T1 where
53− fromJSONKey = B.FromJSONKeyText T1
47+instance FromJSON T1 where
48+ parseJSON = withText "T1" $ pure . T1
49+instance FromJSONKey T1 where
50+ fromJSONKey = FromJSONKeyText T1
5451
5552-------------------------------------------------------------------------------
5653-- Coerce
@@ -64,10 +61,10 @@ instance NFData T2 where
6461instance Hashable T2 where
6562 hashWithSalt salt (T2 t) = hashWithSalt salt t
6663
67−instance B.FromJSON T2 where
68− parseJSON = B.withText "T2" $ pure . T2
69−instance B.FromJSONKey T2 where
70− fromJSONKey = B.fromJSONKeyCoerce
64+instance FromJSON T2 where
65+ parseJSON = withText "T2" $ pure . T2
66+instance FromJSONKey T2 where
67+ fromJSONKey = fromJSONKeyCoerce
7168
7269-------------------------------------------------------------------------------
7370-- TextParser
@@ -81,10 +78,10 @@ instance NFData T3 where
8178instance Hashable T3 where
8279 hashWithSalt salt (T3 t) = hashWithSalt salt t
8380
84−instance B.FromJSON T3 where
85− parseJSON = B.withText "T3" $ pure . T3
86−instance B.FromJSONKey T3 where
87− fromJSONKey = B.FromJSONKeyTextParser (pure . T3)
81+instance FromJSON T3 where
82+ parseJSON = withText "T3" $ pure . T3
83+instance FromJSONKey T3 where
84+ fromJSONKey = FromJSONKeyTextParser (pure . T3)
8885
8986-------------------------------------------------------------------------------
9087-- Values
@@ -97,40 +94,30 @@ value1000 = value 1000
9794value10000 = value 10000
9895
9996encodedValue10 :: LBS.ByteString
100−encodedValue10 = B.encode value10
97+encodedValue10 = encode value10
10198
10299encodedValue100 :: LBS.ByteString
103−encodedValue100 = B.encode value100
100+encodedValue100 = encode value100
104101
105102encodedValue1000 :: LBS.ByteString
106−encodedValue1000 = B.encode value1000
103+encodedValue1000 = encode value1000
107104
108105encodedValue10000 :: LBS.ByteString
109−encodedValue10000 = B.encode value10000
106+encodedValue10000 = encode value10000
110107
111108-------------------------------------------------------------------------------
112109-- Helpers
113110-------------------------------------------------------------------------------
114111
115−decodeHMB
116− :: (B.FromJSONKey k, Eq k, Hashable k)
112+decodeHM
113+ :: (FromJSON (HM.HashMap k T.Text), Eq k, Hashable k)
117114 => Proxy k -> LBS.ByteString -> Maybe (HM.HashMap k T.Text)
118−decodeHMB _ = B.decode
115+decodeHM _ = decode
119116
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
131− :: (A.FromJSON (M.Map k T.Text), Ord k)
117+decodeMap
118+ :: (FromJSON (M.Map k T.Text), Ord k)
132119 => Proxy k -> LBS.ByteString -> Maybe (M.Map k T.Text)
133−decodeMapA _ = A.decode
120+decodeMap _ = decode
134121
135122proxyText :: Proxy T.Text
136123proxyText = Proxy
@@ -156,15 +143,14 @@ benchDecodeHM
156143 -> LBS.ByteString
157144 -> Benchmark
158145benchDecodeHM name val = bgroup name
159− [ bench "Text" $ nf (decodeHMB proxyText) val
160− , bench "Identity" $ nf (decodeHMB proxyT1) val
161− , bench "Coerce" $ nf (decodeHMB proxyT2) val
162− , bench "Parser" $ nf (decodeHMB proxyT3) val
163− , bench "aeson-hackage" $ nf (decodeHMA proxyText) val
164− , bench "Tagged Text" $ nf (decodeHMB $ proxyTagged proxyText) val
165− , bench "Tagged Identity" $ nf (decodeHMB $ proxyTagged proxyT1) val
166− , bench "Tagged Coerce" $ nf (decodeHMB $ proxyTagged proxyT2) val
167− , bench "Tagged Parser" $ nf (decodeHMB $ proxyTagged proxyT3) val
146+ [ bench "Text" $ nf (decodeHM proxyText) val
147+ , bench "Identity" $ nf (decodeHM proxyT1) val
148+ , bench "Coerce" $ nf (decodeHM proxyT2) val
149+ , bench "Parser" $ nf (decodeHM proxyT3) val
150+ , bench "Tagged Text" $ nf (decodeHM $ proxyTagged proxyText) val
151+ , bench "Tagged Identity" $ nf (decodeHM $ proxyTagged proxyT1) val
152+ , bench "Tagged Coerce" $ nf (decodeHM $ proxyTagged proxyT2) val
153+ , bench "Tagged Parser" $ nf (decodeHM $ proxyTagged proxyT3) val
168154 ]
169155
170156benchDecodeMap
@@ -172,11 +158,10 @@ benchDecodeMap
172158 -> LBS.ByteString
173159 -> Benchmark
174160benchDecodeMap name val = bgroup name
175− [ bench "Text" $ nf (decodeMapB proxyText) val
176− , bench "Identity" $ nf (decodeMapB proxyT1) val
177− , bench "Coerce" $ nf (decodeMapB proxyT2) val
178− , bench "Parser" $ nf (decodeMapB proxyT3) val
179− , bench "aeson-hackage" $ nf (decodeMapA proxyText) val
161+ [ bench "Text" $ nf (decodeMap proxyText) val
162+ , bench "Identity" $ nf (decodeMap proxyT1) val
163+ , bench "Coerce" $ nf (decodeMap proxyT2) val
164+ , bench "Parser" $ nf (decodeMap proxyT3) val
180165 ]
181166
182167benchEncodeHM
@@ -184,8 +169,7 @@ benchEncodeHM
184169 -> HM.HashMap T.Text T.Text
185170 -> Benchmark
186171benchEncodeHM name val = bgroup name
187− [ bench "Text" $ nf B.encode val
188− , bench "aeson-0.11" $ nf A.encode val
172+ [ bench "Text" $ nf encode val
189173 ]
190174
191175benchEncodeMap
@@ -193,8 +177,7 @@ benchEncodeMap
193177 -> HM.HashMap T.Text T.Text
194178 -> Benchmark
195179benchEncodeMap name val = bgroup name
196− [ bench "Text" $ nf B.encode val'
197− , bench "aeson-0.11" $ nf A.encode val'
180+ [ bench "Text" $ nf encode val'
198181 ]
199182 where
200183 val' :: M.Map T.Text T.Text
benchmarks/AesonParse.hs+2−3
@@ -1,13 +1,12 @@
11{-# LANGUAGE BangPatterns #-}
2+{-# LANGUAGE NoImplicitPrelude #-}
23{-# LANGUAGE OverloadedStrings #-}
3−{-# LANGUAGE PackageImports #-}
44
55module Main (main) where
66
7−import Prelude ()
87import Prelude.Compat
98
10−import "aeson-benchmarks" Data.Aeson
9+import Data.Aeson
1110import Control.Monad
1211import Data.Attoparsec.ByteString (IResult(..), parseWith)
1312import Data.Time.Clock
benchmarks/AesonTuples.hs+2−1
@@ -1,6 +1,7 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
13module Main (main) where
24
3−import Prelude ()
45import Prelude.Compat
56
67import Control.DeepSeq (deepseq)
benchmarks/Auto/G/BigProduct.hsnew file+33
@@ -0,0 +1,33 @@
1+{-# LANGUAGE DeriveGeneric #-}
2+
3+module Auto.G.BigProduct where
4+
5+import Control.DeepSeq
6+import Data.Aeson
7+import GHC.Generics (Generic)
8+import Options
9+
10+data BigProduct = BigProduct
11+ !Int !Int !Int !Int !Int
12+ !Int !Int !Int !Int !Int
13+ !Int !Int !Int !Int !Int
14+ !Int !Int !Int !Int !Int
15+ !Int !Int !Int !Int !Int
16+ deriving (Show, Eq, Generic)
17+
18+instance NFData BigProduct where
19+ rnf a = a `seq` ()
20+
21+instance ToJSON BigProduct where
22+ toJSON = genericToJSON opts
23+ toEncoding = genericToEncoding opts
24+
25+instance FromJSON BigProduct where
26+ parseJSON = genericParseJSON opts
27+
28+bigProduct :: BigProduct
29+bigProduct = BigProduct 1 2 3 4 5
30+ 6 7 8 9 10
31+ 11 12 13 14 15
32+ 16 17 18 19 20
33+ 21 22 23 24 25
benchmarks/Auto/G/BigRecord.hsnew file+33
@@ -0,0 +1,33 @@
1+{-# LANGUAGE DeriveGeneric #-}
2+
3+module Auto.G.BigRecord where
4+
5+import Control.DeepSeq
6+import Data.Aeson
7+import GHC.Generics (Generic)
8+import Options
9+
10+data BigRecord = BigRecord
11+ { field01 :: !Int, field02 :: !Int, field03 :: !Int, field04 :: !Int, field05 :: !Int
12+ , field06 :: !Int, field07 :: !Int, field08 :: !Int, field09 :: !Int, field10 :: !Int
13+ , field11 :: !Int, field12 :: !Int, field13 :: !Int, field14 :: !Int, field15 :: !Int
14+ , field16 :: !Int, field17 :: !Int, field18 :: !Int, field19 :: !Int, field20 :: !Int
15+ , field21 :: !Int, field22 :: !Int, field23 :: !Int, field24 :: !Int, field25 :: !Int
16+ } deriving (Show, Eq, Generic)
17+
18+instance NFData BigRecord where
19+ rnf a = a `seq` ()
20+
21+instance ToJSON BigRecord where
22+ toJSON = genericToJSON opts
23+ toEncoding = genericToEncoding opts
24+
25+instance FromJSON BigRecord where
26+ parseJSON = genericParseJSON opts
27+
28+bigRecord :: BigRecord
29+bigRecord = BigRecord 1 2 3 4 5
30+ 6 7 8 9 10
31+ 11 12 13 14 15
32+ 16 17 18 19 20
33+ 21 22 23 24 25
benchmarks/Auto/G/BigSum.hsnew file+28
@@ -0,0 +1,28 @@
1+{-# LANGUAGE DeriveGeneric #-}
2+
3+module Auto.G.BigSum where
4+
5+import Control.DeepSeq
6+import Data.Aeson
7+import GHC.Generics (Generic)
8+import Options
9+
10+data BigSum = F01 | F02 | F03 | F04 | F05
11+ | F06 | F07 | F08 | F09 | F10
12+ | F11 | F12 | F13 | F14 | F15
13+ | F16 | F17 | F18 | F19 | F20
14+ | F21 | F22 | F23 | F24 | F25
15+ deriving (Show, Eq, Generic)
16+
17+instance NFData BigSum where
18+ rnf a = a `seq` ()
19+
20+instance ToJSON BigSum where
21+ toJSON = genericToJSON opts
22+ toEncoding = genericToEncoding opts
23+
24+instance FromJSON BigSum where
25+ parseJSON = genericParseJSON opts
26+
27+bigSum :: BigSum
28+bigSum = F25
benchmarks/Auto/G/D.hsnew file+44
@@ -0,0 +1,44 @@
1+{-# LANGUAGE DeriveGeneric #-}
2+
3+module Auto.G.D where
4+
5+import Control.DeepSeq
6+import Data.Aeson
7+import GHC.Generics (Generic)
8+import Options
9+
10+data D a = Nullary
11+ | Unary Int
12+ | Product String Char a
13+ | Record { testOne :: Double
14+ , testTwo :: Bool
15+ , testThree :: D a
16+ }
17+ deriving (Show, Eq, Generic)
18+
19+instance NFData a => NFData (D a) where
20+ rnf Nullary = ()
21+ rnf (Unary n) = rnf n
22+ rnf (Product s c x) = s `deepseq` c `deepseq` rnf x
23+ rnf (Record a b y) = a `deepseq` b `deepseq` rnf y
24+
25+instance ToJSON a => ToJSON (D a) where
26+ toJSON = genericToJSON opts
27+ toEncoding = genericToEncoding opts
28+
29+instance FromJSON a => FromJSON (D a) where
30+ parseJSON = genericParseJSON opts
31+
32+type T = D (D (D ()))
33+
34+d :: T
35+d = Record
36+ { testOne = 1234.56789
37+ , testTwo = True
38+ , testThree = Product "Hello World!" 'a'
39+ Record
40+ { testOne = 9876.54321
41+ , testTwo = False
42+ , testThree = Product "Yeehaa!!!" '\n' Nullary
43+ }
44+ }
benchmarks/Auto/T/BigProduct.hsnew file+27
@@ -0,0 +1,27 @@
1+{-# LANGUAGE TemplateHaskell #-}
2+
3+module Auto.T.BigProduct where
4+
5+import Control.DeepSeq
6+import Data.Aeson.TH
7+import Options
8+
9+data BigProduct = BigProduct
10+ !Int !Int !Int !Int !Int
11+ !Int !Int !Int !Int !Int
12+ !Int !Int !Int !Int !Int
13+ !Int !Int !Int !Int !Int
14+ !Int !Int !Int !Int !Int
15+ deriving (Show, Eq)
16+
17+instance NFData BigProduct where
18+ rnf a = a `seq` ()
19+
20+deriveJSON opts ''BigProduct
21+
22+bigProduct :: BigProduct
23+bigProduct = BigProduct 1 2 3 4 5
24+ 6 7 8 9 10
25+ 11 12 13 14 15
26+ 16 17 18 19 20
27+ 21 22 23 24 25
benchmarks/Auto/T/BigRecord.hsnew file+27
@@ -0,0 +1,27 @@
1+{-# LANGUAGE TemplateHaskell #-}
2+
3+module Auto.T.BigRecord where
4+
5+import Control.DeepSeq
6+import Data.Aeson.TH
7+import Options
8+
9+data BigRecord = BigRecord
10+ { field01 :: !Int, field02 :: !Int, field03 :: !Int, field04 :: !Int, field05 :: !Int
11+ , field06 :: !Int, field07 :: !Int, field08 :: !Int, field09 :: !Int, field10 :: !Int
12+ , field11 :: !Int, field12 :: !Int, field13 :: !Int, field14 :: !Int, field15 :: !Int
13+ , field16 :: !Int, field17 :: !Int, field18 :: !Int, field19 :: !Int, field20 :: !Int
14+ , field21 :: !Int, field22 :: !Int, field23 :: !Int, field24 :: !Int, field25 :: !Int
15+ } deriving (Show, Eq)
16+
17+instance NFData BigRecord where
18+ rnf a = a `seq` ()
19+
20+deriveJSON opts ''BigRecord
21+
22+bigRecord :: BigRecord
23+bigRecord = BigRecord 1 2 3 4 5
24+ 6 7 8 9 10
25+ 11 12 13 14 15
26+ 16 17 18 19 20
27+ 21 22 23 24 25
benchmarks/Auto/T/BigSum.hsnew file+22
@@ -0,0 +1,22 @@
1+{-# LANGUAGE TemplateHaskell #-}
2+
3+module Auto.T.BigSum where
4+
5+import Control.DeepSeq
6+import Data.Aeson.TH
7+import Options
8+
9+data BigSum = F01 | F02 | F03 | F04 | F05
10+ | F06 | F07 | F08 | F09 | F10
11+ | F11 | F12 | F13 | F14 | F15
12+ | F16 | F17 | F18 | F19 | F20
13+ | F21 | F22 | F23 | F24 | F25
14+ deriving (Show, Eq)
15+
16+instance NFData BigSum where
17+ rnf a = a `seq` ()
18+
19+deriveJSON opts ''BigSum
20+
21+bigSum :: BigSum
22+bigSum = F25
benchmarks/Auto/T/D.hsnew file+38
@@ -0,0 +1,38 @@
1+{-# LANGUAGE TemplateHaskell #-}
2+
3+module Auto.T.D where
4+
5+import Control.DeepSeq
6+import Data.Aeson.TH
7+import Options
8+
9+data D a = Nullary
10+ | Unary Int
11+ | Product String Char a
12+ | Record { testOne :: Double
13+ , testTwo :: Bool
14+ , testThree :: D a
15+ }
16+ deriving (Show, Eq)
17+
18+instance NFData a => NFData (D a) where
19+ rnf Nullary = ()
20+ rnf (Unary n) = rnf n
21+ rnf (Product s c x) = s `deepseq` c `deepseq` rnf x
22+ rnf (Record a b y) = a `deepseq` b `deepseq` rnf y
23+
24+deriveJSON opts ''D
25+
26+type T = D (D (D ()))
27+
28+d :: T
29+d = Record
30+ { testOne = 1234.56789
31+ , testTwo = True
32+ , testThree = Product "Hello World!" 'a'
33+ Record
34+ { testOne = 9876.54321
35+ , testTwo = False
36+ , testThree = Product "Yeehaa!!!" '\n' Nullary
37+ }
38+ }
benchmarks/AutoCompare.hsnew file+73
@@ -0,0 +1,73 @@
1+{-# LANGUAGE RankNTypes #-}
2+{-# LANGUAGE ScopedTypeVariables #-}
3+
4+module Main (main) where
5+
6+import Control.DeepSeq
7+import Control.Monad
8+import Criterion.Main
9+import Data.Aeson
10+
11+import qualified Auto.T.D as T
12+import qualified Auto.T.BigRecord as T
13+import qualified Auto.T.BigProduct as T
14+import qualified Auto.T.BigSum as T
15+import qualified Auto.G.D as G
16+import qualified Auto.G.BigRecord as G
17+import qualified Auto.G.BigProduct as G
18+import qualified Auto.G.BigSum as G
19+
20+--------------------------------------------------------------------------------
21+
22+runBench :: IO ()
23+runBench = defaultMain
24+ [ compareBench "D" T.d G.d
25+ , compareBench "BigRecord" T.bigRecord G.bigRecord
26+ , compareBench "BigProduct" T.bigProduct G.bigProduct
27+ , compareBench "BigSum" T.bigSum G.bigSum
28+ ]
29+
30+group :: String -> Benchmarkable -> Benchmarkable -> Benchmark
31+group n th gen = bgroup n [ bench "th" th
32+ , bench "generic" gen
33+ ]
34+
35+compareBench
36+ :: forall a b
37+ . (ToJSON a, FromJSON a, NFData a, ToJSON b, FromJSON b, NFData b)
38+ => String -> a -> b -> Benchmark
39+compareBench name a b = v `deepseq` bgroup name
40+ [ group "toJSON" (nf toJSON a)
41+ (nf toJSON b)
42+ , group "encode" (nf encode a)
43+ (nf encode b)
44+ , group "fromJSON" (nf (fromJSON :: Value -> Result a) v)
45+ (nf (fromJSON :: Value -> Result b) v)
46+ ] where
47+ v = toJSON a -- == toJSON b
48+
49+sanityCheck :: IO ()
50+sanityCheck = do
51+ check T.d
52+ check G.d
53+ check T.bigRecord
54+ check G.bigRecord
55+ check T.bigProduct
56+ check G.bigProduct
57+ check T.bigSum
58+ check G.bigSum
59+
60+check :: (Show a, Eq a, FromJSON a, ToJSON a)
61+ => a -> IO ()
62+check x = do
63+ unless (Success x == (fromJSON . toJSON) x) $ fail $ "toJSON: " ++ show x
64+ unless (Success x == (decode_ . encode) x) $ fail $ "encode: " ++ show x
65+ where
66+ decode_ s = case decode s of
67+ Just v -> fromJSON v
68+ Nothing -> fail ""
69+
70+main :: IO ()
71+main = do
72+ sanityCheck
73+ runBench
benchmarks/Compare.hs+10−5
@@ -1,22 +1,25 @@
1−{-# LANGUAGE PackageImports #-}
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE NoImplicitPrelude #-}
23{-# LANGUAGE ScopedTypeVariables #-}
34
45module Main (main) where
56
6−import Prelude ()
77import Prelude.Compat
88
99import Compare.BufferBuilder ()
10−import Compare.JsonBuilder ()
1110import Criterion.Main
1211import Data.BufferBuilder.Json
13−import Data.Json.Builder
1412import Twitter
1513import Twitter.Manual ()
1614import Typed.Common
17−import qualified "aeson-benchmarks" Data.Aeson as Aeson
15+import qualified Data.Aeson as Aeson
1816import qualified Compare.JsonBench as JsonBench
1917
18+#ifdef MIN_VERSION_json_builder
19+import Data.Json.Builder
20+import Compare.JsonBuilder ()
21+#endif
22+
2023main :: IO ()
2124main =
2225 defaultMain [
@@ -24,7 +27,9 @@ main =
2427 bgroup "twitter" [
2528 bench "aeson" $ nf Aeson.encode twtr
2629 , bench "buffer-builder" $ nf encodeJson twtr
30+#ifdef MIN_VERSION_json_builder
2731 , bench "json-builder" $ nf toJsonLBS twtr
32+#endif
2833 ]
2934 , JsonBench.benchmarks
3035 ]
benchmarks/Compare/BufferBuilder.hs+2−3
@@ -1,3 +1,4 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
12{-# LANGUAGE OverloadedStrings #-}
23{-# LANGUAGE RecordWildCards #-}
34
@@ -6,13 +7,11 @@
67
78module Compare.BufferBuilder () where
89
9−import Prelude ()
10−import Prelude.Compat
10+import Prelude.Compat hiding ((<>))
1111
1212import Data.BufferBuilder.Json
1313import Data.Int (Int64)
1414import Data.Monoid ((<>))
15−import Prelude hiding (id)
1615import Twitter
1716import qualified Data.BufferBuilder.Utf8 as UB
1817
benchmarks/Compare/JsonBench.hs+18−9
@@ -1,17 +1,18 @@
1−-- Adapted from a buffer-builder benchmark:
2−--
3−-- https://github.com/chadaustin/buffer-builder/blob/master/test.json
4−
1+{-# LANGUAGE CPP #-}
52{-# LANGUAGE BangPatterns #-}
63{-# LANGUAGE MagicHash #-}
4+{-# LANGUAGE NoImplicitPrelude #-}
75{-# LANGUAGE OverloadedStrings #-}
86{-# LANGUAGE RecordWildCards #-}
97{-# LANGUAGE ScopedTypeVariables #-}
108
9+-- Adapted from a buffer-builder benchmark:
10+--
11+-- https://github.com/chadaustin/buffer-builder/blob/master/test.json
12+
1113module Compare.JsonBench (benchmarks) where
1214
13−import Prelude ()
14−import Prelude.Compat
15+import Prelude.Compat hiding ((<>))
1516
1617import Control.DeepSeq (NFData(..))
1718import Criterion
@@ -19,9 +20,13 @@ import Data.Aeson ((.:))
1920import Data.Monoid ((<>))
2021import Data.Text (Text)
2122import Typed.Common (load)
23+import qualified Control.Monad.Fail as Fail
2224import qualified Data.Aeson as Aeson
2325import qualified Data.BufferBuilder.Json as Json
26+
27+#ifdef MIN_VERSION_json_builder
2428import qualified Data.Json.Builder as JB
29+#endif
2530
2631data EyeColor = Green | Blue | Brown
2732 deriving (Eq, Show)
@@ -64,10 +69,10 @@ instance NFData Gender where rnf !_ = ()
6469instance NFData Fruit where rnf !_ = ()
6570
6671instance NFData Friend where
67− rnf Friend {..} = rnf fId `seq` rnf fName `seq` ()
72+ rnf Friend {..} = rnf fId `seq` rnf fName
6873
6974instance NFData User where
70− rnf User {..} = rnf uId `seq` rnf uIndex `seq` rnf uGuid `seq` rnf uIsActive `seq` rnf uBalance `seq` rnf uPicture `seq` rnf uAge `seq` rnf uEyeColor `seq` rnf uName `seq` rnf uGender `seq` rnf uCompany `seq` rnf uEmail `seq` rnf uPhone `seq` rnf uAddress `seq` rnf uAbout `seq` rnf uRegistered `seq` rnf uLatitude `seq` rnf uLongitude `seq` rnf uTags `seq` rnf uFriends `seq` rnf uGreeting `seq` rnf uFavouriteFruit `seq` ()
75+ rnf User {..} = rnf uId `seq` rnf uIndex `seq` rnf uGuid `seq` rnf uIsActive `seq` rnf uBalance `seq` rnf uPicture `seq` rnf uAge `seq` rnf uEyeColor `seq` rnf uName `seq` rnf uGender `seq` rnf uCompany `seq` rnf uEmail `seq` rnf uPhone `seq` rnf uAddress `seq` rnf uAbout `seq` rnf uRegistered `seq` rnf uLatitude `seq` rnf uLongitude `seq` rnf uTags `seq` rnf uFriends `seq` rnf uGreeting `seq` rnf uFavouriteFruit
7176
7277eyeColorTable :: [(Text, EyeColor)]
7378eyeColorTable = [("brown", Brown), ("green", Green), ("blue", Blue)]
@@ -78,7 +83,7 @@ genderTable = [("male", Male), ("female", Female)]
7883fruitTable :: [(Text, Fruit)]
7984fruitTable = [("apple", Apple), ("strawberry", Strawberry), ("banana", Banana)]
8085
81−enumFromJson :: Monad m => String -> [(Text, enum)] -> (json -> m Text) -> json -> m enum
86+enumFromJson :: Fail.MonadFail m => String -> [(Text, enum)] -> (json -> m Text) -> json -> m enum
8287enumFromJson enumName table extract v = do
8388 s <- extract v
8489 case lookup s table of
@@ -268,6 +273,7 @@ instance Json.ToJson User where
268273 <> "greeting"# Json..=# uGreeting
269274 <> "favoriteFruit"# Json..=# uFavouriteFruit
270275
276+#ifdef MIN_VERSION_json_builder
271277---- json-builder instances ----
272278
273279instance JB.Value EyeColor where
@@ -319,6 +325,7 @@ instance JB.Value User where
319325 <> t "friends" `JB.row` uFriends
320326 <> t "greeting" `JB.row` uGreeting
321327 <> t "favoriteFruit" `JB.row` uFavouriteFruit
328+#endif
322329
323330benchmarks :: Benchmark
324331benchmarks = env (load "json-data/buffer-builder.json") $
@@ -326,5 +333,7 @@ benchmarks = env (load "json-data/buffer-builder.json") $
326333 bgroup "json-bench" [
327334 bench "aeson" $ nf Aeson.encode parsedUserList
328335 , bench "buffer-builder" $ nf Json.encodeJson parsedUserList
336+#ifdef MIN_VERSION_json_builder
329337 , bench "json-builder" $ nf JB.toJsonLBS parsedUserList
338+#endif
330339 ]
benchmarks/Compare/JsonBuilder.hs+2−3
@@ -1,3 +1,4 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
12{-# LANGUAGE RecordWildCards #-}
23
34{-# OPTIONS_GHC -fno-warn-name-shadowing #-}
@@ -5,12 +6,10 @@
56
67module Compare.JsonBuilder () where
78
8−import Prelude ()
9−import Prelude.Compat
9+import Prelude.Compat hiding ((<>))
1010
1111import Data.Json.Builder
1212import Data.Monoid ((<>))
13−import Prelude hiding (id)
1413import Twitter
1514
1615instance JsObject Metadata where
benchmarks/CompareWithJSON.hs+23−33
@@ -1,9 +1,9 @@
1−{-# LANGUAGE PackageImports #-}
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
23{-# OPTIONS_GHC -fno-warn-orphans #-}
34
45module Main (main) where
56
6−import Prelude ()
77import Prelude.Compat
88
99import Blaze.ByteString.Builder (toLazyByteString)
@@ -11,10 +11,9 @@ import Blaze.ByteString.Builder.Char.Utf8 (fromString)
1111import Control.DeepSeq (NFData(rnf))
1212import Criterion.Main
1313import Data.Maybe (fromMaybe)
14−import qualified "aeson-benchmarks" Data.Aeson as A
15−import qualified "aeson-benchmarks" Data.Aeson.Text as A
16−import qualified "aeson-benchmarks" Data.Aeson.Parser.Internal as I
17−import qualified "aeson" Data.Aeson as B
14+import qualified Data.Aeson as A
15+import qualified Data.Aeson.Text as A
16+import qualified Data.Aeson.Parser.Internal as I
1817import qualified Data.ByteString as BS
1918import qualified Data.ByteString.Lazy as BL
2019import qualified Data.Text.Lazy as TL
@@ -28,7 +27,7 @@ instance (NFData v) => NFData (J.JSObject v) where
2827instance NFData J.JSValue where
2928 rnf J.JSNull = ()
3029 rnf (J.JSBool b) = rnf b
31− rnf (J.JSRational a b) = rnf a `seq` rnf b `seq` ()
30+ rnf (J.JSRational a b) = rnf a `seq` rnf b
3231 rnf (J.JSString s) = rnf (J.fromJSString s)
3332 rnf (J.JSArray lst) = rnf lst
3433 rnf (J.JSObject o) = rnf o
@@ -39,20 +38,14 @@ decodeJ s =
3938 J.Ok v -> v
4039 J.Error _ -> error "fail to parse via JSON"
4140
42−decodeA :: BL.ByteString -> A.Value
43−decodeA s = fromMaybe (error "fail to parse via Aeson") $ A.decode s
44−
45−decodeA' :: BL.ByteString -> A.Value
46−decodeA' s = fromMaybe (error "fail to parse via Aeson") $ A.decode' s
47−
48−decodeAS :: BS.ByteString -> A.Value
49−decodeAS s = fromMaybe (error "fail to parse via Aeson") $ A.decodeStrict' s
41+decode :: BL.ByteString -> A.Value
42+decode s = fromMaybe (error "fail to parse via Aeson") $ A.decode s
5043
51−decodeB :: BL.ByteString -> B.Value
52−decodeB s = fromMaybe (error "fail to parse via Aeson") $ B.decode s
44+decode' :: BL.ByteString -> A.Value
45+decode' s = fromMaybe (error "fail to parse via Aeson") $ A.decode' s
5346
54−decodeBS :: BS.ByteString -> B.Value
55−decodeBS s = fromMaybe (error "fail to parse via Aeson") $ B.decodeStrict' s
47+decodeS :: BS.ByteString -> A.Value
48+decodeS s = fromMaybe (error "fail to parse via Aeson") $ A.decodeStrict' s
5649
5750decodeIP :: BL.ByteString -> A.Value
5851decodeIP s = fromMaybe (error "fail to parse via Parser.decodeWith") $
@@ -80,32 +73,29 @@ main = do
8073 defaultMain [
8174 bgroup "decode" [
8275 bgroup "en" [
83− bench "aeson/lazy" $ nf decodeA enA
84− , bench "aeson/strict" $ nf decodeA' enA
85− , bench "aeson/stricter" $ nf decodeAS enS
86− , bench "aeson/hackage" $ nf decodeB enA
87− , bench "aeson/hackage'" $ nf decodeBS enS
76+ bench "aeson/lazy" $ nf decode enA
77+ , bench "aeson/strict" $ nf decode' enA
78+ , bench "aeson/stricter" $ nf decodeS enS
8879 , bench "aeson/parser" $ nf decodeIP enA
8980 , bench "json" $ nf decodeJ enJ
9081 ]
9182 , bgroup "jp" [
92− bench "aeson" $ nf decodeA jpA
93− , bench "aeson/stricter" $ nf decodeAS jpS
94− , bench "aeson/hackage" $ nf decodeB jpA
83+ bench "aeson" $ nf decode jpA
84+ , bench "aeson/stricter" $ nf decodeS jpS
9585 , bench "json" $ nf decodeJ jpJ
9686 ]
9787 ]
9888 , bgroup "encode" [
9989 bgroup "en" [
100− bench "aeson-to-bytestring" $ nf A.encode (decodeA enA)
101− , bench "aeson-via-text-to-bytestring" $ nf encodeViaText (decodeA enA)
102− , bench "aeson-to-text" $ nf encodeToText (decodeA enA)
90+ bench "aeson-to-bytestring" $ nf A.encode (decode enA)
91+ , bench "aeson-via-text-to-bytestring" $ nf encodeViaText (decode enA)
92+ , bench "aeson-to-text" $ nf encodeToText (decode enA)
10393 , bench "json" $ nf encodeJ (decodeJ enJ)
10494 ]
10595 , bgroup "jp" [
106− bench "aeson-to-bytestring" $ nf A.encode (decodeA jpA)
107− , bench "aeson-via-text-to-bytestring" $ nf encodeViaText (decodeA jpA)
108− , bench "aeson-to-text" $ nf encodeToText (decodeA jpA)
96+ bench "aeson-to-bytestring" $ nf A.encode (decode jpA)
97+ , bench "aeson-via-text-to-bytestring" $ nf encodeViaText (decode jpA)
98+ , bench "aeson-to-text" $ nf encodeToText (decode jpA)
10999 , bench "json" $ nf encodeJ (decodeJ jpJ)
110100 ]
111101 ]
benchmarks/Dates.hs+2−2
@@ -1,7 +1,7 @@
1−{-# OPTIONS_GHC -fsimpl-tick-factor=0 #-}
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
23module Main (main) where
34
4−import Prelude ()
55import Prelude.Compat
66
77import Criterion.Main
benchmarks/Escape.hsnew file+32
@@ -0,0 +1,32 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
2+{-# LANGUAGE ScopedTypeVariables #-}
3+
4+{-# OPTIONS_GHC -fno-warn-name-shadowing #-}
5+
6+module Main (main) where
7+
8+import Prelude.Compat
9+
10+import Criterion.Main
11+import qualified Data.Aeson.Parser.UnescapeFFI as FFI
12+import qualified Data.Aeson.Parser.UnescapePure as Pure
13+
14+import qualified Data.ByteString.Char8 as BS
15+import System.Environment (getArgs, withArgs)
16+
17+main :: IO ()
18+main = do
19+ args_ <- getArgs
20+ let (args, p, n) =
21+ case args_ of
22+ "--pattern" : p : args_ -> k p args_
23+ _ -> k "\\\"" args_
24+ k p args_ =
25+ case args_ of
26+ "--repeat" : n : args_ -> (args_, p, read n)
27+ args_ -> (args_, p, 10000)
28+ input = BS.concat $ replicate n $ BS.pack p
29+ withArgs args $ defaultMain
30+ [ bench "ffi" $ whnf FFI.unescapeText input
31+ , bench "pure" $ whnf Pure.unescapeText input
32+ ]
benchmarks/Issue673.hsnew file+165
@@ -0,0 +1,165 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
2+{-# LANGUAGE OverloadedStrings #-}
3+
4+module Main (
5+ main,
6+ input17,
7+ input32,
8+ input64,
9+ input128,
10+ input256,
11+ input2048,
12+ input4096,
13+ input8192,
14+ input16384,
15+ ) where
16+
17+import Criterion.Main
18+import Prelude.Compat
19+import Data.Int (Int64)
20+import Data.Scientific (Scientific)
21+import Data.Semigroup ((<>))
22+import Data.Aeson.Parser (scientific)
23+
24+import qualified Data.Attoparsec.ByteString.Lazy as AttoL
25+import qualified Data.Attoparsec.ByteString.Char8 as Atto8
26+import qualified Data.Aeson as A
27+import qualified Data.ByteString as BS
28+import qualified Data.ByteString.Lazy as LBS
29+import qualified Data.ByteString.Lazy.Char8 as LBS8
30+
31+decodeInt :: LBS.ByteString -> Maybe Int
32+decodeInt = A.decode
33+
34+decodeString :: LBS.ByteString -> Maybe String
35+decodeString = A.decode
36+
37+decodeScientific :: LBS.ByteString -> Maybe Scientific
38+decodeScientific = A.decode
39+
40+decodeViaRead :: LBS.ByteString -> Integer
41+decodeViaRead = read . LBS8.unpack
42+
43+decodeAtto :: LBS.ByteString -> Maybe Scientific
44+decodeAtto
45+ = parseOnly (scientific <* AttoL.endOfInput)
46+ where
47+ parseOnly p lbs = case AttoL.parse p lbs of
48+ AttoL.Done _ r -> Just r
49+ AttoL.Fail {} -> Nothing
50+
51+decodeAtto8 :: LBS.ByteString -> Maybe Scientific
52+decodeAtto8
53+ = parseOnly (Atto8.scientific <* AttoL.endOfInput)
54+ where
55+ parseOnly p lbs = case AttoL.parse p lbs of
56+ AttoL.Done _ r -> Just r
57+ AttoL.Fail {} -> Nothing
58+
59+generate :: Int64 -> LBS.ByteString
60+generate n = LBS8.replicate n '1'
61+
62+input17 :: LBS.ByteString
63+input17 = generate 17
64+
65+input32 :: LBS.ByteString
66+input32 = generate 32
67+
68+input64 :: LBS.ByteString
69+input64 = generate 64
70+
71+input128 :: LBS.ByteString
72+input128 = generate 128
73+
74+input256 :: LBS.ByteString
75+input256 = generate 256
76+
77+input2048 :: LBS.ByteString
78+input2048 = generate 2048
79+
80+input4096 :: LBS.ByteString
81+input4096 = generate 4096
82+
83+input8192 :: LBS.ByteString
84+input8192 = generate 8192
85+
86+input16384 :: LBS.ByteString
87+input16384 = generate 16384
88+
89+
90+main :: IO ()
91+main = defaultMain
92+ -- works on 64bit
93+ [ benchPair "17" input17
94+ -- , benchPair "32" input32
95+ -- , benchPair "64" input64
96+ -- , benchPair "128" input128
97+ -- , benchPair "256" input256
98+ , benchPair "2048" input2048
99+ , benchPair "4096" input4096
100+ , benchPair "8192" input8192
101+ , benchPair "16384" input16384
102+ ]
103+ where
104+ benchPair name input = bgroup name
105+ [ bench "Int" $ whnf decodeInt input
106+ , bench "Simple" $ whnf bsToIntegerSimple (LBS.toStrict input)
107+ , bench "Optim" $ whnf bsToInteger (LBS.toStrict input)
108+ , bench "Read" $ whnf decodeViaRead input
109+ , bench "Scientific" $ whnf decodeScientific input
110+ , bench "parserA" $ whnf decodeAtto input
111+ , bench "parserS" $ whnf decodeAtto8 input
112+ , bench "String" $ whnf decodeString $ "\"" <> input <> "\""
113+ ]
114+
115+-------------------------------------------------------------------------------
116+-- better fromInteger
117+-------------------------------------------------------------------------------
118+
119+bsToInteger :: BS.ByteString -> Integer
120+bsToInteger bs
121+ | l > 40 = valInteger 10 l [ fromIntegral (w - 48) | w <- BS.unpack bs ]
122+ | otherwise = bsToIntegerSimple bs
123+ where
124+ l = BS.length bs
125+
126+bsToIntegerSimple :: BS.ByteString -> Integer
127+bsToIntegerSimple = BS.foldl' step 0 where
128+ step a b = a * 10 + fromIntegral (b - 48) -- 48 = '0'
129+
130+-- A sub-quadratic algorithm for Integer. Pairs of adjacent radix b
131+-- digits are combined into a single radix b^2 digit. This process is
132+-- repeated until we are left with a single digit. This algorithm
133+-- performs well only on large inputs, so we use the simple algorithm
134+-- for smaller inputs.
135+valInteger :: Integer -> Int -> [Integer] -> Integer
136+valInteger = go
137+ where
138+ go :: Integer -> Int -> [Integer] -> Integer
139+ go _ _ [] = 0
140+ go _ _ [d] = d
141+ go b l ds
142+ | l > 40 = b' `seq` go b' l' (combine b ds')
143+ | otherwise = valSimple b ds
144+ where
145+ -- ensure that we have an even number of digits
146+ -- before we call combine:
147+ ds' = if even l then ds else 0 : ds
148+ b' = b * b
149+ l' = (l + 1) `quot` 2
150+
151+ combine b (d1 : d2 : ds) = d `seq` (d : combine b ds)
152+ where
153+ d = d1 * b + d2
154+ combine _ [] = []
155+ combine _ [_] = errorWithoutStackTrace "this should not happen"
156+
157+-- The following algorithm is only linear for types whose Num operations
158+-- are in constant time.
159+valSimple :: Integer -> [Integer] -> Integer
160+valSimple base = go 0
161+ where
162+ go r [] = r
163+ go r (d : ds) = r' `seq` go r' ds
164+ where
165+ r' = r * base + fromIntegral d
benchmarks/JsonParse.hs+3−2
@@ -1,10 +1,11 @@
11{-# LANGUAGE BangPatterns #-}
2+{-# LANGUAGE NoImplicitPrelude #-}
23{-# LANGUAGE ScopedTypeVariables #-}
4+
35{-# OPTIONS_GHC -fno-warn-orphans #-}
46
57module Main (main) where
68
7−import Prelude ()
89import Prelude.Compat
910
1011import Control.DeepSeq
@@ -16,7 +17,7 @@ import Text.JSON
1617instance NFData JSValue where
1718 rnf JSNull = ()
1819 rnf (JSBool b) = rnf b
19− rnf (JSRational b r) = rnf b `seq` rnf r `seq` ()
20+ rnf (JSRational b r) = rnf b `seq` rnf r
2021 rnf (JSString s) = rnf (fromJSString s)
2122 rnf (JSArray vs) = rnf vs
2223 rnf (JSObject kvs) = rnf (fromJSObject kvs)
benchmarks/Micro.hs+8−6
@@ -1,11 +1,13 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
13module Main (main) where
24
3−import Prelude ()
45import Prelude.Compat
56
67import Criterion.Main
7−import qualified Data.Aeson.Encoding.Builder as AB
8−import qualified Data.ByteString.Builder as B
8+
9+-- Encoding is a newtype wrapper around Builder
10+import Data.Aeson.Encoding (text, string, encodingToLazyByteString)
911import qualified Data.Text as T
1012
1113main :: IO ()
@@ -13,8 +15,8 @@ main = do
1315 let txt = "append (append b (primBounded w1 x1)) (primBounded w2 x2)"
1416 defaultMain [
1517 bgroup "string" [
16− bench "text" $ nf (B.toLazyByteString . AB.text) (T.pack txt)
17− , bench "string direct" $ nf (B.toLazyByteString . AB.string) txt
18− , bench "string via text" $ nf (B.toLazyByteString . AB.text . T.pack) txt
18+ bench "text" $ nf (encodingToLazyByteString . text) (T.pack txt)
19+ , bench "string direct" $ nf (encodingToLazyByteString . string) txt
20+ , bench "string via text" $ nf (encodingToLazyByteString . text . T.pack) txt
1921 ]
2022 ]
benchmarks/Options.hs−3
@@ -1,8 +1,5 @@
11module Options (opts) where
22
3−import Prelude ()
4−import Prelude.Compat
5−
63import Data.Aeson.Types
74
85opts :: Options
benchmarks/ReadFile.hs+1−1
@@ -1,9 +1,9 @@
11{-# LANGUAGE BangPatterns #-}
2+{-# LANGUAGE NoImplicitPrelude #-}
23{-# LANGUAGE OverloadedStrings #-}
34
45module Main (main) where
56
6−import Prelude ()
77import Prelude.Compat
88
99import Control.DeepSeq
benchmarks/Typed.hs+2−1
@@ -1,6 +1,7 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
13module Main (main) where
24
3−import Prelude ()
45import Prelude.Compat
56
67import Criterion.Main
benchmarks/Typed/Common.hs+1−10
@@ -1,25 +1,16 @@
1−{-# LANGUAGE CPP #-}
2−#ifdef HAS_BOTH_AESON_AND_BENCHMARKS
3−{-# LANGUAGE PackageImports #-}
4−#endif
1+{-# LANGUAGE NoImplicitPrelude #-}
52
63{-# OPTIONS_GHC -fno-warn-unused-imports #-}
74
85module Typed.Common (load) where
96
10−import Prelude ()
117import Prelude.Compat
128
139import Data.ByteString.Lazy as L
1410import System.Exit
1511import System.IO
1612
17−#ifndef HAS_BOTH_AESON_AND_BENCHMARKS
1813import Data.Aeson hiding (Result)
19−#else
20−import "aeson" Data.Aeson hiding (Result)
21−import qualified "aeson-benchmarks" Data.Aeson as B
22−#endif
2314
2415load :: FromJSON a => FilePath -> IO a
2516load fileName = do
benchmarks/Typed/Generic.hs+15−31
@@ -1,60 +1,44 @@
1−{-# LANGUAGE PackageImports #-}
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
23module Typed.Generic (benchmarks, decodeBenchmarks) where
34
4−import Prelude ()
55import Prelude.Compat
66
7−import "aeson" Data.Aeson hiding (Result)
7+import Data.Aeson hiding (Result)
88import Criterion
99import Data.ByteString.Lazy as L
1010import Twitter.Generic
1111import Typed.Common
12−import qualified "aeson-benchmarks" Data.Aeson as B
13−
14−encodeDirectA :: Result -> L.ByteString
15−encodeDirectA = encode
1612
17−encodeViaValueA :: Result -> L.ByteString
18−encodeViaValueA = encode . toJSON
13+encodeDirect :: Result -> L.ByteString
14+encodeDirect = encode
1915
20−encodeDirectB :: Result -> L.ByteString
21−encodeDirectB = B.encode
22−
23−encodeViaValueB :: Result -> L.ByteString
24−encodeViaValueB = B.encode . B.toJSON
16+encodeViaValue :: Result -> L.ByteString
17+encodeViaValue = encode . toJSON
2518
2619benchmarks :: Benchmark
2720benchmarks =
2821 env ((,) <$> load "json-data/twitter100.json" <*> load "json-data/jp100.json") $ \ ~(twitter100, jp100) ->
2922 bgroup "encodeGeneric" [
3023 bgroup "direct" [
31− bench "twitter100" $ nf encodeDirectB twitter100
32− , bench "jp100" $ nf encodeDirectB jp100
33− , bench "twitter100 baseline" $ nf encodeDirectA twitter100
34− , bench "jp100 baseline" $ nf encodeDirectA jp100
24+ bench "twitter100" $ nf encodeDirect twitter100
25+ , bench "jp100" $ nf encodeDirect jp100
3526 ]
3627 , bgroup "viaValue" [
37− bench "twitter100" $ nf encodeViaValueB twitter100
38− , bench "jp100" $ nf encodeViaValueB jp100
39− , bench "twitter100 baseline" $ nf encodeViaValueA twitter100
40− , bench "jp100 baseline" $ nf encodeViaValueA jp100
28+ bench "twitter100" $ nf encodeViaValue twitter100
29+ , bench "jp100" $ nf encodeViaValue jp100
4130 ]
4231 ]
4332
44−decodeDirectA :: L.ByteString -> Maybe Result
45−decodeDirectA = decode
46−
47−decodeDirectB :: L.ByteString -> Maybe Result
48−decodeDirectB = B.decode
33+decodeDirect :: L.ByteString -> Maybe Result
34+decodeDirect = decode
4935
5036decodeBenchmarks :: Benchmark
5137decodeBenchmarks =
5238 env ((,) <$> L.readFile "json-data/twitter100.json" <*> L.readFile "json-data/jp100.json") $ \ ~(twitter100, jp100) ->
5339 bgroup "decodeGeneric"
5440 [ bgroup "direct"
55− [ bench "twitter100" $ nf decodeDirectB twitter100
56− , bench "jp100" $ nf decodeDirectB jp100
57− , bench "twitter100 baseline" $ nf decodeDirectA twitter100
58− , bench "jp100 baseline" $ nf decodeDirectA jp100
41+ [ bench "twitter100" $ nf decodeDirect twitter100
42+ , bench "jp100" $ nf decodeDirect jp100
5943 ]
6044 ]
benchmarks/Typed/Manual.hs+15−31
@@ -1,60 +1,44 @@
1−{-# LANGUAGE PackageImports #-}
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
23module Typed.Manual (benchmarks, decodeBenchmarks) where
34
4−import Prelude ()
55import Prelude.Compat
66
7−import "aeson" Data.Aeson hiding (Result)
7+import Data.Aeson hiding (Result)
88import Criterion
99import Data.ByteString.Lazy as L
1010import Twitter.Manual
1111import Typed.Common
12−import qualified "aeson-benchmarks" Data.Aeson as B
13−
14−encodeDirectA :: Result -> L.ByteString
15−encodeDirectA = encode
1612
17−encodeViaValueA :: Result -> L.ByteString
18−encodeViaValueA = encode . toJSON
13+encodeDirect :: Result -> L.ByteString
14+encodeDirect = encode
1915
20−encodeDirectB :: Result -> L.ByteString
21−encodeDirectB = B.encode
22−
23−encodeViaValueB :: Result -> L.ByteString
24−encodeViaValueB = B.encode . B.toJSON
16+encodeViaValue :: Result -> L.ByteString
17+encodeViaValue = encode . toJSON
2518
2619benchmarks :: Benchmark
2720benchmarks =
2821 env ((,) <$> load "json-data/twitter100.json" <*> load "json-data/jp100.json") $ \ ~(twitter100, jp100) ->
2922 bgroup "encodeManual" [
3023 bgroup "direct" [
31− bench "twitter100" $ nf encodeDirectB twitter100
32− , bench "jp100" $ nf encodeDirectB jp100
33− , bench "twitter100 baseline" $ nf encodeDirectA twitter100
34− , bench "jp100 baseline" $ nf encodeDirectA jp100
24+ bench "twitter100" $ nf encodeDirect twitter100
25+ , bench "jp100" $ nf encodeDirect jp100
3526 ]
3627 , bgroup "viaValue" [
37− bench "twitter100" $ nf encodeViaValueB twitter100
38− , bench "jp100" $ nf encodeViaValueB jp100
39− , bench "twitter100 baseline" $ nf encodeViaValueA twitter100
40− , bench "jp100 baseline" $ nf encodeViaValueA jp100
28+ bench "twitter100" $ nf encodeViaValue twitter100
29+ , bench "jp100" $ nf encodeViaValue jp100
4130 ]
4231 ]
4332
44−decodeDirectA :: L.ByteString -> Maybe Result
45−decodeDirectA = decode
46−
47−decodeDirectB :: L.ByteString -> Maybe Result
48−decodeDirectB = B.decode
33+decodeDirect :: L.ByteString -> Maybe Result
34+decodeDirect = decode
4935
5036decodeBenchmarks :: Benchmark
5137decodeBenchmarks =
5238 env ((,) <$> L.readFile "json-data/twitter100.json" <*> L.readFile "json-data/jp100.json") $ \ ~(twitter100, jp100) ->
5339 bgroup "decodeManual"
5440 [ bgroup "direct"
55− [ bench "twitter100" $ nf decodeDirectB twitter100
56− , bench "jp100" $ nf decodeDirectB jp100
57− , bench "twitter100 baseline" $ nf decodeDirectA twitter100
58− , bench "jp100 baseline" $ nf decodeDirectA jp100
41+ [ bench "twitter100" $ nf decodeDirect twitter100
42+ , bench "jp100" $ nf decodeDirect jp100
5943 ]
6044 ]
benchmarks/Typed/TH.hs+15−31
@@ -1,60 +1,44 @@
1−{-# LANGUAGE PackageImports #-}
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
23module Typed.TH (benchmarks, decodeBenchmarks) where
34
4−import Prelude ()
55import Prelude.Compat
66
7−import "aeson" Data.Aeson hiding (Result)
7+import Data.Aeson hiding (Result)
88import Criterion
99import Data.ByteString.Lazy as L
1010import Twitter.TH
1111import Typed.Common
12−import qualified "aeson-benchmarks" Data.Aeson as B
13−
14−encodeDirectA :: Result -> L.ByteString
15−encodeDirectA = encode
1612
17−encodeViaValueA :: Result -> L.ByteString
18−encodeViaValueA = encode . toJSON
13+encodeDirect :: Result -> L.ByteString
14+encodeDirect = encode
1915
20−encodeDirectB :: Result -> L.ByteString
21−encodeDirectB = B.encode
22−
23−encodeViaValueB :: Result -> L.ByteString
24−encodeViaValueB = B.encode . B.toJSON
16+encodeViaValue :: Result -> L.ByteString
17+encodeViaValue = encode . toJSON
2518
2619benchmarks :: Benchmark
2720benchmarks =
2821 env ((,) <$> load "json-data/twitter100.json" <*> load "json-data/jp100.json") $ \ ~(twitter100, jp100) ->
2922 bgroup "encodeTH" [
3023 bgroup "direct" [
31− bench "twitter100" $ nf encodeDirectB twitter100
32− , bench "jp100" $ nf encodeDirectB jp100
33− , bench "twitter100 baseline" $ nf encodeDirectA twitter100
34− , bench "jp100 baseline" $ nf encodeDirectA jp100
24+ bench "twitter100" $ nf encodeDirect twitter100
25+ , bench "jp100" $ nf encodeDirect jp100
3526 ]
3627 , bgroup "viaValue" [
37− bench "twitter100" $ nf encodeViaValueA twitter100
38− , bench "jp100" $ nf encodeViaValueA jp100
39− , bench "twitter100 baseline" $ nf encodeViaValueB twitter100
40− , bench "jp100 baseline" $ nf encodeViaValueB jp100
28+ bench "twitter100" $ nf encodeViaValue twitter100
29+ , bench "jp100" $ nf encodeViaValue jp100
4130 ]
4231 ]
4332
44−decodeDirectA :: L.ByteString -> Maybe Result
45−decodeDirectA = decode
46−
47−decodeDirectB :: L.ByteString -> Maybe Result
48−decodeDirectB = B.decode
33+decodeDirect :: L.ByteString -> Maybe Result
34+decodeDirect = decode
4935
5036decodeBenchmarks :: Benchmark
5137decodeBenchmarks =
5238 env ((,) <$> L.readFile "json-data/twitter100.json" <*> L.readFile "json-data/jp100.json") $ \ ~(twitter100, jp100) ->
5339 bgroup "decodeTH"
5440 [ bgroup "direct"
55− [ bench "twitter100" $ nf decodeDirectB twitter100
56− , bench "jp100" $ nf decodeDirectB jp100
57− , bench "twitter100 baseline" $ nf decodeDirectA twitter100
58− , bench "jp100 baseline" $ nf decodeDirectA jp100
41+ [ bench "twitter100" $ nf decodeDirect twitter100
42+ , bench "jp100" $ nf decodeDirect jp100
5943 ]
6044 ]
benchmarks/aeson-benchmarks.cabal+167−70
@@ -1,65 +1,21 @@
11name: aeson-benchmarks
22version: 0
33build-type: Simple
4−
5−cabal-version: >=1.8
4+cabal-version: >=1.10
65
76flag bytestring-builder
87 description: Depend on the bytestring-builder package for backwards compatibility.
98 default: False
109 manual: False
1110
12−library
13− hs-source-dirs: .. . ../ffi ../pure ../attoparsec-iso8601
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− Data.Attoparsec.Time
38− Data.Attoparsec.Time.Internal
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
3916
40− build-depends:
41− attoparsec >= 0.13.0.1,
42− base == 4.*,
43− base-compat >= 0.9.1 && <0.10,
44− time-locale-compat >=0.1.1 && <0.2,
45− containers,
46− deepseq,
47− dlist >= 0.2,
48− fail == 4.9.*,
49− ghc-prim >= 0.2,
50− hashable >= 1.1.2.0,
51− mtl,
52− scientific >= 0.3.4.7 && < 0.4,
53− syb,
54− tagged >=0.8.3 && <0.9,
55− template-haskell >= 2.4,
56− text >= 1.1.1.0,
57− th-abstraction >= 0.2.2 && < 0.3,
58− time,
59− transformers,
60− unordered-containers >= 0.2.3.0,
61− uuid-types >= 1.0.3 && <1.1,
62− vector >= 0.7.1
17+library
18+ default-language: Haskell2010
6319
6420 if flag(bytestring-builder)
6521 build-depends: bytestring >= 0.9 && < 0.10.4,
@@ -67,26 +23,139 @@ library
6723 else
6824 build-depends: bytestring >= 0.10.4
6925
70− if impl(ghc >=7.8)
71− cpp-options: -DHAS_COERCIBLE
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)
56+ build-depends: contravariant
57+
58+ if !impl(ghc >= 8.0)
59+ -- `Data.Semigroup` is available in base only since GHC 8.0 / base 4.9
60+ build-depends: semigroups,
61+ transformers-compat
7262
73− if !impl(ghc >= 8.0)
74− -- `Data.Semigroup` is available in base only since GHC 8.0 / base 4.9
75− build-depends: semigroups >= 0.18.2 && < 0.19
63+ if !impl(ghc >= 7.10)
64+ -- `Numeric.Natural` is available in base only since GHC 7.10 / base 4.8
65+ build-depends: nats,
66+ void
7667
77− include-dirs: ../include
68+ include-dirs: ../include
69+
70+ ghc-options: -O2 -Wall
71+ cpp-options: -DGENERICS
72+
73+ exposed-modules:
74+ Data.Aeson
75+ Data.Aeson.Encoding
76+ Data.Aeson.Encoding.Builder
77+ Data.Aeson.Encoding.Internal
78+ Data.Aeson.Internal
79+ Data.Aeson.Internal.Functions
80+ Data.Aeson.Internal.Time
81+ Data.Aeson.Parser
82+ Data.Aeson.Parser.Internal
83+ Data.Aeson.Parser.Time
84+ Data.Aeson.Parser.Unescape
85+ Data.Aeson.Parser.UnescapeFFI
86+ Data.Aeson.Parser.UnescapePure
87+ Data.Aeson.TH
88+ Data.Aeson.Text
89+ Data.Aeson.Types
90+ Data.Aeson.Types.Class
91+ Data.Aeson.Types.FromJSON
92+ Data.Aeson.Types.Generic
93+ Data.Aeson.Types.Internal
94+ Data.Aeson.Types.ToJSON
95+ Data.Attoparsec.Time
96+ Data.Attoparsec.Time.Internal
97+
98+ else
99+
100+ build-depends: aeson
101+
102+ reexported-modules:
103+ Data.Aeson,
104+ Data.Aeson.Encoding,
105+ Data.Aeson.Parser.Internal,
106+ Data.Aeson.Text,
107+ Data.Aeson.TH,
108+ Data.Aeson.Types
109+
110+executable aeson-benchmark-auto-compare
111+ default-language: Haskell2010
112+ main-is: AutoCompare.hs
113+ hs-source-dirs: .
114+ ghc-options: -Wall -O2 -rtsopts
115+ other-modules:
116+ Auto.T.D
117+ Auto.T.BigRecord
118+ Auto.T.BigProduct
119+ Auto.T.BigSum
120+ Auto.G.D
121+ Auto.G.BigRecord
122+ Auto.G.BigProduct
123+ Auto.G.BigSum
124+ Options
125+ build-depends:
126+ aeson-benchmarks,
127+ base,
128+ criterion,
129+ deepseq,
130+ template-haskell
78131
79− ghc-options: -O2 -Wall
80− cpp-options: -DGENERICS
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
81150
82151executable aeson-benchmark-compare
152+ default-language: Haskell2010
83153 main-is: Compare.hs
84154 hs-source-dirs: ../examples .
85155 ghc-options: -Wall -O2 -rtsopts
86156 other-modules:
87157 Compare.BufferBuilder
88158 Compare.JsonBench
89− Compare.JsonBuilder
90159 Twitter
91160 Twitter.Manual
92161 Typed.Common
@@ -99,10 +168,19 @@ executable aeson-benchmark-compare
99168 criterion >= 1.0,
100169 deepseq,
101170 ghc-prim,
102− json-builder,
103171 text
104172
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+
105182executable aeson-benchmark-micro
183+ default-language: Haskell2010
106184 main-is: Micro.hs
107185 hs-source-dirs: ../examples .
108186 ghc-options: -Wall -O2 -rtsopts
@@ -117,12 +195,10 @@ executable aeson-benchmark-micro
117195 text
118196
119197executable aeson-benchmark-typed
198+ default-language: Haskell2010
120199 main-is: Typed.hs
121200 hs-source-dirs: ../examples .
122201 ghc-options: -Wall -O2 -rtsopts
123− -- We must help ourself in situations when there is both
124− -- aeson and aeson-benchmakrs
125− cpp-options: -DHAS_BOTH_AESON_AND_BENCHMARKS
126202 other-modules:
127203 Twitter
128204 Twitter.Generic
@@ -134,7 +210,6 @@ executable aeson-benchmark-typed
134210 Typed.Manual
135211 Typed.TH
136212 build-depends:
137− aeson,
138213 aeson-benchmarks,
139214 base,
140215 base-compat,
@@ -149,13 +224,14 @@ executable aeson-benchmark-typed
149224 bytestring-builder >= 0.10.4 && < 1
150225 else
151226 build-depends: bytestring >= 0.10.4
227+ if impl(ghc < 8.0)
228+ build-depends: semigroups
152229
153230executable aeson-benchmark-compare-with-json
231+ default-language: Haskell2010
154232 main-is: CompareWithJSON.hs
155233 ghc-options: -Wall -O2 -rtsopts
156− cpp-options: -DHAS_BOTH_AESON_AND_BENCHMARKS
157234 build-depends:
158− aeson,
159235 aeson-benchmarks,
160236 base,
161237 base-compat,
@@ -167,6 +243,7 @@ executable aeson-benchmark-compare-with-json
167243 text
168244
169245executable aeson-benchmark-aeson-encode
246+ default-language: Haskell2010
170247 main-is: AesonEncode.hs
171248 ghc-options: -Wall -O2 -rtsopts
172249 build-depends:
@@ -179,6 +256,7 @@ executable aeson-benchmark-aeson-encode
179256 time
180257
181258executable aeson-benchmark-aeson-parse
259+ default-language: Haskell2010
182260 main-is: AesonParse.hs
183261 ghc-options: -Wall -O2 -rtsopts
184262 build-depends:
@@ -190,6 +268,7 @@ executable aeson-benchmark-aeson-parse
190268 time
191269
192270executable aeson-benchmark-json-parse
271+ default-language: Haskell2010
193272 main-is: JsonParse.hs
194273 ghc-options: -Wall -O2 -rtsopts
195274 build-depends:
@@ -200,6 +279,7 @@ executable aeson-benchmark-json-parse
200279 time
201280
202281executable aeson-benchmark-dates
282+ default-language: Haskell2010
203283 main-is: Dates.hs
204284 ghc-options: -Wall -O2 -rtsopts
205285 build-depends:
@@ -211,12 +291,14 @@ executable aeson-benchmark-dates
211291 aeson-benchmarks,
212292 text,
213293 time
294+ if impl(ghc >= 8.2)
295+ ghc-options: -Wno-simplifiable-class-constraints
214296
215297executable aeson-benchmark-map
298+ default-language: Haskell2010
216299 main-is: AesonMap.hs
217300 ghc-options: -Wall -O2 -rtsopts
218301 build-depends:
219− aeson,
220302 aeson-benchmarks,
221303 base,
222304 base-compat,
@@ -230,10 +312,10 @@ executable aeson-benchmark-map
230312 unordered-containers
231313
232314executable aeson-benchmark-foldable
315+ default-language: Haskell2010
233316 main-is: AesonFoldable.hs
234317 ghc-options: -Wall -O2 -rtsopts
235318 build-depends:
236− aeson,
237319 aeson-benchmarks,
238320 base,
239321 base-compat,
@@ -246,3 +328,18 @@ executable aeson-benchmark-foldable
246328 text,
247329 unordered-containers,
248330 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.project+3
@@ -1,2 +1,5 @@
11with-compiler: ghc
22packages: .
3+packages: attoparsec-iso8601
4+-- packages: benchmarks
5+tests: true
changelog.md+154−1
@@ -1,6 +1,159 @@
11For 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).
22
3−## 1.2.1.0
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
4157
5158* Add `parserThrowError` and `parserCatchError` combinators, thanks to Oleg Grenrus.
6159
examples/Generic.hs+1−1
@@ -6,11 +6,11 @@
66-- automatically derive the Generic class for us.
77
88{-# LANGUAGE DeriveGeneric #-}
9+{-# LANGUAGE NoImplicitPrelude #-}
910{-# LANGUAGE OverloadedStrings #-}
1011
1112module Main (main) where
1213
13−import Prelude ()
1414import Prelude.Compat
1515
1616import Data.Aeson (FromJSON, ToJSON, decode, encode)
examples/Simplest.hs+1−1
@@ -1,9 +1,9 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
12{-# LANGUAGE OverloadedStrings #-}
23{-# LANGUAGE RecordWildCards #-}
34
45module Main (main) where
56
6−import Prelude ()
77import Prelude.Compat
88
99import Control.Applicative (empty)
examples/TemplateHaskell.hs+1−1
@@ -1,12 +1,12 @@
11-- We can use Template Haskell (TH) to generate instances of the
22-- FromJSON and ToJSON classes automatically. This is the fastest way
33-- to add JSON support for a type.
4+{-# LANGUAGE NoImplicitPrelude #-}
45{-# LANGUAGE OverloadedStrings #-}
56{-# LANGUAGE TemplateHaskell #-}
67
78module Main (main) where
89
9−import Prelude ()
1010import Prelude.Compat
1111
1212import Data.Aeson (decode, encode)
examples/Twitter.hs+1−2
@@ -10,6 +10,7 @@
1010
1111{-# LANGUAGE DeriveDataTypeable #-}
1212{-# LANGUAGE DeriveGeneric #-}
13+{-# LANGUAGE NoImplicitPrelude #-}
1314
1415module Twitter
1516 (
@@ -19,7 +20,6 @@ module Twitter
1920 , Result(..)
2021 ) where
2122
22−import Prelude ()
2323import Prelude.Compat
2424
2525import Control.DeepSeq
@@ -27,7 +27,6 @@ import Data.Data (Typeable, Data)
2727import Data.Int (Int64)
2828import Data.Text (Text)
2929import GHC.Generics (Generic)
30−import Prelude hiding (id)
3130
3231{-# ANN module "Hlint: ignore Use camelCase" #-}
3332{-# ANN module "Hlint: ignore Use newtype instead of data" #-}
examples/Twitter/Generic.hs+2−37
@@ -1,11 +1,8 @@
11-- Use GHC generics to automatically generate good instances.
22
3−{-# LANGUAGE CPP #-}
4−{-# OPTIONS_GHC -fno-warn-orphans #-}
3+{-# LANGUAGE NoImplicitPrelude #-}
54
6−#ifdef HAS_BOTH_AESON_AND_BENCHMARKS
7−{-# LANGUAGE PackageImports #-}
8−#endif
5+{-# OPTIONS_GHC -fno-warn-orphans #-}
96
107module Twitter.Generic
118 (
@@ -15,18 +12,12 @@ module Twitter.Generic
1512 , Result(..)
1613 ) where
1714
18−import Prelude ()
1915import Prelude.Compat ()
2016
2117import Twitter
2218import Twitter.Options
2319
24−#ifndef HAS_BOTH_AESON_AND_BENCHMARKS
2520import Data.Aeson (ToJSON (..), FromJSON (..), genericToJSON, genericToEncoding, genericParseJSON)
26−#else
27−import "aeson" Data.Aeson (ToJSON (..), FromJSON (..), genericToJSON, genericToEncoding, genericParseJSON)
28−import qualified "aeson-benchmarks" Data.Aeson as B
29−#endif
3021
3122instance ToJSON Metadata where
3223 toJSON = genericToJSON twitterOptions
@@ -51,29 +42,3 @@ instance ToJSON Result where
5142 toEncoding = genericToEncoding twitterOptions
5243instance FromJSON Result where
5344 parseJSON = genericParseJSON twitterOptions
54−
55−#ifdef HAS_BOTH_AESON_AND_BENCHMARKS
56−instance B.ToJSON Metadata where
57− toJSON = B.genericToJSON btwitterOptions
58− toEncoding = B.genericToEncoding btwitterOptions
59−instance B.FromJSON Metadata where
60− parseJSON = B.genericParseJSON btwitterOptions
61−
62−instance B.ToJSON Geo where
63− toJSON = B.genericToJSON btwitterOptions
64− toEncoding = B.genericToEncoding btwitterOptions
65−instance B.FromJSON Geo where
66− parseJSON = B.genericParseJSON btwitterOptions
67−
68−instance B.ToJSON Story where
69− toJSON = B.genericToJSON btwitterOptions
70− toEncoding = B.genericToEncoding btwitterOptions
71−instance B.FromJSON Story where
72− parseJSON = B.genericParseJSON btwitterOptions
73−
74−instance B.ToJSON Result where
75− toJSON = B.genericToJSON btwitterOptions
76− toEncoding = B.genericToEncoding btwitterOptions
77−instance B.FromJSON Result where
78− parseJSON = B.genericParseJSON btwitterOptions
79−#endif
examples/Twitter/Manual.hs+3−139
@@ -1,13 +1,9 @@
11-- Manually write instances.
2−
3−{-# LANGUAGE CPP #-}
2+{-# LANGUAGE NoImplicitPrelude #-}
43{-# LANGUAGE OverloadedStrings #-}
54{-# LANGUAGE RecordWildCards #-}
6−{-# OPTIONS_GHC -fno-warn-orphans #-}
75
8−#ifdef HAS_BOTH_AESON_AND_BENCHMARKS
9−{-# LANGUAGE PackageImports #-}
10−#endif
6+{-# OPTIONS_GHC -fno-warn-orphans #-}
117
128module Twitter.Manual
139 (
@@ -17,20 +13,13 @@ module Twitter.Manual
1713 , Result(..)
1814 ) where
1915
20−import Prelude ()
2116import Prelude.Compat
2217
2318import Control.Applicative
24−import Data.Monoid ((<>))
25−import Prelude hiding (id)
19+import Data.Semigroup ((<>))
2620import Twitter
2721
28−#ifndef HAS_BOTH_AESON_AND_BENCHMARKS
2922import Data.Aeson hiding (Result)
30−#else
31−import "aeson" Data.Aeson hiding (Result)
32−import qualified "aeson-benchmarks" Data.Aeson as B
33−#endif
3423
3524instance ToJSON Metadata where
3625
@@ -155,128 +144,3 @@ instance FromJSON Result where
155144 <*> v .: "max_id_str"
156145 <*> v .: "query"
157146 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.hs−23
@@ -1,20 +1,6 @@
1−{-# LANGUAGE CPP #-}
2−
3−#ifdef HAS_BOTH_AESON_AND_BENCHMARKS
4−{-# LANGUAGE PackageImports #-}
5−#endif
6−
71module Twitter.Options (module Twitter.Options) where
82
9−#ifndef HAS_BOTH_AESON_AND_BENCHMARKS
103import Data.Aeson
11−import Data.Aeson.Types
12−#else
13−import "aeson" Data.Aeson
14−import "aeson" Data.Aeson.Types
15−import qualified "aeson-benchmarks" Data.Aeson as B
16−import qualified "aeson-benchmarks" Data.Aeson.Types as B
17−#endif
184
195twitterOptions :: Options
206twitterOptions = defaultOptions
@@ -22,12 +8,3 @@ twitterOptions = defaultOptions
228 "id_" -> "id"
239 _ -> x
2410 }
25−
26−#ifdef HAS_BOTH_AESON_AND_BENCHMARKS
27−btwitterOptions :: B.Options
28−btwitterOptions = B.defaultOptions
29− { B.fieldLabelModifier = \x -> case x of
30− "id_" -> "id"
31− _ -> x
32− }
33−#endif
examples/Twitter/TH.hs+2−18
@@ -1,12 +1,9 @@
11-- Use Template Haskell to generate good instances.
22
3−{-# LANGUAGE CPP #-}
3+{-# LANGUAGE NoImplicitPrelude #-}
44{-# LANGUAGE TemplateHaskell #-}
5−{-# OPTIONS_GHC -fno-warn-orphans #-}
65
7−#ifdef HAS_BOTH_AESON_AND_BENCHMARKS
8−{-# LANGUAGE PackageImports #-}
9−#endif
6+{-# OPTIONS_GHC -fno-warn-orphans #-}
107
118module Twitter.TH
129 (
@@ -16,26 +13,13 @@ module Twitter.TH
1613 , Result(..)
1714 ) where
1815
19−import Prelude ()
2016
2117import Twitter
2218import Twitter.Options
2319
24−#ifndef HAS_BOTH_AESON_AND_BENCHMARKS
2520import Data.Aeson.TH
26−#else
27−import "aeson" Data.Aeson.TH
28−import qualified "aeson-benchmarks" Data.Aeson.TH as B
29−#endif
3021
3122$(deriveJSON twitterOptions ''Metadata)
3223$(deriveJSON twitterOptions ''Geo)
3324$(deriveJSON twitterOptions ''Story)
3425$(deriveJSON twitterOptions ''Result)
35−
36−#ifdef HAS_BOTH_AESON_AND_BENCHMARKS
37−$(B.deriveJSON btwitterOptions ''Metadata)
38−$(B.deriveJSON btwitterOptions ''Geo)
39−$(B.deriveJSON btwitterOptions ''Story)
40−$(B.deriveJSON btwitterOptions ''Result)
41−#endif
ffi/Data/Aeson/Parser/UnescapeFFI.hs+1−1
@@ -10,7 +10,7 @@ module Data.Aeson.Parser.UnescapeFFI
1010import Control.Exception (evaluate, throw, try)
1111import Control.Monad.ST.Unsafe (unsafeIOToST, unsafeSTToIO)
1212import Data.ByteString as B
13−import Data.ByteString.Internal as B hiding (c2w)
13+import Data.ByteString.Internal as B
1414import Data.Text.Encoding.Error (UnicodeException (..))
1515import Data.Text.Internal (Text (..))
1616import Data.Text.Internal.Private (runText)
pure/Data/Aeson/Parser/UnescapePure.hs+13−36
@@ -119,38 +119,18 @@ decode UtfTail1 point word = case word of
119119 w | 0x80 <= w && w <= 0xbf -> (UtfGround, setByte1 point word)
120120 _ -> throwDecodeError
121121
122−{-# INLINE decode #-}
123−
124122decodeHex :: Word8 -> Word16
125−decodeHex 48 = 0 -- '0'
126−decodeHex 49 = 1 -- '1'
127−decodeHex 50 = 2 -- '2'
128−decodeHex 51 = 3 -- '3'
129−decodeHex 52 = 4 -- '4'
130−decodeHex 53 = 5 -- '5'
131−decodeHex 54 = 6 -- '6'
132−decodeHex 55 = 7 -- '7'
133−decodeHex 56 = 8 -- '8'
134−decodeHex 57 = 9 -- '9'
135−decodeHex 65 = 10 -- 'A'
136−decodeHex 97 = 10 -- 'a'
137−decodeHex 66 = 11 -- 'B'
138−decodeHex 98 = 11 -- 'b'
139−decodeHex 67 = 12 -- 'C'
140−decodeHex 99 = 12 -- 'c'
141−decodeHex 68 = 13 -- 'D'
142−decodeHex 100 = 13 -- 'd'
143−decodeHex 69 = 14 -- 'E'
144−decodeHex 101 = 14 -- 'e'
145−decodeHex 70 = 15 -- 'F'
146−decodeHex 102 = 15 -- 'f'
147−decodeHex _ = throwDecodeError
148−{-# INLINE decodeHex #-}
123+decodeHex x
124+ | 48 <= x && x <= 57 = fromIntegral x - 48 -- 0-9
125+ | 65 <= x && x <= 70 = fromIntegral x - 55 -- A-F
126+ | 97 <= x && x <= 102 = fromIntegral x - 87 -- a-f
127+ | otherwise = throwDecodeError
149128
150129unescapeText' :: ByteString -> Text
151130unescapeText' bs = runText $ \done -> do
152131 dest <- A.new len
153− (pos, finalState) <- B.foldl' (f' dest) (return (0, StateNone)) bs
132+
133+ (pos, finalState) <- loop dest (0, StateNone) 0
154134
155135 -- Check final state. Currently pos gets only increased over time, so this check should catch overflows.
156136 when ( finalState /= StateNone || pos > len)
@@ -172,11 +152,12 @@ unescapeText' bs = runText $ \done -> do
172152 (st', p) ->
173153 return (pos, StateUtf st' p)
174154
175− {-# INLINE runUtf #-}
176−
177− f' dest m c = m >>= \s -> f dest s c
178−
179− {-# INLINE f' #-}
155+ loop :: A.MArray s -> (Int, State) -> Int -> ST s (Int, State)
156+ loop _ ps i | i >= len = return ps
157+ loop dest ps i = do
158+ let c = B.index bs i -- JP: We can use unsafe index once we prove bounds with Liquid Haskell.
159+ ps' <- f dest ps c
160+ loop dest ps' $ i+1
180161
181162 -- No pending state.
182163 f dest (pos, StateNone) c = runUtf dest pos UtfGround 0 c
@@ -253,8 +234,6 @@ unescapeText' bs = runText $ \done -> do
253234 else
254235 writeAndReturn dest pos u StateNone
255236
256− {-# INLINE f #-}
257−
258237write :: A.MArray s -> Int -> Word16 -> ST s ()
259238write dest pos char =
260239 A.unsafeWrite dest pos char
@@ -270,8 +249,6 @@ throwDecodeError :: a
270249throwDecodeError =
271250 let desc = "Data.Text.Internal.Encoding.decodeUtf8: Invalid UTF-8 stream" in
272251 throw (DecodeError desc Nothing)
273−{-# INLINE throwDecodeError #-}
274252
275253unescapeText :: ByteString -> Either UnicodeException Text
276254unescapeText = unsafeDupablePerformIO . try . evaluate . unescapeText'
277−{-# INLINE unescapeText #-}
run-hlint.shnew file+7
@@ -0,0 +1,7 @@
1+#!/bin/bash
2+
3+if hash hlint 2>/dev/null; then
4+ hlint "$@"
5+else
6+ ./hlint.sh "$@"
7+fi
stack-bench.yaml+2−5
@@ -1,4 +1,4 @@
1−resolver: lts-8.5
1+resolver: nightly-2019-09-21
22# We use aeson in the snapshot to
33# - avoid recompilation of criterion
44# - compare against it
@@ -9,7 +9,4 @@ resolver: lts-8.5
99work-dir: .stack-work-bench
1010packages:
1111- benchmarks
12−extra-deps:
13−- aeson-1.2.1.0
14−- quickcheck-instances-0.3.14
15−- th-abstraction-0.2.2.0
12+extra-deps: []
stack-ffi-unescape.yamlnew file+9
@@ -0,0 +1,9 @@
1+resolver: nightly-2019-09-21
2+packages:
3+- '.'
4+flags:
5+ aeson:
6+ fast: true
7+ cffi: true
8+extra-deps:
9+- Diff-0.4.0
stack-lts12.yamlnew file+15
@@ -0,0 +1,15 @@
1+resolver: lts-12.26
2+packages:
3+- '.'
4+- attoparsec-iso8601
5+flags:
6+ aeson:
7+ fast: true
8+ cffi: true
9+extra-deps:
10+- base-orphans-0.8.1
11+- hashable-time-0.2.0.1
12+- QuickCheck-2.13.1
13+- quickcheck-instances-0.3.21
14+- splitmix-0.0.2
15+- time-compat-1.9.2.2
stack-lts6.yamldeleted−20
@@ -1,20 +0,0 @@
1−resolver: lts-6.30
2−packages:
3−- '.'
4−- attoparsec-iso8601
5−extra-deps:
6−- integer-logarithms-1
7−- QuickCheck-2.9.2
8−- quickcheck-instances-0.3.14
9−- semigroups-0.18.2
10−- tagged-0.8.5
11−- th-abstraction-0.2.2.0
12−- transformers-compat-0.5.1.4
13−flags:
14−flags:
15− aeson:
16− fast: true
17− attoparsec-iso8601:
18− fast: true
19− semigroups:
20− bytestring-builder: false
stack-lts7.yamldeleted−13
@@ -1,13 +0,0 @@
1−resolver: lts-7.19
2−packages:
3−- '.'
4−- attoparsec-iso8601
5−extra-deps:
6−- integer-logarithms-1
7−- quickcheck-instances-0.3.14
8−- th-abstraction-0.2.2.0
9−flags:
10− aeson:
11− fast: true
12− attoparsec-iso8601:
13− fast: true
stack-lts8.yamldeleted−12
@@ -1,12 +0,0 @@
1−resolver: lts-8.5
2−packages:
3−- '.'
4−- attoparsec-iso8601
5−extra-deps:
6−- quickcheck-instances-0.3.14
7−- th-abstraction-0.2.2.0
8−flags:
9− aeson:
10− fast: true
11− attoparsec-iso8601:
12− fast: true
stack-nightly.yaml+3−4
@@ -1,12 +1,11 @@
1−resolver: nightly-2017-03-25
1+resolver: nightly-2019-10-14
22packages:
33- '.'
44- attoparsec-iso8601
5−extra-deps:
6−- quickcheck-instances-0.3.14
7−- th-abstraction-0.2.2.0
85flags:
96 aeson:
107 fast: true
118 attoparsec-iso8601:
129 fast: true
10+extra-deps:
11+- generic-deriving-1.12.4
stack-pure-unescape.yamldeleted−10
@@ -1,10 +0,0 @@
1−resolver: lts-8.1
2−packages:
3−- '.'
4−extra-deps:
5−- quickcheck-instances-0.3.14
6−- th-abstraction-0.2.2.0
7−flags:
8− aeson:
9− fast: true
10− cffi: false
tests/DataFamilies/Encoders.hs+1−1
@@ -1,10 +1,10 @@
11{-# LANGUAGE CPP #-}
22{-# LANGUAGE GADTs #-}
3+{-# LANGUAGE NoImplicitPrelude #-}
34{-# LANGUAGE TemplateHaskell #-}
45
56module DataFamilies.Encoders (module DataFamilies.Encoders) where
67
7−import Prelude ()
88import Prelude.Compat
99
1010import Data.Aeson.TH
tests/DataFamilies/Instances.hs+2−1
@@ -1,12 +1,13 @@
11{-# LANGUAGE FlexibleInstances #-}
22{-# LANGUAGE GADTs #-}
3+{-# LANGUAGE NoImplicitPrelude #-}
34{-# LANGUAGE TemplateHaskell #-}
45{-# LANGUAGE TypeFamilies #-}
6+
57{-# OPTIONS_GHC -fno-warn-orphans #-}
68
79module DataFamilies.Instances () where
810
9−import Prelude ()
1011import Prelude.Compat
1112
1213import Data.Aeson.TH
tests/DataFamilies/Properties.hs+6−5
@@ -1,20 +1,21 @@
11{-# LANGUAGE CPP #-}
2+{-# LANGUAGE NoImplicitPrelude #-}
23
34module DataFamilies.Properties (tests) where
45
5−import Prelude ()
66import Prelude.Compat
77
88import DataFamilies.Encoders
99import DataFamilies.Instances ()
10−import Properties hiding (tests)
10+import PropUtils
1111
12−import Test.Framework (Test, testGroup)
13−import Test.Framework.Providers.QuickCheck2 (testProperty)
12+
13+import Test.Tasty (TestTree, testGroup)
14+import Test.Tasty.QuickCheck (testProperty)
1415
1516--------------------------------------------------------------------------------
1617
17−tests :: Test
18+tests :: TestTree
1819tests = testGroup "data families" [
1920 testGroup "template-haskell" [
2021 testGroup "toJSON" [
tests/DataFamilies/Types.hs+1−1
@@ -4,13 +4,13 @@
44{-# LANGUAGE FlexibleInstances #-}
55{-# LANGUAGE GADTs #-}
66{-# LANGUAGE GeneralizedNewtypeDeriving #-}
7+{-# LANGUAGE NoImplicitPrelude #-}
78{-# LANGUAGE StandaloneDeriving #-}
89{-# LANGUAGE TemplateHaskell #-}
910{-# LANGUAGE TypeFamilies #-}
1011
1112module DataFamilies.Types (module DataFamilies.Types) where
1213
13−import Prelude ()
1414import Prelude.Compat
1515
1616import Generics.Deriving.TH (deriveAll0)
tests/Encoders.hs+81−7
@@ -1,11 +1,12 @@
11{-# LANGUAGE CPP #-}
22{-# LANGUAGE GADTs #-}
3+{-# LANGUAGE NoImplicitPrelude #-}
34{-# LANGUAGE TemplateHaskell #-}
45
56module Encoders (module Encoders) where
67
7−import Prelude ()
88import Prelude.Compat
9+import Data.Text (Text)
910
1011import Data.Aeson.TH
1112import Data.Aeson.Types
@@ -96,6 +97,18 @@ gNullaryToEncodingObjectWithSingleField = genericToEncoding optsObjectWithSingle
9697gNullaryParseJSONObjectWithSingleField :: Value -> Parser Nullary
9798gNullaryParseJSONObjectWithSingleField = genericParseJSON optsObjectWithSingleField
9899
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"
99112
100113--------------------------------------------------------------------------------
101114-- SomeType encoders/decoders
@@ -175,7 +188,6 @@ gSomeTypeToEncoding2ElemArray = genericToEncoding opts2ElemArray
175188gSomeTypeParseJSON2ElemArray :: Value -> Parser (SomeType Int)
176189gSomeTypeParseJSON2ElemArray = genericParseJSON opts2ElemArray
177190
178−#if __GLASGOW_HASKELL__ >= 706
179191gSomeTypeLiftToEncoding2ElemArray :: LiftToEncoding SomeType a
180192gSomeTypeLiftToEncoding2ElemArray = genericLiftToEncoding opts2ElemArray
181193
@@ -184,7 +196,6 @@ gSomeTypeLiftToJSON2ElemArray = genericLiftToJSON opts2ElemArray
184196
185197gSomeTypeLiftParseJSON2ElemArray :: LiftParseJSON SomeType a
186198gSomeTypeLiftParseJSON2ElemArray = genericLiftParseJSON opts2ElemArray
187−#endif
188199
189200
190201gSomeTypeToJSONTaggedObject :: SomeType Int -> Value
@@ -196,7 +207,6 @@ gSomeTypeToEncodingTaggedObject = genericToEncoding optsTaggedObject
196207gSomeTypeParseJSONTaggedObject :: Value -> Parser (SomeType Int)
197208gSomeTypeParseJSONTaggedObject = genericParseJSON optsTaggedObject
198209
199−#if __GLASGOW_HASKELL__ >= 706
200210gSomeTypeLiftToEncodingTaggedObject :: LiftToEncoding SomeType a
201211gSomeTypeLiftToEncodingTaggedObject = genericLiftToEncoding optsTaggedObject
202212
@@ -205,7 +215,6 @@ gSomeTypeLiftToJSONTaggedObject = genericLiftToJSON optsTaggedObject
205215
206216gSomeTypeLiftParseJSONTaggedObject :: LiftParseJSON SomeType a
207217gSomeTypeLiftParseJSONTaggedObject = genericLiftParseJSON optsTaggedObject
208−#endif
209218
210219
211220gSomeTypeToJSONObjectWithSingleField :: SomeType Int -> Value
@@ -217,7 +226,6 @@ gSomeTypeToEncodingObjectWithSingleField = genericToEncoding optsObjectWithSingl
217226gSomeTypeParseJSONObjectWithSingleField :: Value -> Parser (SomeType Int)
218227gSomeTypeParseJSONObjectWithSingleField = genericParseJSON optsObjectWithSingleField
219228
220−#if __GLASGOW_HASKELL__ >= 706
221229gSomeTypeLiftToEncodingObjectWithSingleField :: LiftToEncoding SomeType a
222230gSomeTypeLiftToEncodingObjectWithSingleField = genericLiftToEncoding optsObjectWithSingleField
223231
@@ -226,7 +234,6 @@ gSomeTypeLiftToJSONObjectWithSingleField = genericLiftToJSON optsObjectWithSingl
226234
227235gSomeTypeLiftParseJSONObjectWithSingleField :: LiftParseJSON SomeType a
228236gSomeTypeLiftParseJSONObjectWithSingleField = genericLiftParseJSON optsObjectWithSingleField
229−#endif
230237
231238
232239gSomeTypeToJSONOmitNothingFields :: SomeType Int -> Value
@@ -235,6 +242,58 @@ gSomeTypeToJSONOmitNothingFields = genericToJSON optsOmitNothingFields
235242gSomeTypeToEncodingOmitNothingFields :: SomeType Int -> Encoding
236243gSomeTypeToEncodingOmitNothingFields = genericToEncoding optsOmitNothingFields
237244
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+
238297--------------------------------------------------------------------------------
239298-- IncoherentInstancesNeeded
240299--------------------------------------------------------------------------------
@@ -252,6 +311,11 @@ incoherentInstancesNeededParseJSONString :: FromJSON a => Value -> Parser (Incoh
252311incoherentInstancesNeededParseJSONString = case () of
253312 _ | True -> $(mkParseJSON defaultOptions ''IncoherentInstancesNeeded)
254313 | False -> genericParseJSON defaultOptions
314+
315+incoherentInstancesNeededToJSON :: ToJSON a => IncoherentInstancesNeeded a -> Value
316+incoherentInstancesNeededToJSON = case () of
317+ _ | True -> $(mkToJSON defaultOptions ''IncoherentInstancesNeeded)
318+ | False -> genericToJSON defaultOptions
255319#endif
256320
257321-------------------------------------------------------------------------------
@@ -382,3 +446,13 @@ gOneConstructorToEncodingTagged = genericToEncoding optsTagSingleConstructors
382446
383447gOneConstructorParseJSONTagged :: Value -> Parser OneConstructor
384448gOneConstructorParseJSONTagged = genericParseJSON optsTagSingleConstructors
449+
450+--------------------------------------------------------------------------------
451+-- Product2 encoders/decoders
452+--------------------------------------------------------------------------------
453+
454+thProduct2ParseJSON :: Value -> Parser (Product2 Int Bool)
455+thProduct2ParseJSON = $(mkParseJSON defaultOptions ''Product2)
456+
457+gProduct2ParseJSON :: Value -> Parser (Product2 Int Bool)
458+gProduct2ParseJSON = genericParseJSON defaultOptions
tests/ErrorMessages.hs+208−41
@@ -1,3 +1,4 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
12{-# LANGUAGE OverloadedStrings #-}
23{-# LANGUAGE ScopedTypeVariables #-}
34
@@ -6,52 +7,218 @@ module ErrorMessages
67 tests
78 ) where
89
9−import Prelude ()
1010import Prelude.Compat
1111
12−import Data.Aeson (FromJSON(..), eitherDecode)
12+import Data.Aeson (FromJSON(..), Value, json)
13+import Data.Aeson.Types (Parser)
14+import Data.Aeson.Parser (eitherDecodeWith)
15+import Data.Aeson.Internal (formatError, iparse)
16+import Data.Algorithm.Diff (PolyDiff (..), getGroupedDiff)
1317import Data.Proxy (Proxy(..))
18+import Data.Semigroup ((<>))
19+import Data.Sequence (Seq)
1420import Instances ()
15−import Test.Framework (Test)
16−import Test.Framework.Providers.HUnit (testCase)
17−import Test.HUnit (Assertion, assertFailure, assertEqual)
21+import Numeric.Natural (Natural)
22+import Test.Tasty (TestTree, TestName)
23+import Test.Tasty.Golden.Advanced (goldenTest)
1824import qualified Data.ByteString.Lazy.Char8 as L
1925import qualified Data.HashMap.Strict as HM
2026
21−tests :: [Test]
27+import Encoders
28+import Types
29+
30+tests :: [TestTree]
2231tests =
23− [
24− testCase "Int" int
25− , testCase "String" string
26− , testCase "HashMap" hashMap
27− ]
28−
29−int :: Assertion
30−int = do
31− let t = test (Proxy :: Proxy Int)
32− t "\"\"" $ expected "Int" "String"
33− t "[]" $ expected "Int" "Array"
34− t "{}" $ expected "Int" "Object"
35− t "null" $ expected "Int" "Null"
36−
37−string :: Assertion
38−string = do
39− let t = test (Proxy :: Proxy String)
40− t "1" $ expected "String" "Number"
41− t "[]" $ expected "String" "Array"
42− t "{}" $ expected "String" "Object"
43− t "null" $ expected "String" "Null"
44−
45−hashMap :: Assertion
46−hashMap = do
47− let t = test (Proxy :: Proxy (HM.HashMap String Int))
48− t "\"\"" $ expected "HashMap k v" "String"
49− t "[]" $ expected "HashMap k v" "Array"
50−
51−expected :: String -> String -> String
52−expected ex enc = "Error in $: expected " ++ ex ++ ", encountered " ++ enc
53−
54−test :: forall a proxy . (FromJSON a, Show a) => proxy a -> L.ByteString -> String -> Assertion
55−test _ v msg = case eitherDecode v of
56− Left e -> assertEqual "Invalid error message" msg e
57− Right (x :: a) -> assertFailure $ "Expected parsing to fail but it suceeded with: " ++ show x
32+ [ aesonGoldenTest "simple" "tests/golden/simple.expected" output
33+ , aesonGoldenTest "generic" "tests/golden/generic.expected" (outputGeneric G)
34+ ]
35+
36+output :: Output
37+output = concat
38+ [ testFor "Int" (Proxy :: Proxy Int)
39+ [ "\"\""
40+ , "[]"
41+ , "{}"
42+ , "null"
43+ ]
44+
45+ , testFor "Integer" (Proxy :: Proxy Integer)
46+ [ "44.44"
47+ ]
48+
49+ , testFor "Natural" (Proxy :: Proxy Natural)
50+ [ "44.44"
51+ , "-50"
52+ ]
53+
54+ , testFor "String" (Proxy :: Proxy String)
55+ [ "1"
56+ , "[]"
57+ , "{}"
58+ , "null"
59+ ]
60+
61+ , testFor "HashMap" (Proxy :: Proxy (HM.HashMap String Int))
62+ [ "\"\""
63+ , "[]"
64+ ]
65+
66+ -- issue #356
67+ , testFor "Either" (Proxy :: Proxy (Int, Either (Int, Bool) ()))
68+ [ "[1,{\"Left\":[2,3]}]"
69+ ]
70+
71+ -- issue #358
72+ , testFor "Seq" (Proxy :: Proxy (Seq Int))
73+ [ "[0,1,true]"
74+ ]
75+ ]
76+
77+data Choice = TH | G
78+
79+outputGeneric :: Choice -> Output
80+outputGeneric choice = concat
81+ [ testWith "OneConstructor"
82+ (select
83+ thOneConstructorParseJSONDefault
84+ gOneConstructorParseJSONDefault)
85+ [ "\"X\""
86+ , "[0]"
87+ ]
88+
89+ , testWith "Nullary"
90+ (select
91+ thNullaryParseJSONString
92+ gNullaryParseJSONString)
93+ [ "\"X\""
94+ , "[]"
95+ ]
96+
97+ , testWithSomeType "SomeType (tagged)"
98+ (select
99+ thSomeTypeParseJSONTaggedObject
100+ gSomeTypeParseJSONTaggedObject)
101+ [ "{\"tag\": \"unary\", \"contents\": true}"
102+ , "{\"tag\": \"unary\"}"
103+ , "{\"tag\": \"record\"}"
104+ , "{\"tag\": \"record\", \"testone\": true, \"testtwo\": null, \"testthree\": null}"
105+ , "{\"tag\": \"X\"}"
106+ , "{}"
107+ , "[]"
108+ ]
109+
110+ , testWithSomeType "SomeType (single-field)"
111+ (select
112+ thSomeTypeParseJSONObjectWithSingleField
113+ gSomeTypeParseJSONObjectWithSingleField)
114+ [ "{\"unary\": {}}"
115+ , "{\"unary\": []}"
116+ , "{\"X\": []}"
117+ , "{\"record\": {}, \"W\":{}}"
118+ , "{}"
119+ , "[]"
120+ , "{\"unary\""
121+ , "{\"unary\":"
122+ , "{\"unary\":1"
123+ ]
124+
125+ , testWithSomeType "SomeType (two-element array)"
126+ (select
127+ thSomeTypeParseJSON2ElemArray
128+ gSomeTypeParseJSON2ElemArray)
129+ [ "[\"unary\", true]"
130+ , "[\"record\", null]"
131+ , "[\"X\", 0]"
132+ , "[null, 0]"
133+ , "[]"
134+ , "{}"
135+ , "[1"
136+ , "[1,"
137+ ]
138+
139+ , testWithSomeType "SomeType (reject unknown fields)"
140+ (select
141+ thSomeTypeParseJSONRejectUnknownFields
142+ gSomeTypeParseJSONRejectUnknownFields)
143+ [ "{\"tag\": \"record\", \"testOne\": 1.0, \"testZero\": 1}"
144+ , "{\"testZero\": 1}"
145+ , "{\"tag\": \"record\", \"testone\": true, \"testtwo\": null, \"testthree\": null}"
146+ ]
147+
148+ , testWithFoo "Foo (reject unknown fields)"
149+ (select
150+ thFooParseJSONRejectUnknownFields
151+ gFooParseJSONRejectUnknownFields)
152+ [ "{\"tag\": \"foo\"}"
153+ ]
154+
155+ , testWithFoo "Foo (reject unknown fields, tagged single)"
156+ (select
157+ thFooParseJSONRejectUnknownFieldsTagged
158+ gFooParseJSONRejectUnknownFieldsTagged)
159+ [ "{\"tag\": \"foo\", \"unknownField\": 0}"
160+ ]
161+
162+ , testWith "EitherTextInt"
163+ (select
164+ thEitherTextIntParseJSONUntaggedValue
165+ gEitherTextIntParseJSONUntaggedValue)
166+ [ "\"X\""
167+ , "[]"
168+ ]
169+
170+ , testWith "Product2 Int Bool"
171+ (select
172+ thProduct2ParseJSON
173+ gProduct2ParseJSON)
174+ [ "[1, null]"
175+ , "[]"
176+ , "{}"
177+ ]
178+ ]
179+ where
180+ select a b = case choice of
181+ TH -> a
182+ G -> b
183+
184+-- Test infrastructure
185+
186+type Output = [String]
187+
188+outputLine :: String -> Output
189+outputLine = pure
190+
191+aesonGoldenTest :: TestName -> FilePath -> Output -> TestTree
192+aesonGoldenTest name ref out = goldenTest name (L.readFile ref) act cmp upd
193+ where
194+ act = pure (L.pack (unlines out))
195+ upd = L.writeFile ref
196+ cmp x y | x == y = return Nothing
197+ cmp x y = return $ Just $ unlines $
198+ concatMap f (getGroupedDiff (L.lines x) (L.lines y))
199+ where
200+ f (First xs) = map (cons3 '-' . L.unpack) xs
201+ f (Second ys) = map (cons3 '+' . L.unpack) ys
202+ -- we print unchanged lines too. It shouldn't be a problem while we have
203+ -- reasonably small examples
204+ f (Both xs _) = map (cons3 ' ' . L.unpack) xs
205+ -- we add three characters, so the changed lines are easier to spot
206+ cons3 c cs = c : c : c : ' ' : cs
207+
208+testWith :: Show a => String -> (Value -> Parser a) -> [L.ByteString] -> Output
209+testWith name parser ts =
210+ outputLine name <>
211+ foldMap (\s ->
212+ case eitherDecodeWith json (iparse parser) s of
213+ Left err -> outputLine $ uncurry formatError err
214+ Right a -> outputLine $ show a) ts
215+
216+testFor :: forall a proxy. (FromJSON a, Show a)
217+ => String -> proxy a -> [L.ByteString] -> Output
218+testFor name _ = testWith name (parseJSON :: Value -> Parser a)
219+
220+testWithSomeType :: String -> (Value -> Parser (SomeType Int)) -> [L.ByteString] -> Output
221+testWithSomeType = testWith
222+
223+testWithFoo :: String -> (Value -> Parser Foo) -> [L.ByteString] -> Output
224+testWithFoo = testWith
tests/Functions.hs+2−1
@@ -1,10 +1,11 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
13module Functions
24 (
35 approxEq
46 , approxEqWith
57 ) where
68
7−import Prelude ()
89import Prelude.Compat
910
1011approxEq :: (Fractional a, Ord a) => a -> a -> Bool
tests/Instances.hs+7−62
@@ -1,13 +1,13 @@
1−{-# LANGUAGE CPP #-}
21{-# LANGUAGE FlexibleContexts #-}
32{-# LANGUAGE FlexibleInstances #-}
3+{-# LANGUAGE NoImplicitPrelude #-}
44{-# LANGUAGE OverloadedStrings #-}
55{-# LANGUAGE RecordWildCards #-}
6+
67{-# OPTIONS_GHC -fno-warn-orphans #-}
78
89module Instances () where
910
10−import Prelude ()
1111import Prelude.Compat
1212
1313import Control.Applicative (empty)
@@ -22,35 +22,14 @@ import Types
2222import qualified Data.DList as DList
2323import qualified Data.HashMap.Strict as HM
2424
25−#if !MIN_VERSION_QuickCheck(2,9,0)
26−import Control.Applicative (Const(..))
27−import Data.Functor.Identity (Identity (..))
28−import Data.List.NonEmpty (NonEmpty(..))
29−import Data.Version
30−import Test.QuickCheck (getNonNegative, listOf1, resize)
31−#endif
32−
33−#if !MIN_VERSION_QuickCheck(2,10,0)
34−import Data.Functor.Compose (Compose (..))
35−import Data.Proxy (Proxy(..))
36−#endif
37−
3825import Data.Orphans ()
3926import Test.QuickCheck.Instances ()
40−#if MIN_VERSION_base(4,7,0)
4127import Data.Hashable.Time ()
42−#endif
43−
44−#if !MIN_VERSION_base(4,8,0) && !MIN_VERSION_QuickCheck(2,8,3)
45−import Numeric.Natural
46−#endif
47−
48−{-# ANN module ("HLint: ignore Use fewer imports"::String) #-}
4928
5029-- "System" types.
5130
5231instance Arbitrary DotNetTime where
53− arbitrary = DotNetTime `liftM` arbitrary
32+ arbitrary = DotNetTime `fmap` arbitrary
5433 shrink = map DotNetTime . shrink . fromDotNetTime
5534
5635-- | Compare timezone part only on 'timeZoneMinutes'
@@ -174,49 +153,15 @@ instance Arbitrary EitherTextInt where
174153instance Arbitrary (GADT String) where
175154 arbitrary = GADT <$> arbitrary
176155
156+instance Arbitrary OptionField where
157+ arbitrary = OptionField <$> arbitrary
158+
159+
177160instance ApproxEq Char where
178161 (=~) = (==)
179162
180163instance (ApproxEq a) => ApproxEq [a] where
181164 a =~ b = length a == length b && all (uncurry (=~)) (zip a b)
182165
183−-- Version tags are deprecated, so we avoid using them in the Arbitrary
184−-- instance. However, the recommended constructor 'makeVersion' is not
185−-- exported by "Data.Version" until base-4.8.0.0. For previous versions,
186−-- a definition is given below.
187−
188−
189−#if !MIN_VERSION_base(4,8,0) && !MIN_VERSION_QuickCheck(2,8,3)
190−instance Arbitrary Natural where
191− arbitrary = fromInteger . abs <$> arbitrary
192−#endif
193−
194−#if !MIN_VERSION_QuickCheck(2,10,0)
195−instance Arbitrary (Proxy a) where
196− arbitrary = pure Proxy
197−
198−instance Arbitrary (f (g a)) => Arbitrary (Compose f g a) where
199− arbitrary = Compose <$> arbitrary
200−#endif
201−
202166instance Arbitrary a => Arbitrary (DList.DList a) where
203167 arbitrary = DList.fromList <$> 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
tests/JSONTestSuite/parsers/test_haskell-aeson/testaeson.cabal+5−3
@@ -1,6 +1,8 @@
1−-- This file has been generated from package.yaml by hpack version 0.14.0.
1+-- This file has been generated from package.yaml by hpack version 0.28.2.
22--
33-- see: https://github.com/sol/hpack
4+--
5+-- hash: 716ef4c3e64849526f097b85ed05015e0072c2e2afcc1f91e58d8bea68b123b2
46
57name: testaeson
68version: 0.0.0
@@ -12,8 +14,8 @@ executable testaeson
1214 hs-source-dirs:
1315 src
1416 build-depends:
15− base >= 4.7 && < 5
16− , aeson
17+ aeson
18+ , base >=4.7 && <5
1719 , base-prelude
1820 , bytestring
1921 default-language: Haskell2010
tests/Options.hs+19−1
@@ -1,6 +1,7 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
13module Options (module Options) where
24
3−import Prelude ()
45import Prelude.Compat
56
67import Data.Aeson.Types
@@ -48,3 +49,20 @@ optsTagSingleConstructors = optsDefault
4849 { tagSingleConstructors = True
4950 , allNullaryToStringTag = False
5051 }
52+
53+optsOptionField :: Options
54+optsOptionField = optsDefault
55+ { fieldLabelModifier = const "field"
56+ , omitNothingFields = True
57+ }
58+
59+optsRejectUnknownFields :: Options
60+optsRejectUnknownFields = optsDefault
61+ { rejectUnknownFields = True
62+ }
63+
64+optsRejectUnknownFieldsTagged :: Options
65+optsRejectUnknownFieldsTagged = optsDefault
66+ { rejectUnknownFields = True
67+ , tagSingleConstructors = True
68+ }
tests/PropUtils.hsnew file+208
@@ -0,0 +1,208 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
2+{-# LANGUAGE OverloadedStrings #-}
3+{-# LANGUAGE RankNTypes #-}
4+
5+module PropUtils (module PropUtils) where
6+
7+import Prelude.Compat
8+
9+import Data.Aeson (eitherDecode, encode)
10+import Data.Aeson.Encoding (encodingToLazyByteString)
11+import Data.Aeson.Internal (IResult(..), formatError, ifromJSON, iparse)
12+import qualified Data.Aeson.Internal as I
13+import Data.Aeson.Parser (value)
14+import Data.Aeson.Types
15+import Data.HashMap.Strict (HashMap)
16+import Data.Hashable (Hashable)
17+import Data.Int (Int8)
18+import Data.Map (Map)
19+import Data.Time (ZonedTime)
20+import Encoders
21+import Instances ()
22+import Test.QuickCheck (Arbitrary(..), Property, Testable, (===), (.&&.), counterexample)
23+import Types
24+import qualified Data.Attoparsec.Lazy as L
25+import qualified Data.ByteString.Lazy.Char8 as L
26+import qualified Data.HashMap.Strict as H
27+import qualified Data.Map as Map
28+import qualified Data.Text as T
29+import qualified Data.Vector as V
30+
31+
32+encodeDouble :: Double -> Double -> Property
33+encodeDouble num denom
34+ | isInfinite d || isNaN d = encode d === "null"
35+ | otherwise = (read . L.unpack . encode) d === d
36+ where d = num / denom
37+
38+encodeInteger :: Integer -> Property
39+encodeInteger i = encode i === L.pack (show i)
40+
41+toParseJSON :: (Eq a, Show a) =>
42+ (Value -> Parser a) -> (a -> Value) -> a -> Property
43+toParseJSON parsejson tojson x =
44+ case iparse parsejson . tojson $ x of
45+ IError path msg -> failure "parse" (formatError path msg) x
46+ ISuccess x' -> x === x'
47+
48+toParseJSON1
49+ :: (Eq (f Int), Show (f Int))
50+ => (forall a. LiftParseJSON f a)
51+ -> (forall a. LiftToJSON f a)
52+ -> f Int
53+ -> Property
54+toParseJSON1 parsejson1 tojson1 = toParseJSON parsejson tojson
55+ where
56+ parsejson = parsejson1 parseJSON (listParser parseJSON)
57+ tojson = tojson1 toJSON (listValue toJSON)
58+
59+roundTripEnc :: (FromJSON a, ToJSON a, Show a) =>
60+ (a -> a -> Property) -> a -> a -> Property
61+roundTripEnc eq _ i =
62+ case fmap ifromJSON . L.parse value . encode $ i of
63+ L.Done _ (ISuccess v) -> v `eq` i
64+ L.Done _ (IError path err) -> failure "fromJSON" (formatError path err) i
65+ L.Fail _ _ err -> failure "parse" err i
66+
67+roundTripNoEnc :: (FromJSON a, ToJSON a, Show a) =>
68+ (a -> a -> Property) -> a -> a -> Property
69+roundTripNoEnc eq _ i =
70+ case ifromJSON . toJSON $ i of
71+ (ISuccess v) -> v `eq` i
72+ (IError path err) -> failure "fromJSON" (formatError path err) i
73+
74+roundTripEq :: (Eq a, FromJSON a, ToJSON a, Show a) => a -> a -> Property
75+roundTripEq x y = roundTripEnc (===) x y .&&. roundTripNoEnc (===) x y
76+
77+-- We test keys by encoding HashMap and Map with it
78+roundTripKey
79+ :: (Ord a, Hashable a, FromJSONKey a, ToJSONKey a, Show a)
80+ => a -> HashMap a Int -> Map a Int -> Property
81+roundTripKey _ h m = roundTripEq h h .&&. roundTripEq m m
82+
83+infix 4 ==~
84+(==~) :: (ApproxEq a, Show a) => a -> a -> Property
85+x ==~ y =
86+ counterexample (show x ++ " /= " ++ show y) (x =~ y)
87+
88+toFromJSON :: (Arbitrary a, Eq a, FromJSON a, ToJSON a, Show a) => a -> Property
89+toFromJSON x = case ifromJSON (toJSON x) of
90+ IError path err -> failure "fromJSON" (formatError path err) x
91+ ISuccess x' -> x === x'
92+
93+modifyFailureProp :: String -> String -> Bool
94+modifyFailureProp orig added =
95+ result == Error (added ++ orig)
96+ where
97+ parser = const $ modifyFailure (added ++) $ fail orig
98+ result :: Result ()
99+ result = parse parser ()
100+
101+parserThrowErrorProp :: String -> Property
102+parserThrowErrorProp msg =
103+ result === Error msg
104+ where
105+ parser = const $ parserThrowError [] msg
106+ result :: Result ()
107+ result = parse parser ()
108+
109+-- | Tests (also) that we catch the JSONPath and it has elements in the right order.
110+parserCatchErrorProp :: [String] -> String -> Property
111+parserCatchErrorProp path msg =
112+ result === Success ([I.Key "outer", I.Key "inner"] ++ jsonPath, msg)
113+ where
114+ parser = parserCatchError outer (curry pure)
115+
116+ outer = inner I.<?> I.Key "outer"
117+ inner = parserThrowError jsonPath msg I.<?> I.Key "inner"
118+
119+ result :: Result (I.JSONPath, String)
120+ result = parse (const parser) ()
121+
122+ jsonPath = map (I.Key . T.pack) path
123+
124+-- | Perform a structural comparison of the results of two encoding
125+-- methods. Compares decoded values to account for HashMap-driven
126+-- variation in JSON object key ordering.
127+sameAs :: (a -> Value) -> (a -> Encoding) -> a -> Property
128+sameAs toVal toEnc v =
129+ counterexample (show s) $
130+ eitherDecode s === Right (toVal v)
131+ where
132+ s = encodingToLazyByteString (toEnc v)
133+
134+sameAs1
135+ :: (forall a. LiftToJSON f a)
136+ -> (forall a. LiftToEncoding f a)
137+ -> f Int
138+ -> Property
139+sameAs1 toVal1 toEnc1 v = lhs === rhs
140+ where
141+ rhs = Right $ toVal1 toJSON (listValue toJSON) v
142+ lhs = eitherDecode . encodingToLazyByteString $
143+ toEnc1 toEncoding (listEncoding toEncoding) v
144+
145+sameAs1Agree
146+ :: ToJSON a
147+ => (f a -> Encoding)
148+ -> (forall b. LiftToEncoding f b)
149+ -> f a
150+ -> Property
151+sameAs1Agree toEnc toEnc1 v = rhs === lhs
152+ where
153+ rhs = encodingToLazyByteString $ toEnc v
154+ lhs = encodingToLazyByteString $ toEnc1 toEncoding (listEncoding toEncoding) v
155+
156+type P6 = Product6 Int Bool String (Approx Double) (Int, Approx Double) ()
157+type S4 = Sum4 Int8 ZonedTime T.Text (Map.Map String Int)
158+
159+--------------------------------------------------------------------------------
160+-- Value properties
161+--------------------------------------------------------------------------------
162+
163+-- | Add the formatted @Value@ to the printed counterexample when the property
164+-- fails.
165+checkValue :: Testable a => (Value -> a) -> Value -> Property
166+checkValue prop v = counterexample (L.unpack (encode v)) (prop v)
167+
168+isString :: Value -> Bool
169+isString (String _) = True
170+isString _ = False
171+
172+is2ElemArray :: Value -> Bool
173+is2ElemArray (Array v) = V.length v == 2 && isString (V.head v)
174+is2ElemArray _ = False
175+
176+isTaggedObjectValue :: Value -> Bool
177+isTaggedObjectValue (Object obj) = "tag" `H.member` obj &&
178+ "contents" `H.member` obj
179+isTaggedObjectValue _ = False
180+
181+isNullaryTaggedObject :: Value -> Bool
182+isNullaryTaggedObject obj = isTaggedObject' obj && isObjectWithSingleField obj
183+
184+isTaggedObject :: Value -> Property
185+isTaggedObject = checkValue isTaggedObject'
186+
187+isTaggedObject' :: Value -> Bool
188+isTaggedObject' (Object obj) = "tag" `H.member` obj
189+isTaggedObject' _ = False
190+
191+isObjectWithSingleField :: Value -> Bool
192+isObjectWithSingleField (Object obj) = H.size obj == 1
193+isObjectWithSingleField _ = False
194+
195+-- | is untaggedValue of EitherTextInt
196+isUntaggedValueETI :: Value -> Bool
197+isUntaggedValueETI (String s)
198+ | s == "nonenullary" = True
199+isUntaggedValueETI (Bool _) = True
200+isUntaggedValueETI (Number _) = True
201+isUntaggedValueETI (Array a) = length a == 2
202+isUntaggedValueETI _ = False
203+
204+isEmptyArray :: Value -> Property
205+isEmptyArray = checkValue isEmptyArray'
206+
207+isEmptyArray' :: Value -> Bool
208+isEmptyArray' = (Array mempty ==)
tests/Properties.hs+14−511
@@ -1,326 +1,28 @@
1−{-# LANGUAGE CPP #-}
2−{-# LANGUAGE FlexibleContexts #-} -- For arbitrary Compose
3−{-# LANGUAGE OverloadedStrings #-}
4−{-# LANGUAGE RankNTypes #-}
5−{-# LANGUAGE ScopedTypeVariables #-}
1+{-# LANGUAGE NoImplicitPrelude #-}
62
73module Properties (module Properties) where
84
9−import Prelude ()
105import Prelude.Compat
116
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 qualified Data.Aeson.Internal as I
17−import Data.Aeson.Parser (value)
18−import Data.Aeson.Types
19−import Data.DList (DList)
20−import Data.Functor.Compose (Compose (..))
21−import Data.HashMap.Strict (HashMap)
22−import Data.Hashable (Hashable)
23−import Data.Int (Int8)
24−import Data.List.NonEmpty (NonEmpty)
25−import Data.Map (Map)
26−import Data.Proxy (Proxy)
27−import Data.Ratio (Ratio)
28−import Data.Sequence (Seq)
29−import Data.Tagged (Tagged)
30−import Data.Time (Day, LocalTime, NominalDiffTime, TimeOfDay, UTCTime, ZonedTime)
31−import Data.Version (Version)
32−import Encoders
337import Instances ()
34−import Numeric.Natural (Natural)
35−import Test.Framework (Test, testGroup)
36−import Test.Framework.Providers.QuickCheck2 (testProperty)
37−import Test.QuickCheck (Arbitrary(..), Property, Testable, (===), (.&&.), counterexample)
38−import Types
39−import qualified Data.Attoparsec.Lazy as L
40−import qualified Data.ByteString.Lazy.Char8 as L
41−import qualified Data.HashMap.Strict as H
42−import qualified Data.Map as Map
43−import qualified Data.Text as T
44−import qualified Data.Text.Lazy as LT
45−import qualified Data.UUID.Types as UUID
46−import qualified Data.Vector as V
8+import Test.Tasty (TestTree, testGroup)
9+import Test.Tasty.QuickCheck (testProperty)
10+import Test.QuickCheck (Property)
11+import PropUtils
12+import PropertyGeneric
13+import PropertyKeys
14+import PropertyRoundTrip
15+import PropertyTH
4716
48−encodeDouble :: Double -> Double -> Property
49−encodeDouble num denom
50− | isInfinite d || isNaN d = encode d === "null"
51− | otherwise = (read . L.unpack . encode) d === d
52− where d = num / denom
5317
54−encodeInteger :: Integer -> Property
55−encodeInteger i = encode i === L.pack (show i)
56−
57−toParseJSON :: (Eq a, Show a) =>
58− (Value -> Parser a) -> (a -> Value) -> a -> Property
59−toParseJSON parsejson tojson x =
60− case iparse parsejson . tojson $ x of
61− IError path msg -> failure "parse" (formatError path msg) x
62− ISuccess x' -> x === x'
63−
64−toParseJSON1
65− :: (Eq (f Int), Show (f Int))
66− => (forall a. LiftParseJSON f a)
67− -> (forall a. LiftToJSON f a)
68− -> f Int
69− -> Property
70−toParseJSON1 parsejson1 tojson1 = toParseJSON parsejson tojson
71− where
72− parsejson = parsejson1 parseJSON (listParser parseJSON)
73− tojson = tojson1 toJSON (listValue toJSON)
74−
75−roundTripEnc :: (FromJSON a, ToJSON a, Show a) =>
76− (a -> a -> Property) -> a -> a -> Property
77−roundTripEnc eq _ i =
78− case fmap ifromJSON . L.parse value . encode $ i of
79− L.Done _ (ISuccess v) -> v `eq` i
80− L.Done _ (IError path err) -> failure "fromJSON" (formatError path err) i
81− L.Fail _ _ err -> failure "parse" err i
82−
83−roundTripNoEnc :: (FromJSON a, ToJSON a, Show a) =>
84− (a -> a -> Property) -> a -> a -> Property
85−roundTripNoEnc eq _ i =
86− case ifromJSON . toJSON $ i of
87− (ISuccess v) -> v `eq` i
88− (IError path err) -> failure "fromJSON" (formatError path err) i
89−
90−roundTripEq :: (Eq a, FromJSON a, ToJSON a, Show a) => a -> a -> Property
91−roundTripEq x y = roundTripEnc (===) x y .&&. roundTripNoEnc (===) x y
92−
93−-- We test keys by encoding HashMap and Map with it
94−roundTripKey
95− :: (Ord a, Hashable a, FromJSONKey a, ToJSONKey a, Show a)
96− => a -> HashMap a Int -> Map a Int -> Property
97−roundTripKey _ h m = roundTripEq h h .&&. roundTripEq m m
98−
99−infix 4 ==~
100−(==~) :: (ApproxEq a, Show a) => a -> a -> Property
101−x ==~ y =
102− counterexample (show x ++ " /= " ++ show y) (x =~ y)
103−
104−toFromJSON :: (Arbitrary a, Eq a, FromJSON a, ToJSON a, Show a) => a -> Property
105−toFromJSON x = case ifromJSON (toJSON x) of
106− IError path err -> failure "fromJSON" (formatError path err) x
107− ISuccess x' -> x === x'
108−
109−modifyFailureProp :: String -> String -> Bool
110−modifyFailureProp orig added =
111− result == Error (added ++ orig)
112− where
113− parser = const $ modifyFailure (added ++) $ fail orig
114− result :: Result ()
115− result = parse parser ()
116−
117−parserThrowErrorProp :: String -> Property
118−parserThrowErrorProp msg =
119− result === Error msg
120− where
121− parser = const $ parserThrowError [] msg
122− result :: Result ()
123− result = parse parser ()
124−
125−-- | Tests (also) that we catch the JSONPath and it has elements in the right order.
126−parserCatchErrorProp :: [String] -> String -> Property
127−parserCatchErrorProp path msg =
128− result === Success ([I.Key "outer", I.Key "inner"] ++ jsonPath, msg)
129− where
130− parser = parserCatchError outer (curry pure)
131−
132− outer = inner I.<?> I.Key "outer"
133− inner = parserThrowError jsonPath msg I.<?> I.Key "inner"
134−
135− result :: Result (I.JSONPath, String)
136− result = parse (const parser) ()
137−
138− jsonPath = map (I.Key . T.pack) path
139−
140−-- | Perform a structural comparison of the results of two encoding
141−-- methods. Compares decoded values to account for HashMap-driven
142−-- variation in JSON object key ordering.
143−sameAs :: (a -> Value) -> (a -> Encoding) -> a -> Property
144−sameAs toVal toEnc v =
145− eitherDecode (encodingToLazyByteString (toEnc v)) === Right (toVal v)
146−
147−sameAs1
148− :: (forall a. LiftToJSON f a)
149− -> (forall a. LiftToEncoding f a)
150− -> f Int
151− -> Property
152−sameAs1 toVal1 toEnc1 v = lhs === rhs
153− where
154− rhs = Right $ toVal1 toJSON (listValue toJSON) v
155− lhs = eitherDecode . encodingToLazyByteString $
156− toEnc1 toEncoding (listEncoding toEncoding) v
157−
158−sameAs1Agree
159− :: ToJSON a
160− => (f a -> Encoding)
161− -> (forall b. LiftToEncoding f b)
162− -> f a
163− -> Property
164−sameAs1Agree toEnc toEnc1 v = rhs === lhs
165− where
166− rhs = encodingToLazyByteString $ toEnc v
167− lhs = encodingToLazyByteString $ toEnc1 toEncoding (listEncoding toEncoding) v
168−
169−type P6 = Product6 Int Bool String (Approx Double) (Int, Approx Double) ()
170−type S4 = Sum4 Int8 ZonedTime T.Text (Map.Map String Int)
171−
172−--------------------------------------------------------------------------------
173−-- Value properties
174−--------------------------------------------------------------------------------
175−
176−-- | Add the formatted @Value@ to the printed counterexample when the property
177−-- fails.
178−checkValue :: Testable a => (Value -> a) -> Value -> Property
179−checkValue prop v = counterexample (L.unpack (encode v)) (prop v)
180−
181−isString :: Value -> Bool
182−isString (String _) = True
183−isString _ = False
184−
185−is2ElemArray :: Value -> Bool
186−is2ElemArray (Array v) = V.length v == 2 && isString (V.head v)
187−is2ElemArray _ = False
188−
189−isTaggedObjectValue :: Value -> Bool
190−isTaggedObjectValue (Object obj) = "tag" `H.member` obj &&
191− "contents" `H.member` obj
192−isTaggedObjectValue _ = False
193−
194−isNullaryTaggedObject :: Value -> Bool
195−isNullaryTaggedObject obj = isTaggedObject' obj && isObjectWithSingleField obj
196−
197−isTaggedObject :: Value -> Property
198−isTaggedObject = checkValue isTaggedObject'
199−
200−isTaggedObject' :: Value -> Bool
201−isTaggedObject' (Object obj) = "tag" `H.member` obj
202−isTaggedObject' _ = False
203−
204−isObjectWithSingleField :: Value -> Bool
205−isObjectWithSingleField (Object obj) = H.size obj == 1
206−isObjectWithSingleField _ = False
207−
208−-- | is untaggedValue of EitherTextInt
209−isUntaggedValueETI :: Value -> Bool
210−isUntaggedValueETI (String s)
211− | s == "nonenullary" = True
212−isUntaggedValueETI (Bool _) = True
213−isUntaggedValueETI (Number _) = True
214−isUntaggedValueETI (Array a) = length a == 2
215−isUntaggedValueETI _ = False
216−
217−isEmptyArray :: Value -> Property
218−isEmptyArray = checkValue isEmptyArray'
219−
220−isEmptyArray' :: Value -> Bool
221−isEmptyArray' = (Array mempty ==)
222−
223−
224−--------------------------------------------------------------------------------
225−
226−
227−tests :: Test
18+tests :: TestTree
22819tests = testGroup "properties" [
22920 testGroup "encode" [
23021 testProperty "encodeDouble" encodeDouble
23122 , testProperty "encodeInteger" encodeInteger
23223 ]
233− , testGroup "roundTrip" [
234− testProperty "Bool" $ roundTripEq True
235− , testProperty "Double" $ roundTripEq (1 :: Approx Double)
236− , testProperty "Int" $ roundTripEq (1 :: Int)
237− , testProperty "NonEmpty Char" $ roundTripEq (undefined :: NonEmpty Char)
238− , testProperty "Integer" $ roundTripEq (1 :: Integer)
239− , testProperty "String" $ roundTripEq ("" :: String)
240− , testProperty "Text" $ roundTripEq T.empty
241− , testProperty "Lazy Text" $ roundTripEq LT.empty
242− , testProperty "Foo" $ roundTripEq (undefined :: Foo)
243− , testProperty "Day" $ roundTripEq (undefined :: Day)
244− , testProperty "BCE Day" $ roundTripEq (undefined :: BCEDay)
245− , testProperty "DotNetTime" $ roundTripEq (undefined :: Approx DotNetTime)
246− , testProperty "LocalTime" $ roundTripEq (undefined :: LocalTime)
247− , testProperty "TimeOfDay" $ roundTripEq (undefined :: TimeOfDay)
248− , testProperty "UTCTime" $ roundTripEq (undefined :: UTCTime)
249− , testProperty "ZonedTime" $ roundTripEq (undefined :: ZonedTime)
250− , testProperty "NominalDiffTime" $ roundTripEq (undefined :: NominalDiffTime)
251− , testProperty "Version" $ roundTripEq (undefined :: Version)
252− , testProperty "Natural" $ roundTripEq (undefined :: Natural)
253− , testProperty "Proxy" $ roundTripEq (undefined :: Proxy Int)
254− , testProperty "Tagged" $ roundTripEq (undefined :: Tagged Int Char)
255− , testProperty "Const" $ roundTripEq (undefined :: Const Int Char)
256− , testProperty "DList" $ roundTripEq (undefined :: DList Int)
257− , testProperty "Seq" $ roundTripEq (undefined :: Seq Int)
258− , testProperty "Rational" $ roundTripEq (undefined :: Rational)
259− , testProperty "Ratio Int" $ roundTripEq (undefined :: Ratio Int)
260− , testProperty "UUID" $ roundTripEq UUID.nil
261− , testGroup "functors"
262− [ testProperty "Identity Char" $ roundTripEq (undefined :: I Int)
263−
264− , testProperty "Identity Char" $ roundTripEq (undefined :: I Char)
265− , testProperty "Identity [Char]" $ roundTripEq (undefined :: I String)
266− , testProperty "[Identity Char]" $ roundTripEq (undefined :: [I Char])
267−
268− , testProperty "Compose I I Int" $ roundTripEq (undefined :: LogScaled (Compose I I Int))
269− , testProperty "Compose [] I Int" $ roundTripEq (undefined :: LogScaled (Compose [] I Int))
270− , testProperty "Compose I [] Int" $ roundTripEq (undefined :: LogScaled (Compose I [] Int))
271− , testProperty "Compose [] [] Int" $ roundTripEq (undefined :: LogScaled (Compose [] [] Int))
272−
273− , testProperty "Compose I I Char" $ roundTripEq (undefined :: LogScaled (Compose I I Char))
274− , testProperty "Compose [] I Char" $ roundTripEq (undefined :: LogScaled (Compose [] I Char))
275− , testProperty "Compose I [] Char" $ roundTripEq (undefined :: LogScaled (Compose I [] Char))
276− , testProperty "Compose [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose [] [] Char))
277−
278− , testProperty "Compose3 I I I Char" $ roundTripEq (undefined :: LogScaled (Compose3 I I I Char))
279− , testProperty "Compose3 I [] I Char" $ roundTripEq (undefined :: LogScaled (Compose3 I [] I Char))
280− , testProperty "Compose3 I I [] Char" $ roundTripEq (undefined :: LogScaled (Compose3 I I [] Char))
281− , testProperty "Compose3 I [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose3 I [] [] Char))
282− , testProperty "Compose3 [] I I Char" $ roundTripEq (undefined :: LogScaled (Compose3 [] I I Char))
283− , testProperty "Compose3 [] [] I Char" $ roundTripEq (undefined :: LogScaled (Compose3 [] [] I Char))
284− , testProperty "Compose3 [] I [] Char" $ roundTripEq (undefined :: LogScaled (Compose3 [] I [] Char))
285− , testProperty "Compose3 [] [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose3 [] [] [] Char))
286−
287− , testProperty "Compose3' I I I Char" $ roundTripEq (undefined :: LogScaled (Compose3' I I I Char))
288− , testProperty "Compose3' I [] I Char" $ roundTripEq (undefined :: LogScaled (Compose3' I [] I Char))
289− , testProperty "Compose3' I I [] Char" $ roundTripEq (undefined :: LogScaled (Compose3' I I [] Char))
290− , testProperty "Compose3' I [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose3' I [] [] Char))
291− , testProperty "Compose3' [] I I Char" $ roundTripEq (undefined :: LogScaled (Compose3' [] I I Char))
292− , testProperty "Compose3' [] [] I Char" $ roundTripEq (undefined :: LogScaled (Compose3' [] [] I Char))
293− , testProperty "Compose3' [] I [] Char" $ roundTripEq (undefined :: LogScaled (Compose3' [] I [] Char))
294− , testProperty "Compose3' [] [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose3' [] [] [] Char))
295− ]
296− , testGroup "ghcGenerics" [
297− testProperty "OneConstructor" $ roundTripEq OneConstructor
298− , testProperty "Product2" $ roundTripEq (undefined :: Product2 Int Bool)
299− , testProperty "Product6" $ roundTripEq (undefined :: P6)
300− , testProperty "Sum4" $ roundTripEq (undefined :: S4)
301− ]
302− ]
303− , testGroup "roundTrip Key"
304− [ testProperty "Bool" $ roundTripKey True
305− , testProperty "Text" $ roundTripKey (undefined :: T.Text)
306− , testProperty "String" $ roundTripKey (undefined :: String)
307− , testProperty "Int" $ roundTripKey (undefined :: Int)
308− , testProperty "[Text]" $ roundTripKey (undefined :: LogScaled [T.Text])
309− , testProperty "(Int,Char)" $ roundTripKey (undefined :: (Int,Char))
310− , testProperty "Integer" $ roundTripKey (undefined :: Integer)
311− , testProperty "Natural" $ roundTripKey (undefined :: Natural)
312− , testProperty "Float" $ roundTripKey (undefined :: Float)
313− , testProperty "Double" $ roundTripKey (undefined :: Double)
314−#if MIN_VERSION_base(4,7,0)
315− , testProperty "Day" $ roundTripKey (undefined :: Day)
316− , testProperty "LocalTime" $ roundTripKey (undefined :: LocalTime)
317− , testProperty "TimeOfDay" $ roundTripKey (undefined :: TimeOfDay)
318− , testProperty "UTCTime" $ roundTripKey (undefined :: UTCTime)
319−#endif
320− , testProperty "Version" $ roundTripKey (undefined :: Version)
321− , testProperty "Lazy Text" $ roundTripKey (undefined :: LT.Text)
322− , testProperty "UUID" $ roundTripKey UUID.nil
323− ]
24+ , roundTripTests
25+ , keysTests
32426 , testGroup "toFromJSON" [
32527 testProperty "Integer" (toFromJSON :: Integer -> Property)
32628 , testProperty "Double" (toFromJSON :: Double -> Property)
@@ -333,205 +35,6 @@ tests = testGroup "properties" [
33335 , testProperty "parserThrowError" parserThrowErrorProp
33436 , testProperty "parserCatchError" parserCatchErrorProp
33537 ]
336− , testGroup "generic" [
337− testGroup "toJSON" [
338− testGroup "Nullary" [
339− testProperty "string" (isString . gNullaryToJSONString)
340− , testProperty "2ElemArray" (is2ElemArray . gNullaryToJSON2ElemArray)
341− , testProperty "TaggedObject" (isNullaryTaggedObject . gNullaryToJSONTaggedObject)
342− , testProperty "ObjectWithSingleField" (isObjectWithSingleField . gNullaryToJSONObjectWithSingleField)
343− , testGroup "roundTrip" [
344− testProperty "string" (toParseJSON gNullaryParseJSONString gNullaryToJSONString)
345− , testProperty "2ElemArray" (toParseJSON gNullaryParseJSON2ElemArray gNullaryToJSON2ElemArray)
346− , testProperty "TaggedObject" (toParseJSON gNullaryParseJSONTaggedObject gNullaryToJSONTaggedObject)
347− , testProperty "ObjectWithSingleField" (toParseJSON gNullaryParseJSONObjectWithSingleField gNullaryToJSONObjectWithSingleField)
348− ]
349− ]
350− , testGroup "EitherTextInt" [
351− testProperty "UntaggedValue" (isUntaggedValueETI . gEitherTextIntToJSONUntaggedValue)
352− , testProperty "roundtrip" (toParseJSON gEitherTextIntParseJSONUntaggedValue gEitherTextIntToJSONUntaggedValue)
353− ]
354− , testGroup "SomeType" [
355− testProperty "2ElemArray" (is2ElemArray . gSomeTypeToJSON2ElemArray)
356− , testProperty "TaggedObject" (isTaggedObject . gSomeTypeToJSONTaggedObject)
357− , testProperty "ObjectWithSingleField" (isObjectWithSingleField . gSomeTypeToJSONObjectWithSingleField)
358− , testGroup "roundTrip" [
359− testProperty "2ElemArray" (toParseJSON gSomeTypeParseJSON2ElemArray gSomeTypeToJSON2ElemArray)
360− , testProperty "TaggedObject" (toParseJSON gSomeTypeParseJSONTaggedObject gSomeTypeToJSONTaggedObject)
361− , testProperty "ObjectWithSingleField" (toParseJSON gSomeTypeParseJSONObjectWithSingleField gSomeTypeToJSONObjectWithSingleField)
362−
363−#if __GLASGOW_HASKELL__ >= 706
364− , testProperty "2ElemArray unary" (toParseJSON1 gSomeTypeLiftParseJSON2ElemArray gSomeTypeLiftToJSON2ElemArray)
365− , testProperty "TaggedObject unary" (toParseJSON1 gSomeTypeLiftParseJSONTaggedObject gSomeTypeLiftToJSONTaggedObject)
366− , testProperty "ObjectWithSingleField unary" (toParseJSON1 gSomeTypeLiftParseJSONObjectWithSingleField gSomeTypeLiftToJSONObjectWithSingleField)
367−#endif
368− ]
369− ]
370− , testGroup "OneConstructor" [
371− testProperty "default" (isEmptyArray . gOneConstructorToJSONDefault)
372− , testProperty "Tagged" (isTaggedObject . gOneConstructorToJSONTagged)
373− , testGroup "roundTrip" [
374− testProperty "default" (toParseJSON gOneConstructorParseJSONDefault gOneConstructorToJSONDefault)
375− , testProperty "Tagged" (toParseJSON gOneConstructorParseJSONTagged gOneConstructorToJSONTagged)
376− ]
377− ]
378− ]
379− , testGroup "toEncoding" [
380− testProperty "NullaryString" $
381− gNullaryToJSONString `sameAs` gNullaryToEncodingString
382− , testProperty "Nullary2ElemArray" $
383− gNullaryToJSON2ElemArray `sameAs` gNullaryToEncoding2ElemArray
384− , testProperty "NullaryTaggedObject" $
385− gNullaryToJSONTaggedObject `sameAs` gNullaryToEncodingTaggedObject
386− , testProperty "NullaryObjectWithSingleField" $
387− gNullaryToJSONObjectWithSingleField `sameAs`
388− gNullaryToEncodingObjectWithSingleField
389− -- , testProperty "ApproxUnwrap" $
390− -- gApproxToJSONUnwrap `sameAs` gApproxToEncodingUnwrap
391− , testProperty "ApproxDefault" $
392− gApproxToJSONDefault `sameAs` gApproxToEncodingDefault
393−
394− , testProperty "EitherTextInt UntaggedValue" $
395− gEitherTextIntToJSONUntaggedValue `sameAs` gEitherTextIntToEncodingUntaggedValue
396−
397− , testProperty "SomeType2ElemArray" $
398− gSomeTypeToJSON2ElemArray `sameAs` gSomeTypeToEncoding2ElemArray
399−#if __GLASGOW_HASKELL__ >= 706
400− , testProperty "SomeType2ElemArray unary" $
401− gSomeTypeLiftToJSON2ElemArray `sameAs1` gSomeTypeLiftToEncoding2ElemArray
402− , testProperty "SomeType2ElemArray unary agree" $
403− gSomeTypeToEncoding2ElemArray `sameAs1Agree` gSomeTypeLiftToEncoding2ElemArray
404−#endif
405−
406− , testProperty "SomeTypeTaggedObject" $
407− gSomeTypeToJSONTaggedObject `sameAs` gSomeTypeToEncodingTaggedObject
408−#if __GLASGOW_HASKELL__ >= 706
409− , testProperty "SomeTypeTaggedObject unary" $
410− gSomeTypeLiftToJSONTaggedObject `sameAs1` gSomeTypeLiftToEncodingTaggedObject
411− , testProperty "SomeTypeTaggedObject unary agree" $
412− gSomeTypeToEncodingTaggedObject `sameAs1Agree` gSomeTypeLiftToEncodingTaggedObject
413−#endif
414−
415− , testProperty "SomeTypeObjectWithSingleField" $
416− gSomeTypeToJSONObjectWithSingleField `sameAs` gSomeTypeToEncodingObjectWithSingleField
417−#if __GLASGOW_HASKELL__ >= 706
418− , testProperty "SomeTypeObjectWithSingleField unary" $
419− gSomeTypeLiftToJSONObjectWithSingleField `sameAs1` gSomeTypeLiftToEncodingObjectWithSingleField
420− , testProperty "SomeTypeObjectWithSingleField unary agree" $
421− gSomeTypeToEncodingObjectWithSingleField `sameAs1Agree` gSomeTypeLiftToEncodingObjectWithSingleField
422−#endif
423−
424− , testProperty "SomeTypeOmitNothingFields" $
425− gSomeTypeToJSONOmitNothingFields `sameAs` gSomeTypeToEncodingOmitNothingFields
426−
427− , testProperty "OneConstructorDefault" $
428− gOneConstructorToJSONDefault `sameAs` gOneConstructorToEncodingDefault
429− , testProperty "OneConstructorTagged" $
430− gOneConstructorToJSONTagged `sameAs` gOneConstructorToEncodingTagged
431− ]
432− ]
433− , testGroup "template-haskell" [
434− testGroup "toJSON" [
435− testGroup "Nullary" [
436− testProperty "string" (isString . thNullaryToJSONString)
437− , testProperty "2ElemArray" (is2ElemArray . thNullaryToJSON2ElemArray)
438− , testProperty "TaggedObject" (isNullaryTaggedObject . thNullaryToJSONTaggedObject)
439− , testProperty "ObjectWithSingleField" (isObjectWithSingleField . thNullaryToJSONObjectWithSingleField)
440−
441− , testGroup "roundTrip" [
442− testProperty "string" (toParseJSON thNullaryParseJSONString thNullaryToJSONString)
443− , testProperty "2ElemArray" (toParseJSON thNullaryParseJSON2ElemArray thNullaryToJSON2ElemArray)
444− , testProperty "TaggedObject" (toParseJSON thNullaryParseJSONTaggedObject thNullaryToJSONTaggedObject)
445− , testProperty "ObjectWithSingleField" (toParseJSON thNullaryParseJSONObjectWithSingleField thNullaryToJSONObjectWithSingleField)
446− ]
447− ]
448− , testGroup "EitherTextInt" [
449− testProperty "UntaggedValue" (isUntaggedValueETI . thEitherTextIntToJSONUntaggedValue)
450− , testProperty "roundtrip" (toParseJSON thEitherTextIntParseJSONUntaggedValue thEitherTextIntToJSONUntaggedValue)
451− ]
452− , testGroup "SomeType" [
453− testProperty "2ElemArray" (is2ElemArray . thSomeTypeToJSON2ElemArray)
454− , testProperty "TaggedObject" (isTaggedObject . thSomeTypeToJSONTaggedObject)
455− , testProperty "ObjectWithSingleField" (isObjectWithSingleField . thSomeTypeToJSONObjectWithSingleField)
456− , testGroup "roundTrip" [
457− testProperty "2ElemArray" (toParseJSON thSomeTypeParseJSON2ElemArray thSomeTypeToJSON2ElemArray)
458− , testProperty "TaggedObject" (toParseJSON thSomeTypeParseJSONTaggedObject thSomeTypeToJSONTaggedObject)
459− , testProperty "ObjectWithSingleField" (toParseJSON thSomeTypeParseJSONObjectWithSingleField thSomeTypeToJSONObjectWithSingleField)
460−
461− , testProperty "2ElemArray unary" (toParseJSON1 thSomeTypeLiftParseJSON2ElemArray thSomeTypeLiftToJSON2ElemArray)
462− , testProperty "TaggedObject unary" (toParseJSON1 thSomeTypeLiftParseJSONTaggedObject thSomeTypeLiftToJSONTaggedObject)
463− , testProperty "ObjectWithSingleField unary" (toParseJSON1 thSomeTypeLiftParseJSONObjectWithSingleField thSomeTypeLiftToJSONObjectWithSingleField)
464−
465− ]
466− ]
467− , testGroup "Approx" [
468− testProperty "string" (isString . thApproxToJSONUnwrap)
469− , testProperty "ObjectWithSingleField" (isObjectWithSingleField . thApproxToJSONDefault)
470− , testGroup "roundTrip" [
471− testProperty "string" (toParseJSON thApproxParseJSONUnwrap thApproxToJSONUnwrap)
472− , testProperty "ObjectWithSingleField" (toParseJSON thApproxParseJSONDefault thApproxToJSONDefault)
473− ]
474− ]
475− , testGroup "GADT" [
476− testProperty "string" (isString . thGADTToJSONUnwrap)
477− , testProperty "ObjectWithSingleField" (isObjectWithSingleField . thGADTToJSONDefault)
478− , testGroup "roundTrip" [
479− testProperty "string" (toParseJSON thGADTParseJSONUnwrap thGADTToJSONUnwrap)
480− , testProperty "ObjectWithSingleField" (toParseJSON thGADTParseJSONDefault thGADTToJSONDefault)
481− ]
482− ]
483− , testGroup "OneConstructor" [
484− testProperty "default" (isEmptyArray . thOneConstructorToJSONDefault)
485− , testProperty "Tagged" (isTaggedObject . thOneConstructorToJSONTagged)
486− , testGroup "roundTrip" [
487− testProperty "default" (toParseJSON thOneConstructorParseJSONDefault thOneConstructorToJSONDefault)
488− , testProperty "Tagged" (toParseJSON thOneConstructorParseJSONTagged thOneConstructorToJSONTagged)
489− ]
490− ]
491− ]
492− , testGroup "toEncoding" [
493− testProperty "NullaryString" $
494− thNullaryToJSONString `sameAs` thNullaryToEncodingString
495− , testProperty "Nullary2ElemArray" $
496− thNullaryToJSON2ElemArray `sameAs` thNullaryToEncoding2ElemArray
497− , testProperty "NullaryTaggedObject" $
498− thNullaryToJSONTaggedObject `sameAs` thNullaryToEncodingTaggedObject
499− , testProperty "NullaryObjectWithSingleField" $
500− thNullaryToJSONObjectWithSingleField `sameAs`
501− thNullaryToEncodingObjectWithSingleField
502− , testProperty "ApproxUnwrap" $
503− thApproxToJSONUnwrap `sameAs` thApproxToEncodingUnwrap
504− , testProperty "ApproxDefault" $
505− thApproxToJSONDefault `sameAs` thApproxToEncodingDefault
506−
507− , testProperty "EitherTextInt UntaggedValue" $
508− thEitherTextIntToJSONUntaggedValue `sameAs` thEitherTextIntToEncodingUntaggedValue
509−
510− , testProperty "SomeType2ElemArray" $
511− thSomeTypeToJSON2ElemArray `sameAs` thSomeTypeToEncoding2ElemArray
512− , testProperty "SomeType2ElemArray unary" $
513− thSomeTypeLiftToJSON2ElemArray `sameAs1` thSomeTypeLiftToEncoding2ElemArray
514− , testProperty "SomeType2ElemArray unary agree" $
515− thSomeTypeToEncoding2ElemArray `sameAs1Agree` thSomeTypeLiftToEncoding2ElemArray
516−
517− , testProperty "SomeTypeTaggedObject" $
518− thSomeTypeToJSONTaggedObject `sameAs` thSomeTypeToEncodingTaggedObject
519− , testProperty "SomeTypeTaggedObject unary" $
520− thSomeTypeLiftToJSONTaggedObject `sameAs1` thSomeTypeLiftToEncodingTaggedObject
521− , testProperty "SomeTypeTaggedObject unary agree" $
522− thSomeTypeToEncodingTaggedObject `sameAs1Agree` thSomeTypeLiftToEncodingTaggedObject
523−
524− , testProperty "SomeTypeObjectWithSingleField" $
525− thSomeTypeToJSONObjectWithSingleField `sameAs` thSomeTypeToEncodingObjectWithSingleField
526− , testProperty "SomeTypeObjectWithSingleField unary" $
527− thSomeTypeLiftToJSONObjectWithSingleField `sameAs1` thSomeTypeLiftToEncodingObjectWithSingleField
528− , testProperty "SomeTypeObjectWithSingleField unary agree" $
529− thSomeTypeToEncodingObjectWithSingleField `sameAs1Agree` thSomeTypeLiftToEncodingObjectWithSingleField
530−
531− , testProperty "OneConstructorDefault" $
532− thOneConstructorToJSONDefault `sameAs` thOneConstructorToEncodingDefault
533− , testProperty "OneConstructorTagged" $
534− thOneConstructorToJSONTagged `sameAs` thOneConstructorToEncodingTagged
535− ]
536− ]
38+ , genericTests
39+ , templateHaskellTests
53740 ]
tests/PropertyGeneric.hsnew file+116
@@ -0,0 +1,116 @@
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE NoImplicitPrelude #-}
3+
4+module PropertyGeneric ( genericTests ) where
5+
6+import Prelude.Compat
7+
8+import Data.Semigroup (Option(..))
9+import Encoders
10+import Instances ()
11+import Test.Tasty (TestTree, testGroup)
12+import Test.Tasty.QuickCheck (testProperty)
13+import Test.QuickCheck ( (===) )
14+import Types
15+import PropUtils
16+
17+
18+genericTests :: TestTree
19+genericTests =
20+ testGroup "generic" [
21+ testGroup "toJSON" [
22+ testGroup "Nullary" [
23+ testProperty "string" (isString . gNullaryToJSONString)
24+ , testProperty "2ElemArray" (is2ElemArray . gNullaryToJSON2ElemArray)
25+ , testProperty "TaggedObject" (isNullaryTaggedObject . gNullaryToJSONTaggedObject)
26+ , testProperty "ObjectWithSingleField" (isObjectWithSingleField . gNullaryToJSONObjectWithSingleField)
27+ , testGroup "roundTrip" [
28+ testProperty "string" (toParseJSON gNullaryParseJSONString gNullaryToJSONString)
29+ , testProperty "2ElemArray" (toParseJSON gNullaryParseJSON2ElemArray gNullaryToJSON2ElemArray)
30+ , testProperty "TaggedObject" (toParseJSON gNullaryParseJSONTaggedObject gNullaryToJSONTaggedObject)
31+ , testProperty "ObjectWithSingleField" (toParseJSON gNullaryParseJSONObjectWithSingleField gNullaryToJSONObjectWithSingleField)
32+ ]
33+ ]
34+ , testGroup "EitherTextInt" [
35+ testProperty "UntaggedValue" (isUntaggedValueETI . gEitherTextIntToJSONUntaggedValue)
36+ , testProperty "roundtrip" (toParseJSON gEitherTextIntParseJSONUntaggedValue gEitherTextIntToJSONUntaggedValue)
37+ ]
38+ , testGroup "SomeType" [
39+ testProperty "2ElemArray" (is2ElemArray . gSomeTypeToJSON2ElemArray)
40+ , testProperty "TaggedObject" (isTaggedObject . gSomeTypeToJSONTaggedObject)
41+ , testProperty "ObjectWithSingleField" (isObjectWithSingleField . gSomeTypeToJSONObjectWithSingleField)
42+ , testGroup "roundTrip" [
43+ testProperty "2ElemArray" (toParseJSON gSomeTypeParseJSON2ElemArray gSomeTypeToJSON2ElemArray)
44+ , testProperty "TaggedObject" (toParseJSON gSomeTypeParseJSONTaggedObject gSomeTypeToJSONTaggedObject)
45+ , testProperty "ObjectWithSingleField" (toParseJSON gSomeTypeParseJSONObjectWithSingleField gSomeTypeToJSONObjectWithSingleField)
46+
47+ , testProperty "2ElemArray unary" (toParseJSON1 gSomeTypeLiftParseJSON2ElemArray gSomeTypeLiftToJSON2ElemArray)
48+ , testProperty "TaggedObject unary" (toParseJSON1 gSomeTypeLiftParseJSONTaggedObject gSomeTypeLiftToJSONTaggedObject)
49+ , testProperty "ObjectWithSingleField unary" (toParseJSON1 gSomeTypeLiftParseJSONObjectWithSingleField gSomeTypeLiftToJSONObjectWithSingleField)
50+ ]
51+ ]
52+ , testGroup "OneConstructor" [
53+ testProperty "default" (isEmptyArray . gOneConstructorToJSONDefault)
54+ , testProperty "Tagged" (isTaggedObject . gOneConstructorToJSONTagged)
55+ , testGroup "roundTrip" [
56+ testProperty "default" (toParseJSON gOneConstructorParseJSONDefault gOneConstructorToJSONDefault)
57+ , testProperty "Tagged" (toParseJSON gOneConstructorParseJSONTagged gOneConstructorToJSONTagged)
58+ ]
59+ ]
60+ , testGroup "OptionField" [
61+ testProperty "like Maybe" $
62+ \x -> gOptionFieldToJSON (OptionField (Option x)) === thMaybeFieldToJSON (MaybeField x)
63+ , testProperty "roundTrip" (toParseJSON gOptionFieldParseJSON gOptionFieldToJSON)
64+ ]
65+ ]
66+ , testGroup "toEncoding" [
67+ testProperty "NullaryString" $
68+ gNullaryToJSONString `sameAs` gNullaryToEncodingString
69+ , testProperty "Nullary2ElemArray" $
70+ gNullaryToJSON2ElemArray `sameAs` gNullaryToEncoding2ElemArray
71+ , testProperty "NullaryTaggedObject" $
72+ gNullaryToJSONTaggedObject `sameAs` gNullaryToEncodingTaggedObject
73+ , testProperty "NullaryObjectWithSingleField" $
74+ gNullaryToJSONObjectWithSingleField `sameAs`
75+ gNullaryToEncodingObjectWithSingleField
76+ -- , testProperty "ApproxUnwrap" $
77+ -- gApproxToJSONUnwrap `sameAs` gApproxToEncodingUnwrap
78+ , testProperty "ApproxDefault" $
79+ gApproxToJSONDefault `sameAs` gApproxToEncodingDefault
80+
81+ , testProperty "EitherTextInt UntaggedValue" $
82+ gEitherTextIntToJSONUntaggedValue `sameAs` gEitherTextIntToEncodingUntaggedValue
83+
84+ , testProperty "SomeType2ElemArray" $
85+ gSomeTypeToJSON2ElemArray `sameAs` gSomeTypeToEncoding2ElemArray
86+ , testProperty "SomeType2ElemArray unary" $
87+ gSomeTypeLiftToJSON2ElemArray `sameAs1` gSomeTypeLiftToEncoding2ElemArray
88+ , testProperty "SomeType2ElemArray unary agree" $
89+ gSomeTypeToEncoding2ElemArray `sameAs1Agree` gSomeTypeLiftToEncoding2ElemArray
90+
91+ , testProperty "SomeTypeTaggedObject" $
92+ gSomeTypeToJSONTaggedObject `sameAs` gSomeTypeToEncodingTaggedObject
93+ , testProperty "SomeTypeTaggedObject unary" $
94+ gSomeTypeLiftToJSONTaggedObject `sameAs1` gSomeTypeLiftToEncodingTaggedObject
95+ , testProperty "SomeTypeTaggedObject unary agree" $
96+ gSomeTypeToEncodingTaggedObject `sameAs1Agree` gSomeTypeLiftToEncodingTaggedObject
97+
98+ , testProperty "SomeTypeObjectWithSingleField" $
99+ gSomeTypeToJSONObjectWithSingleField `sameAs` gSomeTypeToEncodingObjectWithSingleField
100+ , testProperty "SomeTypeObjectWithSingleField unary" $
101+ gSomeTypeLiftToJSONObjectWithSingleField `sameAs1` gSomeTypeLiftToEncodingObjectWithSingleField
102+ , testProperty "SomeTypeObjectWithSingleField unary agree" $
103+ gSomeTypeToEncodingObjectWithSingleField `sameAs1Agree` gSomeTypeLiftToEncodingObjectWithSingleField
104+
105+ , testProperty "SomeTypeOmitNothingFields" $
106+ gSomeTypeToJSONOmitNothingFields `sameAs` gSomeTypeToEncodingOmitNothingFields
107+
108+ , testProperty "OneConstructorDefault" $
109+ gOneConstructorToJSONDefault `sameAs` gOneConstructorToEncodingDefault
110+ , testProperty "OneConstructorTagged" $
111+ gOneConstructorToJSONTagged `sameAs` gOneConstructorToEncodingTagged
112+
113+ , testProperty "OptionField" $
114+ gOptionFieldToJSON `sameAs` gOptionFieldToEncoding
115+ ]
116+ ]
tests/PropertyKeys.hsnew file+40
@@ -0,0 +1,40 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
3+module PropertyKeys ( keysTests ) where
4+
5+import Prelude.Compat
6+
7+import Data.Time (Day, LocalTime, TimeOfDay, UTCTime)
8+import Data.Version (Version)
9+import Instances ()
10+import Numeric.Natural (Natural)
11+import Test.Tasty (TestTree, testGroup)
12+import Test.Tasty.QuickCheck (testProperty)
13+import Types
14+import qualified Data.Text as T
15+import qualified Data.Text.Lazy as LT
16+import qualified Data.UUID.Types as UUID
17+import PropUtils
18+
19+
20+keysTests :: TestTree
21+keysTests =
22+ testGroup "roundTrip Key"
23+ [ testProperty "Bool" $ roundTripKey True
24+ , testProperty "Text" $ roundTripKey (undefined :: T.Text)
25+ , testProperty "String" $ roundTripKey (undefined :: String)
26+ , testProperty "Int" $ roundTripKey (undefined :: Int)
27+ , testProperty "[Text]" $ roundTripKey (undefined :: LogScaled [T.Text])
28+ , testProperty "(Int,Char)" $ roundTripKey (undefined :: (Int,Char))
29+ , testProperty "Integer" $ roundTripKey (undefined :: Integer)
30+ , testProperty "Natural" $ roundTripKey (undefined :: Natural)
31+ , testProperty "Float" $ roundTripKey (undefined :: Float)
32+ , testProperty "Double" $ roundTripKey (undefined :: Double)
33+ , testProperty "Day" $ roundTripKey (undefined :: Day)
34+ , testProperty "LocalTime" $ roundTripKey (undefined :: LocalTime)
35+ , testProperty "TimeOfDay" $ roundTripKey (undefined :: TimeOfDay)
36+ , testProperty "UTCTime" $ roundTripKey (undefined :: UTCTime)
37+ , testProperty "Version" $ roundTripKey (undefined :: Version)
38+ , testProperty "Lazy Text" $ roundTripKey (undefined :: LT.Text)
39+ , testProperty "UUID" $ roundTripKey UUID.nil
40+ ]
tests/PropertyRTFunctors.hsnew file+51
@@ -0,0 +1,51 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
3+module PropertyRTFunctors ( roundTripFunctorsTests ) where
4+
5+import Prelude.Compat
6+
7+import Data.Functor.Compose (Compose (..))
8+import Instances ()
9+import Test.Tasty (TestTree, testGroup)
10+import Test.Tasty.QuickCheck (testProperty)
11+import Types
12+import PropUtils
13+
14+
15+roundTripFunctorsTests :: TestTree
16+roundTripFunctorsTests =
17+ testGroup "functors"
18+ [ testProperty "Identity Char" $ roundTripEq (undefined :: I Int)
19+
20+ , testProperty "Identity Char" $ roundTripEq (undefined :: I Char)
21+ , testProperty "Identity [Char]" $ roundTripEq (undefined :: I String)
22+ , testProperty "[Identity Char]" $ roundTripEq (undefined :: [I Char])
23+
24+ , testProperty "Compose I I Int" $ roundTripEq (undefined :: LogScaled (Compose I I Int))
25+ , testProperty "Compose [] I Int" $ roundTripEq (undefined :: LogScaled (Compose [] I Int))
26+ , testProperty "Compose I [] Int" $ roundTripEq (undefined :: LogScaled (Compose I [] Int))
27+ , testProperty "Compose [] [] Int" $ roundTripEq (undefined :: LogScaled (Compose [] [] Int))
28+
29+ , testProperty "Compose I I Char" $ roundTripEq (undefined :: LogScaled (Compose I I Char))
30+ , testProperty "Compose [] I Char" $ roundTripEq (undefined :: LogScaled (Compose [] I Char))
31+ , testProperty "Compose I [] Char" $ roundTripEq (undefined :: LogScaled (Compose I [] Char))
32+ , testProperty "Compose [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose [] [] Char))
33+
34+ , testProperty "Compose3 I I I Char" $ roundTripEq (undefined :: LogScaled (Compose3 I I I Char))
35+ , testProperty "Compose3 I [] I Char" $ roundTripEq (undefined :: LogScaled (Compose3 I [] I Char))
36+ , testProperty "Compose3 I I [] Char" $ roundTripEq (undefined :: LogScaled (Compose3 I I [] Char))
37+ , testProperty "Compose3 I [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose3 I [] [] Char))
38+ , testProperty "Compose3 [] I I Char" $ roundTripEq (undefined :: LogScaled (Compose3 [] I I Char))
39+ , testProperty "Compose3 [] [] I Char" $ roundTripEq (undefined :: LogScaled (Compose3 [] [] I Char))
40+ , testProperty "Compose3 [] I [] Char" $ roundTripEq (undefined :: LogScaled (Compose3 [] I [] Char))
41+ , testProperty "Compose3 [] [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose3 [] [] [] Char))
42+
43+ , testProperty "Compose3' I I I Char" $ roundTripEq (undefined :: LogScaled (Compose3' I I I Char))
44+ , testProperty "Compose3' I [] I Char" $ roundTripEq (undefined :: LogScaled (Compose3' I [] I Char))
45+ , testProperty "Compose3' I I [] Char" $ roundTripEq (undefined :: LogScaled (Compose3' I I [] Char))
46+ , testProperty "Compose3' I [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose3' I [] [] Char))
47+ , testProperty "Compose3' [] I I Char" $ roundTripEq (undefined :: LogScaled (Compose3' [] I I Char))
48+ , testProperty "Compose3' [] [] I Char" $ roundTripEq (undefined :: LogScaled (Compose3' [] [] I Char))
49+ , testProperty "Compose3' [] I [] Char" $ roundTripEq (undefined :: LogScaled (Compose3' [] I [] Char))
50+ , testProperty "Compose3' [] [] [] Char" $ roundTripEq (undefined :: LogScaled (Compose3' [] [] [] Char))
51+ ]
tests/PropertyRoundTrip.hsnew file+74
@@ -0,0 +1,74 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
3+module PropertyRoundTrip ( roundTripTests ) where
4+
5+import Prelude.Compat
6+
7+import Control.Applicative (Const)
8+import Data.Aeson.Types
9+import Data.DList (DList)
10+import Data.List.NonEmpty (NonEmpty)
11+import Data.Proxy (Proxy)
12+import Data.Ratio (Ratio)
13+import Data.Sequence (Seq)
14+import Data.Tagged (Tagged)
15+import Data.Time (Day, DiffTime, LocalTime, NominalDiffTime, TimeOfDay, UTCTime, ZonedTime)
16+import Data.Version (Version)
17+import Data.Time.Calendar.Compat (CalendarDiffDays, DayOfWeek)
18+import Data.Time.LocalTime.Compat (CalendarDiffTime)
19+import Data.Time.Clock.System.Compat (SystemTime)
20+import Instances ()
21+import Numeric.Natural (Natural)
22+import Test.Tasty (TestTree, testGroup)
23+import Test.Tasty.QuickCheck (testProperty)
24+import Types
25+import qualified Data.Text as T
26+import qualified Data.Text.Lazy as LT
27+import qualified Data.UUID.Types as UUID
28+import PropUtils
29+import PropertyRTFunctors
30+
31+
32+roundTripTests :: TestTree
33+roundTripTests =
34+ testGroup "roundTrip" [
35+ testProperty "Bool" $ roundTripEq True
36+ , testProperty "Double" $ roundTripEq (1 :: Approx Double)
37+ , testProperty "Int" $ roundTripEq (1 :: Int)
38+ , testProperty "NonEmpty Char" $ roundTripEq (undefined :: NonEmpty Char)
39+ , testProperty "Integer" $ roundTripEq (1 :: Integer)
40+ , testProperty "String" $ roundTripEq ("" :: String)
41+ , testProperty "Text" $ roundTripEq T.empty
42+ , testProperty "Lazy Text" $ roundTripEq LT.empty
43+ , testProperty "Foo" $ roundTripEq (undefined :: Foo)
44+ , testProperty "Day" $ roundTripEq (undefined :: Day)
45+ , testProperty "BCE Day" $ roundTripEq (undefined :: BCEDay)
46+ , testProperty "DotNetTime" $ roundTripEq (undefined :: Approx DotNetTime)
47+ , testProperty "LocalTime" $ roundTripEq (undefined :: LocalTime)
48+ , testProperty "TimeOfDay" $ roundTripEq (undefined :: TimeOfDay)
49+ , testProperty "UTCTime" $ roundTripEq (undefined :: UTCTime)
50+ , testProperty "ZonedTime" $ roundTripEq (undefined :: ZonedTime)
51+ , testProperty "NominalDiffTime" $ roundTripEq (undefined :: NominalDiffTime)
52+ , testProperty "DiffTime" $ roundTripEq (undefined :: DiffTime)
53+ , testProperty "DayOfWeek" $ roundTripEq (undefined :: DayOfWeek)
54+ , testProperty "SystemTime" $ roundTripEq (undefined :: SystemTime)
55+ , testProperty "CalendarDiffTime" $ roundTripEq (undefined :: CalendarDiffTime)
56+ , testProperty "CalendarDiffDays" $ roundTripEq (undefined :: CalendarDiffDays)
57+ , testProperty "Version" $ roundTripEq (undefined :: Version)
58+ , testProperty "Natural" $ roundTripEq (undefined :: Natural)
59+ , testProperty "Proxy" $ roundTripEq (undefined :: Proxy Int)
60+ , testProperty "Tagged" $ roundTripEq (undefined :: Tagged Int Char)
61+ , testProperty "Const" $ roundTripEq (undefined :: Const Int Char)
62+ , testProperty "DList" $ roundTripEq (undefined :: DList Int)
63+ , testProperty "Seq" $ roundTripEq (undefined :: Seq Int)
64+ , testProperty "Rational" $ roundTripEq (undefined :: Rational)
65+ , testProperty "Ratio Int" $ roundTripEq (undefined :: Ratio Int)
66+ , testProperty "UUID" $ roundTripEq UUID.nil
67+ , roundTripFunctorsTests
68+ , testGroup "ghcGenerics" [
69+ testProperty "OneConstructor" $ roundTripEq OneConstructor
70+ , testProperty "Product2" $ roundTripEq (undefined :: Product2 Int Bool)
71+ , testProperty "Product6" $ roundTripEq (undefined :: P6)
72+ , testProperty "Sum4" $ roundTripEq (undefined :: S4)
73+ ]
74+ ]
tests/PropertyTH.hsnew file+130
@@ -0,0 +1,130 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
3+module PropertyTH ( templateHaskellTests ) where
4+
5+import Prelude.Compat
6+
7+import Data.Semigroup (Option(..))
8+import Encoders
9+import Instances ()
10+import Test.Tasty (TestTree, testGroup)
11+import Test.Tasty.QuickCheck (testProperty)
12+import Test.QuickCheck ( (===) )
13+import Types
14+import PropUtils
15+
16+
17+templateHaskellTests :: TestTree
18+templateHaskellTests =
19+ testGroup "template-haskell" [
20+ testGroup "toJSON" [
21+ testGroup "Nullary" [
22+ testProperty "string" (isString . thNullaryToJSONString)
23+ , testProperty "2ElemArray" (is2ElemArray . thNullaryToJSON2ElemArray)
24+ , testProperty "TaggedObject" (isNullaryTaggedObject . thNullaryToJSONTaggedObject)
25+ , testProperty "ObjectWithSingleField" (isObjectWithSingleField . thNullaryToJSONObjectWithSingleField)
26+
27+ , testGroup "roundTrip" [
28+ testProperty "string" (toParseJSON thNullaryParseJSONString thNullaryToJSONString)
29+ , testProperty "2ElemArray" (toParseJSON thNullaryParseJSON2ElemArray thNullaryToJSON2ElemArray)
30+ , testProperty "TaggedObject" (toParseJSON thNullaryParseJSONTaggedObject thNullaryToJSONTaggedObject)
31+ , testProperty "ObjectWithSingleField" (toParseJSON thNullaryParseJSONObjectWithSingleField thNullaryToJSONObjectWithSingleField)
32+ ]
33+ ]
34+ , testGroup "EitherTextInt" [
35+ testProperty "UntaggedValue" (isUntaggedValueETI . thEitherTextIntToJSONUntaggedValue)
36+ , testProperty "roundtrip" (toParseJSON thEitherTextIntParseJSONUntaggedValue thEitherTextIntToJSONUntaggedValue)
37+ ]
38+ , testGroup "SomeType" [
39+ testProperty "2ElemArray" (is2ElemArray . thSomeTypeToJSON2ElemArray)
40+ , testProperty "TaggedObject" (isTaggedObject . thSomeTypeToJSONTaggedObject)
41+ , testProperty "ObjectWithSingleField" (isObjectWithSingleField . thSomeTypeToJSONObjectWithSingleField)
42+ , testGroup "roundTrip" [
43+ testProperty "2ElemArray" (toParseJSON thSomeTypeParseJSON2ElemArray thSomeTypeToJSON2ElemArray)
44+ , testProperty "TaggedObject" (toParseJSON thSomeTypeParseJSONTaggedObject thSomeTypeToJSONTaggedObject)
45+ , testProperty "ObjectWithSingleField" (toParseJSON thSomeTypeParseJSONObjectWithSingleField thSomeTypeToJSONObjectWithSingleField)
46+
47+ , testProperty "2ElemArray unary" (toParseJSON1 thSomeTypeLiftParseJSON2ElemArray thSomeTypeLiftToJSON2ElemArray)
48+ , testProperty "TaggedObject unary" (toParseJSON1 thSomeTypeLiftParseJSONTaggedObject thSomeTypeLiftToJSONTaggedObject)
49+ , testProperty "ObjectWithSingleField unary" (toParseJSON1 thSomeTypeLiftParseJSONObjectWithSingleField thSomeTypeLiftToJSONObjectWithSingleField)
50+
51+ ]
52+ ]
53+ , testGroup "Approx" [
54+ testProperty "string" (isString . thApproxToJSONUnwrap)
55+ , testProperty "ObjectWithSingleField" (isObjectWithSingleField . thApproxToJSONDefault)
56+ , testGroup "roundTrip" [
57+ testProperty "string" (toParseJSON thApproxParseJSONUnwrap thApproxToJSONUnwrap)
58+ , testProperty "ObjectWithSingleField" (toParseJSON thApproxParseJSONDefault thApproxToJSONDefault)
59+ ]
60+ ]
61+ , testGroup "GADT" [
62+ testProperty "string" (isString . thGADTToJSONUnwrap)
63+ , testProperty "ObjectWithSingleField" (isObjectWithSingleField . thGADTToJSONDefault)
64+ , testGroup "roundTrip" [
65+ testProperty "string" (toParseJSON thGADTParseJSONUnwrap thGADTToJSONUnwrap)
66+ , testProperty "ObjectWithSingleField" (toParseJSON thGADTParseJSONDefault thGADTToJSONDefault)
67+ ]
68+ ]
69+ , testGroup "OneConstructor" [
70+ testProperty "default" (isEmptyArray . thOneConstructorToJSONDefault)
71+ , testProperty "Tagged" (isTaggedObject . thOneConstructorToJSONTagged)
72+ , testGroup "roundTrip" [
73+ testProperty "default" (toParseJSON thOneConstructorParseJSONDefault thOneConstructorToJSONDefault)
74+ , testProperty "Tagged" (toParseJSON thOneConstructorParseJSONTagged thOneConstructorToJSONTagged)
75+ ]
76+ ]
77+ , testGroup "OptionField" [
78+ testProperty "like Maybe" $
79+ \x -> thOptionFieldToJSON (OptionField (Option x)) === thMaybeFieldToJSON (MaybeField x)
80+ , testProperty "roundTrip" (toParseJSON thOptionFieldParseJSON thOptionFieldToJSON)
81+ ]
82+ ]
83+ , testGroup "toEncoding" [
84+ testProperty "NullaryString" $
85+ thNullaryToJSONString `sameAs` thNullaryToEncodingString
86+ , testProperty "Nullary2ElemArray" $
87+ thNullaryToJSON2ElemArray `sameAs` thNullaryToEncoding2ElemArray
88+ , testProperty "NullaryTaggedObject" $
89+ thNullaryToJSONTaggedObject `sameAs` thNullaryToEncodingTaggedObject
90+ , testProperty "NullaryObjectWithSingleField" $
91+ thNullaryToJSONObjectWithSingleField `sameAs`
92+ thNullaryToEncodingObjectWithSingleField
93+ , testProperty "ApproxUnwrap" $
94+ thApproxToJSONUnwrap `sameAs` thApproxToEncodingUnwrap
95+ , testProperty "ApproxDefault" $
96+ thApproxToJSONDefault `sameAs` thApproxToEncodingDefault
97+
98+ , testProperty "EitherTextInt UntaggedValue" $
99+ thEitherTextIntToJSONUntaggedValue `sameAs` thEitherTextIntToEncodingUntaggedValue
100+
101+ , testProperty "SomeType2ElemArray" $
102+ thSomeTypeToJSON2ElemArray `sameAs` thSomeTypeToEncoding2ElemArray
103+ , testProperty "SomeType2ElemArray unary" $
104+ thSomeTypeLiftToJSON2ElemArray `sameAs1` thSomeTypeLiftToEncoding2ElemArray
105+ , testProperty "SomeType2ElemArray unary agree" $
106+ thSomeTypeToEncoding2ElemArray `sameAs1Agree` thSomeTypeLiftToEncoding2ElemArray
107+
108+ , testProperty "SomeTypeTaggedObject" $
109+ thSomeTypeToJSONTaggedObject `sameAs` thSomeTypeToEncodingTaggedObject
110+ , testProperty "SomeTypeTaggedObject unary" $
111+ thSomeTypeLiftToJSONTaggedObject `sameAs1` thSomeTypeLiftToEncodingTaggedObject
112+ , testProperty "SomeTypeTaggedObject unary agree" $
113+ thSomeTypeToEncodingTaggedObject `sameAs1Agree` thSomeTypeLiftToEncodingTaggedObject
114+
115+ , testProperty "SomeTypeObjectWithSingleField" $
116+ thSomeTypeToJSONObjectWithSingleField `sameAs` thSomeTypeToEncodingObjectWithSingleField
117+ , testProperty "SomeTypeObjectWithSingleField unary" $
118+ thSomeTypeLiftToJSONObjectWithSingleField `sameAs1` thSomeTypeLiftToEncodingObjectWithSingleField
119+ , testProperty "SomeTypeObjectWithSingleField unary agree" $
120+ thSomeTypeToEncodingObjectWithSingleField `sameAs1Agree` thSomeTypeLiftToEncodingObjectWithSingleField
121+
122+ , testProperty "OneConstructorDefault" $
123+ thOneConstructorToJSONDefault `sameAs` thOneConstructorToEncodingDefault
124+ , testProperty "OneConstructorTagged" $
125+ thOneConstructorToJSONTagged `sameAs` thOneConstructorToEncodingTagged
126+
127+ , testProperty "OptionField" $
128+ thOptionFieldToJSON `sameAs` thOptionFieldToEncoding
129+ ]
130+ ]
tests/SerializationFormatSpec.hs+53−30
@@ -1,10 +1,9 @@
11{-# LANGUAGE CPP #-}
22{-# LANGUAGE DeriveGeneric #-}
33{-# LANGUAGE GADTs #-}
4+{-# LANGUAGE NoImplicitPrelude #-}
45{-# LANGUAGE OverloadedStrings #-}
5−#if __GLASGOW_HASKELL__ >= 708
66{-# LANGUAGE DataKinds #-}
7−#endif
87
98------------------------------------------------------------------------------
109-- These tests assert that the JSON serialization doesn't change by accident.
@@ -15,7 +14,6 @@ module SerializationFormatSpec
1514 tests
1615 ) where
1716
18−import Prelude ()
1917import Prelude.Compat
2018
2119import Control.Applicative (Const(..))
@@ -32,12 +30,14 @@ import Data.Proxy (Proxy(..))
3230import Data.Scientific (Scientific)
3331import Data.Tagged (Tagged(..))
3432import 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 (..))
3536import Data.Word (Word8)
3637import GHC.Generics (Generic)
3738import Instances ()
38−import Test.Framework (Test, testGroup)
39−import Test.Framework.Providers.HUnit (testCase)
40−import Test.HUnit (assertFailure, assertEqual)
39+import Test.Tasty (TestTree, testGroup)
40+import Test.Tasty.HUnit (assertFailure, assertEqual, testCase)
4141import Types (Approx(..), Compose3, Compose3', I)
4242import qualified Data.ByteString.Lazy.Char8 as L
4343import qualified Data.DList as DList
@@ -54,7 +54,7 @@ import qualified Data.Tree as Tree
5454import qualified Data.UUID.Types as UUID
5555import qualified Data.Vector as Vector
5656
57−tests :: [Test]
57+tests :: [TestTree]
5858tests =
5959 [
6060 testGroup "To JSON representation" $ fmap assertJsonEncodingExample jsonEncodingExamples
@@ -69,13 +69,14 @@ jsonExamples =
6969 example "Either Left" "{\"Left\":1}" (Left 1 :: Either Int Int)
7070 , example "Either Right" "{\"Right\":1}" (Right 1 :: Either Int Int)
7171 , 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
7275 , example "Just" "1" (Just 1 :: Maybe Int)
7376 , example "Proxy Int" "null" (Proxy :: Proxy Int)
7477 , example "Tagged Char Int" "1" (Tagged 1 :: Tagged Char Int)
75−#if __GLASGOW_HASKELL__ >= 708
7678 -- Test Tagged instance is polykinded
7779 , example "Tagged 123 Int" "1" (Tagged 1 :: Tagged 123 Int)
78−#endif
7980 , example "Const Char Int" "\"c\"" (Const 'c' :: Const Char Int)
8081 , example "Tuple" "[1,2]" ((1, 2) :: (Int, Int))
8182 , example "NonEmpty" "[1,2,3]" (1 :| [2, 3] :: NonEmpty Int)
@@ -83,22 +84,22 @@ jsonExamples =
8384 , example "DList" "[1,2,3]" (DList.fromList [1, 2, 3] :: DList.DList Int)
8485 , example "()" "[]" ()
8586
86− , Example "HashMap Int Int"
87+ , ndExample "HashMap Int Int"
8788 [ "{\"0\":1,\"2\":3}", "{\"2\":3,\"0\":1}"]
8889 (HM.fromList [(0,1),(2,3)] :: HM.HashMap Int Int)
89− , Example "Map Int Int"
90+ , ndExample "Map Int Int"
9091 [ "{\"0\":1,\"2\":3}", "{\"2\":3,\"0\":1}"]
9192 (M.fromList [(0,1),(2,3)] :: M.Map Int Int)
92− , Example "Map (Tagged Int Int) Int"
93+ , ndExample "Map (Tagged Int Int) Int"
9394 [ "{\"0\":1,\"2\":3}", "{\"2\":3,\"0\":1}"]
9495 (M.fromList [(Tagged 0,1),(Tagged 2,3)] :: M.Map (Tagged Int Int) Int)
9596 , example "Map [Int] Int"
9697 "[[[0],1],[[2],3]]"
9798 (M.fromList [([0],1),([2],3)] :: M.Map [Int] Int)
98− , Example "Map [Char] Int"
99+ , ndExample "Map [Char] Int"
99100 [ "{\"ab\":1,\"cd\":3}", "{\"cd\":3,\"ab\":1}" ]
100101 (M.fromList [("ab",1),("cd",3)] :: M.Map String Int)
101− , Example "Map [I Char] Int"
102+ , ndExample "Map [I Char] Int"
102103 [ "{\"ab\":1,\"cd\":3}", "{\"cd\":3,\"ab\":1}" ]
103104 (M.fromList [(map pure "ab",1),(map pure "cd",3)] :: M.Map [I Char] Int)
104105
@@ -194,16 +195,27 @@ jsonExamples =
194195 , example "Semigroup.WrappedMonoid Int" "2" (Semigroup.WrapMonoid 2 :: Semigroup.WrappedMonoid Int)
195196 , example "Semigroup.Option Just" "2" (pure 2 :: Semigroup.Option Int)
196197 , 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
197211 ]
198212
199213jsonEncodingExamples :: [Example]
200214jsonEncodingExamples =
201215 [
202− -- Maybe serialising is lossy
203− -- https://github.com/bos/aeson/issues/376
204− example "Just Nothing" "null" (Just Nothing :: Maybe (Maybe Int))
205216 -- infinities cannot be recovered, null is decoded as NaN
206− , example "inf :: Double" "null" (Approx $ 1/0 :: Approx Double)
217+ example "inf :: Double" "null" (Approx $ 1/0 :: Approx Double)
218+ , example "-inf :: Double" "null" (Approx $ -1/0 :: Approx Double)
207219 ]
208220
209221jsonDecodingExamples :: [Example]
@@ -225,16 +237,27 @@ jsonDecodingExamples = [
225237 ]
226238
227239data Example where
228− Example
229− :: (Eq a, Show a, ToJSON a, FromJSON a)
230− => String -> [L.ByteString] -> a -> Example -- empty bytestring will fail, any p [] == False
231− MaybeExample
232− :: (Eq a, Show a, FromJSON a)
233− => String -> L.ByteString -> Maybe a -> Example
240+ Example
241+ :: (Eq a, Show a, ToJSON a, FromJSON a)
242+ => String -- name
243+ -> [L.ByteString] -- encoded variants
244+ -> a -- input
245+ -> a -- decoded
246+ -> Example -- empty bytestring will fail, any p [] == False
247+
248+ MaybeExample
249+ :: (Eq a, Show a, FromJSON a)
250+ => String -> L.ByteString -> Maybe a -> Example
234251
235252example :: (Eq a, Show a, ToJSON a, FromJSON a)
236253 => String -> L.ByteString -> a -> Example
237−example n bs x = Example n [bs] x
254+example n bs x = Example n [bs] x x
255+
256+-- | Non-deterministic example, input encodes to some of bytestrings.
257+ndExample :: (Eq a, Show a, ToJSON a, FromJSON a)
258+ => String -> [L.ByteString] -> a -> Example
259+ndExample n bss x = Example n bss x x
260+
238261
239262data MyEither a b = MyLeft a | MyRight b
240263 deriving (Generic, Show, Eq)
@@ -246,17 +269,17 @@ instance (ToJSON a, ToJSON b) => ToJSON (MyEither a b) where
246269instance (FromJSON a, FromJSON b) => FromJSON (MyEither a b) where
247270 parseJSON = genericParseJSON defaultOptions { sumEncoding = UntaggedValue }
248271
249−assertJsonExample :: Example -> Test
250−assertJsonExample (Example name bss val) = testCase name $ do
272+assertJsonExample :: Example -> TestTree
273+assertJsonExample (Example name bss val val') = testCase name $ do
251274 assertSomeEqual "encode" bss (encode val)
252275 assertSomeEqual "encode/via value" bss (encode $ toJSON val)
253276 for_ bss $ \bs ->
254− assertEqual "decode" (Just val) (decode bs)
277+ assertEqual "decode" (Just val') (decode bs)
255278assertJsonExample (MaybeExample name bs mval) = testCase name $
256279 assertEqual "decode" mval (decode bs)
257280
258−assertJsonEncodingExample :: Example -> Test
259−assertJsonEncodingExample (Example name bss val) = testCase name $ do
281+assertJsonEncodingExample :: Example -> TestTree
282+assertJsonEncodingExample (Example name bss val _) = testCase name $ do
260283 assertSomeEqual "encode" bss (encode val)
261284 assertSomeEqual "encode/via value" bss (encode $ toJSON val)
262285assertJsonEncodingExample (MaybeExample name _ _) = testCase name $
tests/Tests.hs+5−3
@@ -1,9 +1,10 @@
1+{-# LANGUAGE NoImplicitPrelude #-}
2+
13module Main (main) where
24
3−import Prelude ()
45import Prelude.Compat
56
6−import Test.Framework (defaultMain)
7+import Test.Tasty (defaultMain, testGroup)
78import qualified DataFamilies.Properties as DF
89import qualified Properties
910import qualified UnitTests
@@ -11,4 +12,5 @@ import qualified UnitTests
1112main :: IO ()
1213main = do
1314 ioTests <- UnitTests.ioTests
14− defaultMain (DF.tests : Properties.tests : UnitTests.tests : ioTests)
15+ let allTests = DF.tests : Properties.tests : UnitTests.tests : ioTests
16+ defaultMain (testGroup "tests" allTests)
tests/Types.hs+10−5
@@ -4,19 +4,21 @@
44{-# LANGUAGE FlexibleInstances #-}
55{-# LANGUAGE GADTs #-}
66{-# LANGUAGE GeneralizedNewtypeDeriving #-}
7−{-# LANGUAGE StandaloneDeriving #-}
7+{-# LANGUAGE NoImplicitPrelude #-}
88{-# LANGUAGE ScopedTypeVariables #-}
9+{-# LANGUAGE StandaloneDeriving #-}
910
1011module Types (module Types) where
1112
12−import Prelude ()
1313import Prelude.Compat
1414
1515import Math.NumberTheory.Logarithms (intLog2)
16+import Control.Applicative ((<$>))
1617import Data.Data
1718import Data.Functor.Compose (Compose (..))
1819import Data.Functor.Identity (Identity (..))
1920import Data.Hashable (Hashable (..))
21+import Data.Semigroup (Option)
2022import Data.Text
2123import Data.Time (Day (..), fromGregorian)
2224import GHC.Generics
@@ -104,6 +106,10 @@ deriving instance Data (GADT String)
104106deriving instance Eq (GADT a)
105107deriving instance Show (GADT a)
106108
109+newtype MaybeField = MaybeField { maybeField :: Maybe Int }
110+newtype OptionField = OptionField { optionField :: Option Int }
111+ deriving (Eq, Show)
112+
107113deriving instance Generic Foo
108114deriving instance Generic UFoo
109115deriving instance Generic OneConstructor
@@ -113,9 +119,8 @@ deriving instance Generic (Sum4 a b c d)
113119deriving instance Generic (Approx a)
114120deriving instance Generic Nullary
115121deriving instance Generic (SomeType a)
116−#if __GLASGOW_HASKELL__ >= 706
117122deriving instance Generic1 SomeType
118−#endif
123+deriving instance Generic OptionField
119124deriving instance Generic EitherTextInt
120125
121126failure :: Show a => String -> String -> a -> Property
@@ -146,7 +151,7 @@ instance Hashable a => Hashable (LogScaled a) where
146151 hashWithSalt salt (LogScaled a) = hashWithSalt salt a
147152
148153instance Arbitrary a => Arbitrary (LogScaled a) where
149− arbitrary = fmap LogScaled $ scale (\x -> intLog2 $ x + 1) arbitrary
154+ arbitrary = LogScaled <$> scale (\x -> intLog2 $ x + 1) arbitrary
150155 shrink = fmap LogScaled . shrink . getLogScaled
151156
152157instance ToJSON a => ToJSON (LogScaled a) where
tests/UnitTests.hs+276−39
@@ -1,55 +1,72 @@
11{-# LANGUAGE CPP #-}
22{-# LANGUAGE DeriveGeneric #-}
33{-# LANGUAGE GeneralizedNewtypeDeriving #-}
4+{-# LANGUAGE NoImplicitPrelude #-}
45{-# LANGUAGE OverloadedStrings #-}
56{-# LANGUAGE ScopedTypeVariables #-}
67{-# LANGUAGE TemplateHaskell #-}
8+{-# LANGUAGE QuasiQuotes #-}
79
810-- For Data.Aeson.Types.camelTo
911{-# OPTIONS_GHC -fno-warn-deprecations #-}
1012
13+#if MIN_VERSION_base(4,9,0)
14+{-# OPTIONS_GHC -fno-warn-unused-top-binds #-}
15+#endif
16+
1117module UnitTests
1218 (
1319 ioTests
1420 , tests
21+ , withEmbeddedJSONTest
1522 ) where
1623
17−import Prelude ()
1824import Prelude.Compat
1925
2026import Control.Monad (forM, forM_)
21−import Data.Aeson ((.=), (.:), (.:?), (.:!), FromJSON(..), FromJSONKeyFunction(..), FromJSONKey(..), ToJSON1(..), decode, eitherDecode, encode, fromJSON, genericParseJSON, genericToEncoding, genericToJSON, object, withObject)
27+import Data.Aeson ((.=), (.:), (.:?), (.:!), FromJSON(..), FromJSONKeyFunction(..), FromJSONKey(..), ToJSON1(..), decode, eitherDecode, encode, fromJSON, genericParseJSON, genericToEncoding, genericToJSON, object, withObject, withEmbeddedJSON)
2228import Data.Aeson.Internal (JSONPathElement(..), formatError)
29+import Data.Aeson.QQ.Simple (aesonQQ)
2330import Data.Aeson.TH (deriveJSON, deriveToJSON, deriveToJSON1)
2431import Data.Aeson.Text (encodeToTextBuilder)
25−import Data.Aeson.Types (Options(..), Result(Success), ToJSON(..), Value(Null), camelTo, camelTo2, defaultOptions, omitNothingFields, parse)
32+import Data.Aeson.Parser
33+ ( json, jsonLast, jsonAccum, jsonNoDup
34+ , json', jsonLast', jsonAccum', jsonNoDup')
35+import Data.Aeson.Types
36+ ( Options(..), Result(Success, Error), ToJSON(..)
37+ , Value(Array, Bool, Null, Number, Object, String), camelTo, camelTo2
38+ , defaultOptions, formatPath, formatRelativePath, omitNothingFields, parse)
39+import Data.Attoparsec.ByteString (Parser, parseOnly)
2640import Data.Char (toUpper)
2741import Data.Either.Compat (isLeft, isRight)
2842import Data.Hashable (hash)
29−import Data.List (sort)
43+import Data.HashMap.Strict (HashMap)
44+import Data.List (sort, isSuffixOf)
3045import Data.Maybe (fromMaybe)
31−import Data.Sequence (Seq)
46+import Data.Scientific (Scientific, scientific)
3247import Data.Tagged (Tagged(..))
3348import Data.Text (Text)
3449import Data.Time (UTCTime)
35−import Data.Time.Format (parseTime)
36−import Data.Time.Locale.Compat (defaultTimeLocale)
50+import Data.Time.Format.Compat (parseTimeM, defaultTimeLocale)
3751import GHC.Generics (Generic)
3852import Instances ()
53+import Numeric.Natural (Natural)
3954import System.Directory (getDirectoryContents)
4055import System.FilePath ((</>), takeExtension, takeFileName)
41−import Test.Framework (Test, testGroup)
42−import Test.Framework.Providers.HUnit (testCase)
43−import Test.HUnit (Assertion, assertBool, assertFailure, assertEqual)
56+import Test.Tasty (TestTree, testGroup)
57+import Test.Tasty.HUnit (Assertion, assertBool, assertFailure, assertEqual, testCase, (@?=))
4458import Text.Printf (printf)
4559import UnitTests.NullaryConstructors (nullaryConstructors)
60+import qualified Data.ByteString as S
4661import qualified Data.ByteString.Base16.Lazy as LBase16
4762import qualified Data.ByteString.Lazy.Char8 as L
4863import qualified Data.HashSet as HashSet
64+import qualified Data.HashMap.Lazy as HashMap
4965import qualified Data.Text.Lazy as LT
5066import qualified Data.Text.Lazy.Builder as TLB
5167import qualified Data.Text.Lazy.Encoding as LT
5268import qualified Data.Text.Lazy.Encoding as TLE
69+import qualified Data.Vector as Vector
5370import qualified ErrorMessages
5471import qualified SerializationFormatSpec
5572
@@ -57,7 +74,7 @@ import qualified SerializationFormatSpec
5774import Data.Aeson.Parser.UnescapeFFI ()
5875import Data.Aeson.Parser.UnescapePure ()
5976
60−tests :: Test
77+tests :: TestTree
6178tests = testGroup "unit" [
6279 testGroup "SerializationFormatSpec" SerializationFormatSpec.tests
6380 , testGroup "ErrorMessages" ErrorMessages.tests
@@ -84,8 +101,8 @@ tests = testGroup "unit" [
84101 testCase "example 1" formatErrorExample
85102 ]
86103 , testGroup ".:, .:?, .:!" $ fmap (testCase "-") dotColonMark
87− , testGroup "JSONPath" $ fmap (testCase "-") jsonPath
88104 , testGroup "Hashable laws" $ fmap (testCase "-") hashableLaws
105+ , testGroup "Object construction" $ fmap (testCase "-") objectConstruction
89106 , testGroup "Issue #351" $ fmap (testCase "-") issue351
90107 , testGroup "Nullary constructors" $ fmap (testCase "-") nullaryConstructors
91108 , testGroup "FromJSONKey" $ fmap (testCase "-") fromJSONKeyAssertions
@@ -93,6 +110,22 @@ tests = testGroup "unit" [
93110 , testCase "Unescape string (PR #477)" unescapeString
94111 , testCase "Show Options" showOptions
95112 , 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+ ]
96129 ]
97130
98131roundTripCamel :: String -> Assertion
@@ -185,10 +218,18 @@ utcTimeGood = do
185218 assertEqual "utctime" (parseWithRead "%F %H:%MZ" ts11) t11
186219 assertEqual "utctime" (parseWithRead "%FT%T%QZ" "2015-01-01T14:30:00Z") t12
187220
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+
188229 where
189230 parseWithRead :: String -> LT.Text -> UTCTime
190231 parseWithRead f s =
191− fromMaybe (error "parseTime input malformed") . parseTime defaultTimeLocale f . LT.unpack $ s
232+ fromMaybe (error "parseTime input malformed") . parseTimeM True defaultTimeLocale f . LT.unpack $ s
192233 parseWithAeson :: LT.Text -> Maybe UTCTime
193234 parseWithAeson s = decode . LT.encodeUtf8 $ LT.concat ["\"", s, "\""]
194235
@@ -204,6 +245,7 @@ utcTimeBad = do
204245 verifyFailParse "2015-01-01T12:30:00.00+00:00Z" -- no Zulu if offset given
205246 verifyFailParse "2015-01-03 12:13:00.Z" -- decimal at the end but no digits
206247 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
207249 where
208250 verifyFailParse (s :: LT.Text) =
209251 let (dec :: Maybe UTCTime) = decode . LT.encodeUtf8 $ LT.concat ["\"", s, "\""] in
@@ -216,6 +258,18 @@ formatErrorExample =
216258 lhs = "Error in $[0].foo.bar['a.b.c']['']['\\'\\\\'].end: error msg"
217259 in assertEqual "formatError example" lhs rhs
218260
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+
219273------------------------------------------------------------------------------
220274-- Comparison (.:?) and (.:!)
221275------------------------------------------------------------------------------
@@ -246,27 +300,6 @@ dotColonMark = [
246300 ex2 = "{\"value\": 42 }"
247301 ex3 = "{\"value\": null }"
248302
249−------------------------------------------------------------------------------
250−-- These tests check that JSONPath is tracked correctly
251−-----------------------------------------------------------------------------
252−
253−jsonPath :: [Assertion]
254−jsonPath = [
255− -- issue #356
256− assertEqual "Either"
257− (Left "Error in $[1].Left[1]: expected Bool, encountered Number")
258− (eitherDecode "[1,{\"Left\":[2,3]}]"
259− :: Either String (Int, Either (Int, Bool) ()))
260− -- issue #358
261− , assertEqual "Seq a"
262− (Left "Error in $[2]: expected Int, encountered Boolean")
263− (eitherDecode "[0,1,true]" :: Either String (Seq Int))
264− , assertEqual "Wibble"
265− (Left "Error in $.wibbleInt: expected Int, encountered Boolean")
266− (eitherDecode "{\"wibbleString\":\"\",\"wibbleInt\":true}"
267− :: Either String Wibble)
268− ]
269−
270303------------------------------------------------------------------------------
271304-- Check that the hashes of two equal Value are the same
272305------------------------------------------------------------------------------
@@ -279,6 +312,18 @@ hashableLaws = [
279312 a = object ["223" .= False, "807882556" .= True]
280313 b = object ["807882556" .= True, "223" .= False]
281314
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+
282327-------------------------------------------------------------------------------
283328-- ToJSONKey
284329-------------------------------------------------------------------------------
@@ -339,13 +384,13 @@ issue351 = [
339384-- Comparison between bytestring and text encoders
340385------------------------------------------------------------------------------
341386
342−ioTests :: IO [Test]
387+ioTests :: IO [TestTree]
343388ioTests = do
344389 enc <- encoderComparisonTests
345390 js <- jsonTestSuite
346391 return [enc, js]
347392
348−encoderComparisonTests :: IO Test
393+encoderComparisonTests :: IO TestTree
349394encoderComparisonTests = do
350395 encoderTests <- forM testFiles $ \file0 -> do
351396 let file = "benchmarks/json-data/" ++ file0
@@ -405,7 +450,7 @@ unescapeString = do
405450
406451-- JSONTestSuite
407452
408−jsonTestSuiteTest :: FilePath -> Test
453+jsonTestSuiteTest :: FilePath -> TestTree
409454jsonTestSuiteTest path = testCase fileName $ do
410455 payload <- L.readFile path
411456 let result = eitherDecode payload :: Either String Value
@@ -420,7 +465,7 @@ jsonTestSuiteTest path = testCase fileName $ do
420465-- Build a collection of tests based on the current contents of the
421466-- JSONTestSuite test directories.
422467
423−jsonTestSuite :: IO Test
468+jsonTestSuite :: IO TestTree
424469jsonTestSuite = do
425470 let suitePath = "tests/JSONTestSuite"
426471 let suites = ["test_parsing", "test_transform"]
@@ -495,13 +540,14 @@ showOptions =
495540 ++ ", sumEncoding = TaggedObject {tagFieldName = \"tag\", contentsFieldName = \"contents\"}"
496541 ++ ", unwrapUnaryRecords = False"
497542 ++ ", tagSingleConstructors = False"
543+ ++ ", rejectUnknownFields = False"
498544 ++ "}")
499545 (show defaultOptions)
500546
501547newtype SingleMaybeField = SingleMaybeField { smf :: Maybe Int }
502548 deriving (Eq, Show, Generic)
503549
504−singleMaybeField :: [Test]
550+singleMaybeField :: [TestTree]
505551singleMaybeField = do
506552 (gName, gToJSON, gToEncoding, gFromJSON) <-
507553 [ ("generic", genericToJSON opts, genericToEncoding opts, parse (genericParseJSON opts))
@@ -515,9 +561,200 @@ singleMaybeField = do
515561 v = SingleMaybeField Nothing
516562 opts = defaultOptions{omitNothingFields=True,unwrapUnaryRecords=True}
517563
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+
518750deriveJSON defaultOptions{omitNothingFields=True} ''MyRecord
519751
520752deriveToJSON defaultOptions ''Foo
521753deriveToJSON1 defaultOptions ''Foo
522754
523755deriveJSON defaultOptions{omitNothingFields=True,unwrapUnaryRecords=True} ''SingleMaybeField
756+
757+deriveJSON defaultOptions{rejectUnknownFields=True} ''UnknownFields
758+deriveJSON defaultOptions{rejectUnknownFields=True} ''UnknownFieldsTag
759+deriveJSON defaultOptions{tagSingleConstructors=True,rejectUnknownFields=True} ''UnknownFieldsUnaryTagged
760+deriveJSON defaultOptions{rejectUnknownFields=True} ''UnknownFieldsSum
tests/UnitTests/NullaryConstructors.hs+8−3
@@ -1,4 +1,5 @@
1−{-# LANGUAGE OverloadedStrings #-}
1+{-# LANGUAGE NoImplicitPrelude #-}
2+{-# LANGUAGE OverloadedStrings #-}
23
34{-# OPTIONS_GHC -fno-warn-deprecations #-}
45
@@ -7,16 +8,16 @@ module UnitTests.NullaryConstructors
78 nullaryConstructors
89 ) where
910
10−import Prelude ()
1111import Prelude.Compat
1212
1313import Data.Aeson (decode, eitherDecode, fromEncoding, Value)
1414import Data.Aeson.Internal (IResult (..), iparse)
1515import Data.Aeson.Types (Parser)
1616import Data.ByteString.Builder (toLazyByteString)
17+import Data.Foldable (for_)
1718import Data.Maybe (fromJust)
1819import Encoders
19−import Test.HUnit ((@=?), Assertion)
20+import Test.Tasty.HUnit ((@=?), Assertion)
2021import Types
2122import qualified Data.ByteString.Lazy.Char8 as L
2223
@@ -52,6 +53,10 @@ nullaryConstructors =
5253 -- Make sure that the old `"contents" : []' is still allowed
5354 , ISuccess C1 @=? parse thNullaryParseJSONTaggedObject (dec "{\"tag\":\"c1\",\"contents\":[]}")
5455 , 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
5560 ]
5661 where
5762 enc = eitherDecode . toLazyByteString . fromEncoding
tests/golden/generic.expectednew file+48
@@ -0,0 +1,48 @@
1+OneConstructor
2+Error in $: parsing Types.OneConstructor(OneConstructor) failed, expected Array, but encountered String
3+Error in $: parsing Types.OneConstructor(OneConstructor) failed, expected an empty Array, but encountered an Array of length 1
4+Nullary
5+Error in $: parsing Types.Nullary failed, expected one of the tags ["C1","C2","C3"], but found tag "X"
6+Error in $: parsing Types.Nullary failed, expected String, but encountered Array
7+SomeType (tagged)
8+Error in $.contents: parsing Int failed, expected Number, but encountered Boolean
9+Error in $: parsing Types.SomeType(Unary) failed, key "contents" not found
10+Error in $: parsing Types.SomeType(Record) failed, key "testone" not found
11+Error in $.testone: parsing Double failed, unexpected Boolean
12+Error in $.tag: parsing Types.SomeType failed, expected tag field to be one of ["nullary","unary","product","record","list"], but found tag "X"
13+Error in $: parsing Types.SomeType failed, expected Object with key "tag" containing one of ["nullary","unary","product","record","list"], key "tag" not found
14+Error in $: parsing Types.SomeType failed, expected Object, but encountered Array
15+SomeType (single-field)
16+Error in $.unary: parsing Int failed, expected Number, but encountered Object
17+Error in $.unary: parsing Int failed, expected Number, but encountered Array
18+Error in $: parsing Types.SomeType failed, expected an Object with a single pair where the tag is one of ["nullary","unary","product","record","list"], but found tag "X"
19+Error in $: parsing Types.SomeType failed, expected an Object with a single pair, but found 2 pairs
20+Error in $: parsing Types.SomeType failed, expected an Object with a single pair, but found 0 pairs
21+Error in $: parsing Types.SomeType failed, expected Object, but encountered Array
22+Error in $: not enough input. Expecting ':'
23+Error in $: not enough input. Expecting object value
24+Error in $: not enough input. Expecting ',' or '}'
25+SomeType (two-element array)
26+Error in $[1]: parsing Int failed, expected Number, but encountered Boolean
27+Error in $[1]: parsing Types.SomeType(Record) failed, expected Object, but encountered Null
28+Error in $[0]: parsing Types.SomeType failed, expected tag of the 2-element Array to be one of ["nullary","unary","product","record","list"], but found tag "X"
29+Error in $[0]: parsing Types.SomeType failed, tag element is not a String
30+Error in $: parsing Types.SomeType failed, expected a 2-element Array, but encountered an Array of length 0
31+Error in $: parsing Types.SomeType failed, expected Array, but encountered Object
32+Error in $: not enough input. Expecting ',' or ']'
33+Error in $: not enough input. Expecting json list value
34+SomeType (reject unknown fields)
35+Error in $: parsing Types.SomeType(Record) failed, unknown fields: ["testZero"]
36+Error in $: parsing Types.SomeType failed, expected Object with key "tag" containing one of ["nullary","unary","product","record","list"], key "tag" not found
37+Error in $: parsing Types.SomeType(Record) failed, unknown fields: ["testtwo","testone","testthree"]
38+Foo (reject unknown fields)
39+Error in $: parsing Types.Foo(Foo) failed, unknown fields: ["tag"]
40+Foo (reject unknown fields, tagged single)
41+Error in $: parsing Types.Foo(Foo) failed, unknown fields: ["unknownField"]
42+EitherTextInt
43+Error in $: parsing Types.EitherTextInt(NoneNullary) failed, expected tag "nonenullary", but found tag "X"
44+Error in $: parsing Types.EitherTextInt(NoneNullary) failed, expected String, but encountered Array
45+Product2 Int Bool
46+Error in $[1]: expected Bool, but encountered Null
47+Error in $: parsing Types.Product2(Product2) failed, expected an Array of length 2, but encountered an Array of length 0
48+Error in $: parsing Types.Product2(Product2) failed, expected Array, but encountered Object
tests/golden/simple.expectednew file+22
@@ -0,0 +1,22 @@
1+Int
2+Error in $: parsing Int failed, expected Number, but encountered String
3+Error in $: parsing Int failed, expected Number, but encountered Array
4+Error in $: parsing Int failed, expected Number, but encountered Object
5+Error in $: parsing Int failed, expected Number, but encountered Null
6+Integer
7+Error in $: parsing Integer failed, unexpected floating number 44.44
8+Natural
9+Error in $: parsing Natural failed, unexpected floating number 44.44
10+Error in $: parsing Natural failed, unexpected negative number -50
11+String
12+Error in $: expected String, but encountered Number
13+Error in $: expected String, but encountered Array
14+Error in $: expected String, but encountered Object
15+Error in $: expected String, but encountered Null
16+HashMap
17+Error in $: parsing HashMap failed, expected Object, but encountered String
18+Error in $: parsing HashMap failed, expected Object, but encountered Array
19+Either
20+Error in $[1].Left[1]: expected Bool, but encountered Number
21+Seq
22+Error in $[2]: parsing Int failed, expected Number, but encountered Boolean
travis/cabal_macros.hnew file+448
@@ -0,0 +1,448 @@
1+/* DO NOT EDIT: This file is automatically generated by Cabal */
2+
3+/* package aeson-1.4.4.0 */
4+#ifndef VERSION_aeson
5+#define VERSION_aeson "1.4.4.0"
6+#endif /* VERSION_aeson */
7+#ifndef MIN_VERSION_aeson
8+#define MIN_VERSION_aeson(major1,major2,minor) (\
9+ (major1) < 1 || \
10+ (major1) == 1 && (major2) < 4 || \
11+ (major1) == 1 && (major2) == 4 && (minor) <= 4)
12+#endif /* MIN_VERSION_aeson */
13+
14+/* package Diff-0.3.4 */
15+#ifndef VERSION_Diff
16+#define VERSION_Diff "0.3.4"
17+#endif /* VERSION_Diff */
18+#ifndef MIN_VERSION_Diff
19+#define MIN_VERSION_Diff(major1,major2,minor) (\
20+ (major1) < 0 || \
21+ (major1) == 0 && (major2) < 3 || \
22+ (major1) == 0 && (major2) == 3 && (minor) <= 4)
23+#endif /* MIN_VERSION_Diff */
24+
25+/* package QuickCheck-2.13.1 */
26+#ifndef VERSION_QuickCheck
27+#define VERSION_QuickCheck "2.13.1"
28+#endif /* VERSION_QuickCheck */
29+#ifndef MIN_VERSION_QuickCheck
30+#define MIN_VERSION_QuickCheck(major1,major2,minor) (\
31+ (major1) < 2 || \
32+ (major1) == 2 && (major2) < 13 || \
33+ (major1) == 2 && (major2) == 13 && (minor) <= 1)
34+#endif /* MIN_VERSION_QuickCheck */
35+
36+/* package aeson-1.4.4.0 */
37+#ifndef VERSION_aeson
38+#define VERSION_aeson "1.4.4.0"
39+#endif /* VERSION_aeson */
40+#ifndef MIN_VERSION_aeson
41+#define MIN_VERSION_aeson(major1,major2,minor) (\
42+ (major1) < 1 || \
43+ (major1) == 1 && (major2) < 4 || \
44+ (major1) == 1 && (major2) == 4 && (minor) <= 4)
45+#endif /* MIN_VERSION_aeson */
46+
47+/* package attoparsec-0.13.2.2 */
48+#ifndef VERSION_attoparsec
49+#define VERSION_attoparsec "0.13.2.2"
50+#endif /* VERSION_attoparsec */
51+#ifndef MIN_VERSION_attoparsec
52+#define MIN_VERSION_attoparsec(major1,major2,minor) (\
53+ (major1) < 0 || \
54+ (major1) == 0 && (major2) < 13 || \
55+ (major1) == 0 && (major2) == 13 && (minor) <= 2)
56+#endif /* MIN_VERSION_attoparsec */
57+
58+/* package base-4.12.0.0 */
59+#ifndef VERSION_base
60+#define VERSION_base "4.12.0.0"
61+#endif /* VERSION_base */
62+#ifndef MIN_VERSION_base
63+#define MIN_VERSION_base(major1,major2,minor) (\
64+ (major1) < 4 || \
65+ (major1) == 4 && (major2) < 12 || \
66+ (major1) == 4 && (major2) == 12 && (minor) <= 0)
67+#endif /* MIN_VERSION_base */
68+
69+/* package base-compat-0.10.5 */
70+#ifndef VERSION_base_compat
71+#define VERSION_base_compat "0.10.5"
72+#endif /* VERSION_base_compat */
73+#ifndef MIN_VERSION_base_compat
74+#define MIN_VERSION_base_compat(major1,major2,minor) (\
75+ (major1) < 0 || \
76+ (major1) == 0 && (major2) < 10 || \
77+ (major1) == 0 && (major2) == 10 && (minor) <= 5)
78+#endif /* MIN_VERSION_base_compat */
79+
80+/* package base-orphans-0.8.1 */
81+#ifndef VERSION_base_orphans
82+#define VERSION_base_orphans "0.8.1"
83+#endif /* VERSION_base_orphans */
84+#ifndef MIN_VERSION_base_orphans
85+#define MIN_VERSION_base_orphans(major1,major2,minor) (\
86+ (major1) < 0 || \
87+ (major1) == 0 && (major2) < 8 || \
88+ (major1) == 0 && (major2) == 8 && (minor) <= 1)
89+#endif /* MIN_VERSION_base_orphans */
90+
91+/* package base16-bytestring-0.1.1.6 */
92+#ifndef VERSION_base16_bytestring
93+#define VERSION_base16_bytestring "0.1.1.6"
94+#endif /* VERSION_base16_bytestring */
95+#ifndef MIN_VERSION_base16_bytestring
96+#define MIN_VERSION_base16_bytestring(major1,major2,minor) (\
97+ (major1) < 0 || \
98+ (major1) == 0 && (major2) < 1 || \
99+ (major1) == 0 && (major2) == 1 && (minor) <= 1)
100+#endif /* MIN_VERSION_base16_bytestring */
101+
102+/* package bytestring-0.10.8.2 */
103+#ifndef VERSION_bytestring
104+#define VERSION_bytestring "0.10.8.2"
105+#endif /* VERSION_bytestring */
106+#ifndef MIN_VERSION_bytestring
107+#define MIN_VERSION_bytestring(major1,major2,minor) (\
108+ (major1) < 0 || \
109+ (major1) == 0 && (major2) < 10 || \
110+ (major1) == 0 && (major2) == 10 && (minor) <= 8)
111+#endif /* MIN_VERSION_bytestring */
112+
113+/* package containers-0.6.0.1 */
114+#ifndef VERSION_containers
115+#define VERSION_containers "0.6.0.1"
116+#endif /* VERSION_containers */
117+#ifndef MIN_VERSION_containers
118+#define MIN_VERSION_containers(major1,major2,minor) (\
119+ (major1) < 0 || \
120+ (major1) == 0 && (major2) < 6 || \
121+ (major1) == 0 && (major2) == 6 && (minor) <= 0)
122+#endif /* MIN_VERSION_containers */
123+
124+/* package directory-1.3.3.0 */
125+#ifndef VERSION_directory
126+#define VERSION_directory "1.3.3.0"
127+#endif /* VERSION_directory */
128+#ifndef MIN_VERSION_directory
129+#define MIN_VERSION_directory(major1,major2,minor) (\
130+ (major1) < 1 || \
131+ (major1) == 1 && (major2) < 3 || \
132+ (major1) == 1 && (major2) == 3 && (minor) <= 3)
133+#endif /* MIN_VERSION_directory */
134+
135+/* package dlist-0.8.0.6 */
136+#ifndef VERSION_dlist
137+#define VERSION_dlist "0.8.0.6"
138+#endif /* VERSION_dlist */
139+#ifndef MIN_VERSION_dlist
140+#define MIN_VERSION_dlist(major1,major2,minor) (\
141+ (major1) < 0 || \
142+ (major1) == 0 && (major2) < 8 || \
143+ (major1) == 0 && (major2) == 8 && (minor) <= 0)
144+#endif /* MIN_VERSION_dlist */
145+
146+/* package filepath-1.4.2.1 */
147+#ifndef VERSION_filepath
148+#define VERSION_filepath "1.4.2.1"
149+#endif /* VERSION_filepath */
150+#ifndef MIN_VERSION_filepath
151+#define MIN_VERSION_filepath(major1,major2,minor) (\
152+ (major1) < 1 || \
153+ (major1) == 1 && (major2) < 4 || \
154+ (major1) == 1 && (major2) == 4 && (minor) <= 2)
155+#endif /* MIN_VERSION_filepath */
156+
157+/* package generic-deriving-1.12.4 */
158+#ifndef VERSION_generic_deriving
159+#define VERSION_generic_deriving "1.12.4"
160+#endif /* VERSION_generic_deriving */
161+#ifndef MIN_VERSION_generic_deriving
162+#define MIN_VERSION_generic_deriving(major1,major2,minor) (\
163+ (major1) < 1 || \
164+ (major1) == 1 && (major2) < 12 || \
165+ (major1) == 1 && (major2) == 12 && (minor) <= 4)
166+#endif /* MIN_VERSION_generic_deriving */
167+
168+/* package ghc-prim-0.5.3 */
169+#ifndef VERSION_ghc_prim
170+#define VERSION_ghc_prim "0.5.3"
171+#endif /* VERSION_ghc_prim */
172+#ifndef MIN_VERSION_ghc_prim
173+#define MIN_VERSION_ghc_prim(major1,major2,minor) (\
174+ (major1) < 0 || \
175+ (major1) == 0 && (major2) < 5 || \
176+ (major1) == 0 && (major2) == 5 && (minor) <= 3)
177+#endif /* MIN_VERSION_ghc_prim */
178+
179+/* package hashable-1.3.0.0 */
180+#ifndef VERSION_hashable
181+#define VERSION_hashable "1.3.0.0"
182+#endif /* VERSION_hashable */
183+#ifndef MIN_VERSION_hashable
184+#define MIN_VERSION_hashable(major1,major2,minor) (\
185+ (major1) < 1 || \
186+ (major1) == 1 && (major2) < 3 || \
187+ (major1) == 1 && (major2) == 3 && (minor) <= 0)
188+#endif /* MIN_VERSION_hashable */
189+
190+/* package hashable-time-0.2.0.2 */
191+#ifndef VERSION_hashable_time
192+#define VERSION_hashable_time "0.2.0.2"
193+#endif /* VERSION_hashable_time */
194+#ifndef MIN_VERSION_hashable_time
195+#define MIN_VERSION_hashable_time(major1,major2,minor) (\
196+ (major1) < 0 || \
197+ (major1) == 0 && (major2) < 2 || \
198+ (major1) == 0 && (major2) == 2 && (minor) <= 0)
199+#endif /* MIN_VERSION_hashable_time */
200+
201+/* package integer-logarithms-1.0.3 */
202+#ifndef VERSION_integer_logarithms
203+#define VERSION_integer_logarithms "1.0.3"
204+#endif /* VERSION_integer_logarithms */
205+#ifndef MIN_VERSION_integer_logarithms
206+#define MIN_VERSION_integer_logarithms(major1,major2,minor) (\
207+ (major1) < 1 || \
208+ (major1) == 1 && (major2) < 0 || \
209+ (major1) == 1 && (major2) == 0 && (minor) <= 3)
210+#endif /* MIN_VERSION_integer_logarithms */
211+
212+/* package quickcheck-instances-0.3.21 */
213+#ifndef VERSION_quickcheck_instances
214+#define VERSION_quickcheck_instances "0.3.21"
215+#endif /* VERSION_quickcheck_instances */
216+#ifndef MIN_VERSION_quickcheck_instances
217+#define MIN_VERSION_quickcheck_instances(major1,major2,minor) (\
218+ (major1) < 0 || \
219+ (major1) == 0 && (major2) < 3 || \
220+ (major1) == 0 && (major2) == 3 && (minor) <= 21)
221+#endif /* MIN_VERSION_quickcheck_instances */
222+
223+/* package scientific-0.3.6.2 */
224+#ifndef VERSION_scientific
225+#define VERSION_scientific "0.3.6.2"
226+#endif /* VERSION_scientific */
227+#ifndef MIN_VERSION_scientific
228+#define MIN_VERSION_scientific(major1,major2,minor) (\
229+ (major1) < 0 || \
230+ (major1) == 0 && (major2) < 3 || \
231+ (major1) == 0 && (major2) == 3 && (minor) <= 6)
232+#endif /* MIN_VERSION_scientific */
233+
234+/* package tagged-0.8.6 */
235+#ifndef VERSION_tagged
236+#define VERSION_tagged "0.8.6"
237+#endif /* VERSION_tagged */
238+#ifndef MIN_VERSION_tagged
239+#define MIN_VERSION_tagged(major1,major2,minor) (\
240+ (major1) < 0 || \
241+ (major1) == 0 && (major2) < 8 || \
242+ (major1) == 0 && (major2) == 8 && (minor) <= 6)
243+#endif /* MIN_VERSION_tagged */
244+
245+/* package tasty-1.2.3 */
246+#ifndef VERSION_tasty
247+#define VERSION_tasty "1.2.3"
248+#endif /* VERSION_tasty */
249+#ifndef MIN_VERSION_tasty
250+#define MIN_VERSION_tasty(major1,major2,minor) (\
251+ (major1) < 1 || \
252+ (major1) == 1 && (major2) < 2 || \
253+ (major1) == 1 && (major2) == 2 && (minor) <= 3)
254+#endif /* MIN_VERSION_tasty */
255+
256+/* package tasty-golden-2.3.2 */
257+#ifndef VERSION_tasty_golden
258+#define VERSION_tasty_golden "2.3.2"
259+#endif /* VERSION_tasty_golden */
260+#ifndef MIN_VERSION_tasty_golden
261+#define MIN_VERSION_tasty_golden(major1,major2,minor) (\
262+ (major1) < 2 || \
263+ (major1) == 2 && (major2) < 3 || \
264+ (major1) == 2 && (major2) == 3 && (minor) <= 2)
265+#endif /* MIN_VERSION_tasty_golden */
266+
267+/* package tasty-hunit-0.10.0.2 */
268+#ifndef VERSION_tasty_hunit
269+#define VERSION_tasty_hunit "0.10.0.2"
270+#endif /* VERSION_tasty_hunit */
271+#ifndef MIN_VERSION_tasty_hunit
272+#define MIN_VERSION_tasty_hunit(major1,major2,minor) (\
273+ (major1) < 0 || \
274+ (major1) == 0 && (major2) < 10 || \
275+ (major1) == 0 && (major2) == 10 && (minor) <= 0)
276+#endif /* MIN_VERSION_tasty_hunit */
277+
278+/* package tasty-quickcheck-0.10.1 */
279+#ifndef VERSION_tasty_quickcheck
280+#define VERSION_tasty_quickcheck "0.10.1"
281+#endif /* VERSION_tasty_quickcheck */
282+#ifndef MIN_VERSION_tasty_quickcheck
283+#define MIN_VERSION_tasty_quickcheck(major1,major2,minor) (\
284+ (major1) < 0 || \
285+ (major1) == 0 && (major2) < 10 || \
286+ (major1) == 0 && (major2) == 10 && (minor) <= 1)
287+#endif /* MIN_VERSION_tasty_quickcheck */
288+
289+/* package template-haskell-2.14.0.0 */
290+#ifndef VERSION_template_haskell
291+#define VERSION_template_haskell "2.14.0.0"
292+#endif /* VERSION_template_haskell */
293+#ifndef MIN_VERSION_template_haskell
294+#define MIN_VERSION_template_haskell(major1,major2,minor) (\
295+ (major1) < 2 || \
296+ (major1) == 2 && (major2) < 14 || \
297+ (major1) == 2 && (major2) == 14 && (minor) <= 0)
298+#endif /* MIN_VERSION_template_haskell */
299+
300+/* package text-1.2.3.1 */
301+#ifndef VERSION_text
302+#define VERSION_text "1.2.3.1"
303+#endif /* VERSION_text */
304+#ifndef MIN_VERSION_text
305+#define MIN_VERSION_text(major1,major2,minor) (\
306+ (major1) < 1 || \
307+ (major1) == 1 && (major2) < 2 || \
308+ (major1) == 1 && (major2) == 2 && (minor) <= 3)
309+#endif /* MIN_VERSION_text */
310+
311+/* package time-1.8.0.2 */
312+#ifndef VERSION_time
313+#define VERSION_time "1.8.0.2"
314+#endif /* VERSION_time */
315+#ifndef MIN_VERSION_time
316+#define MIN_VERSION_time(major1,major2,minor) (\
317+ (major1) < 1 || \
318+ (major1) == 1 && (major2) < 8 || \
319+ (major1) == 1 && (major2) == 8 && (minor) <= 0)
320+#endif /* MIN_VERSION_time */
321+
322+/* package time-compat-1.9.2.2 */
323+#ifndef VERSION_time_compat
324+#define VERSION_time_compat "1.9.2.2"
325+#endif /* VERSION_time_compat */
326+#ifndef MIN_VERSION_time_compat
327+#define MIN_VERSION_time_compat(major1,major2,minor) (\
328+ (major1) < 1 || \
329+ (major1) == 1 && (major2) < 9 || \
330+ (major1) == 1 && (major2) == 9 && (minor) <= 2)
331+#endif /* MIN_VERSION_time_compat */
332+
333+/* package unordered-containers-0.2.10.0 */
334+#ifndef VERSION_unordered_containers
335+#define VERSION_unordered_containers "0.2.10.0"
336+#endif /* VERSION_unordered_containers */
337+#ifndef MIN_VERSION_unordered_containers
338+#define MIN_VERSION_unordered_containers(major1,major2,minor) (\
339+ (major1) < 0 || \
340+ (major1) == 0 && (major2) < 2 || \
341+ (major1) == 0 && (major2) == 2 && (minor) <= 10)
342+#endif /* MIN_VERSION_unordered_containers */
343+
344+/* package uuid-types-1.0.3 */
345+#ifndef VERSION_uuid_types
346+#define VERSION_uuid_types "1.0.3"
347+#endif /* VERSION_uuid_types */
348+#ifndef MIN_VERSION_uuid_types
349+#define MIN_VERSION_uuid_types(major1,major2,minor) (\
350+ (major1) < 1 || \
351+ (major1) == 1 && (major2) < 0 || \
352+ (major1) == 1 && (major2) == 0 && (minor) <= 3)
353+#endif /* MIN_VERSION_uuid_types */
354+
355+/* package vector-0.12.0.3 */
356+#ifndef VERSION_vector
357+#define VERSION_vector "0.12.0.3"
358+#endif /* VERSION_vector */
359+#ifndef MIN_VERSION_vector
360+#define MIN_VERSION_vector(major1,major2,minor) (\
361+ (major1) < 0 || \
362+ (major1) == 0 && (major2) < 12 || \
363+ (major1) == 0 && (major2) == 12 && (minor) <= 0)
364+#endif /* MIN_VERSION_vector */
365+
366+/* tool gcc-4.2.1 */
367+#ifndef TOOL_VERSION_gcc
368+#define TOOL_VERSION_gcc "4.2.1"
369+#endif /* TOOL_VERSION_gcc */
370+#ifndef MIN_TOOL_VERSION_gcc
371+#define MIN_TOOL_VERSION_gcc(major1,major2,minor) (\
372+ (major1) < 4 || \
373+ (major1) == 4 && (major2) < 2 || \
374+ (major1) == 4 && (major2) == 2 && (minor) <= 1)
375+#endif /* MIN_TOOL_VERSION_gcc */
376+
377+/* tool ghc-8.6.5 */
378+#ifndef TOOL_VERSION_ghc
379+#define TOOL_VERSION_ghc "8.6.5"
380+#endif /* TOOL_VERSION_ghc */
381+#ifndef MIN_TOOL_VERSION_ghc
382+#define MIN_TOOL_VERSION_ghc(major1,major2,minor) (\
383+ (major1) < 8 || \
384+ (major1) == 8 && (major2) < 6 || \
385+ (major1) == 8 && (major2) == 6 && (minor) <= 5)
386+#endif /* MIN_TOOL_VERSION_ghc */
387+
388+/* tool ghc-pkg-8.6.5 */
389+#ifndef TOOL_VERSION_ghc_pkg
390+#define TOOL_VERSION_ghc_pkg "8.6.5"
391+#endif /* TOOL_VERSION_ghc_pkg */
392+#ifndef MIN_TOOL_VERSION_ghc_pkg
393+#define MIN_TOOL_VERSION_ghc_pkg(major1,major2,minor) (\
394+ (major1) < 8 || \
395+ (major1) == 8 && (major2) < 6 || \
396+ (major1) == 8 && (major2) == 6 && (minor) <= 5)
397+#endif /* MIN_TOOL_VERSION_ghc_pkg */
398+
399+/* tool haddock-2.22.0 */
400+#ifndef TOOL_VERSION_haddock
401+#define TOOL_VERSION_haddock "2.22.0"
402+#endif /* TOOL_VERSION_haddock */
403+#ifndef MIN_TOOL_VERSION_haddock
404+#define MIN_TOOL_VERSION_haddock(major1,major2,minor) (\
405+ (major1) < 2 || \
406+ (major1) == 2 && (major2) < 22 || \
407+ (major1) == 2 && (major2) == 22 && (minor) <= 0)
408+#endif /* MIN_TOOL_VERSION_haddock */
409+
410+/* tool hpc-0.67 */
411+#ifndef TOOL_VERSION_hpc
412+#define TOOL_VERSION_hpc "0.67"
413+#endif /* TOOL_VERSION_hpc */
414+#ifndef MIN_TOOL_VERSION_hpc
415+#define MIN_TOOL_VERSION_hpc(major1,major2,minor) (\
416+ (major1) < 0 || \
417+ (major1) == 0 && (major2) < 67 || \
418+ (major1) == 0 && (major2) == 67 && (minor) <= 0)
419+#endif /* MIN_TOOL_VERSION_hpc */
420+
421+/* tool hsc2hs-0.68.5 */
422+#ifndef TOOL_VERSION_hsc2hs
423+#define TOOL_VERSION_hsc2hs "0.68.5"
424+#endif /* TOOL_VERSION_hsc2hs */
425+#ifndef MIN_TOOL_VERSION_hsc2hs
426+#define MIN_TOOL_VERSION_hsc2hs(major1,major2,minor) (\
427+ (major1) < 0 || \
428+ (major1) == 0 && (major2) < 68 || \
429+ (major1) == 0 && (major2) == 68 && (minor) <= 5)
430+#endif /* MIN_TOOL_VERSION_hsc2hs */
431+
432+/* tool runghc-8.6.5 */
433+#ifndef TOOL_VERSION_runghc
434+#define TOOL_VERSION_runghc "8.6.5"
435+#endif /* TOOL_VERSION_runghc */
436+#ifndef MIN_TOOL_VERSION_runghc
437+#define MIN_TOOL_VERSION_runghc(major1,major2,minor) (\
438+ (major1) < 8 || \
439+ (major1) == 8 && (major2) < 6 || \
440+ (major1) == 8 && (major2) == 6 && (minor) <= 5)
441+#endif /* MIN_TOOL_VERSION_runghc */
442+
443+#ifndef CURRENT_COMPONENT_ID
444+#define CURRENT_COMPONENT_ID "aeson-1.4.4.0-inplace-tests"
445+#endif /* CURRENT_COMPONENT_ID */
446+#ifndef CURRENT_PACKAGE_VERSION
447+#define CURRENT_PACKAGE_VERSION "1.4.4.0"
448+#endif /* CURRENT_PACKAGE_VERSION */
travis/install.sh+11
@@ -7,6 +7,11 @@ echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo
77stack --version
88
99case $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+ ;;
1015 stack)
1116 stack --no-terminal --skip-ghc-check setup
1217 stack --no-terminal --skip-ghc-check test --only-snapshot
@@ -44,4 +49,10 @@ case $BUILD in
4449 cp -a $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin installplan.txt $HOME/.cabsnap/;
4550 fi
4651 ;;
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+ ;;
4758esac
travis/script.sh+4−2
@@ -19,9 +19,11 @@ case $BUILD in
1919 SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&
2020 (cd dist && cabal install --force-reinstalls "$SRC_TGZ")
2121 ;;
22+ cabal2)
23+ cabal v2-build --enable-tests --enable-benchmarks
24+ cabal v2-test --enable-tests --enable-benchmarks
25+ ;;
2226 hlint)
23− stack build --fast aeson --stack-yaml stack-lts8.yaml --system-ghc --no-terminal
24− stack install hlint-2.0.5 --stack-yaml stack-lts8.yaml --system-ghc --no-terminal
2527 make lint
2628 ;;
2729esac