Add .all property with interleaved stdout and stderr

fixtures/noop-132

@@ -0,0 +1,14 @@
+#!/usr/bin/env node
+'use strict';
+// Interleaving the output of stdout and stderr is unpredictable and can't be
+// expressed as a test. What I've tried so far to make it predictable:
+// - process.stdout._handle.setBlocking(true)
+// - process.stdout.once('drain', () => process.stderr.write('2'));
+// - process.stdout.write('1', () => process.stderr.write('2'));
+// - await delay() between calls; it works but with varying ms, based on load
+// - console.log/error
+
+process.stdout.write('1');
+process.stdout.write('3');
+// Ideally, to demonstrate the interleaving, the next line should go before '3'
+process.stderr.write('2');

index.js

@@ -6,6 +6,7 @@ const stripFinalNewline = require('strip-final-newline');
 const npmRunPath = require('npm-run-path');
 const isStream = require('is-stream');
 const _getStream = require('get-stream');
+const mergeStream = require('merge-stream');
 const pFinally = require('p-finally');
 const onExit = require('signal-exit');
 const errname = require('./lib/errname');
@@ -122,6 +123,24 @@ function handleShell(fn, command, options) {
 	return fn(file, args, options);
 }
 
+function makeAllStream(spawned) {
+	const mixed = mergeStream();
+
+	if (!spawned.stdout && !spawned.stderr) {
+		return null;
+	}
+
+	if (spawned.stdout) {
+		mixed.add(spawned.stdout);
+	}
+
+	if (spawned.stderr) {
+		mixed.add(spawned.stderr);
+	}
+
+	return mixed;
+}
+
 function getStream(process, stream, {encoding, buffer, maxBuffer}) {
 	if (!process[stream]) {
 		return null;
@@ -268,16 +287,22 @@ module.exports = (command, args, options) => {
 		if (spawned.stderr) {
 			spawned.stderr.destroy();
 		}
+
+		if (spawned.all) {
+			spawned.all.destroy();
+		}
 	}
 
 	const handlePromise = () => pFinally(Promise.all([
 		processDone,
 		getStream(spawned, 'stdout', {encoding, buffer, maxBuffer}),
-		getStream(spawned, 'stderr', {encoding, buffer, maxBuffer})
+		getStream(spawned, 'stderr', {encoding, buffer, maxBuffer}),
+		getStream(spawned, 'all', {encoding, buffer, maxBuffer: maxBuffer * 2})
 	]).then(arr => {
 		const result = arr[0];
 		result.stdout = arr[1];
 		result.stderr = arr[2];
+		result.all = arr[3];
 
 		if (result.error || result.code !== 0 || result.signal !== null) {
 			const error = makeError(result, {
@@ -301,6 +326,7 @@ module.exports = (command, args, options) => {
 		return {
 			stdout: handleOutput(parsed.options, result.stdout),
 			stderr: handleOutput(parsed.options, result.stderr),
+			all: handleOutput(parsed.options, result.all),
 			code: 0,
 			failed: false,
 			killed: false,
@@ -314,6 +340,8 @@ module.exports = (command, args, options) => {
 
 	handleInput(spawned, parsed.options.input);
 
+	spawned.all = makeAllStream(spawned);
+
 	spawned.then = (onfulfilled, onrejected) => handlePromise().then(onfulfilled, onrejected);
 	spawned.catch = onrejected => handlePromise().catch(onrejected);
 
@@ -339,6 +367,10 @@ module.exports.sync = (command, args, options) => {
 	const result = childProcess.spawnSync(parsed.command, parsed.args, parsed.options);
 	result.code = result.status;
 
+	// `spawnSync` doesn't expose the stdout/stderr before terminating, which means
+	// the streams can't be merged unless proxying on `options.stdio`
+	result.all = result.stdout + result.stderr;
+
 	if (result.error || result.status !== 0 || result.signal !== null) {
 		const error = makeError(result, {
 			joinedCommand,
@@ -355,6 +387,7 @@ module.exports.sync = (command, args, options) => {
 	return {
 		stdout: handleOutput(parsed.options, result.stdout),
 		stderr: handleOutput(parsed.options, result.stderr),
+		all: handleOutput(parsed.options, result.all),
 		code: 0,
 		failed: false,
 		signal: null,

package.json

@@ -40,6 +40,7 @@
 		"cross-spawn": "^6.0.0",
 		"get-stream": "^4.0.0",
 		"is-stream": "^1.1.0",
+		"merge-stream": "1.0.1",
 		"npm-run-path": "^2.0.0",
 		"p-finally": "^1.0.0",
 		"signal-exit": "^3.0.0",

test.js

@@ -41,6 +41,19 @@ test('execa.stderr()', async t => {
 	t.is(stderr, 'foo');
 });
 
+test('result.all shows both `stdout` and `stderr` intermixed', async t => {
+	const result = await m('noop-132');
+	// Due to the async nature of process.stdout/stderr on POSIX, this test
+	// is very unpredictable, although it should interleave the streams
+	// https://nodejs.org/api/process.html#process_a_note_on_process_i_os
+	t.is(result.all, '132');
+});
+
+test('result.all shows both `stdout` and `stderr` concatenated - sync', t => {
+	const result = m.sync('noop-132');
+	t.is(result.all, '132');
+});
+
 test('stdout/stderr available on errors', async t => {
 	const err = await t.throws(m('exit', ['2']));
 	t.is(typeof err.stdout, 'string');
@@ -243,7 +256,8 @@ test('do not buffer stdout when `buffer` set to `false`', async t => {
 	const promise = m('max-buffer', ['stdout', '10'], {buffer: false});
 	const [result, stdout] = await Promise.all([
 		promise,
-		getStream(promise.stdout)
+		getStream(promise.stdout),
+		getStream(promise.all)
 	]);
 
 	t.is(result.stdout, undefined);
@@ -254,7 +268,8 @@ test('do not buffer stderr when `buffer` set to `false`', async t => {
 	const promise = m('max-buffer', ['stderr', '10'], {buffer: false});
 	const [result, stderr] = await Promise.all([
 		promise,
-		getStream(promise.stderr)
+		getStream(promise.stderr),
+		getStream(promise.all)
 	]);
 
 	t.is(result.stderr, undefined);