trasa-server 0.5.3 → 0.5.4
raw patch · 2 files changed
+3/−8 lines, 2 filesdep −wai-extra
Dependencies removed: wai-extra
Files
- src/Trasa/Server.hs +2/−6
- trasa-server.cabal +1/−2
src/Trasa/Server.hs view
@@ -33,7 +33,6 @@ import qualified Network.HTTP.Media.RenderHeader as N import qualified Network.HTTP.Types.Status as N import qualified Network.Wai as Wai-import qualified Network.Wai.Parse as Wai import Trasa.Core @@ -42,7 +41,6 @@ data TrasaEnv = TrasaEnv { trasaHeaders :: Headers , trasaQueryString :: QueryString- , trasaRequestBodyType :: Maybe Wai.RequestBodyType } newtype TrasaT m a = TrasaT@@ -76,9 +74,8 @@ :: TrasaT m a -> M.Map (CI BS.ByteString) T.Text -- ^ Headers -> QueryString -- ^ Query string parameters- -> Maybe Wai.RequestBodyType -- ^ Request body type from @wai-extra@ -> m (Either TrasaErr a, M.Map (CI BS.ByteString) T.Text)-runTrasaT trasa headers queryStrings mrequestBodyType = (flip runReaderT (TrasaEnv headers queryStrings mrequestBodyType) . flip runStateT M.empty . runExceptT . unTrasaT) trasa+runTrasaT trasa headers queryStrings = (flip runReaderT (TrasaEnv headers queryStrings) . flip runStateT M.empty . runExceptT . unTrasaT) trasa mapTrasaT :: (forall x. m x -> n x) -> TrasaT m a -> TrasaT n a mapTrasaT eta = TrasaT . mapExceptT (mapStateT (mapReaderT eta)) . unTrasaT@@ -108,8 +105,7 @@ let queryStrings = decodeQuery (Wai.queryString req) url = Url (Wai.pathInfo req) queryStrings dispatch = dispatchWith toMeta makeResponse madeRouter method accepts url content- mrequestBodyType = Wai.getRequestBodyType req- runTrasaT dispatch headers queryStrings mrequestBodyType >>= \case+ runTrasaT dispatch headers queryStrings >>= \case (resErr,newHeaders) -> case join resErr of Left (TrasaErr stat errBody) -> respond (Wai.responseLBS stat (encodeHeaders newHeaders) errBody)
trasa-server.cabal view
@@ -2,7 +2,7 @@ name: trasa-server version:- 0.5.3+ 0.5.4 synopsis: Type safe web server description:@@ -45,7 +45,6 @@ , text == 1.2.* , trasa == 0.4.* , wai == 3.2.2.*- , wai-extra default-language: Haskell2010