remove evalOutput

ema-org/src/Site/Org/Render.hs

@@ -8,7 +8,6 @@ module Site.Org.Render (
 )
 where
 
-import Control.Monad.Trans.Either (runEitherT)
 import Data.IxSet.Typed qualified as Ix
 import Data.Map qualified as Map
 import Ema (Asset (AssetGenerated), Format (Html), routeUrl)
@@ -54,13 +53,6 @@ pageExp rp pgs page = do
     bk = backend pgs rp
     router = routeUrl rp
 
-evalOutput :: RenderM m => OndimState -> Ondim a -> m (Either OndimException a)
-evalOutput ostate content = do
-  let RenderT out = evalOndimTWith ostate content
-  collapse <$> runEitherT out
-  where
-    collapse = fromRight (error "")
-
 renderPost :: Identifier -> Prism' FilePath Route -> Model -> Ondim (Asset LByteString)
 renderPost identifier rp m = do
   lPage :: [HtmlDocument] <-

organon/src/Site/Organon/Route.hs

@@ -70,10 +70,9 @@ instance EmaSite Route where
         where
           files = keys model.static.modelFiles
 
-      render :: RenderM m => Ondim (Asset LByteString) -> m (Asset LByteString)
       render res =
         either handleErrors return
-          =<< evalOutput ostate (res `binding` globalExps)
+          =<< unRenderT (evalOndimTWith ostate (res `binding` globalExps))
         where
           handleErrors e = do
             let msg = prettyException e