@@ -1,28 +1,29 @@
1−{-# LANGUAGE CPP #-}
1+{-# LANGUAGE CPP #-}
2−{-# LANGUAGE DataKinds #-}
2+{-# LANGUAGE DataKinds #-}
3−{-# LANGUAGE DefaultSignatures #-}
3+{-# LANGUAGE DefaultSignatures #-}
4−{-# LANGUAGE FlexibleContexts #-}
4+{-# LANGUAGE FlexibleContexts #-}
5−{-# LANGUAGE FlexibleInstances #-}
5+{-# LANGUAGE FlexibleInstances #-}
6−{-# LANGUAGE GADTs #-}
6+{-# LANGUAGE GADTs #-}
7{-# LANGUAGE MultiParamTypeClasses #-}
7{-# LANGUAGE MultiParamTypeClasses #-}
8−{-# LANGUAGE NoImplicitPrelude #-}
8+{-# LANGUAGE NamedFieldPuns #-}
9−{-# LANGUAGE OverloadedStrings #-}
9+{-# LANGUAGE OverloadedStrings #-}
10−{-# LANGUAGE PolyKinds #-}
11−{-# LANGUAGE RecordWildCards #-}
10+{-# LANGUAGE RecordWildCards #-}
12−{-# LANGUAGE ScopedTypeVariables #-}
11+{-# LANGUAGE ScopedTypeVariables #-}
13−{-# LANGUAGE TypeOperators #-}
12+{-# LANGUAGE TypeOperators #-}
14−{-# LANGUAGE TupleSections #-}
13+{-# LANGUAGE TypeSynonymInstances #-}
15−{-# LANGUAGE UndecidableInstances #-}
14+{-# LANGUAGE UndecidableInstances #-}
16−{-# LANGUAGE ViewPatterns #-}
15+{-# LANGUAGE ViewPatterns #-}
18−#include "incoherent-compat.h"
17+#if __GLASGOW_HASKELL__ >= 706
18+{-# LANGUAGE PolyKinds #-}
19#include "overlapping-compat.h"
21#include "overlapping-compat.h"
21-- TODO: Drop this when we remove support for Data.Attoparsec.Number
23-- TODO: Drop this when we remove support for Data.Attoparsec.Number
22{-# OPTIONS_GHC -fno-warn-deprecations #-}
24{-# OPTIONS_GHC -fno-warn-deprecations #-}
24−module Data.Aeson.Types.FromJSON
26+module Data.Aeson.Types.FromJSON (
26 -- * Core JSON classes
27 -- * Core JSON classes
27 FromJSON(..)
28 FromJSON(..)
28 -- * Liftings to unary and binary type constructors
29 -- * Liftings to unary and binary type constructors
@@ -32,7 +33,6 @@ module Data.Aeson.Types.FromJSON
32 , parseJSON2
33 , parseJSON2
33 -- * Generic JSON classes
34 -- * Generic JSON classes
34 , GFromJSON(..)
35 , GFromJSON(..)
36 , genericParseJSON
36 , genericParseJSON
37 , genericLiftParseJSON
37 , genericLiftParseJSON
38 -- * Classes and types for map keys
38 -- * Classes and types for map keys
@@ -42,121 +42,106 @@ module Data.Aeson.Types.FromJSON
42 , coerceFromJSONKeyFunction
42 , coerceFromJSONKeyFunction
43 , mapFromJSONKeyFunction
43 , mapFromJSONKeyFunction
48 -- * List functions
45 -- * List functions
49 , listParser
46 , listParser
51− -- * Inspecting @'Value's@
48+ -- * Inspecting @'Value's@
52 , withObject
49 , withObject
53 , withText
50 , withText
54 , withArray
51 , withArray
55 , withScientific
53 , withScientific
56 , withBool
54 , withBool
59 -- * Functions
56 -- * Functions
60 , fromJSON
57 , fromJSON
61 , ifromJSON
58 , ifromJSON
68− , explicitParseFieldMaybe
69− , explicitParseFieldMaybe'
77 -- * Internal
65 -- * Internal
78 , parseOptionalFieldWith
66 , parseOptionalFieldWith
81−import Prelude.Compat
69+import Prelude ()
70+import Prelude.Compat hiding (foldr)
83−import Control.Applicative ((<|>), Const(..), liftA2)
84−import Control.Monad (zipWithM)
85import Data.Aeson.Internal.Functions (mapKey)
72import Data.Aeson.Internal.Functions (mapKey)
86−import Data.Aeson.Parser.Internal (eitherDecodeWith, jsonEOF)
87import Data.Aeson.Types.Generic
73import Data.Aeson.Types.Generic
88import Data.Aeson.Types.Internal
74import Data.Aeson.Types.Internal
76+import qualified Data.Aeson.Parser.Time as Time
77+import qualified Data.Attoparsec.ByteString.Char8 as A (endOfInput, parseOnly,
80+import Control.Applicative (Const (..), (<|>))
81+import Control.Monad ((<=<), zipWithM)
82+import Data.Attoparsec.Number (Number (..))
89−import Data.Bits (unsafeShiftR)
83+import Data.Bits (unsafeShiftR)
90−import Data.Fixed (Fixed, HasResolution (resolution), Nano)
84+import Data.Fixed (Fixed, HasResolution)
91−import Data.Functor.Compose (Compose(..))
85+import Data.Functor.Compose (Compose (..))
92−import Data.Functor.Identity (Identity(..))
86+import Data.Functor.Identity (Identity (..))
93−import Data.Functor.Product (Product(..))
87+import Data.Functor.Product (Product (..))
94−import Data.Functor.Sum (Sum(..))
88+import Data.Functor.Sum (Sum (..))
95−import Data.Hashable (Hashable(..))
89+import Data.Hashable (Hashable (..))
96−import Data.Int (Int16, Int32, Int64, Int8)
90+import Data.Int (Int16, Int32, Int64, Int8)
97−import Data.List.NonEmpty (NonEmpty(..))
91+import Data.List.NonEmpty (NonEmpty (..))
98−import Data.Maybe (fromMaybe)
92+import Data.Maybe (fromMaybe)
99−import Data.Semigroup ((<>))
93+import Data.Monoid (Dual (..), First (..), Last (..), (<>))
100−import Data.Proxy (Proxy(..))
94+import Data.Proxy (Proxy (..))
101−import Data.Ratio ((%), Ratio)
95+import Data.Ratio (Ratio, (%))
102−import Data.Scientific (Scientific, base10Exponent)
96+import Data.Scientific (Scientific)
103−import Data.Tagged (Tagged(..))
97+import Data.Tagged (Tagged (..))
104−import Data.Text (Text, pack, unpack)
98+import Data.Text (Text, pack, unpack)
105−import Data.Time (Day, DiffTime, LocalTime, NominalDiffTime, TimeOfDay, UTCTime, ZonedTime)
99+import Data.Time (Day, LocalTime, NominalDiffTime, TimeOfDay,
106−import Data.Time.Calendar.Compat (CalendarDiffDays (..), DayOfWeek (..))
100+ UTCTime, ZonedTime)
107−import Data.Time.LocalTime.Compat (CalendarDiffTime (..))
101+import Data.Time.Format (parseTime)
108−import Data.Time.Clock.System.Compat (SystemTime (..))
109−import Data.Time.Format.Compat (parseTimeM, defaultTimeLocale)
102+import Data.Time.Locale.Compat (defaultTimeLocale)
110−import Data.Traversable as Tr (sequence)
103+import Data.Traversable as Tr (sequence)
111−import Data.Vector (Vector)
104+import Data.Vector (Vector)
112−import Data.Version (Version, parseVersion)
105+import Data.Version (Version, parseVersion)
113−import Data.Void (Void)
114−import Data.Word (Word16, Word32, Word64, Word8)
106+import Data.Word (Word16, Word32, Word64, Word8)
115−import Foreign.Storable (Storable)
107+import Foreign.Storable (Storable)
116−import Foreign.C.Types (CTime (..))
117import GHC.Generics
108import GHC.Generics
118−import Numeric.Natural (Natural)
109+import Numeric.Natural (Natural)
119import Text.ParserCombinators.ReadP (readP_to_S)
110import Text.ParserCombinators.ReadP (readP_to_S)
120−import Unsafe.Coerce (unsafeCoerce)
111+
121−import qualified Data.Aeson.Parser.Time as Time
112+import qualified Data.DList as DList
122−import qualified Data.Attoparsec.ByteString.Char8 as A (endOfInput, parseOnly, scientific)
123−import qualified Data.ByteString.Lazy as L
124−import qualified Data.DList as DList
125−import qualified Data.HashMap.Strict as H
113+import qualified Data.HashMap.Strict as H
126−import qualified Data.HashSet as HashSet
114+import qualified Data.HashSet as HashSet
127−import qualified Data.IntMap as IntMap
115+import qualified Data.IntMap as IntMap
128−import qualified Data.IntSet as IntSet
116+import qualified Data.IntSet as IntSet
129−import qualified Data.Map as M
117+import qualified Data.Map as M
130−import qualified Data.Monoid as Monoid
131−import qualified Data.Scientific as Scientific
118+import qualified Data.Scientific as Scientific
132−import qualified Data.Semigroup as Semigroup
133−import qualified Data.Sequence as Seq
119+import qualified Data.Sequence as Seq
134−import qualified Data.Set as Set
120+import qualified Data.Set as Set
135−import qualified Data.Text as T
121+import qualified Data.Text as T
136−import qualified Data.Text.Encoding as T
122+import qualified Data.Text.Encoding as T
137−import qualified Data.Text.Lazy as LT
123+import qualified Data.Text.Lazy as LT
138−import qualified Data.Tree as Tree
124+import qualified Data.Tree as Tree
139−import qualified Data.UUID.Types as UUID
140−import qualified Data.Vector as V
125+import qualified Data.Vector as V
141−import qualified Data.Vector.Generic as VG
126+import qualified Data.Vector.Generic as VG
142import qualified Data.Vector.Primitive as VP
127import qualified Data.Vector.Primitive as VP
143−import qualified Data.Vector.Storable as VS
128+import qualified Data.Vector.Storable as VS
144−import qualified Data.Vector.Unboxed as VU
129+import qualified Data.Vector.Unboxed as VU
146−import qualified GHC.Exts as Exts
131+import Unsafe.Coerce (unsafeCoerce)
147−import qualified Data.Primitive.Array as PM
148−import qualified Data.Primitive.SmallArray as PM
149−import qualified Data.Primitive.Types as PM
151−#if MIN_VERSION_primitive(0,6,4)
133+#ifndef HAS_COERCIBLE
152−#if !MIN_VERSION_primitive(0,7,0)
134+#define HAS_COERCIBLE (__GLASGOW_HASKELL__ >= 707)
153−import qualified Data.Primitive.UnliftedArray as PM
155−import qualified Data.Primitive.PrimArray as PM
159import Data.Coerce (Coercible, coerce)
138import Data.Coerce (Coercible, coerce)
139+coerce' :: Coercible a b => a -> b
143+coerce' = unsafeCoerce
161parseIndexedJSON :: (Value -> Parser a) -> Int -> Value -> Parser a
146parseIndexedJSON :: (Value -> Parser a) -> Int -> Value -> Parser a
162parseIndexedJSON p idx value = p value <?> Index idx
147parseIndexedJSON p idx value = p value <?> Index idx
@@ -165,7 +150,7 @@ parseIndexedJSON p idx value = p value <?> Index idx
165parseIndexedJSONPair :: (Value -> Parser a) -> (Value -> Parser b) -> Int -> Value -> Parser (a, b)
150parseIndexedJSONPair :: (Value -> Parser a) -> (Value -> Parser b) -> Int -> Value -> Parser (a, b)
166parseIndexedJSONPair keyParser valParser idx value = p value <?> Index idx
151parseIndexedJSONPair keyParser valParser idx value = p value <?> Index idx
168− p = withArray "(k, v)" $ \ab ->
153+ p = withArray "(k,v)" $ \ab ->
169 let n = V.length ab
154 let n = V.length ab
170 in if n == 2
155 in if n == 2
171 then (,) <$> parseJSONElemAtIndex keyParser 0 ab
156 then (,) <$> parseJSONElemAtIndex keyParser 0 ab
@@ -177,57 +162,33 @@ parseIndexedJSONPair keyParser valParser idx value = p value <?> Index idx
177parseJSONElemAtIndex :: (Value -> Parser a) -> Int -> V.Vector Value -> Parser a
162parseJSONElemAtIndex :: (Value -> Parser a) -> Int -> V.Vector Value -> Parser a
178parseJSONElemAtIndex p idx ary = p (V.unsafeIndex ary idx) <?> Index idx
163parseJSONElemAtIndex p idx ary = p (V.unsafeIndex ary idx) <?> Index idx
165+scientificToNumber :: Scientific -> Number
167+ | e < 0 = D $ Scientific.toRealFloat s
168+ | otherwise = I $ c * 10 ^ e
170+ e = Scientific.base10Exponent s
171+ c = Scientific.coefficient s
172+{-# INLINE scientificToNumber #-}
180parseRealFloat :: RealFloat a => String -> Value -> Parser a
174parseRealFloat :: RealFloat a => String -> Value -> Parser a
181−parseRealFloat _ (Number s) = pure $ Scientific.toRealFloat s
175+parseRealFloat _ (Number s) = pure $ Scientific.toRealFloat s
182−parseRealFloat _ Null = pure (0/0)
176+parseRealFloat _ Null = pure (0/0)
183−parseRealFloat name v = prependContext name (unexpected v)
177+parseRealFloat expected v = typeMismatch expected v
184{-# INLINE parseRealFloat #-}
178{-# INLINE parseRealFloat #-}
186−parseIntegralFromScientific :: forall a. Integral a => Scientific -> Parser a
187−parseIntegralFromScientific s =
188− case Scientific.floatingOrInteger s :: Either Double a of
190− Left _ -> fail $ "unexpected floating number " ++ show s
191−{-# INLINE parseIntegralFromScientific #-}
193parseIntegral :: Integral a => String -> Value -> Parser a
180parseIntegral :: Integral a => String -> Value -> Parser a
194−parseIntegral name =
181+parseIntegral expected = withScientific expected $ pure . truncate
195− prependContext name . withBoundedScientific' parseIntegralFromScientific
196{-# INLINE parseIntegral #-}
182{-# INLINE parseIntegral #-}
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)
202− (Scientific.toBoundedInteger s)
203−{-# INLINE parseBoundedIntegralFromScientific #-}
205−parseBoundedIntegral :: (Bounded a, Integral a) => String -> Value -> Parser a
206−parseBoundedIntegral name =
207− prependContext name . withScientific' parseBoundedIntegralFromScientific
208−{-# INLINE parseBoundedIntegral #-}
210parseScientificText :: Text -> Parser Scientific
184parseScientificText :: Text -> Parser Scientific
211parseScientificText
185parseScientificText
212 = either fail pure
186 = either fail pure
213 . A.parseOnly (A.scientific <* A.endOfInput)
187 . A.parseOnly (A.scientific <* A.endOfInput)
214 . T.encodeUtf8
188 . T.encodeUtf8
216−parseIntegralText :: Integral a => String -> Text -> Parser a
190+parseIntegralText :: Integral a => Text -> Parser a
217−parseIntegralText name t =
191+parseIntegralText t = truncate <$> parseScientificText t
218− prependContext name $
219− parseScientificText t
220− >>= rejectLargeExponent
221− >>= parseIntegralFromScientific
223− rejectLargeExponent :: Scientific -> Parser Scientific
224− rejectLargeExponent s = withBoundedScientific' pure (Number s)
225−{-# INLINE parseIntegralText #-}
227−parseBoundedIntegralText :: (Bounded a, Integral a) => String -> Text -> Parser a
228−parseBoundedIntegralText name t =
229− prependContext name $
230− parseScientificText t >>= parseBoundedIntegralFromScientific
232parseOptionalFieldWith :: (Value -> Parser (Maybe a))
193parseOptionalFieldWith :: (Value -> Parser (Maybe a))
233 -> Object -> Text -> Parser (Maybe a)
194 -> Object -> Text -> Parser (Maybe a)
@@ -246,21 +207,16 @@ class GFromJSON arity f where
246 -- | This method (applied to 'defaultOptions') is used as the
207 -- | This method (applied to 'defaultOptions') is used as the
247 -- default generic implementation of 'parseJSON' (if the @arity@ is 'Zero')
208 -- default generic implementation of 'parseJSON' (if the @arity@ is 'Zero')
248 -- or 'liftParseJSON' (if the @arity@ is 'One').
209 -- or 'liftParseJSON' (if the @arity@ is 'One').
249− gParseJSON :: Options -> FromArgs arity a -> Value -> Parser (f a)
210+ gParseJSON :: Options -> Proxy arity
251−-- | A 'FromArgs' value either stores nothing (for 'FromJSON') or it stores the
252−-- two function arguments that decode occurrences of the type parameter (for
254−data FromArgs arity a where
255− NoFromArgs :: FromArgs Zero a
256− From1Args :: (Value -> Parser a) -> (Value -> Parser [a]) -> FromArgs One a
211+ -> (Value -> Parser a) -> (Value -> Parser [a])
212+ -> Value -> Parser (f a)
258-- | A configurable generic JSON decoder. This function applied to
214-- | A configurable generic JSON decoder. This function applied to
259-- 'defaultOptions' is used as the default for 'parseJSON' when the
215-- 'defaultOptions' is used as the default for 'parseJSON' when the
260-- type is an instance of 'Generic'.
216-- type is an instance of 'Generic'.
261genericParseJSON :: (Generic a, GFromJSON Zero (Rep a))
217genericParseJSON :: (Generic a, GFromJSON Zero (Rep a))
262 => Options -> Value -> Parser a
218 => Options -> Value -> Parser a
263−genericParseJSON opts = fmap to . gParseJSON opts NoFromArgs
219+genericParseJSON opts = fmap to . gParseJSON opts proxyZero undefined undefined
265-- | A configurable generic JSON decoder. This function applied to
221-- | A configurable generic JSON decoder. This function applied to
266-- 'defaultOptions' is used as the default for 'liftParseJSON' when the
222-- 'defaultOptions' is used as the default for 'liftParseJSON' when the
@@ -268,7 +224,7 @@ genericParseJSON opts = fmap to . gParseJSON opts NoFromArgs
268genericLiftParseJSON :: (Generic1 f, GFromJSON One (Rep1 f))
224genericLiftParseJSON :: (Generic1 f, GFromJSON One (Rep1 f))
269 => Options -> (Value -> Parser a) -> (Value -> Parser [a])
225 => Options -> (Value -> Parser a) -> (Value -> Parser [a])
270 -> Value -> Parser (f a)
226 -> Value -> Parser (f a)
271−genericLiftParseJSON opts pj pjl = fmap to1 . gParseJSON opts (From1Args pj pjl)
227+genericLiftParseJSON opts pj pjl = fmap to1 . gParseJSON opts proxyOne pj pjl
273-------------------------------------------------------------------------------
229-------------------------------------------------------------------------------
@@ -287,21 +243,14 @@ genericLiftParseJSON opts pj pjl = fmap to1 . gParseJSON opts (From1Args pj pjl)
288-- The basic ways to signal a failed conversion are as follows:
244-- The basic ways to signal a failed conversion are as follows:
290−-- * 'fail' yields a custom error message: it is the recommended way of
246+-- * 'empty' and 'mzero' work, but are terse and uninformative
291−-- reporting a failure;
293−-- * 'Control.Applicative.empty' (or 'Control.Monad.mzero') is uninformative:
248+-- * 'fail' yields a custom error message
294−-- use it when the error is meant to be caught by some @('<|>')@;
296−-- * 'typeMismatch' can be used to report a failure when the encountered value
250+-- * 'typeMismatch' produces an informative message for cases when the
297−-- is not of the expected JSON type; 'unexpected' is an appropriate alternative
251+-- value encountered is not of the expected type
298−-- when more than one type may be expected, or to keep the expected type
301−-- 'prependFailure' (or 'modifyFailure') add more information to a parser's
304−-- An example type and instance using 'typeMismatch' and 'prependFailure':
253+-- An example type and instance:
307-- \-- Allow ourselves to write 'Text' literals.
256-- \-- Allow ourselves to write 'Text' literals.
@@ -309,30 +258,15 @@ genericLiftParseJSON opts pj pjl = fmap to1 . gParseJSON opts (From1Args pj pjl)
310-- data Coord = Coord { x :: Double, y :: Double }
259-- data Coord = Coord { x :: Double, y :: Double }
312−-- instance 'FromJSON' Coord where
261+-- instance FromJSON Coord where
313−-- 'parseJSON' ('Object' v) = Coord
262+-- parseJSON ('Object' v) = Coord '<$>'
314−-- '<$>' v '.:' \"x\"
263+-- v '.:' \"x\" '<*>'
315−-- '<*>' v '.:' \"y\"
264+-- v '.:' \"y\"
317−-- \-- We do not expect a non-'Object' value here.
266+-- \-- We do not expect a non-'Object' value here.
318−-- \-- We could use 'Control.Applicative.empty' to fail, but 'typeMismatch'
267+-- \-- We could use 'mzero' to fail, but 'typeMismatch'
319−-- \-- gives a much more informative error message.
268+-- \-- gives a much more informative error message.
320−-- 'parseJSON' invalid =
269+-- parseJSON invalid = 'typeMismatch' \"Coord\" invalid
321−-- 'prependFailure' "parsing Coord failed, "
322−-- ('typeMismatch' \"Object\" invalid)
325−-- For this common case of only being concerned with a single
326−-- type of JSON value, the functions 'withObject', 'withScientific', etc.
327−-- are provided. Their use is to be preferred when possible, since
328−-- they are more terse. Using 'withObject', we can rewrite the above instance
329−-- (assuming the same language extension and data type) as:
332−-- instance 'FromJSON' Coord where
333−-- 'parseJSON' = 'withObject' \"Coord\" $ \\v -> Coord
334−-- '<$>' v '.:' \"x\"
335−-- '<*>' v '.:' \"y\"
338-- Instead of manually writing your 'FromJSON' instance, there are two options
272-- Instead of manually writing your 'FromJSON' instance, there are two options
@@ -340,7 +274,7 @@ genericLiftParseJSON opts pj pjl = fmap to1 . gParseJSON opts (From1Args pj pjl)
341-- * "Data.Aeson.TH" provides Template Haskell functions which will derive an
275-- * "Data.Aeson.TH" provides Template Haskell functions which will derive an
342-- instance at compile time. The generated instance is optimized for your type
276-- instance at compile time. The generated instance is optimized for your type
343−-- so it will probably be more efficient than the following option.
277+-- so will probably be more efficient than the following two options:
345-- * The compiler can provide a default generic implementation for
279-- * The compiler can provide a default generic implementation for
346-- 'parseJSON'.
280-- 'parseJSON'.
@@ -358,21 +292,18 @@ genericLiftParseJSON opts pj pjl = fmap to1 . gParseJSON opts (From1Args pj pjl)
359-- data Coord = Coord { x :: Double, y :: Double } deriving 'Generic'
293-- data Coord = Coord { x :: Double, y :: Double } deriving 'Generic'
361−-- instance 'FromJSON' Coord
295+-- instance FromJSON Coord
364−-- The default implementation will be equivalent to
298+-- If @DefaultSignatures@ doesn't give exactly the results you want,
365−-- @parseJSON = 'genericParseJSON' 'defaultOptions'@; if you need different
366−-- options, you can customize the generic decoding by defining:
299+-- you can customize the generic decoding with only a tiny amount of
300+-- effort, using 'genericParseJSON' with your preferred 'Options':
369−-- customOptions = 'defaultOptions'
370−-- { 'fieldLabelModifier' = 'map' 'Data.Char.toUpper'
373−-- instance 'FromJSON' Coord where
303+-- instance FromJSON Coord where
374−-- 'parseJSON' = 'genericParseJSON' customOptions
304+-- parseJSON = 'genericParseJSON' 'defaultOptions'
376class FromJSON a where
307class FromJSON a where
377 parseJSON :: Value -> Parser a
308 parseJSON :: Value -> Parser a
@@ -380,11 +311,13 @@ class FromJSON a where
380 parseJSON = genericParseJSON defaultOptions
311 parseJSON = genericParseJSON defaultOptions
382 parseJSONList :: Value -> Parser [a]
313 parseJSONList :: Value -> Parser [a]
383− parseJSONList = withArray "[]" $ \a ->
314+ parseJSONList (Array a)
384− zipWithM (parseIndexedJSON parseJSON) [0..]
315+ = zipWithM (parseIndexedJSON parseJSON) [0..]
385 . V.toList
316 . V.toList
319+ parseJSONList v = typeMismatch "[a]" v
388-------------------------------------------------------------------------------
321-------------------------------------------------------------------------------
389-- Classes and types for map keys
322-- Classes and types for map keys
390-------------------------------------------------------------------------------
323-------------------------------------------------------------------------------
@@ -396,16 +329,6 @@ class FromJSON a where
396-- > newtype SomeId = SomeId { getSomeId :: Text }
329-- > newtype SomeId = SomeId { getSomeId :: Text }
397-- > deriving (Eq,Ord,Hashable,FromJSONKey)
330-- > deriving (Eq,Ord,Hashable,FromJSONKey)
399−-- If you have a sum of nullary constructors, you may use the generic
403−-- data Color = Red | Green | Blue
406−-- instance 'FromJSONKey' Color where
407−-- 'fromJSONKey' = 'genericFromJSONKey' 'defaultJSONKeyOptions'
409class FromJSONKey a where
332class FromJSONKey a where
410 -- | Strategy for parsing the key of a map-like container.
333 -- | Strategy for parsing the key of a map-like container.
411 fromJSONKey :: FromJSONKeyFunction a
334 fromJSONKey :: FromJSONKeyFunction a
@@ -428,7 +351,11 @@ class FromJSONKey a where
428-- At the moment this type is intentionally not exported. 'FromJSONKeyFunction'
351-- At the moment this type is intentionally not exported. 'FromJSONKeyFunction'
429-- can be inspected, but cannot be constructed.
352-- can be inspected, but cannot be constructed.
430data CoerceText a where
353data CoerceText a where
431 CoerceText :: Coercible Text a => CoerceText a
355 CoerceText :: Coercible Text a => CoerceText a
357+ CoerceText :: CoerceText a
433-- | This type is related to 'ToJSONKeyFunction'. If 'FromJSONKeyValue' is used in the
360-- | This type is related to 'ToJSONKeyFunction'. If 'FromJSONKeyValue' is used in the
434-- 'FromJSONKey' instance, then 'ToJSONKeyValue' should be used in the 'ToJSONKey'
361-- 'FromJSONKey' instance, then 'ToJSONKeyValue' should be used in the 'ToJSONKey'
@@ -448,7 +375,7 @@ data FromJSONKeyFunction a
449-- | Only law abiding up to interpretation
376-- | Only law abiding up to interpretation
450instance Functor FromJSONKeyFunction where
377instance Functor FromJSONKeyFunction where
451− fmap h (FromJSONKeyCoerce CoerceText) = FromJSONKeyText (h . coerce)
378+ fmap h (FromJSONKeyCoerce CoerceText) = FromJSONKeyText (h . coerce')
452 fmap h (FromJSONKeyText f) = FromJSONKeyText (h . f)
379 fmap h (FromJSONKeyText f) = FromJSONKeyText (h . f)
453 fmap h (FromJSONKeyTextParser f) = FromJSONKeyTextParser (fmap h . f)
380 fmap h (FromJSONKeyTextParser f) = FromJSONKeyTextParser (fmap h . f)
454 fmap h (FromJSONKeyValue f) = FromJSONKeyValue (fmap h . f)
381 fmap h (FromJSONKeyValue f) = FromJSONKeyValue (fmap h . f)
@@ -462,7 +389,9 @@ instance Functor FromJSONKeyFunction where
463-- On pre GHC 7.8 this is unconstrainted function.
390-- On pre GHC 7.8 this is unconstrainted function.
464fromJSONKeyCoerce ::
391fromJSONKeyCoerce ::
465 Coercible Text a =>
393 Coercible Text a =>
466 FromJSONKeyFunction a
395 FromJSONKeyFunction a
467fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText
396fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText
@@ -470,91 +399,60 @@ fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText
471-- See note on 'fromJSONKeyCoerce'.
400-- See note on 'fromJSONKeyCoerce'.
472coerceFromJSONKeyFunction ::
401coerceFromJSONKeyFunction ::
473 Coercible a b =>
403 Coercible a b =>
474 FromJSONKeyFunction a -> FromJSONKeyFunction b
405 FromJSONKeyFunction a -> FromJSONKeyFunction b
475coerceFromJSONKeyFunction = coerce
407coerceFromJSONKeyFunction = coerce
409+coerceFromJSONKeyFunction (FromJSONKeyCoerce CoerceText) = FromJSONKeyCoerce CoerceText
410+coerceFromJSONKeyFunction (FromJSONKeyText f) = FromJSONKeyText (coerce' . f)
411+coerceFromJSONKeyFunction (FromJSONKeyTextParser f) = FromJSONKeyTextParser (fmap coerce' . f)
412+coerceFromJSONKeyFunction (FromJSONKeyValue f) = FromJSONKeyValue (fmap coerce' . f)
478 "FromJSONKeyCoerce: fmap id" forall (x :: FromJSONKeyFunction a).
416 "FromJSONKeyCoerce: fmap id" forall (x :: FromJSONKeyFunction a).
479 fmap id x = x
417 fmap id x = x
482 "FromJSONKeyCoerce: fmap coerce" forall x .
421 "FromJSONKeyCoerce: fmap coerce" forall x .
483 fmap coerce x = coerceFromJSONKeyFunction x
422 fmap coerce x = coerceFromJSONKeyFunction x
486-- | Same as 'fmap'. Provided for the consistency with 'ToJSONKeyFunction'.
426-- | Same as 'fmap'. Provided for the consistency with 'ToJSONKeyFunction'.
487mapFromJSONKeyFunction :: (a -> b) -> FromJSONKeyFunction a -> FromJSONKeyFunction b
427mapFromJSONKeyFunction :: (a -> b) -> FromJSONKeyFunction a -> FromJSONKeyFunction b
488mapFromJSONKeyFunction = fmap
428mapFromJSONKeyFunction = fmap
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.
494−-- See also 'genericToJSONKey'.
499−-- data Color = Red | Green | Blue
500−-- deriving 'Generic'
502−-- instance 'FromJSONKey' Color where
503−-- 'fromJSONKey' = 'genericFromJSONKey' 'defaultJSONKeyOptions'
505−genericFromJSONKey :: forall a. (Generic a, GFromJSONKey (Rep a))
507− -> FromJSONKeyFunction a
508−genericFromJSONKey opts = FromJSONKeyTextParser $ \t ->
509− case parseSumFromString (keyModifier opts) t of
511− "invalid key " ++ show t ++ ", expected one of " ++ show cnames
512− Just k -> pure (to k)
514− cnames = unTagged2 (constructorTags (keyModifier opts) :: Tagged2 (Rep a) [String])
516−class (ConstructorNames f, SumFromString f) => GFromJSONKey f where
517−instance (ConstructorNames f, SumFromString f) => GFromJSONKey f where
519-------------------------------------------------------------------------------
430-------------------------------------------------------------------------------
520-- Functions needed for documentation
431-- Functions needed for documentation
521-------------------------------------------------------------------------------
432-------------------------------------------------------------------------------
523-- | Fail parsing due to a type mismatch, with a descriptive message.
434-- | Fail parsing due to a type mismatch, with a descriptive message.
525−-- The following wrappers should generally be prefered:
436+-- Example usage:
526−-- 'withObject', 'withArray', 'withText', 'withBool'.
528−-- ==== Error message example
530−-- > typeMismatch "Object" (String "oops")
438+-- @
531−-- > -- Error: "expected Object, but encountered String"
439+-- instance FromJSON Coord where
440+-- parseJSON ('Object' v) = {- type matches, life is good -}
441+-- parseJSON wat = 'typeMismatch' \"Coord\" wat
532−typeMismatch :: String -- ^ The name of the JSON type being parsed
443+typeMismatch :: String -- ^ The name of the type you are trying to parse.
533− -- (@\"Object\"@, @\"Array\"@, @\"String\"@, @\"Number\"@,
534− -- @\"Boolean\"@, or @\"Null\"@).
535 -> Value -- ^ The actual value encountered.
444 -> Value -- ^ The actual value encountered.
536 -> Parser a
445 -> Parser a
537typeMismatch expected actual =
446typeMismatch expected actual =
538− fail $ "expected " ++ expected ++ ", but encountered " ++ typeOf actual
447+ fail $ "expected " ++ expected ++ ", encountered " ++ name
540−-- | Fail parsing due to a type mismatch, when the expected types are implicit.
542−-- ==== Error message example
544−-- > unexpected (String "oops")
545−-- > -- Error: "unexpected String"
546−unexpected :: Value -> Parser a
547−unexpected actual = fail $ "unexpected " ++ typeOf actual
549−-- | JSON type of a value, name of the head constructor.
550−typeOf :: Value -> String
551−typeOf v = case v of
449+ name = case actual of
552− Object _ -> "Object"
450+ Object _ -> "Object"
553− Array _ -> "Array"
451+ Array _ -> "Array"
554− String _ -> "String"
452+ String _ -> "String"
555− Number _ -> "Number"
453+ Number _ -> "Number"
556− Bool _ -> "Boolean"
454+ Bool _ -> "Boolean"
557− Null -> "Null"
455+ Null -> "Null"
559-------------------------------------------------------------------------------
457-------------------------------------------------------------------------------
560-- Lifings of FromJSON and ToJSON to unary and binary type constructors
458-- Lifings of FromJSON and ToJSON to unary and binary type constructors
@@ -567,7 +465,7 @@ typeOf v = case v of
568-- * "Data.Aeson.TH" provides Template Haskell functions which will derive an
466-- * "Data.Aeson.TH" provides Template Haskell functions which will derive an
569-- instance at compile time. The generated instance is optimized for your type
467-- instance at compile time. The generated instance is optimized for your type
570−-- so it will probably be more efficient than the following option.
468+-- so will probably be more efficient than the following two options:
572-- * The compiler can provide a default generic implementation for
470-- * The compiler can provide a default generic implementation for
573-- 'liftParseJSON'.
471-- 'liftParseJSON'.
@@ -585,20 +483,16 @@ typeOf v = case v of
586-- data Pair a b = Pair { pairFst :: a, pairSnd :: b } deriving 'Generic1'
484-- data Pair a b = Pair { pairFst :: a, pairSnd :: b } deriving 'Generic1'
588−-- instance 'FromJSON' a => 'FromJSON1' (Pair a)
486+-- instance FromJSON a => FromJSON1 (Pair a)
591−-- If the default implementation doesn't give exactly the results you want,
489+-- If @DefaultSignatures@ doesn't give exactly the results you want,
592-- you can customize the generic decoding with only a tiny amount of
490-- you can customize the generic decoding with only a tiny amount of
593-- effort, using 'genericLiftParseJSON' with your preferred 'Options':
491-- effort, using 'genericLiftParseJSON' with your preferred 'Options':
596−-- customOptions = 'defaultOptions'
597−-- { 'fieldLabelModifier' = 'map' 'Data.Char.toUpper'
600−-- instance 'FromJSON' a => 'FromJSON1' (Pair a) where
494+-- instance FromJSON a => FromJSON1 (Pair a) where
601−-- 'liftParseJSON' = 'genericLiftParseJSON' customOptions
495+-- liftParseJSON = 'genericLiftParseJSON' 'defaultOptions'
603class FromJSON1 f where
497class FromJSON1 f where
604 liftParseJSON :: (Value -> Parser a) -> (Value -> Parser [a]) -> Value -> Parser (f a)
498 liftParseJSON :: (Value -> Parser a) -> (Value -> Parser [a]) -> Value -> Parser (f a)
@@ -635,8 +529,9 @@ class FromJSON2 f where
635 -> (Value -> Parser b)
529 -> (Value -> Parser b)
636 -> (Value -> Parser [b])
530 -> (Value -> Parser [b])
637 -> Value -> Parser [f a b]
531 -> Value -> Parser [f a b]
638− liftParseJSONList2 fa ga fb gb = withArray "[]" $ \vals ->
532+ liftParseJSONList2 fa ga fb gb v = case v of
639− fmap V.toList (V.mapM (liftParseJSON2 fa ga fb gb) vals)
533+ Array vals -> fmap V.toList (V.mapM (liftParseJSON2 fa ga fb gb) vals)
534+ _ -> typeMismatch "[a]" v
641-- | Lift the standard 'parseJSON' function through the type constructor.
536-- | Lift the standard 'parseJSON' function through the type constructor.
642parseJSON2 :: (FromJSON2 f, FromJSON a, FromJSON b) => Value -> Parser (f a b)
537parseJSON2 :: (FromJSON2 f, FromJSON a, FromJSON b) => Value -> Parser (f a b)
@@ -647,10 +542,9 @@ parseJSON2 = liftParseJSON2 parseJSON parseJSONList parseJSON parseJSONList
647-- List functions
542-- List functions
648-------------------------------------------------------------------------------
543-------------------------------------------------------------------------------
650−-- | Helper function to use with 'liftParseJSON'. See 'Data.Aeson.ToJSON.listEncoding'.
651listParser :: (Value -> Parser a) -> Value -> Parser [a]
545listParser :: (Value -> Parser a) -> Value -> Parser [a]
652listParser f (Array xs) = fmap V.toList (V.mapM f xs)
546listParser f (Array xs) = fmap V.toList (V.mapM f xs)
653−listParser _ v = typeMismatch "Array" v
547+listParser _ v = typeMismatch "[a]" v
654{-# INLINE listParser #-}
548{-# INLINE listParser #-}
656-------------------------------------------------------------------------------
550-------------------------------------------------------------------------------
@@ -668,139 +562,48 @@ instance (FromJSON a) => FromJSON [a] where
668-- Functions
562-- Functions
669-------------------------------------------------------------------------------
563-------------------------------------------------------------------------------
671−-- | Add context to a failure message, indicating the name of the structure
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, ")
679−-- | @'withObject' name f value@ applies @f@ to the 'Object' when @value@
565+-- | @withObject expected f value@ applies @f@ to the 'Object' when @value@ is an @Object@
680−-- is an 'Data.Aeson.Object' and fails otherwise.
566+-- and fails using @'typeMismatch' expected@ otherwise.
682−-- ==== Error message example
684−-- > withObject "MyType" f (String "oops")
685−-- > -- Error: "parsing MyType failed, expected Object, but encountered String"
686withObject :: String -> (Object -> Parser a) -> Value -> Parser a
567withObject :: String -> (Object -> Parser a) -> Value -> Parser a
687−withObject _ f (Object obj) = f obj
568+withObject _ f (Object obj) = f obj
688−withObject name _ v = prependContext name (typeMismatch "Object" v)
569+withObject expected _ v = typeMismatch expected v
689{-# INLINE withObject #-}
570{-# INLINE withObject #-}
691−-- | @'withText' name f value@ applies @f@ to the 'Text' when @value@ is a
572+-- | @withText expected f value@ applies @f@ to the 'Text' when @value@ is a @String@
692−-- 'Data.Aeson.String' and fails otherwise.
573+-- and fails using @'typeMismatch' expected@ otherwise.
694−-- ==== Error message example
696−-- > withText "MyType" f Null
697−-- > -- Error: "parsing MyType failed, expected String, but encountered Null"
698withText :: String -> (Text -> Parser a) -> Value -> Parser a
574withText :: String -> (Text -> Parser a) -> Value -> Parser a
699−withText _ f (String txt) = f txt
575+withText _ f (String txt) = f txt
700−withText name _ v = prependContext name (typeMismatch "String" v)
576+withText expected _ v = typeMismatch expected v
701{-# INLINE withText #-}
577{-# INLINE withText #-}
703−-- | @'withArray' expected f value@ applies @f@ to the 'Array' when @value@ is
579+-- | @withArray expected f value@ applies @f@ to the 'Array' when @value@ is an @Array@
704−-- an 'Data.Aeson.Array' and fails otherwise.
580+-- and fails using @'typeMismatch' expected@ otherwise.
706−-- ==== Error message example
708−-- > withArray "MyType" f (String "oops")
709−-- > -- Error: "parsing MyType failed, expected Array, but encountered String"
710withArray :: String -> (Array -> Parser a) -> Value -> Parser a
581withArray :: String -> (Array -> Parser a) -> Value -> Parser a
711−withArray _ f (Array arr) = f arr
582+withArray _ f (Array arr) = f arr
712−withArray name _ v = prependContext name (typeMismatch "Array" v)
583+withArray expected _ v = typeMismatch expected v
713{-# INLINE withArray #-}
584{-# INLINE withArray #-}
586+-- | @withNumber expected f value@ applies @f@ to the 'Number' when @value@ is a 'Number'.
587+-- and fails using @'typeMismatch' expected@ otherwise.
588+withNumber :: String -> (Number -> Parser a) -> Value -> Parser a
589+withNumber expected f = withScientific expected (f . scientificToNumber)
590+{-# INLINE withNumber #-}
591+{-# DEPRECATED withNumber "Use withScientific instead" #-}
715−-- | @'withScientific' name f value@ applies @f@ to the 'Scientific' number
593+-- | @withScientific expected f value@ applies @f@ to the 'Scientific' number when @value@ is a 'Number'.
716−-- when @value@ is a 'Data.Aeson.Number' and fails using 'typeMismatch'
594+-- and fails using @'typeMismatch' expected@ otherwise.
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.
724−-- ==== Error message example
726−-- > withScientific "MyType" f (String "oops")
727−-- > -- Error: "parsing MyType failed, expected Number, but encountered String"
728withScientific :: String -> (Scientific -> Parser a) -> Value -> Parser a
595withScientific :: String -> (Scientific -> Parser a) -> Value -> Parser a
729−withScientific _ f (Number scientific) = f scientific
596+withScientific _ f (Number scientific) = f scientific
730−withScientific name _ v = prependContext name (typeMismatch "Number" v)
597+withScientific expected _ v = typeMismatch expected v
731{-# INLINE withScientific #-}
598{-# INLINE withScientific #-}
733−-- | A variant of 'withScientific' which doesn't use 'prependContext', so that
600+-- | @withBool expected f value@ applies @f@ to the 'Bool' when @value@ is a @Bool@
734−-- such context can be added separately in a way that also applies when the
735−-- continuation @f :: Scientific -> Parser a@ fails.
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.
742−-- ==== Error message examples
744−-- > withScientific' f (String "oops")
745−-- > -- Error: "unexpected String"
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
752− _ -> typeMismatch "Number" v
753−{-# INLINE withScientific' #-}
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 #-}
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' #-}
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) =
773− then whenFail (fail msg)
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_ #-}
782−-- | @'withBool' expected f value@ applies @f@ to the 'Bool' when @value@ is a
783−-- 'Boolean' and fails otherwise.
601+-- and fails using @'typeMismatch' expected@ otherwise.
785−-- ==== Error message example
787−-- > withBool "MyType" f (String "oops")
788−-- > -- Error: "parsing MyType failed, expected Boolean, but encountered String"
789withBool :: String -> (Bool -> Parser a) -> Value -> Parser a
602withBool :: String -> (Bool -> Parser a) -> Value -> Parser a
790−withBool _ f (Bool arr) = f arr
603+withBool _ f (Bool arr) = f arr
791−withBool name _ v = prependContext name (typeMismatch "Boolean" v)
604+withBool expected _ v = typeMismatch expected v
792{-# INLINE withBool #-}
605{-# INLINE withBool #-}
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)
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 #-}
804-- | Convert a value from JSON, failing if the types do not match.
607-- | Convert a value from JSON, failing if the types do not match.
805fromJSON :: (FromJSON a) => Value -> Result a
608fromJSON :: (FromJSON a) => Value -> Result a
806fromJSON = parse parseJSON
609fromJSON = parse parseJSON
@@ -819,68 +622,32 @@ ifromJSON = iparse parseJSON
819-- in an object for it to be valid. If the key and value are
622-- in an object for it to be valid. If the key and value are
820-- optional, use '.:?' instead.
623-- optional, use '.:?' instead.
821(.:) :: (FromJSON a) => Object -> Text -> Parser a
624(.:) :: (FromJSON a) => Object -> Text -> Parser a
822−(.:) = explicitParseField parseJSON
625+obj .: key = case H.lookup key obj of
626+ Nothing -> fail $ "key " ++ show key ++ " not present"
627+ Just v -> parseJSON v <?> Key key
823{-# INLINE (.:) #-}
628{-# INLINE (.:) #-}
825−-- | Retrieve the value associated with the given key of an 'Object'. The
630+-- | Retrieve the value associated with the given key of an 'Object'.
826−-- result is 'Nothing' if the key is not present or if its value is 'Null',
631+-- The result is 'Nothing' if the key is not present, or 'empty' if
827−-- or 'empty' if the value cannot be converted to the desired type.
632+-- the value cannot be converted to the desired type.
829-- This accessor is most useful if the key and value can be absent
634-- This accessor is most useful if the key and value can be absent
830-- from an object without affecting its validity. If the key and
635-- from an object without affecting its validity. If the key and
831-- value are mandatory, use '.:' instead.
636-- value are mandatory, use '.:' instead.
832(.:?) :: (FromJSON a) => Object -> Text -> Parser (Maybe a)
637(.:?) :: (FromJSON a) => Object -> Text -> Parser (Maybe a)
833−(.:?) = explicitParseFieldMaybe parseJSON
638+obj .:? key = case H.lookup key obj of
639+ Nothing -> pure Nothing
640+ Just v -> parseJSON v <?> Key key
834{-# INLINE (.:?) #-}
641{-# INLINE (.:?) #-}
836−-- | Retrieve the value associated with the given key of an 'Object'.
643+-- | Like '.:?', but the resulting parser will fail,
837−-- The result is 'Nothing' if the key is not present or 'empty' if the
644+-- if the key is present but is 'Null'.
838−-- value cannot be converted to the desired type.
840−-- This differs from '.:?' by attempting to parse 'Null' the same as any
841−-- other JSON value, instead of interpreting it as 'Nothing'.
842(.:!) :: (FromJSON a) => Object -> Text -> Parser (Maybe a)
645(.:!) :: (FromJSON a) => Object -> Text -> Parser (Maybe a)
843−(.:!) = explicitParseFieldMaybe' parseJSON
646+obj .:! key = case H.lookup key obj of
647+ Nothing -> pure Nothing
648+ Just v -> Just <$> parseJSON v <?> Key key
844{-# INLINE (.:!) #-}
649{-# INLINE (.:!) #-}
846−-- | Function variant of '.:'.
847−parseField :: (FromJSON a) => Object -> Text -> Parser a
849−{-# INLINE parseField #-}
851−-- | Function variant of '.:?'.
852−parseFieldMaybe :: (FromJSON a) => Object -> Text -> Parser (Maybe a)
853−parseFieldMaybe = (.:?)
854−{-# INLINE parseFieldMaybe #-}
856−-- | Function variant of '.:!'.
857−parseFieldMaybe' :: (FromJSON a) => Object -> Text -> Parser (Maybe a)
858−parseFieldMaybe' = (.:!)
859−{-# INLINE parseFieldMaybe' #-}
861−-- | Variant of '.:' with explicit parser function.
863−-- E.g. @'explicitParseField' 'parseJSON1' :: ('FromJSON1' f, 'FromJSON' a) -> 'Object' -> 'Text' -> 'Parser' (f a)@
864−explicitParseField :: (Value -> Parser a) -> Object -> Text -> Parser a
865−explicitParseField p obj key = case H.lookup key obj of
866− Nothing -> fail $ "key " ++ show key ++ " not found"
867− Just v -> p v <?> Key key
868−{-# INLINE explicitParseField #-}
870−-- | Variant of '.:?' with explicit parser function.
871−explicitParseFieldMaybe :: (Value -> Parser a) -> Object -> Text -> Parser (Maybe a)
872−explicitParseFieldMaybe p obj key = case H.lookup key obj of
873− Nothing -> pure Nothing
874− Just v -> liftParseJSON p (listParser p) v <?> Key key -- listParser isn't used by maybe instance.
875−{-# INLINE explicitParseFieldMaybe #-}
877−-- | Variant of '.:!' with explicit parser function.
878−explicitParseFieldMaybe' :: (Value -> Parser a) -> Object -> Text -> Parser (Maybe a)
879−explicitParseFieldMaybe' p obj key = case H.lookup key obj of
880− Nothing -> pure Nothing
881− Just v -> Just <$> p v <?> Key key
882−{-# INLINE explicitParseFieldMaybe' #-}
884-- | Helper for use in combination with '.:?' to provide default
651-- | Helper for use in combination with '.:?' to provide default
885-- values for optional JSON object fields.
652-- values for optional JSON object fields.
@@ -903,554 +670,317 @@ pmval .!= val = fromMaybe val <$> pmval
903-- Generic parseJSON
670-- Generic parseJSON
904-------------------------------------------------------------------------------
671-------------------------------------------------------------------------------
906−instance GFromJSON arity V1 where
907− -- Whereof we cannot format, thereof we cannot parse:
908− gParseJSON _ _ _ = fail "Attempted to parse empty type"
911instance OVERLAPPABLE_ (GFromJSON arity a) => GFromJSON arity (M1 i c a) where
673instance OVERLAPPABLE_ (GFromJSON arity a) => GFromJSON arity (M1 i c a) where
912 -- Meta-information, which is not handled elsewhere, is just added to the
674 -- Meta-information, which is not handled elsewhere, is just added to the
913 -- parsed value:
675 -- parsed value:
914− gParseJSON opts fargs = fmap M1 . gParseJSON opts fargs
676+ gParseJSON opts pa pj pjl = fmap M1 . gParseJSON opts pa pj pjl
916−-- Information for error messages
918−type TypeName = String
919−type ConName = String
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
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 ++ ", ")
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)
939−-- | Render a constructor as @\"MyType(MyConstructor)\"@.
940−showCons :: ConName -> TypeName -> String
941−showCons cname tname = tname ++ "(" ++ cname ++ ")"
943−--------------------------------------------------------------------------------
945−-- Parsing single fields
947instance (FromJSON a) => GFromJSON arity (K1 i a) where
678instance (FromJSON a) => GFromJSON arity (K1 i a) where
948 -- Constant values are decoded using their FromJSON instance:
679 -- Constant values are decoded using their FromJSON instance:
949− gParseJSON _opts _ = fmap K1 . parseJSON
680+ gParseJSON _opts _ _ _ = fmap K1 . parseJSON
951instance GFromJSON One Par1 where
682instance GFromJSON One Par1 where
952 -- Direct occurrences of the last type parameter are decoded with the
683 -- Direct occurrences of the last type parameter are decoded with the
953 -- function passed in as an argument:
684 -- function passed in as an argument:
954− gParseJSON _opts (From1Args pj _) = fmap Par1 . pj
685+ gParseJSON _opts _ pj _ = fmap Par1 . pj
956instance (FromJSON1 f) => GFromJSON One (Rec1 f) where
687instance (FromJSON1 f) => GFromJSON One (Rec1 f) where
957 -- Recursive occurrences of the last type parameter are decoded using their
688 -- Recursive occurrences of the last type parameter are decoded using their
958 -- FromJSON1 instance:
689 -- FromJSON1 instance:
959− gParseJSON _opts (From1Args pj pjl) = fmap Rec1 . liftParseJSON pj pjl
690+ gParseJSON _opts _ pj pjl = fmap Rec1 . liftParseJSON pj pjl
692+instance GFromJSON arity U1 where
693+ -- Empty constructors are expected to be encoded as an empty array:
694+ gParseJSON _opts _ _ _ v
695+ | isEmptyArray v = pure U1
696+ | otherwise = typeMismatch "unit constructor (U1)" v
698+instance (ConsFromJSON arity a) => GFromJSON arity (C1 c a) where
699+ -- Constructors need to be decoded differently depending on whether they're
700+ -- a record or not. This distinction is made by consParseJSON:
701+ gParseJSON opts pa pj pjl = fmap M1 . consParseJSON opts pa pj pjl
703+instance ( FromProduct arity a, FromProduct arity b
704+ , ProductSize a, ProductSize b
705+ ) => GFromJSON arity (a :*: b) where
706+ -- Products are expected to be encoded to an array. Here we check whether we
707+ -- got an array of the same size as the product, then parse each of the
708+ -- product's elements using parseProduct:
709+ gParseJSON opts pa pj pjl = withArray "product (:*:)" $ \arr ->
710+ let lenArray = V.length arr
711+ lenProduct = (unTagged2 :: Tagged2 (a :*: b) Int -> Int)
713+ if lenArray == lenProduct
714+ then parseProduct opts pa arr 0 lenProduct pj pjl
715+ else fail $ "When expecting a product of " ++ show lenProduct ++
716+ " values, encountered an Array of " ++ show lenArray ++
719+instance ( AllNullary (a :+: b) allNullary
720+ , ParseSum arity (a :+: b) allNullary
721+ ) => GFromJSON arity (a :+: b) where
722+ -- If all constructors of a sum datatype are nullary and the
723+ -- 'allNullaryToStringTag' option is set they are expected to be
724+ -- encoded as strings. This distinction is made by 'parseSum':
725+ gParseJSON opts pa pj pjl =
726+ (unTagged :: Tagged allNullary (Parser ((a :+: b) d)) ->
727+ Parser ((a :+: b) d))
728+ . parseSum opts pa pj pjl
961instance (FromJSON1 f, GFromJSON One g) => GFromJSON One (f :.: g) where
730instance (FromJSON1 f, GFromJSON One g) => GFromJSON One (f :.: g) where
962 -- If an occurrence of the last type parameter is nested inside two
731 -- 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
732 -- composed types, it is decoded by using the outermost type's FromJSON1
964 -- instance to generically decode the innermost type:
733 -- instance to generically decode the innermost type:
965− gParseJSON opts fargs =
734+ gParseJSON opts pa pj pjl =
966− let gpj = gParseJSON opts fargs in
735+ let gpj = gParseJSON opts pa pj pjl in
967− fmap Comp1 . liftParseJSON gpj (listParser gpj)
736+ fmap Comp1 . liftParseJSON gpj (listParser gpj)
969−--------------------------------------------------------------------------------
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
974− gParseJSON opts fargs = fmap M1 . gParseJSON' (tname :* opts :* fargs)
976− tname = moduleName proxy ++ "." ++ datatypeName proxy
977− proxy = undefined :: M1 _i d _f _p
979−-- | 'GFromJSON', after unwrapping the 'D1' constructor, now carrying the data
981−class GFromJSON' arity f where
982− gParseJSON' :: TypeName :* Options :* FromArgs arity a
986−-- | Single constructor.
987−instance ( ConsFromJSON arity a
988− , AllNullary (C1 c a) allNullary
989− , ParseSum arity (C1 c a) allNullary
991− ) => GFromJSON' arity (C1 c a) where
992− -- The option 'tagSingleConstructors' determines whether to wrap
993− -- a single-constructor type.
994− gParseJSON' p@(_ :* opts :* _)
995− | tagSingleConstructors opts
996− = (unTagged :: Tagged allNullary (Parser (C1 c a p)) -> Parser (C1 c a p))
998− | otherwise = fmap M1 . consParseJSON (cname :* p)
1000− cname = conName (undefined :: M1 _i c _f _p)
1002−-- | Multiple constructors.
1003−instance ( AllNullary (a :+: b) allNullary
1004− , ParseSum arity (a :+: b) allNullary
1005− ) => GFromJSON' arity (a :+: b) where
1006− -- If all constructors of a sum datatype are nullary and the
1007− -- 'allNullaryToStringTag' option is set they are expected to be
1008− -- encoded as strings. This distinction is made by 'parseSum':
1010− (unTagged :: Tagged allNullary (Parser ((a :+: b) _d)) ->
1011− Parser ((a :+: b) _d))
1014--------------------------------------------------------------------------------
738--------------------------------------------------------------------------------
1016class ParseSum arity f allNullary where
740class ParseSum arity f allNullary where
1017− parseSum :: TypeName :* Options :* FromArgs arity a
741+ parseSum :: Options -> Proxy arity
1018− -> Value
742+ -> (Value -> Parser a) -> (Value -> Parser [a])
1019− -> Tagged allNullary (Parser (f a))
743+ -> Value -> Tagged allNullary (Parser (f a))
1021−instance ( ConstructorNames f
1022− , SumFromString f
745+instance ( SumFromString (a :+: b)
1023− , FromPair arity f
746+ , FromPair arity (a :+: b)
1024− , FromTaggedObject arity f
747+ , FromTaggedObject arity (a :+: b)
1025− , FromUntaggedValue arity f
1026− ) => ParseSum arity f True where
748+ ) => ParseSum arity (a :+: b) True where
1027− parseSum p@(tname :* opts :* _)
749+ parseSum opts pa pj pjl
1028− | allNullaryToStringTag opts = Tagged . parseAllNullarySum tname opts
750+ | allNullaryToStringTag opts = Tagged . parseAllNullarySum opts
1029− | otherwise = Tagged . parseNonAllNullarySum p
751+ | otherwise = Tagged . parseNonAllNullarySum opts pa pj pjl
1031−instance ( ConstructorNames f
1032− , FromPair arity f
753+instance ( FromPair arity (a :+: b)
1033− , FromTaggedObject arity f
754+ , FromTaggedObject arity (a :+: b)
1034− , FromUntaggedValue arity f
1035− ) => ParseSum arity f False where
755+ ) => ParseSum arity (a :+: b) False where
1036− parseSum p = Tagged . parseNonAllNullarySum p
756+ parseSum opts pa pj pjl = Tagged . parseNonAllNullarySum opts pa pj pjl
1038--------------------------------------------------------------------------------
758--------------------------------------------------------------------------------
1040−parseAllNullarySum :: (SumFromString f, ConstructorNames f)
760+parseAllNullarySum :: SumFromString f => Options -> Value -> Parser (f a)
1041− => TypeName -> Options -> Value -> Parser (f a)
1042−parseAllNullarySum tname opts =
761+parseAllNullarySum opts = withText "Text" $ \key ->
1043− withText tname $ \tag ->
1044− maybe (badTag tag) return $
762+ maybe (notFound key) return $
1045− parseSumFromString modifier tag
763+ parseSumFromString opts key
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
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.
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
1061− cnames = unTagged2 (constructorTags modifier :: Tagged2 f [t])
1063class SumFromString f where
765class SumFromString f where
1064− parseSumFromString :: (String -> String) -> Text -> Maybe (f a)
766+ parseSumFromString :: Options -> Text -> Maybe (f a)
1066instance (SumFromString a, SumFromString b) => SumFromString (a :+: b) where
768instance (SumFromString a, SumFromString b) => SumFromString (a :+: b) where
1067 parseSumFromString opts key = (L1 <$> parseSumFromString opts key) <|>
769 parseSumFromString opts key = (L1 <$> parseSumFromString opts key) <|>
1068 (R1 <$> parseSumFromString opts key)
770 (R1 <$> parseSumFromString opts key)
1070instance (Constructor c) => SumFromString (C1 c U1) where
772instance (Constructor c) => SumFromString (C1 c U1) where
1071− parseSumFromString modifier key
773+ parseSumFromString opts key | key == name = Just $ M1 U1
1072− | key == name = Just $ M1 U1
1073− | otherwise = Nothing
774+ | otherwise = Nothing
1075− name = pack $ modifier $ conName (undefined :: M1 _i c _f _p)
776+ name = pack $ constructorTagModifier opts $
1077−-- For genericFromJSONKey
1078−instance SumFromString a => SumFromString (D1 d a) where
1079− parseSumFromString modifier key = M1 <$> parseSumFromString modifier key
1081−-- | List of all constructor tags.
1082−constructorTags :: ConstructorNames a => (String -> t) -> Tagged2 a [t]
1083−constructorTags modifier =
1084− fmap DList.toList (constructorNames' modifier)
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)
1091−instance (ConstructorNames a, ConstructorNames b) => ConstructorNames (a :+: b) where
1092− constructorNames' = liftA2 append constructorNames' constructorNames'
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)
1100−instance Constructor c => ConstructorNames (C1 c a) where
1101− constructorNames' f = Tagged2 (pure (f cname))
1103− cname = conName (undefined :: M1 _i c _f _p)
777+ conName (undefined :: t c U1 p)
1105−-- For genericFromJSONKey
1106−instance ConstructorNames a => ConstructorNames (D1 d a) where
1107− constructorNames' = retag . constructorNames'
1109− retag :: Tagged2 a u -> Tagged2 (D1 d a) u
1110− retag (Tagged2 x) = Tagged2 x
1112--------------------------------------------------------------------------------
779--------------------------------------------------------------------------------
1113−parseNonAllNullarySum :: forall f c arity.
781+parseNonAllNullarySum :: ( FromPair arity (a :+: b)
1115− , FromTaggedObject arity f
782+ , FromTaggedObject arity (a :+: b)
1116− , FromUntaggedValue arity f
1117− , ConstructorNames f
1118− ) => TypeName :* Options :* FromArgs arity c
783+ ) => Options -> Proxy arity
784+ -> (Value -> Parser c) -> (Value -> Parser [c])
1119− -> Value -> Parser (f c)
785+ -> Value -> Parser ((a :+: b) c)
1120−parseNonAllNullarySum p@(tname :* opts :* _) =
786+parseNonAllNullarySum opts pa pj pjl =
1121 case sumEncoding opts of
787 case sumEncoding opts of
1122 TaggedObject{..} ->
788 TaggedObject{..} ->
1123− withObject tname $ \obj -> do
789+ withObject "Object" $ \obj -> do
1124− tag <- contextType tname . contextTag tagKey cnames_ $ obj .: tagKey
1125− fromMaybe (badTag tag <?> Key tagKey) $
1126− parseFromTaggedObject (tag :* contentsFieldName :* p) obj
1128− tagKey = pack tagFieldName
790+ tag <- obj .: pack tagFieldName
1129− badTag tag = failWith_ $ \cnames ->
791+ fromMaybe (notFound tag) $
1130− "expected tag field to be one of " ++ show cnames ++
792+ parseFromTaggedObject opts pa contentsFieldName obj pj pjl tag
1131− ", but found tag " ++ show tag
1132− cnames_ = unTagged2 (constructorTags (constructorTagModifier opts) :: Tagged2 f [String])
1134 ObjectWithSingleField ->
794 ObjectWithSingleField ->
795+ withObject "Object" $ \obj ->
1135− withObject tname $ \obj -> case H.toList obj of
796+ case H.toList obj of
1136− [(tag, v)] -> maybe (badTag tag) (<?> Key tag) $
797+ [pair@(tag, _)] -> fromMaybe (notFound tag) $
1137− parsePair (tag :* p) v
798+ parsePair opts pa pj pjl pair
1138− _ -> contextType tname . fail $
799+ _ -> fail "Object doesn't have a single field"
1139− "expected an Object with a single pair, but found " ++
1140− show (H.size obj) ++ " pairs"
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
1146 TwoElemArray ->
801 TwoElemArray ->
1147− withArray tname $ \arr -> case V.length arr of
802+ withArray "Array" $ \arr ->
803+ if V.length arr == 2
1148− 2 | String tag <- V.unsafeIndex arr 0 ->
804+ then case V.unsafeIndex arr 0 of
1149− maybe (badTag tag <?> Index 0) (<?> Index 1) $
805+ String tag -> fromMaybe (notFound tag) $
1150− parsePair (tag :* p) (V.unsafeIndex arr 1)
806+ parsePair opts pa pj pjl (tag, V.unsafeIndex arr 1)
1152− contextType tname $
1153− fail "tag element is not a String" <?> Index 0
807+ _ -> fail "First element is not a String"
1154− len -> contextType tname . fail $
808+ else fail "Array doesn't have 2 elements"
1155− "expected a 2-element Array, but encountered an Array of length " ++
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
1162− UntaggedValue -> parseUntaggedValue p
1164− failWith_ = failWithCTags tname (constructorTagModifier opts)
1166--------------------------------------------------------------------------------
810--------------------------------------------------------------------------------
1168class FromTaggedObject arity f where
812class FromTaggedObject arity f where
1169− -- The first two components of the parameter tuple are: the constructor tag
1170− -- to match against, and the contents field name.
1171− parseFromTaggedObject
813+ parseFromTaggedObject :: Options -> Proxy arity
1172− :: Text :* String :* TypeName :* Options :* FromArgs arity a
1173− -> Object
814+ -> String -> Object
815+ -> (Value -> Parser a) -> (Value -> Parser [a])
1174− -> Maybe (Parser (f a))
816+ -> Text -> Maybe (Parser (f a))
1176instance ( FromTaggedObject arity a, FromTaggedObject arity b) =>
818instance ( FromTaggedObject arity a, FromTaggedObject arity b) =>
1177 FromTaggedObject arity (a :+: b) where
819 FromTaggedObject arity (a :+: b) where
1178− parseFromTaggedObject p obj =
820+ parseFromTaggedObject opts pa contentsFieldName obj pj pjl tag =
1179− (fmap L1 <$> parseFromTaggedObject p obj) <|>
821+ (fmap L1 <$> parseFromTaggedObject opts pa contentsFieldName obj pj pjl tag) <|>
1180− (fmap R1 <$> parseFromTaggedObject p obj)
822+ (fmap R1 <$> parseFromTaggedObject opts pa contentsFieldName obj pj pjl tag)
1182−instance ( IsRecord f isRecord
1183− , FromTaggedObject' arity f isRecord
824+instance ( FromTaggedObject' arity f
1184 , Constructor c
825 , Constructor c
1185 ) => FromTaggedObject arity (C1 c f) where
826 ) => FromTaggedObject arity (C1 c f) where
1186− parseFromTaggedObject (tag :* contentsFieldName :* p@(_ :* opts :* _))
827+ parseFromTaggedObject opts pa contentsFieldName obj pj pjl tag
1189− (unTagged :: Tagged isRecord (Parser (f a)) -> Parser (f a)) .
1190− parseFromTaggedObject' (contentsFieldName :* cname :* p)
828+ | tag == name = Just $ M1 <$> parseFromTaggedObject'
829+ opts pa contentsFieldName pj pjl obj
1191− | otherwise = const Nothing
830+ | otherwise = Nothing
1193− tag' = pack $ constructorTagModifier opts cname
832+ name = pack $ constructorTagModifier opts $
1194− cname = conName (undefined :: M1 _i c _f _p)
833+ conName (undefined :: t c f p)
1196--------------------------------------------------------------------------------
835--------------------------------------------------------------------------------
1198−class FromTaggedObject' arity f isRecord where
837+class FromTaggedObject' arity f where
1199− -- The first component of the parameter tuple is the contents field name.
838+ parseFromTaggedObject' :: Options -> Proxy arity -> String
839+ -> (Value -> Parser a) -> (Value -> Parser [a])
840+ -> Object -> Parser (f a)
842+class FromTaggedObject'' arity f isRecord where
1200− parseFromTaggedObject'
843+ parseFromTaggedObject'' :: Options -> Proxy arity -> String
1201− :: String :* ConName :* TypeName :* Options :* FromArgs arity a
844+ -> (Value -> Parser a) -> (Value -> Parser [a])
1202− -> Object -> Tagged isRecord (Parser (f a))
845+ -> Object -> Tagged isRecord (Parser (f a))
847+instance ( IsRecord f isRecord
848+ , FromTaggedObject'' arity f isRecord
1204−instance (RecordFromJSON arity f, FieldNames f) => FromTaggedObject' arity f True where
849+ ) => FromTaggedObject' arity f where
1205− -- Records are unpacked in the tagged object
850+ parseFromTaggedObject' opts pa contentsFieldName pj pjl =
851+ (unTagged :: Tagged isRecord (Parser (f a)) -> Parser (f a)) .
1206− parseFromTaggedObject' (_ :* p) = Tagged . recordParseJSON (True :* p)
852+ parseFromTaggedObject'' opts pa contentsFieldName pj pjl
854+instance (FromRecord arity f) => FromTaggedObject'' arity f True where
855+ parseFromTaggedObject'' opts pa _ pj pjl =
856+ Tagged . parseRecord opts pa Nothing pj pjl
1208−instance (ConsFromJSON arity f) => FromTaggedObject' arity f False where
858+instance (GFromJSON arity f) => FromTaggedObject'' arity f False where
1209− -- Nonnullary nonrecords are encoded in the contents field
859+ parseFromTaggedObject'' opts pa contentsFieldName pj pjl = Tagged .
1210− parseFromTaggedObject' p obj = Tagged $ do
1211− contents <- contextCons cname tname (obj .: key)
1212− consParseJSON p' contents <?> Key key
1214− key = pack contentsFieldName
860+ (gParseJSON opts pa pj pjl <=< (.: pack contentsFieldName))
1215− contentsFieldName :* p'@(cname :* tname :* _) = p
1217−instance OVERLAPPING_ FromTaggedObject' arity U1 False where
862+instance OVERLAPPING_ FromTaggedObject'' arity U1 False where
1218− -- Nullary constructors don't need a contents field
1219− parseFromTaggedObject' _ _ = Tagged (pure U1)
863+ parseFromTaggedObject'' _ _ _ _ _ _ = Tagged (pure U1)
1221--------------------------------------------------------------------------------
865--------------------------------------------------------------------------------
1223−-- | Constructors need to be decoded differently depending on whether they're
1224−-- a record or not. This distinction is made by 'ConsParseJSON'.
1225class ConsFromJSON arity f where
867class ConsFromJSON arity f where
1226− consParseJSON
868+ consParseJSON :: Options -> Proxy arity
1227− :: ConName :* TypeName :* Options :* FromArgs arity a
869+ -> (Value -> Parser a) -> (Value -> Parser [a])
1228− -> Value -> Parser (f a)
870+ -> Value -> Parser (f a)
1230class ConsFromJSON' arity f isRecord where
872class ConsFromJSON' arity f isRecord where
1231− consParseJSON'
873+ consParseJSON' :: Options -> Proxy arity
1232− :: ConName :* TypeName :* Options :* FromArgs arity a
874+ -> Maybe Text -- ^ A dummy label
875+ -- (Nothing to use proper label)
876+ -> (Value -> Parser a) -> (Value -> Parser [a])
1233− -> Value -> Tagged isRecord (Parser (f a))
877+ -> Value -> Tagged isRecord (Parser (f a))
1235instance ( IsRecord f isRecord
879instance ( IsRecord f isRecord
1236 , ConsFromJSON' arity f isRecord
880 , ConsFromJSON' arity f isRecord
1237 ) => ConsFromJSON arity f where
881 ) => ConsFromJSON arity f where
1238− consParseJSON p =
882+ consParseJSON opts pa pj pjl v = let
1239− (unTagged :: Tagged isRecord (Parser (f a)) -> Parser (f a))
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
883+ (v2,lab) = case (unwrapUnaryRecords opts,isUnary (undefined :: f a)) of
1247− | otherwise = Tagged . withObject (showCons cname tname) (recordParseJSON (False :* p))
884+ -- use a dummy object with a dummy label
1248−
885+ (True,True) -> (object [(pack "dummy",v)], Just $ pack "dummy")
1249−instance RecordFromJSON arity f => ConsFromJSON' arity f True where
886+ _ ->(v,Nothing)
1250− consParseJSON' p@(cname :* tname :* _) =
887+ in (unTagged :: Tagged isRecord (Parser (f a)) -> Parser (f a))
1251− Tagged . withObject (showCons cname tname) (recordParseJSON (False :* p))
888+ $ consParseJSON' opts pa lab pj pjl v2
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
1263− "expected an empty Array, but encountered an Array of length " ++
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
1271−instance (ProductFromJSON arity f, ProductSize f
1272− ) => ConsFromJSON' arity f False where
891+instance (FromRecord arity f) => ConsFromJSON' arity f True where
1273− consParseJSON' p = Tagged . productParseJSON0 p
892+ consParseJSON' opts pa mlab pj pjl = Tagged . withObject "record (:*:)"
1274−
893+ (parseRecord opts pa mlab pj pjl)
1275−--------------------------------------------------------------------------------
1277−class FieldNames f where
895+instance (GFromJSON arity f) => ConsFromJSON' arity f False where
1278− fieldNames :: f a -> [Text] -> [Text]
896+ consParseJSON' opts pa _ pj pjl = Tagged . gParseJSON opts pa pj pjl
1280−instance (FieldNames a, FieldNames b) => FieldNames (a :*: b) where
898+--------------------------------------------------------------------------------
1282− fieldNames (undefined :: a x) .
1283− fieldNames (undefined :: b y)
1285−instance (Selector s) => FieldNames (S1 s f) where
1286− fieldNames _ = (pack (selName (undefined :: M1 _i s _f _p)) :)
1288−class RecordFromJSON arity f where
1290− :: Bool :* ConName :* TypeName :* Options :* FromArgs arity a
1291− -> Object -> Parser (f a)
1293−instance ( FieldNames f
900+class FromRecord arity f where
1294− , RecordFromJSON' arity f
901+ parseRecord :: Options -> Proxy arity
1295− ) => RecordFromJSON arity f where
902+ -> Maybe Text -- ^ A dummy label
1296− recordParseJSON (fromTaggedSum :* p@(cname :* tname :* opts :* _)) =
903+ -- (Nothing to use proper label)
1297− \obj -> checkUnknown obj >> recordParseJSON' p obj
904+ -> (Value -> Parser a) -> (Value -> Parser [a])
905+ -> Object -> Parser (f a)
907+instance ( FromRecord arity a
908+ , FromRecord arity b
909+ ) => FromRecord arity (a :*: b) where
910+ parseRecord opts pa _ pj pjl obj =
911+ (:*:) <$> parseRecord opts pa Nothing pj pjl obj
912+ <*> parseRecord opts pa Nothing pj pjl obj
914+instance ( Selector s
916+ ) => FromRecord arity (S1 s a) where
917+ parseRecord opts pa lab pj pjl =
918+ (<?> Key label) . gParseJSON opts pa pj pjl <=< (.: label)
1299− knownFields :: H.HashMap Text ()
920+ label = fromMaybe defLabel lab
1300− knownFields = H.fromList $ map (,()) $
1301− fieldNames (undefined :: f a)
1302− [pack (tagFieldName (sumEncoding opts)) | fromTaggedSum]
1304− if not (rejectUnknownFields opts)
1305− then \_ -> return ()
1306− else \obj -> case H.keys (H.difference obj knownFields) of
1308− unknownFields -> contextCons cname tname $
1309− fail ("unknown fields: " ++ show unknownFields)
1311−class RecordFromJSON' arity f where
1313− :: ConName :* TypeName :* Options :* FromArgs arity a
1314− -> Object -> Parser (f a)
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
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
1329− label = pack $ fieldLabelModifier opts sname
921+ defLabel = pack . fieldLabelModifier opts $
1330− sname = selName (undefined :: M1 _i s _f _p)
922+ selName (undefined :: t s a p)
1332−instance INCOHERENT_ (Selector s, FromJSON a) =>
924+instance OVERLAPPING_ (Selector s, FromJSON a) =>
1333− RecordFromJSON' arity (S1 s (K1 i (Maybe a))) where
925+ FromRecord arity (S1 s (K1 i (Maybe a))) where
1334− recordParseJSON' (_ :* _ :* opts :* _) obj = M1 . K1 <$> obj .:? pack label
926+ parseRecord _ _ (Just lab) _ _ obj = (M1 . K1) <$> obj .:? lab
1335− where
927+ parseRecord opts _ Nothing _ _ obj = (M1 . K1) <$> obj .:? pack label
1336− label = fieldLabelModifier opts sname
1337− sname = selName (undefined :: M1 _i s _f _p)
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
1344− wrap :: S1 s (K1 i (Maybe a)) p -> S1 s (K1 i (Semigroup.Option a)) p
929+ label = fieldLabelModifier opts $
1345− wrap (M1 (K1 a)) = M1 (K1 (Semigroup.Option a))
930+ selName (undefined :: t s (K1 i (Maybe a)) p)
1347--------------------------------------------------------------------------------
932--------------------------------------------------------------------------------
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)
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
1369−class ProductFromJSON arity f where
934+class FromProduct arity f where
1370− productParseJSON :: ConName :* TypeName :* Options :* FromArgs arity a
935+ parseProduct :: Options -> Proxy arity
1371 -> Array -> Int -> Int
936 -> Array -> Int -> Int
937+ -> (Value -> Parser a) -> (Value -> Parser [a])
1372 -> Parser (f a)
938 -> Parser (f a)
1374−instance ( ProductFromJSON arity a
940+instance ( FromProduct arity a
1375− , ProductFromJSON arity b
941+ , FromProduct arity b
1376− ) => ProductFromJSON arity (a :*: b) where
942+ ) => FromProduct arity (a :*: b) where
1377− productParseJSON p arr ix len =
943+ parseProduct opts pa arr ix len pj pjl =
1378− (:*:) <$> productParseJSON p arr ix lenL
944+ (:*:) <$> parseProduct opts pa arr ix lenL pj pjl
1379− <*> productParseJSON p arr ixR lenR
945+ <*> parseProduct opts pa arr ixR lenR pj pjl
1381 lenL = len `unsafeShiftR` 1
947 lenL = len `unsafeShiftR` 1
1382 ixR = ix + lenL
948 ixR = ix + lenL
1383 lenR = len - lenL
949 lenR = len - lenL
1385−instance (GFromJSON arity a) => ProductFromJSON arity (S1 s a) where
951+instance (GFromJSON arity a) => FromProduct arity (S1 s a) where
1386− productParseJSON (_ :* _ :* opts :* fargs) arr ix _ =
952+ parseProduct opts pa arr ix _ pj pjl =
1387− M1 <$> gParseJSON opts fargs (V.unsafeIndex arr ix) <?> Index ix
953+ gParseJSON opts pa pj pjl $ V.unsafeIndex arr ix
1389--------------------------------------------------------------------------------
955--------------------------------------------------------------------------------
1391class FromPair arity f where
957class FromPair arity f where
1392− -- The first component of the parameter tuple is the tag to match.
1393− parsePair :: Text :* TypeName :* Options :* FromArgs arity a
958+ parsePair :: Options -> Proxy arity
1394− -> Value
959+ -> (Value -> Parser a) -> (Value -> Parser [a])
1395− -> Maybe (Parser (f a))
960+ -> Pair -> Maybe (Parser (f a))
1397instance ( FromPair arity a
962instance ( FromPair arity a
1398 , FromPair arity b
963 , FromPair arity b
1399 ) => FromPair arity (a :+: b) where
964 ) => FromPair arity (a :+: b) where
1401− (fmap L1 <$> parsePair p pair) <|>
965+ parsePair opts pa pj pjl pair = (fmap L1 <$> parsePair opts pa pj pjl pair) <|>
1402− (fmap R1 <$> parsePair p pair)
966+ (fmap R1 <$> parsePair opts pa pj pjl pair)
1404instance ( Constructor c
968instance ( Constructor c
1405 , ConsFromJSON arity a
970 , ConsFromJSON arity a
1406 ) => FromPair arity (C1 c a) where
971 ) => FromPair arity (C1 c a) where
1407− parsePair (tag :* p@(_ :* opts :* _)) v
972+ parsePair opts pa pj pjl (tag, value)
1408− | tag == tag' = Just $ M1 <$> consParseJSON (cname :* p) v
973+ | tag == tag' = Just $ gParseJSON opts pa pj pjl value
1409 | otherwise = Nothing
974 | otherwise = Nothing
1411− tag' = pack $ constructorTagModifier opts cname
976+ tag' = pack $ constructorTagModifier opts $
1412− cname = conName (undefined :: M1 _i c _a _p)
977+ conName (undefined :: t c a p)
1414--------------------------------------------------------------------------------
979--------------------------------------------------------------------------------
1416−class FromUntaggedValue arity f where
1417− parseUntaggedValue :: TypeName :* Options :* FromArgs arity a
1419− -> Parser (f a)
981+notFound :: Text -> Parser a
1420−
982+notFound key = fail $ "The key \"" ++ unpack key ++ "\" was not found"
1421−instance
983+{-# INLINE notFound #-}
1422− ( FromUntaggedValue arity a
1423− , FromUntaggedValue arity b
1424− ) => FromUntaggedValue arity (a :+: b)
1426− parseUntaggedValue p value =
1427− L1 <$> parseUntaggedValue p value <|>
1428− R1 <$> parseUntaggedValue p value
1430−instance OVERLAPPABLE_
1431− ( ConsFromJSON arity a
1433− ) => FromUntaggedValue arity (C1 c a)
1435− parseUntaggedValue p = fmap M1 . consParseJSON (cname :* p)
1437− cname = conName (undefined :: M1 _i c _f _p)
1439−instance OVERLAPPING_
1441− => FromUntaggedValue arity (C1 c U1)
1443− parseUntaggedValue (tname :* opts :* _) v =
1444− contextCons cname tname $ case v of
1446− | tag == tag' -> pure $ M1 U1
1447− | otherwise -> fail_ tag
1448− _ -> typeMismatch "String" v
1450− tag' = pack $ constructorTagModifier opts cname
1451− cname = conName (undefined :: M1 _i c _f _p)
1453− "expected tag " ++ show tag' ++ ", but found tag " ++ show tag
1455-------------------------------------------------------------------------------
985-------------------------------------------------------------------------------
1456-- Instances
986-- Instances
@@ -1508,20 +1038,17 @@ instance (FromJSON a, FromJSON b) => FromJSON (Either a b) where
1508 parseJSON = parseJSON2
1038 parseJSON = parseJSON2
1509 {-# INLINE parseJSON #-}
1039 {-# INLINE parseJSON #-}
1511−instance FromJSON Void where
1041+
1512− parseJSON _ = fail "Cannot parse Void"
1513− {-# INLINE parseJSON #-}
1515instance FromJSON Bool where
1043instance FromJSON Bool where
1516− parseJSON (Bool b) = pure b
1044+ parseJSON = withBool "Bool" pure
1517− parseJSON v = typeMismatch "Bool" v
1518 {-# INLINE parseJSON #-}
1045 {-# INLINE parseJSON #-}
1520instance FromJSONKey Bool where
1047instance FromJSONKey Bool where
1521 fromJSONKey = FromJSONKeyTextParser $ \t -> case t of
1048 fromJSONKey = FromJSONKeyTextParser $ \t -> case t of
1522 "true" -> pure True
1049 "true" -> pure True
1523 "false" -> pure False
1050 "false" -> pure False
1524− _ -> fail $ "cannot parse key " ++ show t ++ " into Bool"
1051+ _ -> fail $ "Cannot parse key into Bool: " ++ T.unpack t
1526instance FromJSON Ordering where
1053instance FromJSON Ordering where
1527 parseJSON = withText "Ordering" $ \s ->
1054 parseJSON = withText "Ordering" $ \s ->
@@ -1529,30 +1056,25 @@ instance FromJSON Ordering where
1529 "LT" -> return LT
1056 "LT" -> return LT
1530 "EQ" -> return EQ
1057 "EQ" -> return EQ
1531 "GT" -> return GT
1058 "GT" -> return GT
1532− _ -> fail $ "parsing Ordering failed, unexpected " ++ show s ++
1533− " (expected \"LT\", \"EQ\", or \"GT\")"
1059+ _ -> fail "Parsing Ordering value failed: expected \"LT\", \"EQ\", or \"GT\""
1535instance FromJSON () where
1061instance FromJSON () where
1536 parseJSON = withArray "()" $ \v ->
1062 parseJSON = withArray "()" $ \v ->
1537 if V.null v
1063 if V.null v
1538 then pure ()
1064 then pure ()
1539− else prependContext "()" $ fail "expected an empty array"
1065+ else fail "Expected an empty array"
1540 {-# INLINE parseJSON #-}
1066 {-# INLINE parseJSON #-}
1542instance FromJSON Char where
1068instance FromJSON Char where
1543− parseJSON = withText "Char" parseChar
1069+ parseJSON = withText "Char" $ \t ->
1070+ if T.compareLength t 1 == EQ
1071+ then pure $ T.head t
1072+ else fail "Expected a string of length 1"
1544 {-# INLINE parseJSON #-}
1073 {-# INLINE parseJSON #-}
1546− parseJSONList (String s) = pure (T.unpack s)
1075+ parseJSONList = withText "String" $ pure . T.unpack
1547− parseJSONList v = typeMismatch "String" v
1548 {-# INLINE parseJSONList #-}
1076 {-# INLINE parseJSONList #-}
1550−parseChar :: Text -> Parser Char
1552− if T.compareLength t 1 == EQ
1553− then pure $ T.head t
1554− else prependContext "Char" $ fail "expected a string of length 1"
1556instance FromJSON Double where
1078instance FromJSON Double where
1557 parseJSON = parseRealFloat "Double"
1079 parseJSON = parseRealFloat "Double"
1558 {-# INLINE parseJSON #-}
1080 {-# INLINE parseJSON #-}
@@ -1564,6 +1086,12 @@ instance FromJSONKey Double where
1564 "-Infinity" -> pure (negate 1/0)
1086 "-Infinity" -> pure (negate 1/0)
1565 _ -> Scientific.toRealFloat <$> parseScientificText t
1087 _ -> Scientific.toRealFloat <$> parseScientificText t
1089+instance FromJSON Number where
1090+ parseJSON (Number s) = pure $ scientificToNumber s
1091+ parseJSON Null = pure (D (0/0))
1092+ parseJSON v = typeMismatch "Number" v
1093+ {-# INLINE parseJSON #-}
1567instance FromJSON Float where
1095instance FromJSON Float where
1568 parseJSON = parseRealFloat "Float"
1096 parseJSON = parseRealFloat "Float"
1569 {-# INLINE parseJSON #-}
1097 {-# INLINE parseJSON #-}
@@ -1576,133 +1104,112 @@ instance FromJSONKey Float where
1576 _ -> Scientific.toRealFloat <$> parseScientificText t
1104 _ -> Scientific.toRealFloat <$> parseScientificText t
1578instance (FromJSON a, Integral a) => FromJSON (Ratio a) where
1106instance (FromJSON a, Integral a) => FromJSON (Ratio a) where
1579− parseJSON (Number x)
1581− , exp10 >= -1024 = return $! realToFrac x
1582− | otherwise = prependContext "Ratio" $ fail msg
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
1589− objParser = withObject "Rational" $ \obj -> do
1107+ parseJSON = withObject "Rational" $ \obj ->
1590− numerator <- obj .: "numerator"
1108+ (%) <$> obj .: "numerator"
1591− denominator <- obj .: "denominator"
1592− if denominator == 0
1593− then fail "Ratio denominator was 0"
1594− else pure $ numerator % denominator
1109+ <*> obj .: "denominator"
1595− {-# INLINE parseJSON #-}
1110+ {-# INLINE parseJSON #-}
1597−-- | This instance includes a bounds check to prevent maliciously
1112+-- | /WARNING:/ Only parse fixed-precision numbers from trusted input
1598−-- large inputs to fill up the memory of the target system. You can
1113+-- since an attacker could easily fill up the memory of the target
1599−-- newtype 'Scientific' and provide your own instance using
1114+-- system by specifying a scientific number with a big exponent like
1600−-- 'withScientific' if you want to allow larger inputs.
1115+-- @1e1000000000@.
1601instance HasResolution a => FromJSON (Fixed a) where
1116instance HasResolution a => FromJSON (Fixed a) where
1602− parseJSON = prependContext "Fixed" . withBoundedScientific' (pure . realToFrac)
1117+ parseJSON = withScientific "Fixed" $ pure . realToFrac
1603 {-# INLINE parseJSON #-}
1118 {-# INLINE parseJSON #-}
1605instance FromJSON Int where
1120instance FromJSON Int where
1606− parseJSON = parseBoundedIntegral "Int"
1121+ parseJSON = parseIntegral "Int"
1607 {-# INLINE parseJSON #-}
1122 {-# INLINE parseJSON #-}
1609instance FromJSONKey Int where
1124instance FromJSONKey Int where
1610− fromJSONKey = FromJSONKeyTextParser $ parseBoundedIntegralText "Int"
1125+ fromJSONKey = FromJSONKeyTextParser parseIntegralText
1612−-- | This instance includes a bounds check to prevent maliciously
1127+-- | /WARNING:/ Only parse Integers from trusted input since an
1613−-- large inputs to fill up the memory of the target system. You can
1128+-- attacker could easily fill up the memory of the target system by
1614−-- newtype 'Scientific' and provide your own instance using
1129+-- specifying a scientific number with a big exponent like
1615−-- 'withScientific' if you want to allow larger inputs.
1130+-- @1e1000000000@.
1616instance FromJSON Integer where
1131instance FromJSON Integer where
1617− parseJSON = parseIntegral "Integer"
1132+ parseJSON = withScientific "Integral" $ pure . truncate
1618 {-# INLINE parseJSON #-}
1133 {-# INLINE parseJSON #-}
1620instance FromJSONKey Integer where
1135instance FromJSONKey Integer where
1621− fromJSONKey = FromJSONKeyTextParser $ parseIntegralText "Integer"
1136+ fromJSONKey = FromJSONKeyTextParser parseIntegralText
1623instance FromJSON Natural where
1138instance FromJSON Natural where
1624− parseJSON value = do
1139+ parseJSON = withScientific "Natural" $ \s ->
1625− integer <- parseIntegral "Natural" value
1140+ if Scientific.coefficient s < 0
1626− parseNatural integer
1141+ then fail $ "Expected a Natural number but got the negative number: " <> show s
1142+ else pure $ truncate s
1628instance FromJSONKey Natural where
1144instance FromJSONKey Natural where
1629− fromJSONKey = FromJSONKeyTextParser $ \text -> do
1145+ fromJSONKey = FromJSONKeyTextParser $ \t -> parseScientificText t >>= \s ->
1630− integer <- parseIntegralText "Natural" text
1146+ if Scientific.coefficient s < 0
1631− parseNatural integer
1633−parseNatural :: Integer -> Parser Natural
1634−parseNatural integer =
1635− if integer < 0 then
1636− fail $ "parsing Natural failed, unexpected negative number " <> show integer
1147+ then fail $ "Expected a Natural number but got the negative number: " <> show s
1637− else
1148+ else pure $ truncate s
1638− pure $ fromIntegral integer
1640instance FromJSON Int8 where
1150instance FromJSON Int8 where
1641− parseJSON = parseBoundedIntegral "Int8"
1151+ parseJSON = parseIntegral "Int8"
1642 {-# INLINE parseJSON #-}
1152 {-# INLINE parseJSON #-}
1644instance FromJSONKey Int8 where
1154instance FromJSONKey Int8 where
1645− fromJSONKey = FromJSONKeyTextParser $ parseBoundedIntegralText "Int8"
1155+ fromJSONKey = FromJSONKeyTextParser parseIntegralText
1647instance FromJSON Int16 where
1157instance FromJSON Int16 where
1648− parseJSON = parseBoundedIntegral "Int16"
1158+ parseJSON = parseIntegral "Int16"
1649 {-# INLINE parseJSON #-}
1159 {-# INLINE parseJSON #-}
1651instance FromJSONKey Int16 where
1161instance FromJSONKey Int16 where
1652− fromJSONKey = FromJSONKeyTextParser $ parseBoundedIntegralText "Int16"
1162+ fromJSONKey = FromJSONKeyTextParser parseIntegralText
1654instance FromJSON Int32 where
1164instance FromJSON Int32 where
1655− parseJSON = parseBoundedIntegral "Int32"
1165+ parseJSON = parseIntegral "Int32"
1656 {-# INLINE parseJSON #-}
1166 {-# INLINE parseJSON #-}
1658instance FromJSONKey Int32 where
1168instance FromJSONKey Int32 where
1659− fromJSONKey = FromJSONKeyTextParser $ parseBoundedIntegralText "Int32"
1169+ fromJSONKey = FromJSONKeyTextParser parseIntegralText
1661instance FromJSON Int64 where
1171instance FromJSON Int64 where
1662− parseJSON = parseBoundedIntegral "Int64"
1172+ parseJSON = parseIntegral "Int64"
1663 {-# INLINE parseJSON #-}
1173 {-# INLINE parseJSON #-}
1665instance FromJSONKey Int64 where
1175instance FromJSONKey Int64 where
1666− fromJSONKey = FromJSONKeyTextParser $ parseBoundedIntegralText "Int64"
1176+ fromJSONKey = FromJSONKeyTextParser parseIntegralText
1668instance FromJSON Word where
1178instance FromJSON Word where
1669− parseJSON = parseBoundedIntegral "Word"
1179+ parseJSON = parseIntegral "Word"
1670 {-# INLINE parseJSON #-}
1180 {-# INLINE parseJSON #-}
1672instance FromJSONKey Word where
1182instance FromJSONKey Word where
1673− fromJSONKey = FromJSONKeyTextParser $ parseBoundedIntegralText "Word"
1183+ fromJSONKey = FromJSONKeyTextParser parseIntegralText
1675instance FromJSON Word8 where
1185instance FromJSON Word8 where
1676− parseJSON = parseBoundedIntegral "Word8"
1186+ parseJSON = parseIntegral "Word8"
1677 {-# INLINE parseJSON #-}
1187 {-# INLINE parseJSON #-}
1679instance FromJSONKey Word8 where
1189instance FromJSONKey Word8 where
1680− fromJSONKey = FromJSONKeyTextParser $ parseBoundedIntegralText "Word8"
1190+ fromJSONKey = FromJSONKeyTextParser parseIntegralText
1682instance FromJSON Word16 where
1192instance FromJSON Word16 where
1683− parseJSON = parseBoundedIntegral "Word16"
1193+ parseJSON = parseIntegral "Word16"
1684 {-# INLINE parseJSON #-}
1194 {-# INLINE parseJSON #-}
1686instance FromJSONKey Word16 where
1196instance FromJSONKey Word16 where
1687− fromJSONKey = FromJSONKeyTextParser $ parseBoundedIntegralText "Word16"
1197+ fromJSONKey = FromJSONKeyTextParser parseIntegralText
1689instance FromJSON Word32 where
1199instance FromJSON Word32 where
1690− parseJSON = parseBoundedIntegral "Word32"
1200+ parseJSON = parseIntegral "Word32"
1691 {-# INLINE parseJSON #-}
1201 {-# INLINE parseJSON #-}
1693instance FromJSONKey Word32 where
1203instance FromJSONKey Word32 where
1694− fromJSONKey = FromJSONKeyTextParser $ parseBoundedIntegralText "Word32"
1204+ fromJSONKey = FromJSONKeyTextParser parseIntegralText
1696instance FromJSON Word64 where
1206instance FromJSON Word64 where
1697− parseJSON = parseBoundedIntegral "Word64"
1207+ parseJSON = parseIntegral "Word64"
1698 {-# INLINE parseJSON #-}
1208 {-# INLINE parseJSON #-}
1700instance FromJSONKey Word64 where
1210instance FromJSONKey Word64 where
1701− fromJSONKey = FromJSONKeyTextParser $ parseBoundedIntegralText "Word64"
1211+ fromJSONKey = FromJSONKeyTextParser parseIntegralText
1703−instance FromJSON CTime where
1704− parseJSON = fmap CTime . parseJSON
1705− {-# INLINE parseJSON #-}
1707instance FromJSON Text where
1214instance FromJSON Text where
1708 parseJSON = withText "Text" pure
1215 parseJSON = withText "Text" pure
@@ -1732,17 +1239,17 @@ parseVersionText = go . readP_to_S parseVersion . unpack
1733 go [(v,[])] = return v
1240 go [(v,[])] = return v
1734 go (_ : xs) = go xs
1241 go (_ : xs) = go xs
1735− go _ = fail "parsing Version failed"
1242+ go _ = fail "could not parse Version"
1737-------------------------------------------------------------------------------
1244-------------------------------------------------------------------------------
1738-- semigroups NonEmpty
1245-- semigroups NonEmpty
1739-------------------------------------------------------------------------------
1246-------------------------------------------------------------------------------
1741instance FromJSON1 NonEmpty where
1248instance FromJSON1 NonEmpty where
1742− liftParseJSON p _ = withArray "NonEmpty" $
1249+ liftParseJSON p _ = withArray "NonEmpty a" $
1743 (>>= ne) . Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1250 (>>= ne) . Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1745− ne [] = fail "parsing NonEmpty failed, unexpected empty list"
1252+ ne [] = fail "Expected a NonEmpty but got an empty list"
1746 ne (x:xs) = pure (x :| xs)
1253 ne (x:xs) = pure (x :| xs)
1747 {-# INLINE liftParseJSON #-}
1254 {-# INLINE liftParseJSON #-}
@@ -1763,7 +1270,7 @@ instance FromJSON Scientific where
1763-------------------------------------------------------------------------------
1270-------------------------------------------------------------------------------
1765instance FromJSON1 DList.DList where
1272instance FromJSON1 DList.DList where
1766− liftParseJSON p _ = withArray "DList" $
1273+ liftParseJSON p _ = withArray "DList a" $
1767 fmap DList.fromList .
1274 fmap DList.fromList .
1768 Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1275 Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1769 {-# INLINE liftParseJSON #-}
1276 {-# INLINE liftParseJSON #-}
@@ -1790,7 +1297,7 @@ instance (FromJSON a) => FromJSON (Identity a) where
1790 parseJSONList = liftParseJSONList parseJSON parseJSONList
1297 parseJSONList = liftParseJSONList parseJSON parseJSONList
1791 {-# INLINE parseJSONList #-}
1298 {-# INLINE parseJSONList #-}
1793−instance (FromJSONKey a) => FromJSONKey (Identity a) where
1300+instance (FromJSONKey a, FromJSON a) => FromJSONKey (Identity a) where
1794 fromJSONKey = coerceFromJSONKeyFunction (fromJSONKey :: FromJSONKeyFunction a)
1301 fromJSONKey = coerceFromJSONKeyFunction (fromJSONKey :: FromJSONKeyFunction a)
1795 fromJSONKeyList = coerceFromJSONKeyFunction (fromJSONKeyList :: FromJSONKeyFunction [a])
1302 fromJSONKeyList = coerceFromJSONKeyFunction (fromJSONKeyList :: FromJSONKeyFunction [a])
@@ -1840,7 +1347,7 @@ instance (FromJSON1 f, FromJSON1 g) => FromJSON1 (Sum f g) where
1840 inr = "InR"
1347 inr = "InR"
1842 liftParseJSON _ _ _ = fail $
1349 liftParseJSON _ _ _ = fail $
1843− "parsing Sum failed, expected an object with a single property " ++
1350+ "expected an object with a single property " ++
1844 "where the property key should be either " ++
1351 "where the property key should be either " ++
1845 "\"InL\" or \"InR\""
1352 "\"InL\" or \"InR\""
1846 {-# INLINE liftParseJSON #-}
1353 {-# INLINE liftParseJSON #-}
@@ -1854,7 +1361,7 @@ instance (FromJSON1 f, FromJSON1 g, FromJSON a) => FromJSON (Sum f g a) where
1854-------------------------------------------------------------------------------
1361-------------------------------------------------------------------------------
1856instance FromJSON1 Seq.Seq where
1363instance FromJSON1 Seq.Seq where
1857− liftParseJSON p _ = withArray "Seq" $
1364+ liftParseJSON p _ = withArray "Seq a" $
1858 fmap Seq.fromList .
1365 fmap Seq.fromList .
1859 Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1366 Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1860 {-# INLINE liftParseJSON #-}
1367 {-# INLINE liftParseJSON #-}
@@ -1888,15 +1395,15 @@ instance FromJSON a => FromJSON (IntMap.IntMap a) where
1889instance (FromJSONKey k, Ord k) => FromJSON1 (M.Map k) where
1396instance (FromJSONKey k, Ord k) => FromJSON1 (M.Map k) where
1890 liftParseJSON p _ = case fromJSONKey of
1397 liftParseJSON p _ = case fromJSONKey of
1891− FromJSONKeyCoerce _ -> withObject "Map" $
1398+ FromJSONKeyCoerce _-> withObject "Map k v" $
1892 fmap (H.foldrWithKey (M.insert . unsafeCoerce) M.empty) . H.traverseWithKey (\k v -> p v <?> Key k)
1399 fmap (H.foldrWithKey (M.insert . unsafeCoerce) M.empty) . H.traverseWithKey (\k v -> p v <?> Key k)
1893− FromJSONKeyText f -> withObject "Map" $
1400+ FromJSONKeyText f -> withObject "Map k v" $
1894 fmap (H.foldrWithKey (M.insert . f) M.empty) . H.traverseWithKey (\k v -> p v <?> Key k)
1401 fmap (H.foldrWithKey (M.insert . f) M.empty) . H.traverseWithKey (\k v -> p v <?> Key k)
1895− FromJSONKeyTextParser f -> withObject "Map" $
1402+ FromJSONKeyTextParser f -> withObject "Map k v" $
1896 H.foldrWithKey (\k v m -> M.insert <$> f k <?> Key k <*> p v <?> Key k <*> m) (pure M.empty)
1403 H.foldrWithKey (\k v m -> M.insert <$> f k <?> Key k <*> p v <?> Key k <*> m) (pure M.empty)
1897− FromJSONKeyValue f -> withArray "Map" $ \arr ->
1404+ FromJSONKeyValue f -> withArray "Map k v" $ \arr ->
1898− fmap M.fromList . Tr.sequence .
1405+ M.fromList <$> (Tr.sequence .
1899− zipWith (parseIndexedJSONPair f p) [0..] . V.toList $ arr
1406+ zipWith (parseIndexedJSONPair f p) [0..] . V.toList $ arr)
1900 {-# INLINE liftParseJSON #-}
1407 {-# INLINE liftParseJSON #-}
1902instance (FromJSONKey k, Ord k, FromJSON v) => FromJSON (M.Map k v) where
1409instance (FromJSONKey k, Ord k, FromJSON v) => FromJSON (M.Map k v) where
@@ -1916,24 +1423,12 @@ instance (FromJSON v) => FromJSON (Tree.Tree v) where
1916 parseJSON = parseJSON1
1423 parseJSON = parseJSON1
1917 {-# INLINE parseJSON #-}
1424 {-# INLINE parseJSON #-}
1919−-------------------------------------------------------------------------------
1921−-------------------------------------------------------------------------------
1923−instance FromJSON UUID.UUID where
1924− parseJSON = withText "UUID" $
1925− maybe (fail "invalid UUID") pure . UUID.fromText
1927−instance FromJSONKey UUID.UUID where
1928− fromJSONKey = FromJSONKeyTextParser $
1929− maybe (fail "invalid UUID") pure . UUID.fromText
1931-------------------------------------------------------------------------------
1426-------------------------------------------------------------------------------
1932-- vector
1427-- vector
1933-------------------------------------------------------------------------------
1428-------------------------------------------------------------------------------
1935instance FromJSON1 Vector where
1430instance FromJSON1 Vector where
1936− liftParseJSON p _ = withArray "Vector" $
1431+ liftParseJSON p _ = withArray "Vector a" $
1937 V.mapM (uncurry $ parseIndexedJSON p) . V.indexed
1432 V.mapM (uncurry $ parseIndexedJSON p) . V.indexed
1938 {-# INLINE liftParseJSON #-}
1433 {-# INLINE liftParseJSON #-}
@@ -1947,14 +1442,14 @@ vectorParseJSON s = withArray s $ fmap V.convert . V.mapM (uncurry $ parseIndexe
1947{-# INLINE vectorParseJSON #-}
1442{-# INLINE vectorParseJSON #-}
1949instance (Storable a, FromJSON a) => FromJSON (VS.Vector a) where
1444instance (Storable a, FromJSON a) => FromJSON (VS.Vector a) where
1950− parseJSON = vectorParseJSON "Data.Vector.Storable.Vector"
1445+ parseJSON = vectorParseJSON "Data.Vector.Storable.Vector a"
1952instance (VP.Prim a, FromJSON a) => FromJSON (VP.Vector a) where
1447instance (VP.Prim a, FromJSON a) => FromJSON (VP.Vector a) where
1953− parseJSON = vectorParseJSON "Data.Vector.Primitive.Vector"
1448+ parseJSON = vectorParseJSON "Data.Vector.Primitive.Vector a"
1954 {-# INLINE parseJSON #-}
1449 {-# INLINE parseJSON #-}
1956instance (VG.Vector VU.Vector a, FromJSON a) => FromJSON (VU.Vector a) where
1451instance (VG.Vector VU.Vector a, FromJSON a) => FromJSON (VU.Vector a) where
1957− parseJSON = vectorParseJSON "Data.Vector.Unboxed.Vector"
1452+ parseJSON = vectorParseJSON "Data.Vector.Unboxed.Vector a"
1958 {-# INLINE parseJSON #-}
1453 {-# INLINE parseJSON #-}
1960-------------------------------------------------------------------------------
1455-------------------------------------------------------------------------------
@@ -1968,15 +1463,15 @@ instance (Eq a, Hashable a, FromJSON a) => FromJSON (HashSet.HashSet a) where
1969instance (FromJSONKey k, Eq k, Hashable k) => FromJSON1 (H.HashMap k) where
1464instance (FromJSONKey k, Eq k, Hashable k) => FromJSON1 (H.HashMap k) where
1970 liftParseJSON p _ = case fromJSONKey of
1465 liftParseJSON p _ = case fromJSONKey of
1971− FromJSONKeyCoerce _ -> withObject "HashMap ~Text" $
1466+ FromJSONKeyCoerce _ -> withObject "HashMap ~Text v" $
1972 uc . H.traverseWithKey (\k v -> p v <?> Key k)
1467 uc . H.traverseWithKey (\k v -> p v <?> Key k)
1973− FromJSONKeyText f -> withObject "HashMap" $
1468+ FromJSONKeyText f -> withObject "HashMap k v" $
1974 fmap (mapKey f) . H.traverseWithKey (\k v -> p v <?> Key k)
1469 fmap (mapKey f) . H.traverseWithKey (\k v -> p v <?> Key k)
1975− FromJSONKeyTextParser f -> withObject "HashMap" $
1470+ FromJSONKeyTextParser f -> withObject "HashMap k v" $
1976 H.foldrWithKey (\k v m -> H.insert <$> f k <?> Key k <*> p v <?> Key k <*> m) (pure H.empty)
1471 H.foldrWithKey (\k v m -> H.insert <$> f k <?> Key k <*> p v <?> Key k <*> m) (pure H.empty)
1977− FromJSONKeyValue f -> withArray "Map" $ \arr ->
1472+ FromJSONKeyValue f -> withArray "Map k v" $ \arr ->
1978− fmap H.fromList . Tr.sequence .
1473+ H.fromList <$> (Tr.sequence .
1979− zipWith (parseIndexedJSONPair f p) [0..] . V.toList $ arr
1474+ zipWith (parseIndexedJSONPair f p) [0..] . V.toList $ arr)
1981 uc :: Parser (H.HashMap Text v) -> Parser (H.HashMap k v)
1476 uc :: Parser (H.HashMap Text v) -> Parser (H.HashMap k v)
1982 uc = unsafeCoerce
1477 uc = unsafeCoerce
@@ -1997,33 +1492,11 @@ instance FromJSON DotNetTime where
1997 parseJSON = withText "DotNetTime" $ \t ->
1492 parseJSON = withText "DotNetTime" $ \t ->
1998 let (s,m) = T.splitAt (T.length t - 5) t
1493 let (s,m) = T.splitAt (T.length t - 5) t
1999 t' = T.concat [s,".",m]
1494 t' = T.concat [s,".",m]
2000− in case parseTimeM True defaultTimeLocale "/Date(%s%Q)/" (unpack t') of
1495+ in case parseTime defaultTimeLocale "/Date(%s%Q)/" (unpack t') of
2001 Just d -> pure (DotNetTime d)
1496 Just d -> pure (DotNetTime d)
2002 _ -> fail "could not parse .NET time"
1497 _ -> fail "could not parse .NET time"
2003 {-# INLINE parseJSON #-}
1498 {-# INLINE parseJSON #-}
2005−-------------------------------------------------------------------------------
2007−-------------------------------------------------------------------------------
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
2014−instance FromJSON a => FromJSON (PM.SmallArray a) where
2015− parseJSON = fmap Exts.fromList . parseJSON
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
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
2027-------------------------------------------------------------------------------
1500-------------------------------------------------------------------------------
2029-------------------------------------------------------------------------------
1502-------------------------------------------------------------------------------
@@ -2049,17 +1522,6 @@ instance FromJSONKey LocalTime where
2049 fromJSONKey = FromJSONKeyTextParser (Time.run Time.localTime)
1522 fromJSONKey = FromJSONKeyTextParser (Time.run Time.localTime)
2052−-- | Supported string formats:
2054−-- @YYYY-MM-DD HH:MM Z@
2055−-- @YYYY-MM-DD HH:MM:SS Z@
2056−-- @YYYY-MM-DD HH:MM:SS.SSS Z@
2058−-- The first space may instead be a @T@, and the second space is
2059−-- optional. The @Z@ represents UTC. The @Z@ may be replaced with a
2060−-- time zone offset of the form @+0000@ or @-08:00@, where the first
2061−-- two digits are hours, the @:@ is optional and the second two digits
2062−-- (also optional) are minutes.
2063instance FromJSON ZonedTime where
1525instance FromJSON ZonedTime where
2064 parseJSON = withText "ZonedTime" (Time.run Time.zonedTime)
1526 parseJSON = withText "ZonedTime" (Time.run Time.zonedTime)
@@ -2074,168 +1536,41 @@ instance FromJSONKey UTCTime where
2074 fromJSONKey = FromJSONKeyTextParser (Time.run Time.utcTime)
1536 fromJSONKey = FromJSONKeyTextParser (Time.run Time.utcTime)
2077−-- | This instance includes a bounds check to prevent maliciously
1539+-- | /WARNING:/ Only parse lengths of time from trusted input
2078−-- large inputs to fill up the memory of the target system. You can
1540+-- since an attacker could easily fill up the memory of the target
2079−-- newtype 'Scientific' and provide your own instance using
1541+-- system by specifying a scientific number with a big exponent like
2080−-- 'withScientific' if you want to allow larger inputs.
1542+-- @1e1000000000@.
2081instance FromJSON NominalDiffTime where
1543instance FromJSON NominalDiffTime where
2082− parseJSON = withBoundedScientific "NominalDiffTime" $ pure . realToFrac
1544+ parseJSON = withScientific "NominalDiffTime" $ pure . realToFrac
2083− {-# INLINE parseJSON #-}
2086−-- | This instance includes a bounds check to prevent maliciously
2087−-- large inputs to fill up the memory of the target system. You can
2088−-- newtype 'Scientific' and provide your own instance using
2089−-- 'withScientific' if you want to allow larger inputs.
2090−instance FromJSON DiffTime where
2091− parseJSON = withBoundedScientific "DiffTime" $ pure . realToFrac
2092 {-# INLINE parseJSON #-}
1545 {-# INLINE parseJSON #-}
2094−instance FromJSON SystemTime where
2095− parseJSON v = prependContext "SystemTime" $ do
2097− let n' = floor (n * fromInteger (resolution n) :: Nano)
2098− let (secs, nano) = n' `divMod` resolution n
2099− return (MkSystemTime (fromInteger secs) (fromInteger nano))
2101−instance FromJSON CalendarDiffTime where
2102− parseJSON = withObject "CalendarDiffTime" $ \obj -> CalendarDiffTime
2103− <$> obj .: "months"
2106−instance FromJSON CalendarDiffDays where
2107− parseJSON = withObject "CalendarDiffDays" $ \obj -> CalendarDiffDays
2108− <$> obj .: "months"
2111−instance FromJSON DayOfWeek where
2112− parseJSON = withText "DaysOfWeek" parseDayOfWeek
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"
2125−instance FromJSONKey DayOfWeek where
2126− fromJSONKey = FromJSONKeyTextParser parseDayOfWeek
2128-------------------------------------------------------------------------------
1547-------------------------------------------------------------------------------
2129-- base Monoid/Semigroup
1548-- base Monoid/Semigroup
2130-------------------------------------------------------------------------------
1549-------------------------------------------------------------------------------
2132−instance FromJSON1 Monoid.Dual where
1551+instance FromJSON1 Dual where
2133− liftParseJSON p _ = fmap Monoid.Dual . p
1552+ liftParseJSON p _ = fmap Dual . p
2134− {-# INLINE liftParseJSON #-}
2136−instance FromJSON a => FromJSON (Monoid.Dual a) where
2137− parseJSON = parseJSON1
2138− {-# INLINE parseJSON #-}
2141−instance FromJSON1 Monoid.First where
2142− liftParseJSON p p' = fmap Monoid.First . liftParseJSON p p'
2143− {-# INLINE liftParseJSON #-}
2145−instance FromJSON a => FromJSON (Monoid.First a) where
2146− parseJSON = parseJSON1
2147− {-# INLINE parseJSON #-}
2150−instance FromJSON1 Monoid.Last where
2151− liftParseJSON p p' = fmap Monoid.Last . liftParseJSON p p'
2152− {-# INLINE liftParseJSON #-}
2154−instance FromJSON a => FromJSON (Monoid.Last a) where
2155− parseJSON = parseJSON1
2156− {-# INLINE parseJSON #-}
2159−instance FromJSON1 Semigroup.Min where
2160− liftParseJSON p _ a = Semigroup.Min <$> p a
2161 {-# INLINE liftParseJSON #-}
1553 {-# INLINE liftParseJSON #-}
2163− liftParseJSONList _ p a = fmap Semigroup.Min <$> p a
2164− {-# INLINE liftParseJSONList #-}
2166−instance (FromJSON a) => FromJSON (Semigroup.Min a) where
1555+instance FromJSON a => FromJSON (Dual a) where
2167 parseJSON = parseJSON1
1556 parseJSON = parseJSON1
2168 {-# INLINE parseJSON #-}
1557 {-# INLINE parseJSON #-}
2170− parseJSONList = liftParseJSONList parseJSON parseJSONList
2171− {-# INLINE parseJSONList #-}
2174−instance FromJSON1 Semigroup.Max where
1560+instance FromJSON1 First where
2175− liftParseJSON p _ a = Semigroup.Max <$> p a
1561+ liftParseJSON p p' = fmap First . liftParseJSON p p'
2176 {-# INLINE liftParseJSON #-}
1562 {-# INLINE liftParseJSON #-}
2178− liftParseJSONList _ p a = fmap Semigroup.Max <$> p a
2179− {-# INLINE liftParseJSONList #-}
2181−instance (FromJSON a) => FromJSON (Semigroup.Max a) where
1564+instance FromJSON a => FromJSON (First a) where
2182 parseJSON = parseJSON1
1565 parseJSON = parseJSON1
2183 {-# INLINE parseJSON #-}
1566 {-# INLINE parseJSON #-}
2185− parseJSONList = liftParseJSONList parseJSON parseJSONList
2186− {-# INLINE parseJSONList #-}
2189−instance FromJSON1 Semigroup.First where
1569+instance FromJSON1 Last where
2190− liftParseJSON p _ a = Semigroup.First <$> p a
1570+ liftParseJSON p p' = fmap Last . liftParseJSON p p'
2191 {-# INLINE liftParseJSON #-}
1571 {-# INLINE liftParseJSON #-}
2193− liftParseJSONList _ p a = fmap Semigroup.First <$> p a
2194− {-# INLINE liftParseJSONList #-}
2196−instance (FromJSON a) => FromJSON (Semigroup.First a) where
1573+instance FromJSON a => FromJSON (Last a) where
2197− parseJSON = parseJSON1
2198− {-# INLINE parseJSON #-}
2200− parseJSONList = liftParseJSONList parseJSON parseJSONList
2201− {-# INLINE parseJSONList #-}
2204−instance FromJSON1 Semigroup.Last where
2205− liftParseJSON p _ a = Semigroup.Last <$> p a
2206− {-# INLINE liftParseJSON #-}
2208− liftParseJSONList _ p a = fmap Semigroup.Last <$> p a
2209− {-# INLINE liftParseJSONList #-}
2211−instance (FromJSON a) => FromJSON (Semigroup.Last a) where
2212− parseJSON = parseJSON1
2213− {-# INLINE parseJSON #-}
2215− parseJSONList = liftParseJSONList parseJSON parseJSONList
2216− {-# INLINE parseJSONList #-}
2219−instance FromJSON1 Semigroup.WrappedMonoid where
2220− liftParseJSON p _ a = Semigroup.WrapMonoid <$> p a
2221− {-# INLINE liftParseJSON #-}
2223− liftParseJSONList _ p a = fmap Semigroup.WrapMonoid <$> p a
2224− {-# INLINE liftParseJSONList #-}
2226−instance (FromJSON a) => FromJSON (Semigroup.WrappedMonoid a) where
2227− parseJSON = parseJSON1
2228− {-# INLINE parseJSON #-}
2230− parseJSONList = liftParseJSONList parseJSON parseJSONList
2231− {-# INLINE parseJSONList #-}
2234−instance FromJSON1 Semigroup.Option where
2235− liftParseJSON p p' = fmap Semigroup.Option . liftParseJSON p p'
2236− {-# INLINE liftParseJSON #-}
2238−instance FromJSON a => FromJSON (Semigroup.Option a) where
2239 parseJSON = parseJSON1
1574 parseJSON = parseJSON1
2240 {-# INLINE parseJSON #-}
1575 {-# INLINE parseJSON #-}
@@ -2243,21 +1578,11 @@ instance FromJSON a => FromJSON (Semigroup.Option a) where
2243-- tagged
1578-- tagged
2244-------------------------------------------------------------------------------
1579-------------------------------------------------------------------------------
2246−instance FromJSON1 Proxy where
2247− {-# INLINE liftParseJSON #-}
2248− liftParseJSON _ _ = fromNull "Proxy" Proxy
2250instance FromJSON (Proxy a) where
1581instance FromJSON (Proxy a) where
2251 {-# INLINE parseJSON #-}
1582 {-# INLINE parseJSON #-}
2252− parseJSON = fromNull "Proxy" Proxy
1583+ parseJSON Null = pure Proxy
1584+ parseJSON v = typeMismatch "Proxy" v
2254−fromNull :: String -> a -> Value -> Parser a
2255−fromNull _ a Null = pure a
2256−fromNull c _ v = prependContext c (typeMismatch "Null" v)
2258−instance FromJSON2 Tagged where
2259− liftParseJSON2 _ _ p _ = fmap Tagged . p
2260− {-# INLINE liftParseJSON2 #-}
2262instance FromJSON1 (Tagged a) where
1587instance FromJSON1 (Tagged a) where
2263 liftParseJSON p _ = fmap Tagged . p
1588 liftParseJSON p _ = fmap Tagged . p
@@ -2280,7 +1605,10 @@ instance (FromJSON a, FromJSON b, FromJSON c) => FromJSONKey (a,b,c)
2280instance (FromJSON a, FromJSON b, FromJSON c, FromJSON d) => FromJSONKey (a,b,c,d)
1605instance (FromJSON a, FromJSON b, FromJSON c, FromJSON d) => FromJSONKey (a,b,c,d)
2282instance FromJSONKey Char where
1607instance FromJSONKey Char where
2283− fromJSONKey = FromJSONKeyTextParser parseChar
1608+ fromJSONKey = FromJSONKeyTextParser $ \t ->
1610+ then return (T.index t 0)
1611+ else typeMismatch "Expected Char but String didn't contain exactly one character" (String t)
2284 fromJSONKeyList = FromJSONKeyText T.unpack
1612 fromJSONKeyList = FromJSONKeyText T.unpack
2286instance (FromJSONKey a, FromJSON a) => FromJSONKey [a] where
1614instance (FromJSONKey a, FromJSON a) => FromJSONKey [a] where