@@ -8,7 +8,6 @@
88{-# LANGUAGE MultiParamTypeClasses #-}
99{-# LANGUAGE OverloadedStrings #-}
1010{-# LANGUAGE PolyKinds #-}
11−{-# LANGUAGE Rank2Types #-}
1211{-# LANGUAGE ScopedTypeVariables #-}
1312{-# LANGUAGE TupleSections #-}
1413{-# LANGUAGE TypeFamilies #-}
@@ -26,9 +25,7 @@
2625module Servant.Reflex
2726 ( client
2827 , clientWithOpts
29− , clientWithOptsAndResultHandler
3028 , clientWithRoute
31− , clientWithRouteAndResultHandler
3229 , BuildHeaderKeysTo(..)
3330 , toHeaders
3431 , HasClient
@@ -39,41 +36,39 @@ module Servant.Reflex
3936
4037------------------------------------------------------------------------------
4138import Control.Applicative
42−import qualified Data.CaseInsensitive as CI
43−import Data.Functor.Identity
44−import qualified Data.Map as Map
4539import Data.Monoid ((<>))
46−import Data.Proxy (Proxy (..))
4740import qualified Data.Set as Set
41+import qualified Data.Text.Encoding as E
42+import Data.CaseInsensitive (mk)
43+import Data.Functor.Identity
44+import Data.Proxy (Proxy (..))
45+import qualified Data.Map as Map
4846import Data.Text (Text)
4947import qualified Data.Text as T
50−import qualified Data.Text.Encoding as E
5148import GHC.Exts (Constraint)
5249import GHC.TypeLits (KnownSymbol, symbolVal)
53−import Servant.API ((:<|>) (..), (:>), BasicAuth,
54− BasicAuthData, BuildHeadersTo (..),
55− Capture, Header, Headers (..),
56− HttpVersion, IsSecure,
57− MimeRender (..), MimeUnrender,
50+import Servant.API ((:<|>)(..),(:>), BasicAuth,
51+ BasicAuthData, BuildHeadersTo(..),
52+ Capture, contentType, Header,
53+ Headers(..), HttpVersion, IsSecure,
54+ MimeRender(..),
5855 NoContent, QueryFlag, QueryParam,
59− QueryParams, Raw, ReflectMethod (..),
56+ QueryParams, Raw, ReflectMethod(..),
6057 RemoteHost, ReqBody,
61− ToHttpApiData (..), Vault, Verb,
62− contentType)
63−import Servant.API.Description (Summary)
58+ ToHttpApiData(..), Vault, Verb)
6459import qualified Servant.Auth as Auth
6560
6661import Reflex.Dom.Core (Dynamic, Event, Reflex,
67− XhrRequest (..), XhrResponse (..),
68− XhrResponseHeaders (..),
69− attachPromptlyDynWith, constDyn, ffor,
70− fmapMaybe, leftmost,
71− performRequestsAsync)
62+ XhrRequest(..),
63+ XhrResponseHeaders(..),
64+ XhrResponse(..), attachPromptlyDynWith, constDyn, ffor, fmapMaybe,
65+ leftmost, performRequestsAsync,
66+ )
7267------------------------------------------------------------------------------
7368import Servant.Common.BaseUrl (BaseUrl(..), Scheme(..), baseUrlWidget,
7469 showBaseUrl,
7570 SupportsServantReflex)
76−import Servant.Common.Req (ClientOptions(..),
71+import Servant.Common.Req (ClientOptions(..), MimeUnrender(..),
7772 defaultClientOptions,
7873 Req, ReqResult(..), QParam(..),
7974 QueryPart(..), addHeader, authData,
@@ -89,6 +84,8 @@ import Servant.Common.Req (ClientOptions(..),
8984 response,
9085 reqTag,
9186 qParams, withCredentials)
87+import Servant.Checked.Exceptions.Internal.Envelope (Envelope)
88+import Servant.Checked.Exceptions.Internal.Servant.API (NoThrow, Throws, Throwing, ThrowingNonterminal)
9289
9390
9491-- * Accessing APIs as a Client
@@ -103,7 +100,7 @@ import Servant.Common.Req (ClientOptions(..),
103100-- >
104101-- > getAllBooks :: Event t l -> m (Event t (l, ReqResult [Book]))
105102-- > postNewBook :: Dynamic t (Maybe Book) -> Event t l
106−-- > -> m (Event t (l, ReqResult Book)))
103+-- -> m (Event t (l, ReqResult Book)))
107104-- > (getAllBooks :<|> postNewBook) = client myApi host
108105-- > where host = constDyn $ BaseUrl Http "localhost" 8080
109106client
@@ -125,53 +122,21 @@ clientWithOpts
125122 -> Client t m layout tag
126123clientWithOpts p q t baseurl = clientWithRoute p q t defReq baseurl
127124
128−-- | Like 'clientWithOpts' but allows passing a function which will process the
129−-- result event in some way. This can be used to handle errors in a uniform way
130−-- across call sites.
131−clientWithOptsAndResultHandler
132− :: (HasClient t m layout tag)
133− => Proxy layout
134− -> Proxy m
135− -> Proxy tag
136− -> Dynamic t BaseUrl
137− -> ClientOptions
138− -> (forall a. Event t (ReqResult tag a) -> m (Event t (ReqResult tag a)))
139− -> Client t m layout tag
140−clientWithOptsAndResultHandler p q t = clientWithRouteAndResultHandler p q t defReq
141−
142125
143126-- | This class lets us define how each API combinator
144127-- influences the creation of an HTTP request. It's mostly
145128-- an internal class, you can just use 'client'.
146−class Monad m => HasClient t m layout (tag :: *) where
129+class HasClient t m layout (tag :: *) where
147130 type Client t m layout tag :: *
148− clientWithRoute
149− :: Proxy layout
150− -> Proxy m
151− -> Proxy tag
152− -> Req t
153− -> Dynamic t BaseUrl
154− -> ClientOptions
155− -> Client t m layout tag
156− clientWithRoute l m t r b o = clientWithRouteAndResultHandler l m t r b o return
157−
158− clientWithRouteAndResultHandler
159− :: Proxy layout
160− -> Proxy m
161− -> Proxy tag
162− -> Req t
163− -> Dynamic t BaseUrl
164− -> ClientOptions
165− -> (forall a. Event t (ReqResult tag a) -> m (Event t (ReqResult tag a)))
166− -> Client t m layout tag
131+ clientWithRoute :: Proxy layout -> Proxy m -> Proxy tag -> Req t -> Dynamic t BaseUrl -> ClientOptions -> Client t m layout tag
167132
168133
169134instance (HasClient t m a tag, HasClient t m b tag) => HasClient t m (a :<|> b) tag where
170135 type Client t m (a :<|> b) tag = Client t m a tag :<|> Client t m b tag
171136
172− clientWithRouteAndResultHandler Proxy q pTag req baseurl opts wrap =
173− clientWithRouteAndResultHandler (Proxy :: Proxy a) q pTag req baseurl opts wrap :<|>
174− clientWithRouteAndResultHandler (Proxy :: Proxy b) q pTag req baseurl opts wrap
137+ clientWithRoute Proxy q pTag req baseurl opts =
138+ clientWithRoute (Proxy :: Proxy a) q pTag req baseurl opts :<|>
139+ clientWithRoute (Proxy :: Proxy b) q pTag req baseurl opts
175140
176141
177142-- Capture. Example:
@@ -192,9 +157,11 @@ instance (SupportsServantReflex t m, ToHttpApiData a, HasClient t m sublayout ta
192157 type Client t m (Capture capture a :> sublayout) tag =
193158 Dynamic t (Either Text a) -> Client t m sublayout tag
194159
195− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap val =
196− clientWithRouteAndResultHandler
197− (Proxy :: Proxy sublayout) q t (prependToPathParts p req) baseurl opts wrap
160+ clientWithRoute Proxy q t req baseurl opts val =
161+ clientWithRoute (Proxy :: Proxy sublayout)
162+ q t
163+ (prependToPathParts p req)
164+ baseurl opts
198165 where p = (fmap . fmap) (toUrlPiece) val
199166
200167
@@ -207,8 +174,8 @@ instance {-# OVERLAPPABLE #-}
207174 Event t tag -> m (Event t (ReqResult tag a))
208175 -- TODO how to access input types here?
209176 -- ExceptT ServantError IO a
210− clientWithRouteAndResultHandler Proxy _ _ req baseurl opts wrap trigs =
211− wrap =<< fmap runIdentity <$> performRequestsCT (Proxy :: Proxy ct) method (constDyn $ Identity $ req') baseurl opts trigs
177+ clientWithRoute Proxy _ _ req baseurl opts trigs =
178+ fmap runIdentity <$> performRequestsCT (Proxy :: Proxy ct) method (constDyn $ Identity $ req') baseurl opts trigs
212179 where method = E.decodeUtf8 $ reflectMethod (Proxy :: Proxy method)
213180 req' = req { reqMethod = method }
214181
@@ -221,33 +188,29 @@ instance {-# OVERLAPPING #-}
221188 Event t tag -> m (Event t (ReqResult tag NoContent))
222189 -- TODO: how to access input types here?
223190 -- ExceptT ServantError IO NoContent
224− clientWithRouteAndResultHandler Proxy _ _ req baseurl opts wrap trigs =
225− wrap =<< fmap runIdentity <$> performRequestsNoBody method (constDyn $ Identity req) baseurl opts trigs
191+ clientWithRoute Proxy _ _ req baseurl opts =
192+ (fmap . fmap) runIdentity . performRequestsNoBody method (constDyn $ Identity req) baseurl opts
226193 where method = E.decodeUtf8 $ reflectMethod (Proxy :: Proxy method)
227194
228195
229196toHeaders :: BuildHeadersTo ls => ReqResult tag a -> ReqResult tag (Headers ls a)
230197toHeaders r =
231− let hdrs = maybe []
232− (\xhr -> fmap (\(h,v) -> (CI.map E.encodeUtf8 h, E.encodeUtf8 v))
198+ let toBS = E.encodeUtf8
199+ hdrs = maybe []
200+ (\xhr -> fmap (\(h,v) -> (mk (toBS h), toBS v))
233201 (Map.toList $ _xhrResponse_headers xhr))
234202 (response r)
235203 in ffor r $ \a -> Headers {getResponse = a ,getHeadersHList = buildHeadersTo hdrs}
236204
237−
238205class BuildHeaderKeysTo hs where
239− buildHeaderKeysTo :: Proxy hs -> [CI.CI T.Text]
206+ buildHeaderKeysTo :: Proxy hs -> [T.Text]
240207
241208instance {-# OVERLAPPABLE #-} BuildHeaderKeysTo '[]
242209 where buildHeaderKeysTo _ = []
243210
244211instance {-# OVERLAPPABLE #-} (BuildHeaderKeysTo xs, KnownSymbol h)
245212 => BuildHeaderKeysTo ((Header h v) ': xs) where
246− buildHeaderKeysTo _ =
247− let
248− thisKey = CI.mk $ T.pack (symbolVal (Proxy :: Proxy h))
249− in thisKey : buildHeaderKeysTo (Proxy :: Proxy xs)
250−
213+ buildHeaderKeysTo _ = T.pack (symbolVal (Proxy :: Proxy h)) : buildHeaderKeysTo (Proxy :: Proxy xs)
251214
252215-- HEADERS Verb (Content) --
253216-- Headers combinator not treated in fully general case,
@@ -262,10 +225,10 @@ instance {-# OVERLAPPABLE #-}
262225 ) => HasClient t m (Verb method status cts' (Headers ls a)) tag where
263226 type Client t m (Verb method status cts' (Headers ls a)) tag =
264227 Event t tag -> m (Event t (ReqResult tag (Headers ls a)))
265− clientWithRouteAndResultHandler Proxy _ _ req baseurl opts wrap trigs = do
228+ clientWithRoute Proxy _ _ req baseurl opts trigs = do
266229 let method = E.decodeUtf8 $ reflectMethod (Proxy :: Proxy method)
267230 resp <- fmap runIdentity <$> performRequestsCT (Proxy :: Proxy ct) method (constDyn $ Identity req') baseurl opts trigs
268− wrap $ toHeaders <$> resp
231+ return $ toHeaders <$> resp
269232 where req' = req { respHeaders =
270233 OnlyHeaders (Set.fromList (buildHeaderKeysTo (Proxy :: Proxy ls)))
271234 }
@@ -278,10 +241,10 @@ instance {-# OVERLAPPABLE #-}
278241 ) => HasClient t m (Verb method status cts (Headers ls NoContent)) tag where
279242 type Client t m (Verb method status cts (Headers ls NoContent)) tag
280243 = Event t tag -> m (Event t (ReqResult tag (Headers ls NoContent)))
281− clientWithRouteAndResultHandler Proxy _ _ req baseurl opts wrap trigs = do
244+ clientWithRoute Proxy _ _ req baseurl opts trigs = do
282245 let method = E.decodeUtf8 $ reflectMethod (Proxy :: Proxy method)
283246 resp <- fmap runIdentity <$> performRequestsNoBody method (constDyn $ Identity req') baseurl opts trigs
284− wrap $ toHeaders <$> resp
247+ return $ toHeaders <$> resp
285248 where req' = req {respHeaders =
286249 OnlyHeaders (Set.fromList (buildHeaderKeysTo (Proxy :: Proxy ls)))
287250 }
@@ -308,11 +271,11 @@ instance (KnownSymbol sym, ToHttpApiData a,
308271 type Client t m (Header sym a :> sublayout) tag =
309272 Dynamic t (Either Text a) -> Client t m sublayout tag
310273
311− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap eVal =
312− clientWithRouteAndResultHandler
313− (Proxy :: Proxy sublayout) q t
314− (Servant.Common.Req.addHeader hname eVal req)
315− baseurl opts wrap
274+ clientWithRoute Proxy q t req baseurl opts eVal =
275+ clientWithRoute (Proxy :: Proxy sublayout)
276+ q t
277+ (Servant.Common.Req.addHeader hname eVal req)
278+ baseurl opts
316279 where hname = T.pack $ symbolVal (Proxy :: Proxy sym)
317280
318281
@@ -326,21 +289,8 @@ instance HasClient t m sublayout tag
326289 type Client t m (HttpVersion :> sublayout) tag =
327290 Client t m sublayout tag
328291
329− clientWithRouteAndResultHandler Proxy =
330− clientWithRouteAndResultHandler (Proxy :: Proxy sublayout)
331−
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−
292+ clientWithRoute Proxy q t =
293+ clientWithRoute (Proxy :: Proxy sublayout) q t
344294
345295
346296-- | If you use a 'QueryParam' in one of your endpoints in your API,
@@ -376,9 +326,9 @@ instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout tag, Reflex
376326 Dynamic t (QParam a) -> Client t m sublayout tag
377327
378328 -- if mparam = Nothing, we don't add it to the query string
379− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap mparam =
380− clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t
381− (req {qParams = paramPair : qParams req}) baseurl opts wrap
329+ clientWithRoute Proxy q t req baseurl opts mparam =
330+ clientWithRoute (Proxy :: Proxy sublayout) q t
331+ (req {qParams = paramPair : qParams req}) baseurl opts
382332
383333 where pname = symbolVal (Proxy :: Proxy sym)
384334 --p prm = QueryPartParam $ (fmap . fmap) (toQueryParam) prm
@@ -422,8 +372,8 @@ instance (KnownSymbol sym, ToHttpApiData a, HasClient t m sublayout tag, Reflex
422372 type Client t m (QueryParams sym a :> sublayout) tag =
423373 Dynamic t [a] -> Client t m sublayout tag
424374
425− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap paramlist =
426− clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t req' baseurl opts wrap
375+ clientWithRoute Proxy q t req baseurl opts paramlist =
376+ clientWithRoute (Proxy :: Proxy sublayout) q t req' baseurl opts
427377
428378 where req' = req { qParams = (T.pack pname, params') : qParams req }
429379 pname = symbolVal (Proxy :: Proxy sym)
@@ -462,8 +412,8 @@ instance (KnownSymbol sym, HasClient t m sublayout tag, Reflex t)
462412 type Client t m (QueryFlag sym :> sublayout) tag =
463413 Dynamic t Bool -> Client t m sublayout tag
464414
465− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap flag =
466− clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t req' baseurl opts wrap
415+ clientWithRoute Proxy q t req baseurl opts flag =
416+ clientWithRoute (Proxy :: Proxy sublayout) q t req' baseurl opts
467417
468418 where req' = req { qParams = thisPair : qParams req }
469419 thisPair = (T.pack pName, QueryPartFlag flag) :: (Text, QueryPart t)
@@ -477,7 +427,7 @@ instance SupportsServantReflex t m => HasClient t m Raw tag where
477427 -> Event t tag
478428 -> m (Event t (ReqResult tag ()))
479429
480− clientWithRouteAndResultHandler _ _ _ _ baseurl _ wrap xhrs triggers = do
430+ clientWithRoute _ _ _ _ baseurl _ xhrs triggers = do
481431
482432 let xhrs' = liftA2 (\x path -> case x of
483433 Left e -> Left e
@@ -488,7 +438,7 @@ instance SupportsServantReflex t m => HasClient t m Raw tag where
488438 okReq = fmapMaybe (\(t,x) -> either (const Nothing) (Just . (t,)) x) xhrs'' :: Event t (tag, XhrRequest ())
489439
490440 resps <- performRequestsAsync okReq
491− wrap $ leftmost [ uncurry RequestFailure <$> badReq
441+ return $ leftmost [ uncurry RequestFailure <$> badReq
492442 , evalResponse (const $ Right ()) <$> resps
493443 ]
494444
@@ -519,8 +469,8 @@ instance (MimeRender ct a, HasClient t m sublayout tag, Reflex t)
519469 type Client t m (ReqBody (ct ': cts) a :> sublayout) tag =
520470 Dynamic t (Either Text a) -> Client t m sublayout tag
521471
522− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap body =
523− clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t req' baseurl opts wrap
472+ clientWithRoute Proxy q t req baseurl opts body =
473+ clientWithRoute (Proxy :: Proxy sublayout) q t req' baseurl opts
524474 where req' = req { reqBody = bodyBytesCT }
525475 ctProxy = Proxy :: Proxy ct
526476 ctString = T.pack $ show $ contentType ctProxy
@@ -534,9 +484,9 @@ instance (MimeRender ct a, HasClient t m sublayout tag, Reflex t)
534484instance (KnownSymbol path, HasClient t m sublayout tag, Reflex t) => HasClient t m (path :> sublayout) tag where
535485 type Client t m (path :> sublayout) tag = Client t m sublayout tag
536486
537− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap =
538− clientWithRouteAndResultHandler (Proxy :: Proxy sublayout) q t
539− (prependToPathParts (pure (Right $ T.pack p)) req) baseurl opts wrap
487+ clientWithRoute Proxy q t req baseurl opts =
488+ clientWithRoute (Proxy :: Proxy sublayout) q t
489+ (prependToPathParts (pure (Right $ T.pack p)) req) baseurl opts
540490
541491 where p = symbolVal (Proxy :: Proxy path)
542492
@@ -544,23 +494,23 @@ instance (KnownSymbol path, HasClient t m sublayout tag, Reflex t) => HasClient
544494instance HasClient t m api tag => HasClient t m (Vault :> api) tag where
545495 type Client t m (Vault :> api) tag = Client t m api tag
546496
547− clientWithRouteAndResultHandler Proxy =
548− clientWithRouteAndResultHandler (Proxy :: Proxy api)
497+ clientWithRoute Proxy q t req baseurl =
498+ clientWithRoute (Proxy :: Proxy api) q t req baseurl
549499
550500
551501instance HasClient t m api tag => HasClient t m (RemoteHost :> api) tag where
552502 type Client t m (RemoteHost :> api) tag = Client t m api tag
553503
554− clientWithRouteAndResultHandler Proxy =
555− clientWithRouteAndResultHandler (Proxy :: Proxy api)
504+ clientWithRoute Proxy q t req baseurl =
505+ clientWithRoute (Proxy :: Proxy api) q t req baseurl
556506
557507
558508
559509instance HasClient t m api tag => HasClient t m (IsSecure :> api) tag where
560510 type Client t m (IsSecure :> api) tag = Client t m api tag
561511
562− clientWithRouteAndResultHandler Proxy =
563− clientWithRouteAndResultHandler (Proxy :: Proxy api)
512+ clientWithRoute Proxy q t req baseurl =
513+ clientWithRoute (Proxy :: Proxy api) q t req baseurl
564514
565515
566516instance (HasClient t m api tag, Reflex t)
@@ -569,8 +519,8 @@ instance (HasClient t m api tag, Reflex t)
569519 type Client t m (BasicAuth realm usr :> api) tag = Dynamic t (Maybe BasicAuthData)
570520 -> Client t m api tag
571521
572− clientWithRouteAndResultHandler Proxy q t req baseurl opts wrap authdata =
573− clientWithRouteAndResultHandler (Proxy :: Proxy api) q t req' baseurl opts wrap
522+ clientWithRoute Proxy q t req baseurl opts authdata =
523+ clientWithRoute (Proxy :: Proxy api) q t req' baseurl opts
574524 where
575525 req' = req { authData = Just authdata }
576526
@@ -613,7 +563,7 @@ for empty and one for non-empty lists).
613563instance (HasCookieAuth auths, HasClient t m api tag) => HasClient t m (Auth.Auth auths a :> api) tag where
614564
615565 type Client t m (Auth.Auth auths a :> api) tag = Client t m api tag
616− clientWithRouteAndResultHandler Proxy = clientWithRouteAndResultHandler (Proxy :: Proxy api)
566+ clientWithRoute Proxy = clientWithRoute (Proxy :: Proxy api)
617567
618568
619569type family HasCookieAuth xs :: Constraint where
@@ -623,3 +573,136 @@ type family HasCookieAuth xs :: Constraint where
623573
624574class CookieAuthNotEnabled
625575
576+{- servant-checked-exceptions
577+~~~~~~~~~~~~~~~~~~~~~
578+-}
579+
580+-- | Change a 'Throws' into 'Throwing'.
581+instance (HasClient t m (Throwing '[e] :> api) tag) => HasClient t m (Throws e :> api) tag where
582+ type Client t m (Throws e :> api) tag = Client t m (Throwing '[e] :> api) tag
583+
584+ clientWithRoute
585+ :: Proxy (Throws e :> api)
586+ -> Proxy m
587+ -> Proxy tag
588+ -> Req t
589+ -> Dynamic t BaseUrl
590+ -> ClientOptions
591+ -> Client t m (Throwing '[e] :> api) tag
592+ clientWithRoute _ = clientWithRoute (Proxy :: Proxy (Throwing '[e] :> api))
593+
594+-- | When @'Throwing' es@ comes before a 'Verb', change it into the same 'Verb'
595+-- but returning an @'Envelope' es@.
596+instance (HasClient t m (Verb method status ctypes (Envelope es a)) tag) =>
597+ HasClient t m (Throwing es :> Verb method status ctypes a) tag where
598+
599+ type Client t m (Throwing es :> Verb method status ctypes a) tag =
600+ Client t m (Verb method status ctypes (Envelope es a)) tag
601+
602+ clientWithRoute
603+ :: Proxy (Throwing es :> Verb method status ctypes a)
604+ -> Proxy m
605+ -> Proxy tag
606+ -> Req t
607+ -> Dynamic t BaseUrl
608+ -> ClientOptions
609+ -> Client t m (Verb method status ctypes (Envelope es a)) tag
610+ clientWithRoute Proxy =
611+ clientWithRoute (Proxy :: Proxy (Verb method status ctypes (Envelope es a)))
612+
613+-- | When 'NoThrow' comes before a 'Verb', change it into the same 'Verb'
614+-- but returning an @'Envelope' \'[]@.
615+instance (HasClient t m (Verb method status ctypes (Envelope '[] a)) tag) =>
616+ HasClient t m (NoThrow :> Verb method status ctypes a) tag where
617+
618+ type Client t m (NoThrow :> Verb method status ctypes a) tag =
619+ Client t m (Verb method status ctypes (Envelope '[] a)) tag
620+
621+ clientWithRoute
622+ :: Proxy (NoThrow :> Verb method status ctypes a)
623+ -> Proxy m
624+ -> Proxy tag
625+ -> Req t
626+ -> Dynamic t BaseUrl
627+ -> ClientOptions
628+ -> Client t m (Verb method status ctypes (Envelope '[] a)) tag
629+ clientWithRoute Proxy =
630+ clientWithRoute (Proxy :: Proxy (Verb method status ctypes (Envelope '[] a)))
631+
632+-- | When @'Throwing' es@ comes before ':<|>', push @'Throwing' es@ into each
633+-- branch of the API.
634+instance HasClient t m ((Throwing es :> api1) :<|> (Throwing es :> api2)) tag =>
635+ HasClient t m (Throwing es :> (api1 :<|> api2)) tag where
636+
637+ type Client t m (Throwing es :> (api1 :<|> api2)) tag =
638+ Client t m ((Throwing es :> api1) :<|> (Throwing es :> api2)) tag
639+
640+ clientWithRoute
641+ :: Proxy (Throwing es :> (api1 :<|> api2))
642+ -> Proxy m
643+ -> Proxy tag
644+ -> Req t
645+ -> Dynamic t BaseUrl
646+ -> ClientOptions
647+ -> Client t m ((Throwing es :> api1) :<|> (Throwing es :> api2)) tag
648+ clientWithRoute _ =
649+ clientWithRoute (Proxy :: Proxy ((Throwing es :> api1) :<|> (Throwing es :> api2)))
650+
651+-- | When 'NoThrow' comes before ':<|>', push 'NoThrow' into each branch of the
652+-- API.
653+instance HasClient t m ((NoThrow :> api1) :<|> (NoThrow :> api2)) tag =>
654+ HasClient t m (NoThrow :> (api1 :<|> api2)) tag where
655+
656+ type Client t m (NoThrow :> (api1 :<|> api2)) tag =
657+ Client t m ((NoThrow :> api1) :<|> (NoThrow :> api2)) tag
658+
659+ clientWithRoute
660+ :: Proxy (NoThrow :> (api1 :<|> api2))
661+ -> Proxy m
662+ -> Proxy tag
663+ -> Req t
664+ -> Dynamic t BaseUrl
665+ -> ClientOptions
666+ -> Client t m ((NoThrow :> api1) :<|> (NoThrow :> api2)) tag
667+ clientWithRoute _ =
668+ clientWithRoute (Proxy :: Proxy ((NoThrow :> api1) :<|> (NoThrow :> api2)))
669+
670+-- | When a @'Throws' e@ comes immediately after a @'Throwing' es@, 'Snoc' the
671+-- @e@ onto the @es@. Otherwise, if @'Throws' e@ comes before any other
672+-- combinator, push it down so it is closer to the 'Verb'.
673+instance HasClient t m (ThrowingNonterminal (Throwing es :> api :> apis)) tag =>
674+ HasClient t m (Throwing es :> api :> apis) tag where
675+
676+ type Client t m (Throwing es :> api :> apis) tag =
677+ Client t m (ThrowingNonterminal (Throwing es :> api :> apis)) tag
678+
679+ clientWithRoute
680+ :: Proxy (Throwing es :> api :> apis)
681+ -> Proxy m
682+ -> Proxy tag
683+ -> Req t
684+ -> Dynamic t BaseUrl
685+ -> ClientOptions
686+ -> Client t m (ThrowingNonterminal (Throwing es :> api :> apis)) tag
687+ clientWithRoute _ =
688+ clientWithRoute (Proxy :: Proxy (ThrowingNonterminal (Throwing es :> api :> apis)))
689+
690+-- | When 'NoThrow' comes before any other combinator, push it down so it is
691+-- closer to the 'Verb'.
692+instance HasClient t m (api :> NoThrow :> apis) tag =>
693+ HasClient t m (NoThrow :> api :> apis) tag where
694+
695+ type Client t m (NoThrow :> api :> apis) tag =
696+ Client t m (api :> NoThrow :> apis) tag
697+
698+ clientWithRoute
699+ :: Proxy (NoThrow :> api :> apis)
700+ -> Proxy m
701+ -> Proxy tag
702+ -> Req t
703+ -> Dynamic t BaseUrl
704+ -> ClientOptions
705+ -> Client t m (api :> NoThrow :> apis) tag
706+ clientWithRoute _ =
707+ clientWithRoute (Proxy :: Proxy (api :> NoThrow :> apis))
708+