Address PR feedback.

Author: jessekempf

Data/Aeson.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE CPP #-}
-
 -- |
 -- Module:      Data.Aeson
 -- Copyright:   (c) 2011-2016 Bryan O'Sullivan
@@ -113,6 +111,7 @@ module Data.Aeson
     , withNumber
     , withScientific
     , withBool
+    , withEmbeddedJSON
     -- * Constructors and accessors
     , Series
     , pairs
@@ -122,7 +121,6 @@ module Data.Aeson
     , (.:!)
     , (.!=)
     , object
-    , embeddedJSON
     -- * Parsing
     , json
     , json'
@@ -138,7 +136,6 @@ import Data.Aeson.Types
 import Data.Aeson.Types.Internal (JSONPath, formatError)
 import qualified Data.ByteString as B
 import qualified Data.ByteString.Lazy as L
-import qualified Data.Text.Encoding as T
 
 -- | Efficiently serialize a JSON value as a lazy 'L.ByteString'.
 --
@@ -224,15 +221,6 @@ eitherDecodeStrict' =
   eitherFormatError . eitherDecodeStrictWith jsonEOF' ifromJSON
 {-# INLINE eitherDecodeStrict' #-}
 
--- | Decode a nested JSON-encoded string.
-embeddedJSON :: (FromJSON a) => String -> (Value -> Parser a)
-embeddedJSON str = withText str (either fail return . eitherDecode . fromStrict . T.encodeUtf8)
-  where
-#if MIN_VERSION_bytestring(0, 9, 2)
-  fromStrict = L.fromChunks . (:[])
-#else
-  fromStrict = L.fromStrict
-#endif
 -- $use
 --
 -- This section contains basic information on the different ways to

Data/Aeson/Compat.hs

@@ -0,0 +1,16 @@
+{-# LANGUAGE CPP #-}
+
+module Data.Aeson.Compat
+  (
+    fromStrict
+  ) where
+
+import qualified Data.ByteString      as S
+import qualified Data.ByteString.Lazy as L
+
+fromStrict :: S.ByteString -> L.ByteString
+#if MIN_VERSION_bytestring(0, 9, 2)
+fromStrict = L.fromChunks . (:[])
+#else
+fromStrict = L.fromStrict
+#endif

Data/Aeson/Types.hs

@@ -84,6 +84,7 @@ module Data.Aeson.Types
     , withNumber
     , withScientific
     , withBool
+    , withEmbeddedJSON
 
     , pairs
     , foldable

Data/Aeson/Types/Class.hs

@@ -73,6 +73,7 @@ module Data.Aeson.Types.Class
     , withNumber
     , withScientific
     , withBool
+    , withEmbeddedJSON
 
     -- * Functions
     , fromJSON

Data/Aeson/Types/FromJSON.hs

@@ -55,6 +55,7 @@ module Data.Aeson.Types.FromJSON
     , withNumber
     , withScientific
     , withBool
+    , withEmbeddedJSON
 
     -- * Functions
     , fromJSON
@@ -82,6 +83,7 @@ import Prelude.Compat
 import Control.Applicative ((<|>), Const(..))
 import Control.Monad ((<=<), zipWithM)
 import Data.Aeson.Internal.Functions (mapKey)
+import Data.Aeson.Parser.Internal (eitherDecodeWith, jsonEOF)
 import Data.Aeson.Types.Generic
 import Data.Aeson.Types.Internal
 import Data.Attoparsec.Number (Number(..))
@@ -114,6 +116,7 @@ import GHC.Generics
 import Numeric.Natural (Natural)
 import Text.ParserCombinators.ReadP (readP_to_S)
 import Unsafe.Coerce (unsafeCoerce)
+import qualified Data.Aeson.Compat as Compat
 import qualified Data.Aeson.Parser.Time as Time
 import qualified Data.Attoparsec.ByteString.Char8 as A (endOfInput, parseOnly, scientific)
 import qualified Data.DList as DList
@@ -665,6 +668,16 @@ withBool _        f (Bool arr) = f arr
 withBool expected _ v          = typeMismatch expected v
 {-# INLINE withBool #-}
 
+-- | Decode a nested JSON-encoded string.
+withEmbeddedJSON :: (FromJSON a) => String -> (Value -> Parser a) -> Value -> Parser a
+withEmbeddedJSON _ innerParser (String txt) =
+    either fail innerParser $ eitherDecode (Compat.fromStrict $ T.encodeUtf8 txt)
+    where
+        eitherDecode = eitherFormatError . eitherDecodeWith jsonEOF ifromJSON
+        eitherFormatError = either (Left . uncurry formatError) Right
+withEmbeddedJSON name _ v = typeMismatch name v
+{-# INLINE withEmbeddedJSON #-}
+
 -- | Convert a value from JSON, failing if the types do not match.
 fromJSON :: (FromJSON a) => Value -> Result a
 fromJSON = parse parseJSON

aeson.cabal

@@ -100,6 +100,7 @@ library
     Data.Aeson.Encode
 
   other-modules:
+    Data.Aeson.Compat
     Data.Aeson.Encoding.Builder
     Data.Aeson.Internal.Functions
     Data.Aeson.Parser.Unescape