General errors

src/Effect/Aff/Class.purs

@@ -1,44 +1,43 @@
-module Effect.Aff.Class where
-
-import Prelude
-import Control.Monad.Cont.Trans (ContT)
-import Control.Monad.Except.Trans (ExceptT)
-import Control.Monad.List.Trans (ListT)
-import Control.Monad.Maybe.Trans (MaybeT)
-import Control.Monad.Reader.Trans (ReaderT)
-import Control.Monad.RWS.Trans (RWST)
-import Control.Monad.State.Trans (StateT)
-import Control.Monad.Trans.Class (lift)
-import Control.Monad.Writer.Trans (WriterT)
-import Effect.Aff (Aff)
-import Effect.Class (class MonadEffect)
-
-class MonadEffect m ⇐ MonadAff m where
-  liftAff ∷ Aff ~> m
-
-instance monadAffAff ∷ MonadAff Aff where
-  liftAff = identity
-
-instance monadAffContT ∷ MonadAff m ⇒ MonadAff (ContT r m) where
-  liftAff = lift <<< liftAff
-
-instance monadAffExceptT ∷ MonadAff m ⇒ MonadAff (ExceptT e m) where
-  liftAff = lift <<< liftAff
-
-instance monadAffListT ∷ MonadAff m ⇒ MonadAff (ListT m) where
-  liftAff = lift <<< liftAff
-
-instance monadAffMaybe ∷ MonadAff m ⇒ MonadAff (MaybeT m) where
-  liftAff = lift <<< liftAff
-
-instance monadAffReader ∷ MonadAff m ⇒ MonadAff (ReaderT r m) where
-  liftAff = lift <<< liftAff
-
-instance monadAffRWS ∷ (MonadAff m, Monoid w) ⇒ MonadAff (RWST r w s m) where
-  liftAff = lift <<< liftAff
-
-instance monadAffState ∷ MonadAff m ⇒ MonadAff (StateT s m) where
-  liftAff = lift <<< liftAff
-
-instance monadAffWriter ∷ (MonadAff m, Monoid w) ⇒ MonadAff (WriterT w m) where
-  liftAff = lift <<< liftAff
+module Effect.Aff.Class where
+
+import Control.Monad.Cont (ContT, lift)
+import Control.Monad.Except (ExceptT)
+import Control.Monad.List.Trans (ListT)
+import Control.Monad.Maybe.Trans (MaybeT)
+import Control.Monad.RWS (RWST)
+import Control.Monad.Reader (ReaderT)
+import Control.Monad.State (StateT)
+import Control.Monad.Writer (WriterT)
+import Effect.Aff.General (Aff, Error)
+import Effect.Class (class MonadEffect)
+import Prelude (class Monoid, type (~>), identity, (<<<))
+
+class MonadEffect m ⇐ MonadAff m where
+  liftAff ∷ Aff Error ~> m
+
+instance monadAffAff ∷ MonadAff (Aff Error) where
+  liftAff = identity
+
+instance monadAffContT ∷ MonadAff m ⇒ MonadAff (ContT r m) where
+  liftAff = lift <<< liftAff
+
+instance monadAffExceptT ∷ MonadAff m ⇒ MonadAff (ExceptT Error m) where
+  liftAff = lift <<< liftAff
+
+instance monadAffListT ∷ MonadAff m ⇒ MonadAff (ListT m) where
+  liftAff = lift <<< liftAff
+
+instance monadAffMaybe ∷ MonadAff m ⇒ MonadAff (MaybeT m) where
+  liftAff = lift <<< liftAff
+
+instance monadAffReader ∷ MonadAff m ⇒ MonadAff (ReaderT r m) where
+  liftAff = lift <<< liftAff
+
+instance monadAffRWS ∷ (MonadAff m, Monoid w) ⇒ MonadAff (RWST r w s m) where
+  liftAff = lift <<< liftAff
+
+instance monadAffState ∷ MonadAff m ⇒ MonadAff (StateT s m) where
+  liftAff = lift <<< liftAff
+
+instance monadAffWriter ∷ (MonadAff m, Monoid w) ⇒ MonadAff (WriterT w m) where
+  liftAff = lift <<< liftAff

src/Effect/Aff/Compat.purs

@@ -1,53 +1,24 @@
--- | This module provides compatability functions for constructing `Aff`s which
--- | are defined via the FFI.
-module Effect.Aff.Compat
-  ( EffectFnAff(..)
-  , EffectFnCanceler(..)
-  , EffectFnCb
-  , fromEffectFnAff
-  , module Effect.Uncurried
-  ) where
-
-import Prelude
-import Data.Either (Either(..))
-import Effect.Aff (Aff, Canceler(..), makeAff, nonCanceler)
-import Effect.Exception (Error)
-import Effect.Uncurried (EffectFn1, EffectFn2, EffectFn3, mkEffectFn1, mkEffectFn2, mkEffectFn3, runEffectFn1, runEffectFn2, runEffectFn3)
-
-type EffectFnCb a = EffectFn1 a Unit
-
-newtype EffectFnAff a = EffectFnAff (EffectFn2 (EffectFnCb Error) (EffectFnCb a) EffectFnCanceler)
-
-newtype EffectFnCanceler = EffectFnCanceler (EffectFn3 Error (EffectFnCb Error) (EffectFnCb Unit) Unit)
-
--- | Lift a FFI definition into an `Aff`. `EffectFnAff` makes use of `EffectFn` so
--- | `Effect` thunks are unnecessary. A definition might follow this example:
--- |
--- | ```javascript
--- | exports._myAff = function (onError, onSuccess) {
--- |   var cancel = doSomethingAsync(function (err, res) {
--- |     if (err) {
--- |       onError(err);
--- |     } else {
--- |       onSuccess(res);
--- |     }
--- |   });
--- |   return function (cancelError, onCancelerError, onCancelerSuccess) {
--- |     cancel();
--- |     onCancelerSuccess();
--- |   };
--- | };
--- | ```
--- |
--- | ```purescript
--- | foreign import _myAff :: EffectFnAff String
--- |
--- | myAff :: Aff String
--- | myAff = fromEffectFnAff _myAff
--- | ````
-fromEffectFnAff ∷ EffectFnAff ~> Aff
-fromEffectFnAff (EffectFnAff eff) = makeAff \k → do
-  EffectFnCanceler canceler ← runEffectFn2 eff (mkEffectFn1 (k <<< Left)) (mkEffectFn1 (k <<< Right))
-  pure $ Canceler \e → makeAff \k2 → do
-    runEffectFn3 canceler e (mkEffectFn1 (k2 <<< Left)) (mkEffectFn1 (k2 <<< Right))
-    pure nonCanceler
+module Effect.Aff.Compat
+  ( EffectFnAff
+  , EffectFnCanceler
+  , fromEffectFnAff
+  , module Effect.Uncurried
+  , module Exports
+  ) where
+
+import Effect.Aff (Aff, Error)
+import Effect.Aff.General.Compat (EffectFnCb) as Exports
+import Effect.Aff.General.Compat as G
+import Effect.Uncurried (EffectFn1, EffectFn2, EffectFn3, mkEffectFn1, mkEffectFn2, mkEffectFn3, runEffectFn1, runEffectFn2, runEffectFn3)
+import Prelude (type (~>))
+
+type EffectFnCb a = G.EffectFnCb a
+
+newtype EffectFnAff a = EffectFnAff
+  (EffectFn2 (EffectFnCb Error) (EffectFnCb a) EffectFnCanceler)
+
+type EffectFnCanceler = G.EffectFnCanceler
+
+fromEffectFnAff ∷ EffectFnAff ~> Aff
+fromEffectFnAff (EffectFnAff f) =
+  G.fromEffectFnAff (G.EffectFnAff (mkEffectFn3 \a b _ → runEffectFn2 f a b))