Merge pull request #26 from slamdata/compiler/0.12

Compiler/0.12

Author: garyb

.gitignore

@@ -6,3 +6,4 @@
 /node_modules/
 /output/
 /example/example.js
+package-lock.json

bower.json

@@ -19,15 +19,17 @@
     "package.json"
   ],
   "dependencies": {
-    "purescript-console": "^3.0.0",
-    "purescript-dom": "^4.0.0",
-    "purescript-arrays": "^4.0.0",
-    "purescript-foreign": "^4.0.0",
-    "purescript-nullable": "^3.0.0",
-    "purescript-prelude": "^3.0.0"
+    "purescript-effect": "^2.0.0",
+    "purescript-web-html": "^1.0.0",
+    "purescript-web-uievents": "^1.0.0",
+    "purescript-arrays": "^5.0.0",
+    "purescript-foreign": "^5.0.0",
+    "purescript-nullable": "^4.0.0",
+    "purescript-prelude": "^4.0.0"
   },
   "devDependencies": {
+    "purescript-console": "^4.1.0",
     "ace-builds": "^1.2.6",
-    "purescript-refs": "^3.0.0"
+    "purescript-refs": "^4.1.0"
   }
 }

example/src/Main.purs

@@ -2,23 +2,13 @@ module Main where
 
 import Prelude
 
-import Control.Monad.Eff (Eff)
-import Control.Monad.Eff.Console (log, CONSOLE)
-import Control.Monad.Eff.Ref (newRef, readRef, writeRef, REF)
-
-import Data.Array.ST (pushSTArray)
-import Data.Maybe (Maybe(..))
-import Data.Traversable (for_)
-
-import DOM (DOM)
-
 import Ace as Ace
 import Ace.Anchor as Anchor
 import Ace.BackgroundTokenizer as BackgroundTokenizer
 import Ace.Config as Config
 import Ace.Document as Document
-import Ace.Editor as Editor
 import Ace.EditSession as Session
+import Ace.Editor as Editor
 import Ace.Ext.LanguageTools as LanguageTools
 import Ace.Ext.LanguageTools.Completer as Completer
 import Ace.KeyBinding as KeyBinding
@@ -28,11 +18,17 @@ import Ace.Search as Search
 import Ace.Selection as Selection
 import Ace.TokenIterator as TokenIterator
 import Ace.UndoManager as UndoManager
+import Data.Array.ST as AST
+import Data.Maybe (Maybe(..))
+import Data.Traversable (for_)
+import Effect (Effect)
+import Effect.Console (log)
+import Effect.Ref as Ref
 
 foreign import rules :: Ace.Rules
-foreign import onLoad :: forall e. Eff e Unit -> Eff e Unit
+foreign import onLoad :: Effect Unit -> Effect Unit
 
-main :: forall e. Eff (ref ::REF, console :: CONSOLE, ace :: Ace.ACE, dom :: DOM|e) Unit
+main :: Effect Unit
 main = onLoad $ do
   _ <- Config.set Config.basePath "foo"
 
@@ -54,10 +50,10 @@ main = onLoad $ do
       "string"
       false
       session
-    >>= newRef
+    >>= Ref.new
 
   let rerenderMarker _ = do
-        readRef markerRef >>= flip Session.removeMarker session
+        Ref.read markerRef >>= flip Session.removeMarker session
         Ace.Position {row: startRow, column: startColumn}
           <- Anchor.getPosition startAnchor
         Ace.Position {row: endRow, column: endColumn}
@@ -74,7 +70,7 @@ main = onLoad $ do
                   false
                   session
 
-        writeRef markerRef newMId
+        Ref.write newMId markerRef
         pure unit
 
   Anchor.onChange startAnchor rerenderMarker
@@ -148,7 +144,7 @@ main = onLoad $ do
     Anchor.detach anchor
 
   -- Add a dynamic marker
-  Session.addDynamicMarker (\html _ -> pushSTArray html "<i>!</i>") true session
+  Session.addDynamicMarker (\html _ -> AST.push "<i>lulz</i>" html) true session
 
   -- Get the background tokenizer and trace the tokens and state on the first line
   backgroundTokenizer <- Session.getBackgroundTokenizer session
@@ -214,7 +210,7 @@ main = onLoad $ do
   pure unit
 
 
-miscTests :: forall e. Eff (console :: CONSOLE, ace :: Ace.ACE |e) Unit
+miscTests :: Effect Unit
 miscTests = void do
   editor <- Ace.edit "tests" Ace.ace
   session <- Editor.getSession editor

package.json

@@ -6,10 +6,10 @@
     "test": "pulp build -I example/src"
   },
   "devDependencies": {
-    "eslint": "^3.8.1",
-    "pulp": "^11.0.0",
-    "purescript": "^0.11.0",
-    "purescript-psa": "^0.5.0",
-    "rimraf": "^2.5.4"
+    "eslint": "^4.19.1",
+    "pulp": "^12.2.0",
+    "purescript": "slamdata/node-purescript#0.12",
+    "purescript-psa": "^0.6.0",
+    "rimraf": "^2.6.2"
   }
 }

src/Ace.purs

@@ -8,28 +8,28 @@ module Ace
   ) where
 
 import Ace.Types
-import Control.Monad.Eff (Eff)
+import Effect (Effect)
 import Data.Function.Uncurried (Fn2, runFn2, Fn3, runFn3)
-import DOM.HTML.Types (HTMLElement)
+import Web.HTML.HTMLElement (HTMLElement)
 
 foreign import ace :: Ace
 
-foreign import editImpl :: forall eff. Fn2 String Ace (Eff (ace :: ACE | eff) Editor)
+foreign import editImpl :: Fn2 String Ace (Effect Editor)
 
-edit :: forall eff. String -> Ace -> Eff (ace :: ACE | eff) Editor
+edit :: String -> Ace -> Effect Editor
 edit el self = runFn2 editImpl el self
 
-foreign import editNodeImpl :: forall eff. Fn2 HTMLElement Ace (Eff (ace :: ACE | eff) Editor)
+foreign import editNodeImpl :: Fn2 HTMLElement Ace (Effect Editor)
 
-editNode :: forall eff. HTMLElement -> Ace -> Eff (ace :: ACE | eff) Editor
+editNode :: HTMLElement -> Ace -> Effect Editor
 editNode el self = runFn2 editNodeImpl el self
 
-foreign import createEditSessionForDocumentImpl :: forall eff. Fn3 Document TextMode Ace (Eff (ace :: ACE | eff) EditSession)
+foreign import createEditSessionForDocumentImpl :: Fn3 Document TextMode Ace (Effect EditSession)
 
-createEditSessionForDocument :: forall eff. Document -> TextMode -> Ace -> Eff (ace :: ACE | eff) EditSession
+createEditSessionForDocument :: Document -> TextMode -> Ace -> Effect EditSession
 createEditSessionForDocument text mode self = runFn3 createEditSessionForDocumentImpl text mode self
 
-foreign import createEditSessionImpl :: forall eff. Fn3 String TextMode Ace (Eff (ace :: ACE | eff) EditSession)
+foreign import createEditSessionImpl :: Fn3 String TextMode Ace (Effect EditSession)
 
-createEditSession :: forall eff. String -> TextMode -> Ace -> Eff (ace :: ACE | eff) EditSession
+createEditSession :: String -> TextMode -> Ace -> Effect EditSession
 createEditSession text mode self = runFn3 createEditSessionImpl text mode self

src/Ace/Anchor.purs

@@ -11,40 +11,38 @@ module Ace.Anchor
 
 import Prelude
 
-import Ace.Types (ACE, Anchor, Document, Position, AnchorEvent)
-import Control.Monad.Eff (Eff)
+import Ace.Types (Anchor, Document, Position, AnchorEvent)
+import Effect (Effect)
 import Data.Function.Uncurried (Fn2, runFn2, Fn3, runFn3, Fn4, runFn4)
 
 foreign import onChangeImpl
-  :: forall eff a
+  :: forall a
    . Fn2 Anchor
-       (AnchorEvent -> Eff (ace :: ACE | eff) a)
-       (Eff (ace :: ACE | eff) Unit)
+       (AnchorEvent -> Effect a)
+       (Effect Unit)
 
 onChange
-  :: forall eff a
+  :: forall a
    . Anchor
-  -> (AnchorEvent -> Eff (ace :: ACE | eff) a)
-  -> Eff (ace :: ACE | eff) Unit
+  -> (AnchorEvent -> Effect a)
+  -> Effect Unit
 onChange self fn = runFn2 onChangeImpl self fn
 
-foreign import getPosition :: forall eff. Anchor -> Eff (ace :: ACE | eff) Position
+foreign import getPosition :: Anchor -> Effect Position
 
-foreign import getDocument :: forall eff. Anchor -> Eff (ace :: ACE | eff) Document
+foreign import getDocument :: Anchor -> Effect Document
 
-foreign import setPositionImpl :: forall eff. Fn4 Int Int Boolean Anchor (Eff (ace :: ACE | eff) Unit)
+foreign import setPositionImpl :: Fn4 Int Int Boolean Anchor (Effect Unit)
 
-setPosition :: forall eff. Int -> Int -> Boolean -> Anchor -> Eff (ace :: ACE | eff) Unit
+setPosition :: Int -> Int -> Boolean -> Anchor -> Effect Unit
 setPosition row column noClip self = runFn4 setPositionImpl row column noClip self
 
-foreign import detach :: forall eff. Anchor -> Eff (ace :: ACE | eff) Unit
+foreign import detach :: Anchor -> Effect Unit
 
-foreign import createImpl :: forall eff. Fn3 Document Int Int (Eff (ace :: ACE | eff) Anchor)
+foreign import createImpl :: Fn3 Document Int Int (Effect Anchor)
 
-create :: forall eff. Document -> Int -> Int -> Eff (ace :: ACE | eff) Anchor
+create :: Document -> Int -> Int -> Effect Anchor
 create doc row column = runFn3 createImpl doc row column
 
-foreign import getInsertRight :: forall eff. Anchor -> Eff (ace :: ACE |eff) Boolean
-foreign import setInsertRight
-  :: forall eff
-   . Boolean -> Anchor -> Eff (ace :: ACE|eff) Unit
+foreign import getInsertRight :: Anchor -> Effect Boolean
+foreign import setInsertRight :: Boolean -> Anchor -> Effect Unit

src/Ace/BackgroundTokenizer.purs

@@ -12,48 +12,48 @@ module Ace.BackgroundTokenizer
 
 import Prelude
 
-import Ace.Types (BackgroundTokenizer, ACE, Editor, Tokenizer, TokenInfo, Document, BackgroundTokenizerEvent)
-import Control.Monad.Eff (Eff)
+import Ace.Types (BackgroundTokenizer, Editor, Tokenizer, TokenInfo, Document, BackgroundTokenizerEvent)
+import Effect (Effect)
 import Data.Function.Uncurried (Fn2, runFn2, Fn3, runFn3)
 
-foreign import onUpdateImpl :: forall eff a. Fn2 BackgroundTokenizer (BackgroundTokenizerEvent -> Eff (ace :: ACE | eff) a) (Eff (ace :: ACE | eff) Unit)
+foreign import onUpdateImpl :: forall a. Fn2 BackgroundTokenizer (BackgroundTokenizerEvent -> Effect a) (Effect Unit)
 
-onUpdate :: forall eff a. BackgroundTokenizer -> (BackgroundTokenizerEvent -> Eff (ace :: ACE | eff) a) -> Eff (ace :: ACE | eff) Unit
+onUpdate :: forall a. BackgroundTokenizer -> (BackgroundTokenizerEvent -> Effect a) -> Effect Unit
 onUpdate self fn = runFn2 onUpdateImpl self fn
 
-foreign import setTokenizerImpl :: forall eff. Fn2 Tokenizer BackgroundTokenizer (Eff (ace :: ACE | eff) Unit)
+foreign import setTokenizerImpl :: Fn2 Tokenizer BackgroundTokenizer (Effect Unit)
 
-setTokenizer :: forall eff. Tokenizer -> BackgroundTokenizer -> Eff (ace :: ACE | eff) Unit
+setTokenizer :: Tokenizer -> BackgroundTokenizer -> Effect Unit
 setTokenizer tokenizer self = runFn2 setTokenizerImpl tokenizer self
 
-foreign import setDocumentImpl :: forall eff. Fn2 Document BackgroundTokenizer (Eff (ace :: ACE | eff) Unit)
+foreign import setDocumentImpl :: Fn2 Document BackgroundTokenizer (Effect Unit)
 
-setDocument :: forall eff. Document -> BackgroundTokenizer -> Eff (ace :: ACE | eff) Unit
+setDocument :: Document -> BackgroundTokenizer -> Effect Unit
 setDocument doc self = runFn2 setDocumentImpl doc self
 
-foreign import fireUpdateEventImpl :: forall eff. Fn3 Int Int BackgroundTokenizer (Eff (ace :: ACE | eff) Unit)
+foreign import fireUpdateEventImpl :: Fn3 Int Int BackgroundTokenizer (Effect Unit)
 
-fireUpdateEvent :: forall eff. Int -> Int -> BackgroundTokenizer -> Eff (ace :: ACE | eff) Unit
+fireUpdateEvent :: Int -> Int -> BackgroundTokenizer -> Effect Unit
 fireUpdateEvent firstRow lastRow self = runFn3 fireUpdateEventImpl firstRow lastRow self
 
-foreign import startImpl :: forall eff. Fn2 Int BackgroundTokenizer (Eff (ace :: ACE | eff) Unit)
+foreign import startImpl :: Fn2 Int BackgroundTokenizer (Effect Unit)
 
-start :: forall eff. Int -> BackgroundTokenizer -> Eff (ace :: ACE | eff) Unit
+start :: Int -> BackgroundTokenizer -> Effect Unit
 start startRow self = runFn2 startImpl startRow self
 
-foreign import stop :: forall eff. BackgroundTokenizer -> (Eff (ace :: ACE | eff) Unit)
+foreign import stop :: BackgroundTokenizer -> (Effect Unit)
 
-foreign import getTokensImpl :: forall eff. Fn2 Int BackgroundTokenizer (Eff (ace :: ACE | eff) (Array TokenInfo))
+foreign import getTokensImpl :: Fn2 Int BackgroundTokenizer (Effect (Array TokenInfo))
 
-getTokens :: forall eff. Int -> BackgroundTokenizer -> Eff (ace :: ACE | eff) (Array TokenInfo)
+getTokens :: Int -> BackgroundTokenizer -> Effect (Array TokenInfo)
 getTokens row self = runFn2 getTokensImpl row self
 
-foreign import getStateImpl :: forall eff. Fn2 Int BackgroundTokenizer (Eff (ace :: ACE | eff) String)
+foreign import getStateImpl :: Fn2 Int BackgroundTokenizer (Effect String)
 
-getState :: forall eff. Int -> BackgroundTokenizer -> Eff (ace :: ACE | eff) String
+getState :: Int -> BackgroundTokenizer -> Effect String
 getState row self = runFn2 getStateImpl row self
 
-foreign import createImpl :: forall eff. Fn2 Tokenizer Editor (Eff (ace :: ACE | eff) BackgroundTokenizer)
+foreign import createImpl :: Fn2 Tokenizer Editor (Effect BackgroundTokenizer)
 
-create :: forall eff. Tokenizer -> Editor -> Eff (ace :: ACE | eff) BackgroundTokenizer
+create :: Tokenizer -> Editor -> Effect BackgroundTokenizer
 create tokenizer editor = runFn2 createImpl tokenizer editor

src/Ace/Config.purs

@@ -10,14 +10,14 @@ module Ace.Config
   ) where
 
 import Ace.Types
-import Control.Monad.Eff (Eff)
+import Effect (Effect)
 import Data.Function.Uncurried (Fn2, runFn2)
 
 newtype ConfigOption a = ConfigOption String
 
-foreign import setImpl :: forall a eff. Fn2 (ConfigOption a) a (Eff (ace :: ACE | eff) Ace)
+foreign import setImpl :: forall a. Fn2 (ConfigOption a) a (Effect Ace)
 
-set :: forall a eff. ConfigOption a -> a -> Eff (ace :: ACE | eff) Ace
+set :: forall a. ConfigOption a -> a -> Effect Ace
 set key value = runFn2 setImpl key value
 
 packaged :: ConfigOption Boolean