Export decodeJSON from Data.Binary.Serialise.CBOR.JSON

iconnect · Jan 20, 2016 · 9f56d28 · 9f56d28
1 parent e73c47f
commit 9f56d28
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Data/API/Value.hs b/src/Data/API/Value.hs
@@ -244,7 +244,7 @@ decode api ty0 = case ty0 of
     TyName tn  -> decodeDecl api (lookupTyName api tn)
     TyList ty  -> List  <$!> decodeListWith (decode api ty)
     TyMaybe ty -> Maybe <$!> decodeMaybeWith (decode api ty)
-    TyJSON     -> JSON  <$!> CBOR.decode
+    TyJSON     -> JSON  <$!> decodeJSON
     TyBasic bt -> decodeBasic bt
 
 decodeBasic :: BasicType -> CBOR.Decoder Value

diff --git a/src/Data/Binary/Serialise/CBOR/JSON.hs b/src/Data/Binary/Serialise/CBOR/JSON.hs
@@ -3,6 +3,7 @@ module Data.Binary.Serialise.CBOR.JSON (
     cborToJson,
     jsonToCbor,
     encodeJSON,
+    decodeJSON,
   ) where
 
 import qualified Data.Aeson          as JSON
@@ -20,6 +21,7 @@ import qualified Data.ByteString.Base64          as Base64
 -- import qualified Data.ByteString.Base64.URL      as Base64url
 import qualified Data.ByteString.Base16          as Base16
 
+import Data.Binary.Serialise.CBOR.Decoding
 import Data.Binary.Serialise.CBOR.Encoding
 import Data.Binary.Serialise.CBOR.Term as CBOR
 import Data.Binary.Serialise.CBOR
@@ -30,11 +32,14 @@ import Prelude
 
 instance Serialise JSON.Value where
   encode = encodeJSON
-  decode = cborToJson <$> decode
+  decode = decodeJSON
 
 encodeJSON :: JSON.Value -> Encoding
 encodeJSON = encode . jsonToCbor
 
+decodeJSON :: Decoder JSON.Value
+decodeJSON = cborToJson <$> decode
+
 -- Most of the types in CBOR have direct analogs in JSON.  However, some
 -- do not, and someone implementing a CBOR-to-JSON converter has to
 -- consider what to do in those cases.  The following non-normative