Support for value serialization

benchmark/Main.hs

@@ -25,6 +25,8 @@ import Streamly.Internal.Data.Serialize hiding (encode)
 import qualified Streamly.Data.Stream as Stream
 import qualified Data.Text as TextS
 import qualified Data.Text.Lazy as TextL
+import qualified Data.Aeson as Aeson
+import qualified Data.Vector as Vector
 
 import Test.Tasty.Bench
 
@@ -171,18 +173,22 @@ main = do
     !lazyText <- do
         testSList <- Stream.replicateM 20 (genStrictText 50) & Stream.toList
         pure $ force $ TextL.fromChunks testSList
+    !strictAeson <- genStrictAeson 1000
 
     -- Asserts
     when (not (TextS.length strictText == 1000))
          (error "TextS.length strictText == 1000")
     when (not (TextL.length lazyText == 1000))
          (error "TextL.length lazyText == 1000")
-
+    when (not (arrayLength strictAeson == 1000))
+         (error "Vector.length strictAeson == 1000")
+
     -- Benchmarks
     defaultMain
         [ bencher "[Int]" intList 100
         , bencher "Strict.Text" strictText 100
         , bencher "Lazy.Text" lazyText 100
+        , bencher "Strict.Aeson" strictAeson 100
         ]
 
     where
@@ -192,3 +198,13 @@ main = do
         Stream.replicateM n genChar
             & Stream.toList
             & fmap (force . TextS.pack)
+
+    genStrictAeson :: Int -> IO Aeson.Value
+    genStrictAeson n = do
+        aesonList <- Vector.replicateM n (generate (arbitrary :: Gen Aeson.Value))
+        let aesonArray = Aeson.Array aesonList
+        pure aesonArray
+
+    arrayLength :: Aeson.Value -> Int
+    arrayLength (Aeson.Array arr) = Vector.length (Vector.fromList $ Vector.toList arr)
+    arrayLength _ = 0

src/Streamly/Data/Serialize/Instances.hs

@@ -13,17 +13,17 @@ module Streamly.Data.Serialize.Instances () where
 --------------------------------------------------------------------------------
 
 import Data.Fixed (Fixed)
-import Data.Maybe (fromJust)
 import Data.Scientific (Scientific)
 import Data.Time (Day, TimeOfDay, LocalTime, DiffTime, UTCTime)
 import Streamly.Data.Serialize.Instances.Text ()
 import Streamly.Internal.Data.Serialize (Serialize(..))
+import Data.Aeson.KeyMap (KeyMap, Key)
+import Data.Map (Map)
 
 import qualified Data.Aeson as Aeson
 import qualified Data.ByteString.Lazy as BSL
 import qualified Data.Vector as Vector
 import qualified Streamly.Internal.Data.Serialize.TH as Serialize
-
 --------------------------------------------------------------------------------
 -- Time
 --------------------------------------------------------------------------------
@@ -66,19 +66,10 @@ instance Serialize BSL.ByteString where
 -- Aeson.Value
 --------------------------------------------------------------------------------
 
--- TODO: Serialize it independently
-
--- XXX Extremely inefficient serialization of Aeson.Value
-instance Serialize Aeson.Value where
-    {-# INLINE size #-}
-    size i val = size i (Aeson.encode val)
-
-    {-# INLINE deserialize #-}
-    deserialize off arr end =
-        fmap (fromJust . Aeson.decode) <$> deserialize off arr end
-
-    {-# INLINE serialize #-}
-    serialize off arr val = serialize off arr (Aeson.encode val)
+$(Serialize.deriveSerialize ''Key)
+$(Serialize.deriveSerialize ''Map)
+$(Serialize.deriveSerialize ''KeyMap)
+$(Serialize.deriveSerialize ''Aeson.Value)
 
 --------------------------------------------------------------------------------
 -- Vector.Vector

streamly-serialize-instances.cabal

@@ -119,9 +119,10 @@ library
                     , text           >= 1.2      && < 2.1
                     , bytestring     >= 0.10.0   && < 0.13.0
                     , vector
-                    , aeson
+                    , aeson          >= 2.0      && < 3.0
                     , time
                     , scientific
+                    , containers     >= 0.6.7    && < 1.0.0
 
     -- Directories containing source files.
     hs-source-dirs:   src
@@ -163,6 +164,7 @@ test-suite serialization-tests
        , QuickCheck
        , time
        , text
+       , aeson                          >= 2.0  && < 3.0
 
 benchmark serialization-benchmarks
     -- Import common warning flags.
@@ -199,3 +201,5 @@ benchmark serialization-benchmarks
        , tasty       >= 1.4.1 && < 1.5
        , text
        , QuickCheck
+       , aeson       >= 2.0  && < 3.0
+       , vector

test/Main.hs

@@ -23,6 +23,7 @@ import Data.Time (UTCTime)
 
 import qualified Data.Text as TextS
 import qualified Data.Text.Lazy as TextL
+import qualified Data.Aeson as Aeson
 
 import Test.Hspec.QuickCheck
 import Test.Hspec as H
@@ -89,6 +90,9 @@ testCases = do
     prop "Strict Text"
         $ \(x :: TextS.Text) -> roundtrip x
 
+    prop "Aeson"
+        $ \(x :: Aeson.Value) -> roundtrip x
+
     prop "Lazy Text"
         $ \(x :: TextL.Text) -> roundtrip x