@@ -5,16 +5,20 @@
55{-# LANGUAGE FlexibleInstances #-}
66{-# LANGUAGE GADTs #-}
77{-# LANGUAGE MultiParamTypeClasses #-}
8+{-# LANGUAGE NamedFieldPuns #-}
89{-# LANGUAGE NoImplicitPrelude #-}
910{-# LANGUAGE OverloadedStrings #-}
10−{-# LANGUAGE PolyKinds #-}
1111{-# LANGUAGE RecordWildCards #-}
1212{-# LANGUAGE ScopedTypeVariables #-}
1313{-# LANGUAGE TypeOperators #-}
14−{-# LANGUAGE TupleSections #-}
14+{-# LANGUAGE TypeSynonymInstances #-}
1515{-# LANGUAGE UndecidableInstances #-}
1616{-# LANGUAGE ViewPatterns #-}
1717
18+#if __GLASGOW_HASKELL__ >= 706
19+{-# LANGUAGE PolyKinds #-}
20+#endif
21+
1822#include "incoherent-compat.h"
1923#include "overlapping-compat.h"
2024
@@ -42,9 +46,6 @@ module Data.Aeson.Types.FromJSON
4246 , coerceFromJSONKeyFunction
4347 , mapFromJSONKeyFunction
4448
45− , GFromJSONKey()
46− , genericFromJSONKey
47−
4849 -- * List functions
4950 , listParser
5051
@@ -60,7 +61,6 @@ module Data.Aeson.Types.FromJSON
6061 , fromJSON
6162 , ifromJSON
6263 , typeMismatch
63− , unexpected
6464 , parseField
6565 , parseFieldMaybe
6666 , parseFieldMaybe'
@@ -80,14 +80,14 @@ module Data.Aeson.Types.FromJSON
8080
8181import Prelude.Compat
8282
83−import Control.Applicative ((<|>), Const(..), liftA2)
84−import Control.Monad (zipWithM)
83+import Control.Applicative ((<|>), Const(..))
84+import Control.Monad ((<=<), zipWithM)
8585import Data.Aeson.Internal.Functions (mapKey)
8686import Data.Aeson.Parser.Internal (eitherDecodeWith, jsonEOF)
8787import Data.Aeson.Types.Generic
8888import Data.Aeson.Types.Internal
8989import Data.Bits (unsafeShiftR)
90−import Data.Fixed (Fixed, HasResolution (resolution), Nano)
90+import Data.Fixed (Fixed, HasResolution)
9191import Data.Functor.Compose (Compose(..))
9292import Data.Functor.Identity (Identity(..))
9393import Data.Functor.Product (Product(..))
@@ -103,10 +103,8 @@ import Data.Scientific (Scientific, base10Exponent)
103103import Data.Tagged (Tagged(..))
104104import Data.Text (Text, pack, unpack)
105105import Data.Time (Day, DiffTime, LocalTime, NominalDiffTime, TimeOfDay, UTCTime, ZonedTime)
106−import Data.Time.Calendar.Compat (CalendarDiffDays (..), DayOfWeek (..))
107−import Data.Time.LocalTime.Compat (CalendarDiffTime (..))
108−import Data.Time.Clock.System.Compat (SystemTime (..))
109−import Data.Time.Format.Compat (parseTimeM, defaultTimeLocale)
106+import Data.Time.Format (parseTime)
107+import Data.Time.Locale.Compat (defaultTimeLocale)
110108import Data.Traversable as Tr (sequence)
111109import Data.Vector (Vector)
112110import Data.Version (Version, parseVersion)
@@ -118,9 +116,9 @@ import GHC.Generics
118116import Numeric.Natural (Natural)
119117import Text.ParserCombinators.ReadP (readP_to_S)
120118import Unsafe.Coerce (unsafeCoerce)
119+import qualified Data.Aeson.Compat as Compat
121120import qualified Data.Aeson.Parser.Time as Time
122121import qualified Data.Attoparsec.ByteString.Char8 as A (endOfInput, parseOnly, scientific)
123−import qualified Data.ByteString.Lazy as L
124122import qualified Data.DList as DList
125123import qualified Data.HashMap.Strict as H
126124import qualified Data.HashSet as HashSet
@@ -149,14 +147,22 @@ import qualified Data.Primitive.SmallArray as PM
149147import qualified Data.Primitive.Types as PM
150148
151149#if MIN_VERSION_primitive(0,6,4)
152−#if !MIN_VERSION_primitive(0,7,0)
153150import qualified Data.Primitive.UnliftedArray as PM
154−#endif
155151import qualified Data.Primitive.PrimArray as PM
156152#endif
157153
154+#ifndef HAS_COERCIBLE
155+#define HAS_COERCIBLE (__GLASGOW_HASKELL__ >= 707)
156+#endif
158157
158+#if HAS_COERCIBLE
159159import Data.Coerce (Coercible, coerce)
160+coerce' :: Coercible a b => a -> b
161+coerce' = coerce
162+#else
163+coerce' :: a -> b
164+coerce' = unsafeCoerce
165+#endif
160166
161167parseIndexedJSON :: (Value -> Parser a) -> Int -> Value -> Parser a
162168parseIndexedJSON p idx value = p value <?> Index idx
@@ -165,7 +171,7 @@ parseIndexedJSON p idx value = p value <?> Index idx
165171parseIndexedJSONPair :: (Value -> Parser a) -> (Value -> Parser b) -> Int -> Value -> Parser (a, b)
166172parseIndexedJSONPair keyParser valParser idx value = p value <?> Index idx
167173 where
168− p = withArray "(k, v)" $ \ab ->
174+ p = withArray "(k,v)" $ \ab ->
169175 let n = V.length ab
170176 in if n == 2
171177 then (,) <$> parseJSONElemAtIndex keyParser 0 ab
@@ -178,33 +184,33 @@ parseJSONElemAtIndex :: (Value -> Parser a) -> Int -> V.Vector Value -> Parser a
178184parseJSONElemAtIndex p idx ary = p (V.unsafeIndex ary idx) <?> Index idx
179185
180186parseRealFloat :: RealFloat a => String -> Value -> Parser a
181−parseRealFloat _ (Number s) = pure $ Scientific.toRealFloat s
182−parseRealFloat _ Null = pure (0/0)
183−parseRealFloat name v = prependContext name (unexpected v)
187+parseRealFloat _ (Number s) = pure $ Scientific.toRealFloat s
188+parseRealFloat _ Null = pure (0/0)
189+parseRealFloat expected v = typeMismatch expected v
184190{-# INLINE parseRealFloat #-}
185191
186−parseIntegralFromScientific :: forall a. Integral a => Scientific -> Parser a
187−parseIntegralFromScientific s =
192+parseIntegralFromScientific :: forall a. Integral a => String -> Scientific -> Parser a
193+parseIntegralFromScientific expected s =
188194 case Scientific.floatingOrInteger s :: Either Double a of
189195 Right x -> pure x
190− Left _ -> fail $ "unexpected floating number " ++ show s
196+ Left _ -> fail $ "expected " ++ expected ++ ", encountered floating number " ++ show s
191197{-# INLINE parseIntegralFromScientific #-}
192198
193199parseIntegral :: Integral a => String -> Value -> Parser a
194−parseIntegral name =
195− prependContext name . withBoundedScientific' parseIntegralFromScientific
200+parseIntegral expected =
201+ withBoundedScientific expected $ parseIntegralFromScientific expected
196202{-# INLINE parseIntegral #-}
197203
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)
204+parseBoundedIntegralFromScientific :: (Bounded a, Integral a) => String -> Scientific -> Parser a
205+parseBoundedIntegralFromScientific expected s = maybe
206+ (fail $ expected ++ " is either floating or will cause over or underflow: " ++ show s)
201207 pure
202208 (Scientific.toBoundedInteger s)
203209{-# INLINE parseBoundedIntegralFromScientific #-}
204210
205211parseBoundedIntegral :: (Bounded a, Integral a) => String -> Value -> Parser a
206−parseBoundedIntegral name =
207− prependContext name . withScientific' parseBoundedIntegralFromScientific
212+parseBoundedIntegral expected =
213+ withScientific expected $ parseBoundedIntegralFromScientific expected
208214{-# INLINE parseBoundedIntegral #-}
209215
210216parseScientificText :: Text -> Parser Scientific
@@ -214,20 +220,18 @@ parseScientificText
214220 . T.encodeUtf8
215221
216222parseIntegralText :: Integral a => String -> Text -> Parser a
217−parseIntegralText name t =
218− prependContext name $
219− parseScientificText t
220− >>= rejectLargeExponent
221− >>= parseIntegralFromScientific
223+parseIntegralText expected t
224+ = parseScientificText t
225+ >>= rejectLargeExponent
226+ >>= parseIntegralFromScientific expected
222227 where
223228 rejectLargeExponent :: Scientific -> Parser Scientific
224− rejectLargeExponent s = withBoundedScientific' pure (Number s)
229+ rejectLargeExponent s = withBoundedScientific expected pure (Number s)
225230{-# INLINE parseIntegralText #-}
226231
227232parseBoundedIntegralText :: (Bounded a, Integral a) => String -> Text -> Parser a
228−parseBoundedIntegralText name t =
229− prependContext name $
230− parseScientificText t >>= parseBoundedIntegralFromScientific
233+parseBoundedIntegralText expected t =
234+ parseScientificText t >>= parseBoundedIntegralFromScientific expected
231235
232236parseOptionalFieldWith :: (Value -> Parser (Maybe a))
233237 -> Object -> Text -> Parser (Maybe a)
@@ -287,21 +291,14 @@ genericLiftParseJSON opts pj pjl = fmap to1 . gParseJSON opts (From1Args pj pjl)
287291--
288292-- The basic ways to signal a failed conversion are as follows:
289293--
290−-- * 'fail' yields a custom error message: it is the recommended way of
291−-- reporting a failure;
294+-- * 'empty' and 'mzero' work, but are terse and uninformative;
292295--
293−-- * 'Control.Applicative.empty' (or 'Control.Monad.mzero') is uninformative:
294−-- use it when the error is meant to be caught by some @('<|>')@;
296+-- * 'fail' yields a custom error message;
295297--
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.
298+-- * 'typeMismatch' produces an informative message for cases when the
299+-- value encountered is not of the expected type.
300300--
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':
301+-- An example type and instance using 'typeMismatch':
305302--
306303-- @
307304-- \-- Allow ourselves to write 'Text' literals.
@@ -315,15 +312,13 @@ genericLiftParseJSON opts pj pjl = fmap to1 . gParseJSON opts (From1Args pj pjl)
315312-- '<*>' v '.:' \"y\"
316313--
317314-- \-- We do not expect a non-'Object' value here.
318−-- \-- We could use 'Control.Applicative.empty' to fail, but 'typeMismatch'
315+-- \-- We could use 'mzero' to fail, but 'typeMismatch'
319316-- \-- gives a much more informative error message.
320−-- 'parseJSON' invalid =
321−-- 'prependFailure' "parsing Coord failed, "
322−-- ('typeMismatch' \"Object\" invalid)
317+-- 'parseJSON' invalid = 'typeMismatch' \"Coord\" invalid
323318-- @
324319--
325320-- For this common case of only being concerned with a single
326−-- type of JSON value, the functions 'withObject', 'withScientific', etc.
321+-- type of JSON value, the functions 'withObject', 'withNumber', etc.
327322-- are provided. Their use is to be preferred when possible, since
328323-- they are more terse. Using 'withObject', we can rewrite the above instance
329324-- (assuming the same language extension and data type) as:
@@ -362,7 +357,7 @@ genericLiftParseJSON opts pj pjl = fmap to1 . gParseJSON opts (From1Args pj pjl)
362357-- @
363358--
364359-- The default implementation will be equivalent to
365−-- @parseJSON = 'genericParseJSON' 'defaultOptions'@; if you need different
360+-- @parseJSON = 'genericParseJSON' 'defaultOptions'@; If you need different
366361-- options, you can customize the generic decoding by defining:
367362--
368363-- @
@@ -380,11 +375,13 @@ class FromJSON a where
380375 parseJSON = genericParseJSON defaultOptions
381376
382377 parseJSONList :: Value -> Parser [a]
383− parseJSONList = withArray "[]" $ \a ->
384− zipWithM (parseIndexedJSON parseJSON) [0..]
378+ parseJSONList (Array a)
379+ = zipWithM (parseIndexedJSON parseJSON) [0..]
385380 . V.toList
386381 $ a
387382
383+ parseJSONList v = typeMismatch "[a]" v
384+
388385-------------------------------------------------------------------------------
389386-- Classes and types for map keys
390387-------------------------------------------------------------------------------
@@ -396,16 +393,6 @@ class FromJSON a where
396393-- > newtype SomeId = SomeId { getSomeId :: Text }
397394-- > deriving (Eq,Ord,Hashable,FromJSONKey)
398395--
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−-- @
409396class FromJSONKey a where
410397 -- | Strategy for parsing the key of a map-like container.
411398 fromJSONKey :: FromJSONKeyFunction a
@@ -428,7 +415,11 @@ class FromJSONKey a where
428415-- At the moment this type is intentionally not exported. 'FromJSONKeyFunction'
429416-- can be inspected, but cannot be constructed.
430417data CoerceText a where
418+#if HAS_COERCIBLE
431419 CoerceText :: Coercible Text a => CoerceText a
420+#else
421+ CoerceText :: CoerceText a
422+#endif
432423
433424-- | This type is related to 'ToJSONKeyFunction'. If 'FromJSONKeyValue' is used in the
434425-- 'FromJSONKey' instance, then 'ToJSONKeyValue' should be used in the 'ToJSONKey'
@@ -448,7 +439,7 @@ data FromJSONKeyFunction a
448439
449440-- | Only law abiding up to interpretation
450441instance Functor FromJSONKeyFunction where
451− fmap h (FromJSONKeyCoerce CoerceText) = FromJSONKeyText (h . coerce)
442+ fmap h (FromJSONKeyCoerce CoerceText) = FromJSONKeyText (h . coerce')
452443 fmap h (FromJSONKeyText f) = FromJSONKeyText (h . f)
453444 fmap h (FromJSONKeyTextParser f) = FromJSONKeyTextParser (fmap h . f)
454445 fmap h (FromJSONKeyValue f) = FromJSONKeyValue (fmap h . f)
@@ -462,7 +453,9 @@ instance Functor FromJSONKeyFunction where
462453--
463454-- On pre GHC 7.8 this is unconstrainted function.
464455fromJSONKeyCoerce ::
456+#if HAS_COERCIBLE
465457 Coercible Text a =>
458+#endif
466459 FromJSONKeyFunction a
467460fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText
468461
@@ -470,91 +463,60 @@ fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText
470463--
471464-- See note on 'fromJSONKeyCoerce'.
472465coerceFromJSONKeyFunction ::
466+#if HAS_COERCIBLE
473467 Coercible a b =>
468+#endif
474469 FromJSONKeyFunction a -> FromJSONKeyFunction b
470+#if HAS_COERCIBLE
475471coerceFromJSONKeyFunction = coerce
472+#else
473+coerceFromJSONKeyFunction (FromJSONKeyCoerce CoerceText) = FromJSONKeyCoerce CoerceText
474+coerceFromJSONKeyFunction (FromJSONKeyText f) = FromJSONKeyText (coerce' . f)
475+coerceFromJSONKeyFunction (FromJSONKeyTextParser f) = FromJSONKeyTextParser (fmap coerce' . f)
476+coerceFromJSONKeyFunction (FromJSONKeyValue f) = FromJSONKeyValue (fmap coerce' . f)
477+#endif
476478
477479{-# RULES
478480 "FromJSONKeyCoerce: fmap id" forall (x :: FromJSONKeyFunction a).
479481 fmap id x = x
480482 #-}
483+#if HAS_COERCIBLE
481484{-# RULES
482485 "FromJSONKeyCoerce: fmap coerce" forall x .
483486 fmap coerce x = coerceFromJSONKeyFunction x
484487 #-}
488+#endif
485489
486490-- | Same as 'fmap'. Provided for the consistency with 'ToJSONKeyFunction'.
487491mapFromJSONKeyFunction :: (a -> b) -> FromJSONKeyFunction a -> FromJSONKeyFunction b
488492mapFromJSONKeyFunction = fmap
489493
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−
519494-------------------------------------------------------------------------------
520495-- Functions needed for documentation
521496-------------------------------------------------------------------------------
522497
523498-- | Fail parsing due to a type mismatch, with a descriptive message.
524499--
525−-- The following wrappers should generally be prefered:
526−-- 'withObject', 'withArray', 'withText', 'withBool'.
527−--
528−-- ==== Error message example
500+-- Example usage:
529501--
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\"@).
502+-- @
503+-- instance FromJSON Coord where
504+-- parseJSON ('Object' v) = {- type matches, life is good -}
505+-- parseJSON wat = 'typeMismatch' \"Coord\" wat
506+-- @
507+typeMismatch :: String -- ^ The name of the type you are trying to parse.
535508 -> Value -- ^ The actual value encountered.
536509 -> Parser a
537510typeMismatch expected actual =
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"
511+ fail $ "expected " ++ expected ++ ", encountered " ++ name
512+ where
513+ name = case actual of
514+ Object _ -> "Object"
515+ Array _ -> "Array"
516+ String _ -> "String"
517+ Number _ -> "Number"
518+ Bool _ -> "Boolean"
519+ Null -> "Null"
558520
559521-------------------------------------------------------------------------------
560522-- Lifings of FromJSON and ToJSON to unary and binary type constructors
@@ -635,8 +597,9 @@ class FromJSON2 f where
635597 -> (Value -> Parser b)
636598 -> (Value -> Parser [b])
637599 -> Value -> Parser [f a b]
638− liftParseJSONList2 fa ga fb gb = withArray "[]" $ \vals ->
639− fmap V.toList (V.mapM (liftParseJSON2 fa ga fb gb) vals)
600+ liftParseJSONList2 fa ga fb gb v = case v of
601+ Array vals -> fmap V.toList (V.mapM (liftParseJSON2 fa ga fb gb) vals)
602+ _ -> typeMismatch "[a]" v
640603
641604-- | Lift the standard 'parseJSON' function through the type constructor.
642605parseJSON2 :: (FromJSON2 f, FromJSON a, FromJSON b) => Value -> Parser (f a b)
@@ -650,7 +613,7 @@ parseJSON2 = liftParseJSON2 parseJSON parseJSONList parseJSON parseJSONList
650613-- | Helper function to use with 'liftParseJSON'. See 'Data.Aeson.ToJSON.listEncoding'.
651614listParser :: (Value -> Parser a) -> Value -> Parser [a]
652615listParser f (Array xs) = fmap V.toList (V.mapM f xs)
653−listParser _ v = typeMismatch "Array" v
616+listParser _ v = typeMismatch "[a]" v
654617{-# INLINE listParser #-}
655618
656619-------------------------------------------------------------------------------
@@ -668,137 +631,69 @@ instance (FromJSON a) => FromJSON [a] where
668631-- Functions
669632-------------------------------------------------------------------------------
670633
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"
634+-- | @'withObject' expected f value@ applies @f@ to the 'Object' when @value@
635+-- is an 'Object' and fails using @'typeMismatch' expected@ otherwise.
686636withObject :: String -> (Object -> Parser a) -> Value -> Parser a
687−withObject _ f (Object obj) = f obj
688−withObject name _ v = prependContext name (typeMismatch "Object" v)
637+withObject _ f (Object obj) = f obj
638+withObject expected _ v = typeMismatch expected v
689639{-# INLINE withObject #-}
690640
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"
641+-- | @'withText' expected f value@ applies @f@ to the 'Text' when @value@ is a
642+-- 'String' and fails using @'typeMismatch' expected@ otherwise.
698643withText :: String -> (Text -> Parser a) -> Value -> Parser a
699−withText _ f (String txt) = f txt
700−withText name _ v = prependContext name (typeMismatch "String" v)
644+withText _ f (String txt) = f txt
645+withText expected _ v = typeMismatch expected v
701646{-# INLINE withText #-}
702647
703648-- | @'withArray' expected f value@ applies @f@ to the 'Array' when @value@ is
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"
649+-- an 'Array' and fails using @'typeMismatch' expected@ otherwise.
710650withArray :: String -> (Array -> Parser a) -> Value -> Parser a
711−withArray _ f (Array arr) = f arr
712−withArray name _ v = prependContext name (typeMismatch "Array" v)
651+withArray _ f (Array arr) = f arr
652+withArray expected _ v = typeMismatch expected v
713653{-# INLINE withArray #-}
714654
715−-- | @'withScientific' name f value@ applies @f@ to the 'Scientific' number
716−-- when @value@ is a 'Data.Aeson.Number' and fails using 'typeMismatch'
655+-- | @'withScientific' expected f value@ applies @f@ to the 'Scientific' number
656+-- when @value@ is a 'Number' and fails using @'typeMismatch' expected@
717657-- otherwise.
718−--
658+-- .
719659-- /Warning/: If you are converting from a scientific to an unbounded
720660-- type such as 'Integer' you may want to add a restriction on the
721661-- size of the exponent (see 'withBoundedScientific') to prevent
722662-- 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"
728663withScientific :: String -> (Scientific -> Parser a) -> Value -> Parser a
729−withScientific _ f (Number scientific) = f scientific
730−withScientific name _ v = prependContext name (typeMismatch "Number" v)
664+withScientific _ f (Number scientific) = f scientific
665+withScientific expected _ v = typeMismatch expected v
731666{-# INLINE withScientific #-}
732667
733−-- | A variant of 'withScientific' which doesn't use 'prependContext', so that
734−-- such context can be added separately in a way that also applies when the
735−-- continuation @f :: Scientific -> Parser a@ fails.
736−--
737−-- /Warning/: If you are converting from a scientific to an unbounded
738−-- type such as 'Integer' you may want to add a restriction on the
739−-- size of the exponent (see 'withBoundedScientific') to prevent
740−-- malicious input from filling up the memory of the target system.
741−--
742−-- ==== Error message examples
668+-- | @'withBoundedScientific' expected f value@ applies @f@ to the 'Scientific' number
669+-- when @value@ is a 'Number' and fails using @'typeMismatch' expected@
670+-- otherwise.
743671--
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.
672+-- The conversion will also fail with a @'typeMismatch' if the
673+-- 'Scientific' exponent is larger than 1024.
757674withBoundedScientific :: String -> (Scientific -> Parser a) -> Value -> Parser a
758−withBoundedScientific name f v = withBoundedScientific_ (prependContext name) f v
759−{-# INLINE withBoundedScientific #-}
760−
761−-- | A variant of 'withBoundedScientific' which doesn't use 'prependContext',
762−-- so that such context can be added separately in a way that also applies
763−-- when the continuation @f :: Scientific -> Parser a@ fails.
764−withBoundedScientific' :: (Scientific -> Parser a) -> Value -> Parser a
765−withBoundedScientific' f v = withBoundedScientific_ id f v
766−{-# INLINE withBoundedScientific' #-}
767−
768−-- | A variant of 'withBoundedScientific_' parameterized by a function to apply
769−-- to the 'Parser' in case of failure.
770−withBoundedScientific_ :: (Parser a -> Parser a) -> (Scientific -> Parser a) -> Value -> Parser a
771−withBoundedScientific_ whenFail f (Number scientific) =
772− if exp10 > 1024
773− then whenFail (fail msg)
675+withBoundedScientific _ f v@(Number scientific) =
676+ if base10Exponent scientific > 1024
677+ then typeMismatch "a number with exponent <= 1024" v
774678 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_ #-}
679+withBoundedScientific expected _ v = typeMismatch expected v
680+{-# INLINE withBoundedScientific #-}
781681
782682-- | @'withBool' expected f value@ applies @f@ to the 'Bool' when @value@ is a
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"
683+-- 'Bool' and fails using @'typeMismatch' expected@ otherwise.
789684withBool :: String -> (Bool -> Parser a) -> Value -> Parser a
790−withBool _ f (Bool arr) = f arr
791−withBool name _ v = prependContext name (typeMismatch "Boolean" v)
685+withBool _ f (Bool arr) = f arr
686+withBool expected _ v = typeMismatch expected v
792687{-# INLINE withBool #-}
793688
794689-- | Decode a nested JSON-encoded string.
795690withEmbeddedJSON :: String -> (Value -> Parser a) -> Value -> Parser a
796691withEmbeddedJSON _ innerParser (String txt) =
797− either fail innerParser $ eitherDecode (L.fromStrict $ T.encodeUtf8 txt)
692+ either fail innerParser $ eitherDecode (Compat.fromStrict $ T.encodeUtf8 txt)
798693 where
799694 eitherDecode = eitherFormatError . eitherDecodeWith jsonEOF ifromJSON
800695 eitherFormatError = either (Left . uncurry formatError) Right
801−withEmbeddedJSON name _ v = prependContext name (typeMismatch "String" v)
696+withEmbeddedJSON name _ v = typeMismatch name v
802697{-# INLINE withEmbeddedJSON #-}
803698
804699-- | Convert a value from JSON, failing if the types do not match.
@@ -863,7 +758,7 @@ parseFieldMaybe' = (.:!)
863758-- E.g. @'explicitParseField' 'parseJSON1' :: ('FromJSON1' f, 'FromJSON' a) -> 'Object' -> 'Text' -> 'Parser' (f a)@
864759explicitParseField :: (Value -> Parser a) -> Object -> Text -> Parser a
865760explicitParseField p obj key = case H.lookup key obj of
866− Nothing -> fail $ "key " ++ show key ++ " not found"
761+ Nothing -> fail $ "key " ++ show key ++ " not present"
867762 Just v -> p v <?> Key key
868763{-# INLINE explicitParseField #-}
869764
@@ -913,37 +808,6 @@ instance OVERLAPPABLE_ (GFromJSON arity a) => GFromJSON arity (M1 i c a) where
913808 -- parsed value:
914809 gParseJSON opts fargs = fmap M1 . gParseJSON opts fargs
915810
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−
947811instance (FromJSON a) => GFromJSON arity (K1 i a) where
948812 -- Constant values are decoded using their FromJSON instance:
949813 gParseJSON _opts _ = fmap K1 . parseJSON
@@ -958,499 +822,342 @@ instance (FromJSON1 f) => GFromJSON One (Rec1 f) where
958822 -- FromJSON1 instance:
959823 gParseJSON _opts (From1Args pj pjl) = fmap Rec1 . liftParseJSON pj pjl
960824
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−--------------------------------------------------------------------------------
970−
971−instance (GFromJSON' arity a, Datatype d) => GFromJSON arity (D1 d a) where
972− -- Meta-information, which is not handled elsewhere, is just added to the
973− -- parsed value:
974− gParseJSON opts fargs = fmap M1 . gParseJSON' (tname :* opts :* fargs)
975− where
976− tname = moduleName proxy ++ "." ++ datatypeName proxy
977− proxy = undefined :: M1 _i d _f _p
978−
979−-- | 'GFromJSON', after unwrapping the 'D1' constructor, now carrying the data
980−-- type's name.
981−class GFromJSON' arity f where
982− gParseJSON' :: TypeName :* Options :* FromArgs arity a
983− -> Value
984− -> Parser (f a)
825+instance GFromJSON arity U1 where
826+ -- Empty constructors are expected to be encoded as an empty array:
827+ gParseJSON _opts _ v
828+ | isEmptyArray v = pure U1
829+ | otherwise = typeMismatch "unit constructor (U1)" v
985830
986−-- | Single constructor.
987831instance ( ConsFromJSON arity a
988832 , AllNullary (C1 c a) allNullary
989833 , ParseSum arity (C1 c a) allNullary
990− , Constructor c
991− ) => GFromJSON' arity (C1 c a) where
834+ ) => GFromJSON arity (D1 d (C1 c a)) where
992835 -- The option 'tagSingleConstructors' determines whether to wrap
993836 -- a single-constructor type.
994− gParseJSON' p@(_ :* opts :* _)
837+ gParseJSON opts fargs
995838 | tagSingleConstructors opts
996− = (unTagged :: Tagged allNullary (Parser (C1 c a p)) -> Parser (C1 c a p))
997− . parseSum p
998− | otherwise = fmap M1 . consParseJSON (cname :* p)
999− where
1000− cname = conName (undefined :: M1 _i c _f _p)
1001−
1002−-- | Multiple constructors.
1003−instance ( AllNullary (a :+: b) allNullary
1004− , ParseSum arity (a :+: b) allNullary
1005− ) => GFromJSON' arity (a :+: b) where
839+ = fmap M1
840+ . (unTagged :: Tagged allNullary (Parser (C1 c a p)) -> Parser (C1 c a p))
841+ . parseSum opts fargs
842+ | otherwise = fmap M1 . fmap M1 . consParseJSON opts fargs
843+
844+instance (ConsFromJSON arity a) => GFromJSON arity (C1 c a) where
845+ -- Constructors need to be decoded differently depending on whether they're
846+ -- a record or not. This distinction is made by consParseJSON:
847+ gParseJSON opts fargs = fmap M1 . consParseJSON opts fargs
848+
849+instance ( FromProduct arity a, FromProduct arity b
850+ , ProductSize a, ProductSize b
851+ ) => GFromJSON arity (a :*: b) where
852+ -- Products are expected to be encoded to an array. Here we check whether we
853+ -- got an array of the same size as the product, then parse each of the
854+ -- product's elements using parseProduct:
855+ gParseJSON opts fargs = withArray "product (:*:)" $ \arr ->
856+ let lenArray = V.length arr
857+ lenProduct = (unTagged2 :: Tagged2 (a :*: b) Int -> Int)
858+ productSize in
859+ if lenArray == lenProduct
860+ then parseProduct opts fargs arr 0 lenProduct
861+ else fail $ "When expecting a product of " ++ show lenProduct ++
862+ " values, encountered an Array of " ++ show lenArray ++
863+ " elements instead"
864+
865+instance ( AllNullary (a :+: b) allNullary
866+ , ParseSum arity (a :+: b) allNullary
867+ ) => GFromJSON arity (a :+: b) where
1006868 -- If all constructors of a sum datatype are nullary and the
1007869 -- 'allNullaryToStringTag' option is set they are expected to be
1008870 -- encoded as strings. This distinction is made by 'parseSum':
1009− gParseJSON' p =
1010− (unTagged :: Tagged allNullary (Parser ((a :+: b) _d)) ->
1011− Parser ((a :+: b) _d))
1012− . parseSum p
871+ gParseJSON opts fargs =
872+ (unTagged :: Tagged allNullary (Parser ((a :+: b) d)) ->
873+ Parser ((a :+: b) d))
874+ . parseSum opts fargs
875+
876+instance (FromJSON1 f, GFromJSON One g) => GFromJSON One (f :.: g) where
877+ -- If an occurrence of the last type parameter is nested inside two
878+ -- composed types, it is decoded by using the outermost type's FromJSON1
879+ -- instance to generically decode the innermost type:
880+ gParseJSON opts fargs =
881+ let gpj = gParseJSON opts fargs in
882+ fmap Comp1 . liftParseJSON gpj (listParser gpj)
1013883
1014884--------------------------------------------------------------------------------
1015885
1016886class ParseSum arity f allNullary where
1017− parseSum :: TypeName :* Options :* FromArgs arity a
1018− -> Value
1019− -> Tagged allNullary (Parser (f a))
887+ parseSum :: Options -> FromArgs arity a
888+ -> Value -> Tagged allNullary (Parser (f a))
1020889
1021−instance ( ConstructorNames f
1022− , SumFromString f
890+instance ( SumFromString f
1023891 , FromPair arity f
1024892 , FromTaggedObject arity f
1025893 , FromUntaggedValue arity f
1026894 ) => ParseSum arity f True where
1027− parseSum p@(tname :* opts :* _)
1028− | allNullaryToStringTag opts = Tagged . parseAllNullarySum tname opts
1029− | otherwise = Tagged . parseNonAllNullarySum p
895+ parseSum opts fargs
896+ | allNullaryToStringTag opts = Tagged . parseAllNullarySum opts
897+ | otherwise = Tagged . parseNonAllNullarySum opts fargs
1030898
1031−instance ( ConstructorNames f
1032− , FromPair arity f
899+instance ( FromPair arity f
1033900 , FromTaggedObject arity f
1034901 , FromUntaggedValue arity f
1035902 ) => ParseSum arity f False where
1036− parseSum p = Tagged . parseNonAllNullarySum p
903+ parseSum opts fargs = Tagged . parseNonAllNullarySum opts fargs
1037904
1038905--------------------------------------------------------------------------------
1039906
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])
907+parseAllNullarySum :: SumFromString f => Options -> Value -> Parser (f a)
908+parseAllNullarySum opts = withText "Text" $ \key ->
909+ maybe (notFound key) return $
910+ parseSumFromString opts key
1062911
1063912class SumFromString f where
1064− parseSumFromString :: (String -> String) -> Text -> Maybe (f a)
913+ parseSumFromString :: Options -> Text -> Maybe (f a)
1065914
1066915instance (SumFromString a, SumFromString b) => SumFromString (a :+: b) where
1067916 parseSumFromString opts key = (L1 <$> parseSumFromString opts key) <|>
1068917 (R1 <$> parseSumFromString opts key)
1069918
1070919instance (Constructor c) => SumFromString (C1 c U1) where
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)
1076−
1077−-- For genericFromJSONKey
1078−instance SumFromString a => SumFromString (D1 d a) where
1079− parseSumFromString modifier key = M1 <$> parseSumFromString modifier key
1080−
1081−-- | List of all constructor tags.
1082−constructorTags :: ConstructorNames a => (String -> t) -> Tagged2 a [t]
1083−constructorTags modifier =
1084− fmap DList.toList (constructorNames' modifier)
1085−
1086−-- | List of all constructor names of an ADT, after a given conversion
1087−-- function. (Better inlining.)
1088−class ConstructorNames a where
1089− constructorNames' :: (String -> t) -> Tagged2 a (DList.DList t)
1090−
1091−instance (ConstructorNames a, ConstructorNames b) => ConstructorNames (a :+: b) where
1092− constructorNames' = liftA2 append constructorNames' constructorNames'
1093− where
1094− append
1095− :: Tagged2 a (DList.DList t)
1096− -> Tagged2 b (DList.DList t)
1097− -> Tagged2 (a :+: b) (DList.DList t)
1098− append (Tagged2 xs) (Tagged2 ys) = Tagged2 (DList.append xs ys)
1099−
1100−instance Constructor c => ConstructorNames (C1 c a) where
1101− constructorNames' f = Tagged2 (pure (f cname))
1102− where
1103− cname = conName (undefined :: M1 _i c _f _p)
1104−
1105−-- For genericFromJSONKey
1106−instance ConstructorNames a => ConstructorNames (D1 d a) where
1107− constructorNames' = retag . constructorNames'
1108− where
1109− retag :: Tagged2 a u -> Tagged2 (D1 d a) u
1110− retag (Tagged2 x) = Tagged2 x
920+ parseSumFromString opts key | key == name = Just $ M1 U1
921+ | otherwise = Nothing
922+ where
923+ name = pack $ constructorTagModifier opts $
924+ conName (undefined :: t c U1 p)
1111925
1112926--------------------------------------------------------------------------------
1113−parseNonAllNullarySum :: forall f c arity.
1114− ( FromPair arity f
927+
928+parseNonAllNullarySum :: ( FromPair arity f
1115929 , FromTaggedObject arity f
1116930 , FromUntaggedValue arity f
1117− , ConstructorNames f
1118− ) => TypeName :* Options :* FromArgs arity c
931+ ) => Options -> FromArgs arity c
1119932 -> Value -> Parser (f c)
1120−parseNonAllNullarySum p@(tname :* opts :* _) =
933+parseNonAllNullarySum opts fargs =
1121934 case sumEncoding opts of
1122935 TaggedObject{..} ->
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])
936+ withObject "Object" $ \obj -> do
937+ tag <- obj .: pack tagFieldName
938+ fromMaybe (notFound tag) $
939+ parseFromTaggedObject opts fargs contentsFieldName obj tag
1133940
1134941 ObjectWithSingleField ->
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
942+ withObject "Object" $ \obj ->
943+ case H.toList obj of
944+ [pair@(tag, _)] -> fromMaybe (notFound tag) $
945+ parsePair opts fargs pair
946+ _ -> fail "Object doesn't have a single field"
1145947
1146948 TwoElemArray ->
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
949+ withArray "Array" $ \arr ->
950+ if V.length arr == 2
951+ then case V.unsafeIndex arr 0 of
952+ String tag -> fromMaybe (notFound tag) $
953+ parsePair opts fargs (tag, V.unsafeIndex arr 1)
954+ _ -> fail "First element is not a String"
955+ else fail "Array doesn't have 2 elements"
1161956
1162− UntaggedValue -> parseUntaggedValue p
1163− where
1164− failWith_ = failWithCTags tname (constructorTagModifier opts)
957+ UntaggedValue -> parseUntaggedValue opts fargs
1165958
1166959--------------------------------------------------------------------------------
1167960
1168961class 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
1172− :: Text :* String :* TypeName :* Options :* FromArgs arity a
1173− -> Object
1174− -> Maybe (Parser (f a))
962+ parseFromTaggedObject :: Options -> FromArgs arity a
963+ -> String -> Object
964+ -> Text -> Maybe (Parser (f a))
1175965
1176966instance ( FromTaggedObject arity a, FromTaggedObject arity b) =>
1177967 FromTaggedObject arity (a :+: b) where
1178− parseFromTaggedObject p obj =
1179− (fmap L1 <$> parseFromTaggedObject p obj) <|>
1180− (fmap R1 <$> parseFromTaggedObject p obj)
968+ parseFromTaggedObject opts fargs contentsFieldName obj tag =
969+ (fmap L1 <$> parseFromTaggedObject opts fargs contentsFieldName obj tag) <|>
970+ (fmap R1 <$> parseFromTaggedObject opts fargs contentsFieldName obj tag)
1181971
1182−instance ( IsRecord f isRecord
1183− , FromTaggedObject' arity f isRecord
972+instance ( FromTaggedObject' arity f
1184973 , Constructor c
1185974 ) => FromTaggedObject arity (C1 c f) where
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)
975+ parseFromTaggedObject opts fargs contentsFieldName obj tag
976+ | tag == name = Just $ M1 <$> parseFromTaggedObject'
977+ opts fargs contentsFieldName obj
978+ | otherwise = Nothing
979+ where
980+ name = pack $ constructorTagModifier opts $
981+ conName (undefined :: t c f p)
1195982
1196983--------------------------------------------------------------------------------
1197984
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
985+class FromTaggedObject' arity f where
986+ parseFromTaggedObject' :: Options -> FromArgs arity a -> String
987+ -> Object -> Parser (f a)
988+
989+class FromTaggedObject'' arity f isRecord where
990+ parseFromTaggedObject'' :: Options -> FromArgs arity a -> String
991+ -> Object -> Tagged isRecord (Parser (f a))
992+
993+instance ( IsRecord f isRecord
994+ , FromTaggedObject'' arity f isRecord
995+ ) => FromTaggedObject' arity f where
996+ parseFromTaggedObject' opts fargs contentsFieldName =
997+ (unTagged :: Tagged isRecord (Parser (f a)) -> Parser (f a)) .
998+ parseFromTaggedObject'' opts fargs contentsFieldName
999+
1000+instance (FromRecord arity f) => FromTaggedObject'' arity f True where
1001+ parseFromTaggedObject'' opts fargs _ =
1002+ Tagged . parseRecord opts fargs
1003+
1004+instance (GFromJSON arity f) => FromTaggedObject'' arity f False where
1005+ parseFromTaggedObject'' opts fargs contentsFieldName = Tagged .
1006+ (gParseJSON opts fargs <=< (.: pack contentsFieldName))
12161007
1217−instance OVERLAPPING_ FromTaggedObject' arity U1 False where
1218− -- Nullary constructors don't need a contents field
1219− parseFromTaggedObject' _ _ = Tagged (pure U1)
1008+instance OVERLAPPING_ FromTaggedObject'' arity U1 False where
1009+ parseFromTaggedObject'' _ _ _ _ = Tagged (pure U1)
12201010
12211011--------------------------------------------------------------------------------
12221012
1223−-- | Constructors need to be decoded differently depending on whether they're
1224−-- a record or not. This distinction is made by 'ConsParseJSON'.
12251013class ConsFromJSON arity f where
1226− consParseJSON
1227− :: ConName :* TypeName :* Options :* FromArgs arity a
1228− -> Value -> Parser (f a)
1014+ consParseJSON :: Options -> FromArgs arity a
1015+ -> Value -> Parser (f a)
12291016
12301017class ConsFromJSON' arity f isRecord where
1231− consParseJSON'
1232− :: ConName :* TypeName :* Options :* FromArgs arity a
1233− -> Value -> Tagged isRecord (Parser (f a))
1018+ consParseJSON' :: Options -> FromArgs arity a
1019+ -> Value -> Tagged isRecord (Parser (f a))
12341020
12351021instance ( IsRecord f isRecord
12361022 , ConsFromJSON' arity f isRecord
12371023 ) => ConsFromJSON arity f where
1238− consParseJSON p =
1024+ consParseJSON opts fargs =
12391025 (unTagged :: Tagged isRecord (Parser (f a)) -> Parser (f a))
1240− . consParseJSON' p
1026+ . consParseJSON' opts fargs
12411027
12421028instance OVERLAPPING_
1243− ( GFromJSON arity a, RecordFromJSON arity (S1 s a)
1029+ ( GFromJSON arity a, FromRecord arity (S1 s a)
12441030 ) => ConsFromJSON' arity (S1 s a) True where
1245− consParseJSON' p@(cname :* tname :* opts :* fargs)
1246− | unwrapUnaryRecords opts = Tagged . fmap M1 . gParseJSON opts fargs
1247− | otherwise = Tagged . withObject (showCons cname tname) (recordParseJSON (False :* p))
1031+ consParseJSON' opts fargs
1032+ | unwrapUnaryRecords opts = Tagged . gParseJSON opts fargs
1033+ | otherwise = Tagged . withObject "unary record" (parseRecord opts fargs)
12481034
1249−instance RecordFromJSON arity f => ConsFromJSON' arity f True where
1250− consParseJSON' p@(cname :* tname :* _) =
1251− Tagged . withObject (showCons cname tname) (recordParseJSON (False :* p))
1035+instance FromRecord arity f => ConsFromJSON' arity f True where
1036+ consParseJSON' opts fargs =
1037+ Tagged . withObject "record (:*:)" (parseRecord opts fargs)
12521038
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
1039+instance GFromJSON arity f => ConsFromJSON' arity f False where
1040+ consParseJSON' opts fargs = Tagged . gParseJSON opts fargs
12741041
12751042--------------------------------------------------------------------------------
12761043
1277−class FieldNames f where
1278− fieldNames :: f a -> [Text] -> [Text]
1279−
1280−instance (FieldNames a, FieldNames b) => FieldNames (a :*: b) where
1281− fieldNames _ =
1282− fieldNames (undefined :: a x) .
1283− fieldNames (undefined :: b y)
1284−
1285−instance (Selector s) => FieldNames (S1 s f) where
1286− fieldNames _ = (pack (selName (undefined :: M1 _i s _f _p)) :)
1044+class FromRecord arity f where
1045+ parseRecord :: Options -> FromArgs arity a
1046+ -> Object -> Parser (f a)
12871047
1288−class RecordFromJSON arity f where
1289− recordParseJSON
1290− :: Bool :* ConName :* TypeName :* Options :* FromArgs arity a
1291− -> Object -> Parser (f a)
1292−
1293−instance ( FieldNames f
1294− , RecordFromJSON' arity f
1295− ) => RecordFromJSON arity f where
1296− recordParseJSON (fromTaggedSum :* p@(cname :* tname :* opts :* _)) =
1297− \obj -> checkUnknown obj >> recordParseJSON' p obj
1298− where
1299− knownFields :: H.HashMap Text ()
1300− knownFields = H.fromList $ map (,()) $
1301− fieldNames (undefined :: f a)
1302− [pack (tagFieldName (sumEncoding opts)) | fromTaggedSum]
1303− checkUnknown =
1304− if not (rejectUnknownFields opts)
1305− then \_ -> return ()
1306− else \obj -> case H.keys (H.difference obj knownFields) of
1307− [] -> return ()
1308− unknownFields -> contextCons cname tname $
1309− fail ("unknown fields: " ++ show unknownFields)
1310−
1311−class RecordFromJSON' arity f where
1312− recordParseJSON'
1313− :: ConName :* TypeName :* Options :* FromArgs arity a
1314− -> Object -> Parser (f a)
1315−
1316−instance ( RecordFromJSON' arity a
1317− , RecordFromJSON' arity b
1318− ) => RecordFromJSON' arity (a :*: b) where
1319− recordParseJSON' p obj =
1320− (:*:) <$> recordParseJSON' p obj
1321− <*> recordParseJSON' p obj
1048+instance ( FromRecord arity a
1049+ , FromRecord arity b
1050+ ) => FromRecord arity (a :*: b) where
1051+ parseRecord opts fargs obj =
1052+ (:*:) <$> parseRecord opts fargs obj
1053+ <*> parseRecord opts fargs obj
13221054
13231055instance 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)
1056+ FromRecord arity (S1 s a) where
1057+ parseRecord opts fargs =
1058+ (<?> Key label) . gParseJSON opts fargs <=< (.: label)
1059+ where
1060+ label = pack . fieldLabelModifier opts $ selName (undefined :: t s a p)
13311061
13321062instance INCOHERENT_ (Selector s, FromJSON a) =>
1333− RecordFromJSON' arity (S1 s (K1 i (Maybe a))) where
1334− recordParseJSON' (_ :* _ :* opts :* _) obj = M1 . K1 <$> obj .:? pack label
1335− where
1336− label = fieldLabelModifier opts sname
1337− sname = selName (undefined :: M1 _i s _f _p)
1063+ FromRecord arity (S1 s (K1 i (Maybe a))) where
1064+ parseRecord opts _ obj = M1 . K1 <$> obj .:? pack label
1065+ where
1066+ label = fieldLabelModifier opts $
1067+ selName (undefined :: t s (K1 i (Maybe a)) p)
13381068
13391069-- Parse an Option like a Maybe.
13401070instance INCOHERENT_ (Selector s, FromJSON a) =>
1341− RecordFromJSON' arity (S1 s (K1 i (Semigroup.Option a))) where
1342− recordParseJSON' p obj = wrap <$> recordParseJSON' p obj
1071+ FromRecord arity (S1 s (K1 i (Semigroup.Option a))) where
1072+ parseRecord opts fargs obj = wrap <$> parseRecord opts fargs obj
13431073 where
13441074 wrap :: S1 s (K1 i (Maybe a)) p -> S1 s (K1 i (Semigroup.Option a)) p
13451075 wrap (M1 (K1 a)) = M1 (K1 (Semigroup.Option a))
13461076
13471077--------------------------------------------------------------------------------
13481078
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
1079+class FromProduct arity f where
1080+ parseProduct :: Options -> FromArgs arity a
13711081 -> Array -> Int -> Int
13721082 -> Parser (f a)
13731083
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
1084+instance ( FromProduct arity a
1085+ , FromProduct arity b
1086+ ) => FromProduct arity (a :*: b) where
1087+ parseProduct opts fargs arr ix len =
1088+ (:*:) <$> parseProduct opts fargs arr ix lenL
1089+ <*> parseProduct opts fargs arr ixR lenR
13801090 where
13811091 lenL = len `unsafeShiftR` 1
13821092 ixR = ix + lenL
13831093 lenR = len - lenL
13841094
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
1095+instance (GFromJSON arity a) => FromProduct arity (S1 s a) where
1096+ parseProduct opts fargs arr ix _ =
1097+ gParseJSON opts fargs $ V.unsafeIndex arr ix
13881098
13891099--------------------------------------------------------------------------------
13901100
13911101class 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
1394− -> Value
1395− -> Maybe (Parser (f a))
1102+ parsePair :: Options -> FromArgs arity a
1103+ -> Pair -> Maybe (Parser (f a))
13961104
13971105instance ( FromPair arity a
13981106 , FromPair arity b
13991107 ) => FromPair arity (a :+: b) where
1400− parsePair p pair =
1401− (fmap L1 <$> parsePair p pair) <|>
1402− (fmap R1 <$> parsePair p pair)
1108+ parsePair opts fargs pair = (fmap L1 <$> parsePair opts fargs pair) <|>
1109+ (fmap R1 <$> parsePair opts fargs pair)
14031110
14041111instance ( Constructor c
1112+ , GFromJSON arity a
14051113 , ConsFromJSON arity a
14061114 ) => FromPair arity (C1 c a) where
1407− parsePair (tag :* p@(_ :* opts :* _)) v
1408− | tag == tag' = Just $ M1 <$> consParseJSON (cname :* p) v
1115+ parsePair opts fargs (tag, value)
1116+ | tag == tag' = Just $ gParseJSON opts fargs value
14091117 | otherwise = Nothing
1410− where
1411− tag' = pack $ constructorTagModifier opts cname
1412− cname = conName (undefined :: M1 _i c _a _p)
1118+ where
1119+ tag' = pack $ constructorTagModifier opts $
1120+ conName (undefined :: t c a p)
14131121
14141122--------------------------------------------------------------------------------
14151123
14161124class FromUntaggedValue arity f where
1417− parseUntaggedValue :: TypeName :* Options :* FromArgs arity a
1418− -> Value
1419− -> Parser (f a)
1125+ parseUntaggedValue :: Options -> FromArgs arity a
1126+ -> Value -> Parser (f a)
14201127
14211128instance
14221129 ( FromUntaggedValue arity a
14231130 , FromUntaggedValue arity b
14241131 ) => FromUntaggedValue arity (a :+: b)
14251132 where
1426− parseUntaggedValue p value =
1427− L1 <$> parseUntaggedValue p value <|>
1428− R1 <$> parseUntaggedValue p value
1133+ parseUntaggedValue opts fargs value =
1134+ L1 <$> parseUntaggedValue opts fargs value <|>
1135+ R1 <$> parseUntaggedValue opts fargs value
14291136
14301137instance OVERLAPPABLE_
1431− ( ConsFromJSON arity a
1432− , Constructor c
1138+ ( GFromJSON arity a
1139+ , ConsFromJSON arity a
14331140 ) => FromUntaggedValue arity (C1 c a)
14341141 where
1435− parseUntaggedValue p = fmap M1 . consParseJSON (cname :* p)
1436− where
1437− cname = conName (undefined :: M1 _i c _f _p)
1142+ parseUntaggedValue = gParseJSON
14381143
14391144instance OVERLAPPING_
14401145 ( Constructor c )
14411146 => FromUntaggedValue arity (C1 c U1)
14421147 where
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
1148+ parseUntaggedValue opts _ (String s)
1149+ | s == pack (constructorTagModifier opts (conName (undefined :: t c U1 p))) =
1150+ pure $ M1 U1
1151+ | otherwise =
1152+ fail $ "Invalid tag: " ++ unpack s
1153+ parseUntaggedValue _ _ v = typeMismatch (conName (undefined :: t c U1 p)) v
1154+
1155+
1156+--------------------------------------------------------------------------------
1157+
1158+notFound :: Text -> Parser a
1159+notFound key = fail $ "The key \"" ++ unpack key ++ "\" was not found"
1160+{-# INLINE notFound #-}
14541161
14551162-------------------------------------------------------------------------------
14561163-- Instances
@@ -1513,15 +1220,14 @@ instance FromJSON Void where
15131220 {-# INLINE parseJSON #-}
15141221
15151222instance FromJSON Bool where
1516− parseJSON (Bool b) = pure b
1517− parseJSON v = typeMismatch "Bool" v
1223+ parseJSON = withBool "Bool" pure
15181224 {-# INLINE parseJSON #-}
15191225
15201226instance FromJSONKey Bool where
15211227 fromJSONKey = FromJSONKeyTextParser $ \t -> case t of
15221228 "true" -> pure True
15231229 "false" -> pure False
1524− _ -> fail $ "cannot parse key " ++ show t ++ " into Bool"
1230+ _ -> fail $ "Cannot parse key into Bool: " ++ T.unpack t
15251231
15261232instance FromJSON Ordering where
15271233 parseJSON = withText "Ordering" $ \s ->
@@ -1529,30 +1235,25 @@ instance FromJSON Ordering where
15291235 "LT" -> return LT
15301236 "EQ" -> return EQ
15311237 "GT" -> return GT
1532− _ -> fail $ "parsing Ordering failed, unexpected " ++ show s ++
1533− " (expected \"LT\", \"EQ\", or \"GT\")"
1238+ _ -> fail "Parsing Ordering value failed: expected \"LT\", \"EQ\", or \"GT\""
15341239
15351240instance FromJSON () where
15361241 parseJSON = withArray "()" $ \v ->
15371242 if V.null v
15381243 then pure ()
1539− else prependContext "()" $ fail "expected an empty array"
1244+ else fail "Expected an empty array"
15401245 {-# INLINE parseJSON #-}
15411246
15421247instance FromJSON Char where
1543− parseJSON = withText "Char" parseChar
1248+ parseJSON = withText "Char" $ \t ->
1249+ if T.compareLength t 1 == EQ
1250+ then pure $ T.head t
1251+ else fail "Expected a string of length 1"
15441252 {-# INLINE parseJSON #-}
15451253
1546− parseJSONList (String s) = pure (T.unpack s)
1547− parseJSONList v = typeMismatch "String" v
1254+ parseJSONList = withText "String" $ pure . T.unpack
15481255 {-# INLINE parseJSONList #-}
15491256
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−
15561257instance FromJSON Double where
15571258 parseJSON = parseRealFloat "Double"
15581259 {-# INLINE parseJSON #-}
@@ -1576,22 +1277,12 @@ instance FromJSONKey Float where
15761277 _ -> Scientific.toRealFloat <$> parseScientificText t
15771278
15781279instance (FromJSON a, Integral a) => FromJSON (Ratio a) where
1579− parseJSON (Number x)
1580− | exp10 <= 1024
1581− , exp10 >= -1024 = return $! realToFrac x
1582− | otherwise = prependContext "Ratio" $ fail msg
1583− where
1584− exp10 = base10Exponent x
1585− msg = "found a number with exponent " ++ show exp10
1586− ++ ", but it must not be greater than 1024 or less than -1024"
1587− parseJSON o = objParser o
1588− where
1589− objParser = withObject "Rational" $ \obj -> do
1590− numerator <- obj .: "numerator"
1591− denominator <- obj .: "denominator"
1592− if denominator == 0
1593− then fail "Ratio denominator was 0"
1594− else pure $ numerator % denominator
1280+ parseJSON = withObject "Rational" $ \obj -> do
1281+ numerator <- obj .: "numerator"
1282+ denominator <- obj .: "denominator"
1283+ if denominator == 0
1284+ then fail "Ratio denominator was 0"
1285+ else pure $ numerator % denominator
15951286 {-# INLINE parseJSON #-}
15961287
15971288-- | This instance includes a bounds check to prevent maliciously
@@ -1599,7 +1290,7 @@ instance (FromJSON a, Integral a) => FromJSON (Ratio a) where
15991290-- newtype 'Scientific' and provide your own instance using
16001291-- 'withScientific' if you want to allow larger inputs.
16011292instance HasResolution a => FromJSON (Fixed a) where
1602− parseJSON = prependContext "Fixed" . withBoundedScientific' (pure . realToFrac)
1293+ parseJSON = withBoundedScientific "Fixed" $ pure . realToFrac
16031294 {-# INLINE parseJSON #-}
16041295
16051296instance FromJSON Int where
@@ -1622,20 +1313,19 @@ instance FromJSONKey Integer where
16221313
16231314instance FromJSON Natural where
16241315 parseJSON value = do
1625− integer <- parseIntegral "Natural" value
1626− parseNatural integer
1316+ integer :: Integer <- parseIntegral "Natural" value
1317+ if integer < 0 then
1318+ fail $ "expected Natural, encountered negative number " <> show integer
1319+ else
1320+ pure $ fromIntegral integer
16271321
16281322instance FromJSONKey Natural where
16291323 fromJSONKey = FromJSONKeyTextParser $ \text -> do
1630− integer <- parseIntegralText "Natural" text
1631− parseNatural integer
1632−
1633−parseNatural :: Integer -> Parser Natural
1634−parseNatural integer =
1635− if integer < 0 then
1636− fail $ "parsing Natural failed, unexpected negative number " <> show integer
1637− else
1638− pure $ fromIntegral integer
1324+ integer :: Integer <- parseIntegralText "Natural" text
1325+ if integer < 0 then
1326+ fail $ "expected Natural, encountered negative number " <> show integer
1327+ else
1328+ pure $ fromIntegral integer
16391329
16401330instance FromJSON Int8 where
16411331 parseJSON = parseBoundedIntegral "Int8"
@@ -1732,17 +1422,17 @@ parseVersionText = go . readP_to_S parseVersion . unpack
17321422 where
17331423 go [(v,[])] = return v
17341424 go (_ : xs) = go xs
1735− go _ = fail "parsing Version failed"
1425+ go _ = fail "could not parse Version"
17361426
17371427-------------------------------------------------------------------------------
17381428-- semigroups NonEmpty
17391429-------------------------------------------------------------------------------
17401430
17411431instance FromJSON1 NonEmpty where
1742− liftParseJSON p _ = withArray "NonEmpty" $
1432+ liftParseJSON p _ = withArray "NonEmpty a" $
17431433 (>>= ne) . Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
17441434 where
1745− ne [] = fail "parsing NonEmpty failed, unexpected empty list"
1435+ ne [] = fail "Expected a NonEmpty but got an empty list"
17461436 ne (x:xs) = pure (x :| xs)
17471437 {-# INLINE liftParseJSON #-}
17481438
@@ -1763,7 +1453,7 @@ instance FromJSON Scientific where
17631453-------------------------------------------------------------------------------
17641454
17651455instance FromJSON1 DList.DList where
1766− liftParseJSON p _ = withArray "DList" $
1456+ liftParseJSON p _ = withArray "DList a" $
17671457 fmap DList.fromList .
17681458 Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
17691459 {-# INLINE liftParseJSON #-}
@@ -1840,7 +1530,7 @@ instance (FromJSON1 f, FromJSON1 g) => FromJSON1 (Sum f g) where
18401530 inr = "InR"
18411531
18421532 liftParseJSON _ _ _ = fail $
1843− "parsing Sum failed, expected an object with a single property " ++
1533+ "expected an object with a single property " ++
18441534 "where the property key should be either " ++
18451535 "\"InL\" or \"InR\""
18461536 {-# INLINE liftParseJSON #-}
@@ -1854,7 +1544,7 @@ instance (FromJSON1 f, FromJSON1 g, FromJSON a) => FromJSON (Sum f g a) where
18541544-------------------------------------------------------------------------------
18551545
18561546instance FromJSON1 Seq.Seq where
1857− liftParseJSON p _ = withArray "Seq" $
1547+ liftParseJSON p _ = withArray "Seq a" $
18581548 fmap Seq.fromList .
18591549 Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
18601550 {-# INLINE liftParseJSON #-}
@@ -1888,13 +1578,13 @@ instance FromJSON a => FromJSON (IntMap.IntMap a) where
18881578
18891579instance (FromJSONKey k, Ord k) => FromJSON1 (M.Map k) where
18901580 liftParseJSON p _ = case fromJSONKey of
1891− FromJSONKeyCoerce _ -> withObject "Map" $
1581+ FromJSONKeyCoerce _-> withObject "Map k v" $
18921582 fmap (H.foldrWithKey (M.insert . unsafeCoerce) M.empty) . H.traverseWithKey (\k v -> p v <?> Key k)
1893− FromJSONKeyText f -> withObject "Map" $
1583+ FromJSONKeyText f -> withObject "Map k v" $
18941584 fmap (H.foldrWithKey (M.insert . f) M.empty) . H.traverseWithKey (\k v -> p v <?> Key k)
1895− FromJSONKeyTextParser f -> withObject "Map" $
1585+ FromJSONKeyTextParser f -> withObject "Map k v" $
18961586 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 ->
1587+ FromJSONKeyValue f -> withArray "Map k v" $ \arr ->
18981588 fmap M.fromList . Tr.sequence .
18991589 zipWith (parseIndexedJSONPair f p) [0..] . V.toList $ arr
19001590 {-# INLINE liftParseJSON #-}
@@ -1922,18 +1612,18 @@ instance (FromJSON v) => FromJSON (Tree.Tree v) where
19221612
19231613instance FromJSON UUID.UUID where
19241614 parseJSON = withText "UUID" $
1925− maybe (fail "invalid UUID") pure . UUID.fromText
1615+ maybe (fail "Invalid UUID") pure . UUID.fromText
19261616
19271617instance FromJSONKey UUID.UUID where
19281618 fromJSONKey = FromJSONKeyTextParser $
1929− maybe (fail "invalid UUID") pure . UUID.fromText
1619+ maybe (fail "Invalid UUID") pure . UUID.fromText
19301620
19311621-------------------------------------------------------------------------------
19321622-- vector
19331623-------------------------------------------------------------------------------
19341624
19351625instance FromJSON1 Vector where
1936− liftParseJSON p _ = withArray "Vector" $
1626+ liftParseJSON p _ = withArray "Vector a" $
19371627 V.mapM (uncurry $ parseIndexedJSON p) . V.indexed
19381628 {-# INLINE liftParseJSON #-}
19391629
@@ -1947,14 +1637,14 @@ vectorParseJSON s = withArray s $ fmap V.convert . V.mapM (uncurry $ parseIndexe
19471637{-# INLINE vectorParseJSON #-}
19481638
19491639instance (Storable a, FromJSON a) => FromJSON (VS.Vector a) where
1950− parseJSON = vectorParseJSON "Data.Vector.Storable.Vector"
1640+ parseJSON = vectorParseJSON "Data.Vector.Storable.Vector a"
19511641
19521642instance (VP.Prim a, FromJSON a) => FromJSON (VP.Vector a) where
1953− parseJSON = vectorParseJSON "Data.Vector.Primitive.Vector"
1643+ parseJSON = vectorParseJSON "Data.Vector.Primitive.Vector a"
19541644 {-# INLINE parseJSON #-}
19551645
19561646instance (VG.Vector VU.Vector a, FromJSON a) => FromJSON (VU.Vector a) where
1957− parseJSON = vectorParseJSON "Data.Vector.Unboxed.Vector"
1647+ parseJSON = vectorParseJSON "Data.Vector.Unboxed.Vector a"
19581648 {-# INLINE parseJSON #-}
19591649
19601650-------------------------------------------------------------------------------
@@ -1968,13 +1658,13 @@ instance (Eq a, Hashable a, FromJSON a) => FromJSON (HashSet.HashSet a) where
19681658
19691659instance (FromJSONKey k, Eq k, Hashable k) => FromJSON1 (H.HashMap k) where
19701660 liftParseJSON p _ = case fromJSONKey of
1971− FromJSONKeyCoerce _ -> withObject "HashMap ~Text" $
1661+ FromJSONKeyCoerce _ -> withObject "HashMap ~Text v" $
19721662 uc . H.traverseWithKey (\k v -> p v <?> Key k)
1973− FromJSONKeyText f -> withObject "HashMap" $
1663+ FromJSONKeyText f -> withObject "HashMap k v" $
19741664 fmap (mapKey f) . H.traverseWithKey (\k v -> p v <?> Key k)
1975− FromJSONKeyTextParser f -> withObject "HashMap" $
1665+ FromJSONKeyTextParser f -> withObject "HashMap k v" $
19761666 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 ->
1667+ FromJSONKeyValue f -> withArray "Map k v" $ \arr ->
19781668 fmap H.fromList . Tr.sequence .
19791669 zipWith (parseIndexedJSONPair f p) [0..] . V.toList $ arr
19801670 where
@@ -1997,7 +1687,7 @@ instance FromJSON DotNetTime where
19971687 parseJSON = withText "DotNetTime" $ \t ->
19981688 let (s,m) = T.splitAt (T.length t - 5) t
19991689 t' = T.concat [s,".",m]
2000− in case parseTimeM True defaultTimeLocale "/Date(%s%Q)/" (unpack t') of
1690+ in case parseTime defaultTimeLocale "/Date(%s%Q)/" (unpack t') of
20011691 Just d -> pure (DotNetTime d)
20021692 _ -> fail "could not parse .NET time"
20031693 {-# INLINE parseJSON #-}
@@ -2006,6 +1696,7 @@ instance FromJSON DotNetTime where
20061696-- primitive
20071697-------------------------------------------------------------------------------
20081698
1699+#if MIN_VERSION_base(4,7,0)
20091700instance FromJSON a => FromJSON (PM.Array a) where
20101701 -- note: we could do better than this if vector exposed the data
20111702 -- constructor in Data.Vector.
@@ -2018,7 +1709,6 @@ instance FromJSON a => FromJSON (PM.SmallArray a) where
20181709instance (PM.Prim a,FromJSON a) => FromJSON (PM.PrimArray a) where
20191710 parseJSON = fmap Exts.fromList . parseJSON
20201711
2021−#if !MIN_VERSION_primitive(0,7,0)
20221712instance (PM.PrimUnlifted a,FromJSON a) => FromJSON (PM.UnliftedArray a) where
20231713 parseJSON = fmap Exts.fromList . parseJSON
20241714#endif
@@ -2091,40 +1781,6 @@ instance FromJSON DiffTime where
20911781 parseJSON = withBoundedScientific "DiffTime" $ pure . realToFrac
20921782 {-# INLINE parseJSON #-}
20931783
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−
21281784-------------------------------------------------------------------------------
21291785-- base Monoid/Semigroup
21301786-------------------------------------------------------------------------------
@@ -2245,15 +1901,14 @@ instance FromJSON a => FromJSON (Semigroup.Option a) where
22451901
22461902instance FromJSON1 Proxy where
22471903 {-# INLINE liftParseJSON #-}
2248− liftParseJSON _ _ = fromNull "Proxy" Proxy
1904+ liftParseJSON _ _ Null = pure Proxy
1905+ liftParseJSON _ _ v = typeMismatch "Proxy" v
22491906
22501907instance FromJSON (Proxy a) where
22511908 {-# INLINE parseJSON #-}
2252− parseJSON = fromNull "Proxy" Proxy
1909+ parseJSON Null = pure Proxy
1910+ parseJSON v = typeMismatch "Proxy" v
22531911
2254−fromNull :: String -> a -> Value -> Parser a
2255−fromNull _ a Null = pure a
2256−fromNull c _ v = prependContext c (typeMismatch "Null" v)
22571912
22581913instance FromJSON2 Tagged where
22591914 liftParseJSON2 _ _ p _ = fmap Tagged . p
@@ -2280,7 +1935,10 @@ instance (FromJSON a, FromJSON b, FromJSON c) => FromJSONKey (a,b,c)
22801935instance (FromJSON a, FromJSON b, FromJSON c, FromJSON d) => FromJSONKey (a,b,c,d)
22811936
22821937instance FromJSONKey Char where
2283− fromJSONKey = FromJSONKeyTextParser parseChar
1938+ fromJSONKey = FromJSONKeyTextParser $ \t ->
1939+ if T.length t == 1
1940+ then return (T.index t 0)
1941+ else typeMismatch "Expected Char but String didn't contain exactly one character" (String t)
22841942 fromJSONKeyList = FromJSONKeyText T.unpack
22851943
22861944instance (FromJSONKey a, FromJSON a) => FromJSONKey [a] where