@@ -5,20 +5,16 @@
55{-# LANGUAGE FlexibleInstances #-}
66{-# LANGUAGE GADTs #-}
77{-# LANGUAGE MultiParamTypeClasses #-}
8−{-# LANGUAGE NamedFieldPuns #-}
98{-# LANGUAGE NoImplicitPrelude #-}
109{-# LANGUAGE OverloadedStrings #-}
10+{-# LANGUAGE PolyKinds #-}
1111{-# LANGUAGE RecordWildCards #-}
1212{-# LANGUAGE ScopedTypeVariables #-}
1313{-# LANGUAGE TypeOperators #-}
14−{-# LANGUAGE TypeSynonymInstances #-}
14+{-# LANGUAGE TupleSections #-}
1515{-# LANGUAGE UndecidableInstances #-}
1616{-# LANGUAGE ViewPatterns #-}
1717
18−#if __GLASGOW_HASKELL__ >= 706
19−{-# LANGUAGE PolyKinds #-}
20−#endif
21−
2218#include "incoherent-compat.h"
2319#include "overlapping-compat.h"
2420
@@ -46,6 +42,9 @@ module Data.Aeson.Types.FromJSON
4642 , coerceFromJSONKeyFunction
4743 , mapFromJSONKeyFunction
4844
45+ , GFromJSONKey()
46+ , genericFromJSONKey
47+
4948 -- * List functions
5049 , listParser
5150
@@ -61,12 +60,14 @@ module Data.Aeson.Types.FromJSON
6160 , fromJSON
6261 , ifromJSON
6362 , typeMismatch
63+ , unexpected
6464 , parseField
6565 , parseFieldMaybe
6666 , parseFieldMaybe'
6767 , explicitParseField
6868 , explicitParseFieldMaybe
6969 , explicitParseFieldMaybe'
70+ , parseIndexedJSON
7071 -- ** Operators
7172 , (.:)
7273 , (.:?)
@@ -79,14 +80,14 @@ module Data.Aeson.Types.FromJSON
7980
8081import Prelude.Compat
8182
82−import Control.Applicative ((<|>), Const(..))
83−import Control.Monad ((<=<), zipWithM)
83+import Control.Applicative ((<|>), Const(..), liftA2)
84+import Control.Monad (zipWithM)
8485import Data.Aeson.Internal.Functions (mapKey)
8586import Data.Aeson.Parser.Internal (eitherDecodeWith, jsonEOF)
8687import Data.Aeson.Types.Generic
8788import Data.Aeson.Types.Internal
8889import Data.Bits (unsafeShiftR)
89−import Data.Fixed (Fixed, HasResolution)
90+import Data.Fixed (Fixed, HasResolution (resolution), Nano)
9091import Data.Functor.Compose (Compose(..))
9192import Data.Functor.Identity (Identity(..))
9293import Data.Functor.Product (Product(..))
@@ -102,8 +103,10 @@ import Data.Scientific (Scientific, base10Exponent)
102103import Data.Tagged (Tagged(..))
103104import Data.Text (Text, pack, unpack)
104105import Data.Time (Day, DiffTime, LocalTime, NominalDiffTime, TimeOfDay, UTCTime, ZonedTime)
105−import Data.Time.Format (parseTime)
106−import Data.Time.Locale.Compat (defaultTimeLocale)
106+import Data.Time.Calendar.Compat (CalendarDiffDays (..), DayOfWeek (..))
107+import Data.Time.LocalTime.Compat (CalendarDiffTime (..))
108+import Data.Time.Clock.System.Compat (SystemTime (..))
109+import Data.Time.Format.Compat (parseTimeM, defaultTimeLocale)
107110import Data.Traversable as Tr (sequence)
108111import Data.Vector (Vector)
109112import Data.Version (Version, parseVersion)
@@ -115,9 +118,9 @@ import GHC.Generics
115118import Numeric.Natural (Natural)
116119import Text.ParserCombinators.ReadP (readP_to_S)
117120import Unsafe.Coerce (unsafeCoerce)
118−import qualified Data.Aeson.Compat as Compat
119121import qualified Data.Aeson.Parser.Time as Time
120122import qualified Data.Attoparsec.ByteString.Char8 as A (endOfInput, parseOnly, scientific)
123+import qualified Data.ByteString.Lazy as L
121124import qualified Data.DList as DList
122125import qualified Data.HashMap.Strict as H
123126import qualified Data.HashSet as HashSet
@@ -146,22 +149,14 @@ import qualified Data.Primitive.SmallArray as PM
146149import qualified Data.Primitive.Types as PM
147150
148151#if MIN_VERSION_primitive(0,6,4)
152+#if !MIN_VERSION_primitive(0,7,0)
149153import qualified Data.Primitive.UnliftedArray as PM
154+#endif
150155import qualified Data.Primitive.PrimArray as PM
151156#endif
152157
153−#ifndef HAS_COERCIBLE
154−#define HAS_COERCIBLE (__GLASGOW_HASKELL__ >= 707)
155−#endif
156158
157−#if HAS_COERCIBLE
158159import Data.Coerce (Coercible, coerce)
159−coerce' :: Coercible a b => a -> b
160−coerce' = coerce
161−#else
162−coerce' :: a -> b
163−coerce' = unsafeCoerce
164−#endif
165160
166161parseIndexedJSON :: (Value -> Parser a) -> Int -> Value -> Parser a
167162parseIndexedJSON p idx value = p value <?> Index idx
@@ -170,7 +165,7 @@ parseIndexedJSON p idx value = p value <?> Index idx
170165parseIndexedJSONPair :: (Value -> Parser a) -> (Value -> Parser b) -> Int -> Value -> Parser (a, b)
171166parseIndexedJSONPair keyParser valParser idx value = p value <?> Index idx
172167 where
173− p = withArray "(k,v)" $ \ab ->
168+ p = withArray "(k, v)" $ \ab ->
174169 let n = V.length ab
175170 in if n == 2
176171 then (,) <$> parseJSONElemAtIndex keyParser 0 ab
@@ -183,33 +178,33 @@ parseJSONElemAtIndex :: (Value -> Parser a) -> Int -> V.Vector Value -> Parser a
183178parseJSONElemAtIndex p idx ary = p (V.unsafeIndex ary idx) <?> Index idx
184179
185180parseRealFloat :: RealFloat a => String -> Value -> Parser a
186−parseRealFloat _ (Number s) = pure $ Scientific.toRealFloat s
187−parseRealFloat _ Null = pure (0/0)
188−parseRealFloat expected v = typeMismatch expected v
181+parseRealFloat _ (Number s) = pure $ Scientific.toRealFloat s
182+parseRealFloat _ Null = pure (0/0)
183+parseRealFloat name v = prependContext name (unexpected v)
189184{-# INLINE parseRealFloat #-}
190185
191−parseIntegralFromScientific :: forall a. Integral a => String -> Scientific -> Parser a
192−parseIntegralFromScientific expected s =
186+parseIntegralFromScientific :: forall a. Integral a => Scientific -> Parser a
187+parseIntegralFromScientific s =
193188 case Scientific.floatingOrInteger s :: Either Double a of
194189 Right x -> pure x
195− Left _ -> fail $ "expected " ++ expected ++ ", encountered floating number " ++ show s
190+ Left _ -> fail $ "unexpected floating number " ++ show s
196191{-# INLINE parseIntegralFromScientific #-}
197192
198193parseIntegral :: Integral a => String -> Value -> Parser a
199−parseIntegral expected =
200− withBoundedScientific expected $ parseIntegralFromScientific expected
194+parseIntegral name =
195+ prependContext name . withBoundedScientific' parseIntegralFromScientific
201196{-# INLINE parseIntegral #-}
202197
203−parseBoundedIntegralFromScientific :: (Bounded a, Integral a) => String -> Scientific -> Parser a
204−parseBoundedIntegralFromScientific expected s = maybe
205− (fail $ expected ++ " is either floating or will cause over or underflow: " ++ show s)
198+parseBoundedIntegralFromScientific :: (Bounded a, Integral a) => Scientific -> Parser a
199+parseBoundedIntegralFromScientific s = maybe
200+ (fail $ "value is either floating or will cause over or underflow " ++ show s)
206201 pure
207202 (Scientific.toBoundedInteger s)
208203{-# INLINE parseBoundedIntegralFromScientific #-}
209204
210205parseBoundedIntegral :: (Bounded a, Integral a) => String -> Value -> Parser a
211−parseBoundedIntegral expected =
212− withScientific expected $ parseBoundedIntegralFromScientific expected
206+parseBoundedIntegral name =
207+ prependContext name . withScientific' parseBoundedIntegralFromScientific
213208{-# INLINE parseBoundedIntegral #-}
214209
215210parseScientificText :: Text -> Parser Scientific
@@ -219,18 +214,20 @@ parseScientificText
219214 . T.encodeUtf8
220215
221216parseIntegralText :: Integral a => String -> Text -> Parser a
222−parseIntegralText expected t
223− = parseScientificText t
224− >>= rejectLargeExponent
225− >>= parseIntegralFromScientific expected
217+parseIntegralText name t =
218+ prependContext name $
219+ parseScientificText t
220+ >>= rejectLargeExponent
221+ >>= parseIntegralFromScientific
226222 where
227223 rejectLargeExponent :: Scientific -> Parser Scientific
228− rejectLargeExponent s = withBoundedScientific expected pure (Number s)
224+ rejectLargeExponent s = withBoundedScientific' pure (Number s)
229225{-# INLINE parseIntegralText #-}
230226
231227parseBoundedIntegralText :: (Bounded a, Integral a) => String -> Text -> Parser a
232−parseBoundedIntegralText expected t =
233− parseScientificText t >>= parseBoundedIntegralFromScientific expected
228+parseBoundedIntegralText name t =
229+ prependContext name $
230+ parseScientificText t >>= parseBoundedIntegralFromScientific
234231
235232parseOptionalFieldWith :: (Value -> Parser (Maybe a))
236233 -> Object -> Text -> Parser (Maybe a)
@@ -290,14 +287,21 @@ genericLiftParseJSON opts pj pjl = fmap to1 . gParseJSON opts (From1Args pj pjl)
290287--
291288-- The basic ways to signal a failed conversion are as follows:
292289--
293−-- * 'empty' and 'mzero' work, but are terse and uninformative;
290+-- * 'fail' yields a custom error message: it is the recommended way of
291+-- reporting a failure;
294292--
295−-- * 'fail' yields a custom error message;
293+-- * 'Control.Applicative.empty' (or 'Control.Monad.mzero') is uninformative:
294+-- use it when the error is meant to be caught by some @('<|>')@;
296295--
297−-- * 'typeMismatch' produces an informative message for cases when the
298−-- value encountered is not of the expected type.
296+-- * 'typeMismatch' can be used to report a failure when the encountered value
297+-- is not of the expected JSON type; 'unexpected' is an appropriate alternative
298+-- when more than one type may be expected, or to keep the expected type
299+-- implicit.
299300--
300−-- An example type and instance using 'typeMismatch':
301+-- 'prependFailure' (or 'modifyFailure') add more information to a parser's
302+-- error messages.
303+--
304+-- An example type and instance using 'typeMismatch' and 'prependFailure':
301305--
302306-- @
303307-- \-- Allow ourselves to write 'Text' literals.
@@ -311,13 +315,15 @@ genericLiftParseJSON opts pj pjl = fmap to1 . gParseJSON opts (From1Args pj pjl)
311315-- '<*>' v '.:' \"y\"
312316--
313317-- \-- We do not expect a non-'Object' value here.
314−-- \-- We could use 'mzero' to fail, but 'typeMismatch'
318+-- \-- We could use 'Control.Applicative.empty' to fail, but 'typeMismatch'
315319-- \-- gives a much more informative error message.
316−-- 'parseJSON' invalid = 'typeMismatch' \"Coord\" invalid
320+-- 'parseJSON' invalid =
321+-- 'prependFailure' "parsing Coord failed, "
322+-- ('typeMismatch' \"Object\" invalid)
317323-- @
318324--
319325-- For this common case of only being concerned with a single
320−-- type of JSON value, the functions 'withObject', 'withNumber', etc.
326+-- type of JSON value, the functions 'withObject', 'withScientific', etc.
321327-- are provided. Their use is to be preferred when possible, since
322328-- they are more terse. Using 'withObject', we can rewrite the above instance
323329-- (assuming the same language extension and data type) as:
@@ -356,7 +362,7 @@ genericLiftParseJSON opts pj pjl = fmap to1 . gParseJSON opts (From1Args pj pjl)
356362-- @
357363--
358364-- The default implementation will be equivalent to
359−-- @parseJSON = 'genericParseJSON' 'defaultOptions'@; If you need different
365+-- @parseJSON = 'genericParseJSON' 'defaultOptions'@; if you need different
360366-- options, you can customize the generic decoding by defining:
361367--
362368-- @
@@ -374,13 +380,11 @@ class FromJSON a where
374380 parseJSON = genericParseJSON defaultOptions
375381
376382 parseJSONList :: Value -> Parser [a]
377− parseJSONList (Array a)
378− = zipWithM (parseIndexedJSON parseJSON) [0..]
383+ parseJSONList = withArray "[]" $ \a ->
384+ zipWithM (parseIndexedJSON parseJSON) [0..]
379385 . V.toList
380386 $ a
381387
382− parseJSONList v = typeMismatch "[a]" v
383−
384388-------------------------------------------------------------------------------
385389-- Classes and types for map keys
386390-------------------------------------------------------------------------------
@@ -392,6 +396,16 @@ class FromJSON a where
392396-- > newtype SomeId = SomeId { getSomeId :: Text }
393397-- > deriving (Eq,Ord,Hashable,FromJSONKey)
394398--
399+-- If you have a sum of nullary constructors, you may use the generic
400+-- implementation:
401+--
402+-- @
403+-- data Color = Red | Green | Blue
404+-- deriving Generic
405+--
406+-- instance 'FromJSONKey' Color where
407+-- 'fromJSONKey' = 'genericFromJSONKey' 'defaultJSONKeyOptions'
408+-- @
395409class FromJSONKey a where
396410 -- | Strategy for parsing the key of a map-like container.
397411 fromJSONKey :: FromJSONKeyFunction a
@@ -414,11 +428,7 @@ class FromJSONKey a where
414428-- At the moment this type is intentionally not exported. 'FromJSONKeyFunction'
415429-- can be inspected, but cannot be constructed.
416430data CoerceText a where
417−#if HAS_COERCIBLE
418431 CoerceText :: Coercible Text a => CoerceText a
419−#else
420− CoerceText :: CoerceText a
421−#endif
422432
423433-- | This type is related to 'ToJSONKeyFunction'. If 'FromJSONKeyValue' is used in the
424434-- 'FromJSONKey' instance, then 'ToJSONKeyValue' should be used in the 'ToJSONKey'
@@ -438,7 +448,7 @@ data FromJSONKeyFunction a
438448
439449-- | Only law abiding up to interpretation
440450instance Functor FromJSONKeyFunction where
441− fmap h (FromJSONKeyCoerce CoerceText) = FromJSONKeyText (h . coerce')
451+ fmap h (FromJSONKeyCoerce CoerceText) = FromJSONKeyText (h . coerce)
442452 fmap h (FromJSONKeyText f) = FromJSONKeyText (h . f)
443453 fmap h (FromJSONKeyTextParser f) = FromJSONKeyTextParser (fmap h . f)
444454 fmap h (FromJSONKeyValue f) = FromJSONKeyValue (fmap h . f)
@@ -452,9 +462,7 @@ instance Functor FromJSONKeyFunction where
452462--
453463-- On pre GHC 7.8 this is unconstrainted function.
454464fromJSONKeyCoerce ::
455−#if HAS_COERCIBLE
456465 Coercible Text a =>
457−#endif
458466 FromJSONKeyFunction a
459467fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText
460468
@@ -462,60 +470,91 @@ fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText
462470--
463471-- See note on 'fromJSONKeyCoerce'.
464472coerceFromJSONKeyFunction ::
465−#if HAS_COERCIBLE
466473 Coercible a b =>
467−#endif
468474 FromJSONKeyFunction a -> FromJSONKeyFunction b
469−#if HAS_COERCIBLE
470475coerceFromJSONKeyFunction = coerce
471−#else
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)
476−#endif
477476
478477{-# RULES
479478 "FromJSONKeyCoerce: fmap id" forall (x :: FromJSONKeyFunction a).
480479 fmap id x = x
481480 #-}
482−#if HAS_COERCIBLE
483481{-# RULES
484482 "FromJSONKeyCoerce: fmap coerce" forall x .
485483 fmap coerce x = coerceFromJSONKeyFunction x
486484 #-}
487−#endif
488485
489486-- | Same as 'fmap'. Provided for the consistency with 'ToJSONKeyFunction'.
490487mapFromJSONKeyFunction :: (a -> b) -> FromJSONKeyFunction a -> FromJSONKeyFunction b
491488mapFromJSONKeyFunction = fmap
492489
490+-- | 'fromJSONKey' for 'Generic' types.
491+-- These types must be sums of nullary constructors, whose names will be used
492+-- as keys for JSON objects.
493+--
494+-- See also 'genericToJSONKey'.
495+--
496+-- === __Example__
497+--
498+-- @
499+-- data Color = Red | Green | Blue
500+-- deriving 'Generic'
501+--
502+-- instance 'FromJSONKey' Color where
503+-- 'fromJSONKey' = 'genericFromJSONKey' 'defaultJSONKeyOptions'
504+-- @
505+genericFromJSONKey :: forall a. (Generic a, GFromJSONKey (Rep a))
506+ => JSONKeyOptions
507+ -> FromJSONKeyFunction a
508+genericFromJSONKey opts = FromJSONKeyTextParser $ \t ->
509+ case parseSumFromString (keyModifier opts) t of
510+ Nothing -> fail $
511+ "invalid key " ++ show t ++ ", expected one of " ++ show cnames
512+ Just k -> pure (to k)
513+ where
514+ cnames = unTagged2 (constructorTags (keyModifier opts) :: Tagged2 (Rep a) [String])
515+
516+class (ConstructorNames f, SumFromString f) => GFromJSONKey f where
517+instance (ConstructorNames f, SumFromString f) => GFromJSONKey f where
518+
493519-------------------------------------------------------------------------------
494520-- Functions needed for documentation
495521-------------------------------------------------------------------------------
496522
497523-- | Fail parsing due to a type mismatch, with a descriptive message.
498524--
499−-- Example usage:
525+-- The following wrappers should generally be prefered:
526+-- 'withObject', 'withArray', 'withText', 'withBool'.
500527--
501−-- @
502−-- instance FromJSON Coord where
503−-- parseJSON ('Object' v) = {- type matches, life is good -}
504−-- parseJSON wat = 'typeMismatch' \"Coord\" wat
505−-- @
506−typeMismatch :: String -- ^ The name of the type you are trying to parse.
528+-- ==== Error message example
529+--
530+-- > typeMismatch "Object" (String "oops")
531+-- > -- Error: "expected Object, but encountered String"
532+typeMismatch :: String -- ^ The name of the JSON type being parsed
533+ -- (@\"Object\"@, @\"Array\"@, @\"String\"@, @\"Number\"@,
534+ -- @\"Boolean\"@, or @\"Null\"@).
507535 -> Value -- ^ The actual value encountered.
508536 -> Parser a
509537typeMismatch expected actual =
510− fail $ "expected " ++ expected ++ ", encountered " ++ name
511− where
512− name = case actual of
513− Object _ -> "Object"
514− Array _ -> "Array"
515− String _ -> "String"
516− Number _ -> "Number"
517− Bool _ -> "Boolean"
518− Null -> "Null"
538+ fail $ "expected " ++ expected ++ ", but encountered " ++ typeOf actual
539+
540+-- | Fail parsing due to a type mismatch, when the expected types are implicit.
541+--
542+-- ==== Error message example
543+--
544+-- > unexpected (String "oops")
545+-- > -- Error: "unexpected String"
546+unexpected :: Value -> Parser a
547+unexpected actual = fail $ "unexpected " ++ typeOf actual
548+
549+-- | JSON type of a value, name of the head constructor.
550+typeOf :: Value -> String
551+typeOf v = case v of
552+ Object _ -> "Object"
553+ Array _ -> "Array"
554+ String _ -> "String"
555+ Number _ -> "Number"
556+ Bool _ -> "Boolean"
557+ Null -> "Null"
519558
520559-------------------------------------------------------------------------------
521560-- Lifings of FromJSON and ToJSON to unary and binary type constructors
@@ -596,9 +635,8 @@ class FromJSON2 f where
596635 -> (Value -> Parser b)
597636 -> (Value -> Parser [b])
598637 -> Value -> Parser [f a b]
599− liftParseJSONList2 fa ga fb gb v = case v of
600− Array vals -> fmap V.toList (V.mapM (liftParseJSON2 fa ga fb gb) vals)
601− _ -> typeMismatch "[a]" v
638+ liftParseJSONList2 fa ga fb gb = withArray "[]" $ \vals ->
639+ fmap V.toList (V.mapM (liftParseJSON2 fa ga fb gb) vals)
602640
603641-- | Lift the standard 'parseJSON' function through the type constructor.
604642parseJSON2 :: (FromJSON2 f, FromJSON a, FromJSON b) => Value -> Parser (f a b)
@@ -612,7 +650,7 @@ parseJSON2 = liftParseJSON2 parseJSON parseJSONList parseJSON parseJSONList
612650-- | Helper function to use with 'liftParseJSON'. See 'Data.Aeson.ToJSON.listEncoding'.
613651listParser :: (Value -> Parser a) -> Value -> Parser [a]
614652listParser f (Array xs) = fmap V.toList (V.mapM f xs)
615−listParser _ v = typeMismatch "[a]" v
653+listParser _ v = typeMismatch "Array" v
616654{-# INLINE listParser #-}
617655
618656-------------------------------------------------------------------------------
@@ -630,69 +668,137 @@ instance (FromJSON a) => FromJSON [a] where
630668-- Functions
631669-------------------------------------------------------------------------------
632670
633−-- | @'withObject' expected f value@ applies @f@ to the 'Object' when @value@
634−-- is an 'Object' and fails using @'typeMismatch' expected@ otherwise.
671+-- | Add context to a failure message, indicating the name of the structure
672+-- being parsed.
673+--
674+-- > prependContext "MyType" (fail "[error message]")
675+-- > -- Error: "parsing MyType failed, [error message]"
676+prependContext :: String -> Parser a -> Parser a
677+prependContext name = prependFailure ("parsing " ++ name ++ " failed, ")
678+
679+-- | @'withObject' name f value@ applies @f@ to the 'Object' when @value@
680+-- is an 'Data.Aeson.Object' and fails otherwise.
681+--
682+-- ==== Error message example
683+--
684+-- > withObject "MyType" f (String "oops")
685+-- > -- Error: "parsing MyType failed, expected Object, but encountered String"
635686withObject :: String -> (Object -> Parser a) -> Value -> Parser a
636−withObject _ f (Object obj) = f obj
637−withObject expected _ v = typeMismatch expected v
687+withObject _ f (Object obj) = f obj
688+withObject name _ v = prependContext name (typeMismatch "Object" v)
638689{-# INLINE withObject #-}
639690
640−-- | @'withText' expected f value@ applies @f@ to the 'Text' when @value@ is a
641−-- 'String' and fails using @'typeMismatch' expected@ otherwise.
691+-- | @'withText' name f value@ applies @f@ to the 'Text' when @value@ is a
692+-- 'Data.Aeson.String' and fails otherwise.
693+--
694+-- ==== Error message example
695+--
696+-- > withText "MyType" f Null
697+-- > -- Error: "parsing MyType failed, expected String, but encountered Null"
642698withText :: String -> (Text -> Parser a) -> Value -> Parser a
643−withText _ f (String txt) = f txt
644−withText expected _ v = typeMismatch expected v
699+withText _ f (String txt) = f txt
700+withText name _ v = prependContext name (typeMismatch "String" v)
645701{-# INLINE withText #-}
646702
647703-- | @'withArray' expected f value@ applies @f@ to the 'Array' when @value@ is
648−-- an 'Array' and fails using @'typeMismatch' expected@ otherwise.
704+-- an 'Data.Aeson.Array' and fails otherwise.
705+--
706+-- ==== Error message example
707+--
708+-- > withArray "MyType" f (String "oops")
709+-- > -- Error: "parsing MyType failed, expected Array, but encountered String"
649710withArray :: String -> (Array -> Parser a) -> Value -> Parser a
650−withArray _ f (Array arr) = f arr
651−withArray expected _ v = typeMismatch expected v
711+withArray _ f (Array arr) = f arr
712+withArray name _ v = prependContext name (typeMismatch "Array" v)
652713{-# INLINE withArray #-}
653714
654−-- | @'withScientific' expected f value@ applies @f@ to the 'Scientific' number
655−-- when @value@ is a 'Number' and fails using @'typeMismatch' expected@
715+-- | @'withScientific' name f value@ applies @f@ to the 'Scientific' number
716+-- when @value@ is a 'Data.Aeson.Number' and fails using 'typeMismatch'
656717-- otherwise.
657−-- .
718+--
658719-- /Warning/: If you are converting from a scientific to an unbounded
659720-- type such as 'Integer' you may want to add a restriction on the
660721-- size of the exponent (see 'withBoundedScientific') to prevent
661722-- malicious input from filling up the memory of the target system.
723+--
724+-- ==== Error message example
725+--
726+-- > withScientific "MyType" f (String "oops")
727+-- > -- Error: "parsing MyType failed, expected Number, but encountered String"
662728withScientific :: String -> (Scientific -> Parser a) -> Value -> Parser a
663−withScientific _ f (Number scientific) = f scientific
664−withScientific expected _ v = typeMismatch expected v
729+withScientific _ f (Number scientific) = f scientific
730+withScientific name _ v = prependContext name (typeMismatch "Number" v)
665731{-# INLINE withScientific #-}
666732
667−-- | @'withBoundedScientific' expected f value@ applies @f@ to the 'Scientific' number
668−-- when @value@ is a 'Number' and fails using @'typeMismatch' expected@
669−-- otherwise.
733+-- | A variant of 'withScientific' which doesn't use 'prependContext', so that
734+-- such context can be added separately in a way that also applies when the
735+-- continuation @f :: Scientific -> Parser a@ fails.
670736--
671−-- The conversion will also fail with a @'typeMismatch' if the
672−-- 'Scientific' exponent is larger than 1024.
737+-- /Warning/: If you are converting from a scientific to an unbounded
738+-- type such as 'Integer' you may want to add a restriction on the
739+-- size of the exponent (see 'withBoundedScientific') to prevent
740+-- malicious input from filling up the memory of the target system.
741+--
742+-- ==== Error message examples
743+--
744+-- > withScientific' f (String "oops")
745+-- > -- Error: "unexpected String"
746+-- >
747+-- > prependContext "MyType" (withScientific' f (String "oops"))
748+-- > -- Error: "parsing MyType failed, unexpected String"
749+withScientific' :: (Scientific -> Parser a) -> Value -> Parser a
750+withScientific' f v = case v of
751+ Number n -> f n
752+ _ -> typeMismatch "Number" v
753+{-# INLINE withScientific' #-}
754+
755+-- | @'withBoundedScientific' name f value@ applies @f@ to the 'Scientific' number
756+-- when @value@ is a 'Number' with exponent less than or equal to 1024.
673757withBoundedScientific :: String -> (Scientific -> Parser a) -> Value -> Parser a
674−withBoundedScientific _ f v@(Number scientific) =
675− if base10Exponent scientific > 1024
676− then typeMismatch "a number with exponent <= 1024" v
677− else f scientific
678−withBoundedScientific expected _ v = typeMismatch expected v
758+withBoundedScientific name f v = withBoundedScientific_ (prependContext name) f v
679759{-# INLINE withBoundedScientific #-}
680760
761+-- | A variant of 'withBoundedScientific' which doesn't use 'prependContext',
762+-- so that such context can be added separately in a way that also applies
763+-- when the continuation @f :: Scientific -> Parser a@ fails.
764+withBoundedScientific' :: (Scientific -> Parser a) -> Value -> Parser a
765+withBoundedScientific' f v = withBoundedScientific_ id f v
766+{-# INLINE withBoundedScientific' #-}
767+
768+-- | A variant of 'withBoundedScientific_' parameterized by a function to apply
769+-- to the 'Parser' in case of failure.
770+withBoundedScientific_ :: (Parser a -> Parser a) -> (Scientific -> Parser a) -> Value -> Parser a
771+withBoundedScientific_ whenFail f (Number scientific) =
772+ if exp10 > 1024
773+ then whenFail (fail msg)
774+ else f scientific
775+ where
776+ exp10 = base10Exponent scientific
777+ msg = "found a number with exponent " ++ show exp10 ++ ", but it must not be greater than 1024"
778+withBoundedScientific_ whenFail _ v =
779+ whenFail (typeMismatch "Number" v)
780+{-# INLINE withBoundedScientific_ #-}
781+
681782-- | @'withBool' expected f value@ applies @f@ to the 'Bool' when @value@ is a
682−-- 'Bool' and fails using @'typeMismatch' expected@ otherwise.
783+-- 'Boolean' and fails otherwise.
784+--
785+-- ==== Error message example
786+--
787+-- > withBool "MyType" f (String "oops")
788+-- > -- Error: "parsing MyType failed, expected Boolean, but encountered String"
683789withBool :: String -> (Bool -> Parser a) -> Value -> Parser a
684−withBool _ f (Bool arr) = f arr
685−withBool expected _ v = typeMismatch expected v
790+withBool _ f (Bool arr) = f arr
791+withBool name _ v = prependContext name (typeMismatch "Boolean" v)
686792{-# INLINE withBool #-}
687793
688794-- | Decode a nested JSON-encoded string.
689795withEmbeddedJSON :: String -> (Value -> Parser a) -> Value -> Parser a
690796withEmbeddedJSON _ innerParser (String txt) =
691− either fail innerParser $ eitherDecode (Compat.fromStrict $ T.encodeUtf8 txt)
797+ either fail innerParser $ eitherDecode (L.fromStrict $ T.encodeUtf8 txt)
692798 where
693799 eitherDecode = eitherFormatError . eitherDecodeWith jsonEOF ifromJSON
694800 eitherFormatError = either (Left . uncurry formatError) Right
695−withEmbeddedJSON name _ v = typeMismatch name v
801+withEmbeddedJSON name _ v = prependContext name (typeMismatch "String" v)
696802{-# INLINE withEmbeddedJSON #-}
697803
698804-- | Convert a value from JSON, failing if the types do not match.
@@ -757,7 +863,7 @@ parseFieldMaybe' = (.:!)
757863-- E.g. @'explicitParseField' 'parseJSON1' :: ('FromJSON1' f, 'FromJSON' a) -> 'Object' -> 'Text' -> 'Parser' (f a)@
758864explicitParseField :: (Value -> Parser a) -> Object -> Text -> Parser a
759865explicitParseField p obj key = case H.lookup key obj of
760− Nothing -> fail $ "key " ++ show key ++ " not present"
866+ Nothing -> fail $ "key " ++ show key ++ " not found"
761867 Just v -> p v <?> Key key
762868{-# INLINE explicitParseField #-}
763869
@@ -807,6 +913,37 @@ instance OVERLAPPABLE_ (GFromJSON arity a) => GFromJSON arity (M1 i c a) where
807913 -- parsed value:
808914 gParseJSON opts fargs = fmap M1 . gParseJSON opts fargs
809915
916+-- Information for error messages
917+
918+type TypeName = String
919+type ConName = String
920+
921+-- | Add the name of the type being parsed to a parser's error messages.
922+contextType :: TypeName -> Parser a -> Parser a
923+contextType = prependContext
924+
925+-- | Add the tagKey that will be looked up while building an ADT
926+-- | Produce the error equivalent to
927+-- | Left "Error in $: parsing T failed, expected an object with keys "tag" and
928+-- | "contents", where "tag" i-- |s associated to one of ["Foo", "Bar"],
929+-- | The parser returned error was: could not find key "tag"
930+contextTag :: Text -> [String] -> Parser a -> Parser a
931+contextTag tagKey cnames = prependFailure
932+ ("expected Object with key \"" ++ unpack tagKey ++ "\"" ++
933+ " containing one of " ++ show cnames ++ ", ")
934+
935+-- | Add the name of the constructor being parsed to a parser's error messages.
936+contextCons :: ConName -> TypeName -> Parser a -> Parser a
937+contextCons cname tname = prependContext (showCons cname tname)
938+
939+-- | Render a constructor as @\"MyType(MyConstructor)\"@.
940+showCons :: ConName -> TypeName -> String
941+showCons cname tname = tname ++ "(" ++ cname ++ ")"
942+
943+--------------------------------------------------------------------------------
944+
945+-- Parsing single fields
946+
810947instance (FromJSON a) => GFromJSON arity (K1 i a) where
811948 -- Constant values are decoded using their FromJSON instance:
812949 gParseJSON _opts _ = fmap K1 . parseJSON
@@ -821,342 +958,499 @@ instance (FromJSON1 f) => GFromJSON One (Rec1 f) where
821958 -- FromJSON1 instance:
822959 gParseJSON _opts (From1Args pj pjl) = fmap Rec1 . liftParseJSON pj pjl
823960
824−instance GFromJSON arity U1 where
825− -- Empty constructors are expected to be encoded as an empty array:
826− gParseJSON _opts _ v
827− | isEmptyArray v = pure U1
828− | otherwise = typeMismatch "unit constructor (U1)" v
961+instance (FromJSON1 f, GFromJSON One g) => GFromJSON One (f :.: g) where
962+ -- If an occurrence of the last type parameter is nested inside two
963+ -- composed types, it is decoded by using the outermost type's FromJSON1
964+ -- instance to generically decode the innermost type:
965+ gParseJSON opts fargs =
966+ let gpj = gParseJSON opts fargs in
967+ fmap Comp1 . liftParseJSON gpj (listParser gpj)
968+
969+--------------------------------------------------------------------------------
829970
971+instance (GFromJSON' arity a, Datatype d) => GFromJSON arity (D1 d a) where
972+ -- Meta-information, which is not handled elsewhere, is just added to the
973+ -- parsed value:
974+ gParseJSON opts fargs = fmap M1 . gParseJSON' (tname :* opts :* fargs)
975+ where
976+ tname = moduleName proxy ++ "." ++ datatypeName proxy
977+ proxy = undefined :: M1 _i d _f _p
978+
979+-- | 'GFromJSON', after unwrapping the 'D1' constructor, now carrying the data
980+-- type's name.
981+class GFromJSON' arity f where
982+ gParseJSON' :: TypeName :* Options :* FromArgs arity a
983+ -> Value
984+ -> Parser (f a)
985+
986+-- | Single constructor.
830987instance ( ConsFromJSON arity a
831988 , AllNullary (C1 c a) allNullary
832989 , ParseSum arity (C1 c a) allNullary
833− ) => GFromJSON arity (D1 d (C1 c a)) where
990+ , Constructor c
991+ ) => GFromJSON' arity (C1 c a) where
834992 -- The option 'tagSingleConstructors' determines whether to wrap
835993 -- a single-constructor type.
836− gParseJSON opts fargs
994+ gParseJSON' p@(_ :* opts :* _)
837995 | tagSingleConstructors opts
838− = fmap M1
839− . (unTagged :: Tagged allNullary (Parser (C1 c a p)) -> Parser (C1 c a p))
840− . parseSum opts fargs
841− | otherwise = fmap M1 . fmap M1 . consParseJSON opts fargs
842−
843−instance (ConsFromJSON arity a) => GFromJSON arity (C1 c a) where
844− -- Constructors need to be decoded differently depending on whether they're
845− -- a record or not. This distinction is made by consParseJSON:
846− gParseJSON opts fargs = fmap M1 . consParseJSON opts fargs
847−
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)
857− productSize in
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 ++
862− " elements instead"
863−
864−instance ( AllNullary (a :+: b) allNullary
865− , ParseSum arity (a :+: b) allNullary
866− ) => GFromJSON arity (a :+: b) where
996+ = (unTagged :: Tagged allNullary (Parser (C1 c a p)) -> Parser (C1 c a p))
997+ . parseSum p
998+ | otherwise = fmap M1 . consParseJSON (cname :* p)
999+ where
1000+ cname = conName (undefined :: M1 _i c _f _p)
1001+
1002+-- | Multiple constructors.
1003+instance ( AllNullary (a :+: b) allNullary
1004+ , ParseSum arity (a :+: b) allNullary
1005+ ) => GFromJSON' arity (a :+: b) where
8671006 -- If all constructors of a sum datatype are nullary and the
8681007 -- 'allNullaryToStringTag' option is set they are expected to be
8691008 -- encoded as strings. This distinction is made by 'parseSum':
870− gParseJSON opts fargs =
871− (unTagged :: Tagged allNullary (Parser ((a :+: b) d)) ->
872− Parser ((a :+: b) d))
873− . parseSum opts fargs
874−
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)
1009+ gParseJSON' p =
1010+ (unTagged :: Tagged allNullary (Parser ((a :+: b) _d)) ->
1011+ Parser ((a :+: b) _d))
1012+ . parseSum p
8821013
8831014--------------------------------------------------------------------------------
8841015
8851016class ParseSum arity f allNullary where
886− parseSum :: Options -> FromArgs arity a
887− -> Value -> Tagged allNullary (Parser (f a))
1017+ parseSum :: TypeName :* Options :* FromArgs arity a
1018+ -> Value
1019+ -> Tagged allNullary (Parser (f a))
8881020
889−instance ( SumFromString f
1021+instance ( ConstructorNames f
1022+ , SumFromString f
8901023 , FromPair arity f
8911024 , FromTaggedObject arity f
8921025 , FromUntaggedValue arity f
8931026 ) => ParseSum arity f True where
894− parseSum opts fargs
895− | allNullaryToStringTag opts = Tagged . parseAllNullarySum opts
896− | otherwise = Tagged . parseNonAllNullarySum opts fargs
1027+ parseSum p@(tname :* opts :* _)
1028+ | allNullaryToStringTag opts = Tagged . parseAllNullarySum tname opts
1029+ | otherwise = Tagged . parseNonAllNullarySum p
8971030
898−instance ( FromPair arity f
1031+instance ( ConstructorNames f
1032+ , FromPair arity f
8991033 , FromTaggedObject arity f
9001034 , FromUntaggedValue arity f
9011035 ) => ParseSum arity f False where
902− parseSum opts fargs = Tagged . parseNonAllNullarySum opts fargs
1036+ parseSum p = Tagged . parseNonAllNullarySum p
9031037
9041038--------------------------------------------------------------------------------
9051039
906−parseAllNullarySum :: SumFromString f => Options -> Value -> Parser (f a)
907−parseAllNullarySum opts = withText "Text" $ \key ->
908− maybe (notFound key) return $
909− parseSumFromString opts key
1040+parseAllNullarySum :: (SumFromString f, ConstructorNames f)
1041+ => TypeName -> Options -> Value -> Parser (f a)
1042+parseAllNullarySum tname opts =
1043+ withText tname $ \tag ->
1044+ maybe (badTag tag) return $
1045+ parseSumFromString modifier tag
1046+ where
1047+ badTag tag = failWithCTags tname modifier $ \cnames ->
1048+ "expected one of the tags " ++ show cnames ++
1049+ ", but found tag " ++ show tag
1050+ modifier = constructorTagModifier opts
1051+
1052+-- | Fail with an informative error message about a mismatched tag.
1053+-- The error message is parameterized by the list of expected tags,
1054+-- to be inferred from the result type of the parser.
1055+failWithCTags
1056+ :: forall f a t. ConstructorNames f
1057+ => TypeName -> (String -> t) -> ([t] -> String) -> Parser (f a)
1058+failWithCTags tname modifier f =
1059+ contextType tname . fail $ f cnames
1060+ where
1061+ cnames = unTagged2 (constructorTags modifier :: Tagged2 f [t])
9101062
9111063class SumFromString f where
912− parseSumFromString :: Options -> Text -> Maybe (f a)
1064+ parseSumFromString :: (String -> String) -> Text -> Maybe (f a)
9131065
9141066instance (SumFromString a, SumFromString b) => SumFromString (a :+: b) where
9151067 parseSumFromString opts key = (L1 <$> parseSumFromString opts key) <|>
9161068 (R1 <$> parseSumFromString opts key)
9171069
9181070instance (Constructor c) => SumFromString (C1 c U1) where
919− parseSumFromString opts key | key == name = Just $ M1 U1
920− | otherwise = Nothing
921− where
922− name = pack $ constructorTagModifier opts $
923− conName (undefined :: t c U1 p)
1071+ parseSumFromString modifier key
1072+ | key == name = Just $ M1 U1
1073+ | otherwise = Nothing
1074+ where
1075+ name = pack $ modifier $ conName (undefined :: M1 _i c _f _p)
9241076
925−--------------------------------------------------------------------------------
1077+-- For genericFromJSONKey
1078+instance SumFromString a => SumFromString (D1 d a) where
1079+ parseSumFromString modifier key = M1 <$> parseSumFromString modifier key
1080+
1081+-- | List of all constructor tags.
1082+constructorTags :: ConstructorNames a => (String -> t) -> Tagged2 a [t]
1083+constructorTags modifier =
1084+ fmap DList.toList (constructorNames' modifier)
1085+
1086+-- | List of all constructor names of an ADT, after a given conversion
1087+-- function. (Better inlining.)
1088+class ConstructorNames a where
1089+ constructorNames' :: (String -> t) -> Tagged2 a (DList.DList t)
1090+
1091+instance (ConstructorNames a, ConstructorNames b) => ConstructorNames (a :+: b) where
1092+ constructorNames' = liftA2 append constructorNames' constructorNames'
1093+ where
1094+ append
1095+ :: Tagged2 a (DList.DList t)
1096+ -> Tagged2 b (DList.DList t)
1097+ -> Tagged2 (a :+: b) (DList.DList t)
1098+ append (Tagged2 xs) (Tagged2 ys) = Tagged2 (DList.append xs ys)
1099+
1100+instance Constructor c => ConstructorNames (C1 c a) where
1101+ constructorNames' f = Tagged2 (pure (f cname))
1102+ where
1103+ cname = conName (undefined :: M1 _i c _f _p)
9261104
927−parseNonAllNullarySum :: ( FromPair arity f
1105+-- For genericFromJSONKey
1106+instance ConstructorNames a => ConstructorNames (D1 d a) where
1107+ constructorNames' = retag . constructorNames'
1108+ where
1109+ retag :: Tagged2 a u -> Tagged2 (D1 d a) u
1110+ retag (Tagged2 x) = Tagged2 x
1111+
1112+--------------------------------------------------------------------------------
1113+parseNonAllNullarySum :: forall f c arity.
1114+ ( FromPair arity f
9281115 , FromTaggedObject arity f
9291116 , FromUntaggedValue arity f
930− ) => Options -> FromArgs arity c
1117+ , ConstructorNames f
1118+ ) => TypeName :* Options :* FromArgs arity c
9311119 -> Value -> Parser (f c)
932−parseNonAllNullarySum opts fargs =
1120+parseNonAllNullarySum p@(tname :* opts :* _) =
9331121 case sumEncoding opts of
9341122 TaggedObject{..} ->
935− withObject "Object" $ \obj -> do
936− tag <- obj .: pack tagFieldName
937− fromMaybe (notFound tag) $
938− parseFromTaggedObject opts fargs contentsFieldName obj tag
1123+ withObject tname $ \obj -> do
1124+ tag <- contextType tname . contextTag tagKey cnames_ $ obj .: tagKey
1125+ fromMaybe (badTag tag <?> Key tagKey) $
1126+ parseFromTaggedObject (tag :* contentsFieldName :* p) obj
1127+ where
1128+ tagKey = pack tagFieldName
1129+ badTag tag = failWith_ $ \cnames ->
1130+ "expected tag field to be one of " ++ show cnames ++
1131+ ", but found tag " ++ show tag
1132+ cnames_ = unTagged2 (constructorTags (constructorTagModifier opts) :: Tagged2 f [String])
9391133
9401134 ObjectWithSingleField ->
941− withObject "Object" $ \obj ->
942− case H.toList obj of
943− [pair@(tag, _)] -> fromMaybe (notFound tag) $
944− parsePair opts fargs pair
945− _ -> fail "Object doesn't have a single field"
1135+ withObject tname $ \obj -> case H.toList obj of
1136+ [(tag, v)] -> maybe (badTag tag) (<?> Key tag) $
1137+ parsePair (tag :* p) v
1138+ _ -> contextType tname . fail $
1139+ "expected an Object with a single pair, but found " ++
1140+ show (H.size obj) ++ " pairs"
1141+ where
1142+ badTag tag = failWith_ $ \cnames ->
1143+ "expected an Object with a single pair where the tag is one of " ++
1144+ show cnames ++ ", but found tag " ++ show tag
9461145
9471146 TwoElemArray ->
948− withArray "Array" $ \arr ->
949− if V.length arr == 2
950− then case V.unsafeIndex arr 0 of
951− String tag -> fromMaybe (notFound tag) $
952− parsePair opts fargs (tag, V.unsafeIndex arr 1)
953− _ -> fail "First element is not a String"
954− else fail "Array doesn't have 2 elements"
1147+ withArray tname $ \arr -> case V.length arr of
1148+ 2 | String tag <- V.unsafeIndex arr 0 ->
1149+ maybe (badTag tag <?> Index 0) (<?> Index 1) $
1150+ parsePair (tag :* p) (V.unsafeIndex arr 1)
1151+ | otherwise ->
1152+ contextType tname $
1153+ fail "tag element is not a String" <?> Index 0
1154+ len -> contextType tname . fail $
1155+ "expected a 2-element Array, but encountered an Array of length " ++
1156+ show len
1157+ where
1158+ badTag tag = failWith_ $ \cnames ->
1159+ "expected tag of the 2-element Array to be one of " ++
1160+ show cnames ++ ", but found tag " ++ show tag
9551161
956− UntaggedValue -> parseUntaggedValue opts fargs
1162+ UntaggedValue -> parseUntaggedValue p
1163+ where
1164+ failWith_ = failWithCTags tname (constructorTagModifier opts)
9571165
9581166--------------------------------------------------------------------------------
9591167
9601168class FromTaggedObject arity f where
961− parseFromTaggedObject :: Options -> FromArgs arity a
962− -> String -> Object
963− -> Text -> Maybe (Parser (f a))
1169+ -- The first two components of the parameter tuple are: the constructor tag
1170+ -- to match against, and the contents field name.
1171+ parseFromTaggedObject
1172+ :: Text :* String :* TypeName :* Options :* FromArgs arity a
1173+ -> Object
1174+ -> Maybe (Parser (f a))
9641175
9651176instance ( FromTaggedObject arity a, FromTaggedObject arity b) =>
9661177 FromTaggedObject arity (a :+: b) where
967− parseFromTaggedObject opts fargs contentsFieldName obj tag =
968− (fmap L1 <$> parseFromTaggedObject opts fargs contentsFieldName obj tag) <|>
969− (fmap R1 <$> parseFromTaggedObject opts fargs contentsFieldName obj tag)
1178+ parseFromTaggedObject p obj =
1179+ (fmap L1 <$> parseFromTaggedObject p obj) <|>
1180+ (fmap R1 <$> parseFromTaggedObject p obj)
9701181
971−instance ( FromTaggedObject' arity f
1182+instance ( IsRecord f isRecord
1183+ , FromTaggedObject' arity f isRecord
9721184 , Constructor c
9731185 ) => FromTaggedObject arity (C1 c f) where
974− parseFromTaggedObject opts fargs contentsFieldName obj tag
975− | tag == name = Just $ M1 <$> parseFromTaggedObject'
976− opts fargs contentsFieldName obj
977− | otherwise = Nothing
978− where
979− name = pack $ constructorTagModifier opts $
980− conName (undefined :: t c f p)
1186+ parseFromTaggedObject (tag :* contentsFieldName :* p@(_ :* opts :* _))
1187+ | tag == tag'
1188+ = Just . fmap M1 .
1189+ (unTagged :: Tagged isRecord (Parser (f a)) -> Parser (f a)) .
1190+ parseFromTaggedObject' (contentsFieldName :* cname :* p)
1191+ | otherwise = const Nothing
1192+ where
1193+ tag' = pack $ constructorTagModifier opts cname
1194+ cname = conName (undefined :: M1 _i c _f _p)
9811195
9821196--------------------------------------------------------------------------------
9831197
984−class FromTaggedObject' arity f where
985− parseFromTaggedObject' :: Options -> FromArgs arity a -> String
986− -> Object -> Parser (f a)
987−
988−class FromTaggedObject'' arity f isRecord where
989− parseFromTaggedObject'' :: Options -> FromArgs arity a -> String
990− -> Object -> Tagged isRecord (Parser (f a))
991−
992−instance ( IsRecord f isRecord
993− , FromTaggedObject'' arity f isRecord
994− ) => FromTaggedObject' arity f where
995− parseFromTaggedObject' opts fargs contentsFieldName =
996− (unTagged :: Tagged isRecord (Parser (f a)) -> Parser (f a)) .
997− parseFromTaggedObject'' opts fargs contentsFieldName
998−
999−instance (FromRecord arity f) => FromTaggedObject'' arity f True where
1000− parseFromTaggedObject'' opts fargs _ =
1001− Tagged . parseRecord opts fargs
1002−
1003−instance (GFromJSON arity f) => FromTaggedObject'' arity f False where
1004− parseFromTaggedObject'' opts fargs contentsFieldName = Tagged .
1005− (gParseJSON opts fargs <=< (.: pack contentsFieldName))
1198+class FromTaggedObject' arity f isRecord where
1199+ -- The first component of the parameter tuple is the contents field name.
1200+ parseFromTaggedObject'
1201+ :: String :* ConName :* TypeName :* Options :* FromArgs arity a
1202+ -> Object -> Tagged isRecord (Parser (f a))
1203+
1204+instance (RecordFromJSON arity f, FieldNames f) => FromTaggedObject' arity f True where
1205+ -- Records are unpacked in the tagged object
1206+ parseFromTaggedObject' (_ :* p) = Tagged . recordParseJSON (True :* p)
1207+
1208+instance (ConsFromJSON arity f) => FromTaggedObject' arity f False where
1209+ -- Nonnullary nonrecords are encoded in the contents field
1210+ parseFromTaggedObject' p obj = Tagged $ do
1211+ contents <- contextCons cname tname (obj .: key)
1212+ consParseJSON p' contents <?> Key key
1213+ where
1214+ key = pack contentsFieldName
1215+ contentsFieldName :* p'@(cname :* tname :* _) = p
10061216
1007−instance OVERLAPPING_ FromTaggedObject'' arity U1 False where
1008− parseFromTaggedObject'' _ _ _ _ = Tagged (pure U1)
1217+instance OVERLAPPING_ FromTaggedObject' arity U1 False where
1218+ -- Nullary constructors don't need a contents field
1219+ parseFromTaggedObject' _ _ = Tagged (pure U1)
10091220
10101221--------------------------------------------------------------------------------
10111222
1223+-- | Constructors need to be decoded differently depending on whether they're
1224+-- a record or not. This distinction is made by 'ConsParseJSON'.
10121225class ConsFromJSON arity f where
1013− consParseJSON :: Options -> FromArgs arity a
1014− -> Value -> Parser (f a)
1226+ consParseJSON
1227+ :: ConName :* TypeName :* Options :* FromArgs arity a
1228+ -> Value -> Parser (f a)
10151229
10161230class ConsFromJSON' arity f isRecord where
1017− consParseJSON' :: Options -> FromArgs arity a
1018− -> Value -> Tagged isRecord (Parser (f a))
1231+ consParseJSON'
1232+ :: ConName :* TypeName :* Options :* FromArgs arity a
1233+ -> Value -> Tagged isRecord (Parser (f a))
10191234
10201235instance ( IsRecord f isRecord
10211236 , ConsFromJSON' arity f isRecord
10221237 ) => ConsFromJSON arity f where
1023− consParseJSON opts fargs =
1238+ consParseJSON p =
10241239 (unTagged :: Tagged isRecord (Parser (f a)) -> Parser (f a))
1025− . consParseJSON' opts fargs
1240+ . consParseJSON' p
10261241
10271242instance OVERLAPPING_
1028− ( GFromJSON arity a, FromRecord arity (S1 s a)
1243+ ( GFromJSON arity a, RecordFromJSON arity (S1 s a)
10291244 ) => ConsFromJSON' arity (S1 s a) True where
1030− consParseJSON' opts fargs
1031− | unwrapUnaryRecords opts = Tagged . gParseJSON opts fargs
1032− | otherwise = Tagged . withObject "unary record" (parseRecord opts fargs)
1245+ consParseJSON' p@(cname :* tname :* opts :* fargs)
1246+ | unwrapUnaryRecords opts = Tagged . fmap M1 . gParseJSON opts fargs
1247+ | otherwise = Tagged . withObject (showCons cname tname) (recordParseJSON (False :* p))
10331248
1034−instance FromRecord arity f => ConsFromJSON' arity f True where
1035− consParseJSON' opts fargs =
1036− Tagged . withObject "record (:*:)" (parseRecord opts fargs)
1249+instance RecordFromJSON arity f => ConsFromJSON' arity f True where
1250+ consParseJSON' p@(cname :* tname :* _) =
1251+ Tagged . withObject (showCons cname tname) (recordParseJSON (False :* p))
10371252
1038−instance GFromJSON arity f => ConsFromJSON' arity f False where
1039− consParseJSON' opts fargs = Tagged . gParseJSON opts fargs
1253+instance OVERLAPPING_
1254+ ConsFromJSON' arity U1 False where
1255+ -- Empty constructors are expected to be encoded as an empty array:
1256+ consParseJSON' (cname :* tname :* _) v =
1257+ Tagged . contextCons cname tname $ case v of
1258+ Array a | V.null a -> pure U1
1259+ | otherwise -> fail_ a
1260+ _ -> typeMismatch "Array" v
1261+ where
1262+ fail_ a = fail $
1263+ "expected an empty Array, but encountered an Array of length " ++
1264+ show (V.length a)
1265+
1266+instance OVERLAPPING_
1267+ GFromJSON arity f => ConsFromJSON' arity (S1 s f) False where
1268+ consParseJSON' (_ :* _ :* opts :* fargs) =
1269+ Tagged . fmap M1 . gParseJSON opts fargs
1270+
1271+instance (ProductFromJSON arity f, ProductSize f
1272+ ) => ConsFromJSON' arity f False where
1273+ consParseJSON' p = Tagged . productParseJSON0 p
10401274
10411275--------------------------------------------------------------------------------
10421276
1043−class FromRecord arity f where
1044− parseRecord :: Options -> FromArgs arity a
1045− -> Object -> Parser (f a)
1277+class FieldNames f where
1278+ fieldNames :: f a -> [Text] -> [Text]
10461279
1047−instance ( FromRecord arity a
1048− , FromRecord arity b
1049− ) => FromRecord arity (a :*: b) where
1050− parseRecord opts fargs obj =
1051− (:*:) <$> parseRecord opts fargs obj
1052− <*> parseRecord opts fargs obj
1280+instance (FieldNames a, FieldNames b) => FieldNames (a :*: b) where
1281+ fieldNames _ =
1282+ fieldNames (undefined :: a x) .
1283+ fieldNames (undefined :: b y)
10531284
1054−instance OVERLAPPABLE_ (Selector s, GFromJSON arity a) =>
1055− FromRecord arity (S1 s a) where
1056− parseRecord opts fargs =
1057− (<?> Key label) . gParseJSON opts fargs <=< (.: label)
1285+instance (Selector s) => FieldNames (S1 s f) where
1286+ fieldNames _ = (pack (selName (undefined :: M1 _i s _f _p)) :)
1287+
1288+class RecordFromJSON arity f where
1289+ recordParseJSON
1290+ :: Bool :* ConName :* TypeName :* Options :* FromArgs arity a
1291+ -> Object -> Parser (f a)
1292+
1293+instance ( FieldNames f
1294+ , RecordFromJSON' arity f
1295+ ) => RecordFromJSON arity f where
1296+ recordParseJSON (fromTaggedSum :* p@(cname :* tname :* opts :* _)) =
1297+ \obj -> checkUnknown obj >> recordParseJSON' p obj
10581298 where
1059− label = pack . fieldLabelModifier opts $ selName (undefined :: t s a p)
1299+ knownFields :: H.HashMap Text ()
1300+ knownFields = H.fromList $ map (,()) $
1301+ fieldNames (undefined :: f a)
1302+ [pack (tagFieldName (sumEncoding opts)) | fromTaggedSum]
1303+ checkUnknown =
1304+ if not (rejectUnknownFields opts)
1305+ then \_ -> return ()
1306+ else \obj -> case H.keys (H.difference obj knownFields) of
1307+ [] -> return ()
1308+ unknownFields -> contextCons cname tname $
1309+ fail ("unknown fields: " ++ show unknownFields)
1310+
1311+class RecordFromJSON' arity f where
1312+ recordParseJSON'
1313+ :: ConName :* TypeName :* Options :* FromArgs arity a
1314+ -> Object -> Parser (f a)
1315+
1316+instance ( RecordFromJSON' arity a
1317+ , RecordFromJSON' arity b
1318+ ) => RecordFromJSON' arity (a :*: b) where
1319+ recordParseJSON' p obj =
1320+ (:*:) <$> recordParseJSON' p obj
1321+ <*> recordParseJSON' p obj
1322+
1323+instance OVERLAPPABLE_ (Selector s, GFromJSON arity a) =>
1324+ RecordFromJSON' arity (S1 s a) where
1325+ recordParseJSON' (cname :* tname :* opts :* fargs) obj = do
1326+ fv <- contextCons cname tname (obj .: label)
1327+ M1 <$> gParseJSON opts fargs fv <?> Key label
1328+ where
1329+ label = pack $ fieldLabelModifier opts sname
1330+ sname = selName (undefined :: M1 _i s _f _p)
10601331
10611332instance INCOHERENT_ (Selector s, FromJSON a) =>
1062− FromRecord arity (S1 s (K1 i (Maybe a))) where
1063− parseRecord opts _ obj = M1 . K1 <$> obj .:? pack label
1064− where
1065− label = fieldLabelModifier opts $
1066− selName (undefined :: t s (K1 i (Maybe a)) p)
1333+ RecordFromJSON' arity (S1 s (K1 i (Maybe a))) where
1334+ recordParseJSON' (_ :* _ :* opts :* _) obj = M1 . K1 <$> obj .:? pack label
1335+ where
1336+ label = fieldLabelModifier opts sname
1337+ sname = selName (undefined :: M1 _i s _f _p)
10671338
10681339-- Parse an Option like a Maybe.
10691340instance INCOHERENT_ (Selector s, FromJSON a) =>
1070− FromRecord arity (S1 s (K1 i (Semigroup.Option a))) where
1071− parseRecord opts fargs obj = wrap <$> parseRecord opts fargs obj
1341+ RecordFromJSON' arity (S1 s (K1 i (Semigroup.Option a))) where
1342+ recordParseJSON' p obj = wrap <$> recordParseJSON' p obj
10721343 where
10731344 wrap :: S1 s (K1 i (Maybe a)) p -> S1 s (K1 i (Semigroup.Option a)) p
10741345 wrap (M1 (K1 a)) = M1 (K1 (Semigroup.Option a))
10751346
10761347--------------------------------------------------------------------------------
10771348
1078−class FromProduct arity f where
1079− parseProduct :: Options -> FromArgs arity a
1349+productParseJSON0
1350+ :: forall f arity a. (ProductFromJSON arity f, ProductSize f)
1351+ => ConName :* TypeName :* Options :* FromArgs arity a
1352+ -> Value -> Parser (f a)
1353+ -- Products are expected to be encoded to an array. Here we check whether we
1354+ -- got an array of the same size as the product, then parse each of the
1355+ -- product's elements using productParseJSON:
1356+productParseJSON0 p@(cname :* tname :* _ :* _) =
1357+ withArray (showCons cname tname) $ \arr ->
1358+ let lenArray = V.length arr
1359+ lenProduct = (unTagged2 :: Tagged2 f Int -> Int)
1360+ productSize in
1361+ if lenArray == lenProduct
1362+ then productParseJSON p arr 0 lenProduct
1363+ else contextCons cname tname $
1364+ fail $ "expected an Array of length " ++ show lenProduct ++
1365+ ", but encountered an Array of length " ++ show lenArray
1366+
1367+--
1368+
1369+class ProductFromJSON arity f where
1370+ productParseJSON :: ConName :* TypeName :* Options :* FromArgs arity a
10801371 -> Array -> Int -> Int
10811372 -> Parser (f a)
10821373
1083−instance ( FromProduct arity a
1084− , FromProduct arity b
1085− ) => FromProduct arity (a :*: b) where
1086− parseProduct opts fargs arr ix len =
1087− (:*:) <$> parseProduct opts fargs arr ix lenL
1088− <*> parseProduct opts fargs arr ixR lenR
1374+instance ( ProductFromJSON arity a
1375+ , ProductFromJSON arity b
1376+ ) => ProductFromJSON arity (a :*: b) where
1377+ productParseJSON p arr ix len =
1378+ (:*:) <$> productParseJSON p arr ix lenL
1379+ <*> productParseJSON p arr ixR lenR
10891380 where
10901381 lenL = len `unsafeShiftR` 1
10911382 ixR = ix + lenL
10921383 lenR = len - lenL
10931384
1094−instance (GFromJSON arity a) => FromProduct arity (S1 s a) where
1095− parseProduct opts fargs arr ix _ =
1096− gParseJSON opts fargs $ V.unsafeIndex arr ix
1385+instance (GFromJSON arity a) => ProductFromJSON arity (S1 s a) where
1386+ productParseJSON (_ :* _ :* opts :* fargs) arr ix _ =
1387+ M1 <$> gParseJSON opts fargs (V.unsafeIndex arr ix) <?> Index ix
10971388
10981389--------------------------------------------------------------------------------
10991390
11001391class FromPair arity f where
1101− parsePair :: Options -> FromArgs arity a
1102− -> Pair -> Maybe (Parser (f a))
1392+ -- The first component of the parameter tuple is the tag to match.
1393+ parsePair :: Text :* TypeName :* Options :* FromArgs arity a
1394+ -> Value
1395+ -> Maybe (Parser (f a))
11031396
11041397instance ( FromPair arity a
11051398 , FromPair arity b
11061399 ) => FromPair arity (a :+: b) where
1107− parsePair opts fargs pair = (fmap L1 <$> parsePair opts fargs pair) <|>
1108− (fmap R1 <$> parsePair opts fargs pair)
1400+ parsePair p pair =
1401+ (fmap L1 <$> parsePair p pair) <|>
1402+ (fmap R1 <$> parsePair p pair)
11091403
11101404instance ( Constructor c
1111− , GFromJSON arity a
11121405 , ConsFromJSON arity a
11131406 ) => FromPair arity (C1 c a) where
1114− parsePair opts fargs (tag, value)
1115− | tag == tag' = Just $ gParseJSON opts fargs value
1407+ parsePair (tag :* p@(_ :* opts :* _)) v
1408+ | tag == tag' = Just $ M1 <$> consParseJSON (cname :* p) v
11161409 | otherwise = Nothing
1117− where
1118− tag' = pack $ constructorTagModifier opts $
1119− conName (undefined :: t c a p)
1410+ where
1411+ tag' = pack $ constructorTagModifier opts cname
1412+ cname = conName (undefined :: M1 _i c _a _p)
11201413
11211414--------------------------------------------------------------------------------
11221415
11231416class FromUntaggedValue arity f where
1124− parseUntaggedValue :: Options -> FromArgs arity a
1125− -> Value -> Parser (f a)
1417+ parseUntaggedValue :: TypeName :* Options :* FromArgs arity a
1418+ -> Value
1419+ -> Parser (f a)
11261420
11271421instance
11281422 ( FromUntaggedValue arity a
11291423 , FromUntaggedValue arity b
11301424 ) => FromUntaggedValue arity (a :+: b)
11311425 where
1132− parseUntaggedValue opts fargs value =
1133− L1 <$> parseUntaggedValue opts fargs value <|>
1134− R1 <$> parseUntaggedValue opts fargs value
1426+ parseUntaggedValue p value =
1427+ L1 <$> parseUntaggedValue p value <|>
1428+ R1 <$> parseUntaggedValue p value
11351429
11361430instance OVERLAPPABLE_
1137− ( GFromJSON arity a
1138− , ConsFromJSON arity a
1431+ ( ConsFromJSON arity a
1432+ , Constructor c
11391433 ) => FromUntaggedValue arity (C1 c a)
11401434 where
1141− parseUntaggedValue = gParseJSON
1435+ parseUntaggedValue p = fmap M1 . consParseJSON (cname :* p)
1436+ where
1437+ cname = conName (undefined :: M1 _i c _f _p)
11421438
11431439instance OVERLAPPING_
11441440 ( Constructor c )
11451441 => FromUntaggedValue arity (C1 c U1)
11461442 where
1147− parseUntaggedValue opts _ (String s)
1148− | s == pack (constructorTagModifier opts (conName (undefined :: t c U1 p))) =
1149− pure $ M1 U1
1150− | otherwise =
1151− fail $ "Invalid tag: " ++ unpack s
1152− parseUntaggedValue _ _ v = typeMismatch (conName (undefined :: t c U1 p)) v
1153−
1154−
1155−--------------------------------------------------------------------------------
1156−
1157−notFound :: Text -> Parser a
1158−notFound key = fail $ "The key \"" ++ unpack key ++ "\" was not found"
1159−{-# INLINE notFound #-}
1443+ parseUntaggedValue (tname :* opts :* _) v =
1444+ contextCons cname tname $ case v of
1445+ String tag
1446+ | tag == tag' -> pure $ M1 U1
1447+ | otherwise -> fail_ tag
1448+ _ -> typeMismatch "String" v
1449+ where
1450+ tag' = pack $ constructorTagModifier opts cname
1451+ cname = conName (undefined :: M1 _i c _f _p)
1452+ fail_ tag = fail $
1453+ "expected tag " ++ show tag' ++ ", but found tag " ++ show tag
11601454
11611455-------------------------------------------------------------------------------
11621456-- Instances
@@ -1219,14 +1513,15 @@ instance FromJSON Void where
12191513 {-# INLINE parseJSON #-}
12201514
12211515instance FromJSON Bool where
1222− parseJSON = withBool "Bool" pure
1516+ parseJSON (Bool b) = pure b
1517+ parseJSON v = typeMismatch "Bool" v
12231518 {-# INLINE parseJSON #-}
12241519
12251520instance FromJSONKey Bool where
12261521 fromJSONKey = FromJSONKeyTextParser $ \t -> case t of
12271522 "true" -> pure True
12281523 "false" -> pure False
1229− _ -> fail $ "Cannot parse key into Bool: " ++ T.unpack t
1524+ _ -> fail $ "cannot parse key " ++ show t ++ " into Bool"
12301525
12311526instance FromJSON Ordering where
12321527 parseJSON = withText "Ordering" $ \s ->
@@ -1234,25 +1529,30 @@ instance FromJSON Ordering where
12341529 "LT" -> return LT
12351530 "EQ" -> return EQ
12361531 "GT" -> return GT
1237− _ -> fail "Parsing Ordering value failed: expected \"LT\", \"EQ\", or \"GT\""
1532+ _ -> fail $ "parsing Ordering failed, unexpected " ++ show s ++
1533+ " (expected \"LT\", \"EQ\", or \"GT\")"
12381534
12391535instance FromJSON () where
12401536 parseJSON = withArray "()" $ \v ->
12411537 if V.null v
12421538 then pure ()
1243− else fail "Expected an empty array"
1539+ else prependContext "()" $ fail "expected an empty array"
12441540 {-# INLINE parseJSON #-}
12451541
12461542instance FromJSON Char where
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"
1543+ parseJSON = withText "Char" parseChar
12511544 {-# INLINE parseJSON #-}
12521545
1253− parseJSONList = withText "String" $ pure . T.unpack
1546+ parseJSONList (String s) = pure (T.unpack s)
1547+ parseJSONList v = typeMismatch "String" v
12541548 {-# INLINE parseJSONList #-}
12551549
1550+parseChar :: Text -> Parser Char
1551+parseChar t =
1552+ if T.compareLength t 1 == EQ
1553+ then pure $ T.head t
1554+ else prependContext "Char" $ fail "expected a string of length 1"
1555+
12561556instance FromJSON Double where
12571557 parseJSON = parseRealFloat "Double"
12581558 {-# INLINE parseJSON #-}
@@ -1276,12 +1576,22 @@ instance FromJSONKey Float where
12761576 _ -> Scientific.toRealFloat <$> parseScientificText t
12771577
12781578instance (FromJSON a, Integral a) => FromJSON (Ratio a) where
1279− parseJSON = withObject "Rational" $ \obj -> do
1280− numerator <- obj .: "numerator"
1281− denominator <- obj .: "denominator"
1282− if denominator == 0
1283− then fail "Ratio denominator was 0"
1284− else pure $ numerator % denominator
1579+ parseJSON (Number x)
1580+ | exp10 <= 1024
1581+ , exp10 >= -1024 = return $! realToFrac x
1582+ | otherwise = prependContext "Ratio" $ fail msg
1583+ where
1584+ exp10 = base10Exponent x
1585+ msg = "found a number with exponent " ++ show exp10
1586+ ++ ", but it must not be greater than 1024 or less than -1024"
1587+ parseJSON o = objParser o
1588+ where
1589+ objParser = withObject "Rational" $ \obj -> do
1590+ numerator <- obj .: "numerator"
1591+ denominator <- obj .: "denominator"
1592+ if denominator == 0
1593+ then fail "Ratio denominator was 0"
1594+ else pure $ numerator % denominator
12851595 {-# INLINE parseJSON #-}
12861596
12871597-- | This instance includes a bounds check to prevent maliciously
@@ -1289,7 +1599,7 @@ instance (FromJSON a, Integral a) => FromJSON (Ratio a) where
12891599-- newtype 'Scientific' and provide your own instance using
12901600-- 'withScientific' if you want to allow larger inputs.
12911601instance HasResolution a => FromJSON (Fixed a) where
1292− parseJSON = withBoundedScientific "Fixed" $ pure . realToFrac
1602+ parseJSON = prependContext "Fixed" . withBoundedScientific' (pure . realToFrac)
12931603 {-# INLINE parseJSON #-}
12941604
12951605instance FromJSON Int where
@@ -1312,19 +1622,20 @@ instance FromJSONKey Integer where
13121622
13131623instance FromJSON Natural where
13141624 parseJSON value = do
1315− integer :: Integer <- parseIntegral "Natural" value
1316− if integer < 0 then
1317− fail $ "expected Natural, encountered negative number " <> show integer
1318− else
1319− pure $ fromIntegral integer
1625+ integer <- parseIntegral "Natural" value
1626+ parseNatural integer
13201627
13211628instance FromJSONKey Natural where
13221629 fromJSONKey = FromJSONKeyTextParser $ \text -> do
1323− integer :: Integer <- parseIntegralText "Natural" text
1324− if integer < 0 then
1325− fail $ "expected Natural, encountered negative number " <> show integer
1326− else
1327− pure $ fromIntegral integer
1630+ integer <- parseIntegralText "Natural" text
1631+ parseNatural integer
1632+
1633+parseNatural :: Integer -> Parser Natural
1634+parseNatural integer =
1635+ if integer < 0 then
1636+ fail $ "parsing Natural failed, unexpected negative number " <> show integer
1637+ else
1638+ pure $ fromIntegral integer
13281639
13291640instance FromJSON Int8 where
13301641 parseJSON = parseBoundedIntegral "Int8"
@@ -1421,17 +1732,17 @@ parseVersionText = go . readP_to_S parseVersion . unpack
14211732 where
14221733 go [(v,[])] = return v
14231734 go (_ : xs) = go xs
1424− go _ = fail "could not parse Version"
1735+ go _ = fail "parsing Version failed"
14251736
14261737-------------------------------------------------------------------------------
14271738-- semigroups NonEmpty
14281739-------------------------------------------------------------------------------
14291740
14301741instance FromJSON1 NonEmpty where
1431− liftParseJSON p _ = withArray "NonEmpty a" $
1742+ liftParseJSON p _ = withArray "NonEmpty" $
14321743 (>>= ne) . Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
14331744 where
1434− ne [] = fail "Expected a NonEmpty but got an empty list"
1745+ ne [] = fail "parsing NonEmpty failed, unexpected empty list"
14351746 ne (x:xs) = pure (x :| xs)
14361747 {-# INLINE liftParseJSON #-}
14371748
@@ -1452,7 +1763,7 @@ instance FromJSON Scientific where
14521763-------------------------------------------------------------------------------
14531764
14541765instance FromJSON1 DList.DList where
1455− liftParseJSON p _ = withArray "DList a" $
1766+ liftParseJSON p _ = withArray "DList" $
14561767 fmap DList.fromList .
14571768 Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
14581769 {-# INLINE liftParseJSON #-}
@@ -1529,7 +1840,7 @@ instance (FromJSON1 f, FromJSON1 g) => FromJSON1 (Sum f g) where
15291840 inr = "InR"
15301841
15311842 liftParseJSON _ _ _ = fail $
1532− "expected an object with a single property " ++
1843+ "parsing Sum failed, expected an object with a single property " ++
15331844 "where the property key should be either " ++
15341845 "\"InL\" or \"InR\""
15351846 {-# INLINE liftParseJSON #-}
@@ -1543,7 +1854,7 @@ instance (FromJSON1 f, FromJSON1 g, FromJSON a) => FromJSON (Sum f g a) where
15431854-------------------------------------------------------------------------------
15441855
15451856instance FromJSON1 Seq.Seq where
1546− liftParseJSON p _ = withArray "Seq a" $
1857+ liftParseJSON p _ = withArray "Seq" $
15471858 fmap Seq.fromList .
15481859 Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
15491860 {-# INLINE liftParseJSON #-}
@@ -1577,13 +1888,13 @@ instance FromJSON a => FromJSON (IntMap.IntMap a) where
15771888
15781889instance (FromJSONKey k, Ord k) => FromJSON1 (M.Map k) where
15791890 liftParseJSON p _ = case fromJSONKey of
1580− FromJSONKeyCoerce _-> withObject "Map k v" $
1891+ FromJSONKeyCoerce _ -> withObject "Map" $
15811892 fmap (H.foldrWithKey (M.insert . unsafeCoerce) M.empty) . H.traverseWithKey (\k v -> p v <?> Key k)
1582− FromJSONKeyText f -> withObject "Map k v" $
1893+ FromJSONKeyText f -> withObject "Map" $
15831894 fmap (H.foldrWithKey (M.insert . f) M.empty) . H.traverseWithKey (\k v -> p v <?> Key k)
1584− FromJSONKeyTextParser f -> withObject "Map k v" $
1895+ FromJSONKeyTextParser f -> withObject "Map" $
15851896 H.foldrWithKey (\k v m -> M.insert <$> f k <?> Key k <*> p v <?> Key k <*> m) (pure M.empty)
1586− FromJSONKeyValue f -> withArray "Map k v" $ \arr ->
1897+ FromJSONKeyValue f -> withArray "Map" $ \arr ->
15871898 fmap M.fromList . Tr.sequence .
15881899 zipWith (parseIndexedJSONPair f p) [0..] . V.toList $ arr
15891900 {-# INLINE liftParseJSON #-}
@@ -1611,18 +1922,18 @@ instance (FromJSON v) => FromJSON (Tree.Tree v) where
16111922
16121923instance FromJSON UUID.UUID where
16131924 parseJSON = withText "UUID" $
1614− maybe (fail "Invalid UUID") pure . UUID.fromText
1925+ maybe (fail "invalid UUID") pure . UUID.fromText
16151926
16161927instance FromJSONKey UUID.UUID where
16171928 fromJSONKey = FromJSONKeyTextParser $
1618− maybe (fail "Invalid UUID") pure . UUID.fromText
1929+ maybe (fail "invalid UUID") pure . UUID.fromText
16191930
16201931-------------------------------------------------------------------------------
16211932-- vector
16221933-------------------------------------------------------------------------------
16231934
16241935instance FromJSON1 Vector where
1625− liftParseJSON p _ = withArray "Vector a" $
1936+ liftParseJSON p _ = withArray "Vector" $
16261937 V.mapM (uncurry $ parseIndexedJSON p) . V.indexed
16271938 {-# INLINE liftParseJSON #-}
16281939
@@ -1636,14 +1947,14 @@ vectorParseJSON s = withArray s $ fmap V.convert . V.mapM (uncurry $ parseIndexe
16361947{-# INLINE vectorParseJSON #-}
16371948
16381949instance (Storable a, FromJSON a) => FromJSON (VS.Vector a) where
1639− parseJSON = vectorParseJSON "Data.Vector.Storable.Vector a"
1950+ parseJSON = vectorParseJSON "Data.Vector.Storable.Vector"
16401951
16411952instance (VP.Prim a, FromJSON a) => FromJSON (VP.Vector a) where
1642− parseJSON = vectorParseJSON "Data.Vector.Primitive.Vector a"
1953+ parseJSON = vectorParseJSON "Data.Vector.Primitive.Vector"
16431954 {-# INLINE parseJSON #-}
16441955
16451956instance (VG.Vector VU.Vector a, FromJSON a) => FromJSON (VU.Vector a) where
1646− parseJSON = vectorParseJSON "Data.Vector.Unboxed.Vector a"
1957+ parseJSON = vectorParseJSON "Data.Vector.Unboxed.Vector"
16471958 {-# INLINE parseJSON #-}
16481959
16491960-------------------------------------------------------------------------------
@@ -1657,13 +1968,13 @@ instance (Eq a, Hashable a, FromJSON a) => FromJSON (HashSet.HashSet a) where
16571968
16581969instance (FromJSONKey k, Eq k, Hashable k) => FromJSON1 (H.HashMap k) where
16591970 liftParseJSON p _ = case fromJSONKey of
1660− FromJSONKeyCoerce _ -> withObject "HashMap ~Text v" $
1971+ FromJSONKeyCoerce _ -> withObject "HashMap ~Text" $
16611972 uc . H.traverseWithKey (\k v -> p v <?> Key k)
1662− FromJSONKeyText f -> withObject "HashMap k v" $
1973+ FromJSONKeyText f -> withObject "HashMap" $
16631974 fmap (mapKey f) . H.traverseWithKey (\k v -> p v <?> Key k)
1664− FromJSONKeyTextParser f -> withObject "HashMap k v" $
1975+ FromJSONKeyTextParser f -> withObject "HashMap" $
16651976 H.foldrWithKey (\k v m -> H.insert <$> f k <?> Key k <*> p v <?> Key k <*> m) (pure H.empty)
1666− FromJSONKeyValue f -> withArray "Map k v" $ \arr ->
1977+ FromJSONKeyValue f -> withArray "Map" $ \arr ->
16671978 fmap H.fromList . Tr.sequence .
16681979 zipWith (parseIndexedJSONPair f p) [0..] . V.toList $ arr
16691980 where
@@ -1686,7 +1997,7 @@ instance FromJSON DotNetTime where
16861997 parseJSON = withText "DotNetTime" $ \t ->
16871998 let (s,m) = T.splitAt (T.length t - 5) t
16881999 t' = T.concat [s,".",m]
1689− in case parseTime defaultTimeLocale "/Date(%s%Q)/" (unpack t') of
2000+ in case parseTimeM True defaultTimeLocale "/Date(%s%Q)/" (unpack t') of
16902001 Just d -> pure (DotNetTime d)
16912002 _ -> fail "could not parse .NET time"
16922003 {-# INLINE parseJSON #-}
@@ -1695,7 +2006,6 @@ instance FromJSON DotNetTime where
16952006-- primitive
16962007-------------------------------------------------------------------------------
16972008
1698−#if MIN_VERSION_base(4,7,0)
16992009instance FromJSON a => FromJSON (PM.Array a) where
17002010 -- note: we could do better than this if vector exposed the data
17012011 -- constructor in Data.Vector.
@@ -1708,6 +2018,7 @@ instance FromJSON a => FromJSON (PM.SmallArray a) where
17082018instance (PM.Prim a,FromJSON a) => FromJSON (PM.PrimArray a) where
17092019 parseJSON = fmap Exts.fromList . parseJSON
17102020
2021+#if !MIN_VERSION_primitive(0,7,0)
17112022instance (PM.PrimUnlifted a,FromJSON a) => FromJSON (PM.UnliftedArray a) where
17122023 parseJSON = fmap Exts.fromList . parseJSON
17132024#endif
@@ -1780,6 +2091,40 @@ instance FromJSON DiffTime where
17802091 parseJSON = withBoundedScientific "DiffTime" $ pure . realToFrac
17812092 {-# INLINE parseJSON #-}
17822093
2094+instance FromJSON SystemTime where
2095+ parseJSON v = prependContext "SystemTime" $ do
2096+ n <- parseJSON v
2097+ let n' = floor (n * fromInteger (resolution n) :: Nano)
2098+ let (secs, nano) = n' `divMod` resolution n
2099+ return (MkSystemTime (fromInteger secs) (fromInteger nano))
2100+
2101+instance FromJSON CalendarDiffTime where
2102+ parseJSON = withObject "CalendarDiffTime" $ \obj -> CalendarDiffTime
2103+ <$> obj .: "months"
2104+ <*> obj .: "time"
2105+
2106+instance FromJSON CalendarDiffDays where
2107+ parseJSON = withObject "CalendarDiffDays" $ \obj -> CalendarDiffDays
2108+ <$> obj .: "months"
2109+ <*> obj .: "days"
2110+
2111+instance FromJSON DayOfWeek where
2112+ parseJSON = withText "DaysOfWeek" parseDayOfWeek
2113+
2114+parseDayOfWeek :: T.Text -> Parser DayOfWeek
2115+parseDayOfWeek t = case T.toLower t of
2116+ "monday" -> return Monday
2117+ "tuesday" -> return Tuesday
2118+ "wednesday" -> return Wednesday
2119+ "thursday" -> return Thursday
2120+ "friday" -> return Friday
2121+ "saturday" -> return Saturday
2122+ "sunday" -> return Sunday
2123+ _ -> fail "Invalid week day"
2124+
2125+instance FromJSONKey DayOfWeek where
2126+ fromJSONKey = FromJSONKeyTextParser parseDayOfWeek
2127+
17832128-------------------------------------------------------------------------------
17842129-- base Monoid/Semigroup
17852130-------------------------------------------------------------------------------
@@ -1900,14 +2245,15 @@ instance FromJSON a => FromJSON (Semigroup.Option a) where
19002245
19012246instance FromJSON1 Proxy where
19022247 {-# INLINE liftParseJSON #-}
1903− liftParseJSON _ _ Null = pure Proxy
1904− liftParseJSON _ _ v = typeMismatch "Proxy" v
2248+ liftParseJSON _ _ = fromNull "Proxy" Proxy
19052249
19062250instance FromJSON (Proxy a) where
19072251 {-# INLINE parseJSON #-}
1908− parseJSON Null = pure Proxy
1909− parseJSON v = typeMismatch "Proxy" v
2252+ parseJSON = fromNull "Proxy" Proxy
19102253
2254+fromNull :: String -> a -> Value -> Parser a
2255+fromNull _ a Null = pure a
2256+fromNull c _ v = prependContext c (typeMismatch "Null" v)
19112257
19122258instance FromJSON2 Tagged where
19132259 liftParseJSON2 _ _ p _ = fmap Tagged . p
@@ -1934,10 +2280,7 @@ instance (FromJSON a, FromJSON b, FromJSON c) => FromJSONKey (a,b,c)
19342280instance (FromJSON a, FromJSON b, FromJSON c, FromJSON d) => FromJSONKey (a,b,c,d)
19352281
19362282instance FromJSONKey Char where
1937− fromJSONKey = FromJSONKeyTextParser $ \t ->
1938− if T.length t == 1
1939− then return (T.index t 0)
1940− else typeMismatch "Expected Char but String didn't contain exactly one character" (String t)
2283+ fromJSONKey = FromJSONKeyTextParser parseChar
19412284 fromJSONKeyList = FromJSONKeyText T.unpack
19422285
19432286instance (FromJSONKey a, FromJSON a) => FromJSONKey [a] where