@@ -38,7 +38,7 @@ module Data.Aeson.Types
3838import Control.Applicative
3939import Control.DeepSeq (NFData(..))
4040import Control.Monad (MonadPlus(..))
41−import Data.Aeson.Functions (hashMap, mapHash, transformMap)
41+import Data.Aeson.Functions
4242import Data.Attoparsec.Char8 (Number(..))
4343import Data.Data (Data)
4444import Data.Int (Int8, Int16, Int32, Int64)
@@ -48,7 +48,7 @@ import Data.Monoid (Monoid(..))
4848import Data.Ratio (Ratio)
4949import Data.String (IsString(..))
5050import Data.Text (Text, pack, unpack)
51−import Data.Text.Encoding (decodeUtf8, encodeUtf8)
51+import Data.Text.Encoding (encodeUtf8)
5252import Data.Time.Clock (UTCTime)
5353import Data.Time.Format (FormatTime, formatTime, parseTime)
5454import Data.Typeable (Typeable)
@@ -480,7 +480,7 @@ instance (ToJSON a) => ToJSON [a] where
480480 {-# INLINE toJSON #-}
481481
482482instance (FromJSON a) => FromJSON [a] where
483− parseJSON (Array a) = mapA parseJSON (V.toList a)
483+ parseJSON (Array a) = mapM parseJSON (V.toList a)
484484 parseJSON _ = empty
485485 {-# INLINE parseJSON #-}
486486
@@ -489,7 +489,7 @@ instance (ToJSON a) => ToJSON (Vector a) where
489489 {-# INLINE toJSON #-}
490490
491491instance (FromJSON a) => FromJSON (Vector a) where
492− parseJSON (Array a) = V.fromList <$> mapA parseJSON (V.toList a)
492+ parseJSON (Array a) = V.mapM parseJSON a
493493 parseJSON _ = empty
494494 {-# INLINE parseJSON #-}
495495
@@ -514,10 +514,8 @@ instance (ToJSON v) => ToJSON (M.Map Text v) where
514514 {-# INLINE toJSON #-}
515515
516516instance (FromJSON v) => FromJSON (M.Map Text v) where
517− parseJSON (Object o) = M.fromAscList <$> go (M.toAscList o)
518− where
519− go ((k,v):kvs) = ((:) . (,) k) <$> parseJSON v <*> go kvs
520− go _ = pure []
517+ parseJSON (Object o) = M.fromAscList <$> mapM go (M.toAscList o)
518+ where go (k,v) = ((,) k) <$> parseJSON v
521519 parseJSON _ = empty
522520
523521instance (ToJSON v) => ToJSON (M.Map LT.Text v) where
@@ -532,15 +530,25 @@ instance (ToJSON v) => ToJSON (M.Map String v) where
532530instance (FromJSON v) => FromJSON (M.Map String v) where
533531 parseJSON = fmap (M.mapKeysMonotonic unpack) . parseJSON
534532
533+instance (ToJSON v) => ToJSON (M.Map B.ByteString v) where
534+ toJSON = Object . transformMap decode toJSON
535+
536+instance (FromJSON v) => FromJSON (M.Map B.ByteString v) where
537+ parseJSON = fmap (M.mapKeysMonotonic encodeUtf8) . parseJSON
538+
539+instance (ToJSON v) => ToJSON (M.Map LB.ByteString v) where
540+ toJSON = Object . transformMap strict toJSON
541+
542+instance (FromJSON v) => FromJSON (M.Map LB.ByteString v) where
543+ parseJSON = fmap (M.mapKeysMonotonic lazy) . parseJSON
544+
535545instance (ToJSON v) => ToJSON (H.HashMap Text v) where
536546 toJSON = Object . hashMap id toJSON
537547 {-# INLINE toJSON #-}
538548
539549instance (FromJSON v) => FromJSON (H.HashMap Text v) where
540− parseJSON (Object o) = H.fromList <$> go (M.toList o)
541− where
542− go ((k,v):kvs) = ((:) . (,) k) <$> parseJSON v <*> go kvs
543− go _ = pure []
550+ parseJSON (Object o) = H.fromList <$> mapM go (M.toList o)
551+ where go (k,v) = ((,) k) <$> parseJSON v
544552 parseJSON _ = empty
545553
546554instance (ToJSON v) => ToJSON (H.HashMap LT.Text v) where
@@ -555,17 +563,17 @@ instance (ToJSON v) => ToJSON (H.HashMap String v) where
555563instance (FromJSON v) => FromJSON (H.HashMap String v) where
556564 parseJSON = fmap (mapHash unpack) . parseJSON
557565
558−instance (ToJSON v) => ToJSON (M.Map B.ByteString v) where
559− toJSON = Object . transformMap decode toJSON
566+instance (ToJSON v) => ToJSON (H.HashMap B.ByteString v) where
567+ toJSON = Object . hashMap decode toJSON
560568
561−instance (FromJSON v) => FromJSON (M.Map B.ByteString v) where
562− parseJSON = fmap (M.mapKeysMonotonic encodeUtf8) . parseJSON
569+instance (FromJSON v) => FromJSON (H.HashMap B.ByteString v) where
570+ parseJSON = fmap (mapHash encodeUtf8) . parseJSON
563571
564−instance (ToJSON v) => ToJSON (M.Map LB.ByteString v) where
565− toJSON = Object . transformMap strict toJSON
572+instance (ToJSON v) => ToJSON (H.HashMap LB.ByteString v) where
573+ toJSON = Object . hashMap strict toJSON
566574
567−instance (FromJSON v) => FromJSON (M.Map LB.ByteString v) where
568− parseJSON = fmap (M.mapKeysMonotonic lazy) . parseJSON
575+instance (FromJSON v) => FromJSON (H.HashMap LB.ByteString v) where
576+ parseJSON = fmap (mapHash lazy) . parseJSON
569577
570578instance ToJSON Value where
571579 toJSON a = a
@@ -639,19 +647,3 @@ instance ToJSON a => ToJSON (Last a) where
639647instance FromJSON a => FromJSON (Last a) where
640648 parseJSON = fmap Last . parseJSON
641649 {-# INLINE parseJSON #-}
642−
643−mapA :: (Alternative m) => (t -> m a) -> [t] -> m [a]
644−mapA f = go
645− where
646− go (a:as) = (:) <$> f a <*> go as
647− go _ = pure []
648−
649−strict :: LB.ByteString -> Text
650−strict = decode . B.concat . LB.toChunks
651−
652−lazy :: Text -> LB.ByteString
653−lazy = LB.fromChunks . (:[]) . encodeUtf8
654−
655−decode :: B.ByteString -> Text
656−decode = decodeUtf8
657−{-# INLINE decode #-}