integrate changes from jcppman #71

Author: dgbeck

index.js

@@ -28,18 +28,7 @@ module.exports = function f (b, opts) {
     var needRecords = !files.length;
 
     var outopt = defined(opts.outputs, opts.output, opts.o);
-    if (typeof outopt === 'function') {
-        var outputs = outopt
-    } else {
-        if (outopt && !isarray(outopt)) outopt = [outopt];
-        var outputs = defined(outopt, []).map(function (o) {
-            if (isStream(o)) return o;
-            else return fs.createWriteStream(o);
-        });
-        if (!isarray(outputs) && isStream(outputs)) outputs = [ outputs ];
-        else if (!isarray(outputs)) outputs = [];
-    }
-    
+     
     function moreOutputs (file) {
         if (isarray(outopt)) return [];
         if (!outopt) return [];
@@ -67,22 +56,32 @@ module.exports = function f (b, opts) {
             }
             next(null, row);
         }, function(next) {
-            var outputResult;
+   if (outopt && !isarray(outopt) && ! typeof outputs === 'function') outopt = [outopt];
+            var outputs = defined(outopt, []);
 
             if (typeof outputs === 'function') {
-                outputResult = outputs();
-            } else outputResult = outputs;
+                outputs = outputs();
+            } else if (!isarray(outputs) && isStream(outputs)) {
+                outputs = [ outputs ];
+            } else if (!isarray(outputs)) {
+                outputs = [];
+            } else {
+                outputs = outputs.map(function (o) {
+                    if (isStream(o)) return o;
+                    else return fs.createWriteStream(o);
+                });
+            }
 
             var pipelines = files.reduce(function (acc, x, ix) {
                 var pipeline = splicer.obj([
                     'pack', [ pack(packOpts) ],
                     'wrap', []
                 ]);
 
-                if (ix >= outputResult.length) {
-                    outputResult.push.apply(outputResult, moreOutputs(x));
+                if (ix >= outputs.length) {
+                    outputs.push.apply(outputs, moreOutputs(x));
                 }
-                if (outputResult[ix]) pipeline.pipe(outputResult[ix]);
+                if (outputs[ix]) pipeline.pipe(outputs[ix]);
 
                 acc[path.resolve(cwd, x)] = pipeline;
                 return acc;

test/outputs.js

@@ -7,15 +7,17 @@ var mkdirp = require('mkdirp');
 var browserify = require('browserify');
 var factor = require('../');
 var concat = require('concat-stream');
+var through = require('through2');
 
 var files = [
     __dirname + '/deps/x.js',
     __dirname + '/deps/y.js'
 ];
-var tmpdir = tmp() + '/factor-bundle-' + Math.random();
-mkdirp.sync(tmpdir);
 
 test('file outputs', function (t) {
+    var tmpdir = tmp() + '/factor-bundle-' + Math.random();
+    mkdirp.sync(tmpdir);
+
     t.plan(2);
     var b = browserify(files);
     b.plugin(factor, {
@@ -43,6 +45,8 @@ test('file outputs', function (t) {
 });
 
 test('stream outputs', function (t) {
+    var tmpdir = tmp() + '/factor-bundle-' + Math.random();
+    mkdirp.sync(tmpdir);
     t.plan(2);
     var sources = {}, pending = 3;
     function write (key) {
@@ -68,3 +72,76 @@ test('stream outputs', function (t) {
         } } });
     }
 });
+
+
+test('bundle twice', function (t) {
+    var tmpdir = tmp() + '/factor-bundle-' + Math.random();
+    mkdirp.sync(tmpdir);
+
+    t.plan(4);
+    var b = browserify(files);
+    var outputs = [
+        path.join(tmpdir, 'x.js'),
+        path.join(tmpdir, 'y.js')
+    ];
+    b.on('reset', function(){
+        b.pipeline.get('deps').push(through.obj(function(data, enc, next){
+            if (data.file.indexOf('x.js') !== -1) {
+                data.source = data.source.replace('z(5)', 'z(6)');
+            }
+            this.push(data);
+            next();
+        }));
+    });
+    b.plugin(factor, {
+        outputs: outputs
+    });
+    validate(55500, 333, function(){
+        validate(66600, 333);
+    });
+    function validate (xVal, yVal, cb) {
+        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, xVal);
+            } } });
+            
+            vm.runInNewContext(common + y, { console: { log: function (msg) {
+                t.equal(msg, yVal);
+            } } });
+            if (cb) cb();
+        });
+    }
+});
+
+test('outpipe outputs', function (t) {
+    var tmpdir = tmp() + '/factor-bundle-' + Math.random();
+    mkdirp.sync(tmpdir);
+
+    t.plan(2);
+    var b = browserify(files);
+    b.plugin(factor, {
+        output: ' 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);
+        } } });
+    });
+});