Naming scheme for effects

Each effect type is typically named using the prefix Ng followed by the
name of the service; e.g., NgHttp. The label for the effect is the same,
except in lowercase; e.g., nghttp.

Author: ethul

MODULE.md

@@ -3,7 +3,7 @@ module Todomvc.Escape (EscapeDirective(), escape) where
 import Data.Maybe
 
 import Angular.Attributes (get)
-import Angular.Element (El(..), on)
+import Angular.Element (on)
 import Angular.Scope (apply, stringApplyExpr)
 
 foreign import data EscapeDirective :: *

examples/Todomvc/Escape.purs

@@ -6,7 +6,7 @@ import Control.Monad.Eff
 
 import qualified DOM.Node as D
 
-import Angular.Attributes (Attr(), get)
+import Angular.Attributes (get)
 import Angular.Element ((!!))
 import Angular.Scope (watch, apply, applyExpr)
 

examples/Todomvc/Focus.purs

@@ -100,4 +100,4 @@ gulp.task('watch.todomvc', function(cb){
   server(cb);
 });
 
-gulp.task('default', ['clean', 'make', 'docgen']);
+gulp.task('default', ['clean', 'make', 'docgen', 'psci']);

gulpfile.js

@@ -1,6 +1,7 @@
 module Angular.Attributes
   ( Attributes()
-  , Attr()
+  , NgAttr()
+  , AttrEff()
   , addClass
   , removeClass
   , updateClass
@@ -14,7 +15,9 @@ import Control.Monad.Eff
 
 foreign import data Attributes :: *
 
-foreign import data Attr :: !
+foreign import data NgAttr :: !
+
+type AttrEff e r = Eff (ngattr :: NgAttr | e) r
 
 foreign import addClass
   " function addClass(classVal){ \
@@ -24,7 +27,7 @@ foreign import addClass
   \     }; \
   \   }; \
   \ }"
-  :: forall e. String -> Attributes -> Eff (ngattr :: Attr | e) Unit
+  :: forall e. String -> Attributes -> AttrEff e Unit
 
 foreign import removeClass
   " function removeClass(classVal){ \
@@ -34,7 +37,7 @@ foreign import removeClass
   \     }; \
   \   }; \
   \ }"
-  :: forall e. String -> Attributes -> Eff (ngattr :: Attr | e) Unit
+  :: forall e. String -> Attributes -> AttrEff e Unit
 
 foreign import updateClass
   " function updateClass(newClasses){ \
@@ -46,7 +49,7 @@ foreign import updateClass
   \     }; \
   \   }; \
   \ }"
-  :: forall e. String -> String -> Attributes -> Eff (ngattr :: Attr | e) Unit
+  :: forall e. String -> String -> Attributes -> AttrEff e Unit
 
 foreign import observe
   " function observe(key){ \
@@ -58,7 +61,7 @@ foreign import observe
   \     }; \
   \   }; \
   \ }"
-  :: forall e f. String -> (String -> Eff f Unit) -> Attributes -> Eff (ngattr :: Attr | e) Unit
+  :: forall e f. String -> (String -> Eff f Unit) -> Attributes -> AttrEff e Unit
 
 foreign import set
   " function set(name){ \
@@ -70,20 +73,20 @@ foreign import set
   \     }; \
   \   }; \
   \ }"
-  :: forall e. String -> String -> Attributes -> Eff (ngattr :: Attr | e) Unit
+  :: forall e. String -> String -> Attributes -> AttrEff e Unit
 
 foreign import get
   " function get(attrs){ \
   \   return function(){ \
   \     return attrs; \
   \   }; \
   \ }"
-  :: forall e a. Attributes -> Eff (ngattr :: Attr | e) { | a }
+  :: forall e a. Attributes -> AttrEff e { | a }
 
 foreign import attr
   " function attr(attrs){ \
   \   return function(){ \
   \     return attrs.$attr; \
   \   }; \
   \ }"
-  :: forall e a. Attributes -> Eff (ngattr :: Attr | e) { | a }
+  :: forall e a. Attributes -> AttrEff e { | a }

src/Angular/Attributes.purs

@@ -1,7 +1,8 @@
 module Angular.Cache
  ( Cache()
  , CacheFactory()
- , CACHE()
+ , CacheEff()
+ , NgCache()
  , Key()
  , Name()
  , Options()
@@ -18,7 +19,7 @@ import Control.Monad.Eff
 import Data.Maybe
 import Data.Function
 
-foreign import data CACHE :: !
+foreign import data NgCache :: !
 
 foreign import data Cache :: *
 
@@ -30,7 +31,9 @@ type Name = String
 
 type Options a = { capacity :: Number | a }
 
-cache :: forall e a. Name -> Maybe (Options a) -> CacheFactory -> Eff (ngcache :: CACHE | e) Cache
+type CacheEff e r = Eff (ngcache :: NgCache | e) r
+
+cache :: forall e a. Name -> Maybe (Options a) -> CacheFactory -> CacheEff e Cache
 cache = runFn4 cacheFn fromMaybe
 
 foreign import cacheFn
@@ -43,7 +46,7 @@ foreign import cacheFn
                      Name
                      (Maybe (Options a))
                      CacheFactory
-                     (Eff (ngcache :: CACHE | e) Cache)
+                     (CacheEff e Cache)
 
 foreign import put
   "  function put(key){ \
@@ -55,7 +58,7 @@ foreign import put
   \      }; \
   \    }; \
   \  } "
-  :: forall e a. Key -> a -> Cache -> Eff (ngcache :: CACHE | e) a
+  :: forall e a. Key -> a -> Cache -> CacheEff e a
 
 foreign import get
   "  function get(key){ \
@@ -65,7 +68,7 @@ foreign import get
   \      }; \
   \    }; \
   \  } "
-  :: forall e a. Key -> Cache -> Eff (ngcache :: CACHE | e) a
+  :: forall e a. Key -> Cache -> CacheEff e a
 
 foreign import remove
   "  function remove(key){ \
@@ -75,28 +78,28 @@ foreign import remove
   \      }; \
   \    }; \
   \  } "
-  :: forall e a. Key -> Cache -> Eff (ngcache :: CACHE | e) Unit
+  :: forall e. Key -> Cache -> CacheEff e Unit
 
 foreign import removeAll
   "  function removeAll(cache){ \
   \    return function(){ \
   \      return cache.removeAll(); \
   \    }; \
   \  } "
-  :: forall e. Cache -> Eff (ngcache :: CACHE | e) Unit
+  :: forall e. Cache -> CacheEff e Unit
 
 foreign import destroy
   "  function destroy(cache){ \
   \    return function(){ \
   \      return cache.destroy(); \
   \    }; \
   \  } "
-  :: forall e. Cache -> Eff (ngcache :: CACHE | e) Unit
+  :: forall e. Cache -> CacheEff e Unit
 
 foreign import info
   "  function info(cache){ \
   \    return function(){ \
   \      return cache.info(); \
   \    }; \
   \  } "
-  :: forall e a. Cache -> Eff (ngcache :: CACHE | e) { id :: String, size :: Number | a }
+  :: forall e a. Cache -> CacheEff e { id :: String, size :: Number | a }