Updates for 0.12 compiler (#38)

* Updates for 0.12 compiler

* Remove event example

Author: paf31

README.md

@@ -1,7 +1,6 @@
 # purescript-behaviors
 
 - [Example](test/Main.purs)
-- [Moving Gears Example](https://github.com/knaman2609/purescript-behaviors-example)
 - [Demo](https://github.com/paf31/purescript-behaviors-demo)
 - [API Documentation](generated-docs/FRP)
 - [Try `purescript-behaviors` in the browser](http://try.purescript.org/?backend=behaviors)

bower.json

@@ -26,11 +26,15 @@
     "purescript-effect": "^2.0.0",
     "purescript-ordered-collections": "^1.0.0",
     "purescript-filterable": "^3.0.0",
-    "purescript-nullable": "^4.0.0"
+    "purescript-nullable": "^4.0.0",
+    "purescript-event": "^1.2.4",
+    "purescript-web-html": "^1.0.0",
+    "purescript-web-events": "^1.0.0",
+    "purescript-web-uievents": "^1.0.0"
   },
   "devDependencies": {
     "purescript-math": "^2.1.1",
     "purescript-integers": "^4.0.0",
-    "purescript-drawing": "justinwoo/purescript-drawing#compiler/0.12"
+    "purescript-drawing": "^4.0.0"
   }
 }

src/FRP.purs

@@ -32,7 +32,7 @@ import Data.Function (applyFlipped)
 import Data.Maybe (Maybe(..))
 import Data.Tuple (Tuple(Tuple))
 import FRP.Event (class IsEvent, Event, fix, fold, keepLatest, sampleOn, subscribe, withLast)
-import FRP.Event.Time (animationFrame)
+import FRP.Event.AnimationFrame (animationFrame)
 
 -- | `ABehavior` is the more general type of `Behavior`, which is parameterized
 -- | over some underlying `event` type.

src/FRP/Behavior.purs

@@ -7,12 +7,12 @@ import Prelude
 
 import Data.Set as Set
 import FRP.Behavior (Behavior, behavior)
-import FRP.Event.Keyboard (withKeys)
+import FRP.Event.Keyboard (Keyboard, withKeys)
 
 -- | A `Behavior` which reports the keys which are currently pressed.
-keys :: Behavior (Set.Set Int)
-keys = behavior \e -> map (\{ value, keys: ks } -> value (Set.fromFoldable ks)) (withKeys e)
+keys :: Keyboard -> Behavior (Set.Set String)
+keys keyboard = behavior \e -> map (\{ value, keys: ks } -> value (Set.fromFoldable ks)) (withKeys keyboard e)
 
 -- | A `Behavior` which reports whether a specific key is currently pressed.
-key :: Int -> Behavior Boolean
-key k = Set.member k <$> keys
+key :: Keyboard -> String -> Behavior Boolean
+key keyboard k = Set.member k <$> keys keyboard

src/FRP/Behavior/Keyboard.purs

@@ -6,15 +6,14 @@ module FRP.Behavior.Mouse
 import Prelude
 
 import Data.Maybe (Maybe)
-import Data.Nullable (toMaybe)
 import Data.Set as Set
 import FRP.Behavior (Behavior, behavior)
-import FRP.Event.Mouse (withPosition, withButtons)
+import FRP.Event.Mouse (Mouse, withPosition, withButtons)
 
 -- | A `Behavior` which reports the current mouse position, if it is known.
-position :: Behavior (Maybe { x :: Int, y :: Int })
-position = behavior \e -> map (\{ value, pos } -> value (toMaybe pos)) (withPosition e)
+position :: Mouse -> Behavior (Maybe { x :: Int, y :: Int })
+position m = behavior \e -> map (\{ value, pos } -> value pos) (withPosition m e)
 
 -- | A `Behavior` which reports the mouse buttons which are currently pressed.
-buttons :: Behavior (Set.Set Int)
-buttons = behavior \e -> map (\{ value, buttons: bs } -> value (Set.fromFoldable bs)) (withButtons e)
+buttons :: Mouse -> Behavior (Set.Set Int)
+buttons m = behavior \e -> map (\{ value, buttons: bs } -> value bs) (withButtons m e)

src/FRP/Behavior/Mouse.purs

@@ -1,17 +1,19 @@
 module FRP.Behavior.Time
-  ( millisSinceEpoch
+  ( instant
   , seconds
   ) where
 
 import Prelude
 
+import Data.DateTime.Instant (Instant, unInstant)
+import Data.Time.Duration (Seconds, toDuration)
 import FRP.Behavior (Behavior, behavior)
 import FRP.Event.Time (withTime)
 
 -- | Get the current time in milliseconds since the epoch.
-millisSinceEpoch :: Behavior Number
-millisSinceEpoch = behavior \e -> map (\{ value, time: t } -> value t) (withTime e)
+instant :: Behavior Instant
+instant = behavior \e -> map (\{ value, time: t } -> value t) (withTime e)
 
 -- | Get the current time in seconds since the epoch.
-seconds :: Behavior Number
-seconds = map (_ / 1000.0) millisSinceEpoch
+seconds :: Behavior Seconds
+seconds = map (toDuration <<< unInstant) instant