Skip to content
Merged
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
44 changes: 39 additions & 5 deletions src/lib/plugins/run-code-blocks/directives/command.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@ interface Args {
captureOutput?: boolean;
}

interface CommandError {
stdout?: string;
stderr?: string;
}

function isCommandError(error: unknown): error is CommandError {
return typeof error === 'object' && error !== null && ('stdout' in error || 'stderr' in error);
}

export default async function command(node: Code, options: Options): Promise<Option<Code>> {
let args = parseArgs<Args>(node, [
optional('lang', String, 'shell'),
Expand Down Expand Up @@ -52,13 +61,38 @@ export default async function command(node: Code, options: Options): Promise<Opt
output.push(`$ ${display}`);
}

let { stdout } = await exec(cmd, { cwd });
try {
let { stdout, stderr } = await exec(cmd, { cwd });

if (args.captureOutput) {
output.push(stdout);
}
if (args.captureOutput) {
if (stdout) {
output.push(stdout);
}

console.log(stdout)
if (stderr) {
output.push(stderr);
}
}

console.log(stdout);
if (stderr) {
console.error(stderr);
}
} catch (error) {
if (args.captureOutput && isCommandError(error)) {
let { stdout, stderr } = error;

if (stdout) {
output.push(stdout);
}

if (stderr) {
output.push(stderr);
}
}

throw error;
}
}

if (args.hidden) {
Expand Down
Loading