Update implementation for PureScript 0.7

Author: ethul

bower.json

@@ -2,15 +2,7 @@
   "name": "gulp-purescript",
   "private": true,
   "devDependencies": {
-    "purescript-foreign": "0.4.2",
-    "purescript-maybe": "0.2.2",
-    "purescript-either": "0.1.8",
-    "purescript-aff": "0.10.1",
-    "purescript-exceptions": "0.2.3",
-    "purescript-arrays": "0.3.7",
-    "purescript-transformers": "0.5.5",
-    "purescript-monad-eff": "0.1.0",
-    "purescript-tuples": "0.3.4",
-    "purescript-control": "0.2.6"
+    "purescript-aff": "~0.11.3",
+    "purescript-foreign": "~0.6.0"
   }
 }

package.json

@@ -17,9 +17,9 @@
   "scripts": {
     "test:run": "node test.js | tap-spec",
     "test": "npm run-script build && npm run-script test:run",
-    "build:bootstrap": "npm install [email protected]",
-    "build": "npm run-script build:bootstrap && npm run-script build:compile && npm run-script build:package",
-    "build:compile": "gulp build",
+    "build": "npm run-script build:compile && npm run-script build:docs && npm run-script build:package",
+    "build:compile": "./node_modules/.bin/pulp build",
+    "build:docs": "./node_modules/.bin/pulp docs",
     "build:package": "./node_modules/.bin/webpack --progress --colors --profile --bail",
     "build:json": "./node_modules/.bin/webpack --progress --colors --profile --bail --json > index.json",
     "prepublish": "npm run-script build"
@@ -44,6 +44,7 @@
     "gulp": "^3.8.11",
     "gulp-plumber": "^1.0.0",
     "json-loader": "^0.5.1",
+    "pulp": "^4.3.0",
     "rewire": "^2.3.1",
     "run-sequence": "^1.0.2",
     "tap-spec": "^2.2.2",

src/Buffer.js

@@ -0,0 +1,9 @@
+'use strict';
+
+// module GulpPurescript.Buffer
+
+function mkBufferFromString(str) {
+  return new Buffer(str);
+}
+
+exports.mkBufferFromString = mkBufferFromString;

src/Buffer.purs

@@ -5,8 +5,4 @@ module GulpPurescript.Buffer
 
 data Buffer
 
-foreign import mkBufferFromString """
-function mkBufferFromString(str) {
-  return new Buffer(str);
-}
-""" :: String -> Buffer
+foreign import mkBufferFromString :: String -> Buffer

src/ChildProcess.js

@@ -0,0 +1,30 @@
+'use strict';
+
+// module GulpPurescript.ChildProcess
+
+var child_process = require('cross-spawn');
+
+function spawnFn(command, args, errback, callback) {
+  return function(){
+    var process = child_process.spawn(command, args);
+
+    var stdout = new Buffer(0);
+
+    var stderr = new Buffer(0);
+
+    process.stdout.on('data', function(data){
+      stdout = Buffer.concat([stdout, new Buffer(data)]);
+    });
+
+    process.stderr.on('data', function(data){
+      stderr = Buffer.concat([stderr, new Buffer(data)]);
+    });
+
+    process.on('close', function(code){
+      if (code !== 0) errback(new Error(Buffer.concat([stdout, stderr]).toString()))();
+      else callback(stdout.toString())();
+    });
+  };
+}
+
+exports.spawnFn = spawnFn;

src/ChildProcess.purs

@@ -3,6 +3,8 @@ module GulpPurescript.ChildProcess
   , spawn
   ) where
 
+import Prelude
+
 import Control.Monad.Aff (Aff(), makeAff)
 import Control.Monad.Eff (Eff())
 import Control.Monad.Eff.Exception (Error())
@@ -11,36 +13,11 @@ import Data.Function
 
 foreign import data ChildProcess :: !
 
-spawn :: forall eff. String -> [String] -> Aff (cp :: ChildProcess | eff) String
+spawn :: forall eff. String -> Array String -> Aff (cp :: ChildProcess | eff) String
 spawn command args = makeAff $ runFn4 spawnFn command args
 
-foreign import spawnFn """
-function spawnFn(command, args, errback, callback) {
-  return function(){
-    var child_process = require('cross-spawn');
-
-    var process = child_process.spawn(command, args);
-
-    var stdout = new Buffer(0);
-
-    var stderr = new Buffer(0);
-
-    process.stdout.on('data', function(data){
-      stdout = Buffer.concat([stdout, new Buffer(data)]);
-    });
-
-    process.stderr.on('data', function(data){
-      stderr = Buffer.concat([stderr, new Buffer(data)]);
-    });
-
-    process.on('close', function(code){
-      if (code !== 0) errback(new Error(Buffer.concat([stdout, stderr]).toString()))();
-      else callback(stdout.toString())();
-    });
-  };
-}
-""" :: forall eff. Fn4 String
-                       [String]
-                       (Error -> Eff (cp :: ChildProcess | eff) Unit)
-                       (String -> Eff (cp :: ChildProcess | eff) Unit)
-                       (Eff (cp :: ChildProcess | eff) Unit)
+foreign import spawnFn :: forall eff. Fn4 String
+                                          (Array String)
+                                          (Error -> Eff (cp :: ChildProcess | eff) Unit)
+                                          (String -> Eff (cp :: ChildProcess | eff) Unit)
+                                          (Eff (cp :: ChildProcess | eff) Unit)

src/Glob.js

@@ -0,0 +1,29 @@
+'use strict';
+
+// module GulpPurescript.Glob
+
+var glob = require('glob');
+
+var async = require('async');
+
+function globFn(pattern, errback, callback) {
+  return function(){
+    glob(pattern, function(error, result){
+      if (error) errback(new Error(error))();
+      else callback(result)();
+    });
+  };
+}
+
+function globAllFn(patterns, errback, callback) {
+  return function(){
+    async.map(patterns, glob, function(error, result){
+      if (error) errback(new Error(error))();
+      else callback(result)();
+    });
+  };
+}
+
+exports.globFn = globFn;
+
+exports.globAllFn = globAllFn;

src/Glob.purs

@@ -4,6 +4,8 @@ module GulpPurescript.Glob
   , globAll
   ) where
 
+import Prelude
+
 import Control.Monad.Aff (Aff(), makeAff)
 import Control.Monad.Eff (Eff())
 import Control.Monad.Eff.Exception (Error())
@@ -12,42 +14,18 @@ import Data.Function
 
 foreign import data Glob :: !
 
-glob :: forall eff. String -> Aff (glob :: Glob | eff) [String]
+glob :: forall eff. String -> Aff (glob :: Glob | eff) (Array String)
 glob pattern = makeAff $ runFn3 globFn pattern
 
-foreign import globFn """
-function globFn(pattern, errback, callback) {
-  return function(){
-    var glob = require('glob');
-
-    glob(pattern, function(error, result){
-      if (error) errback(new Error(error))();
-      else callback(result)();
-    });
-  };
-}
-""" :: forall eff. Fn3 String
-                       (Error -> Eff (glob :: Glob | eff) Unit)
-                       ([String] -> Eff (glob :: Glob | eff) Unit)
-                       (Eff (glob :: Glob | eff) Unit)
-
-globAll :: forall eff. [String] -> Aff (glob :: Glob | eff) [[String]]
+foreign import globFn :: forall eff. Fn3 String
+                                         (Error -> Eff (glob :: Glob | eff) Unit)
+                                         (Array String -> Eff (glob :: Glob | eff) Unit)
+                                         (Eff (glob :: Glob | eff) Unit)
+
+globAll :: forall eff. Array String -> Aff (glob :: Glob | eff) (Array (Array String))
 globAll patterns = makeAff $ runFn3 globAllFn patterns
 
-foreign import globAllFn """
-function globAllFn(patterns, errback, callback) {
-  return function(){
-    var glob = require('glob');
-
-    var async = require('async');
-
-    async.map(patterns, glob, function(error, result){
-      if (error) errback(new Error(error))();
-      else callback(result)();
-    });
-  };
-}
-""" :: forall eff. Fn3 [String]
-                       (Error -> Eff (glob :: Glob | eff) Unit)
-                       ([[String]] -> Eff (glob :: Glob | eff) Unit)
-                       (Eff (glob :: Glob | eff) Unit)
+foreign import globAllFn :: forall eff. Fn3 (Array String)
+                                            (Error -> Eff (glob :: Glob | eff) Unit)
+                                            ((Array (Array String)) -> Eff (glob :: Glob | eff) Unit)
+                                            (Eff (glob :: Glob | eff) Unit)

src/GulpUtil.js

@@ -0,0 +1,17 @@
+'use strict';
+
+// module GulpPurescript.GulpUtil
+
+var gutil = require('gulp-util');
+
+function mkPluginErrorFn(name, message) {
+  return new gutil.PluginError(name, message);
+}
+
+function mkFileFn(path, contents) {
+  return new gutil.File({path: path, contents: contents});
+}
+
+exports.mkPluginErrorFn = mkPluginErrorFn;
+
+exports.mkFileFn = mkFileFn;

src/GulpUtil.purs

@@ -15,19 +15,9 @@ data File
 mkPluginError :: String -> String -> Error
 mkPluginError name msg = runFn2 mkPluginErrorFn name msg
 
-foreign import mkPluginErrorFn """
-function mkPluginErrorFn(name, message) {
-  var gutil = require('gulp-util');
-  return new gutil.PluginError(name, message);
-}
-""" :: Fn2 String String Error
+foreign import mkPluginErrorFn :: Fn2 String String Error
 
 mkFile :: String -> Buffer -> File
 mkFile path contents = runFn2 mkFileFn path contents
 
-foreign import mkFileFn """
-function mkFileFn(path, contents) {
-  var gutil = require('gulp-util');
-  return new gutil.File({path: path, contents: contents});
-}
-""" :: Fn2 String Buffer File
+foreign import mkFileFn :: Fn2 String Buffer File