git.iko.soy/typeable/http-api-data
on master help sign in
Add ToForm/FormForm instances for IntMap and HashMap
6cd7a03Nickolay Kudasov
http-api-data.cabal+4−2
compare with master
unifiedsplit
@@ -23,12 +23,14 @@ flag use-text-show
23library
23library
24 hs-source-dirs: src/
24 hs-source-dirs: src/
25 build-depends: base >= 4.6 && < 4.10
25 build-depends: base >= 4.6 && < 4.10
26− , text >= 0.5
27 , bytestring
26 , bytestring
28 , containers
27 , containers
28+ , hashable
29+ , network-uri >= 2.6 && < 2.7
30+ , text >= 0.5
29 , time
31 , time
30 , time-locale-compat >=0.1.1.0 && <0.2
32 , time-locale-compat >=0.1.1.0 && <0.2
31− , network-uri >= 2.6 && < 2.7
33+ , unordered-containers
32 if flag(use-text-show)
34 if flag(use-text-show)
33 cpp-options: -DUSE_TEXT_SHOW
35 cpp-options: -DUSE_TEXT_SHOW
34 build-depends: text-show >= 2
36 build-depends: text-show >= 2
src/Web/FormUrlEncoded.hs+4
@@ -15,6 +15,10 @@ module Web.FormUrlEncoded (
15
15
16 encodeForm,
16 encodeForm,
17 decodeForm,
17 decodeForm,
18+
19+ -- * Helpers
20+ toEntriesByKey,
21+ fromEntriesByKey,
18) where
22) where
19
23
20import Web.Internal.FormUrlEncoded
24import Web.Internal.FormUrlEncoded
src/Web/Internal/FormUrlEncoded.hs+26−5
@@ -20,7 +20,12 @@ import Control.Arrow ((***))
20import Control.Monad ((<=<))
20import Control.Monad ((<=<))
21import qualified Data.ByteString.Lazy as BSL
21import qualified Data.ByteString.Lazy as BSL
22import qualified Data.ByteString.Lazy.Char8 as BSL8
22import qualified Data.ByteString.Lazy.Char8 as BSL8
23+import Data.Hashable (Hashable)
24+import Data.HashMap.Strict (HashMap)
25+import qualified Data.HashMap.Strict as HashMap
23import Data.Int
26import Data.Int
27+import Data.IntMap (IntMap)
28+import qualified Data.IntMap as IntMap
24import Data.Map (Map)
29import Data.Map (Map)
25import qualified Data.Map as Map
30import qualified Data.Map as Map
26import Data.Monoid
31import Data.Monoid
@@ -201,7 +206,17 @@ instance (ToFormKey k, ToHttpApiData v) => ToForm [(k, v)] where
201 toForm = fromList . map (toFormKey *** toQueryParam)
206 toForm = fromList . map (toFormKey *** toQueryParam)
202
207
203instance (ToFormKey k, ToHttpApiData v) => ToForm (Map k [v]) where
208instance (ToFormKey k, ToHttpApiData v) => ToForm (Map k [v]) where
209+ toForm = fromEntriesByKey . Map.toList
210+
211+instance (ToFormKey k, ToHttpApiData v) => ToForm (HashMap k [v]) where
212+ toForm = fromEntriesByKey . HashMap.toList
213+
214+instance ToHttpApiData v => ToForm (IntMap [v]) where
215+ toForm = fromEntriesByKey . IntMap.toList
216+
217+-- | Convert a list of entries groupped by key into a 'Form'.
218+fromEntriesByKey :: (ToFormKey k, ToHttpApiData v) => [(k, [v])] -> Form
204− toForm = Form . Map.fromListWith (<>) . map (toFormKey *** map toQueryParam) . Map.toList
219+fromEntriesByKey = Form . Map.fromListWith (<>) . map (toFormKey *** map toQueryParam)
205
220
206-- | A 'Generic'-based implementation of 'toForm'.
221-- | A 'Generic'-based implementation of 'toForm'.
207-- This is used as a default implementation in 'ToForm'.
222-- This is used as a default implementation in 'ToForm'.
@@ -273,14 +288,20 @@ class FromForm a where
273instance FromForm Form where fromForm = pure
288instance FromForm Form where fromForm = pure
274
289
275instance (FromFormKey k, FromHttpApiData v) => FromForm [(k, v)] where
290instance (FromFormKey k, FromHttpApiData v) => FromForm [(k, v)] where
276− fromForm = fmap (concatMap (\(k, vs) -> map ((,) k) vs)) . entriesByKey
291+ fromForm = fmap (concatMap (\(k, vs) -> map ((,) k) vs)) . toEntriesByKey
277
292
278instance (Ord k, FromFormKey k, FromHttpApiData v) => FromForm (Map k [v]) where
293instance (Ord k, FromFormKey k, FromHttpApiData v) => FromForm (Map k [v]) where
279− fromForm = fmap (Map.fromListWith (<>)) . entriesByKey
294+ fromForm = fmap (Map.fromListWith (<>)) . toEntriesByKey
295+
296+instance (Eq k, Hashable k, FromFormKey k, FromHttpApiData v) => FromForm (HashMap k [v]) where
297+ fromForm = fmap (HashMap.fromListWith (<>)) . toEntriesByKey
298+
299+instance FromHttpApiData v => FromForm (IntMap [v]) where
300+ fromForm = fmap (IntMap.fromListWith (<>)) . toEntriesByKey
280
301
281-- | Parse a 'Form' into a list of entries groupped by key.
302-- | Parse a 'Form' into a list of entries groupped by key.
282−entriesByKey :: (FromFormKey k, FromHttpApiData v) => Form -> Either Text [(k, [v])]
303+toEntriesByKey :: (FromFormKey k, FromHttpApiData v) => Form -> Either Text [(k, [v])]
283−entriesByKey = traverse parseGroup . Map.toList . unForm
304+toEntriesByKey = traverse parseGroup . Map.toList . unForm
284 where
305 where
285 parseGroup (k, vs) = (,) <$> parseFormKey k <*> traverse parseQueryParam vs
306 parseGroup (k, vs) = (,) <$> parseFormKey k <*> traverse parseQueryParam vs
286
307