@@ -5,16 +5,20 @@
5{-# LANGUAGE FlexibleInstances #-}
5{-# LANGUAGE FlexibleInstances #-}
6{-# LANGUAGE GADTs #-}
6{-# LANGUAGE GADTs #-}
7{-# LANGUAGE MultiParamTypeClasses #-}
7{-# LANGUAGE MultiParamTypeClasses #-}
8+{-# LANGUAGE NamedFieldPuns #-}
8{-# LANGUAGE NoImplicitPrelude #-}
9{-# LANGUAGE NoImplicitPrelude #-}
9{-# LANGUAGE OverloadedStrings #-}
10{-# LANGUAGE OverloadedStrings #-}
10−{-# LANGUAGE PolyKinds #-}
11{-# LANGUAGE RecordWildCards #-}
11{-# LANGUAGE RecordWildCards #-}
12{-# LANGUAGE ScopedTypeVariables #-}
12{-# LANGUAGE ScopedTypeVariables #-}
13{-# LANGUAGE TypeOperators #-}
13{-# LANGUAGE TypeOperators #-}
14−{-# LANGUAGE TupleSections #-}
14+{-# LANGUAGE TypeSynonymInstances #-}
15{-# LANGUAGE UndecidableInstances #-}
15{-# LANGUAGE UndecidableInstances #-}
16{-# LANGUAGE ViewPatterns #-}
16{-# LANGUAGE ViewPatterns #-}
18+#if __GLASGOW_HASKELL__ >= 706
19+{-# LANGUAGE PolyKinds #-}
18#include "incoherent-compat.h"
22#include "incoherent-compat.h"
19#include "overlapping-compat.h"
23#include "overlapping-compat.h"
@@ -42,9 +46,6 @@ module Data.Aeson.Types.FromJSON
42 , coerceFromJSONKeyFunction
46 , coerceFromJSONKeyFunction
43 , mapFromJSONKeyFunction
47 , mapFromJSONKeyFunction
48 -- * List functions
49 -- * List functions
49 , listParser
50 , listParser
@@ -60,14 +61,12 @@ module Data.Aeson.Types.FromJSON
60 , fromJSON
61 , fromJSON
61 , ifromJSON
62 , ifromJSON
62 , typeMismatch
63 , typeMismatch
64 , parseField
64 , parseField
65 , parseFieldMaybe
65 , parseFieldMaybe
66 , parseFieldMaybe'
66 , parseFieldMaybe'
67 , explicitParseField
67 , explicitParseField
68 , explicitParseFieldMaybe
68 , explicitParseFieldMaybe
69 , explicitParseFieldMaybe'
69 , explicitParseFieldMaybe'
71 -- ** Operators
70 -- ** Operators
@@ -80,14 +79,14 @@ module Data.Aeson.Types.FromJSON
81import Prelude.Compat
80import Prelude.Compat
83−import Control.Applicative ((<|>), Const(..), liftA2)
82+import Control.Applicative ((<|>), Const(..))
84−import Control.Monad (zipWithM)
83+import Control.Monad ((<=<), zipWithM)
85import Data.Aeson.Internal.Functions (mapKey)
84import Data.Aeson.Internal.Functions (mapKey)
86import Data.Aeson.Parser.Internal (eitherDecodeWith, jsonEOF)
85import Data.Aeson.Parser.Internal (eitherDecodeWith, jsonEOF)
87import Data.Aeson.Types.Generic
86import Data.Aeson.Types.Generic
88import Data.Aeson.Types.Internal
87import Data.Aeson.Types.Internal
89import Data.Bits (unsafeShiftR)
88import Data.Bits (unsafeShiftR)
90−import Data.Fixed (Fixed, HasResolution (resolution), Nano)
89+import Data.Fixed (Fixed, HasResolution)
91import Data.Functor.Compose (Compose(..))
90import Data.Functor.Compose (Compose(..))
92import Data.Functor.Identity (Identity(..))
91import Data.Functor.Identity (Identity(..))
93import Data.Functor.Product (Product(..))
92import Data.Functor.Product (Product(..))
@@ -103,10 +102,8 @@ import Data.Scientific (Scientific, base10Exponent)
103import Data.Tagged (Tagged(..))
102import Data.Tagged (Tagged(..))
104import Data.Text (Text, pack, unpack)
103import Data.Text (Text, pack, unpack)
105import Data.Time (Day, DiffTime, LocalTime, NominalDiffTime, TimeOfDay, UTCTime, ZonedTime)
104import Data.Time (Day, DiffTime, LocalTime, NominalDiffTime, TimeOfDay, UTCTime, ZonedTime)
106−import Data.Time.Calendar.Compat (CalendarDiffDays (..), DayOfWeek (..))
105+import Data.Time.Format (parseTime)
107−import Data.Time.LocalTime.Compat (CalendarDiffTime (..))
108−import Data.Time.Clock.System.Compat (SystemTime (..))
109−import Data.Time.Format.Compat (parseTimeM, defaultTimeLocale)
106+import Data.Time.Locale.Compat (defaultTimeLocale)
110import Data.Traversable as Tr (sequence)
107import Data.Traversable as Tr (sequence)
111import Data.Vector (Vector)
108import Data.Vector (Vector)
112import Data.Version (Version, parseVersion)
109import Data.Version (Version, parseVersion)
@@ -118,9 +115,9 @@ import GHC.Generics
118import Numeric.Natural (Natural)
115import Numeric.Natural (Natural)
119import Text.ParserCombinators.ReadP (readP_to_S)
116import Text.ParserCombinators.ReadP (readP_to_S)
120import Unsafe.Coerce (unsafeCoerce)
117import Unsafe.Coerce (unsafeCoerce)
118+import qualified Data.Aeson.Compat as Compat
121import qualified Data.Aeson.Parser.Time as Time
119import qualified Data.Aeson.Parser.Time as Time
122import qualified Data.Attoparsec.ByteString.Char8 as A (endOfInput, parseOnly, scientific)
120import qualified Data.Attoparsec.ByteString.Char8 as A (endOfInput, parseOnly, scientific)
123−import qualified Data.ByteString.Lazy as L
124import qualified Data.DList as DList
121import qualified Data.DList as DList
125import qualified Data.HashMap.Strict as H
122import qualified Data.HashMap.Strict as H
126import qualified Data.HashSet as HashSet
123import qualified Data.HashSet as HashSet
@@ -149,14 +146,22 @@ import qualified Data.Primitive.SmallArray as PM
149import qualified Data.Primitive.Types as PM
146import qualified Data.Primitive.Types as PM
151#if MIN_VERSION_primitive(0,6,4)
148#if MIN_VERSION_primitive(0,6,4)
152−#if !MIN_VERSION_primitive(0,7,0)
153import qualified Data.Primitive.UnliftedArray as PM
149import qualified Data.Primitive.UnliftedArray as PM
155import qualified Data.Primitive.PrimArray as PM
150import qualified Data.Primitive.PrimArray as PM
153+#ifndef HAS_COERCIBLE
154+#define HAS_COERCIBLE (__GLASGOW_HASKELL__ >= 707)
159import Data.Coerce (Coercible, coerce)
158import Data.Coerce (Coercible, coerce)
159+coerce' :: Coercible a b => a -> b
163+coerce' = unsafeCoerce
161parseIndexedJSON :: (Value -> Parser a) -> Int -> Value -> Parser a
166parseIndexedJSON :: (Value -> Parser a) -> Int -> Value -> Parser a
162parseIndexedJSON p idx value = p value <?> Index idx
167parseIndexedJSON p idx value = p value <?> Index idx
@@ -165,7 +170,7 @@ parseIndexedJSON p idx value = p value <?> Index idx
165parseIndexedJSONPair :: (Value -> Parser a) -> (Value -> Parser b) -> Int -> Value -> Parser (a, b)
170parseIndexedJSONPair :: (Value -> Parser a) -> (Value -> Parser b) -> Int -> Value -> Parser (a, b)
166parseIndexedJSONPair keyParser valParser idx value = p value <?> Index idx
171parseIndexedJSONPair keyParser valParser idx value = p value <?> Index idx
168− p = withArray "(k, v)" $ \ab ->
173+ p = withArray "(k,v)" $ \ab ->
169 let n = V.length ab
174 let n = V.length ab
170 in if n == 2
175 in if n == 2
171 then (,) <$> parseJSONElemAtIndex keyParser 0 ab
176 then (,) <$> parseJSONElemAtIndex keyParser 0 ab
@@ -178,33 +183,33 @@ parseJSONElemAtIndex :: (Value -> Parser a) -> Int -> V.Vector Value -> Parser a
178parseJSONElemAtIndex p idx ary = p (V.unsafeIndex ary idx) <?> Index idx
183parseJSONElemAtIndex p idx ary = p (V.unsafeIndex ary idx) <?> Index idx
180parseRealFloat :: RealFloat a => String -> Value -> Parser a
185parseRealFloat :: RealFloat a => String -> Value -> Parser a
181−parseRealFloat _ (Number s) = pure $ Scientific.toRealFloat s
186+parseRealFloat _ (Number s) = pure $ Scientific.toRealFloat s
182−parseRealFloat _ Null = pure (0/0)
187+parseRealFloat _ Null = pure (0/0)
183−parseRealFloat name v = prependContext name (unexpected v)
188+parseRealFloat expected v = typeMismatch expected v
184{-# INLINE parseRealFloat #-}
189{-# INLINE parseRealFloat #-}
186−parseIntegralFromScientific :: forall a. Integral a => Scientific -> Parser a
191+parseIntegralFromScientific :: forall a. Integral a => String -> Scientific -> Parser a
187−parseIntegralFromScientific s =
192+parseIntegralFromScientific expected s =
188 case Scientific.floatingOrInteger s :: Either Double a of
193 case Scientific.floatingOrInteger s :: Either Double a of
189 Right x -> pure x
194 Right x -> pure x
190− Left _ -> fail $ "unexpected floating number " ++ show s
195+ Left _ -> fail $ "expected " ++ expected ++ ", encountered floating number " ++ show s
191{-# INLINE parseIntegralFromScientific #-}
196{-# INLINE parseIntegralFromScientific #-}
193parseIntegral :: Integral a => String -> Value -> Parser a
198parseIntegral :: Integral a => String -> Value -> Parser a
194−parseIntegral name =
199+parseIntegral expected =
195− prependContext name . withBoundedScientific' parseIntegralFromScientific
200+ withBoundedScientific expected $ parseIntegralFromScientific expected
196{-# INLINE parseIntegral #-}
201{-# INLINE parseIntegral #-}
198−parseBoundedIntegralFromScientific :: (Bounded a, Integral a) => Scientific -> Parser a
203+parseBoundedIntegralFromScientific :: (Bounded a, Integral a) => String -> Scientific -> Parser a
199−parseBoundedIntegralFromScientific s = maybe
204+parseBoundedIntegralFromScientific expected s = maybe
200− (fail $ "value is either floating or will cause over or underflow " ++ show s)
205+ (fail $ expected ++ " is either floating or will cause over or underflow: " ++ show s)
202 (Scientific.toBoundedInteger s)
207 (Scientific.toBoundedInteger s)
203{-# INLINE parseBoundedIntegralFromScientific #-}
208{-# INLINE parseBoundedIntegralFromScientific #-}
205parseBoundedIntegral :: (Bounded a, Integral a) => String -> Value -> Parser a
210parseBoundedIntegral :: (Bounded a, Integral a) => String -> Value -> Parser a
206−parseBoundedIntegral name =
211+parseBoundedIntegral expected =
207− prependContext name . withScientific' parseBoundedIntegralFromScientific
212+ withScientific expected $ parseBoundedIntegralFromScientific expected
208{-# INLINE parseBoundedIntegral #-}
213{-# INLINE parseBoundedIntegral #-}
210parseScientificText :: Text -> Parser Scientific
215parseScientificText :: Text -> Parser Scientific
@@ -214,20 +219,18 @@ parseScientificText
214 . T.encodeUtf8
219 . T.encodeUtf8
216parseIntegralText :: Integral a => String -> Text -> Parser a
221parseIntegralText :: Integral a => String -> Text -> Parser a
217−parseIntegralText name t =
222+parseIntegralText expected t
218− prependContext name $
219− parseScientificText t
223+ = parseScientificText t
220− >>= rejectLargeExponent
224+ >>= rejectLargeExponent
221− >>= parseIntegralFromScientific
225+ >>= parseIntegralFromScientific expected
223 rejectLargeExponent :: Scientific -> Parser Scientific
227 rejectLargeExponent :: Scientific -> Parser Scientific
224− rejectLargeExponent s = withBoundedScientific' pure (Number s)
228+ rejectLargeExponent s = withBoundedScientific expected pure (Number s)
225{-# INLINE parseIntegralText #-}
229{-# INLINE parseIntegralText #-}
227parseBoundedIntegralText :: (Bounded a, Integral a) => String -> Text -> Parser a
231parseBoundedIntegralText :: (Bounded a, Integral a) => String -> Text -> Parser a
228−parseBoundedIntegralText name t =
232+parseBoundedIntegralText expected t =
229− prependContext name $
230− parseScientificText t >>= parseBoundedIntegralFromScientific
233+ parseScientificText t >>= parseBoundedIntegralFromScientific expected
232parseOptionalFieldWith :: (Value -> Parser (Maybe a))
235parseOptionalFieldWith :: (Value -> Parser (Maybe a))
233 -> Object -> Text -> Parser (Maybe a)
236 -> Object -> Text -> Parser (Maybe a)
@@ -287,21 +290,14 @@ genericLiftParseJSON opts pj pjl = fmap to1 . gParseJSON opts (From1Args pj pjl)
288-- The basic ways to signal a failed conversion are as follows:
291-- The basic ways to signal a failed conversion are as follows:
290−-- * 'fail' yields a custom error message: it is the recommended way of
293+-- * 'empty' and 'mzero' work, but are terse and uninformative;
291−-- reporting a failure;
293−-- * 'Control.Applicative.empty' (or 'Control.Monad.mzero') is uninformative:
295+-- * '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
297+-- * 'typeMismatch' produces an informative message for cases when the
297−-- is not of the expected JSON type; 'unexpected' is an appropriate alternative
298+-- 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':
300+-- An example type and instance using 'typeMismatch':
307-- \-- Allow ourselves to write 'Text' literals.
303-- \-- Allow ourselves to write 'Text' literals.
@@ -315,15 +311,13 @@ genericLiftParseJSON opts pj pjl = fmap to1 . gParseJSON opts (From1Args pj pjl)
315-- '<*>' v '.:' \"y\"
311-- '<*>' v '.:' \"y\"
317-- \-- We do not expect a non-'Object' value here.
313-- \-- We do not expect a non-'Object' value here.
318−-- \-- We could use 'Control.Applicative.empty' to fail, but 'typeMismatch'
314+-- \-- We could use 'mzero' to fail, but 'typeMismatch'
319-- \-- gives a much more informative error message.
315-- \-- gives a much more informative error message.
320−-- 'parseJSON' invalid =
316+-- '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
319-- For this common case of only being concerned with a single
326−-- type of JSON value, the functions 'withObject', 'withScientific', etc.
320+-- type of JSON value, the functions 'withObject', 'withNumber', etc.
327-- are provided. Their use is to be preferred when possible, since
321-- are provided. Their use is to be preferred when possible, since
328-- they are more terse. Using 'withObject', we can rewrite the above instance
322-- they are more terse. Using 'withObject', we can rewrite the above instance
329-- (assuming the same language extension and data type) as:
323-- (assuming the same language extension and data type) as:
@@ -362,7 +356,7 @@ genericLiftParseJSON opts pj pjl = fmap to1 . gParseJSON opts (From1Args pj pjl)
364-- The default implementation will be equivalent to
358-- The default implementation will be equivalent to
365−-- @parseJSON = 'genericParseJSON' 'defaultOptions'@; if you need different
359+-- @parseJSON = 'genericParseJSON' 'defaultOptions'@; If you need different
366-- options, you can customize the generic decoding by defining:
360-- options, you can customize the generic decoding by defining:
@@ -380,11 +374,13 @@ class FromJSON a where
380 parseJSON = genericParseJSON defaultOptions
374 parseJSON = genericParseJSON defaultOptions
382 parseJSONList :: Value -> Parser [a]
376 parseJSONList :: Value -> Parser [a]
383− parseJSONList = withArray "[]" $ \a ->
377+ parseJSONList (Array a)
384− zipWithM (parseIndexedJSON parseJSON) [0..]
378+ = zipWithM (parseIndexedJSON parseJSON) [0..]
385 . V.toList
379 . V.toList
382+ parseJSONList v = typeMismatch "[a]" v
388-------------------------------------------------------------------------------
384-------------------------------------------------------------------------------
389-- Classes and types for map keys
385-- Classes and types for map keys
390-------------------------------------------------------------------------------
386-------------------------------------------------------------------------------
@@ -396,16 +392,6 @@ class FromJSON a where
396-- > newtype SomeId = SomeId { getSomeId :: Text }
392-- > newtype SomeId = SomeId { getSomeId :: Text }
397-- > deriving (Eq,Ord,Hashable,FromJSONKey)
393-- > 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
395class FromJSONKey a where
410 -- | Strategy for parsing the key of a map-like container.
396 -- | Strategy for parsing the key of a map-like container.
411 fromJSONKey :: FromJSONKeyFunction a
397 fromJSONKey :: FromJSONKeyFunction a
@@ -428,7 +414,11 @@ class FromJSONKey a where
428-- At the moment this type is intentionally not exported. 'FromJSONKeyFunction'
414-- At the moment this type is intentionally not exported. 'FromJSONKeyFunction'
429-- can be inspected, but cannot be constructed.
415-- can be inspected, but cannot be constructed.
430data CoerceText a where
416data CoerceText a where
431 CoerceText :: Coercible Text a => CoerceText a
418 CoerceText :: Coercible Text a => CoerceText a
420+ CoerceText :: CoerceText a
433-- | This type is related to 'ToJSONKeyFunction'. If 'FromJSONKeyValue' is used in the
423-- | This type is related to 'ToJSONKeyFunction'. If 'FromJSONKeyValue' is used in the
434-- 'FromJSONKey' instance, then 'ToJSONKeyValue' should be used in the 'ToJSONKey'
424-- 'FromJSONKey' instance, then 'ToJSONKeyValue' should be used in the 'ToJSONKey'
@@ -448,7 +438,7 @@ data FromJSONKeyFunction a
449-- | Only law abiding up to interpretation
439-- | Only law abiding up to interpretation
450instance Functor FromJSONKeyFunction where
440instance Functor FromJSONKeyFunction where
451− fmap h (FromJSONKeyCoerce CoerceText) = FromJSONKeyText (h . coerce)
441+ fmap h (FromJSONKeyCoerce CoerceText) = FromJSONKeyText (h . coerce')
452 fmap h (FromJSONKeyText f) = FromJSONKeyText (h . f)
442 fmap h (FromJSONKeyText f) = FromJSONKeyText (h . f)
453 fmap h (FromJSONKeyTextParser f) = FromJSONKeyTextParser (fmap h . f)
443 fmap h (FromJSONKeyTextParser f) = FromJSONKeyTextParser (fmap h . f)
454 fmap h (FromJSONKeyValue f) = FromJSONKeyValue (fmap h . f)
444 fmap h (FromJSONKeyValue f) = FromJSONKeyValue (fmap h . f)
@@ -462,7 +452,9 @@ instance Functor FromJSONKeyFunction where
463-- On pre GHC 7.8 this is unconstrainted function.
453-- On pre GHC 7.8 this is unconstrainted function.
464fromJSONKeyCoerce ::
454fromJSONKeyCoerce ::
465 Coercible Text a =>
456 Coercible Text a =>
466 FromJSONKeyFunction a
458 FromJSONKeyFunction a
467fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText
459fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText
@@ -470,91 +462,60 @@ fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText
471-- See note on 'fromJSONKeyCoerce'.
463-- See note on 'fromJSONKeyCoerce'.
472coerceFromJSONKeyFunction ::
464coerceFromJSONKeyFunction ::
473 Coercible a b =>
466 Coercible a b =>
474 FromJSONKeyFunction a -> FromJSONKeyFunction b
468 FromJSONKeyFunction a -> FromJSONKeyFunction b
475coerceFromJSONKeyFunction = coerce
470coerceFromJSONKeyFunction = coerce
472+coerceFromJSONKeyFunction (FromJSONKeyCoerce CoerceText) = FromJSONKeyCoerce CoerceText
473+coerceFromJSONKeyFunction (FromJSONKeyText f) = FromJSONKeyText (coerce' . f)
474+coerceFromJSONKeyFunction (FromJSONKeyTextParser f) = FromJSONKeyTextParser (fmap coerce' . f)
475+coerceFromJSONKeyFunction (FromJSONKeyValue f) = FromJSONKeyValue (fmap coerce' . f)
478 "FromJSONKeyCoerce: fmap id" forall (x :: FromJSONKeyFunction a).
479 "FromJSONKeyCoerce: fmap id" forall (x :: FromJSONKeyFunction a).
479 fmap id x = x
480 fmap id x = x
482 "FromJSONKeyCoerce: fmap coerce" forall x .
484 "FromJSONKeyCoerce: fmap coerce" forall x .
483 fmap coerce x = coerceFromJSONKeyFunction x
485 fmap coerce x = coerceFromJSONKeyFunction x
486-- | Same as 'fmap'. Provided for the consistency with 'ToJSONKeyFunction'.
489-- | Same as 'fmap'. Provided for the consistency with 'ToJSONKeyFunction'.
487mapFromJSONKeyFunction :: (a -> b) -> FromJSONKeyFunction a -> FromJSONKeyFunction b
490mapFromJSONKeyFunction :: (a -> b) -> FromJSONKeyFunction a -> FromJSONKeyFunction b
488mapFromJSONKeyFunction = fmap
491mapFromJSONKeyFunction = 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-------------------------------------------------------------------------------
493-------------------------------------------------------------------------------
520-- Functions needed for documentation
494-- Functions needed for documentation
521-------------------------------------------------------------------------------
495-------------------------------------------------------------------------------
523-- | Fail parsing due to a type mismatch, with a descriptive message.
497-- | Fail parsing due to a type mismatch, with a descriptive message.
525−-- The following wrappers should generally be prefered:
499+-- Example usage:
526−-- 'withObject', 'withArray', 'withText', 'withBool'.
528−-- ==== Error message example
530−-- > typeMismatch "Object" (String "oops")
501+-- @
531−-- > -- Error: "expected Object, but encountered String"
502+-- instance FromJSON Coord where
503+-- parseJSON ('Object' v) = {- type matches, life is good -}
504+-- parseJSON wat = 'typeMismatch' \"Coord\" wat
532−typeMismatch :: String -- ^ The name of the JSON type being parsed
506+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.
507 -> Value -- ^ The actual value encountered.
536 -> Parser a
508 -> Parser a
537typeMismatch expected actual =
509typeMismatch expected actual =
538− fail $ "expected " ++ expected ++ ", but encountered " ++ typeOf actual
510+ 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
512+ name = case actual of
552− Object _ -> "Object"
513+ Object _ -> "Object"
553− Array _ -> "Array"
514+ Array _ -> "Array"
554− String _ -> "String"
515+ String _ -> "String"
555− Number _ -> "Number"
516+ Number _ -> "Number"
556− Bool _ -> "Boolean"
517+ Bool _ -> "Boolean"
557− Null -> "Null"
518+ Null -> "Null"
559-------------------------------------------------------------------------------
520-------------------------------------------------------------------------------
560-- Lifings of FromJSON and ToJSON to unary and binary type constructors
521-- Lifings of FromJSON and ToJSON to unary and binary type constructors
@@ -635,8 +596,9 @@ class FromJSON2 f where
635 -> (Value -> Parser b)
596 -> (Value -> Parser b)
636 -> (Value -> Parser [b])
597 -> (Value -> Parser [b])
637 -> Value -> Parser [f a b]
598 -> Value -> Parser [f a b]
638− liftParseJSONList2 fa ga fb gb = withArray "[]" $ \vals ->
599+ liftParseJSONList2 fa ga fb gb v = case v of
639− fmap V.toList (V.mapM (liftParseJSON2 fa ga fb gb) vals)
600+ Array vals -> fmap V.toList (V.mapM (liftParseJSON2 fa ga fb gb) vals)
601+ _ -> typeMismatch "[a]" v
641-- | Lift the standard 'parseJSON' function through the type constructor.
603-- | Lift the standard 'parseJSON' function through the type constructor.
642parseJSON2 :: (FromJSON2 f, FromJSON a, FromJSON b) => Value -> Parser (f a b)
604parseJSON2 :: (FromJSON2 f, FromJSON a, FromJSON b) => Value -> Parser (f a b)
@@ -650,7 +612,7 @@ parseJSON2 = liftParseJSON2 parseJSON parseJSONList parseJSON parseJSONList
650-- | Helper function to use with 'liftParseJSON'. See 'Data.Aeson.ToJSON.listEncoding'.
612-- | Helper function to use with 'liftParseJSON'. See 'Data.Aeson.ToJSON.listEncoding'.
651listParser :: (Value -> Parser a) -> Value -> Parser [a]
613listParser :: (Value -> Parser a) -> Value -> Parser [a]
652listParser f (Array xs) = fmap V.toList (V.mapM f xs)
614listParser f (Array xs) = fmap V.toList (V.mapM f xs)
653−listParser _ v = typeMismatch "Array" v
615+listParser _ v = typeMismatch "[a]" v
654{-# INLINE listParser #-}
616{-# INLINE listParser #-}
656-------------------------------------------------------------------------------
618-------------------------------------------------------------------------------
@@ -668,137 +630,69 @@ instance (FromJSON a) => FromJSON [a] where
668-- Functions
630-- Functions
669-------------------------------------------------------------------------------
631-------------------------------------------------------------------------------
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@
633+-- | @'withObject' expected f value@ applies @f@ to the 'Object' when @value@
680−-- is an 'Data.Aeson.Object' and fails otherwise.
634+-- is an 'Object' 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
635withObject :: String -> (Object -> Parser a) -> Value -> Parser a
687−withObject _ f (Object obj) = f obj
636+withObject _ f (Object obj) = f obj
688−withObject name _ v = prependContext name (typeMismatch "Object" v)
637+withObject expected _ v = typeMismatch expected v
689{-# INLINE withObject #-}
638{-# INLINE withObject #-}
691−-- | @'withText' name f value@ applies @f@ to the 'Text' when @value@ is a
640+-- | @'withText' expected f value@ applies @f@ to the 'Text' when @value@ is a
692−-- 'Data.Aeson.String' and fails otherwise.
641+-- 'String' 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
642withText :: String -> (Text -> Parser a) -> Value -> Parser a
699−withText _ f (String txt) = f txt
643+withText _ f (String txt) = f txt
700−withText name _ v = prependContext name (typeMismatch "String" v)
644+withText expected _ v = typeMismatch expected v
701{-# INLINE withText #-}
645{-# INLINE withText #-}
703-- | @'withArray' expected f value@ applies @f@ to the 'Array' when @value@ is
647-- | @'withArray' expected f value@ applies @f@ to the 'Array' when @value@ is
704−-- an 'Data.Aeson.Array' and fails otherwise.
648+-- an 'Array' 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
649withArray :: String -> (Array -> Parser a) -> Value -> Parser a
711−withArray _ f (Array arr) = f arr
650+withArray _ f (Array arr) = f arr
712−withArray name _ v = prependContext name (typeMismatch "Array" v)
651+withArray expected _ v = typeMismatch expected v
713{-# INLINE withArray #-}
652{-# INLINE withArray #-}
715−-- | @'withScientific' name f value@ applies @f@ to the 'Scientific' number
654+-- | @'withScientific' expected f value@ applies @f@ to the 'Scientific' number
716−-- when @value@ is a 'Data.Aeson.Number' and fails using 'typeMismatch'
655+-- when @value@ is a 'Number' and fails using @'typeMismatch' expected@
717-- otherwise.
656-- otherwise.
719-- /Warning/: If you are converting from a scientific to an unbounded
658-- /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
659-- type such as 'Integer' you may want to add a restriction on the
721-- size of the exponent (see 'withBoundedScientific') to prevent
660-- size of the exponent (see 'withBoundedScientific') to prevent
722-- malicious input from filling up the memory of the target system.
661-- 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
662withScientific :: String -> (Scientific -> Parser a) -> Value -> Parser a
729−withScientific _ f (Number scientific) = f scientific
663+withScientific _ f (Number scientific) = f scientific
730−withScientific name _ v = prependContext name (typeMismatch "Number" v)
664+withScientific expected _ v = typeMismatch expected v
731{-# INLINE withScientific #-}
665{-# INLINE withScientific #-}
733−-- | A variant of 'withScientific' which doesn't use 'prependContext', so that
667+-- | @'withBoundedScientific' expected f value@ applies @f@ to the 'Scientific' number
734−-- such context can be added separately in a way that also applies when the
668+-- when @value@ is a 'Number' and fails using @'typeMismatch' expected@
735−-- continuation @f :: Scientific -> Parser a@ fails.
669+-- otherwise.
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")
671+-- The conversion will also fail with a @'typeMismatch' if the
745−-- > -- Error: "unexpected String"
672+-- 'Scientific' exponent is larger than 1024.
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.
757withBoundedScientific :: String -> (Scientific -> Parser a) -> Value -> Parser a
673withBoundedScientific :: String -> (Scientific -> Parser a) -> Value -> Parser a
758−withBoundedScientific name f v = withBoundedScientific_ (prependContext name) f v
674+withBoundedScientific _ f v@(Number scientific) =
759−{-# INLINE withBoundedScientific #-}
675+ if base10Exponent scientific > 1024
760−
676+ then typeMismatch "a number with exponent <= 1024" v
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)
774 else f scientific
677 else f scientific
775− where
678+withBoundedScientific expected _ v = typeMismatch expected v
776− exp10 = base10Exponent scientific
679+{-# INLINE withBoundedScientific #-}
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
681-- | @'withBool' expected f value@ applies @f@ to the 'Bool' when @value@ is a
783−-- 'Boolean' and fails otherwise.
682+-- 'Bool' 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
683withBool :: String -> (Bool -> Parser a) -> Value -> Parser a
790−withBool _ f (Bool arr) = f arr
684+withBool _ f (Bool arr) = f arr
791−withBool name _ v = prependContext name (typeMismatch "Boolean" v)
685+withBool expected _ v = typeMismatch expected v
792{-# INLINE withBool #-}
686{-# INLINE withBool #-}
794-- | Decode a nested JSON-encoded string.
688-- | Decode a nested JSON-encoded string.
795withEmbeddedJSON :: String -> (Value -> Parser a) -> Value -> Parser a
689withEmbeddedJSON :: String -> (Value -> Parser a) -> Value -> Parser a
796withEmbeddedJSON _ innerParser (String txt) =
690withEmbeddedJSON _ innerParser (String txt) =
797− either fail innerParser $ eitherDecode (L.fromStrict $ T.encodeUtf8 txt)
691+ either fail innerParser $ eitherDecode (Compat.fromStrict $ T.encodeUtf8 txt)
799 eitherDecode = eitherFormatError . eitherDecodeWith jsonEOF ifromJSON
693 eitherDecode = eitherFormatError . eitherDecodeWith jsonEOF ifromJSON
800 eitherFormatError = either (Left . uncurry formatError) Right
694 eitherFormatError = either (Left . uncurry formatError) Right
801−withEmbeddedJSON name _ v = prependContext name (typeMismatch "String" v)
695+withEmbeddedJSON name _ v = typeMismatch name v
802{-# INLINE withEmbeddedJSON #-}
696{-# INLINE withEmbeddedJSON #-}
804-- | Convert a value from JSON, failing if the types do not match.
698-- | Convert a value from JSON, failing if the types do not match.
@@ -863,7 +757,7 @@ parseFieldMaybe' = (.:!)
863-- E.g. @'explicitParseField' 'parseJSON1' :: ('FromJSON1' f, 'FromJSON' a) -> 'Object' -> 'Text' -> 'Parser' (f a)@
757-- E.g. @'explicitParseField' 'parseJSON1' :: ('FromJSON1' f, 'FromJSON' a) -> 'Object' -> 'Text' -> 'Parser' (f a)@
864explicitParseField :: (Value -> Parser a) -> Object -> Text -> Parser a
758explicitParseField :: (Value -> Parser a) -> Object -> Text -> Parser a
865explicitParseField p obj key = case H.lookup key obj of
759explicitParseField p obj key = case H.lookup key obj of
866− Nothing -> fail $ "key " ++ show key ++ " not found"
760+ Nothing -> fail $ "key " ++ show key ++ " not present"
867 Just v -> p v <?> Key key
761 Just v -> p v <?> Key key
868{-# INLINE explicitParseField #-}
762{-# INLINE explicitParseField #-}
@@ -913,37 +807,6 @@ instance OVERLAPPABLE_ (GFromJSON arity a) => GFromJSON arity (M1 i c a) where
913 -- parsed value:
807 -- parsed value:
914 gParseJSON opts fargs = fmap M1 . gParseJSON opts fargs
808 gParseJSON opts fargs = fmap M1 . gParseJSON opts fargs
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
810instance (FromJSON a) => GFromJSON arity (K1 i a) where
948 -- Constant values are decoded using their FromJSON instance:
811 -- Constant values are decoded using their FromJSON instance:
949 gParseJSON _opts _ = fmap K1 . parseJSON
812 gParseJSON _opts _ = fmap K1 . parseJSON
@@ -958,499 +821,342 @@ instance (FromJSON1 f) => GFromJSON One (Rec1 f) where
958 -- FromJSON1 instance:
821 -- FromJSON1 instance:
959 gParseJSON _opts (From1Args pj pjl) = fmap Rec1 . liftParseJSON pj pjl
822 gParseJSON _opts (From1Args pj pjl) = fmap Rec1 . liftParseJSON pj pjl
961−instance (FromJSON1 f, GFromJSON One g) => GFromJSON One (f :.: g) where
824+instance GFromJSON arity U1 where
962− -- If an occurrence of the last type parameter is nested inside two
825+ -- Empty constructors are expected to be encoded as an empty array:
963− -- composed types, it is decoded by using the outermost type's FromJSON1
964− -- instance to generically decode the innermost type:
965− gParseJSON opts fargs =
826+ gParseJSON _opts _ v
966− let gpj = gParseJSON opts fargs in
827+ | isEmptyArray v = pure U1
967− fmap Comp1 . liftParseJSON gpj (listParser gpj)
828+ | otherwise = typeMismatch "unit constructor (U1)" v
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.
987instance ( ConsFromJSON arity a
830instance ( ConsFromJSON arity a
988 , AllNullary (C1 c a) allNullary
831 , AllNullary (C1 c a) allNullary
989 , ParseSum arity (C1 c a) allNullary
832 , ParseSum arity (C1 c a) allNullary
991− ) => GFromJSON' arity (C1 c a) where
833+ ) => GFromJSON arity (D1 d (C1 c a)) where
992 -- The option 'tagSingleConstructors' determines whether to wrap
834 -- The option 'tagSingleConstructors' determines whether to wrap
993 -- a single-constructor type.
835 -- a single-constructor type.
994− gParseJSON' p@(_ :* opts :* _)
836+ gParseJSON opts fargs
995 | tagSingleConstructors opts
837 | tagSingleConstructors opts
996− = (unTagged :: Tagged allNullary (Parser (C1 c a p)) -> Parser (C1 c a p))
839+ . (unTagged :: Tagged allNullary (Parser (C1 c a p)) -> Parser (C1 c a p))
997− . parseSum p
840+ . parseSum opts fargs
998− | otherwise = fmap M1 . consParseJSON (cname :* p)
841+ | otherwise = fmap M1 . fmap M1 . consParseJSON opts fargs
1000− cname = conName (undefined :: M1 _i c _f _p)
843+instance (ConsFromJSON arity a) => GFromJSON arity (C1 c a) where
1001−
844+ -- Constructors need to be decoded differently depending on whether they're
1002−-- | Multiple constructors.
845+ -- a record or not. This distinction is made by consParseJSON:
846+ gParseJSON opts fargs = fmap M1 . consParseJSON opts fargs
848+instance ( FromProduct arity a, FromProduct arity b
849+ , ProductSize a, ProductSize b
850+ ) => GFromJSON arity (a :*: b) where
851+ -- Products are expected to be encoded to an array. Here we check whether we
852+ -- got an array of the same size as the product, then parse each of the
853+ -- product's elements using parseProduct:
854+ gParseJSON opts fargs = withArray "product (:*:)" $ \arr ->
855+ let lenArray = V.length arr
856+ lenProduct = (unTagged2 :: Tagged2 (a :*: b) Int -> Int)
858+ if lenArray == lenProduct
859+ then parseProduct opts fargs arr 0 lenProduct
860+ else fail $ "When expecting a product of " ++ show lenProduct ++
861+ " values, encountered an Array of " ++ show lenArray ++
1003−instance ( AllNullary (a :+: b) allNullary
864+instance ( AllNullary (a :+: b) allNullary
1004− , ParseSum arity (a :+: b) allNullary
865+ , ParseSum arity (a :+: b) allNullary
1005− ) => GFromJSON' arity (a :+: b) where
866+ ) => GFromJSON arity (a :+: b) where
1006 -- If all constructors of a sum datatype are nullary and the
867 -- If all constructors of a sum datatype are nullary and the
1007 -- 'allNullaryToStringTag' option is set they are expected to be
868 -- 'allNullaryToStringTag' option is set they are expected to be
1008 -- encoded as strings. This distinction is made by 'parseSum':
869 -- encoded as strings. This distinction is made by 'parseSum':
1009− gParseJSON' p =
870+ gParseJSON opts fargs =
1010− (unTagged :: Tagged allNullary (Parser ((a :+: b) _d)) ->
871+ (unTagged :: Tagged allNullary (Parser ((a :+: b) d)) ->
1011− Parser ((a :+: b) _d))
872+ Parser ((a :+: b) d))
1012− . parseSum p
873+ . parseSum opts fargs
875+instance (FromJSON1 f, GFromJSON One g) => GFromJSON One (f :.: g) where
876+ -- If an occurrence of the last type parameter is nested inside two
877+ -- composed types, it is decoded by using the outermost type's FromJSON1
878+ -- instance to generically decode the innermost type:
879+ gParseJSON opts fargs =
880+ let gpj = gParseJSON opts fargs in
881+ fmap Comp1 . liftParseJSON gpj (listParser gpj)
1014--------------------------------------------------------------------------------
883--------------------------------------------------------------------------------
1016class ParseSum arity f allNullary where
885class ParseSum arity f allNullary where
1017− parseSum :: TypeName :* Options :* FromArgs arity a
886+ parseSum :: Options -> FromArgs arity a
1019− -> Tagged allNullary (Parser (f a))
887+ -> Value -> Tagged allNullary (Parser (f a))
1021−instance ( ConstructorNames f
1022− , SumFromString f
889+instance ( SumFromString f
1023 , FromPair arity f
890 , FromPair arity f
1024 , FromTaggedObject arity f
891 , FromTaggedObject arity f
1025 , FromUntaggedValue arity f
892 , FromUntaggedValue arity f
1026 ) => ParseSum arity f True where
893 ) => ParseSum arity f True where
1027− parseSum p@(tname :* opts :* _)
894+ parseSum opts fargs
1028− | allNullaryToStringTag opts = Tagged . parseAllNullarySum tname opts
895+ | allNullaryToStringTag opts = Tagged . parseAllNullarySum opts
1029− | otherwise = Tagged . parseNonAllNullarySum p
896+ | otherwise = Tagged . parseNonAllNullarySum opts fargs
1031−instance ( ConstructorNames f
1032− , FromPair arity f
898+instance ( FromPair arity f
1033 , FromTaggedObject arity f
899 , FromTaggedObject arity f
1034 , FromUntaggedValue arity f
900 , FromUntaggedValue arity f
1035 ) => ParseSum arity f False where
901 ) => ParseSum arity f False where
1036− parseSum p = Tagged . parseNonAllNullarySum p
902+ parseSum opts fargs = Tagged . parseNonAllNullarySum opts fargs
1038--------------------------------------------------------------------------------
904--------------------------------------------------------------------------------
1040−parseAllNullarySum :: (SumFromString f, ConstructorNames f)
906+parseAllNullarySum :: SumFromString f => Options -> Value -> Parser (f a)
1041− => TypeName -> Options -> Value -> Parser (f a)
1042−parseAllNullarySum tname opts =
907+parseAllNullarySum opts = withText "Text" $ \key ->
1043− withText tname $ \tag ->
1044− maybe (badTag tag) return $
908+ maybe (notFound key) return $
1045− parseSumFromString modifier tag
909+ 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
911class SumFromString f where
1064− parseSumFromString :: (String -> String) -> Text -> Maybe (f a)
912+ parseSumFromString :: Options -> Text -> Maybe (f a)
1066instance (SumFromString a, SumFromString b) => SumFromString (a :+: b) where
914instance (SumFromString a, SumFromString b) => SumFromString (a :+: b) where
1067 parseSumFromString opts key = (L1 <$> parseSumFromString opts key) <|>
915 parseSumFromString opts key = (L1 <$> parseSumFromString opts key) <|>
1068 (R1 <$> parseSumFromString opts key)
916 (R1 <$> parseSumFromString opts key)
1070instance (Constructor c) => SumFromString (C1 c U1) where
918instance (Constructor c) => SumFromString (C1 c U1) where
1071− parseSumFromString modifier key
919+ parseSumFromString opts key | key == name = Just $ M1 U1
1072− | key == name = Just $ M1 U1
1073− | otherwise = Nothing
920+ | otherwise = Nothing
1075− name = pack $ modifier $ conName (undefined :: M1 _i c _f _p)
922+ 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)
923+ 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--------------------------------------------------------------------------------
925--------------------------------------------------------------------------------
1113−parseNonAllNullarySum :: forall f c arity.
927+parseNonAllNullarySum :: ( FromPair arity f
1115 , FromTaggedObject arity f
928 , FromTaggedObject arity f
1116 , FromUntaggedValue arity f
929 , FromUntaggedValue arity f
1117− , ConstructorNames f
1118− ) => TypeName :* Options :* FromArgs arity c
930+ ) => Options -> FromArgs arity c
1119 -> Value -> Parser (f c)
931 -> Value -> Parser (f c)
1120−parseNonAllNullarySum p@(tname :* opts :* _) =
932+parseNonAllNullarySum opts fargs =
1121 case sumEncoding opts of
933 case sumEncoding opts of
1122 TaggedObject{..} ->
934 TaggedObject{..} ->
1123− withObject tname $ \obj -> do
935+ 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
936+ tag <- obj .: pack tagFieldName
1129− badTag tag = failWith_ $ \cnames ->
937+ fromMaybe (notFound tag) $
1130− "expected tag field to be one of " ++ show cnames ++
938+ parseFromTaggedObject opts fargs contentsFieldName obj tag
1131− ", but found tag " ++ show tag
1132− cnames_ = unTagged2 (constructorTags (constructorTagModifier opts) :: Tagged2 f [String])
1134 ObjectWithSingleField ->
940 ObjectWithSingleField ->
941+ withObject "Object" $ \obj ->
1135− withObject tname $ \obj -> case H.toList obj of
942+ case H.toList obj of
1136− [(tag, v)] -> maybe (badTag tag) (<?> Key tag) $
943+ [pair@(tag, _)] -> fromMaybe (notFound tag) $
1137− parsePair (tag :* p) v
944+ parsePair opts fargs pair
1138− _ -> contextType tname . fail $
945+ _ -> 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 ->
947 TwoElemArray ->
1147− withArray tname $ \arr -> case V.length arr of
948+ withArray "Array" $ \arr ->
949+ if V.length arr == 2
1148− 2 | String tag <- V.unsafeIndex arr 0 ->
950+ then case V.unsafeIndex arr 0 of
1149− maybe (badTag tag <?> Index 0) (<?> Index 1) $
951+ String tag -> fromMaybe (notFound tag) $
1150− parsePair (tag :* p) (V.unsafeIndex arr 1)
952+ parsePair opts fargs (tag, V.unsafeIndex arr 1)
1152− contextType tname $
1153− fail "tag element is not a String" <?> Index 0
953+ _ -> fail "First element is not a String"
1154− len -> contextType tname . fail $
954+ 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
956+ UntaggedValue -> parseUntaggedValue opts fargs
1164− failWith_ = failWithCTags tname (constructorTagModifier opts)
1166--------------------------------------------------------------------------------
958--------------------------------------------------------------------------------
1168class FromTaggedObject arity f where
960class 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
961+ parseFromTaggedObject :: Options -> FromArgs arity a
1172− :: Text :* String :* TypeName :* Options :* FromArgs arity a
1173− -> Object
962+ -> String -> Object
1174− -> Maybe (Parser (f a))
963+ -> Text -> Maybe (Parser (f a))
1176instance ( FromTaggedObject arity a, FromTaggedObject arity b) =>
965instance ( FromTaggedObject arity a, FromTaggedObject arity b) =>
1177 FromTaggedObject arity (a :+: b) where
966 FromTaggedObject arity (a :+: b) where
1178− parseFromTaggedObject p obj =
967+ parseFromTaggedObject opts fargs contentsFieldName obj tag =
1179− (fmap L1 <$> parseFromTaggedObject p obj) <|>
968+ (fmap L1 <$> parseFromTaggedObject opts fargs contentsFieldName obj tag) <|>
1180− (fmap R1 <$> parseFromTaggedObject p obj)
969+ (fmap R1 <$> parseFromTaggedObject opts fargs contentsFieldName obj tag)
1182−instance ( IsRecord f isRecord
1183− , FromTaggedObject' arity f isRecord
971+instance ( FromTaggedObject' arity f
1184 , Constructor c
972 , Constructor c
1185 ) => FromTaggedObject arity (C1 c f) where
973 ) => FromTaggedObject arity (C1 c f) where
1186− parseFromTaggedObject (tag :* contentsFieldName :* p@(_ :* opts :* _))
974+ parseFromTaggedObject opts fargs contentsFieldName obj tag
1189− (unTagged :: Tagged isRecord (Parser (f a)) -> Parser (f a)) .
1190− parseFromTaggedObject' (contentsFieldName :* cname :* p)
975+ | tag == name = Just $ M1 <$> parseFromTaggedObject'
976+ opts fargs contentsFieldName obj
1191− | otherwise = const Nothing
977+ | otherwise = Nothing
1193− tag' = pack $ constructorTagModifier opts cname
979+ name = pack $ constructorTagModifier opts $
1194− cname = conName (undefined :: M1 _i c _f _p)
980+ conName (undefined :: t c f p)
1196--------------------------------------------------------------------------------
982--------------------------------------------------------------------------------
1198−class FromTaggedObject' arity f isRecord where
984+class FromTaggedObject' arity f where
1199− -- The first component of the parameter tuple is the contents field name.
985+ parseFromTaggedObject' :: Options -> FromArgs arity a -> String
1200− parseFromTaggedObject'
986+ -> Object -> Parser (f a)
988+class FromTaggedObject'' arity f isRecord where
1201− :: String :* ConName :* TypeName :* Options :* FromArgs arity a
989+ parseFromTaggedObject'' :: Options -> FromArgs arity a -> String
1202− -> Object -> Tagged isRecord (Parser (f a))
990+ -> Object -> Tagged isRecord (Parser (f a))
992+instance ( IsRecord f isRecord
993+ , FromTaggedObject'' arity f isRecord
1204−instance (RecordFromJSON arity f, FieldNames f) => FromTaggedObject' arity f True where
994+ ) => FromTaggedObject' arity f where
1205− -- Records are unpacked in the tagged object
995+ parseFromTaggedObject' opts fargs contentsFieldName =
996+ (unTagged :: Tagged isRecord (Parser (f a)) -> Parser (f a)) .
1206− parseFromTaggedObject' (_ :* p) = Tagged . recordParseJSON (True :* p)
997+ parseFromTaggedObject'' opts fargs contentsFieldName
999+instance (FromRecord arity f) => FromTaggedObject'' arity f True where
1000+ parseFromTaggedObject'' opts fargs _ =
1001+ Tagged . parseRecord opts fargs
1208−instance (ConsFromJSON arity f) => FromTaggedObject' arity f False where
1003+instance (GFromJSON arity f) => FromTaggedObject'' arity f False where
1209− -- Nonnullary nonrecords are encoded in the contents field
1210− parseFromTaggedObject' p obj = Tagged $ do
1004+ parseFromTaggedObject'' opts fargs contentsFieldName = Tagged .
1211− contents <- contextCons cname tname (obj .: key)
1212− consParseJSON p' contents <?> Key key
1214− key = pack contentsFieldName
1005+ (gParseJSON opts fargs <=< (.: pack contentsFieldName))
1215− contentsFieldName :* p'@(cname :* tname :* _) = p
1217−instance OVERLAPPING_ FromTaggedObject' arity U1 False where
1007+instance OVERLAPPING_ FromTaggedObject'' arity U1 False where
1218− -- Nullary constructors don't need a contents field
1219− parseFromTaggedObject' _ _ = Tagged (pure U1)
1008+ parseFromTaggedObject'' _ _ _ _ = Tagged (pure U1)
1221--------------------------------------------------------------------------------
1010--------------------------------------------------------------------------------
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
1012class ConsFromJSON arity f where
1227− :: ConName :* TypeName :* Options :* FromArgs arity a
1013+ consParseJSON :: Options -> FromArgs arity a
1228− -> Value -> Parser (f a)
1014+ -> Value -> Parser (f a)
1230class ConsFromJSON' arity f isRecord where
1016class ConsFromJSON' arity f isRecord where
1232− :: ConName :* TypeName :* Options :* FromArgs arity a
1017+ consParseJSON' :: Options -> FromArgs arity a
1233− -> Value -> Tagged isRecord (Parser (f a))
1018+ -> Value -> Tagged isRecord (Parser (f a))
1235instance ( IsRecord f isRecord
1020instance ( IsRecord f isRecord
1236 , ConsFromJSON' arity f isRecord
1021 , ConsFromJSON' arity f isRecord
1237 ) => ConsFromJSON arity f where
1022 ) => ConsFromJSON arity f where
1238− consParseJSON p =
1023+ consParseJSON opts fargs =
1239 (unTagged :: Tagged isRecord (Parser (f a)) -> Parser (f a))
1024 (unTagged :: Tagged isRecord (Parser (f a)) -> Parser (f a))
1240− . consParseJSON' p
1025+ . consParseJSON' opts fargs
1242instance OVERLAPPING_
1027instance OVERLAPPING_
1243− ( GFromJSON arity a, RecordFromJSON arity (S1 s a)
1028+ ( GFromJSON arity a, FromRecord arity (S1 s a)
1244 ) => ConsFromJSON' arity (S1 s a) True where
1029 ) => ConsFromJSON' arity (S1 s a) True where
1245− consParseJSON' p@(cname :* tname :* opts :* fargs)
1030+ consParseJSON' opts fargs
1246− | unwrapUnaryRecords opts = Tagged . fmap M1 . gParseJSON opts fargs
1031+ | unwrapUnaryRecords opts = Tagged . gParseJSON opts fargs
1247− | otherwise = Tagged . withObject (showCons cname tname) (recordParseJSON (False :* p))
1032+ | otherwise = Tagged . withObject "unary record" (parseRecord opts fargs)
1249−instance RecordFromJSON arity f => ConsFromJSON' arity f True where
1034+instance FromRecord arity f => ConsFromJSON' arity f True where
1250− consParseJSON' p@(cname :* tname :* _) =
1035+ consParseJSON' opts fargs =
1251− Tagged . withObject (showCons cname tname) (recordParseJSON (False :* p))
1036+ Tagged . withObject "record (:*:)" (parseRecord opts fargs)
1253−instance OVERLAPPING_
1254− ConsFromJSON' arity U1 False where
1255− -- Empty constructors are expected to be encoded as an empty array:
1256− consParseJSON' (cname :* tname :* _) v =
1257− Tagged . contextCons cname tname $ case v of
1258− Array a | V.null a -> pure U1
1259− | otherwise -> fail_ a
1260− _ -> typeMismatch "Array" v
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
1038+instance GFromJSON arity f => ConsFromJSON' arity f False where
1268− consParseJSON' (_ :* _ :* opts :* fargs) =
1039+ consParseJSON' opts fargs = Tagged . gParseJSON opts fargs
1269− Tagged . fmap M1 . gParseJSON opts fargs
1271−instance (ProductFromJSON arity f, ProductSize f
1272− ) => ConsFromJSON' arity f False where
1273− consParseJSON' p = Tagged . productParseJSON0 p
1275--------------------------------------------------------------------------------
1041--------------------------------------------------------------------------------
1277−class FieldNames f where
1043+class FromRecord arity f where
1278− fieldNames :: f a -> [Text] -> [Text]
1044+ parseRecord :: Options -> FromArgs arity a
1279−
1045+ -> Object -> Parser (f a)
1280−instance (FieldNames a, FieldNames b) => FieldNames (a :*: b) where
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
1047+instance ( FromRecord arity a
1289− recordParseJSON
1048+ , FromRecord arity b
1290− :: Bool :* ConName :* TypeName :* Options :* FromArgs arity a
1291− -> Object -> Parser (f a)
1293−instance ( FieldNames f
1294− , RecordFromJSON' arity f
1295− ) => RecordFromJSON arity f where
1296− recordParseJSON (fromTaggedSum :* p@(cname :* tname :* opts :* _)) =
1297− \obj -> checkUnknown obj >> recordParseJSON' p obj
1299− knownFields :: H.HashMap Text ()
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
1049+ ) => FromRecord arity (a :*: b) where
1319− recordParseJSON' p obj =
1050+ parseRecord opts fargs obj =
1320− (:*:) <$> recordParseJSON' p obj
1051+ (:*:) <$> parseRecord opts fargs obj
1321− <*> recordParseJSON' p obj
1052+ <*> parseRecord opts fargs obj
1323instance OVERLAPPABLE_ (Selector s, GFromJSON arity a) =>
1054instance OVERLAPPABLE_ (Selector s, GFromJSON arity a) =>
1324− RecordFromJSON' arity (S1 s a) where
1055+ FromRecord arity (S1 s a) where
1325− recordParseJSON' (cname :* tname :* opts :* fargs) obj = do
1056+ parseRecord opts fargs =
1326− fv <- contextCons cname tname (obj .: label)
1057+ (<?> Key label) . gParseJSON opts fargs <=< (.: label)
1327− M1 <$> gParseJSON opts fargs fv <?> Key label
1329− label = pack $ fieldLabelModifier opts sname
1059+ label = pack . fieldLabelModifier opts $ selName (undefined :: t s a p)
1330− sname = selName (undefined :: M1 _i s _f _p)
1332instance INCOHERENT_ (Selector s, FromJSON a) =>
1061instance INCOHERENT_ (Selector s, FromJSON a) =>
1333− RecordFromJSON' arity (S1 s (K1 i (Maybe a))) where
1062+ FromRecord arity (S1 s (K1 i (Maybe a))) where
1334− recordParseJSON' (_ :* _ :* opts :* _) obj = M1 . K1 <$> obj .:? pack label
1063+ parseRecord opts _ obj = M1 . K1 <$> obj .:? pack label
1336− label = fieldLabelModifier opts sname
1065+ label = fieldLabelModifier opts $
1337− sname = selName (undefined :: M1 _i s _f _p)
1066+ selName (undefined :: t s (K1 i (Maybe a)) p)
1339-- Parse an Option like a Maybe.
1068-- Parse an Option like a Maybe.
1340instance INCOHERENT_ (Selector s, FromJSON a) =>
1069instance INCOHERENT_ (Selector s, FromJSON a) =>
1341− RecordFromJSON' arity (S1 s (K1 i (Semigroup.Option a))) where
1070+ FromRecord arity (S1 s (K1 i (Semigroup.Option a))) where
1342− recordParseJSON' p obj = wrap <$> recordParseJSON' p obj
1071+ parseRecord opts fargs obj = wrap <$> parseRecord opts fargs obj
1344 wrap :: S1 s (K1 i (Maybe a)) p -> S1 s (K1 i (Semigroup.Option a)) p
1073 wrap :: S1 s (K1 i (Maybe a)) p -> S1 s (K1 i (Semigroup.Option a)) p
1345 wrap (M1 (K1 a)) = M1 (K1 (Semigroup.Option a))
1074 wrap (M1 (K1 a)) = M1 (K1 (Semigroup.Option a))
1347--------------------------------------------------------------------------------
1076--------------------------------------------------------------------------------
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
1078+class FromProduct arity f where
1370− productParseJSON :: ConName :* TypeName :* Options :* FromArgs arity a
1079+ parseProduct :: Options -> FromArgs arity a
1371 -> Array -> Int -> Int
1080 -> Array -> Int -> Int
1372 -> Parser (f a)
1081 -> Parser (f a)
1374−instance ( ProductFromJSON arity a
1083+instance ( FromProduct arity a
1375− , ProductFromJSON arity b
1084+ , FromProduct arity b
1376− ) => ProductFromJSON arity (a :*: b) where
1085+ ) => FromProduct arity (a :*: b) where
1377− productParseJSON p arr ix len =
1086+ parseProduct opts fargs arr ix len =
1378− (:*:) <$> productParseJSON p arr ix lenL
1087+ (:*:) <$> parseProduct opts fargs arr ix lenL
1379− <*> productParseJSON p arr ixR lenR
1088+ <*> parseProduct opts fargs arr ixR lenR
1381 lenL = len `unsafeShiftR` 1
1090 lenL = len `unsafeShiftR` 1
1382 ixR = ix + lenL
1091 ixR = ix + lenL
1383 lenR = len - lenL
1092 lenR = len - lenL
1385−instance (GFromJSON arity a) => ProductFromJSON arity (S1 s a) where
1094+instance (GFromJSON arity a) => FromProduct arity (S1 s a) where
1386− productParseJSON (_ :* _ :* opts :* fargs) arr ix _ =
1095+ parseProduct opts fargs arr ix _ =
1387− M1 <$> gParseJSON opts fargs (V.unsafeIndex arr ix) <?> Index ix
1096+ gParseJSON opts fargs $ V.unsafeIndex arr ix
1389--------------------------------------------------------------------------------
1098--------------------------------------------------------------------------------
1391class FromPair arity f where
1100class 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
1101+ parsePair :: Options -> FromArgs arity a
1395− -> Maybe (Parser (f a))
1102+ -> Pair -> Maybe (Parser (f a))
1397instance ( FromPair arity a
1104instance ( FromPair arity a
1398 , FromPair arity b
1105 , FromPair arity b
1399 ) => FromPair arity (a :+: b) where
1106 ) => FromPair arity (a :+: b) where
1401− (fmap L1 <$> parsePair p pair) <|>
1107+ parsePair opts fargs pair = (fmap L1 <$> parsePair opts fargs pair) <|>
1402− (fmap R1 <$> parsePair p pair)
1108+ (fmap R1 <$> parsePair opts fargs pair)
1404instance ( Constructor c
1110instance ( Constructor c
1111+ , GFromJSON arity a
1405 , ConsFromJSON arity a
1112 , ConsFromJSON arity a
1406 ) => FromPair arity (C1 c a) where
1113 ) => FromPair arity (C1 c a) where
1407− parsePair (tag :* p@(_ :* opts :* _)) v
1114+ parsePair opts fargs (tag, value)
1408− | tag == tag' = Just $ M1 <$> consParseJSON (cname :* p) v
1115+ | tag == tag' = Just $ gParseJSON opts fargs value
1409 | otherwise = Nothing
1116 | otherwise = Nothing
1411− tag' = pack $ constructorTagModifier opts cname
1118+ tag' = pack $ constructorTagModifier opts $
1412− cname = conName (undefined :: M1 _i c _a _p)
1119+ conName (undefined :: t c a p)
1414--------------------------------------------------------------------------------
1121--------------------------------------------------------------------------------
1416class FromUntaggedValue arity f where
1123class FromUntaggedValue arity f where
1417− parseUntaggedValue :: TypeName :* Options :* FromArgs arity a
1124+ parseUntaggedValue :: Options -> FromArgs arity a
1419− -> Parser (f a)
1125+ -> Value -> Parser (f a)
1422 ( FromUntaggedValue arity a
1128 ( FromUntaggedValue arity a
1423 , FromUntaggedValue arity b
1129 , FromUntaggedValue arity b
1424 ) => FromUntaggedValue arity (a :+: b)
1130 ) => FromUntaggedValue arity (a :+: b)
1426− parseUntaggedValue p value =
1132+ parseUntaggedValue opts fargs value =
1427− L1 <$> parseUntaggedValue p value <|>
1133+ L1 <$> parseUntaggedValue opts fargs value <|>
1428− R1 <$> parseUntaggedValue p value
1134+ R1 <$> parseUntaggedValue opts fargs value
1430instance OVERLAPPABLE_
1136instance OVERLAPPABLE_
1431− ( ConsFromJSON arity a
1137+ ( GFromJSON arity a
1432− , Constructor c
1138+ , ConsFromJSON arity a
1433 ) => FromUntaggedValue arity (C1 c a)
1139 ) => FromUntaggedValue arity (C1 c a)
1435− parseUntaggedValue p = fmap M1 . consParseJSON (cname :* p)
1141+ parseUntaggedValue = gParseJSON
1437− cname = conName (undefined :: M1 _i c _f _p)
1439instance OVERLAPPING_
1143instance OVERLAPPING_
1440 ( Constructor c )
1144 ( Constructor c )
1441 => FromUntaggedValue arity (C1 c U1)
1145 => FromUntaggedValue arity (C1 c U1)
1443− parseUntaggedValue (tname :* opts :* _) v =
1147+ parseUntaggedValue opts _ (String s)
1444− contextCons cname tname $ case v of
1148+ | s == pack (constructorTagModifier opts (conName (undefined :: t c U1 p))) =
1446− | tag == tag' -> pure $ M1 U1
1149+ pure $ M1 U1
1447− | otherwise -> fail_ tag
1150+ | otherwise =
1448− _ -> typeMismatch "String" v
1151+ fail $ "Invalid tag: " ++ unpack s
1449− where
1152+ parseUntaggedValue _ _ v = typeMismatch (conName (undefined :: t c U1 p)) v
1450− tag' = pack $ constructorTagModifier opts cname
1153+
1451− cname = conName (undefined :: M1 _i c _f _p)
1154+
1452− fail_ tag = fail $
1155+--------------------------------------------------------------------------------
1453− "expected tag " ++ show tag' ++ ", but found tag " ++ show tag
1156+
1157+notFound :: Text -> Parser a
1158+notFound key = fail $ "The key \"" ++ unpack key ++ "\" was not found"
1159+{-# INLINE notFound #-}
1455-------------------------------------------------------------------------------
1161-------------------------------------------------------------------------------
1456-- Instances
1162-- Instances
@@ -1513,15 +1219,14 @@ instance FromJSON Void where
1513 {-# INLINE parseJSON #-}
1219 {-# INLINE parseJSON #-}
1515instance FromJSON Bool where
1221instance FromJSON Bool where
1516− parseJSON (Bool b) = pure b
1222+ parseJSON = withBool "Bool" pure
1517− parseJSON v = typeMismatch "Bool" v
1518 {-# INLINE parseJSON #-}
1223 {-# INLINE parseJSON #-}
1520instance FromJSONKey Bool where
1225instance FromJSONKey Bool where
1521 fromJSONKey = FromJSONKeyTextParser $ \t -> case t of
1226 fromJSONKey = FromJSONKeyTextParser $ \t -> case t of
1522 "true" -> pure True
1227 "true" -> pure True
1523 "false" -> pure False
1228 "false" -> pure False
1524− _ -> fail $ "cannot parse key " ++ show t ++ " into Bool"
1229+ _ -> fail $ "Cannot parse key into Bool: " ++ T.unpack t
1526instance FromJSON Ordering where
1231instance FromJSON Ordering where
1527 parseJSON = withText "Ordering" $ \s ->
1232 parseJSON = withText "Ordering" $ \s ->
@@ -1529,30 +1234,25 @@ instance FromJSON Ordering where
1529 "LT" -> return LT
1234 "LT" -> return LT
1530 "EQ" -> return EQ
1235 "EQ" -> return EQ
1531 "GT" -> return GT
1236 "GT" -> return GT
1532− _ -> fail $ "parsing Ordering failed, unexpected " ++ show s ++
1533− " (expected \"LT\", \"EQ\", or \"GT\")"
1237+ _ -> fail "Parsing Ordering value failed: expected \"LT\", \"EQ\", or \"GT\""
1535instance FromJSON () where
1239instance FromJSON () where
1536 parseJSON = withArray "()" $ \v ->
1240 parseJSON = withArray "()" $ \v ->
1537 if V.null v
1241 if V.null v
1538 then pure ()
1242 then pure ()
1539− else prependContext "()" $ fail "expected an empty array"
1243+ else fail "Expected an empty array"
1540 {-# INLINE parseJSON #-}
1244 {-# INLINE parseJSON #-}
1542instance FromJSON Char where
1246instance FromJSON Char where
1543− parseJSON = withText "Char" parseChar
1247+ parseJSON = withText "Char" $ \t ->
1248+ if T.compareLength t 1 == EQ
1249+ then pure $ T.head t
1250+ else fail "Expected a string of length 1"
1544 {-# INLINE parseJSON #-}
1251 {-# INLINE parseJSON #-}
1546− parseJSONList (String s) = pure (T.unpack s)
1253+ parseJSONList = withText "String" $ pure . T.unpack
1547− parseJSONList v = typeMismatch "String" v
1548 {-# INLINE parseJSONList #-}
1254 {-# 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
1256instance FromJSON Double where
1557 parseJSON = parseRealFloat "Double"
1257 parseJSON = parseRealFloat "Double"
1558 {-# INLINE parseJSON #-}
1258 {-# INLINE parseJSON #-}
@@ -1576,22 +1276,12 @@ instance FromJSONKey Float where
1576 _ -> Scientific.toRealFloat <$> parseScientificText t
1276 _ -> Scientific.toRealFloat <$> parseScientificText t
1578instance (FromJSON a, Integral a) => FromJSON (Ratio a) where
1278instance (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
1279+ parseJSON = withObject "Rational" $ \obj -> do
1590− numerator <- obj .: "numerator"
1280+ numerator <- obj .: "numerator"
1591− denominator <- obj .: "denominator"
1281+ denominator <- obj .: "denominator"
1592− if denominator == 0
1282+ if denominator == 0
1593− then fail "Ratio denominator was 0"
1283+ then fail "Ratio denominator was 0"
1594− else pure $ numerator % denominator
1284+ else pure $ numerator % denominator
1595 {-# INLINE parseJSON #-}
1285 {-# INLINE parseJSON #-}
1597-- | This instance includes a bounds check to prevent maliciously
1287-- | This instance includes a bounds check to prevent maliciously
@@ -1599,7 +1289,7 @@ instance (FromJSON a, Integral a) => FromJSON (Ratio a) where
1599-- newtype 'Scientific' and provide your own instance using
1289-- newtype 'Scientific' and provide your own instance using
1600-- 'withScientific' if you want to allow larger inputs.
1290-- 'withScientific' if you want to allow larger inputs.
1601instance HasResolution a => FromJSON (Fixed a) where
1291instance HasResolution a => FromJSON (Fixed a) where
1602− parseJSON = prependContext "Fixed" . withBoundedScientific' (pure . realToFrac)
1292+ parseJSON = withBoundedScientific "Fixed" $ pure . realToFrac
1603 {-# INLINE parseJSON #-}
1293 {-# INLINE parseJSON #-}
1605instance FromJSON Int where
1295instance FromJSON Int where
@@ -1622,20 +1312,19 @@ instance FromJSONKey Integer where
1623instance FromJSON Natural where
1313instance FromJSON Natural where
1624 parseJSON value = do
1314 parseJSON value = do
1625− integer <- parseIntegral "Natural" value
1315+ integer :: Integer <- parseIntegral "Natural" value
1626− parseNatural integer
1316+ if integer < 0 then
1317+ fail $ "expected Natural, encountered negative number " <> show integer
1319+ pure $ fromIntegral integer
1628instance FromJSONKey Natural where
1321instance FromJSONKey Natural where
1629 fromJSONKey = FromJSONKeyTextParser $ \text -> do
1322 fromJSONKey = FromJSONKeyTextParser $ \text -> do
1630− integer <- parseIntegralText "Natural" text
1323+ integer :: Integer <- parseIntegralText "Natural" text
1631− parseNatural integer
1633−parseNatural :: Integer -> Parser Natural
1634−parseNatural integer =
1635− if integer < 0 then
1324+ if integer < 0 then
1636− fail $ "parsing Natural failed, unexpected negative number " <> show integer
1325+ fail $ "expected Natural, encountered negative number " <> show integer
1638− pure $ fromIntegral integer
1327+ pure $ fromIntegral integer
1640instance FromJSON Int8 where
1329instance FromJSON Int8 where
1641 parseJSON = parseBoundedIntegral "Int8"
1330 parseJSON = parseBoundedIntegral "Int8"
@@ -1732,17 +1421,17 @@ parseVersionText = go . readP_to_S parseVersion . unpack
1733 go [(v,[])] = return v
1422 go [(v,[])] = return v
1734 go (_ : xs) = go xs
1423 go (_ : xs) = go xs
1735− go _ = fail "parsing Version failed"
1424+ go _ = fail "could not parse Version"
1737-------------------------------------------------------------------------------
1426-------------------------------------------------------------------------------
1738-- semigroups NonEmpty
1427-- semigroups NonEmpty
1739-------------------------------------------------------------------------------
1428-------------------------------------------------------------------------------
1741instance FromJSON1 NonEmpty where
1430instance FromJSON1 NonEmpty where
1742− liftParseJSON p _ = withArray "NonEmpty" $
1431+ liftParseJSON p _ = withArray "NonEmpty a" $
1743 (>>= ne) . Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1432 (>>= ne) . Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1745− ne [] = fail "parsing NonEmpty failed, unexpected empty list"
1434+ ne [] = fail "Expected a NonEmpty but got an empty list"
1746 ne (x:xs) = pure (x :| xs)
1435 ne (x:xs) = pure (x :| xs)
1747 {-# INLINE liftParseJSON #-}
1436 {-# INLINE liftParseJSON #-}
@@ -1763,7 +1452,7 @@ instance FromJSON Scientific where
1763-------------------------------------------------------------------------------
1452-------------------------------------------------------------------------------
1765instance FromJSON1 DList.DList where
1454instance FromJSON1 DList.DList where
1766− liftParseJSON p _ = withArray "DList" $
1455+ liftParseJSON p _ = withArray "DList a" $
1767 fmap DList.fromList .
1456 fmap DList.fromList .
1768 Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1457 Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1769 {-# INLINE liftParseJSON #-}
1458 {-# INLINE liftParseJSON #-}
@@ -1840,7 +1529,7 @@ instance (FromJSON1 f, FromJSON1 g) => FromJSON1 (Sum f g) where
1840 inr = "InR"
1529 inr = "InR"
1842 liftParseJSON _ _ _ = fail $
1531 liftParseJSON _ _ _ = fail $
1843− "parsing Sum failed, expected an object with a single property " ++
1532+ "expected an object with a single property " ++
1844 "where the property key should be either " ++
1533 "where the property key should be either " ++
1845 "\"InL\" or \"InR\""
1534 "\"InL\" or \"InR\""
1846 {-# INLINE liftParseJSON #-}
1535 {-# INLINE liftParseJSON #-}
@@ -1854,7 +1543,7 @@ instance (FromJSON1 f, FromJSON1 g, FromJSON a) => FromJSON (Sum f g a) where
1854-------------------------------------------------------------------------------
1543-------------------------------------------------------------------------------
1856instance FromJSON1 Seq.Seq where
1545instance FromJSON1 Seq.Seq where
1857− liftParseJSON p _ = withArray "Seq" $
1546+ liftParseJSON p _ = withArray "Seq a" $
1858 fmap Seq.fromList .
1547 fmap Seq.fromList .
1859 Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1548 Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
1860 {-# INLINE liftParseJSON #-}
1549 {-# INLINE liftParseJSON #-}
@@ -1888,13 +1577,13 @@ instance FromJSON a => FromJSON (IntMap.IntMap a) where
1889instance (FromJSONKey k, Ord k) => FromJSON1 (M.Map k) where
1578instance (FromJSONKey k, Ord k) => FromJSON1 (M.Map k) where
1890 liftParseJSON p _ = case fromJSONKey of
1579 liftParseJSON p _ = case fromJSONKey of
1891− FromJSONKeyCoerce _ -> withObject "Map" $
1580+ FromJSONKeyCoerce _-> withObject "Map k v" $
1892 fmap (H.foldrWithKey (M.insert . unsafeCoerce) M.empty) . H.traverseWithKey (\k v -> p v <?> Key k)
1581 fmap (H.foldrWithKey (M.insert . unsafeCoerce) M.empty) . H.traverseWithKey (\k v -> p v <?> Key k)
1893− FromJSONKeyText f -> withObject "Map" $
1582+ FromJSONKeyText f -> withObject "Map k v" $
1894 fmap (H.foldrWithKey (M.insert . f) M.empty) . H.traverseWithKey (\k v -> p v <?> Key k)
1583 fmap (H.foldrWithKey (M.insert . f) M.empty) . H.traverseWithKey (\k v -> p v <?> Key k)
1895− FromJSONKeyTextParser f -> withObject "Map" $
1584+ 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)
1585 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 ->
1586+ FromJSONKeyValue f -> withArray "Map k v" $ \arr ->
1898 fmap M.fromList . Tr.sequence .
1587 fmap M.fromList . Tr.sequence .
1899 zipWith (parseIndexedJSONPair f p) [0..] . V.toList $ arr
1588 zipWith (parseIndexedJSONPair f p) [0..] . V.toList $ arr
1900 {-# INLINE liftParseJSON #-}
1589 {-# INLINE liftParseJSON #-}
@@ -1922,18 +1611,18 @@ instance (FromJSON v) => FromJSON (Tree.Tree v) where
1923instance FromJSON UUID.UUID where
1612instance FromJSON UUID.UUID where
1924 parseJSON = withText "UUID" $
1613 parseJSON = withText "UUID" $
1925− maybe (fail "invalid UUID") pure . UUID.fromText
1614+ maybe (fail "Invalid UUID") pure . UUID.fromText
1927instance FromJSONKey UUID.UUID where
1616instance FromJSONKey UUID.UUID where
1928 fromJSONKey = FromJSONKeyTextParser $
1617 fromJSONKey = FromJSONKeyTextParser $
1929− maybe (fail "invalid UUID") pure . UUID.fromText
1618+ maybe (fail "Invalid UUID") pure . UUID.fromText
1931-------------------------------------------------------------------------------
1620-------------------------------------------------------------------------------
1932-- vector
1621-- vector
1933-------------------------------------------------------------------------------
1622-------------------------------------------------------------------------------
1935instance FromJSON1 Vector where
1624instance FromJSON1 Vector where
1936− liftParseJSON p _ = withArray "Vector" $
1625+ liftParseJSON p _ = withArray "Vector a" $
1937 V.mapM (uncurry $ parseIndexedJSON p) . V.indexed
1626 V.mapM (uncurry $ parseIndexedJSON p) . V.indexed
1938 {-# INLINE liftParseJSON #-}
1627 {-# INLINE liftParseJSON #-}
@@ -1947,14 +1636,14 @@ vectorParseJSON s = withArray s $ fmap V.convert . V.mapM (uncurry $ parseIndexe
1947{-# INLINE vectorParseJSON #-}
1636{-# INLINE vectorParseJSON #-}
1949instance (Storable a, FromJSON a) => FromJSON (VS.Vector a) where
1638instance (Storable a, FromJSON a) => FromJSON (VS.Vector a) where
1950− parseJSON = vectorParseJSON "Data.Vector.Storable.Vector"
1639+ parseJSON = vectorParseJSON "Data.Vector.Storable.Vector a"
1952instance (VP.Prim a, FromJSON a) => FromJSON (VP.Vector a) where
1641instance (VP.Prim a, FromJSON a) => FromJSON (VP.Vector a) where
1953− parseJSON = vectorParseJSON "Data.Vector.Primitive.Vector"
1642+ parseJSON = vectorParseJSON "Data.Vector.Primitive.Vector a"
1954 {-# INLINE parseJSON #-}
1643 {-# INLINE parseJSON #-}
1956instance (VG.Vector VU.Vector a, FromJSON a) => FromJSON (VU.Vector a) where
1645instance (VG.Vector VU.Vector a, FromJSON a) => FromJSON (VU.Vector a) where
1957− parseJSON = vectorParseJSON "Data.Vector.Unboxed.Vector"
1646+ parseJSON = vectorParseJSON "Data.Vector.Unboxed.Vector a"
1958 {-# INLINE parseJSON #-}
1647 {-# INLINE parseJSON #-}
1960-------------------------------------------------------------------------------
1649-------------------------------------------------------------------------------
@@ -1968,13 +1657,13 @@ instance (Eq a, Hashable a, FromJSON a) => FromJSON (HashSet.HashSet a) where
1969instance (FromJSONKey k, Eq k, Hashable k) => FromJSON1 (H.HashMap k) where
1658instance (FromJSONKey k, Eq k, Hashable k) => FromJSON1 (H.HashMap k) where
1970 liftParseJSON p _ = case fromJSONKey of
1659 liftParseJSON p _ = case fromJSONKey of
1971− FromJSONKeyCoerce _ -> withObject "HashMap ~Text" $
1660+ FromJSONKeyCoerce _ -> withObject "HashMap ~Text v" $
1972 uc . H.traverseWithKey (\k v -> p v <?> Key k)
1661 uc . H.traverseWithKey (\k v -> p v <?> Key k)
1973− FromJSONKeyText f -> withObject "HashMap" $
1662+ FromJSONKeyText f -> withObject "HashMap k v" $
1974 fmap (mapKey f) . H.traverseWithKey (\k v -> p v <?> Key k)
1663 fmap (mapKey f) . H.traverseWithKey (\k v -> p v <?> Key k)
1975− FromJSONKeyTextParser f -> withObject "HashMap" $
1664+ 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)
1665 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 ->
1666+ FromJSONKeyValue f -> withArray "Map k v" $ \arr ->
1978 fmap H.fromList . Tr.sequence .
1667 fmap H.fromList . Tr.sequence .
1979 zipWith (parseIndexedJSONPair f p) [0..] . V.toList $ arr
1668 zipWith (parseIndexedJSONPair f p) [0..] . V.toList $ arr
@@ -1997,7 +1686,7 @@ instance FromJSON DotNetTime where
1997 parseJSON = withText "DotNetTime" $ \t ->
1686 parseJSON = withText "DotNetTime" $ \t ->
1998 let (s,m) = T.splitAt (T.length t - 5) t
1687 let (s,m) = T.splitAt (T.length t - 5) t
1999 t' = T.concat [s,".",m]
1688 t' = T.concat [s,".",m]
2000− in case parseTimeM True defaultTimeLocale "/Date(%s%Q)/" (unpack t') of
1689+ in case parseTime defaultTimeLocale "/Date(%s%Q)/" (unpack t') of
2001 Just d -> pure (DotNetTime d)
1690 Just d -> pure (DotNetTime d)
2002 _ -> fail "could not parse .NET time"
1691 _ -> fail "could not parse .NET time"
2003 {-# INLINE parseJSON #-}
1692 {-# INLINE parseJSON #-}
@@ -2006,6 +1695,7 @@ instance FromJSON DotNetTime where
2006-- primitive
1695-- primitive
2007-------------------------------------------------------------------------------
1696-------------------------------------------------------------------------------
1698+#if MIN_VERSION_base(4,7,0)
2009instance FromJSON a => FromJSON (PM.Array a) where
1699instance FromJSON a => FromJSON (PM.Array a) where
2010 -- note: we could do better than this if vector exposed the data
1700 -- note: we could do better than this if vector exposed the data
2011 -- constructor in Data.Vector.
1701 -- constructor in Data.Vector.
@@ -2018,7 +1708,6 @@ instance FromJSON a => FromJSON (PM.SmallArray a) where
2018instance (PM.Prim a,FromJSON a) => FromJSON (PM.PrimArray a) where
1708instance (PM.Prim a,FromJSON a) => FromJSON (PM.PrimArray a) where
2019 parseJSON = fmap Exts.fromList . parseJSON
1709 parseJSON = fmap Exts.fromList . parseJSON
2021−#if !MIN_VERSION_primitive(0,7,0)
2022instance (PM.PrimUnlifted a,FromJSON a) => FromJSON (PM.UnliftedArray a) where
1711instance (PM.PrimUnlifted a,FromJSON a) => FromJSON (PM.UnliftedArray a) where
2023 parseJSON = fmap Exts.fromList . parseJSON
1712 parseJSON = fmap Exts.fromList . parseJSON
@@ -2091,40 +1780,6 @@ instance FromJSON DiffTime where
2091 parseJSON = withBoundedScientific "DiffTime" $ pure . realToFrac
1780 parseJSON = withBoundedScientific "DiffTime" $ pure . realToFrac
2092 {-# INLINE parseJSON #-}
1781 {-# 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-------------------------------------------------------------------------------
1783-------------------------------------------------------------------------------
2129-- base Monoid/Semigroup
1784-- base Monoid/Semigroup
2130-------------------------------------------------------------------------------
1785-------------------------------------------------------------------------------
@@ -2245,15 +1900,14 @@ instance FromJSON a => FromJSON (Semigroup.Option a) where
2246instance FromJSON1 Proxy where
1901instance FromJSON1 Proxy where
2247 {-# INLINE liftParseJSON #-}
1902 {-# INLINE liftParseJSON #-}
2248− liftParseJSON _ _ = fromNull "Proxy" Proxy
1903+ liftParseJSON _ _ Null = pure Proxy
1904+ liftParseJSON _ _ v = typeMismatch "Proxy" v
2250instance FromJSON (Proxy a) where
1906instance FromJSON (Proxy a) where
2251 {-# INLINE parseJSON #-}
1907 {-# INLINE parseJSON #-}
2252− parseJSON = fromNull "Proxy" Proxy
1908+ parseJSON Null = pure Proxy
1909+ 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)
2258instance FromJSON2 Tagged where
1912instance FromJSON2 Tagged where
2259 liftParseJSON2 _ _ p _ = fmap Tagged . p
1913 liftParseJSON2 _ _ p _ = fmap Tagged . p
@@ -2280,7 +1934,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)
1934instance (FromJSON a, FromJSON b, FromJSON c, FromJSON d) => FromJSONKey (a,b,c,d)
2282instance FromJSONKey Char where
1936instance FromJSONKey Char where
2283− fromJSONKey = FromJSONKeyTextParser parseChar
1937+ fromJSONKey = FromJSONKeyTextParser $ \t ->
1939+ then return (T.index t 0)
1940+ else typeMismatch "Expected Char but String didn't contain exactly one character" (String t)
2284 fromJSONKeyList = FromJSONKeyText T.unpack
1941 fromJSONKeyList = FromJSONKeyText T.unpack
2286instance (FromJSONKey a, FromJSON a) => FromJSONKey [a] where
1943instance (FromJSONKey a, FromJSON a) => FromJSONKey [a] where