Converting the pscBundle task to a stream

Note that this is part of the updates for PureScript 0.7, which along
with previous commits resolves #38

Author: ethul

foreign.js

@@ -0,0 +1,2 @@
+function test(){
+}

package.json

@@ -35,10 +35,8 @@
     "gulp-util": "^3.0.4",
     "logalot": "^2.1.0",
     "minimist": "^1.1.1",
-    "multipipe": "^0.1.2",
     "promise": "^7.0.3",
     "resolve-bin": "^0.3.0",
-    "through2": "^0.6.3",
     "which": "^1.0.9"
   },
   "devDependencies": {
@@ -50,6 +48,7 @@
     "run-sequence": "^1.0.2",
     "tap-spec": "^2.2.2",
     "tape": "^3.5.0",
+    "through2": "^0.6.3",
     "webpack": "^1.8.9"
   }
 }

src/FS.purs

@@ -1,6 +1,5 @@
 module GulpPurescript.FS
   ( FS()
-  , Stream()
   , writeFile
   ) where
 
@@ -12,8 +11,6 @@ import Data.Function
 
 foreign import data FS :: !
 
-data Stream i o
-
 writeFile :: forall eff. String -> String -> Aff (fs :: FS | eff) Unit
 writeFile filename contents = makeAff $ runFn4 writeFileFn filename contents
 

src/GulpUtil.purs

@@ -2,9 +2,6 @@ module GulpPurescript.GulpUtil
   ( File()
   , mkPluginError
   , mkFile
-  , filePath
-  , fileIsNull
-  , fileIsStream
   ) where
 
 import Control.Monad.Eff.Exception (Error())
@@ -34,21 +31,3 @@ function mkFileFn(path, contents) {
   return new gutil.File({path: path, contents: contents});
 }
 """ :: Fn2 String Buffer File
-
-foreign import filePath """
-function filePath(file) {
-  return file.path;
-}
-""" :: File -> String
-
-foreign import fileIsNull"""
-function fileIsNull(file) {
-  return file.isNull();
-}
-""" :: File -> Boolean
-
-foreign import fileIsStream """
-function fileIsStream(file) {
-  return file.isStream();
-}
-""" :: File -> Boolean

src/Multipipe.purs

@@ -28,16 +28,15 @@ import GulpPurescript.Buffer (Buffer(), mkBufferFromString)
 import GulpPurescript.ChildProcess (ChildProcess(), spawn)
 import GulpPurescript.FS (FS(), writeFile)
 import GulpPurescript.Glob (Glob(), globAll)
-import GulpPurescript.GulpUtil (File(), fileIsNull, fileIsStream, filePath, mkFile, mkPluginError)
+import GulpPurescript.GulpUtil (File(), mkFile, mkPluginError)
 import GulpPurescript.Logalot (Logalot(), info)
 import GulpPurescript.Minimist (minimist)
-import GulpPurescript.Multipipe (multipipe2)
 import GulpPurescript.OS (OS(), Platform(Win32), platform)
 import GulpPurescript.Options (Psci(..), pscOptions, pscBundleOptions, pscDocsOptions)
 import GulpPurescript.Package (Pkg(), Package(..), package)
 import GulpPurescript.Path (relative)
 import GulpPurescript.ResolveBin (ResolveBin(), resolveBin)
-import GulpPurescript.Through2 (Through2(), objStream, accStream)
+import GulpPurescript.Stream (Stream(), ReadableStream(), mkReadableStreamFromBuffer)
 import GulpPurescript.Which (Which(), which)
 
 newtype Argv = Argv { verbose :: Boolean }
@@ -53,7 +52,7 @@ type Effects eff =
   , os :: OS
   , package :: Pkg
   , resolveBin :: ResolveBin
-  , through2 :: Through2
+  , stream :: Stream
   , which :: Which
   | eff
   )
@@ -120,24 +119,23 @@ psc opts eb cb = runAff eb cb $ do
     then liftEff $ info $ pscCommand ++ "\n" ++ output
     else pure unit
 
-pscBundle :: forall eff. Foreign -> Errorback eff -> Callback eff Unit -> Eff (Effects eff) Unit
-pscBundle opts eb cb = runAff eb cb $ do
-  output <- either (throwPluginError <<< show)
-                   (execute pscBundleCommand)
-                   (pscBundleOptions opts)
-  if isVerbose
-    then liftEff $ info $ pscCommand ++ "\n" ++ output
-    else pure unit
+pscBundle :: forall eff. Foreign -> Errorback eff -> Callback eff (ReadableStream Buffer) -> Eff (Effects eff) Unit
+pscBundle opts eb cb = runAff eb cb (either (throwPluginError <<< show) run (pscBundleOptions opts))
+  where
+    run :: [String] -> Aff (Effects eff) (ReadableStream Buffer)
+    run args = do
+      bundle <- execute pscBundleCommand args
+      liftEff (mkReadableStreamFromBuffer (mkBufferFromString bundle))
 
 pscDocs :: forall eff. Foreign -> Errorback eff -> Callback eff File -> Eff (Effects eff) Unit
-pscDocs opts eb cb = runAff eb cb $ do
-  case pscDocsOptions opts of
-       Left e  -> throwPluginError (show e)
-       Right a -> mkFile "." <$> mkBufferFromString
-                             <$> execute pscDocsCommand a
+pscDocs opts eb cb = runAff eb cb (either (throwPluginError <<< show) run (pscDocsOptions opts))
+  where
+    run :: [String] -> Aff (Effects eff) File
+    run args = mkFile "." <$> mkBufferFromString
+                          <$> execute pscDocsCommand args
 
 psci :: forall eff. Foreign -> Errorback eff -> Callback eff Unit -> Eff (Effects eff) Unit
-psci opts eb cb = runAff eb cb (either (\e -> throwPluginError (show e)) write (read opts))
+psci opts eb cb = runAff eb cb (either (throwPluginError <<< show) write (read opts))
   where
     write :: Psci -> Aff (Effects eff) Unit
     write (Psci a) = do

src/Plugin.purs

@@ -0,0 +1,30 @@
+module GulpPurescript.Stream
+  ( Stream()
+  , ReadableStream()
+  , mkReadableStreamFromBuffer
+  ) where
+
+import Control.Monad.Eff (Eff())
+
+import GulpPurescript.Buffer (Buffer())
+
+foreign import data Stream :: !
+
+data ReadableStream o
+
+foreign import mkReadableStreamFromBuffer """
+function mkReadableStreamFromBuffer(buffer) {
+  return function(){
+    var Readable = require('stream').Readable;
+
+    var stream = Readable();
+
+    stream._read = function(){
+      stream.push(buffer);
+      return stream.push(null);
+    };
+
+    return stream;
+  };
+}
+""" :: forall eff. Buffer -> Eff (stream :: Stream | eff) (ReadableStream Buffer)