0ea692b · servant · git.iko.soy

git.iko.soy/servant

Add support of Pretty modifier for all verbs aliases

Minor import warning fix

commit0ea692bb64273ae39ba3186cf4b33007e1a3d7a1 authorНикита Размахнин <nikita@riskbook.com> dateWed 11 Nov 2020, 10:22 (6 years ago) parent8e2a654

2 files changed+20−3

compare with master

unifiedsplit

servant-docs/src/Servant/Docs/Internal.hs+1−3 servant-docs/src/Servant/Docs/Internal/Pretty.hs+19

servant-docs/src/Servant/Docs/Internal.hs+1−3

@@ -32,9 +32,7 @@ import Data.ByteString.Lazy.Char8

3232 (ByteString)

3333import qualified Data.CaseInsensitive as CI

3434import Data.Foldable

35− (toList)

36−import Data.Foldable

37− (fold)

35+ (fold, toList)

3836import Data.Hashable

3937 (Hashable)

4038import Data.HashMap.Strict

servant-docs/src/Servant/Docs/Internal/Pretty.hs+19

@@ -18,6 +18,7 @@ import Data.Proxy

1818import Network.HTTP.Media

1919 ((//))

2020import Servant.API

21+import Servant.API.Verbs

2122

2223-- | PrettyJSON content type.

2324data PrettyJSON

@@ -46,6 +47,24 @@ type family Pretty (api :: k) :: k where

4647 Pretty (Put cs r) = Put (Pretty cs) r

4748 Pretty (Delete cs r) = Delete (Pretty cs) r

4849 Pretty (Patch cs r) = Patch (Pretty cs) r

50+ Pretty (GetPartialContent cs r) = GetPartialContent (Pretty cs) r

51+ Pretty (PutResetContent cs r) = PutResetContent (Pretty cs) r

52+ Pretty (PatchResetContent cs r) = PatchResetContent (Pretty cs) r

53+ Pretty (DeleteResetContent cs r) = DeleteResetContent (Pretty cs) r

54+ Pretty (PostResetContent cs r) = PostResetContent (Pretty cs) r

55+ Pretty (GetResetContent cs r) = GetResetContent (Pretty cs) r

56+ Pretty (PutNonAuthoritative cs r) = PutNonAuthoritative (Pretty cs) r

57+ Pretty (PatchNonAuthoritative cs r) = PatchNonAuthoritative (Pretty cs) r

58+ Pretty (DeleteNonAuthoritative cs r) = DeleteNonAuthoritative (Pretty cs) r

59+ Pretty (PostNonAuthoritative cs r) = PostNonAuthoritative (Pretty cs) r

60+ Pretty (GetNonAuthoritative cs r) = GetNonAuthoritative (Pretty cs) r

61+ Pretty (PutAccepted cs r) = PutAccepted (Pretty cs) r

62+ Pretty (PatchAccepted cs r) = PatchAccepted (Pretty cs) r

63+ Pretty (DeleteAccepted cs r) = DeleteAccepted (Pretty cs) r

64+ Pretty (PostAccepted cs r) = PostAccepted (Pretty cs) r

65+ Pretty (GetAccepted cs r) = GetAccepted (Pretty cs) r

66+ Pretty (PutCreated cs r) = PutCreated (Pretty cs) r

67+ Pretty (PostCreated cs r) = PostCreated (Pretty cs) r

4968 Pretty (ReqBody cs r) = ReqBody (Pretty cs) r

5069 Pretty (JSON ': xs) = PrettyJSON ': xs

5170 Pretty (x ': xs) = x ': Pretty xs