7294049 · typeable/aeson

git.iko.soy/typeable/aeson

Shrink the API a bit

commit7294049398c8f0b73c0e8e496323f66fd7e82651 authorBryan O'Sullivan <bos@serpentine.com> dateTue 26 May 2015, 21:55 (11 years ago) parente9eeeb6

4 files changed+18−30

compare with master

unifiedsplit

Data/Aeson.hs+1 Data/Aeson/Encode/ByteString.hs+1−25 Data/Aeson/Types.hs+1−1 Data/Aeson/Types/Instances.hs+15−4

Data/Aeson.hs+1

@@ -70,6 +70,7 @@ module Data.Aeson

7070 -- * Constructors and accessors

7171 , Series

7272 , series

73+ , foldable

7374 , (.:)

7475 , (.:?)

7576 , (.!=)

Data/Aeson/Encode/ByteString.hs+1−25

@@ -24,22 +24,17 @@ module Data.Aeson.Encode.ByteString

2424 , text

2525 , unquoted

2626 , number

27− , foldable

28− , series

2927 , ascii2

3028 , ascii4

3129 , ascii5

32− , ascii6

33− , ascii7

3430 ) where

3531

3632import Data.Aeson.Types.Class (ToJSON(..))

37−import Data.Aeson.Types.Internal (Encoding(..), Series(..), Value(..))

33+import Data.Aeson.Types.Internal (Encoding(..), Value(..))

3834import Data.ByteString.Builder as B

3935import Data.ByteString.Builder.Prim as BP

4036import Data.ByteString.Builder.Scientific (scientificBuilder)

4137import Data.Char (ord)

42−import Data.Foldable (Foldable, foldMap)

4338import Data.Monoid ((<>))

4439import Data.Scientific (Scientific, base10Exponent, coefficient)

4540import Data.Word (Word8)

@@ -128,14 +123,6 @@ number s

128123 where

129124 e = base10Exponent s

130125

131−foldable :: (Foldable t, ToJSON a) => t a -> Encoding

132−foldable = series '[' ']' . foldMap (Value . toEncoding)

133−

134−series :: Char -> Char -> Series -> Encoding

135−series begin end (Value v) = Encoding $

136− B.char7 begin <> fromEncoding v <> B.char7 end

137−series begin end Empty = Encoding (BP.primBounded (ascii2 (begin,end)) ())

138−

139126emptyArray_ :: Encoding

140127emptyArray_ = Encoding (BP.primBounded (ascii2 ('[',']')) ())

141128

@@ -155,14 +142,3 @@ ascii5 :: (Char, (Char, (Char, (Char, Char)))) -> BP.BoundedPrim a

155142ascii5 cs = BP.liftFixedToBounded $ (const cs) >$<

156143 BP.char7 >*< BP.char7 >*< BP.char7 >*< BP.char7 >*< BP.char7

157144{-# INLINE ascii5 #-}

158−

159−ascii6 :: (Char, (Char, (Char, (Char, (Char, Char))))) -> BP.BoundedPrim a

160−ascii6 cs = BP.liftFixedToBounded $ (const cs) >$<

161− BP.char7 >*< BP.char7 >*< BP.char7 >*< BP.char7 >*< BP.char7 >*< BP.char7

162−{-# INLINE ascii6 #-}

163−

164−ascii7 :: (Char, (Char, (Char, (Char, (Char, (Char, Char)))))) -> BP.BoundedPrim a

165−ascii7 cs = BP.liftFixedToBounded $ (const cs) >$<

166− BP.char7 >*< BP.char7 >*< BP.char7 >*< BP.char7 >*< BP.char7 >*<

167− BP.char7 >*< BP.char7

168−{-# INLINE ascii7 #-}

Data/Aeson/Types.hs+1−1

@@ -52,8 +52,8 @@ module Data.Aeson.Types

5252 , withScientific

5353 , withBool

5454

55−

5655 , series

56+ , foldable

5757 , (.:)

5858 , (.:?)

5959 , (.!=)

Data/Aeson/Types/Instances.hs+15−4

@@ -49,6 +49,7 @@ module Data.Aeson.Types.Instances

4949 , (.!=)

5050 , builder

5151 , series

52+ , foldable

5253 , tuple

5354 , (>*<)

5455 , typeMismatch

@@ -65,7 +66,8 @@ import Data.Scientific (Scientific)

6566import qualified Data.Scientific as Scientific (coefficient, base10Exponent, fromFloatDigits, toRealFloat)

6667import Data.Attoparsec.Number (Number(..))

6768import Data.Fixed

68−import Data.Foldable (Foldable, toList)

69+import Data.Foldable (Foldable, foldMap, toList)

70+import Data.ByteString.Builder.Prim (primBounded)

6971import Data.Functor.Identity (Identity(..))

7072import Data.Hashable (Hashable(..))

7173import Data.Int (Int8, Int16, Int32, Int64)

@@ -439,7 +441,7 @@ instance (Foldable t, ToJSON a) => ToJSON (t a) where

439441 toJSON = toJSON . toList

440442 {-# INLINE toJSON #-}

441443

442− toEncoding = E.foldable

444+ toEncoding = foldable

443445

444446instance (FromJSON a) => FromJSON (Seq.Seq a) where

445447 parseJSON = withArray "Seq a" $ traverse parseJSON . Seq.fromList . V.toList

@@ -451,6 +453,15 @@ instance (ToJSON a) => ToJSON (Vector a) where

451453

452454 toEncoding = encodeVector

453455

456+-- | Encode a 'Foldable' as a JSON array.

457+foldable :: (Foldable t, ToJSON a) => t a -> Encoding

458+foldable = brackets '[' ']' . foldMap (Value . toEncoding)

459+

460+brackets :: Char -> Char -> Series -> Encoding

461+brackets begin end (Value v) = Encoding $

462+ B.char7 begin <> fromEncoding v <> B.char7 end

463+brackets begin end Empty = Encoding (primBounded (E.ascii2 (begin,end)) ())

464+

454465encodeVector :: (ToJSON a, VG.Vector v a) => v a -> Encoding

455466encodeVector xs

456467 | VG.null xs = E.emptyArray_

@@ -511,7 +522,7 @@ instance (ToJSON a) => ToJSON (HashSet.HashSet a) where

511522 toJSON = toJSON . HashSet.toList

512523 {-# INLINE toJSON #-}

513524

514− toEncoding = E.foldable

525+ toEncoding = foldable

515526

516527instance (Eq a, Hashable a, FromJSON a) => FromJSON (HashSet.HashSet a) where

517528 parseJSON = fmap HashSet.fromList . parseJSON

@@ -571,7 +582,7 @@ encodeMap minViewWithKey foldrWithKey xs =

571582encodeWithKey :: (ToJSON k, ToJSON v) =>

572583 ((k -> v -> Series -> Series) -> Series -> m -> Series)

573584 -> m -> Encoding

574−encodeWithKey foldrWithKey = E.series '{' '}' . foldrWithKey go mempty

585+encodeWithKey foldrWithKey = brackets '{' '}' . foldrWithKey go mempty

575586 where go k v c = Value (Encoding $ encodePair k v) <> c

576587

577588encodePair :: (ToJSON k, ToJSON v) => k -> v -> B.Builder