Update to node-buffer ^0.2.0

Author: hdgarrood

bower.json

@@ -18,11 +18,14 @@
     "purescript-datetime": "^0.9.0",
     "purescript-exceptions": "^0.3.0",
     "purescript-foreign": "^0.7.0",
-    "purescript-node-buffer": "^0.1.0",
+    "purescript-node-buffer": "^0.2.0",
     "purescript-node-path": "^0.4.0",
     "purescript-unsafe-coerce": "^0.1.0",
     "purescript-nullable": "~0.2.1"
   },
+  "devDependencies": {
+    "purescript-console": "~0.1.1"
+  },
   "repository": {
     "type": "git",
     "url": "git://github.com/purescript-node/purescript-node-fs"

src/Node/FS/Async.purs

@@ -41,7 +41,7 @@ import Data.Either
 import Data.Function
 import Data.Maybe
 import Data.Nullable
-import Node.Buffer (Buffer(), size)
+import Node.Buffer (Buffer(), BUFFER(), size)
 import Data.Int (round)
 import Data.Maybe.Unsafe (fromJust)
 import Node.Encoding
@@ -273,8 +273,8 @@ utimes file atime mtime cb = mkEff $ \_ -> runFn4
 -- Reads the entire contents of a file returning the result as a raw buffer.
 --
 readFile :: forall eff. FilePath
-                     -> Callback eff Buffer
-                     -> Eff (fs :: FS | eff) Unit
+                     -> Callback (buffer :: BUFFER | eff) Buffer
+                     -> Eff (buffer :: BUFFER, fs :: FS | eff) Unit
 
 readFile file cb = mkEff $ \_ -> runFn3
   fs.readFile file {} (handleCallback cb)
@@ -295,8 +295,8 @@ readTextFile encoding file cb = mkEff $ \_ -> runFn3
 --
 writeFile :: forall eff. FilePath
                       -> Buffer
-                      -> Callback eff Unit
-                      -> Eff (fs :: FS | eff) Unit
+                      -> Callback (buffer :: BUFFER | eff) Unit
+                      -> Eff (buffer :: BUFFER, fs :: FS | eff) Unit
 
 writeFile file buff cb = mkEff $ \_ -> runFn4
   fs.writeFile file buff {} (handleCallback cb)
@@ -318,8 +318,8 @@ writeTextFile encoding file buff cb = mkEff $ \_ -> runFn4
 --
 appendFile :: forall eff. FilePath
                        -> Buffer
-                       -> Callback eff Unit
-                       -> Eff (fs :: FS | eff) Unit
+                       -> Callback (buffer :: BUFFER | eff) Unit
+                       -> Eff (buffer :: BUFFER, fs :: FS | eff) Unit
 
 appendFile file buff cb = mkEff $ \_ -> runFn4
   fs.appendFile file buff {} (handleCallback cb)
@@ -372,8 +372,8 @@ fdRead :: forall eff.
        -> BufferOffset
        -> BufferLength
        -> Maybe FilePosition
-       -> Callback eff ByteCount
-       -> Eff (fs :: FS | eff) Unit
+       -> Callback (buffer :: BUFFER | eff) ByteCount
+       -> Eff (buffer :: BUFFER, fs :: FS | eff) Unit
 fdRead fd buff off len pos cb =  mkEff $ \_ -> runFn6 fs.read fd buff off len (toNullable pos) (handleCallback cb)
 
 --|
@@ -383,9 +383,11 @@ fdRead fd buff off len pos cb =  mkEff $ \_ -> runFn6 fs.read fd buff off len (t
 fdNext :: forall eff.
           FileDescriptor
        -> Buffer
-       -> Callback eff ByteCount
-       -> Eff (fs :: FS | eff) Unit
-fdNext fd buff cb = fdRead fd buff 0 (size buff) Nothing cb
+       -> Callback (buffer :: BUFFER | eff) ByteCount
+       -> Eff (buffer :: BUFFER, fs :: FS | eff) Unit
+fdNext fd buff cb = do
+  sz <- size buff
+  fdRead fd buff 0 sz Nothing cb
 
 --|
 -- Write to a file asynchronously.  See <a
@@ -398,8 +400,8 @@ fdWrite :: forall eff.
         -> BufferOffset
         -> BufferLength
         -> Maybe FilePosition
-        -> Callback eff ByteCount
-        -> Eff (fs :: FS | eff) Unit
+        -> Callback (buffer :: BUFFER | eff) ByteCount
+        -> Eff (buffer :: BUFFER, fs :: FS | eff) Unit
 fdWrite fd buff off len pos cb = mkEff $ \_ -> runFn6 fs.write fd buff off len (toNullable pos) (handleCallback cb)
 
 --|
@@ -409,9 +411,11 @@ fdWrite fd buff off len pos cb = mkEff $ \_ -> runFn6 fs.write fd buff off len (
 fdAppend :: forall eff.
             FileDescriptor
          -> Buffer
-         -> Callback eff ByteCount
-         -> Eff (fs :: FS | eff) Unit
-fdAppend fd buff cb = fdWrite fd buff 0 (size buff) Nothing cb
+         -> Callback (buffer :: BUFFER | eff) ByteCount
+         -> Eff (buffer :: BUFFER, fs :: FS | eff) Unit
+fdAppend fd buff cb = do
+  sz <- size buff
+  fdWrite fd buff 0 sz Nothing cb
 
 --|
 -- Close a file asynchronously.  See <a

src/Node/FS/Sync.purs

@@ -40,7 +40,7 @@ import Data.Either
 import Data.Function
 import Data.Int (round)
 import Data.Maybe (Maybe(..))
-import Node.Buffer (Buffer(), size)
+import Node.Buffer (Buffer(), BUFFER(), size)
 import Node.Encoding
 import Node.FS
 import Node.FS.Stats
@@ -265,7 +265,7 @@ readTextFile encoding file = mkEff $ \_ -> runFn2
 --
 writeFile :: forall eff. FilePath
                       -> Buffer
-                      -> Eff (fs :: FS, err :: EXCEPTION | eff) Unit
+                      -> Eff (buffer :: BUFFER, fs :: FS, err :: EXCEPTION | eff) Unit
 
 writeFile file buff = mkEff $ \_ -> runFn3
   fs.writeFileSync file buff {}
@@ -286,7 +286,7 @@ writeTextFile encoding file text = mkEff $ \_ -> runFn3
 --
 appendFile :: forall eff. FilePath
                        -> Buffer
-                       -> Eff (fs :: FS, err :: EXCEPTION | eff) Unit
+                       -> Eff (buffer :: BUFFER, fs :: FS, err :: EXCEPTION | eff) Unit
 
 appendFile file buff = mkEff $ \_ -> runFn3
   fs.appendFileSync file buff {}
@@ -337,7 +337,7 @@ fdRead :: forall eff.
        -> BufferOffset
        -> BufferLength
        -> Maybe FilePosition
-       -> Eff (err :: EXCEPTION, fs :: FS | eff) ByteCount
+       -> Eff (buffer :: BUFFER, err :: EXCEPTION, fs :: FS | eff) ByteCount
 fdRead fd buff off len Nothing =
   mkEff $ \_ -> runFn4 readSeqSync fd buff off len
 fdRead fd buff off len (Just pos) =
@@ -350,8 +350,10 @@ fdRead fd buff off len (Just pos) =
 fdNext :: forall eff.
           FileDescriptor
        -> Buffer
-       -> Eff (err :: EXCEPTION, fs :: FS | eff) ByteCount
-fdNext fd buff = fdRead fd buff 0 (size buff) Nothing
+       -> Eff (buffer :: BUFFER, err :: EXCEPTION, fs :: FS | eff) ByteCount
+fdNext fd buff = do
+  sz <- size buff
+  fdRead fd buff 0 sz Nothing
 
 --|
 -- Write to a file synchronously.  See <a
@@ -364,7 +366,7 @@ fdWrite :: forall eff.
         -> BufferOffset
         -> BufferLength
         -> Maybe FilePosition
-        -> Eff (err :: EXCEPTION, fs :: FS | eff) ByteCount
+        -> Eff (buffer :: BUFFER, err :: EXCEPTION, fs :: FS | eff) ByteCount
 fdWrite fd buff off len Nothing =
   mkEff $ \_ -> runFn4 writeSeqSync fd buff off len
 fdWrite fd buff off len (Just pos) =
@@ -377,8 +379,10 @@ fdWrite fd buff off len (Just pos) =
 fdAppend :: forall eff.
             FileDescriptor
          -> Buffer
-         -> Eff (err :: EXCEPTION, fs :: FS | eff) ByteCount
-fdAppend fd buff = fdWrite fd buff 0 (size buff) Nothing
+         -> Eff (buffer :: BUFFER, err :: EXCEPTION, fs :: FS | eff) ByteCount
+fdAppend fd buff = do
+  sz <- size buff
+  fdWrite fd buff 0 sz Nothing
 
 --|
 -- Flush a file synchronously.  See <a