Merge pull request #875 from haskell/toJSONKeyText

Add toJSONKeyKey, revert type of ToJSONKeyText
haskell · Oct 9, 2021 · 4ad6b40 · 4ad6b40
2 parents 80ec09c + 82e33e0
commit 4ad6b40
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/src/Data/Aeson/Types.hs b/src/Data/Aeson/Types.hs
@@ -48,6 +48,7 @@ module Data.Aeson.Types
     , ToJSONKey(..)
     , ToJSONKeyFunction(..)
     , toJSONKeyText
+    , toJSONKeyKey
     , contramapToJSONKeyFunction
     , FromJSONKey(..)
     , FromJSONKeyFunction(..)

diff --git a/src/Data/Aeson/Types/Class.hs b/src/Data/Aeson/Types/Class.hs
@@ -53,6 +53,7 @@ module Data.Aeson.Types.Class
     , ToJSONKey(..)
     , ToJSONKeyFunction(..)
     , toJSONKeyText
+    , toJSONKeyKey
     , contramapToJSONKeyFunction
     , FromJSONKey(..)
     , FromJSONKeyFunction(..)

diff --git a/src/Data/Aeson/Types/FromJSON.hs b/src/Data/Aeson/Types/FromJSON.hs
@@ -2285,10 +2285,6 @@ instance FromJSON1 Proxy where
 instance FromJSON (Proxy a) where
     parseJSON _ = pure Proxy
 
-fromNull :: String -> a -> Value -> Parser a
-fromNull _ a Null = pure a
-fromNull c _ v    = prependContext c (typeMismatch "Null" v)
-
 instance FromJSON2 Tagged where
     liftParseJSON2 _ _ p _ = fmap Tagged . p
 

diff --git a/src/Data/Aeson/Types/ToJSON.hs b/src/Data/Aeson/Types/ToJSON.hs
@@ -39,6 +39,7 @@ module Data.Aeson.Types.ToJSON
     , ToJSONKey(..)
     , ToJSONKeyFunction(..)
     , toJSONKeyText
+    , toJSONKeyKey
     , contramapToJSONKeyFunction
 
     , GToJSONKey()
@@ -490,8 +491,14 @@ data ToJSONKeyFunction a
 --       where
 --         myKeyToText = Text.pack . show -- or showt from text-show
 -- @
-toJSONKeyText :: (a -> Key) -> ToJSONKeyFunction a
-toJSONKeyText f = ToJSONKeyText f (E.key . f)
+toJSONKeyText :: (a -> Text) -> ToJSONKeyFunction a
+toJSONKeyText f = toJSONKeyKey (Key.fromText . f)
+
+-- |
+--
+-- @since 2.0.0.0
+toJSONKeyKey :: (a -> Key) -> ToJSONKeyFunction a
+toJSONKeyKey f = ToJSONKeyText f (E.key . f)
 
 -- | TODO: should this be exported?
 toJSONKeyTextEnc :: (a -> Encoding' Key) -> ToJSONKeyFunction a
@@ -532,7 +539,7 @@ contramapToJSONKeyFunction h x = case x of
 -- @
 genericToJSONKey :: (Generic a, GToJSONKey (Rep a))
            => JSONKeyOptions -> ToJSONKeyFunction a
-genericToJSONKey opts = toJSONKeyText (Key.fromString . keyModifier opts . getConName . from)
+genericToJSONKey opts = toJSONKeyKey (Key.fromString . keyModifier opts . getConName . from)
 
 class    GetConName f => GToJSONKey f
 instance GetConName f => GToJSONKey f
@@ -1448,23 +1455,23 @@ instance ToJSON Text where
     toEncoding = E.text
 
 instance ToJSONKey Text where
-    toJSONKey = toJSONKeyText Key.fromText
+    toJSONKey = toJSONKeyText id
 
 
 instance ToJSON LT.Text where
     toJSON = String . LT.toStrict
     toEncoding = E.lazyText
 
 instance ToJSONKey LT.Text where
-    toJSONKey = toJSONKeyText (Key.fromText . LT.toStrict)
+    toJSONKey = toJSONKeyText (LT.toStrict)
 
 
 instance ToJSON Version where
     toJSON = toJSON . showVersion
     toEncoding = toEncoding . showVersion
 
 instance ToJSONKey Version where
-    toJSONKey = toJSONKeyText (Key.fromString . showVersion)
+    toJSONKey = toJSONKeyKey (Key.fromString . showVersion)
 
 -------------------------------------------------------------------------------
 -- semigroups NonEmpty
@@ -2199,8 +2206,8 @@ instance (ToJSON a, ToJSON b, ToJSON c) => ToJSONKey (a,b,c)
 instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d) => ToJSONKey (a,b,c,d)
 
 instance ToJSONKey Char where
-    toJSONKey = ToJSONKeyText (Key.fromText . T.singleton) (E.key . Key.fromText . T.singleton)
-    toJSONKeyList = toJSONKeyText Key.fromString
+    toJSONKey = toJSONKeyText T.singleton
+    toJSONKeyList = toJSONKeyText T.pack
 
 instance (ToJSONKey a, ToJSON a) => ToJSONKey [a] where
     toJSONKey = toJSONKeyList