Merge pull request #14 from natefaubion/aff-updates

Aff updates

Author: paf31

bower.json

@@ -14,7 +14,7 @@
     "url": "git://github.com/purescript-contrib/purescript-aff-coroutines.git"
   },
   "dependencies": {
-    "purescript-aff": "^3.0.0",
+    "purescript-aff": "^4.0.0",
     "purescript-coroutines": "^4.0.0"
   }
 }

src/Control/Coroutine/Aff.purs

@@ -10,7 +10,7 @@ import Prelude
 
 import Control.Coroutine (Producer, producer)
 import Control.Monad.Aff (Aff, runAff, forkAff)
-import Control.Monad.Aff.AVar (AVAR, makeVar, takeVar, putVar)
+import Control.Monad.Aff.AVar (AVAR, makeEmptyVar, takeVar, putVar)
 import Control.Monad.Aff.Class (class MonadAff, liftAff)
 import Control.Monad.Eff (Eff)
 import Control.Monad.Eff.Class (liftEff)
@@ -39,7 +39,7 @@ produce
    . ((Either a r -> Eff (avar :: AVAR | eff) Unit) -> Eff (avar :: AVAR | eff) Unit)
   -> Producer a (Aff (avar :: AVAR | eff)) r
 produce recv = produceAff \send ->
-  liftEff (recv (void <<< runAff (const (pure unit)) pure <<< send))
+  liftEff (recv (void <<< runAff (const (pure unit)) <<< send))
 
 -- | A version of `produce` that creates a `Producer` with an underlying
 -- | `MonadAff`, rather than `Aff` specifically.
@@ -57,14 +57,16 @@ produce' = hoistFreeT liftAff <<< produce
 -- |
 -- | ```purescript
 -- | produceAff \emit -> do
--- |   later' 1000 $ emit $ Left "progress"
--- |   later' 1000 $ emit $ Right "finished"
+-- |   delay $ Milliseconds 1000
+-- |   emit  $ Left "progress"
+-- |   delay $ Milliseconds 1000
+-- |   emit  $ Right "finished"
 -- | ```
 produceAff
   :: forall a r eff
    . ((Either a r -> Aff (avar :: AVAR | eff) Unit) -> Aff (avar :: AVAR | eff) Unit)
   -> Producer a (Aff (avar :: AVAR | eff)) r
 produceAff recv = do
-  v <- lift makeVar
-  _ <- lift (forkAff (recv (putVar v)))
+  v <- lift makeEmptyVar
+  _ <- lift (forkAff (recv (flip putVar v)))
   producer (takeVar v)

test/Main.purs

@@ -11,7 +11,7 @@ import Control.Monad.Eff.Class (liftEff)
 import Control.Monad.Eff.Console (CONSOLE, log, logShow)
 import Control.Monad.Eff.Exception (EXCEPTION)
 
-import Data.Either (Either(..))
+import Data.Either (Either(..), either)
 import Data.Maybe (Maybe(..))
 import Data.Newtype (wrap)
 
@@ -30,4 +30,4 @@ c :: forall eff. Consumer String (Aff (console :: CONSOLE | eff)) String
 c = consumer \s -> liftEff (log s) $> Nothing
 
 main :: forall eff. Eff (console :: CONSOLE, avar :: AVAR, err :: EXCEPTION | eff) Unit
-main = void $ runAff logShow log $ runProcess (p $$ c)
+main = void $ runAff (either logShow log) $ runProcess (p $$ c)