bdbcbfa · servant-reflex

git.iko.soy/servant-reflex

Fixup merge

commitbdbcbfa0f45d4e7b784038fec7fef5b29e99e8a8 authorMatthew Bauer <mjbauer95@gmail.com> dateFri 17 May 2019, 15:48 (7 years ago) parent120c5ca

4 files changed+14−15

compare with master

unifiedsplit

servant-reflex.cabal+3−4 src/Servant/Common/Req.hs+9−9 src/Servant/Reflex.hs+1−1 src/Servant/Reflex/Multi.hs+1−1

servant-reflex.cabal+3−4

@@ -24,8 +24,7 @@ library

2424

2525 hs-source-dirs: src

2626 build-depends:

27− base >= 4.8 && < 4.10,

28− aeson >= 0.11 && < 1.3,

27+ aeson >= 0.11 && < 1.5,

2928 base >= 4.8 && < 5,

3029 bytestring >= 0.10 && < 0.11,

3130 case-insensitive >= 1.2.0.4 && < 1.3,

@@ -41,8 +40,8 @@ library

4140 reflex >= 0.5 && < 0.7,

4241 reflex-dom-core >= 0.4 && < 0.6,

4342 safe >= 0.3.9 && < 0.4,

44− servant >= 0.13 && < 0.14,

45− servant-checked-exceptions >= 1.1.0.0 && < 1.2,

43+ servant >= 0.13 && < 0.16,

44+ servant-checked-exceptions >= 2.0 && < 2.2,

4645 servant-auth >= 0.2.1 && < 0.4,

4746 string-conversions >= 0.4 && < 0.5,

4847 text >= 1.2 && < 1.3,

src/Servant/Common/Req.hs+9−9

@@ -36,7 +36,7 @@ import Data.Monoid ((<>))

3636import Data.Proxy (Proxy (..))

3737import Data.Text (Text)

3838import qualified Data.Text as T

39−import qualified Data.Text.Encoding as T

39+import qualified Data.Text.Encoding as TE

4040import qualified Data.Text.Lazy as TL

4141import Data.Traversable (forM)

4242import qualified Language.Javascript.JSaddle as JS

@@ -181,7 +181,7 @@ prependToPathParts p req =

181181 req { reqPathParts = p : reqPathParts req }

182182

183183addHeader :: (ToHttpApiData a, Reflex t) => Text -> Dynamic t (Either Text a) -> Req t -> Req t

184−addHeader name val req = req { headers = (name, (fmap . fmap) (T.decodeUtf8 . toHeader) val) : headers req }

184+addHeader name val req = req { headers = (name, (fmap . fmap) (TE.decodeUtf8 . toHeader) val) : headers req }

185185

186186reqToReflexRequest

187187 :: forall t. Reflex t

@@ -275,8 +275,8 @@ reqToReflexRequest reqMeth reqHost req@(Req _ _ _ (reqBody :: Maybe (Dynamic t (

275275 mkAuth _ (Left e) = Left e

276276 mkAuth Nothing r = r

277277 mkAuth (Just (BasicAuthData u p)) (Right config) = Right $ config

278− { _xhrRequestConfig_user = Just $ T.decodeUtf8 u

279− , _xhrRequestConfig_password = Just $ T.decodeUtf8 p}

278+ { _xhrRequestConfig_user = Just $ TE.decodeUtf8 u

279+ , _xhrRequestConfig_password = Just $ TE.decodeUtf8 p}

280280

281281 addAuth :: Dynamic t (Either Text (XhrRequestConfig x))

282282 -> Dynamic t (Either Text (XhrRequestConfig x))

@@ -449,7 +449,7 @@ instance FromJSON a => MimeUnrender JSON a where

449449-- Note that the @mimeUnrender p (mimeRender p x) == Right x@ law only

450450-- holds if every element of x is non-null (i.e., not @("", "")@)

451451instance FromForm a => MimeUnrender FormUrlEncoded a where

452− mimeUnrender _ = first T.unpack . urlDecodeAsForm . BB.toLazyByteString . T.encodeUtf8Builder . JS.textFromJSString

452+ mimeUnrender _ = first T.unpack . urlDecodeAsForm . Builder.toLazyByteString . TE.encodeUtf8Builder . JS.textFromJSString

453453

454454-- | @left show . TextL.decodeUtf8'@

455455instance MimeUnrender PlainText TL.Text where

@@ -465,11 +465,11 @@ instance MimeUnrender PlainText String where

465465

466466-- | @Right . id@

467467instance MimeUnrender OctetStream ByteString where

468− mimeUnrender _ = pure . BB.toLazyByteString . T.encodeUtf8Builder . JS.textFromJSString

468+ mimeUnrender _ = pure . Builder.toLazyByteString . TE.encodeUtf8Builder . JS.textFromJSString

469469

470470-- | @Right . toStrict@

471471instance MimeUnrender OctetStream BS.ByteString where

472− mimeUnrender _ = pure . T.encodeUtf8 . JS.textFromJSString

472+ mimeUnrender _ = pure . TE.encodeUtf8 . JS.textFromJSString

473473

474474note :: e -> Maybe a -> Either e a

475475note e Nothing = Left e

@@ -479,8 +479,8 @@ fmapL :: (e -> e') -> Either e a -> Either e' a

479479fmapL _ (Right a) = Right a

480480fmapL f (Left e) = Left (f e)

481481

482−builderToText :: BB.Builder -> T.Text

483−builderToText = T.decodeUtf8 . BL.toStrict . BB.toLazyByteString

482+builderToText :: Builder.Builder -> T.Text

483+builderToText = TE.decodeUtf8 . BL.toStrict . Builder.toLazyByteString

484484

485485escape :: T.Text -> T.Text

486486escape = T.pack . N.escapeURIString (not . N.isReserved) . T.unpack . TE.decodeUtf8 . BL.toStrict . Builder.toLazyByteString . toEncodedUrlPiece

src/Servant/Reflex.hs+1−1

@@ -105,7 +105,7 @@ import Reflex.Dom.Core (Dynamic,

105105 leftmost,

106106 performRequestsAsync)

107107------------------------------------------------------------------------------

108−import Servant.Checked.Exceptions.Internal.Envelope (Envelope)

108+import Servant.Checked.Exceptions.Internal (Envelope)

109109import Servant.Checked.Exceptions.Internal.Servant.API (NoThrow,

110110 Throwing,

111111 ThrowingNonterminal,

src/Servant/Reflex/Multi.hs+1−1

@@ -79,7 +79,7 @@ import Reflex.Dom.Core (Dynamic,

7979 attachPromptlyDynWith,

8080 constDyn)

8181------------------------------------------------------------------------------

82−import Servant.Checked.Exceptions.Internal.Envelope (Envelope)

82+import Servant.Checked.Exceptions.Internal (Envelope)

8383import Servant.Checked.Exceptions.Internal.Servant.API (NoThrow,

8484 Throwing,

8585 ThrowingNonterminal,