Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,27 @@ export class ExecProcess implements Result {

nodeOptions.env = computeEnv(cwd, nodeOptions.env);

// Always use 'pipe' for stdout/stderr so we can capture output
// If user requested 'inherit', we will forward output manually
const wantInheritStdout =
nodeOptions.stdio === 'inherit' ||
(Array.isArray(nodeOptions.stdio) && nodeOptions.stdio[1] === 'inherit');
const wantInheritStderr =
nodeOptions.stdio === 'inherit' ||
(Array.isArray(nodeOptions.stdio) && nodeOptions.stdio[2] === 'inherit');

// Force stdio to 'pipe' for stdout/stderr
if (nodeOptions.stdio === 'inherit') {
nodeOptions.stdio = ['inherit', 'pipe', 'pipe'];
} else if (Array.isArray(nodeOptions.stdio)) {
nodeOptions.stdio = [
nodeOptions.stdio[0] ?? 'inherit',
'pipe',
'pipe',
...nodeOptions.stdio.slice(3)
];
}

const {command: normalisedCommand, args: normalisedArgs} =
normaliseCommandAndArgs(this._command, this._args);

Expand All @@ -305,9 +326,19 @@ export class ExecProcess implements Result {

if (handle.stderr) {
this._streamErr = handle.stderr;
if (wantInheritStderr) {
handle.stderr.on('data', (chunk) => {
process.stderr.write(chunk);
});
}
}
if (handle.stdout) {
this._streamOut = handle.stdout;
if (wantInheritStdout) {
handle.stdout.on('data', (chunk) => {
process.stdout.write(chunk);
});
}
}

this._process = handle;
Expand Down
28 changes: 26 additions & 2 deletions src/test/main_test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {x, NonZeroExitError} from '../main.js';
import {describe, test, expect} from 'vitest';
import os from 'node:os';
import {describe, expect, test, vi} from 'vitest';
import {NonZeroExitError, x} from '../main.js';

const isWindows = os.platform() === 'win32';

Expand Down Expand Up @@ -38,15 +38,39 @@ describe('exec', async () => {
});

test('resolves to stdout', async () => {
const stdoutWrite = vi.spyOn(process.stdout, 'write');
const result = await x('node', ['-e', "console.log('foo')"]);
expect(result.stdout).toBe('foo\n');
expect(result.stderr).toBe('');
expect(stdoutWrite).not.toHaveBeenCalled();
});

test('resolves to stdout - with inherit', async () => {
const stdoutWrite = vi.spyOn(process.stdout, 'write');
const result = await x('node', ['-e', "console.log('foo')"], {
nodeOptions: {stdio: 'inherit'}
});
expect(result.stdout).toBe('foo\n');
expect(result.stderr).toBe('');
expect(stdoutWrite).toHaveBeenCalledWith(Buffer.from('foo\n'));
});

test('captures stderr', async () => {
const stderrWrite = vi.spyOn(process.stderr, 'write');
const result = await x('node', ['-e', "console.error('some error')"]);
expect(result.stderr).toBe('some error\n');
expect(result.stdout).toBe('');
expect(stderrWrite).not.toHaveBeenCalled();
});

test('captures stderr - with inherit', async () => {
const stderrWrite = vi.spyOn(process.stderr, 'write');
const result = await x('node', ['-e', "console.error('some error')"], {
nodeOptions: {stdio: 'inherit'}
});
expect(result.stderr).toBe('some error\n');
expect(result.stdout).toBe('');
expect(stderrWrite).toHaveBeenCalledWith(Buffer.from('some error\n'));
});
});

Expand Down