Merge pull request #13 from justinwoo/compiler/0.12

kritzcreek · web-flow · commit d4442ce6065a · 2018-05-14T12:06:45.000+02:00
changes for 0.12
diff --git a/bower.json b/bower.json
@@ -16,17 +16,17 @@
     "package.json"
   ],
   "dependencies": {
-    "purescript-exceptions": "^3.0.0",
-    "purescript-foreign": "^4.0.0",
-    "purescript-functions": "^3.0.0",
-    "purescript-maps": "^3.0.0",
-    "purescript-node-fs": "^4.0.0",
-    "purescript-node-streams": "^3.0.0",
-    "purescript-nullable": "^3.0.0",
-    "purescript-posix-types": "^3.0.0",
-    "purescript-unsafe-coerce": "^3.0.0"
+    "purescript-exceptions": "#compiler/0.12",
+    "purescript-foreign": "#compiler/0.12",
+    "purescript-functions": "#compiler/0.12",
+    "purescript-node-fs": "#compiler/0.12",
+    "purescript-node-streams": "#compiler/0.12",
+    "purescript-nullable": "#compiler/0.12",
+    "purescript-posix-types": "#compiler/0.12",
+    "purescript-unsafe-coerce": "#compiler/0.12",
+    "purescript-foreign-object": "#compiler/0.12"
   },
   "devDependencies": {
-    "purescript-console": "^3.0.0"
+    "purescript-console": "#compiler/0.12"
   }
 }
diff --git a/src/Node/ChildProcess.purs b/src/Node/ChildProcess.purs
@@ -13,7 +13,6 @@
 module Node.ChildProcess
   ( Handle
   , ChildProcess
-  , CHILD_PROCESS
   , stderr
   , stdout
   , stdin
@@ -48,18 +47,19 @@ module Node.ChildProcess
 import Prelude
 
 import Control.Alt ((<|>))
-import Control.Monad.Eff (kind Effect, Eff)
-import Control.Monad.Eff.Exception as Exception
-import Control.Monad.Eff.Exception.Unsafe (unsafeThrow)
+import Effect (Effect)
+import Effect.Exception as Exception
+import Effect.Exception.Unsafe (unsafeThrow)
 
-import Data.Foreign (Foreign)
 import Data.Function.Uncurried (Fn2, runFn2)
 import Data.Maybe (Maybe(..), fromMaybe)
 import Data.Nullable (Nullable, toNullable, toMaybe)
 import Data.Posix (Pid, Gid, Uid)
 import Data.Posix.Signal (Signal)
 import Data.Posix.Signal as Signal
-import Data.StrMap (StrMap)
+
+import Foreign (Foreign)
+import Foreign.Object (Object)
 
 import Node.Buffer (Buffer)
 import Node.FS as FS
@@ -70,9 +70,6 @@ import Unsafe.Coerce (unsafeCoerce)
 -- | A handle for inter-process communication (IPC).
 foreign import data Handle :: Type
 
--- | The effect for creating and interacting with child processes.
-foreign import data CHILD_PROCESS :: Effect
-
 newtype ChildProcess = ChildProcess ChildProcessRec
 
 runChildProcess :: ChildProcess -> ChildProcessRec
@@ -81,29 +78,29 @@ runChildProcess (ChildProcess r) = r
 -- | Note: some of these types are lies, and so it is unsafe to access some of
 -- | these record fields directly.
 type ChildProcessRec =
-  { stdin :: forall eff. Nullable (Writable () (cp :: CHILD_PROCESS | eff))
-  , stdout :: forall eff. Nullable (Readable () (cp :: CHILD_PROCESS | eff))
-  , stderr :: forall eff. Nullable (Readable () (cp :: CHILD_PROCESS | eff))
+  { stdin :: Nullable (Writable ())
+  , stdout :: Nullable (Readable ())
+  , stderr :: Nullable (Readable ())
   , pid :: Pid
   , connected :: Boolean
   , kill :: String -> Boolean
   , send :: forall r. Fn2 { | r} Handle Boolean
-  , disconnect :: forall eff. Eff eff Unit
+  , disconnect :: Effect Unit
   }
 
 -- | The standard input stream of a child process. Note that this is only
 -- | available if the process was spawned with the stdin option set to "pipe".
-stdin :: forall eff. ChildProcess -> Writable () (cp :: CHILD_PROCESS | eff)
+stdin :: ChildProcess -> Writable ()
 stdin = unsafeFromNullable (missingStream "stdin") <<< _.stdin <<< runChildProcess
 
 -- | The standard output stream of a child process. Note that this is only
 -- | available if the process was spawned with the stdout option set to "pipe".
-stdout :: forall eff. ChildProcess -> Readable () (cp :: CHILD_PROCESS | eff)
+stdout :: ChildProcess -> Readable ()
 stdout = unsafeFromNullable (missingStream "stdout") <<< _.stdout <<< runChildProcess
 
 -- | The standard error stream of a child process. Note that this is only
 -- | available if the process was spawned with the stderr option set to "pipe".
-stderr :: forall eff. ChildProcess -> Readable () (cp :: CHILD_PROCESS | eff)
+stderr :: ChildProcess -> Readable ()
 stderr = unsafeFromNullable (missingStream "stderr") <<< _.stderr <<< runChildProcess
 
 missingStream :: String -> String
@@ -119,23 +116,23 @@ foreign import unsafeFromNullable :: forall a. String -> Nullable a -> a
 pid :: ChildProcess -> Pid
 pid = _.pid <<< runChildProcess
 
-connected :: forall eff. ChildProcess -> Eff (cp :: CHILD_PROCESS | eff) Boolean
-connected (ChildProcess cp) = mkEff \_ -> cp.connected
+connected :: ChildProcess -> Effect Boolean
+connected (ChildProcess cp) = mkEffect \_ -> cp.connected
 
-send :: forall eff props. { | props } -> Handle -> ChildProcess -> Eff (cp :: CHILD_PROCESS | eff) Boolean
-send msg handle (ChildProcess cp) = mkEff \_ -> runFn2 cp.send msg handle
+send :: forall props. { | props } -> Handle -> ChildProcess -> Effect Boolean
+send msg handle (ChildProcess cp) = mkEffect \_ -> runFn2 cp.send msg handle
 
-disconnect :: forall eff. ChildProcess -> Eff (cp :: CHILD_PROCESS | eff) Unit
+disconnect :: ChildProcess -> Effect Unit
 disconnect = _.disconnect <<< runChildProcess
 
 -- | Send a signal to a child process. It's an unfortunate historical decision
 -- | that this function is called "kill", as sending a signal to a child
 -- | process won't necessarily kill it.
-kill :: forall eff. Signal -> ChildProcess -> Eff (cp :: CHILD_PROCESS | eff) Boolean
-kill sig (ChildProcess cp) = mkEff \_ -> cp.kill (Signal.toString sig)
+kill :: Signal -> ChildProcess -> Effect Boolean
+kill sig (ChildProcess cp) = mkEffect \_ -> cp.kill (Signal.toString sig)
 
-mkEff :: forall eff a. (Unit -> a) -> Eff eff a
-mkEff = unsafeCoerce
+mkEffect :: forall a. (Unit -> a) -> Effect a
+mkEffect = unsafeCoerce
 
 -- | Specifies how a child process exited; normally (with an exit code), or
 -- | due to a signal.
@@ -156,45 +153,43 @@ mkExit code signal =
   fromCode = toMaybe >>> map Normally
   fromSignal = toMaybe >=> Signal.fromString >>> map BySignal
 
-onExit :: forall eff. ChildProcess -> (Exit -> Eff eff Unit) -> Eff eff Unit
+onExit :: ChildProcess -> (Exit -> Effect Unit) -> Effect Unit
 onExit = mkOnExit mkExit
 
 foreign import mkOnExit
-  :: forall eff
-   . (Nullable Int -> Nullable String -> Exit)
+  :: (Nullable Int -> Nullable String -> Exit)
   -> ChildProcess
-  -> (Exit -> Eff eff Unit)
-  -> Eff eff Unit
+  -> (Exit -> Effect Unit)
+  -> Effect Unit
 
-onClose :: forall eff. ChildProcess -> (Exit -> Eff eff Unit) -> Eff eff Unit
+onClose :: ChildProcess -> (Exit -> Effect Unit) -> Effect Unit
 onClose = mkOnClose mkExit
 
 foreign import mkOnClose
-  :: forall eff
-   . (Nullable Int -> Nullable String -> Exit)
+  :: (Nullable Int -> Nullable String -> Exit)
   -> ChildProcess
-  -> (Exit -> Eff eff Unit)
-  -> Eff eff Unit
+  -> (Exit -> Effect Unit)
+  -> Effect Unit
 
-onMessage :: forall eff. ChildProcess -> (Foreign -> Maybe Handle -> Eff eff Unit) -> Eff eff Unit
+onMessage :: ChildProcess -> (Foreign -> Maybe Handle -> Effect Unit) -> Effect Unit
 onMessage = mkOnMessage Nothing Just
 
 foreign import mkOnMessage
-  :: forall a eff
+  :: forall a
    . Maybe a
   -> (a -> Maybe a)
   -> ChildProcess
-  -> (Foreign -> Maybe Handle -> Eff eff Unit)
-  -> Eff eff Unit
+  -> (Foreign -> Maybe Handle -> Effect Unit)
+  -> Effect Unit
 
-foreign import onDisconnect :: forall eff. ChildProcess -> Eff eff Unit -> Eff eff Unit
-foreign import onError :: forall eff. ChildProcess -> (Error -> Eff eff Unit) -> Eff eff Unit
+foreign import onDisconnect :: ChildProcess -> Effect Unit -> Effect Unit
+foreign import onError :: ChildProcess -> (Error -> Effect Unit) -> Effect Unit
 
 -- | Spawn a child process. Note that, in the event that a child process could
 -- | not be spawned (for example, if the executable was not found) this will
 -- | not throw an error. Instead, the `ChildProcess` will be created anyway,
 -- | but it will immediately emit an 'error' event.
-spawn :: forall eff. String -> Array String -> SpawnOptions -> Eff (cp :: CHILD_PROCESS | eff) ChildProcess
+spawn :: String -> Array String -> SpawnOptions -> Effect ChildProcess
 spawn cmd args = spawnImpl cmd args <<< convertOpts
   where
   convertOpts opts =
@@ -206,15 +201,15 @@ spawn cmd args = spawnImpl cmd args <<< convertOpts
     , gid: fromMaybe undefined opts.gid
     }
 
-foreign import spawnImpl :: forall opts eff. String -> Array String -> { | opts } -> Eff (cp :: CHILD_PROCESS | eff) ChildProcess
+foreign import spawnImpl :: forall opts. String -> Array String -> { | opts } -> Effect ChildProcess
 
 -- There's gotta be a better way.
 foreign import undefined :: forall a. a
 
 type SpawnOptions =
   { cwd :: Maybe String
   , stdio :: Array (Maybe StdIOBehaviour)
-  , env :: Maybe (StrMap String)
+  , env :: Maybe (Object String)
   , detached :: Boolean
   , uid :: Maybe Uid
   , gid :: Maybe Gid
@@ -238,11 +233,10 @@ defaultSpawnOptions =
 -- | Note that the child process will be killed if the amount of output exceeds
 -- | a certain threshold (the default is defined by Node.js).
 exec
-  :: forall eff
-   . String
+  :: String
   -> ExecOptions
-  -> (ExecResult -> Eff (cp :: CHILD_PROCESS | eff) Unit)
-  -> Eff (cp :: CHILD_PROCESS | eff) Unit
+  -> (ExecResult -> Effect Unit)
+  -> Effect Unit
 exec cmd opts callback =
   execImpl cmd (convertExecOptions opts) \err stdout' stderr' ->
     callback
@@ -252,21 +246,19 @@ exec cmd opts callback =
       }
 
 foreign import execImpl
-  :: forall eff
-   . String
+  :: String
   -> ActualExecOptions
-  -> (Nullable Exception.Error -> Buffer -> Buffer -> Eff (cp :: CHILD_PROCESS | eff) Unit)
-  -> Eff (cp :: CHILD_PROCESS | eff) Unit
+  -> (Nullable Exception.Error -> Buffer -> Buffer -> Effect Unit)
+  -> Effect Unit
 
 -- | Like `exec`, except instead of using a shell, it passes the arguments
 -- | directly to the specified command.
 execFile
-  :: forall eff
-   .  String
+  :: String
   -> Array String
   -> ExecOptions
-  -> (ExecResult -> Eff (cp :: CHILD_PROCESS | eff) Unit)
-  -> Eff (cp :: CHILD_PROCESS | eff) Unit
+  -> (ExecResult -> Effect Unit)
+  -> Effect Unit
 execFile cmd args opts callback =
   execFileImpl cmd args (convertExecOptions opts) \err stdout' stderr' ->
     callback
@@ -276,12 +268,11 @@ execFile cmd args opts callback =
       }
 
 foreign import execFileImpl
-  :: forall eff
-   . String
+  :: String
   -> Array String
   -> ActualExecOptions
-  -> (Nullable Exception.Error -> Buffer -> Buffer -> Eff (cp :: CHILD_PROCESS | eff) Unit)
-  -> Eff (cp :: CHILD_PROCESS | eff) Unit
+  -> (Nullable Exception.Error -> Buffer -> Buffer -> Effect Unit)
+  -> Effect Unit
 
 foreign import data ActualExecOptions :: Type
 
@@ -298,7 +289,7 @@ convertExecOptions opts = unsafeCoerce
 
 type ExecOptions =
   { cwd :: Maybe String
-  , env :: Maybe (StrMap String)
+  , env :: Maybe (Object String)
   , timeout :: Maybe Number
   , maxBuffer :: Maybe Int
   , killSignal :: Maybe Signal
@@ -326,7 +317,7 @@ type ExecResult =
 -- | A special case of `spawn` for creating Node.js child processes. The first
 -- | argument is the module to be run, and the second is the argv (command line
 -- | arguments).
-foreign import fork :: forall eff. String -> Array String -> Eff (cp :: CHILD_PROCESS | eff) ChildProcess
+foreign import fork :: String -> Array String -> Effect ChildProcess
 
 -- | An error which occurred inside a child process.
 type Error =
@@ -336,7 +327,7 @@ type Error =
   }
 
 -- | Convert a ChildProcess.Error to a standard Error, which can then be thrown
--- | inside an Eff or Aff computation (for example).
+-- | inside an Effect or Aff computation (for example).
 toStandardError :: Error -> Exception.Error
 toStandardError = unsafeCoerce
 
@@ -355,7 +346,7 @@ toStandardError = unsafeCoerce
 data StdIOBehaviour
   = Pipe
   | Ignore
-  | ShareStream (forall r eff. Stream r eff)
+  | ShareStream (forall r. Stream r)
   | ShareFD FS.FileDescriptor
 
 -- | Create pipes for each of the three standard IO streams.
diff --git a/test/Main.purs b/test/Main.purs
@@ -2,20 +2,17 @@ module Test.Main where
 
 import Prelude
 
-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 Data.Posix.Signal (Signal(..))
 
 import Node.Buffer as Buffer
-import Node.ChildProcess (CHILD_PROCESS, Exit(..), defaultExecOptions, exec, onError, defaultSpawnOptions, spawn, stdout, onExit, kill)
+import Node.ChildProcess (Exit(..), defaultExecOptions, exec, onError, defaultSpawnOptions, spawn, stdout, onExit, kill)
 import Node.Encoding (Encoding(UTF8))
 import Node.Stream (onData)
 
-type TestEff = Eff (cp :: CHILD_PROCESS, console :: CONSOLE, exception :: EXCEPTION, buffer :: Buffer.BUFFER) Unit
-
-main :: TestEff
+main :: Effect Unit
 main = do
   log "spawns processes ok"
   spawnLs
@@ -47,28 +44,19 @@ main = do
   log "exec"
   execLs
 
-spawnLs :: TestEff
+spawnLs :: Effect Unit
 spawnLs = do
   ls <- spawn "ls" ["-la"] defaultSpawnOptions
   onExit ls \exit ->
       log $ "ls exited: " <> show exit
   onData (stdout ls) (Buffer.toString UTF8 >=> log)
 
-nonExistentExecutable
-  :: forall eff
-   . Eff ( console :: CONSOLE
-         , cp :: CHILD_PROCESS
-         | eff
-         ) Unit
-  -> Eff ( cp :: CHILD_PROCESS
-         , console :: CONSOLE
-         | eff
-         ) Unit
+nonExistentExecutable :: Effect Unit -> Effect Unit
 nonExistentExecutable done = do
   ch <- spawn "this-does-not-exist" [] defaultSpawnOptions
   onError ch (\err -> log err.code *> done)
 
-execLs :: TestEff
+execLs :: Effect Unit
 execLs = do
   exec "ls >&2" defaultExecOptions \r ->
     log "redirected to stderr:" *> (Buffer.toString UTF8 r.stderr >>= log)
