75f86f2 · typeable/servant-reflex

git.iko.soy/typeable/servant-reflex

Add "Summary" combinator compatibility

commit75f86f258efef6cda76c1f3d4718c5f489417a16 authorJacek Galowicz <jacek@galowicz.de> dateSat 20 Mar 2021, 15:28 (6 years ago) parent31f2f33

2 files changed+66−38

compare with master

unifiedsplit

src/Servant/Reflex.hs+31−16 src/Servant/Reflex/Multi.hs+35−22

src/Servant/Reflex.hs+31−16

@@ -39,34 +39,36 @@ module Servant.Reflex

3939

4040------------------------------------------------------------------------------

4141import Control.Applicative

42−import Data.Monoid ((<>))

43−import qualified Data.Set as Set

44−import qualified Data.Text.Encoding as E

4542import qualified Data.CaseInsensitive as CI

4643import Data.Functor.Identity

47−import Data.Proxy (Proxy (..))

4844import qualified Data.Map as Map

45+import Data.Monoid ((<>))

46+import Data.Proxy (Proxy (..))

47+import qualified Data.Set as Set

4948import Data.Text (Text)

5049import qualified Data.Text as T

50+import qualified Data.Text.Encoding as E

5151import GHC.Exts (Constraint)

5252import GHC.TypeLits (KnownSymbol, symbolVal)

53−import Servant.API ((:<|>)(..),(:>), BasicAuth,

54− BasicAuthData, BuildHeadersTo(..),

55− Capture, contentType, Header,

56− Headers(..), HttpVersion, IsSecure,

57− MimeRender(..), MimeUnrender,

53+import Servant.API ((:<|>) (..), (:>), BasicAuth,

54+ BasicAuthData, BuildHeadersTo (..),

55+ Capture, Header, Headers (..),

56+ HttpVersion, IsSecure,

57+ MimeRender (..), MimeUnrender,

5858 NoContent, QueryFlag, QueryParam,

59− QueryParams, Raw, ReflectMethod(..),

59+ QueryParams, Raw, ReflectMethod (..),

6060 RemoteHost, ReqBody,

61− ToHttpApiData(..), Vault, Verb)

61+ ToHttpApiData (..), Vault, Verb,

62+ contentType)

63+import Servant.API.Description (Summary)

6264import qualified Servant.Auth as Auth

6365

6466import Reflex.Dom.Core (Dynamic, Event, Reflex,

65− XhrRequest(..),

66− XhrResponseHeaders(..),

67− XhrResponse(..), attachPromptlyDynWith, constDyn, ffor, fmapMaybe,

68− leftmost, performRequestsAsync,

69− )

67+ XhrRequest (..), XhrResponse (..),

68+ XhrResponseHeaders (..),

69+ attachPromptlyDynWith, constDyn, ffor,

70+ fmapMaybe, leftmost,

71+ performRequestsAsync)

7072------------------------------------------------------------------------------

7173import Servant.Common.BaseUrl (BaseUrl(..), Scheme(..), baseUrlWidget,

7274 showBaseUrl,

@@ -327,6 +329,19 @@ instance HasClient t m sublayout tag

327329 clientWithRouteAndResultHandler Proxy =

328330 clientWithRouteAndResultHandler (Proxy :: Proxy sublayout)

329331

332+-- | Using a 'Summary' combinator in your API doesn't affect the client

333+-- functions.

334+instance (HasClient t m sublayout tag, KnownSymbol sym)

335+ => HasClient t m (Summary sym :> sublayout) tag where

336+

337+ type Client t m (Summary sym :> sublayout) tag =

338+ Client t m sublayout tag

339+

340+ clientWithRouteAndResultHandler Proxy =

341+ clientWithRouteAndResultHandler (Proxy :: Proxy sublayout)

342+

343+

344+

330345

331346-- | If you use a 'QueryParam' in one of your endpoints in your API,

332347-- the corresponding querying function will automatically take

src/Servant/Reflex/Multi.hs+35−22

@@ -37,28 +37,30 @@ module Servant.Reflex.Multi (

3737 ) where

3838

3939------------------------------------------------------------------------------

40−import Control.Applicative (liftA2)

41−import Data.Functor.Compose (Compose (..), getCompose)

42−import Data.Proxy (Proxy (..))

43−import qualified Data.Set as Set

44−import Data.Text (Text)

45−import qualified Data.Text as T

46−import qualified Data.Text.Encoding as E

47−import GHC.TypeLits (KnownSymbol, symbolVal)

48−import Servant.API ((:<|>) (..), (:>), BasicAuth,

49− BasicAuthData, BuildHeadersTo (..),

50− Capture, Header, Headers (..),

51− HttpVersion, IsSecure, MimeRender (..),

52− MimeUnrender, NoContent, QueryFlag,

53− QueryParam, QueryParams, Raw,

54− ReflectMethod (..), RemoteHost,

55− ReqBody, ToHttpApiData (..), Vault,

56− Verb, contentType)

57−

58−import Reflex.Dom.Core (Dynamic, Event, Reflex,

59− XhrRequest (..),

60− XhrResponseHeaders (..),

61− attachPromptlyDynWith, constDyn)

40+import Control.Applicative (liftA2)

41+import Data.Functor.Compose (Compose (..), getCompose)

42+import Data.Proxy (Proxy (..))

43+import qualified Data.Set as Set

44+import Data.Text (Text)

45+import qualified Data.Text as T

46+import qualified Data.Text.Encoding as E

47+import GHC.TypeLits (KnownSymbol, symbolVal)

48+import Servant.API ((:<|>) (..), (:>), BasicAuth,

49+ BasicAuthData, BuildHeadersTo (..),

50+ Capture, Header, Headers (..),

51+ HttpVersion, IsSecure,

52+ MimeRender (..), MimeUnrender,

53+ NoContent, QueryFlag, QueryParam,

54+ QueryParams, Raw, ReflectMethod (..),

55+ RemoteHost, ReqBody,

56+ ToHttpApiData (..), Vault, Verb,

57+ contentType)

58+import Servant.API.Description (Summary)

59+

60+import Reflex.Dom.Core (Dynamic, Event, Reflex,

61+ XhrRequest (..),

62+ XhrResponseHeaders (..),

63+ attachPromptlyDynWith, constDyn)

6264------------------------------------------------------------------------------

6365import Servant.Common.BaseUrl (BaseUrl (..), Scheme (..),

6466 SupportsServantReflex)

@@ -240,6 +242,17 @@ instance HasClientMulti t m sublayout f tag

240242 clientWithRouteMulti (Proxy :: Proxy sublayout) q f tag

241243

242244

245+------------------------------------------------------------------------------

246+instance (HasClientMulti t m sublayout f tag, KnownSymbol sym)

247+ => HasClientMulti t m (Summary sym :> sublayout) f tag where

248+

249+ type ClientMulti t m (Summary sym :> sublayout) f tag =

250+ ClientMulti t m sublayout f tag

251+

252+ clientWithRouteMulti Proxy q f tag =

253+ clientWithRouteMulti (Proxy :: Proxy sublayout) q f tag

254+

255+

243256------------------------------------------------------------------------------

244257instance (KnownSymbol sym,

245258 ToHttpApiData a,