add test for output as function

Author: dgbeck

index.js

@@ -29,13 +29,6 @@ module.exports = function f (b, opts) {
 
     var outopt = defined(opts.outputs, opts.output, opts.o);
 
-    function moreOutputs (file) {
-        if (isarray(outopt)) return [];
-        if (!outopt) return [];
-        var xopts = { env: xtend(process.env, { FILE: file }) };
-        return [ outpipe(outopt, xopts) ];
-    }
-    
     opts.objectMode = true;
     opts.raw = true;
     opts.rmap = {};
@@ -56,20 +49,27 @@ module.exports = function f (b, opts) {
             }
             next(null, row);
         }, function(next) {
-   if (outopt && !isarray(outopt) && ! typeof outputs === 'function') outopt = [outopt];
-            var outputs = defined(outopt, []);
-
-            if (typeof outputs === 'function') {
-                outputs = outputs();
-            } else if (!isarray(outputs) && isStream(outputs)) {
-                outputs = [ outputs ];
-            } else if (!isarray(outputs)) {
-                outputs = [];
-            } else {
-                outputs = outputs.map(function (o) {
+            var outopt = defined(opts.outputs, opts.output, opts.o);
+
+            if (typeof outopt === 'function') {
+                outopt = outopt();
+            }
+
+            var outputs;
+            if (isarray(outopt)) {
+                outputs = outopt.map(function (o) {
                     if (isStream(o)) return o;
-                    else return fs.createWriteStream(o);
+                    return fs.createWriteStream(o);
                 });
+            } else {
+                outputs = [];
+            }
+
+            function moreOutputs (file) {
+                if (isarray(outopt)) return [];
+                if (!outopt) return [];
+                var xopts = { env: xtend(process.env, { FILE: file }) };
+                return [ outpipe(outopt, xopts) ];
             }
 
             var pipelines = files.reduce(function (acc, x, ix) {

readme.markdown

@@ -140,7 +140,7 @@ where OPTIONS are:
 
   -o  Output FILE or CMD that maps to a corresponding entry file at the same
       index. CMDs are executed with $FILE set to the corresponding input file.
-      Optionally specify a function that return a writable stream.
+      Optionally specify a function that returns a valid value for this argument.
  
   -e  Entry file to use, overriding the entry files listed in the original
       bundle.

test/outputs.js

@@ -73,6 +73,32 @@ test('stream outputs', function (t) {
     }
 });
 
+test('function outputs', function (t) {
+    var tmpdir = tmp() + '/factor-bundle-' + Math.random();
+    mkdirp.sync(tmpdir);
+
+    t.plan(2);
+    var b = browserify(files);
+    b.plugin(factor, {
+        output: function() { return ' cat > ' + tmpdir + '/`basename $FILE`'; }
+    });
+    var w = fs.createWriteStream(path.join(tmpdir, 'common.js'));
+    b.bundle().pipe(w);
+    
+    w.on('finish', function () {
+        var common = fs.readFileSync(tmpdir + '/common.js', 'utf8');
+        var x = fs.readFileSync(tmpdir + '/x.js', 'utf8');
+        var y = fs.readFileSync(tmpdir + '/y.js', 'utf8');
+        
+        vm.runInNewContext(common + x, { console: { log: function (msg) {
+            t.equal(msg, 55500);
+        } } });
+        
+        vm.runInNewContext(common + y, { console: { log: function (msg) {
+            t.equal(msg, 333);
+        } } });
+    });
+});
 
 test('bundle twice', function (t) {
     var tmpdir = tmp() + '/factor-bundle-' + Math.random();