7862a6b...master · typeable/req

git.iko.soy/typeable/req

on master help sign in

.github/dependabot.ymlnew file+6

since splitsnapshots

unifiedsplit

@@ -0,0 +1,6 @@

1+version: 2

2+updates:

3+ - package-ecosystem: "github-actions"

4+ directory: "/"

5+ schedule:

6+ interval: "weekly"

.github/workflows/ci.yaml+14−13

@@ -11,27 +11,25 @@ jobs:

11 ormolu:

12 runs-on: ubuntu-latest

13 steps:

14− - uses: actions/checkout@v2.3.4

14+ - uses: actions/checkout@v4

15− - uses: mrkkrp/ormolu-action@v5

15+ - uses: haskell-actions/run-ormolu@v17

16 build:

17 runs-on: ubuntu-latest

18 needs: ormolu

19 strategy:

20 matrix:

21− cabal: ["3.6"]

21+ cabal: ["3.12"]

22− ghc: ["8.10.7", "9.0.2", "9.2.1"]

22+ ghc: ["9.6.3", "9.8.2", "9.10.1"]

23− env:

24− CONFIG: "--enable-tests --enable-benchmarks --flags=dev"

25 steps:

23 steps:

26− - uses: actions/checkout@v2.3.4

24+ - uses: actions/checkout@v4

27− - uses: haskell/actions/setup@v1.2.9

25+ - uses: haskell-actions/setup@v2

28 id: setup-haskell-cabal

26 id: setup-haskell-cabal

29 with:

27 with:

30 ghc-version: ${{ matrix.ghc }}

28 ghc-version: ${{ matrix.ghc }}

31 cabal-version: ${{ matrix.cabal }}

29 cabal-version: ${{ matrix.cabal }}

32 - run: cabal update

30 - run: cabal update

33− - run: cabal freeze $CONFIG

31+ - run: cabal freeze

34− - uses: actions/cache@v2.1.3

32+ - uses: actions/cache@v4.2.3

35 with:

33 with:

36 path: |

34 path: |

37 ${{ steps.setup-haskell-cabal.outputs.cabal-store }}

35 ${{ steps.setup-haskell-cabal.outputs.cabal-store }}

@@ -40,7 +38,10 @@ jobs:

40 restore-keys: |

38 restore-keys: |

41 ${{ runner.os }}-${{ matrix.ghc }}-

39 ${{ runner.os }}-${{ matrix.ghc }}-

42 - run: cabal format && git diff --exit-code --color=always

40 - run: cabal format && git diff --exit-code --color=always

43− - run: cabal build $CONFIG

41+ - run: cabal build

42+ - run: |

43+ docker pull kennethreitz/httpbin

44+ docker run -p 1234:80 kennethreitz/httpbin &

44− - run: cabal test $CONFIG

45+ cabal test

45− - run: cabal haddock $CONFIG

46+ - run: cabal haddock

46 - run: cabal sdist

47 - run: cabal sdist

.gitignore+1

@@ -25,5 +25,6 @@ cabal.project.local

25cabal.sandbox.config

26dist-*/

27dist/

28+hie.yaml

28stack.yaml

29stack.yaml

29stack.yaml.lock

30stack.yaml.lock

CHANGELOG.md+31

@@ -1,3 +1,34 @@

1+## Req 3.13.4

3+* Fixed empty ciphersuite list when compiling against `tls < 2.0.6`

4+ (see [PR 175](https://github.com/mrkkrp/req/pull/175)). As a side effect, now

5+ compatible with older versions of `crypton-connection` (>= 0.3).

7+## Req 3.13.3

9+* Works with `crypton-connection-0.4` and newer.

10+

11+## Req 3.13.2

12+

13+* Disable the problematic `httpbin-tests` test suite by default. Only enable

14+ it when the `dev` flag is enabled. In that case it is expected that an

15+ httpbin server is run locally at `localhost:1234`.

16+

17+## Req 3.13.1

18+

19+* Switched the non-pure test suite to use https://httpbun.org instead of

20+ https://httpbin.org since the latter proved to be highly unreliable

21+ lately.

22+

23+* Switched from `connection` to `crypton-connection`.

24+

25+* Builds with GHC 9.6.1.

26+

27+## Req 3.13.0

28+

29+* Add `headerRedacted` function to add header fields, which will be with

30+ redacted values on print.

31+

1## Req 3.12.0

32## Req 3.12.0

3* Add `isStatusCodeException` function.

34* Add `isStatusCodeException` function.

Network/HTTP/Req.hs+78−83

@@ -1,20 +1,9 @@

1−{-# LANGUAGE BangPatterns #-}

2−{-# LANGUAGE CPP #-}

3{-# LANGUAGE DataKinds #-}

1{-# LANGUAGE DataKinds #-}

4−{-# LANGUAGE DeriveDataTypeable #-}

5−{-# LANGUAGE DeriveGeneric #-}

6−{-# LANGUAGE DeriveLift #-}

7−{-# LANGUAGE FlexibleInstances #-}

8−{-# LANGUAGE GeneralizedNewtypeDeriving #-}

9{-# LANGUAGE LambdaCase #-}

2{-# LANGUAGE LambdaCase #-}

10−{-# LANGUAGE MultiParamTypeClasses #-}

11{-# LANGUAGE OverloadedStrings #-}

3{-# LANGUAGE OverloadedStrings #-}

12{-# LANGUAGE QuasiQuotes #-}

4{-# LANGUAGE QuasiQuotes #-}

13−{-# LANGUAGE RankNTypes #-}

14{-# LANGUAGE RecordWildCards #-}

5{-# LANGUAGE RecordWildCards #-}

15{-# LANGUAGE RoleAnnotations #-}

6{-# LANGUAGE RoleAnnotations #-}

16−{-# LANGUAGE ScopedTypeVariables #-}

17−{-# LANGUAGE StandaloneDeriving #-}

18{-# LANGUAGE TemplateHaskellQuotes #-}

7{-# LANGUAGE TemplateHaskellQuotes #-}

19{-# LANGUAGE TypeFamilies #-}

8{-# LANGUAGE TypeFamilies #-}

20{-# LANGUAGE UndecidableInstances #-}

9{-# LANGUAGE UndecidableInstances #-}

@@ -161,6 +150,7 @@ module Network.HTTP.Req

161 -- *** Headers

150 -- *** Headers

162 header,

151 header,

163 attachHeader,

152 attachHeader,

153+ headerRedacted,

164

154

165 -- *** Cookies

155 -- *** Cookies

166 -- $cookies

156 -- $cookies

@@ -213,69 +203,72 @@ module Network.HTTP.Req

213 )

203 )

214where

204where

215

205

216−import qualified Blaze.ByteString.Builder as BB

206+import Blaze.ByteString.Builder qualified as BB

217import Control.Applicative

207import Control.Applicative

218import Control.Arrow (first, second)

208import Control.Arrow (first, second)

219import Control.Exception hiding (Handler (..), TypeError)

209import Control.Exception hiding (Handler (..), TypeError)

210+import Control.Monad (guard, void, (>=>))

220import Control.Monad.Base

211import Control.Monad.Base

221import Control.Monad.Catch (Handler (..), MonadCatch, MonadMask, MonadThrow)

212import Control.Monad.Catch (Handler (..), MonadCatch, MonadMask, MonadThrow)

222import Control.Monad.IO.Class

213import Control.Monad.IO.Class

223import Control.Monad.IO.Unlift

214import Control.Monad.IO.Unlift

224−import Control.Monad.Reader

215+import Control.Monad.Reader (ReaderT (ReaderT), ask, lift, runReaderT)

225import Control.Monad.Trans.Accum (AccumT)

216import Control.Monad.Trans.Accum (AccumT)

226import Control.Monad.Trans.Cont (ContT)

217import Control.Monad.Trans.Cont (ContT)

227import Control.Monad.Trans.Control

218import Control.Monad.Trans.Control

228import Control.Monad.Trans.Except (ExceptT)

219import Control.Monad.Trans.Except (ExceptT)

229import Control.Monad.Trans.Identity (IdentityT)

220import Control.Monad.Trans.Identity (IdentityT)

230import Control.Monad.Trans.Maybe (MaybeT)

221import Control.Monad.Trans.Maybe (MaybeT)

231−import qualified Control.Monad.Trans.RWS.CPS as RWS.CPS

222+import Control.Monad.Trans.RWS.CPS qualified as RWS.CPS

232−import qualified Control.Monad.Trans.RWS.Lazy as RWS.Lazy

223+import Control.Monad.Trans.RWS.Lazy qualified as RWS.Lazy

233−import qualified Control.Monad.Trans.RWS.Strict as RWS.Strict

224+import Control.Monad.Trans.RWS.Strict qualified as RWS.Strict

234import Control.Monad.Trans.Select (SelectT)

225import Control.Monad.Trans.Select (SelectT)

235−import qualified Control.Monad.Trans.State.Lazy as State.Lazy

226+import Control.Monad.Trans.State.Lazy qualified as State.Lazy

236−import qualified Control.Monad.Trans.State.Strict as State.Strict

227+import Control.Monad.Trans.State.Strict qualified as State.Strict

237−import qualified Control.Monad.Trans.Writer.CPS as Writer.CPS

228+import Control.Monad.Trans.Writer.CPS qualified as Writer.CPS

238−import qualified Control.Monad.Trans.Writer.Lazy as Writer.Lazy

229+import Control.Monad.Trans.Writer.Lazy qualified as Writer.Lazy

239−import qualified Control.Monad.Trans.Writer.Strict as Writer.Strict

230+import Control.Monad.Trans.Writer.Strict qualified as Writer.Strict

240import Control.Retry

231import Control.Retry

241import Data.Aeson (FromJSON (..), ToJSON (..))

232import Data.Aeson (FromJSON (..), ToJSON (..))

242−import qualified Data.Aeson as A

233+import Data.Aeson qualified as A

243import Data.ByteString (ByteString)

234import Data.ByteString (ByteString)

244−import qualified Data.ByteString as B

235+import Data.ByteString qualified as B

245−import qualified Data.ByteString.Lazy as BL

236+import Data.ByteString.Lazy qualified as BL

246−import qualified Data.CaseInsensitive as CI

237+import Data.CaseInsensitive qualified as CI

247import Data.Data (Data)

238import Data.Data (Data)

239+import Data.Default.Class (def)

248import Data.Function (on)

240import Data.Function (on)

249import Data.IORef

241import Data.IORef

250import Data.Kind (Constraint, Type)

242import Data.Kind (Constraint, Type)

251import Data.List (foldl', nubBy)

243import Data.List (foldl', nubBy)

252import Data.List.NonEmpty (NonEmpty (..))

244import Data.List.NonEmpty (NonEmpty (..))

253−import qualified Data.List.NonEmpty as NE

245+import Data.List.NonEmpty qualified as NE

254import Data.Maybe (fromMaybe)

246import Data.Maybe (fromMaybe)

255import Data.Proxy

247import Data.Proxy

256import Data.Semigroup (Endo (..))

248import Data.Semigroup (Endo (..))

249+import Data.Set qualified as S

257import Data.Text (Text)

250import Data.Text (Text)

258−import qualified Data.Text as T

251+import Data.Text qualified as T

259−import qualified Data.Text.Encoding as T

252+import Data.Text.Encoding qualified as T

260import Data.Typeable (Typeable, cast)

253import Data.Typeable (Typeable, cast)

261import GHC.Generics

254import GHC.Generics

262import GHC.TypeLits

255import GHC.TypeLits

263−import qualified Language.Haskell.TH as TH

256+import Language.Haskell.TH qualified as TH

264−import qualified Language.Haskell.TH.Quote as TH

257+import Language.Haskell.TH.Quote qualified as TH

265−import qualified Language.Haskell.TH.Syntax as TH

258+import Language.Haskell.TH.Syntax qualified as TH

266−import qualified Network.Connection as NC

259+import Network.Connection qualified as NC

267−import qualified Network.HTTP.Client as L

260+import Network.HTTP.Client qualified as L

268−import qualified Network.HTTP.Client.Internal as LI

261+import Network.HTTP.Client.Internal qualified as LI

269−import qualified Network.HTTP.Client.MultipartFormData as LM

262+import Network.HTTP.Client.MultipartFormData qualified as LM

270−import qualified Network.HTTP.Client.TLS as L

263+import Network.HTTP.Client.TLS qualified as L

271−import qualified Network.HTTP.Types as Y

264+import Network.HTTP.Types qualified as Y

272import System.IO.Unsafe (unsafePerformIO)

265import System.IO.Unsafe (unsafePerformIO)

273import Text.URI (URI)

266import Text.URI (URI)

274−import qualified Text.URI as URI

267+import Text.URI qualified as URI

275−import qualified Text.URI.QQ as QQ

268+import Text.URI.QQ qualified as QQ

276−import qualified Web.Authenticate.OAuth as OAuth

269+import Web.Authenticate.OAuth qualified as OAuth

277import Web.FormUrlEncoded (FromForm (..), ToForm (..))

270import Web.FormUrlEncoded (FromForm (..), ToForm (..))

278−import qualified Web.FormUrlEncoded as Form

271+import Web.FormUrlEncoded qualified as Form

279import Web.HttpApiData (ToHttpApiData (..))

272import Web.HttpApiData (ToHttpApiData (..))

280

273

281----------------------------------------------------------------------------

274----------------------------------------------------------------------------

@@ -496,7 +489,7 @@ reqCb method url body responseProxy options adjustRequest =

496--

489--

497-- @since 3.7.0

490-- @since 3.7.0

498reqHandler ::

491reqHandler ::

499− MonadHttp m =>

492+ (MonadHttp m) =>

500 -- | How to get final result from a 'L.Response'

493 -- | How to get final result from a 'L.Response'

501 (L.Response L.BodyReader -> IO b) ->

494 (L.Response L.BodyReader -> IO b) ->

502 -- | 'L.Request' to perform

495 -- | 'L.Request' to perform

@@ -592,10 +585,10 @@ req' method url body options m = do

592 withReqManager (m request)

585 withReqManager (m request)

593

586

594-- | Perform an action using the global implicit 'L.Manager' that the rest

587-- | Perform an action using the global implicit 'L.Manager' that the rest

595−-- of the library uses. This allows to reuse connections that the

588+-- of the library uses. This allows us to reuse connections that the

596-- 'L.Manager' controls.

589-- 'L.Manager' controls.

597−withReqManager :: MonadIO m => (L.Manager -> m a) -> m a

590+withReqManager :: (MonadIO m) => (L.Manager -> m a) -> m a

598−withReqManager m = liftIO (readIORef globalManager) >>= m

591+withReqManager m = m globalManager

599

592

600-- | The global 'L.Manager' that 'req' uses. Here we just go with the

593-- | The global 'L.Manager' that 'req' uses. Here we just go with the

601-- default settings, so users don't need to deal with this manager stuff at

594-- default settings, so users don't need to deal with this manager stuff at

@@ -608,16 +601,16 @@ withReqManager m = liftIO (readIORef globalManager) >>= m

608-- manager. From that moment on the 'IORef' will be just reused—exactly the

601-- manager. From that moment on the 'IORef' will be just reused—exactly the

609-- behavior we want here in order to maximize connection sharing. GHC could

602-- behavior we want here in order to maximize connection sharing. GHC could

610-- spoil the plan by inlining the definition, hence the @NOINLINE@ pragma.

603-- spoil the plan by inlining the definition, hence the @NOINLINE@ pragma.

611−globalManager :: IORef L.Manager

604+globalManager :: L.Manager

612globalManager = unsafePerformIO $ do

605globalManager = unsafePerformIO $ do

613 context <- NC.initConnectionContext

606 context <- NC.initConnectionContext

614 let settings =

607 let settings =

615 L.mkManagerSettingsContext

608 L.mkManagerSettingsContext

616 (Just context)

609 (Just context)

617− (NC.TLSSettingsSimple False False False)

610+ def

618 Nothing

611 Nothing

619 manager <- L.newManager settings

612 manager <- L.newManager settings

620− newIORef manager

613+ return manager

621{-# NOINLINE globalManager #-}

614{-# NOINLINE globalManager #-}

622

615

623----------------------------------------------------------------------------

616----------------------------------------------------------------------------

@@ -637,7 +630,7 @@ globalManager = unsafePerformIO $ do

637-- | A type class for monads that support performing HTTP requests.

630-- | A type class for monads that support performing HTTP requests.

638-- Typically, you only need to define the 'handleHttpException' method

631-- Typically, you only need to define the 'handleHttpException' method

639-- unless you want to tweak 'HttpConfig'.

632-- unless you want to tweak 'HttpConfig'.

640−class MonadIO m => MonadHttp m where

633+class (MonadIO m) => MonadHttp m where

641 -- | This method describes how to deal with 'HttpException' that was

634 -- | This method describes how to deal with 'HttpException' that was

642 -- caught by the library. One option is to re-throw it if you are OK with

635 -- caught by the library. One option is to re-throw it if you are OK with

643 -- exceptions, but if you prefer working with something like

636 -- exceptions, but if you prefer working with something like

@@ -721,9 +714,8 @@ data HttpConfig = HttpConfig

721 -- | Max length of preview fragment of response body.

714 -- | Max length of preview fragment of response body.

722 --

715 --

723 -- @since 3.6.0

716 -- @since 3.6.0

724− httpConfigBodyPreviewLength :: forall a. Num a => a

717+ httpConfigBodyPreviewLength :: forall a. (Num a) => a

725 }

718 }

726− deriving (Typeable)

727

719

728-- | The default value of 'HttpConfig'.

720-- | The default value of 'HttpConfig'.

729--

721--

@@ -811,27 +803,27 @@ instance (MonadHttp m, Monoid w) => MonadHttp (AccumT w m) where

811 getHttpConfig = lift getHttpConfig

803 getHttpConfig = lift getHttpConfig

812

804

813-- | @since 3.10.0

805-- | @since 3.10.0

814−instance MonadHttp m => MonadHttp (ContT r m) where

806+instance (MonadHttp m) => MonadHttp (ContT r m) where

815 handleHttpException = lift . handleHttpException

807 handleHttpException = lift . handleHttpException

816 getHttpConfig = lift getHttpConfig

808 getHttpConfig = lift getHttpConfig

817

809

818-- | @since 3.10.0

810-- | @since 3.10.0

819−instance MonadHttp m => MonadHttp (ExceptT e m) where

811+instance (MonadHttp m) => MonadHttp (ExceptT e m) where

820 handleHttpException = lift . handleHttpException

812 handleHttpException = lift . handleHttpException

821 getHttpConfig = lift getHttpConfig

813 getHttpConfig = lift getHttpConfig

822

814

823-- | @since 3.10.0

815-- | @since 3.10.0

824−instance MonadHttp m => MonadHttp (IdentityT m) where

816+instance (MonadHttp m) => MonadHttp (IdentityT m) where

825 handleHttpException = lift . handleHttpException

817 handleHttpException = lift . handleHttpException

826 getHttpConfig = lift getHttpConfig

818 getHttpConfig = lift getHttpConfig

827

819

828-- | @since 3.10.0

820-- | @since 3.10.0

829−instance MonadHttp m => MonadHttp (MaybeT m) where

821+instance (MonadHttp m) => MonadHttp (MaybeT m) where

830 handleHttpException = lift . handleHttpException

822 handleHttpException = lift . handleHttpException

831 getHttpConfig = lift getHttpConfig

823 getHttpConfig = lift getHttpConfig

832

824

833-- | @since 3.10.0

825-- | @since 3.10.0

834−instance MonadHttp m => MonadHttp (ReaderT r m) where

826+instance (MonadHttp m) => MonadHttp (ReaderT r m) where

835 handleHttpException = lift . handleHttpException

827 handleHttpException = lift . handleHttpException

836 getHttpConfig = lift getHttpConfig

828 getHttpConfig = lift getHttpConfig

837

829

@@ -851,17 +843,17 @@ instance (MonadHttp m, Monoid w) => MonadHttp (RWS.Strict.RWST r w s m) where

851 getHttpConfig = lift getHttpConfig

843 getHttpConfig = lift getHttpConfig

852

844

853-- | @since 3.10.0

845-- | @since 3.10.0

854−instance MonadHttp m => MonadHttp (SelectT r m) where

846+instance (MonadHttp m) => MonadHttp (SelectT r m) where

855 handleHttpException = lift . handleHttpException

847 handleHttpException = lift . handleHttpException

856 getHttpConfig = lift getHttpConfig

848 getHttpConfig = lift getHttpConfig

857

849

858-- | @since 3.10.0

850-- | @since 3.10.0

859−instance MonadHttp m => MonadHttp (State.Lazy.StateT s m) where

851+instance (MonadHttp m) => MonadHttp (State.Lazy.StateT s m) where

860 handleHttpException = lift . handleHttpException

852 handleHttpException = lift . handleHttpException

861 getHttpConfig = lift getHttpConfig

853 getHttpConfig = lift getHttpConfig

862

854

863-- | @since 3.10.0

855-- | @since 3.10.0

864−instance MonadHttp m => MonadHttp (State.Strict.StateT s m) where

856+instance (MonadHttp m) => MonadHttp (State.Strict.StateT s m) where

865 handleHttpException = lift . handleHttpException

857 handleHttpException = lift . handleHttpException

866 getHttpConfig = lift getHttpConfig

858 getHttpConfig = lift getHttpConfig

867

859

@@ -885,7 +877,7 @@ instance (MonadHttp m, Monoid w) => MonadHttp (Writer.Strict.WriterT w m) where

885--

877--

886-- @since 0.4.0

878-- @since 0.4.0

887runReq ::

879runReq ::

888− MonadIO m =>

880+ (MonadIO m) =>

889 -- | 'HttpConfig' to use

881 -- | 'HttpConfig' to use

890 HttpConfig ->

882 HttpConfig ->

891 -- | Computation to run

883 -- | Computation to run

@@ -990,7 +982,7 @@ class HttpMethod a where

990 -- | Return name of the method as a 'ByteString'.

982 -- | Return name of the method as a 'ByteString'.

991 httpMethodName :: Proxy a -> ByteString

983 httpMethodName :: Proxy a -> ByteString

992

984

993−instance HttpMethod method => RequestComponent (Tagged "method" method) where

985+instance (HttpMethod method) => RequestComponent (Tagged "method" method) where

994 getRequestMod _ = Endo $ \x ->

986 getRequestMod _ = Endo $ \x ->

995 x {L.method = httpMethodName (Proxy :: Proxy method)}

987 x {L.method = httpMethodName (Proxy :: Proxy method)}

996

988

@@ -1032,25 +1024,20 @@ instance HttpMethod method => RequestComponent (Tagged "method" method) where

1032-- > -- https://%D1%8E%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4.%D1%80%D1%84

1024-- > -- https://%D1%8E%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4.%D1%80%D1%84

1033data Url (scheme :: Scheme) = Url Scheme (NonEmpty Text)

1025data Url (scheme :: Scheme) = Url Scheme (NonEmpty Text)

1034 -- NOTE The second value is the path segments in reversed order.

1026 -- NOTE The second value is the path segments in reversed order.

1035− deriving (Eq, Ord, Show, Data, Typeable, Generic)

1027+ deriving (Eq, Ord, Show, Data, Generic)

1036

1028

1037type role Url nominal

1029type role Url nominal

1038

1030

1039-- With template-haskell >=2.15 and text >=1.2.4 Lift can be derived, however

1031-- With template-haskell >=2.15 and text >=1.2.4 Lift can be derived, however

1040-- the derived lift forgets the type of the scheme.

1032-- the derived lift forgets the type of the scheme.

1041−instance Typeable scheme => TH.Lift (Url scheme) where

1033+instance (Typeable scheme) => TH.Lift (Url scheme) where

1042 lift url =

1034 lift url =

1043 TH.dataToExpQ (fmap liftText . cast) url `TH.sigE` case url of

1035 TH.dataToExpQ (fmap liftText . cast) url `TH.sigE` case url of

1044 Url Http _ -> [t|Url 'Http|]

1036 Url Http _ -> [t|Url 'Http|]

1045 Url Https _ -> [t|Url 'Https|]

1037 Url Https _ -> [t|Url 'Https|]

1046 where

1038 where

1047 liftText t = TH.AppE (TH.VarE 'T.pack) <$> TH.lift (T.unpack t)

1039 liftText t = TH.AppE (TH.VarE 'T.pack) <$> TH.lift (T.unpack t)

1048−

1049−#if MIN_VERSION_template_haskell(2,17,0)

1050 liftTyped = TH.Code . TH.unsafeTExpCoerce . TH.lift

1040 liftTyped = TH.Code . TH.unsafeTExpCoerce . TH.lift

1051−#elif MIN_VERSION_template_haskell(2,16,0)

1052− liftTyped = TH.unsafeTExpCoerce . TH.lift

1053−#endif

1054

1041

1055-- | Given host name, produce a 'Url' which has “http” as its scheme and

1042-- | Given host name, produce a 'Url' which has “http” as its scheme and

1056-- empty path. This also sets port to @80@.

1043-- empty path. This also sets port to @80@.

@@ -1066,7 +1053,7 @@ https = Url Https . pure

1066-- path segment can be of any type that is an instance of 'ToHttpApiData'.

1053-- path segment can be of any type that is an instance of 'ToHttpApiData'.

1067infixl 5 /~

1054infixl 5 /~

1068

1055

1069−(/~) :: ToHttpApiData a => Url scheme -> a -> Url scheme

1056+(/~) :: (ToHttpApiData a) => Url scheme -> a -> Url scheme

1070Url secure path /~ segment = Url secure (NE.cons (toUrlPiece segment) path)

1057Url secure path /~ segment = Url secure (NE.cons (toUrlPiece segment) path)

1071

1058

1072-- | A type-constrained version of @('/~')@ to remove ambiguity in the cases

1059-- | A type-constrained version of @('/~')@ to remove ambiguity in the cases

@@ -1254,7 +1241,7 @@ instance HttpBody NoReqBody where

1254-- charset=utf-8\"@ value.

1241-- charset=utf-8\"@ value.

1255newtype ReqBodyJson a = ReqBodyJson a

1242newtype ReqBodyJson a = ReqBodyJson a

1256

1243

1257−instance ToJSON a => HttpBody (ReqBodyJson a) where

1244+instance (ToJSON a) => HttpBody (ReqBodyJson a) where

1258 getRequestBody (ReqBodyJson a) = L.RequestBodyLBS (A.encode a)

1245 getRequestBody (ReqBodyJson a) = L.RequestBodyLBS (A.encode a)

1259 getRequestContentType _ = pure "application/json; charset=utf-8"

1246 getRequestContentType _ = pure "application/json; charset=utf-8"

1260

1247

@@ -1353,7 +1340,7 @@ instance HttpBody ReqBodyMultipart where

1353-- | Create 'ReqBodyMultipart' request body from a collection of 'LM.Part's.

1340-- | Create 'ReqBodyMultipart' request body from a collection of 'LM.Part's.

1354--

1341--

1355-- @since 0.2.0

1342-- @since 0.2.0

1356−reqBodyMultipart :: MonadIO m => [LM.Part] -> m ReqBodyMultipart

1343+reqBodyMultipart :: (MonadIO m) => [LM.Part] -> m ReqBodyMultipart

1357reqBodyMultipart parts = liftIO $ do

1344reqBodyMultipart parts = liftIO $ do

1358 boundary <- LM.webkitBoundary

1345 boundary <- LM.webkitBoundary

1359 body <- LM.renderParts boundary parts

1346 body <- LM.renderParts boundary parts

@@ -1393,7 +1380,7 @@ type family

1393 TypeError

1380 TypeError

1394 ('Text "This HTTP method does not allow attaching a request body.")

1381 ('Text "This HTTP method does not allow attaching a request body.")

1395

1382

1396−instance HttpBody body => RequestComponent (Tagged "body" body) where

1383+instance (HttpBody body) => RequestComponent (Tagged "body" body) where

1397 getRequestMod (Tagged body) = Endo $ \x ->

1384 getRequestMod (Tagged body) = Endo $ \x ->

1398 x

1385 x

1399 { L.requestBody = getRequestBody body,

1386 { L.requestBody = getRequestBody body,

@@ -1463,7 +1450,7 @@ instance RequestComponent (Option scheme) where

1463

1450

1464-- | Finalize given 'L.Request' by applying a finalizer from the given

1451-- | Finalize given 'L.Request' by applying a finalizer from the given

1465-- 'Option' (if it has any).

1452-- 'Option' (if it has any).

1466−finalizeRequest :: MonadIO m => Option scheme -> L.Request -> m L.Request

1453+finalizeRequest :: (MonadIO m) => Option scheme -> L.Request -> m L.Request

1467finalizeRequest (Option _ mfinalizer) = liftIO . fromMaybe pure mfinalizer

1454finalizeRequest (Option _ mfinalizer) = liftIO . fromMaybe pure mfinalizer

1468

1455

1469----------------------------------------------------------------------------

1456----------------------------------------------------------------------------

@@ -1496,7 +1483,7 @@ name =: value = queryParam name (pure value)

1496-- This operator is defined in terms of 'queryParam':

1483-- This operator is defined in terms of 'queryParam':

1497--

1484--

1498-- > queryFlag name = queryParam name (Nothing :: Maybe ())

1485-- > queryFlag name = queryParam name (Nothing :: Maybe ())

1499−queryFlag :: QueryParam param => Text -> param

1486+queryFlag :: (QueryParam param) => Text -> param

1500queryFlag name = queryParam name (Nothing :: Maybe ())

1487queryFlag name = queryParam name (Nothing :: Maybe ())

1501

1488

1502-- | Construct query parameters from a 'ToForm' instance. This function

1489-- | Construct query parameters from a 'ToForm' instance. This function

@@ -1526,7 +1513,7 @@ class QueryParam param where

1526 -- 'Nothing', it won't be included at all (i.e. you create a flag this

1513 -- 'Nothing', it won't be included at all (i.e. you create a flag this

1527 -- way). It's recommended to use @('=:')@ and 'queryFlag' instead of this

1514 -- way). It's recommended to use @('=:')@ and 'queryFlag' instead of this

1528 -- method, because they are easier to read.

1515 -- method, because they are easier to read.

1529− queryParam :: ToHttpApiData a => Text -> Maybe a -> param

1516+ queryParam :: (ToHttpApiData a) => Text -> Maybe a -> param

1530

1517

1531 -- | Get the query parameter names and values set by 'queryParam'.

1518 -- | Get the query parameter names and values set by 'queryParam'.

1532 --

1519 --

@@ -1560,6 +1547,14 @@ attachHeader :: ByteString -> ByteString -> L.Request -> L.Request

1560attachHeader name value x =

1547attachHeader name value x =

1561 x {L.requestHeaders = (CI.mk name, value) : L.requestHeaders x}

1548 x {L.requestHeaders = (CI.mk name, value) : L.requestHeaders x}

1562

1549

1550+-- | Same as 'header', but with redacted values on print.

1551+--

1552+-- @since 3.13.0

1553+headerRedacted :: ByteString -> ByteString -> Option scheme

1554+headerRedacted name value = withRequest $ \x ->

1555+ let y = attachHeader name value x

1556+ in y {L.redactHeaders = CI.mk name `S.insert` L.redactHeaders y}

1557+

1563----------------------------------------------------------------------------

1558----------------------------------------------------------------------------

1564-- Request—Optional parameters—Cookies

1559-- Request—Optional parameters—Cookies

1565

1560

@@ -1767,7 +1762,7 @@ ignoreResponse = Proxy

1767newtype JsonResponse a = JsonResponse (L.Response a)

1762newtype JsonResponse a = JsonResponse (L.Response a)

1768 deriving (Show)

1763 deriving (Show)

1769

1764

1770−instance FromJSON a => HttpResponse (JsonResponse a) where

1765+instance (FromJSON a) => HttpResponse (JsonResponse a) where

1771 type HttpResponseBody (JsonResponse a) = a

1766 type HttpResponseBody (JsonResponse a) = a

1772 toVanillaResponse (JsonResponse r) = r

1767 toVanillaResponse (JsonResponse r) = r

1773 getHttpResponse r = do

1768 getHttpResponse r = do

@@ -1883,14 +1878,14 @@ brReadN br n = go 0 id id

1883

1878

1884-- | Get the response body.

1879-- | Get the response body.

1885responseBody ::

1880responseBody ::

1886− HttpResponse response =>

1881+ (HttpResponse response) =>

1887 response ->

1882 response ->

1888 HttpResponseBody response

1883 HttpResponseBody response

1889responseBody = L.responseBody . toVanillaResponse

1884responseBody = L.responseBody . toVanillaResponse

1890

1885

1891-- | Get the response status code.

1886-- | Get the response status code.

1892responseStatusCode ::

1887responseStatusCode ::

1893− HttpResponse response =>

1888+ (HttpResponse response) =>

1894 response ->

1889 response ->

1895 Int

1890 Int

1896responseStatusCode =

1891responseStatusCode =

@@ -1898,7 +1893,7 @@ responseStatusCode =

1898

1893

1899-- | Get the response status message.

1894-- | Get the response status message.

1900responseStatusMessage ::

1895responseStatusMessage ::

1901− HttpResponse response =>

1896+ (HttpResponse response) =>

1902 response ->

1897 response ->

1903 ByteString

1898 ByteString

1904responseStatusMessage =

1899responseStatusMessage =

@@ -1906,7 +1901,7 @@ responseStatusMessage =

1906

1901

1907-- | Lookup a particular header from a response.

1902-- | Lookup a particular header from a response.

1908responseHeader ::

1903responseHeader ::

1909− HttpResponse response =>

1904+ (HttpResponse response) =>

1910 -- | Response interpretation

1905 -- | Response interpretation

1911 response ->

1906 response ->

1912 -- | Header to lookup

1907 -- | Header to lookup

@@ -1918,7 +1913,7 @@ responseHeader r h =

1918

1913

1919-- | Get the response 'L.CookieJar'.

1914-- | Get the response 'L.CookieJar'.

1920responseCookieJar ::

1915responseCookieJar ::

1921− HttpResponse response =>

1916+ (HttpResponse response) =>

1922 response ->

1917 response ->

1923 L.CookieJar

1918 L.CookieJar

1924responseCookieJar = L.responseCookieJar . toVanillaResponse

1919responseCookieJar = L.responseCookieJar . toVanillaResponse

@@ -2016,7 +2011,7 @@ data HttpException

2016 | -- | A wrapper with Aeson-produced 'String' describing why decoding

2011 | -- | A wrapper with Aeson-produced 'String' describing why decoding

2017 -- failed

2012 -- failed

2018 JsonHttpException String

2013 JsonHttpException String

2019− deriving (Show, Typeable, Generic)

2014+ deriving (Show, Generic)

2020

2015

2021instance Exception HttpException

2016instance Exception HttpException

2022

2017

@@ -2053,4 +2048,4 @@ data Scheme

2053 Http

2048 Http

2054 | -- | HTTPS

2049 | -- | HTTPS

2055 Https

2050 Https

2056− deriving (Eq, Ord, Show, Data, Typeable, Generic, TH.Lift)

2051+ deriving (Eq, Ord, Show, Data, Generic, TH.Lift)

README.md+1−1

@@ -4,7 +4,7 @@

4[![Hackage](https://img.shields.io/hackage/v/req.svg?style=flat)](https://hackage.haskell.org/package/req)

5[![Stackage Nightly](http://stackage.org/package/req/badge/nightly)](http://stackage.org/nightly/package/req)

6[![Stackage LTS](http://stackage.org/package/req/badge/lts)](http://stackage.org/lts/package/req)

7−![CI](https://github.com/mrkkrp/req/workflows/CI/badge.svg?branch=master)

7+[![CI](https://github.com/mrkkrp/req/actions/workflows/ci.yaml/badge.svg)](https://github.com/mrkkrp/req/actions/workflows/ci.yaml)

9* [Related packages](#related-packages)

10* [Blog posts](#blog-posts)

Setup.hsdeleted−6

@@ -1,6 +0,0 @@

1−module Main (main) where

2−

3−import Distribution.Simple

4−

5−main :: IO ()

6−main = defaultMain

cabal.projectnew file+4

@@ -0,0 +1,4 @@

1+packages: .

2+tests: True

3+benchmarks: True

4+constraints: req +dev

httpbin-tests/Network/HTTP/ReqSpec.hs+74−42

@@ -8,24 +8,25 @@

8module Network.HTTP.ReqSpec (spec) where

10import Control.Exception

11−import Control.Monad.Reader

11+import Control.Monad (forM_)

12import Control.Monad.Trans.Control

13import Data.Aeson (ToJSON (..), Value (..), object, (.=))

14−import qualified Data.Aeson as A

14+import Data.Aeson qualified as A

15−import qualified Data.Aeson.KeyMap as Aeson.KeyMap

15+import Data.Aeson.KeyMap qualified as Aeson.KeyMap

16−import qualified Data.ByteString as B

16+import Data.ByteString qualified as B

17−import qualified Data.ByteString.Lazy as BL

17+import Data.ByteString.Lazy qualified as BL

18import Data.Functor.Identity (runIdentity)

19import Data.Maybe (fromJust)

20import Data.Proxy

21import Data.Text (Text)

22−import qualified Data.Text as T

22+import Data.Text qualified as T

23−import qualified Data.Text.Encoding as T

23+import Data.Text.Encoding qualified as T

24−import qualified Data.Text.IO as TIO

24+import Data.Text.IO qualified as TIO

25−import qualified Network.HTTP.Client as L

25+import Network.HTTP.Client qualified as L

26−import qualified Network.HTTP.Client.MultipartFormData as LM

26+import Network.HTTP.Client.MultipartFormData qualified as LM

27−import Network.HTTP.Req

27+import Network.HTTP.Req hiding (req)

28+import Network.HTTP.Req qualified as Req

28−import qualified Network.HTTP.Types as Y

29+import Network.HTTP.Types qualified as Y

29import Test.Hspec

30import Test.Hspec

30import Test.QuickCheck

31import Test.QuickCheck

@@ -84,8 +85,7 @@ spec = do

84 .= object

85 .= object

85 [ "Accept-Encoding" .= ("gzip" :: Text),

86 [ "Accept-Encoding" .= ("gzip" :: Text),

86 "Foo" .= ("bar" :: Text),

87 "Foo" .= ("bar" :: Text),

87− "Baz" .= ("quux" :: Text),

88+ "Baz" .= ("quux" :: Text)

88− "Host" .= ("httpbin.org" :: Text)

89 ]

90 ]

91 responseStatusCode r `shouldBe` 200

@@ -97,11 +97,10 @@ spec = do

97 (stripFunnyHeaders . stripOrigin) (responseBody r)

98 `shouldBe` object

99 [ "args" .= emptyObject,

100− "url" .= ("https://httpbin.org/get" :: Text),

100+ "url" .= ("http://localhost:1234/get" :: Text),

101 "headers"

102 .= object

103− [ "Accept-Encoding" .= ("gzip" :: Text),

103+ [ "Accept-Encoding" .= ("gzip" :: Text)

104− "Host" .= ("httpbin.org" :: Text)

105 ]

104 ]

106 ]

105 ]

107 responseHeader r "Content-Type" `shouldBe` return "application/json"

106 responseHeader r "Content-Type" `shouldBe` return "application/json"

@@ -118,12 +117,11 @@ spec = do

118 [ "args" .= emptyObject,

117 [ "args" .= emptyObject,

119 "json" .= text,

118 "json" .= text,

120 "data" .= reflected,

119 "data" .= reflected,

121− "url" .= ("https://httpbin.org/post" :: Text),

120+ "url" .= ("http://localhost:1234/post" :: Text),

122 "headers"

121 "headers"

123 .= object

122 .= object

124 [ "Content-Type" .= ("application/json; charset=utf-8" :: Text),

123 [ "Content-Type" .= ("application/json; charset=utf-8" :: Text),

125 "Accept-Encoding" .= ("gzip" :: Text),

124 "Accept-Encoding" .= ("gzip" :: Text),

126− "Host" .= ("httpbin.org" :: Text),

127 "Content-Length" .= show (T.length reflected)

125 "Content-Length" .= show (T.length reflected)

128 ],

126 ],

129 "files" .= emptyObject,

127 "files" .= emptyObject,

@@ -147,12 +145,11 @@ spec = do

147 [ "args" .= emptyObject,

145 [ "args" .= emptyObject,

148 "json" .= Null,

146 "json" .= Null,

149 "data" .= ("" :: Text),

147 "data" .= ("" :: Text),

150− "url" .= ("https://httpbin.org/post" :: Text),

148+ "url" .= ("http://localhost:1234/post" :: Text),

151 "headers"

149 "headers"

152 .= object

150 .= object

153 [ "Content-Type" .= T.decodeUtf8 contentType,

151 [ "Content-Type" .= T.decodeUtf8 contentType,

154 "Accept-Encoding" .= ("gzip" :: Text),

152 "Accept-Encoding" .= ("gzip" :: Text),

155− "Host" .= ("httpbin.org" :: Text),

156 "Content-Length" .= ("242" :: Text)

153 "Content-Length" .= ("242" :: Text)

157 ],

154 ],

158 "files" .= emptyObject,

155 "files" .= emptyObject,

@@ -177,11 +174,10 @@ spec = do

177 [ "args" .= emptyObject,

174 [ "args" .= emptyObject,

178 "json" .= Null,

175 "json" .= Null,

179 "data" .= contents,

176 "data" .= contents,

180− "url" .= ("https://httpbin.org/patch" :: Text),

177+ "url" .= ("http://localhost:1234/patch" :: Text),

181 "headers"

178 "headers"

182 .= object

179 .= object

183 [ "Accept-Encoding" .= ("gzip" :: Text),

180 [ "Accept-Encoding" .= ("gzip" :: Text),

184− "Host" .= ("httpbin.org" :: Text),

185 "Content-Length" .= show (T.length contents)

181 "Content-Length" .= show (T.length contents)

186 ],

182 ],

187 "files" .= emptyObject,

183 "files" .= emptyObject,

@@ -203,12 +199,11 @@ spec = do

203 [ "args" .= emptyObject,

199 [ "args" .= emptyObject,

204 "json" .= Null,

200 "json" .= Null,

205 "data" .= ("" :: Text),

201 "data" .= ("" :: Text),

206− "url" .= ("https://httpbin.org/put" :: Text),

202+ "url" .= ("http://localhost:1234/put" :: Text),

207 "headers"

203 "headers"

208 .= object

204 .= object

209 [ "Content-Type" .= ("application/x-www-form-urlencoded" :: Text),

205 [ "Content-Type" .= ("application/x-www-form-urlencoded" :: Text),

210 "Accept-Encoding" .= ("gzip" :: Text),

206 "Accept-Encoding" .= ("gzip" :: Text),

211− "Host" .= ("httpbin.org" :: Text),

212 "Content-Length" .= ("18" :: Text)

207 "Content-Length" .= ("18" :: Text)

213 ],

208 ],

214 "files" .= emptyObject,

209 "files" .= emptyObject,

@@ -306,7 +301,7 @@ spec = do

306 (httpbin /: "basic-auth" /~ user /~ password)

301 (httpbin /: "basic-auth" /~ user /~ password)

307 NoReqBody

302 NoReqBody

308 ignoreResponse

303 ignoreResponse

309− (basicAuth (T.encodeUtf8 user) (T.encodeUtf8 password))

304+ (basicAuthUnsafe (T.encodeUtf8 user) (T.encodeUtf8 password))

310 responseStatusCode r `shouldBe` 200

305 responseStatusCode r `shouldBe` 200

311 responseStatusMessage r `shouldBe` "OK"

306 responseStatusMessage r `shouldBe` "OK"

312

307

@@ -406,8 +401,28 @@ blindlyThrowing = runReq defaultHttpConfig {httpConfigCheckResponse = doit}

406 doit _ _ = error "Oops!"

401 doit _ _ = error "Oops!"

407

402

408-- | 'Url' representing <https://httpbin.org>.

403-- | 'Url' representing <https://httpbin.org>.

409−httpbin :: Url 'Https

404+httpbin :: Url 'Http

410−httpbin = https "httpbin.org"

405+httpbin = http "localhost"

406+

407+req ::

408+ ( MonadHttp m,

409+ HttpMethod method,

410+ HttpBody body,

411+ HttpResponse response,

412+ HttpBodyAllowed (AllowsBody method) (ProvidesBody body)

413+ ) =>

414+ method ->

415+ Url scheme ->

416+ body ->

417+ Proxy response ->

418+ Option scheme ->

419+ m response

420+req method url body responseProxy options =

421+ Req.req method url body responseProxy (options <> defaultOptions)

422+

423+-- | Options to apply by default.

424+defaultOptions :: Option scheme

425+defaultOptions = port 1234

411

426

412-- | Remove “origin” field from JSON value. Origin may change, we don't want

427-- | Remove “origin” field from JSON value. Origin may change, we don't want

413-- to depend on that.

428-- to depend on that.

@@ -417,19 +432,36 @@ stripOrigin value = value

417

432

418-- | Remove funny headers that might break the tests.

433-- | Remove funny headers that might break the tests.

419stripFunnyHeaders :: Value -> Value

434stripFunnyHeaders :: Value -> Value

420−stripFunnyHeaders (Object m) =

435+stripFunnyHeaders = \case

436+ Object m ->

437+ Object

438+ ( runIdentity

439+ ( Aeson.KeyMap.alterF

440+ (pure . fmap stripFunnyHeaders')

441+ "headers"

442+ m

443+ )

444+ )

445+ value -> value

446+

447+-- | Similar to 'stripFunnyHeaders', but acts directly on the argument

448+-- without trying to access its "headers" field.

449+stripFunnyHeaders' :: Value -> Value

450+stripFunnyHeaders' = \case

451+ Object p ->

452+ Object $

421− let f (Object p) = Object $ Aeson.KeyMap.filterWithKey (\k _ -> k `elem` hs) p

453+ Aeson.KeyMap.filterWithKey

454+ (\k _ -> k `elem` whitelistedHeaders)

455+ p

422− f value = value

456+ value -> value

423− hs =

457+ where

458+ whitelistedHeaders =

424− [ "Content-Type",

459+ [ "Content-Type",

425− "Accept-Encoding",

460+ "Accept-Encoding",

426− "Host",

427− "Content-Length",

461+ "Content-Length",

428− "Foo",

462+ "Foo",

429− "Baz"

463+ "Baz"

430− ]

464+ ]

431− in Object (runIdentity (Aeson.KeyMap.alterF (pure . fmap f) "headers" m))

432−stripFunnyHeaders value = value

433

465

434-- | This is a complete test case that makes use of <https://httpbin.org> to

466-- | This is a complete test case that makes use of <https://httpbin.org> to

435-- get various response status codes.

467-- get various response status codes.

@@ -471,7 +503,7 @@ emptyObject :: Value

471emptyObject = Object Aeson.KeyMap.empty

503emptyObject = Object Aeson.KeyMap.empty

472

504

473-- | Get a rendered JSON value as 'Text'.

505-- | Get a rendered JSON value as 'Text'.

474−reflectJSON :: ToJSON a => a -> Text

506+reflectJSON :: (ToJSON a) => a -> Text

475reflectJSON = T.decodeUtf8 . BL.toStrict . A.encode

507reflectJSON = T.decodeUtf8 . BL.toStrict . A.encode

476

508

477-- | Clarify to the type checker that the inner computation is in the 'IO'

509-- | Clarify to the type checker that the inner computation is in the 'IO'

pure-tests/Network/HTTP/ReqSpec.hs+18−18

@@ -13,41 +13,41 @@

14module Network.HTTP.ReqSpec (spec) where

16−import qualified Blaze.ByteString.Builder as BB

16+import Blaze.ByteString.Builder qualified as BB

17import Control.Exception (throwIO)

18import Control.Monad

19import Control.Retry

20import Data.Aeson (ToJSON (..))

21−import qualified Data.Aeson as A

21+import Data.Aeson qualified as A

22import Data.ByteString (ByteString)

23−import qualified Data.ByteString as B

23+import Data.ByteString qualified as B

24−import qualified Data.ByteString.Char8 as B8

24+import Data.ByteString.Char8 qualified as B8

25−import qualified Data.ByteString.Lazy as BL

25+import Data.ByteString.Lazy qualified as BL

26−import qualified Data.CaseInsensitive as CI

26+import Data.CaseInsensitive qualified as CI

27import Data.Either (isRight)

28−import qualified Data.List.NonEmpty as NE

28+import Data.List.NonEmpty qualified as NE

29import Data.Maybe (fromJust, fromMaybe, isJust, isNothing)

30import Data.Proxy

31import Data.Text (Text)

32−import qualified Data.Text as T

32+import Data.Text qualified as T

33−import qualified Data.Text.Encoding as T

33+import Data.Text.Encoding qualified as T

34import Data.Time

35import Data.Typeable (Typeable, eqT)

36import GHC.Exts (IsList (..))

37import GHC.Generics

38−import qualified Language.Haskell.TH as TH

38+import Language.Haskell.TH qualified as TH

39−import qualified Language.Haskell.TH.Quote as TH

39+import Language.Haskell.TH.Quote qualified as TH

40−import qualified Network.HTTP.Client as L

40+import Network.HTTP.Client qualified as L

41import Network.HTTP.Req

42−import qualified Network.HTTP.Types as Y

42+import Network.HTTP.Types qualified as Y

43−import qualified Network.HTTP.Types.Header as Y

43+import Network.HTTP.Types.Header qualified as Y

44import Test.Hspec

45import Test.Hspec.Core.Spec (SpecM)

46import Test.QuickCheck

47import Text.URI (URI)

48−import qualified Text.URI as URI

48+import Text.URI qualified as URI

49−import qualified Text.URI.QQ as QQ

49+import Text.URI.QQ qualified as QQ

50−import qualified Web.FormUrlEncoded as F

50+import Web.FormUrlEncoded qualified as F

52spec :: Spec

53spec = do

@@ -413,7 +413,7 @@ spec = do

413 -- 'Https, Option _) type checks, so we can catch if the type of scheme

414 -- is unspecified.

415 let testTypeOfQuoterResult ::

416− forall a s. Typeable a => (a, Option s) -> Bool

416+ forall a s. (Typeable a) => (a, Option s) -> Bool

417 testTypeOfQuoterResult _ = isJust $ eqT @a @(Url 'Https)

418 in property $ testTypeOfQuoterResult [urlQ|https://example.org/|]

419 it "doesn't work for invalid urls" $

req.cabal+43−43

@@ -1,11 +1,11 @@

1cabal-version: 2.4

2name: req

3−version: 3.12.0

3+version: 3.13.4

4license: BSD-3-Clause

5license-file: LICENSE.md

6maintainer: Mark Karpov <markkarpov92@gmail.com>

7author: Mark Karpov <markkarpov92@gmail.com>

8−tested-with: ghc ==8.10.7 ghc ==9.0.2 ghc ==9.2.1

8+tested-with: ghc ==9.6.3 ghc ==9.8.2 ghc ==9.10.1

9homepage: https://github.com/mrkkrp/req

10bug-reports: https://github.com/mrkkrp/req/issues

11synopsis: HTTP client library

@@ -31,71 +31,70 @@ flag dev

32library

33 exposed-modules: Network.HTTP.Req

34− default-language: Haskell2010

34+ default-language: GHC2021

35 build-depends:

36 aeson >=0.9 && <3,

37 authenticate-oauth >=1.5 && <1.8,

38− base >=4.13 && <5.0,

38+ base >=4.15 && <5,

39 blaze-builder >=0.3 && <0.5,

40− bytestring >=0.10.8 && <0.12,

40+ bytestring >=0.10.8 && <0.13,

41 case-insensitive >=0.2 && <1.3,

42+ containers >=0.5 && <0.8,

42− connection >=0.2.2 && <0.4,

43+ crypton-connection >=0.4.2 && <0.5,

44+ data-default-class >=0.2.0.0,

43 exceptions >=0.6 && <0.11,

45 exceptions >=0.6 && <0.11,

44− http-api-data >=0.2 && <0.5,

46+ http-api-data >=0.2 && <0.7,

45− http-client >=0.7 && <0.8,

47+ http-client >=0.7.13.1 && <0.8,

46 http-client-tls >=0.3.2 && <0.4,

48 http-client-tls >=0.3.2 && <0.4,

47− http-types >=0.8 && <10.0,

49+ http-types >=0.8 && <10,

48 modern-uri >=0.3 && <0.4,

50 modern-uri >=0.3 && <0.4,

49 monad-control >=1.0 && <1.1,

51 monad-control >=1.0 && <1.1,

50 mtl >=2.0 && <3.0,

52 mtl >=2.0 && <3.0,

51 retry >=0.8 && <0.10,

53 retry >=0.8 && <0.10,

52− template-haskell >=2.14 && <2.19,

54+ template-haskell >=2.19 && <2.23,

53− text >=0.2 && <2.1,

55+ text >=0.2 && <2.2,

54− time >=1.2 && <1.13,

55− transformers >=0.5.3.0 && <0.6,

56+ transformers >=0.5.3.0 && <0.7,

56 transformers-base,

57 transformers-base,

57 unliftio-core >=0.1.1 && <0.3

58 unliftio-core >=0.1.1 && <0.3

59 if flag(dev)

60 if flag(dev)

60− ghc-options: -O0 -Wall -Werror

61+ ghc-options:

62+ -Wall -Werror -Wpartial-fields -Wunused-packages

63+ -Wno-unused-imports

62 else

65 else

63 ghc-options: -O2 -Wall

66 ghc-options: -O2 -Wall

65− if flag(dev)

66− ghc-options:

67− -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns

68− -Wnoncanonical-monad-instances

69−

70test-suite pure-tests

68test-suite pure-tests

71 type: exitcode-stdio-1.0

69 type: exitcode-stdio-1.0

72 main-is: Spec.hs

70 main-is: Spec.hs

73− build-tool-depends: hspec-discover:hspec-discover >=2.0 && <3.0

71+ build-tool-depends: hspec-discover:hspec-discover >=2 && <3

74 hs-source-dirs: pure-tests

72 hs-source-dirs: pure-tests

75 other-modules: Network.HTTP.ReqSpec

73 other-modules: Network.HTTP.ReqSpec

76− default-language: Haskell2010

74+ default-language: GHC2021

77 build-depends:

75 build-depends:

78− QuickCheck >=2.7 && <3.0,

76+ QuickCheck >=2.7 && <3,

79 aeson >=0.9 && <3,

77 aeson >=0.9 && <3,

80− base >=4.13 && <5.0,

78+ base >=4.15 && <5.0,

81 blaze-builder >=0.3 && <0.5,

79 blaze-builder >=0.3 && <0.5,

82− bytestring >=0.10.8 && <0.12,

80+ bytestring >=0.10.8 && <0.13,

83 case-insensitive >=0.2 && <1.3,

81 case-insensitive >=0.2 && <1.3,

84− hspec >=2.0 && <3.0,

82+ hspec >=2.0 && <3,

85− hspec-core >=2.0 && <3.0,

83+ hspec-core >=2.0 && <3,

86− http-api-data >=0.2 && <0.5,

84+ http-api-data >=0.2 && <0.7,

87 http-client >=0.7 && <0.8,

85 http-client >=0.7 && <0.8,

88− http-types >=0.8 && <10.0,

86+ http-types >=0.8 && <10,

89 modern-uri >=0.3 && <0.4,

87 modern-uri >=0.3 && <0.4,

90− mtl >=2.0 && <3.0,

91 req,

88 req,

92 retry >=0.8 && <0.10,

89 retry >=0.8 && <0.10,

93− template-haskell >=2.14 && <2.19,

90+ template-haskell >=2.19 && <2.23,

94− text >=0.2 && <2.1,

91+ text >=0.2 && <2.2,

95− time >=1.2 && <1.13

92+ time >=1.2 && <1.15

97 if flag(dev)

94 if flag(dev)

98− ghc-options: -O0 -Wall -Werror

95+ ghc-options:

96+ -Wall -Werror -Wredundant-constraints -Wpartial-fields

97+ -Wunused-packages

100 else

99 else

101 ghc-options: -O2 -Wall

100 ghc-options: -O2 -Wall

@@ -103,25 +102,26 @@ test-suite pure-tests

103test-suite httpbin-tests

102test-suite httpbin-tests

104 type: exitcode-stdio-1.0

103 type: exitcode-stdio-1.0

105 main-is: Spec.hs

104 main-is: Spec.hs

106− build-tool-depends: hspec-discover:hspec-discover >=2.0 && <3.0

105+ build-tool-depends: hspec-discover:hspec-discover >=2 && <3

107 hs-source-dirs: httpbin-tests

106 hs-source-dirs: httpbin-tests

108 other-modules: Network.HTTP.ReqSpec

107 other-modules: Network.HTTP.ReqSpec

109− default-language: Haskell2010

108+ default-language: GHC2021

110 build-depends:

109 build-depends:

111− QuickCheck >=2.7 && <3.0,

110+ QuickCheck >=2.7 && <3,

112 aeson >=2 && <3,

111 aeson >=2 && <3,

113− base >=4.13 && <5.0,

112+ base >=4.15 && <5,

114− bytestring >=0.10.8 && <0.12,

113+ bytestring >=0.10.8 && <0.13,

115 hspec >=2.0 && <3.0,

114 hspec >=2.0 && <3.0,

116 http-client >=0.7 && <0.8,

115 http-client >=0.7 && <0.8,

117− http-types >=0.8 && <10.0,

116+ http-types >=0.8 && <10,

118 monad-control >=1.0 && <1.1,

117 monad-control >=1.0 && <1.1,

119− mtl >=2.0 && <3.0,

120 req,

118 req,

121− text >=0.2 && <2.1

119+ text >=0.2 && <2.2

122

120

123 if flag(dev)

121 if flag(dev)

124− ghc-options: -O0 -Wall -Werror

122+ ghc-options:

123+ -Wall -Werror -Wredundant-constraints -Wpartial-fields

124+ -Wunused-packages

125

126 else

127− ghc-options: -O2 -Wall

127+ buildable: False