@@ -5,19 +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 TupleSections #-}
1415{-# LANGUAGE UndecidableInstances #-}
1516{-# LANGUAGE ViewPatterns #-}
1617
17−#if __GLASGOW_HASKELL__ >= 706
18−{-# LANGUAGE PolyKinds #-}
19−#endif
20−
2118#include "incoherent-compat.h"
2219#include "overlapping-compat.h"
2320
@@ -45,6 +42,9 @@ module Data.Aeson.Types.FromJSON
4542 , coerceFromJSONKeyFunction
4643 , mapFromJSONKeyFunction
4744
45+ , GFromJSONKey()
46+ , genericFromJSONKey
47+
4848 -- * List functions
4949 , listParser
5050
@@ -87,7 +87,7 @@ import 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)
90+import Data.Fixed (Fixed, HasResolution (resolution), Nano)
9191import Data.Functor.Compose (Compose(..))
9292import Data.Functor.Identity (Identity(..))
9393import Data.Functor.Product (Product(..))
@@ -103,8 +103,10 @@ 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.Format (parseTime)
107−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)
108110import Data.Traversable as Tr (sequence)
109111import Data.Vector (Vector)
110112import Data.Version (Version, parseVersion)
@@ -116,9 +118,9 @@ import GHC.Generics
116118import Numeric.Natural (Natural)
117119import Text.ParserCombinators.ReadP (readP_to_S)
118120import Unsafe.Coerce (unsafeCoerce)
119−import qualified Data.Aeson.Compat as Compat
120121import qualified Data.Aeson.Parser.Time as Time
121122import qualified Data.Attoparsec.ByteString.Char8 as A (endOfInput, parseOnly, scientific)
123+import qualified Data.ByteString.Lazy as L
122124import qualified Data.DList as DList
123125import qualified Data.HashMap.Strict as H
124126import qualified Data.HashSet as HashSet
@@ -147,22 +149,14 @@ import qualified Data.Primitive.SmallArray as PM
147149import qualified Data.Primitive.Types as PM
148150
149151#if MIN_VERSION_primitive(0,6,4)
152+#if !MIN_VERSION_primitive(0,7,0)
150153import qualified Data.Primitive.UnliftedArray as PM
154+#endif
151155import qualified Data.Primitive.PrimArray as PM
152156#endif
153157
154−#ifndef HAS_COERCIBLE
155−#define HAS_COERCIBLE (__GLASGOW_HASKELL__ >= 707)
156−#endif
157158
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
166160
167161parseIndexedJSON :: (Value -> Parser a) -> Int -> Value -> Parser a
168162parseIndexedJSON p idx value = p value <?> Index idx
@@ -402,6 +396,16 @@ class FromJSON a where
402396-- > newtype SomeId = SomeId { getSomeId :: Text }
403397-- > deriving (Eq,Ord,Hashable,FromJSONKey)
404398--
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+-- @
405409class FromJSONKey a where
406410 -- | Strategy for parsing the key of a map-like container.
407411 fromJSONKey :: FromJSONKeyFunction a
@@ -424,11 +428,7 @@ class FromJSONKey a where
424428-- At the moment this type is intentionally not exported. 'FromJSONKeyFunction'
425429-- can be inspected, but cannot be constructed.
426430data CoerceText a where
427−#if HAS_COERCIBLE
428431 CoerceText :: Coercible Text a => CoerceText a
429−#else
430− CoerceText :: CoerceText a
431−#endif
432432
433433-- | This type is related to 'ToJSONKeyFunction'. If 'FromJSONKeyValue' is used in the
434434-- 'FromJSONKey' instance, then 'ToJSONKeyValue' should be used in the 'ToJSONKey'
@@ -448,7 +448,7 @@ data FromJSONKeyFunction a
448448
449449-- | Only law abiding up to interpretation
450450instance Functor FromJSONKeyFunction where
451− fmap h (FromJSONKeyCoerce CoerceText) = FromJSONKeyText (h . coerce')
451+ fmap h (FromJSONKeyCoerce CoerceText) = FromJSONKeyText (h . coerce)
452452 fmap h (FromJSONKeyText f) = FromJSONKeyText (h . f)
453453 fmap h (FromJSONKeyTextParser f) = FromJSONKeyTextParser (fmap h . f)
454454 fmap h (FromJSONKeyValue f) = FromJSONKeyValue (fmap h . f)
@@ -462,9 +462,7 @@ instance Functor FromJSONKeyFunction where
462462--
463463-- On pre GHC 7.8 this is unconstrainted function.
464464fromJSONKeyCoerce ::
465−#if HAS_COERCIBLE
466465 Coercible Text a =>
467−#endif
468466 FromJSONKeyFunction a
469467fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText
470468
@@ -472,34 +470,52 @@ fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText
472470--
473471-- See note on 'fromJSONKeyCoerce'.
474472coerceFromJSONKeyFunction ::
475−#if HAS_COERCIBLE
476473 Coercible a b =>
477−#endif
478474 FromJSONKeyFunction a -> FromJSONKeyFunction b
479−#if HAS_COERCIBLE
480475coerceFromJSONKeyFunction = coerce
481−#else
482−coerceFromJSONKeyFunction (FromJSONKeyCoerce CoerceText) = FromJSONKeyCoerce CoerceText
483−coerceFromJSONKeyFunction (FromJSONKeyText f) = FromJSONKeyText (coerce' . f)
484−coerceFromJSONKeyFunction (FromJSONKeyTextParser f) = FromJSONKeyTextParser (fmap coerce' . f)
485−coerceFromJSONKeyFunction (FromJSONKeyValue f) = FromJSONKeyValue (fmap coerce' . f)
486−#endif
487476
488477{-# RULES
489478 "FromJSONKeyCoerce: fmap id" forall (x :: FromJSONKeyFunction a).
490479 fmap id x = x
491480 #-}
492−#if HAS_COERCIBLE
493481{-# RULES
494482 "FromJSONKeyCoerce: fmap coerce" forall x .
495483 fmap coerce x = coerceFromJSONKeyFunction x
496484 #-}
497−#endif
498485
499486-- | Same as 'fmap'. Provided for the consistency with 'ToJSONKeyFunction'.
500487mapFromJSONKeyFunction :: (a -> b) -> FromJSONKeyFunction a -> FromJSONKeyFunction b
501488mapFromJSONKeyFunction = fmap
502489
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+
503519-------------------------------------------------------------------------------
504520-- Functions needed for documentation
505521-------------------------------------------------------------------------------
@@ -752,13 +768,13 @@ withBoundedScientific' f v = withBoundedScientific_ id f v
752768-- | A variant of 'withBoundedScientific_' parameterized by a function to apply
753769-- to the 'Parser' in case of failure.
754770withBoundedScientific_ :: (Parser a -> Parser a) -> (Scientific -> Parser a) -> Value -> Parser a
755−withBoundedScientific_ whenFail f v@(Number scientific) =
756− if exponent > 1024
771+withBoundedScientific_ whenFail f (Number scientific) =
772+ if exp10 > 1024
757773 then whenFail (fail msg)
758774 else f scientific
759775 where
760− exponent = base10Exponent scientific
761− msg = "found a number with exponent " ++ show exponent ++ ", but it must not be greater than 1024"
776+ exp10 = base10Exponent scientific
777+ msg = "found a number with exponent " ++ show exp10 ++ ", but it must not be greater than 1024"
762778withBoundedScientific_ whenFail _ v =
763779 whenFail (typeMismatch "Number" v)
764780{-# INLINE withBoundedScientific_ #-}
@@ -778,7 +794,7 @@ withBool name _ v = prependContext name (typeMismatch "Boolean" v)
778794-- | Decode a nested JSON-encoded string.
779795withEmbeddedJSON :: String -> (Value -> Parser a) -> Value -> Parser a
780796withEmbeddedJSON _ innerParser (String txt) =
781− either fail innerParser $ eitherDecode (Compat.fromStrict $ T.encodeUtf8 txt)
797+ either fail innerParser $ eitherDecode (L.fromStrict $ T.encodeUtf8 txt)
782798 where
783799 eitherDecode = eitherFormatError . eitherDecodeWith jsonEOF ifromJSON
784800 eitherFormatError = either (Left . uncurry formatError) Right
@@ -847,7 +863,7 @@ parseFieldMaybe' = (.:!)
847863-- E.g. @'explicitParseField' 'parseJSON1' :: ('FromJSON1' f, 'FromJSON' a) -> 'Object' -> 'Text' -> 'Parser' (f a)@
848864explicitParseField :: (Value -> Parser a) -> Object -> Text -> Parser a
849865explicitParseField p obj key = case H.lookup key obj of
850− Nothing -> fail $ "key " ++ show key ++ " not present"
866+ Nothing -> fail $ "key " ++ show key ++ " not found"
851867 Just v -> p v <?> Key key
852868{-# INLINE explicitParseField #-}
853869
@@ -906,6 +922,16 @@ type ConName = String
906922contextType :: TypeName -> Parser a -> Parser a
907923contextType = prependContext
908924
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+
909935-- | Add the name of the constructor being parsed to a parser's error messages.
910936contextCons :: ConName -> TypeName -> Parser a -> Parser a
911937contextCons cname tname = prependContext (showCons cname tname)
@@ -1016,41 +1042,46 @@ parseAllNullarySum :: (SumFromString f, ConstructorNames f)
10161042parseAllNullarySum tname opts =
10171043 withText tname $ \tag ->
10181044 maybe (badTag tag) return $
1019− parseSumFromString opts tag
1045+ parseSumFromString modifier tag
10201046 where
1021− badTag tag = failWithCTags tname opts $ \cnames ->
1047+ badTag tag = failWithCTags tname modifier $ \cnames ->
10221048 "expected one of the tags " ++ show cnames ++
10231049 ", but found tag " ++ show tag
1050+ modifier = constructorTagModifier opts
10241051
10251052-- | Fail with an informative error message about a mismatched tag.
10261053-- The error message is parameterized by the list of expected tags,
10271054-- to be inferred from the result type of the parser.
10281055failWithCTags
1029− :: forall f a. ConstructorNames f
1030− => TypeName -> Options -> ([String] -> String) -> Parser (f a)
1031−failWithCTags tname opts f =
1056+ :: forall f a t. ConstructorNames f
1057+ => TypeName -> (String -> t) -> ([t] -> String) -> Parser (f a)
1058+failWithCTags tname modifier f =
10321059 contextType tname . fail $ f cnames
10331060 where
1034− cnames = unTagged2 (constructorTags opts :: Tagged2 f [String])
1061+ cnames = unTagged2 (constructorTags modifier :: Tagged2 f [t])
10351062
10361063class SumFromString f where
1037− parseSumFromString :: Options -> Text -> Maybe (f a)
1064+ parseSumFromString :: (String -> String) -> Text -> Maybe (f a)
10381065
10391066instance (SumFromString a, SumFromString b) => SumFromString (a :+: b) where
10401067 parseSumFromString opts key = (L1 <$> parseSumFromString opts key) <|>
10411068 (R1 <$> parseSumFromString opts key)
10421069
10431070instance (Constructor c) => SumFromString (C1 c U1) where
1044− parseSumFromString opts key | key == name = Just $ M1 U1
1045− | otherwise = Nothing
1046− where
1047− name = pack $ constructorTagModifier opts $
1048− conName (undefined :: M1 _i c _f _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)
1076+
1077+-- For genericFromJSONKey
1078+instance SumFromString a => SumFromString (D1 d a) where
1079+ parseSumFromString modifier key = M1 <$> parseSumFromString modifier key
10491080
10501081-- | List of all constructor tags.
1051−constructorTags :: ConstructorNames a => Options -> Tagged2 a [String]
1052−constructorTags opts =
1053− fmap DList.toList (constructorNames' (constructorTagModifier opts))
1082+constructorTags :: ConstructorNames a => (String -> t) -> Tagged2 a [t]
1083+constructorTags modifier =
1084+ fmap DList.toList (constructorNames' modifier)
10541085
10551086-- | List of all constructor names of an ADT, after a given conversion
10561087-- function. (Better inlining.)
@@ -1071,9 +1102,16 @@ instance Constructor c => ConstructorNames (C1 c a) where
10711102 where
10721103 cname = conName (undefined :: M1 _i c _f _p)
10731104
1074−--------------------------------------------------------------------------------
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
10751111
1076−parseNonAllNullarySum :: ( FromPair arity f
1112+--------------------------------------------------------------------------------
1113+parseNonAllNullarySum :: forall f c arity.
1114+ ( FromPair arity f
10771115 , FromTaggedObject arity f
10781116 , FromUntaggedValue arity f
10791117 , ConstructorNames f
@@ -1083,7 +1121,7 @@ parseNonAllNullarySum p@(tname :* opts :* _) =
10831121 case sumEncoding opts of
10841122 TaggedObject{..} ->
10851123 withObject tname $ \obj -> do
1086− tag <- contextType tname $ obj .: tagKey
1124+ tag <- contextType tname . contextTag tagKey cnames_ $ obj .: tagKey
10871125 fromMaybe (badTag tag <?> Key tagKey) $
10881126 parseFromTaggedObject (tag :* contentsFieldName :* p) obj
10891127 where
@@ -1091,6 +1129,7 @@ parseNonAllNullarySum p@(tname :* opts :* _) =
10911129 badTag tag = failWith_ $ \cnames ->
10921130 "expected tag field to be one of " ++ show cnames ++
10931131 ", but found tag " ++ show tag
1132+ cnames_ = unTagged2 (constructorTags (constructorTagModifier opts) :: Tagged2 f [String])
10941133
10951134 ObjectWithSingleField ->
10961135 withObject tname $ \obj -> case H.toList obj of
@@ -1122,7 +1161,7 @@ parseNonAllNullarySum p@(tname :* opts :* _) =
11221161
11231162 UntaggedValue -> parseUntaggedValue p
11241163 where
1125− failWith_ = failWithCTags tname opts
1164+ failWith_ = failWithCTags tname (constructorTagModifier opts)
11261165
11271166--------------------------------------------------------------------------------
11281167
@@ -1162,9 +1201,9 @@ class FromTaggedObject' arity f isRecord where
11621201 :: String :* ConName :* TypeName :* Options :* FromArgs arity a
11631202 -> Object -> Tagged isRecord (Parser (f a))
11641203
1165−instance (RecordFromJSON arity f) => FromTaggedObject' arity f True where
1204+instance (RecordFromJSON arity f, FieldNames f) => FromTaggedObject' arity f True where
11661205 -- Records are unpacked in the tagged object
1167− parseFromTaggedObject' (_ :* p) = Tagged . recordParseJSON p
1206+ parseFromTaggedObject' (_ :* p) = Tagged . recordParseJSON (True :* p)
11681207
11691208instance (ConsFromJSON arity f) => FromTaggedObject' arity f False where
11701209 -- Nonnullary nonrecords are encoded in the contents field
@@ -1205,11 +1244,11 @@ instance OVERLAPPING_
12051244 ) => ConsFromJSON' arity (S1 s a) True where
12061245 consParseJSON' p@(cname :* tname :* opts :* fargs)
12071246 | unwrapUnaryRecords opts = Tagged . fmap M1 . gParseJSON opts fargs
1208− | otherwise = Tagged . withObject (showCons cname tname) (recordParseJSON p)
1247+ | otherwise = Tagged . withObject (showCons cname tname) (recordParseJSON (False :* p))
12091248
12101249instance RecordFromJSON arity f => ConsFromJSON' arity f True where
12111250 consParseJSON' p@(cname :* tname :* _) =
1212− Tagged . withObject (showCons cname tname) (recordParseJSON p)
1251+ Tagged . withObject (showCons cname tname) (recordParseJSON (False :* p))
12131252
12141253instance OVERLAPPING_
12151254 ConsFromJSON' arity U1 False where
@@ -1235,21 +1274,55 @@ instance (ProductFromJSON arity f, ProductSize f
12351274
12361275--------------------------------------------------------------------------------
12371276
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)) :)
1287+
12381288class RecordFromJSON arity f where
12391289 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'
12401313 :: ConName :* TypeName :* Options :* FromArgs arity a
12411314 -> Object -> Parser (f a)
12421315
1243−instance ( RecordFromJSON arity a
1244− , RecordFromJSON arity b
1245− ) => RecordFromJSON arity (a :*: b) where
1246− recordParseJSON p obj =
1247− (:*:) <$> recordParseJSON p obj
1248− <*> recordParseJSON p obj
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
12491322
12501323instance OVERLAPPABLE_ (Selector s, GFromJSON arity a) =>
1251− RecordFromJSON arity (S1 s a) where
1252− recordParseJSON (cname :* tname :* opts :* fargs) obj = do
1324+ RecordFromJSON' arity (S1 s a) where
1325+ recordParseJSON' (cname :* tname :* opts :* fargs) obj = do
12531326 fv <- contextCons cname tname (obj .: label)
12541327 M1 <$> gParseJSON opts fargs fv <?> Key label
12551328 where
@@ -1257,16 +1330,16 @@ instance OVERLAPPABLE_ (Selector s, GFromJSON arity a) =>
12571330 sname = selName (undefined :: M1 _i s _f _p)
12581331
12591332instance INCOHERENT_ (Selector s, FromJSON a) =>
1260− RecordFromJSON arity (S1 s (K1 i (Maybe a))) where
1261− recordParseJSON (_ :* _ :* opts :* _) obj = M1 . K1 <$> obj .:? pack label
1333+ RecordFromJSON' arity (S1 s (K1 i (Maybe a))) where
1334+ recordParseJSON' (_ :* _ :* opts :* _) obj = M1 . K1 <$> obj .:? pack label
12621335 where
12631336 label = fieldLabelModifier opts sname
12641337 sname = selName (undefined :: M1 _i s _f _p)
12651338
12661339-- Parse an Option like a Maybe.
12671340instance INCOHERENT_ (Selector s, FromJSON a) =>
1268− RecordFromJSON arity (S1 s (K1 i (Semigroup.Option a))) where
1269− recordParseJSON p obj = wrap <$> recordParseJSON p obj
1341+ RecordFromJSON' arity (S1 s (K1 i (Semigroup.Option a))) where
1342+ recordParseJSON' p obj = wrap <$> recordParseJSON' p obj
12701343 where
12711344 wrap :: S1 s (K1 i (Maybe a)) p -> S1 s (K1 i (Semigroup.Option a)) p
12721345 wrap (M1 (K1 a)) = M1 (K1 (Semigroup.Option a))
@@ -1503,12 +1576,22 @@ instance FromJSONKey Float where
15031576 _ -> Scientific.toRealFloat <$> parseScientificText t
15041577
15051578instance (FromJSON a, Integral a) => FromJSON (Ratio a) where
1506− parseJSON = withObject "Rational" $ \obj -> do
1507− numerator <- obj .: "numerator"
1508− denominator <- obj .: "denominator"
1509− if denominator == 0
1510− then fail "Ratio denominator was 0"
1511− 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
15121595 {-# INLINE parseJSON #-}
15131596
15141597-- | This instance includes a bounds check to prevent maliciously
@@ -1659,7 +1742,7 @@ instance FromJSON1 NonEmpty where
16591742 liftParseJSON p _ = withArray "NonEmpty" $
16601743 (>>= ne) . Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
16611744 where
1662− ne [] = fail "parsing NonEmpty failed, unpexpected empty list"
1745+ ne [] = fail "parsing NonEmpty failed, unexpected empty list"
16631746 ne (x:xs) = pure (x :| xs)
16641747 {-# INLINE liftParseJSON #-}
16651748
@@ -1914,7 +1997,7 @@ instance FromJSON DotNetTime where
19141997 parseJSON = withText "DotNetTime" $ \t ->
19151998 let (s,m) = T.splitAt (T.length t - 5) t
19161999 t' = T.concat [s,".",m]
1917− in case parseTime defaultTimeLocale "/Date(%s%Q)/" (unpack t') of
2000+ in case parseTimeM True defaultTimeLocale "/Date(%s%Q)/" (unpack t') of
19182001 Just d -> pure (DotNetTime d)
19192002 _ -> fail "could not parse .NET time"
19202003 {-# INLINE parseJSON #-}
@@ -1923,7 +2006,6 @@ instance FromJSON DotNetTime where
19232006-- primitive
19242007-------------------------------------------------------------------------------
19252008
1926−#if MIN_VERSION_base(4,7,0)
19272009instance FromJSON a => FromJSON (PM.Array a) where
19282010 -- note: we could do better than this if vector exposed the data
19292011 -- constructor in Data.Vector.
@@ -1936,6 +2018,7 @@ instance FromJSON a => FromJSON (PM.SmallArray a) where
19362018instance (PM.Prim a,FromJSON a) => FromJSON (PM.PrimArray a) where
19372019 parseJSON = fmap Exts.fromList . parseJSON
19382020
2021+#if !MIN_VERSION_primitive(0,7,0)
19392022instance (PM.PrimUnlifted a,FromJSON a) => FromJSON (PM.UnliftedArray a) where
19402023 parseJSON = fmap Exts.fromList . parseJSON
19412024#endif
@@ -2008,6 +2091,40 @@ instance FromJSON DiffTime where
20082091 parseJSON = withBoundedScientific "DiffTime" $ pure . realToFrac
20092092 {-# INLINE parseJSON #-}
20102093
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+
20112128-------------------------------------------------------------------------------
20122129-- base Monoid/Semigroup
20132130-------------------------------------------------------------------------------