Update to purescript 0.7

Author: paf31

.gitignore

@@ -1,3 +1,4 @@
+.psci_modules
 *.sw[mnopqrstuv]
 *.un~
 .psci

README.md

@@ -1,9 +1,6 @@
-# Module Documentation
-
 ## Module Node.FS.Aff
 
 
-
 [Node.FS][Node.FS] Wrappers for [purescript-aff][aff]
 
 The `Aff` monad let's you write async code with ease.
@@ -18,7 +15,7 @@ main = launchAff do
     return $
          FS.isDirectory stat
       && (maybe false (fromChar >>> (/= ".")) $ charAt 0 file)
-  liftEff $ Debug.Trace.trace $ show files'
+  liftEff $ print files'
 ```
 
 That was easy. For a working example, see [example.purs][example].
@@ -31,7 +28,7 @@ To build the example, run `gulp example`.
 #### `rename`
 
 ``` purescript
-rename :: forall eff. FilePath -> FilePath -> Aff (fs :: F.FS | eff) Unit
+rename :: forall eff. FilePath -> FilePath -> Aff (fs :: FS | eff) Unit
 ```
 
 
@@ -41,7 +38,7 @@ Rename a file.
 #### `truncate`
 
 ``` purescript
-truncate :: forall eff. FilePath -> Number -> Aff (fs :: F.FS | eff) Unit
+truncate :: forall eff. FilePath -> Number -> Aff (fs :: FS | eff) Unit
 ```
 
 
@@ -51,7 +48,7 @@ Truncates a file to the specified length.
 #### `chown`
 
 ``` purescript
-chown :: forall eff. FilePath -> Number -> Number -> Aff (fs :: F.FS | eff) Unit
+chown :: forall eff. FilePath -> Number -> Number -> Aff (fs :: FS | eff) Unit
 ```
 
 
@@ -61,7 +58,7 @@ Changes the ownership of a file.
 #### `chmod`
 
 ``` purescript
-chmod :: forall eff. FilePath -> Perms -> Aff (fs :: F.FS | eff) Unit
+chmod :: forall eff. FilePath -> Perms -> Aff (fs :: FS | eff) Unit
 ```
 
 
@@ -71,7 +68,7 @@ Changes the permissions of a file.
 #### `stat`
 
 ``` purescript
-stat :: forall eff. FilePath -> Aff (fs :: F.FS | eff) Stats
+stat :: forall eff. FilePath -> Aff (fs :: FS | eff) Stats
 ```
 
 
@@ -81,7 +78,7 @@ Gets file statistics.
 #### `link`
 
 ``` purescript
-link :: forall eff. FilePath -> FilePath -> Aff (fs :: F.FS | eff) Unit
+link :: forall eff. FilePath -> FilePath -> Aff (fs :: FS | eff) Unit
 ```
 
 
@@ -91,7 +88,7 @@ Creates a link to an existing file.
 #### `symlink`
 
 ``` purescript
-symlink :: forall eff. FilePath -> FilePath -> F.SymlinkType -> Aff (fs :: F.FS | eff) Unit
+symlink :: forall eff. FilePath -> FilePath -> SymlinkType -> Aff (fs :: FS | eff) Unit
 ```
 
 
@@ -101,7 +98,7 @@ Creates a symlink.
 #### `readlink`
 
 ``` purescript
-readlink :: forall eff. FilePath -> Aff (fs :: F.FS | eff) FilePath
+readlink :: forall eff. FilePath -> Aff (fs :: FS | eff) FilePath
 ```
 
 
@@ -111,7 +108,7 @@ Reads the value of a symlink.
 #### `realpath`
 
 ``` purescript
-realpath :: forall eff. FilePath -> Aff (fs :: F.FS | eff) FilePath
+realpath :: forall eff. FilePath -> Aff (fs :: FS | eff) FilePath
 ```
 
 
@@ -121,7 +118,7 @@ Find the canonicalized absolute location for a path.
 #### `realpath'`
 
 ``` purescript
-realpath' :: forall eff cache. FilePath -> {  | cache } -> Aff (fs :: F.FS | eff) FilePath
+realpath' :: forall eff cache. FilePath -> {  | cache } -> Aff (fs :: FS | eff) FilePath
 ```
 
 
@@ -132,7 +129,7 @@ for already resolved paths.
 #### `unlink`
 
 ``` purescript
-unlink :: forall eff. FilePath -> Aff (fs :: F.FS | eff) Unit
+unlink :: forall eff. FilePath -> Aff (fs :: FS | eff) Unit
 ```
 
 
@@ -142,7 +139,7 @@ Deletes a file.
 #### `rmdir`
 
 ``` purescript
-rmdir :: forall eff. FilePath -> Aff (fs :: F.FS | eff) Unit
+rmdir :: forall eff. FilePath -> Aff (fs :: FS | eff) Unit
 ```
 
 
@@ -152,7 +149,7 @@ Deletes a directory.
 #### `mkdir`
 
 ``` purescript
-mkdir :: forall eff. FilePath -> Aff (fs :: F.FS | eff) Unit
+mkdir :: forall eff. FilePath -> Aff (fs :: FS | eff) Unit
 ```
 
 
@@ -162,7 +159,7 @@ Makes a new directory.
 #### `mkdir'`
 
 ``` purescript
-mkdir' :: forall eff. FilePath -> Perms -> Aff (fs :: F.FS | eff) Unit
+mkdir' :: forall eff. FilePath -> Perms -> Aff (fs :: FS | eff) Unit
 ```
 
 
@@ -172,7 +169,7 @@ Makes a new directory with the specified permissions.
 #### `readdir`
 
 ``` purescript
-readdir :: forall eff. FilePath -> Aff (fs :: F.FS | eff) [FilePath]
+readdir :: forall eff. FilePath -> Aff (fs :: FS | eff) (Array FilePath)
 ```
 
 
@@ -182,7 +179,7 @@ Reads the contents of a directory.
 #### `utimes`
 
 ``` purescript
-utimes :: forall eff. FilePath -> Date -> Date -> Aff (fs :: F.FS | eff) Unit
+utimes :: forall eff. FilePath -> Date -> Date -> Aff (fs :: FS | eff) Unit
 ```
 
 
@@ -192,7 +189,7 @@ Sets the accessed and modified times for the specified file.
 #### `readFile`
 
 ``` purescript
-readFile :: forall eff. FilePath -> Aff (fs :: F.FS | eff) Buffer
+readFile :: forall eff. FilePath -> Aff (fs :: FS | eff) Buffer
 ```
 
 
@@ -202,7 +199,7 @@ Reads the entire contents of a file returning the result as a raw buffer.
 #### `readTextFile`
 
 ``` purescript
-readTextFile :: forall eff. Encoding -> FilePath -> Aff (fs :: F.FS | eff) String
+readTextFile :: forall eff. Encoding -> FilePath -> Aff (fs :: FS | eff) String
 ```
 
 
@@ -212,7 +209,7 @@ Reads the entire contents of a text file with the specified encoding.
 #### `writeFile`
 
 ``` purescript
-writeFile :: forall eff. FilePath -> Buffer -> Aff (fs :: F.FS | eff) Unit
+writeFile :: forall eff. FilePath -> Buffer -> Aff (fs :: FS | eff) Unit
 ```
 
 
@@ -222,7 +219,7 @@ Writes a buffer to a file.
 #### `writeTextFile`
 
 ``` purescript
-writeTextFile :: forall eff. Encoding -> FilePath -> String -> Aff (fs :: F.FS | eff) Unit
+writeTextFile :: forall eff. Encoding -> FilePath -> String -> Aff (fs :: FS | eff) Unit
 ```
 
 
@@ -232,7 +229,7 @@ Writes text to a file using the specified encoding.
 #### `appendFile`
 
 ``` purescript
-appendFile :: forall eff. FilePath -> Buffer -> Aff (fs :: F.FS | eff) Unit
+appendFile :: forall eff. FilePath -> Buffer -> Aff (fs :: FS | eff) Unit
 ```
 
 
@@ -242,7 +239,7 @@ Appends the contents of a buffer to a file.
 #### `appendTextFile`
 
 ``` purescript
-appendTextFile :: forall eff. Encoding -> FilePath -> String -> Aff (fs :: F.FS | eff) Unit
+appendTextFile :: forall eff. Encoding -> FilePath -> String -> Aff (fs :: FS | eff) Unit
 ```
 
 
@@ -252,12 +249,11 @@ Appends text to a file using the specified encoding.
 #### `exists`
 
 ``` purescript
-exists :: forall eff. String -> Aff (fs :: F.FS | eff) Boolean
+exists :: forall eff. String -> Aff (fs :: FS | eff) Boolean
 ```
 
 
 Check to see if a file exists.
 
 
 
-

bower.json

@@ -19,9 +19,9 @@
     "tests"
   ],
   "dependencies": {
-    "purescript-aff": "~0.10.1",
-    "purescript-node-fs": "~0.6.0",
-    "purescript-either": "~0.1.8",
-    "purescript-node-path": "~0.3.0"
+    "purescript-aff": "~0.11.0",
+    "purescript-node-fs": "~0.7.0",
+    "purescript-either": "~0.2.0",
+    "purescript-node-path": "~0.4.0"
   }
 }

example/example.purs

@@ -1,22 +1,24 @@
-module Example.Main where
+module Test.Main where
+
+import Prelude 
 
-import Control.Monad (filterM)
-import Control.Functor
-import Data.String (charAt, fromChar)
 import Data.Maybe
 import Data.Array
-import Control.Monad.Trans
+import Data.Functor
+import Data.String (charAt, fromChar)
+
 import Control.Monad.Aff
 import Control.Monad.Eff.Class (liftEff)
+import Control.Monad.Eff.Console
+
 import qualified Node.Path as Path
-import qualified Debug.Trace as T
 import qualified Node.FS.Aff as FS
 import qualified Node.FS as FS
 import qualified Node.FS.Stats as FS
 
-trace :: forall e a. (Show a) => a -> Aff (trace :: T.Trace | e) a
+trace :: forall e a. (Show a) => a -> Aff (console :: CONSOLE | e) a
 trace a = do
-  liftEff $ T.trace (show a)
+  liftEff $ log (show a)
   return a
 
 main = launchAff do
@@ -26,4 +28,4 @@ main = launchAff do
     return $
          FS.isDirectory stat
       && (maybe false (fromChar >>> (/= ".")) $ charAt 0 file)
-  liftEff $ Debug.Trace.trace $ show files'
+  liftEff $ log $ show files'

src/Node/FS/Aff.purs

@@ -13,7 +13,7 @@
 -- |     return $
 -- |          FS.isDirectory stat
 -- |       && (maybe false (fromChar >>> (/= ".")) $ charAt 0 file)
--- |   liftEff $ Debug.Trace.trace $ show files'
+-- |   liftEff $ print files'
 -- | ```
 -- |
 -- | That was easy. For a working example, see [example.purs][example].
@@ -24,9 +24,9 @@
 -- | [example]: http://github.com/purescript-node/purescript-node-fs-aff/blob/master/example/example.purs
 
 module Node.FS.Aff
-  ( rename
-  , truncate
-  , chown
+( rename
+, truncate
+, chown
   , chmod
   , stat
   , link
@@ -49,6 +49,8 @@ module Node.FS.Aff
   , exists
   ) where
 
+import Prelude
+
 import Node.Path (FilePath())
 import Node.FS.Perms (Perms())
 import Node.FS.Stats (Stats())
@@ -184,7 +186,7 @@ mkdir' = toAff2 A.mkdir'
 -- | Reads the contents of a directory.
 -- |
 readdir :: forall eff. FilePath
-                    -> Aff (fs :: F.FS | eff) [FilePath]
+                    -> Aff (fs :: F.FS | eff) (Array FilePath)
 readdir = toAff1 A.readdir
 
 -- |
@@ -245,24 +247,9 @@ appendTextFile :: forall eff. Encoding
                            -> Aff (fs :: F.FS | eff) Unit
 appendTextFile = toAff3 A.appendTextFile
 
--- |
--- Patch `Node.FS.Async.exists`
--- The current version of `Node.FS.Async.exists` fails the occurs check
--- because it's callback signature does not include the FS effect.
---
-import Data.Function
-foreign import mkEff
-  "function mkEff(action) {\
-  \  return action;\
-  \}" :: forall eff a. (Unit -> a) -> Eff eff a
-foreign import fs "var fs = require('fs');" ::
-  { exists :: forall a. Fn2 FilePath (Boolean -> a) Unit }
-_exists file cb = mkEff $ \_ -> runFn2
-  fs.exists file $ \b -> runPure (unsafeInterleaveEff (cb b))
-
 -- |
 -- | Check to see if a file exists.
 -- |
 exists :: forall eff. String
                    -> Aff (fs :: F.FS | eff) Boolean
-exists file = makeAff \_ a -> _exists file a
+exists file = makeAff \_ a -> A.exists file a