update to 0.12 and psc-package

Author: justinwoo

exercises/chapter10/src/Control/Monad/Eff/Alert.purs

@@ -1,8 +1,8 @@
-module Control.Monad.Eff.Alert where
+module Effect.Alert where
 
 import Prelude
 
-import Control.Monad.Eff (kind Effect, Eff)
+import Effect (kind Effect, Effect)
 
 foreign import data ALERT :: Effect
 

exercises/chapter10/src/Control/Monad/Eff/Storage.purs

@@ -1,8 +1,8 @@
-module Control.Monad.Eff.Storage where
+module Effect.Storage where
 
 import Prelude
 
-import Control.Monad.Eff (kind Effect, Eff)
+import Effect (kind Effect, Effect)
 import Data.Foreign (Foreign)
 
 foreign import data STORAGE :: Effect

exercises/chapter10/src/Main.purs

@@ -2,10 +2,10 @@ module Main where
 
 import Prelude
 
-import Control.Monad.Eff (Eff)
-import Control.Monad.Eff.Alert (ALERT, alert)
-import Control.Monad.Eff.Console (CONSOLE, log)
-import Control.Monad.Eff.Storage (STORAGE, setItem, getItem)
+import Effect (Effect)
+import Effect.Alert (ALERT, alert)
+import Effect.Console (log)
+import Effect.Storage (STORAGE, setItem, getItem)
 import Control.Monad.Except (runExcept)
 import DOM (DOM)
 import DOM.HTML (window)

exercises/chapter11/.gitignore

@@ -5,3 +5,4 @@
 /output/
 /node_modules/
 /bower_components/
+.psc-package

exercises/chapter11/psc-package.json

@@ -0,0 +1,13 @@
+{
+  "name": "chapter2",
+  "set": "psc-0.12.0-20180625",
+  "source": "https://github.com/purescript/package-sets.git",
+  "depends": [
+    "console",
+    "math",
+    "node-readline",
+    "prelude",
+    "strings",
+    "transformers"
+  ]
+}

exercises/chapter11/src/Main.purs

@@ -2,9 +2,8 @@ module Main where
 
 import Prelude
 import Node.ReadLine as RL
-import Control.Monad.Eff (Eff)
-import Control.Monad.Eff.Console (CONSOLE, log)
-import Control.Monad.Eff.Exception (EXCEPTION)
+import Effect (Effect)
+import Effect.Console (log)
 import Control.Monad.RWS (RWSResult(..), runRWS)
 import Data.Either (Either(..))
 import Data.Foldable (for_)

exercises/chapter12/.gitignore

@@ -5,3 +5,4 @@
 /output/
 /node_modules/
 /bower_components/
+.psc-package

exercises/chapter12/bower.json

@@ -0,0 +1,16 @@
+{
+  "name": "chapter2",
+  "set": "psc-0.12.0-20180625",
+  "source": "https://github.com/purescript/package-sets.git",
+  "depends": [
+    "console",
+    "functions",
+    "lists",
+    "math",
+    "parallel",
+    "prelude",
+    "refs",
+    "strings",
+    "transformers"
+  ]
+}

exercises/chapter12/psc-package.json

@@ -3,50 +3,48 @@ module Files where
 import Prelude
 
 import Control.Monad.Cont.Trans (ContT(..))
-import Control.Monad.Eff (kind Effect, Eff)
+import Effect (Effect)
 import Control.Monad.Except.Trans (ExceptT(..))
 import Data.Either (Either(..))
 import Data.Function.Uncurried (Fn4, Fn3, runFn4, runFn3)
 import Types (Async)
 
-foreign import data FS :: Effect
-
 type ErrorCode = String
 
 type FilePath = String
 
 foreign import readFileImpl ::
-                 forall eff. Fn3 FilePath
-                   (String -> Eff (fs :: FS | eff) Unit)
-                   (ErrorCode -> Eff (fs :: FS | eff) Unit)
-                   (Eff (fs :: FS | eff) Unit)
+                 Fn3 FilePath
+                   (String -> Effect Unit)
+                   (ErrorCode -> Effect Unit)
+                   (Effect Unit)
 
 foreign import writeFileImpl ::
-                 forall eff. Fn4 FilePath
+                 Fn4 FilePath
                    String
-                   (Eff (fs :: FS | eff) Unit)
-                   (ErrorCode -> Eff (fs :: FS | eff) Unit)
-                   (Eff (fs :: FS | eff) Unit)
+                   (Effect Unit)
+                   (ErrorCode -> Effect Unit)
+                   (Effect Unit)
 
-readFile :: forall eff. FilePath -> (Either ErrorCode String -> Eff (fs :: FS | eff) Unit) -> Eff (fs :: FS | eff) Unit
+readFile :: FilePath -> (Either ErrorCode String -> Effect Unit) -> Effect Unit
 readFile path k = runFn3 readFileImpl path (k <<< Right) (k <<< Left)
 
-writeFile :: forall eff. FilePath -> String -> (Either ErrorCode Unit -> Eff (fs :: FS | eff) Unit) -> Eff (fs :: FS | eff) Unit
+writeFile :: FilePath -> String -> (Either ErrorCode Unit -> Effect Unit) -> Effect Unit
 writeFile path text k = runFn4 writeFileImpl path text (k $ Right unit) (k <<< Left)
 
-readFileCont :: forall eff. FilePath -> Async (fs :: FS | eff) (Either ErrorCode String)
+readFileCont :: FilePath -> Async (Either ErrorCode String)
 readFileCont path = ContT $ readFile path
 
-writeFileCont :: forall eff. FilePath -> String -> Async (fs :: FS | eff) (Either ErrorCode Unit)
+writeFileCont :: FilePath -> String -> Async (Either ErrorCode Unit)
 writeFileCont path text = ContT $ writeFile path text
 
-readFileContEx :: forall eff. FilePath -> ExceptT ErrorCode (Async (fs :: FS | eff)) String
+readFileContEx :: FilePath -> ExceptT ErrorCode Async String
 readFileContEx path = ExceptT $ readFileCont path
 
-writeFileContEx :: forall eff. FilePath -> String -> ExceptT ErrorCode (Async (fs :: FS | eff)) Unit
+writeFileContEx :: FilePath -> String -> ExceptT ErrorCode Async Unit
 writeFileContEx path text = ExceptT $ writeFileCont path text
 
-copyFileContEx :: forall eff. FilePath -> FilePath -> ExceptT ErrorCode (Async (fs :: FS | eff)) Unit
+copyFileContEx :: FilePath -> FilePath -> ExceptT ErrorCode Async Unit
 copyFileContEx src dest = do
   content <- readFileContEx src
   writeFileContEx dest content