Move FFI declarations into their own files, for 0.7

Author: hdgarrood

src/Node/FS/Async.js

@@ -0,0 +1,17 @@
+/* global require */
+/* global exports */
+"use strict";
+
+// module Node.FS.Async
+
+exports.fs = require('fs');
+
+exports.handleCallbackImpl = function (left, right, f) {
+  return function (err, value) {
+    if (err) {
+      f(left(err))();
+    } else {
+      f(right(value))();
+    }
+  };
+};

src/Node/FS/Async.purs

@@ -45,21 +45,16 @@ foreign import data Nullable :: * -> *
 
 type JSCallback a = Fn2 (Nullable Error) a Unit
 
-foreign import handleCallbackImpl
-  "function handleCallbackImpl(left, right, f) {\
-  \  return function(err, value) {\
-  \    if (err) f(left(err))();\
-  \    else f(right(value))();\
-  \  };\
-  \}" :: forall eff a. Fn3 (Error -> Either Error a)
-                           (a -> Either Error a)
-                           (Callback eff a)
-                           (JSCallback a)
+foreign import handleCallbackImpl ::
+  forall eff a. Fn3 (Error -> Either Error a)
+                    (a -> Either Error a)
+                    (Callback eff a)
+                    (JSCallback a)
 
 handleCallback :: forall eff a b. (Callback eff a) -> JSCallback a
 handleCallback cb = runFn3 handleCallbackImpl Left Right cb
 
-foreign import fs "var fs = require('fs');" ::
+foreign import fs ::
   { rename :: Fn3 FilePath FilePath (JSCallback Unit) Unit
   , truncate :: Fn3 FilePath Number (JSCallback Unit) Unit
   , chown :: Fn4 FilePath Number Number (JSCallback Unit) Unit
@@ -72,19 +67,14 @@ foreign import fs "var fs = require('fs');" ::
   , unlink :: Fn2 FilePath (JSCallback Unit) Unit
   , rmdir :: Fn2 FilePath (JSCallback Unit) Unit
   , mkdir :: Fn3 FilePath String (JSCallback Unit) Unit
-  , readdir :: Fn2 FilePath (JSCallback [FilePath]) Unit
+  , readdir :: Fn2 FilePath (JSCallback (Array FilePath)) Unit
   , utimes :: Fn4 FilePath Number Number (JSCallback Unit) Unit
   , readFile :: forall a opts. Fn3 FilePath { | opts } (JSCallback a) Unit
   , writeFile :: forall a opts. Fn4 FilePath a { | opts } (JSCallback Unit) Unit
   , appendFile :: forall a opts. Fn4 FilePath a { | opts } (JSCallback Unit) Unit
   , exists :: forall a. Fn2 FilePath (Boolean -> a) Unit
   }
 
-foreign import mkEff
-  "function mkEff(action) {\
-  \  return action;\
-  \}" :: forall eff a. (Unit -> a) -> Eff eff a
-
 -- |
 -- Type synonym for callback functions.
 --
@@ -97,8 +87,7 @@ rename :: forall eff. FilePath
                    -> FilePath
                    -> Callback eff Unit
                    -> Eff (fs :: FS | eff) Unit
-
-rename oldFile newFile cb = mkEff $ \_ -> runFn3
+rename oldFile newFile cb = return $ runFn3
   fs.rename oldFile newFile (handleCallback cb)
 
 -- |
@@ -109,7 +98,7 @@ truncate :: forall eff. FilePath
                      -> Callback eff Unit
                      -> Eff (fs :: FS | eff) Unit
 
-truncate file len cb = mkEff $ \_ -> runFn3
+truncate file len cb = return $ runFn3
   fs.truncate file len (handleCallback cb)
 
 -- |
@@ -121,7 +110,7 @@ chown :: forall eff. FilePath
                   -> Callback eff Unit
                   -> Eff (fs :: FS | eff) Unit
 
-chown file uid gid cb = mkEff $ \_ -> runFn4
+chown file uid gid cb = return $ runFn4
   fs.chown file uid gid (handleCallback cb)
 
 -- |
@@ -132,7 +121,7 @@ chmod :: forall eff. FilePath
                   -> Callback eff Unit
                   -> Eff (fs :: FS | eff) Unit
 
-chmod file perms cb = mkEff $ \_ -> runFn3
+chmod file perms cb = return $ runFn3
   fs.chmod file (permsToString perms) (handleCallback cb)
 
 -- |
@@ -142,7 +131,7 @@ stat :: forall eff. FilePath
                  -> Callback eff Stats
                  -> Eff (fs :: FS | eff) Unit
 
-stat file cb = mkEff $ \_ -> runFn2
+stat file cb = return $ runFn2
   fs.stat file (handleCallback $ cb <<< (<$>) Stats)
 
 -- |
@@ -153,7 +142,7 @@ link :: forall eff. FilePath
                  -> Callback eff Unit
                  -> Eff (fs :: FS | eff) Unit
 
-link src dst cb = mkEff $ \_ -> runFn3
+link src dst cb = return $ runFn3
   fs.link src dst (handleCallback cb)
 
 -- |
@@ -165,7 +154,7 @@ symlink :: forall eff. FilePath
                     -> Callback eff Unit
                     -> Eff (fs :: FS | eff) Unit
 
-symlink src dest ty cb = mkEff $ \_ -> runFn4
+symlink src dest ty cb = return $ runFn4
   fs.symlink src dest (show ty) (handleCallback cb)
 
 -- |
@@ -175,7 +164,7 @@ readlink :: forall eff. FilePath
                      -> Callback eff FilePath
                      -> Eff (fs :: FS | eff) Unit
 
-readlink path cb = mkEff $ \_ -> runFn2
+readlink path cb = return $ runFn2
   fs.readlink path (handleCallback cb)
 
 -- |
@@ -185,7 +174,7 @@ realpath :: forall eff. FilePath
                      -> Callback eff FilePath
                      -> Eff (fs :: FS | eff) Unit
 
-realpath path cb = mkEff $ \_ -> runFn3
+realpath path cb = return $ runFn3
   fs.realpath path {} (handleCallback cb)
 
 -- |
@@ -197,7 +186,7 @@ realpath' :: forall eff cache. FilePath
                             -> Callback eff FilePath
                             -> Eff (fs :: FS | eff) Unit
 
-realpath' path cache cb = mkEff $ \_ -> runFn3
+realpath' path cache cb = return $ runFn3
   fs.realpath path cache (handleCallback cb)
 
 -- |
@@ -207,7 +196,7 @@ unlink :: forall eff. FilePath
                    -> Callback eff Unit
                    -> Eff (fs :: FS | eff) Unit
 
-unlink file cb = mkEff $ \_ -> runFn2
+unlink file cb = return $ runFn2
   fs.unlink file (handleCallback cb)
 
 -- |
@@ -217,7 +206,7 @@ rmdir :: forall eff. FilePath
                    -> Callback eff Unit
                    -> Eff (fs :: FS | eff) Unit
 
-rmdir file cb = mkEff $ \_ -> runFn2
+rmdir file cb = return $ runFn2
   fs.rmdir file (handleCallback cb)
 
 -- |
@@ -237,17 +226,17 @@ mkdir' :: forall eff. FilePath
                    -> Callback eff Unit
                    -> Eff (fs :: FS | eff) Unit
 
-mkdir' file perms cb = mkEff $ \_ -> runFn3
+mkdir' file perms cb = return $ runFn3
   fs.mkdir file (permsToString perms) (handleCallback cb)
 
 -- |
 -- Reads the contents of a directory.
 --
 readdir :: forall eff. FilePath
-                    -> Callback eff [FilePath]
+                    -> Callback eff (Array FilePath)
                     -> Eff (fs :: FS | eff) Unit
 
-readdir file cb = mkEff $ \_ -> runFn2
+readdir file cb = return $ runFn2
   fs.readdir file (handleCallback cb)
 
 -- |
@@ -259,7 +248,7 @@ utimes :: forall eff. FilePath
                    -> Callback eff Unit
                    -> Eff (fs :: FS | eff) Unit
 
-utimes file atime mtime cb = mkEff $ \_ -> runFn4
+utimes file atime mtime cb = return $ runFn4
   fs.utimes file
             (ms (toEpochMilliseconds atime) / 1000)
             (ms (toEpochMilliseconds mtime) / 1000)
@@ -274,7 +263,7 @@ readFile :: forall eff. FilePath
                      -> Callback eff Buffer
                      -> Eff (fs :: FS | eff) Unit
 
-readFile file cb = mkEff $ \_ -> runFn3
+readFile file cb = return $ runFn3
   fs.readFile file {} (handleCallback cb)
 
 -- |
@@ -285,7 +274,7 @@ readTextFile :: forall eff. Encoding
                          -> Callback eff String
                          -> Eff (fs :: FS | eff) Unit
 
-readTextFile encoding file cb = mkEff $ \_ -> runFn3
+readTextFile encoding file cb = return $ runFn3
   fs.readFile file { encoding: show encoding } (handleCallback cb)
 
 -- |
@@ -296,7 +285,7 @@ writeFile :: forall eff. FilePath
                       -> Callback eff Unit
                       -> Eff (fs :: FS | eff) Unit
 
-writeFile file buff cb = mkEff $ \_ -> runFn4
+writeFile file buff cb = return $ runFn4
   fs.writeFile file buff {} (handleCallback cb)
 
 -- |
@@ -308,7 +297,7 @@ writeTextFile :: forall eff. Encoding
                           -> Callback eff Unit
                           -> Eff (fs :: FS | eff) Unit
 
-writeTextFile encoding file buff cb = mkEff $ \_ -> runFn4
+writeTextFile encoding file buff cb = return $ runFn4
   fs.writeFile file buff { encoding: show encoding } (handleCallback cb)
 
 -- |
@@ -319,7 +308,7 @@ appendFile :: forall eff. FilePath
                        -> Callback eff Unit
                        -> Eff (fs :: FS | eff) Unit
 
-appendFile file buff cb = mkEff $ \_ -> runFn4
+appendFile file buff cb = return $ runFn4
   fs.appendFile file buff {} (handleCallback cb)
 
 -- |
@@ -331,7 +320,7 @@ appendTextFile :: forall eff. Encoding
                            -> Callback eff Unit
                            -> Eff (fs :: FS | eff) Unit
 
-appendTextFile encoding file buff cb = mkEff $ \_ -> runFn4
+appendTextFile encoding file buff cb = return $ runFn4
   fs.appendFile file buff { encoding: show encoding } (handleCallback cb)
 
 -- |
@@ -340,5 +329,5 @@ appendTextFile encoding file buff cb = mkEff $ \_ -> runFn4
 exists :: forall eff. FilePath
                    -> (Boolean -> Eff eff Unit)
                    -> Eff (fs :: FS | eff) Unit
-exists file cb = mkEff $ \_ -> runFn2
+exists file cb = return $ runFn2
   fs.exists file $ \b -> runPure (unsafeInterleaveEff (cb b))

src/Node/FS/Stats.js

@@ -0,0 +1,11 @@
+/* global require */
+/* global exports */
+"use strict";
+
+// module Node.FS.Stats
+
+exports.showStatsObj = require('util').inspect;
+
+exports.statsMethod = function (m, s) {
+  return s[m]();
+}

src/Node/FS/Stats.purs

@@ -42,18 +42,12 @@ type StatsObj =
 --
 data Stats = Stats StatsObj
 
-foreign import showStatsObj
-  "function showStatsObj (obj) {\
-  \  return require('util').inspect(obj);\
-  \}" :: StatsObj -> String
+foreign import showStatsObj :: StatsObj -> String
 
 instance showStats :: Show Stats where
   show (Stats o) = "Stats " ++ showStatsObj o
 
-foreign import statsMethod
-  "function statsMethod(m, s) {\
-  \  return s[m]();\
-  \}" :: Fn2 String StatsObj Boolean
+foreign import statsMethod :: Fn2 String StatsObj Boolean
 
 isFile :: Stats -> Boolean
 isFile (Stats s) = runFn2 statsMethod "isFile" s

src/Node/FS/Sync.js

@@ -0,0 +1,22 @@
+/* global require */
+/* global exports */
+"use strict";
+
+// module Node.FS.Sync
+
+var fs = require('fs');
+exports.fs = fs;
+
+exports.handleCallbackImpl = function (left, right, f) {
+  return function (err, value) {
+    if (err) {
+      f(left(err))();
+    } else {
+      f(right(value))();
+    }
+  };
+};
+
+exports.createSync = fs.openSync;
+exports.writeSeqSync = fs.writeSync;
+exports.readSeqSync = fs.readSync;