Merge branch 'topic/fixing-constructors'

Author: ethul

src/Angular/Cache.purs

@@ -16,6 +16,7 @@ module Angular.Cache
 
 import Control.Monad.Eff
 import Data.Maybe
+import Data.Function
 
 foreign import data CACHE :: !
 
@@ -29,17 +30,20 @@ type Name = String
 
 type Options a = { capacity :: Number | a }
 
-foreign import cache
-  " function cache(name){ \
-  \   return function(opts){ \
-  \     return function($cacheFactory){ \
-  \       return function(){ \
-  \         return $cacheFactory(name, opts.values[0]); \
-  \       }; \
-  \     }; \
+cache :: forall e a. Name -> Maybe (Options a) -> CacheFactory -> Eff (ngcache :: CACHE | e) Cache
+cache = runFn4 cacheFn fromMaybe
+
+foreign import cacheFn
+  " function cacheFn(fromMaybe, name, opts, $cacheFactory){ \
+  \   return function(){ \
+  \     return $cacheFactory(name, fromMaybe(undefined)(opts)); \
   \   }; \
   \ } "
-  :: forall e a. Name -> Maybe (Options a) -> CacheFactory -> Eff (ngcache :: CACHE | e) Cache
+  :: forall e a. Fn4 (Options a -> Maybe (Options a) -> Options a)
+                     Name
+                     (Maybe (Options a))
+                     CacheFactory
+                     (Eff (ngcache :: CACHE | e) Cache)
 
 foreign import put
   "  function put(key){ \

src/Angular/Element.purs

@@ -58,7 +58,7 @@ module Angular.Element
 import Prelude (Unit())
 
 import Control.Monad.Eff
-import Data.Function (Fn3(), Fn4(), runFn3, runFn4)
+import Data.Function (Fn3(), Fn4(), Fn5(), runFn3, runFn4, runFn5)
 import Data.Maybe
 
 import DOM.Event (Event())
@@ -517,16 +517,22 @@ foreign import wrap
   \ }"
   :: forall e. Element -> Element -> Eff (ngel :: El | e) Element
 
-foreign import controller
-  " function controller(nameOpt){ \
-  \   return function(el){ \
-  \     return function(){ \
-  \       var a = el.controller(nameOpt.values[0]); \
-  \       return angular.isDefined(a) ? Data_Maybe.Just(a) : Data_Maybe.Nothing; \
-  \     }; \
+foreign import controllerFn
+  " function controllerFn(fromMaybe, nothing, just, name, el){ \
+  \   return function(){ \
+  \     var a = el.controller(fromMaybe(undefined)(name)); \
+  \     return angular.isDefined(a) ? just(a) : nothing; \
   \   }; \
   \ }"
-  :: forall e a. Maybe String -> Element -> Eff (ngel :: El | e) (Maybe a)
+  :: forall e a. Fn5 (String -> Maybe String -> String)
+                     (Maybe a)
+                     (a -> Maybe a)
+                     (Maybe String)
+                     Element
+                     (Eff (ngel :: El | e) (Maybe a))
+
+controller :: forall e a. Maybe String -> Element -> Eff (ngel :: El | e) (Maybe a)
+controller = runFn5 controllerFn fromMaybe Nothing Just
 
 foreign import injectorFn
   " function injectorFn(nothing, just, el){ \

src/Angular/Http.purs

@@ -1,5 +1,6 @@
 module Angular.Http
  ( Http()
+ , HttpEff()
  , HttpResponse()
  , Response()
  , Config()

src/Angular/NgModelController.purs

@@ -28,6 +28,7 @@ module Angular.NgModelController
  ) where
 
 import Control.Monad.Eff
+import Data.Function
 import Data.Maybe
 
 foreign import data NgModelController :: * -> *
@@ -129,39 +130,47 @@ foreign import setModelValue
   \ } "
   :: forall e a b. b -> NgModelController a -> Eff (ngmodel :: NgModelCtrl | e) (NgModelController b)
 
-foreign import appendParsers
-  " function appendParsers(parsers){ \
-  \   return function($ctrl){ \
-  \     return function(){ \
-  \       var as = []; \
-  \       angular.forEach(parsers, function(p){ \
-  \         as.push(function(v){ \
-  \           return p(v).values[0]; \
-  \         }); \
+foreign import appendParsersFn
+  " function appendParsersFn(fromMaybe, parsers, $ctrl){ \
+  \   return function(){ \
+  \     var as = []; \
+  \     angular.forEach(parsers, function(p){ \
+  \       as.push(function(v){ \
+  \         return fromMaybe(undefined)(p(v)); \
   \       }); \
-  \       $ctrl.$parsers.push.apply($ctrl.$parsers, as); \
-  \       return {}; \
-  \     }; \
+  \     }); \
+  \     $ctrl.$parsers.push.apply($ctrl.$parsers, as); \
+  \     return {}; \
   \   }; \
   \ } "
-  :: forall e a. [Parser a] -> NgModelController a -> Eff (ngmodel :: NgModelCtrl | e) Unit
+  :: forall e a. Fn3 (a -> Maybe a -> a)
+                     [Parser a]
+                     (NgModelController a)
+                     (Eff (ngmodel :: NgModelCtrl | e) Unit)
 
-foreign import prependParsers
-  " function prependParsers(parsers){ \
-  \   return function($ctrl){ \
-  \     return function(){ \
-  \       var as = []; \
-  \       angular.forEach(parsers, function(p){ \
-  \         as.push(function(v){ \
-  \           return p(v).values[0]; \
-  \         }); \
+appendParsers :: forall e a. [Parser a] -> NgModelController a -> Eff (ngmodel :: NgModelCtrl | e) Unit
+appendParsers = runFn3 appendParsersFn fromMaybe
+
+foreign import prependParsersFn
+  " function prependParsersFn(fromMaybe, parsers, $ctrl){ \
+  \   return function(){ \
+  \     var as = []; \
+  \     angular.forEach(parsers, function(p){ \
+  \       as.push(function(v){ \
+  \         return fromMaybe(undefined)(p(v)); \
   \       }); \
-  \       $ctrl.$parsers.unshift.apply($ctrl.$parsers, as); \
-  \       return {}; \
-  \     }; \
+  \     }); \
+  \     $ctrl.$parsers.unshift.apply($ctrl.$parsers, as); \
+  \     return {}; \
   \   }; \
   \ } "
-  :: forall e a. [Parser a] -> NgModelController a -> Eff (ngmodel :: NgModelCtrl | e) Unit
+  :: forall e a. Fn3 (a -> Maybe a -> a)
+                     [Parser a]
+                     (NgModelController a)
+                     (Eff (ngmodel :: NgModelCtrl | e) Unit)
+
+prependParsers :: forall e a. [Parser a] -> NgModelController a -> Eff (ngmodel :: NgModelCtrl | e) Unit
+prependParsers = runFn3 prependParsersFn fromMaybe
 
 foreign import appendFormatters
   " function appendFormatters(formatters){ \