diff options
author | 2023-09-15 04:21:43 -0700 | |
---|---|---|
committer | 2023-09-15 04:21:43 -0700 | |
commit | 56c471a0052b081d01b973fc86a5d75a2373dce9 (patch) | |
tree | 28747cfdd928b3850b2691f6b0b353c7c1b00a91 /src | |
parent | 20f61b236980cf12dee0b0b80b04f605bd517581 (diff) | |
download | bun-56c471a0052b081d01b973fc86a5d75a2373dce9.tar.gz bun-56c471a0052b081d01b973fc86a5d75a2373dce9.tar.zst bun-56c471a0052b081d01b973fc86a5d75a2373dce9.zip |
Make `bun run --silent` omit `"error: "..." exited with code 1` (#5459)
* Make --silent behave as expected
* Make the "tsconfig.json extends" error a debug level
---------
Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/cli/run_command.zig | 35 | ||||
-rw-r--r-- | src/logger.zig | 6 | ||||
-rw-r--r-- | src/resolver/resolver.zig | 2 |
3 files changed, 27 insertions, 16 deletions
diff --git a/src/cli/run_command.zig b/src/cli/run_command.zig index 42560947a..3ef68b494 100644 --- a/src/cli/run_command.zig +++ b/src/cli/run_command.zig @@ -282,7 +282,10 @@ pub const RunCommand = struct { child_process.stdout_behavior = .Inherit; const result = child_process.spawnAndWait() catch |err| { - Output.prettyErrorln("<r><red>error<r>: Failed to run script <b>{s}<r> due to error <b>{s}<r>", .{ name, @errorName(err) }); + if (!silent) { + Output.prettyErrorln("<r><red>error<r>: Failed to run script <b>{s}<r> due to error <b>{s}<r>", .{ name, @errorName(err) }); + } + Output.flush(); return true; }; @@ -290,7 +293,7 @@ pub const RunCommand = struct { switch (result) { .Exited => |code| { if (code > 0) { - if (code != 2) { + if (code != 2 and !silent) { Output.prettyErrorln("<r><red>error<r><d>:<r> script <b>\"{s}\"<r> exited with {any}<r>", .{ name, bun.SignalCode.from(code) }); Output.flush(); } @@ -299,14 +302,18 @@ pub const RunCommand = struct { } }, .Signal => |signal| { - Output.prettyErrorln("<r><red>error<r><d>:<r> script <b>\"{s}\"<r> exited with {any}<r>", .{ name, bun.SignalCode.from(signal) }); - Output.flush(); + if (!silent) { + Output.prettyErrorln("<r><red>error<r><d>:<r> script <b>\"{s}\"<r> exited with {any}<r>", .{ name, bun.SignalCode.from(signal) }); + Output.flush(); + } Global.exit(1); }, .Stopped => |signal| { - Output.prettyErrorln("<r><red>error<r><d>:<r> script <b>\"{s}\"<r> was stopped by signal {any}<r>", .{ name, bun.SignalCode.from(signal) }); - Output.flush(); + if (!silent) { + Output.prettyErrorln("<r><red>error<r><d>:<r> script <b>\"{s}\"<r> was stopped by signal {any}<r>", .{ name, bun.SignalCode.from(signal) }); + Output.flush(); + } Global.exit(1); }, @@ -341,6 +348,7 @@ pub const RunCommand = struct { child_process.stderr_behavior = .Inherit; child_process.stdin_behavior = .Inherit; child_process.stdout_behavior = .Inherit; + const silent = ctx.debug.silent; const result = child_process.spawnAndWait() catch |err| { if (err == error.AccessDenied) { @@ -349,7 +357,8 @@ pub const RunCommand = struct { const rc = bun.C.stat(executable[0.. :0].ptr, &stat); if (rc == 0) { if (std.os.S.ISDIR(stat.mode)) { - Output.prettyErrorln("<r><red>error<r>: Failed to run directory \"<b>{s}<r>\"\n", .{executable}); + if (!silent) + Output.prettyErrorln("<r><red>error<r>: Failed to run directory \"<b>{s}<r>\"\n", .{executable}); Global.exit(1); } } @@ -361,24 +370,25 @@ pub const RunCommand = struct { switch (result) { .Exited => |sig| { // 2 is SIGINT, which is CTRL + C so that's kind of annoying to show - if (sig > 0 and sig != 2) + if (sig > 0 and sig != 2 and !silent) Output.prettyErrorln("<r><red>error<r><d>:<r> \"<b>{s}<r>\" exited with <b>{any}<r>", .{ std.fs.path.basename(executable), bun.SignalCode.from(sig) }); Global.exit(sig); }, .Signal => |sig| { // 2 is SIGINT, which is CTRL + C so that's kind of annoying to show - if (sig > 0 and sig != 2) { + if (sig > 0 and sig != 2 and !silent) { Output.prettyErrorln("<r><red>error<r><d>:<r> \"<b>{s}<r>\" exited with <b>{any}<r>", .{ std.fs.path.basename(executable), bun.SignalCode.from(sig) }); } Global.exit(std.mem.asBytes(&sig)[0]); }, .Stopped => |sig| { - if (sig > 0) + if (sig > 0 and !silent) Output.prettyErrorln("<r><red>error<r> \"<b>{s}<r>\" stopped with {any}<r>", .{ std.fs.path.basename(executable), bun.SignalCode.from(sig) }); Global.exit(std.mem.asBytes(&sig)[0]); }, .Unknown => |sig| { - Output.prettyErrorln("<r><red>error<r> \"<b>{s}<r>\" stopped: {d}<r>", .{ std.fs.path.basename(executable), sig }); + if (!silent) + Output.prettyErrorln("<r><red>error<r> \"<b>{s}<r>\" stopped: {d}<r>", .{ std.fs.path.basename(executable), sig }); Global.exit(1); }, } @@ -955,7 +965,8 @@ pub const RunCommand = struct { // "White space after #! is optional." var shebang_buf: [64]u8 = undefined; const shebang_size = file.pread(&shebang_buf, 0) catch |err| { - Output.prettyErrorln("<r><red>error<r>: Failed to read file <b>{s}<r> due to error <b>{s}<r>", .{ file_path, @errorName(err) }); + if (!ctx.debug.silent) + Output.prettyErrorln("<r><red>error<r>: Failed to read file <b>{s}<r> due to error <b>{s}<r>", .{ file_path, @errorName(err) }); Global.exit(1); }; diff --git a/src/logger.zig b/src/logger.zig index ba27fcdbe..d1b89438b 100644 --- a/src/logger.zig +++ b/src/logger.zig @@ -703,12 +703,12 @@ pub const Log = struct { }; } - pub fn addVerboseFmt(log: *Log, source: ?*const Source, l: Loc, allocator: std.mem.Allocator, comptime text: string, args: anytype) !void { - if (!Kind.shouldPrint(.verbose, log.level)) return; + pub fn addDebugFmt(log: *Log, source: ?*const Source, l: Loc, allocator: std.mem.Allocator, comptime text: string, args: anytype) !void { + if (!Kind.shouldPrint(.debug, log.level)) return; @setCold(true); try log.addMsg(.{ - .kind = .verbose, + .kind = .debug, .data = try rangeData(source, Range{ .loc = l }, allocPrint(allocator, text, args) catch unreachable).cloneLineText(log.clone_line_text, log.msgs.allocator), }); } diff --git a/src/resolver/resolver.zig b/src/resolver/resolver.zig index c80fe2adf..b6f571e23 100644 --- a/src/resolver/resolver.zig +++ b/src/resolver/resolver.zig @@ -3887,7 +3887,7 @@ pub const Resolver = struct { // not sure why this needs cwd but we'll just pass in the dir of the tsconfig... var abs_path = ResolvePath.joinAbsStringBuf(ts_dir_name, bufs(.tsconfig_path_abs), &[_]string{ ts_dir_name, current.extends }, .auto); var parent_config_maybe = r.parseTSConfig(abs_path, 0) catch |err| { - r.log.addVerboseFmt(null, logger.Loc.Empty, r.allocator, "{s} loading tsconfig.json extends {}", .{ @errorName(err), strings.QuotedFormatter{ + r.log.addDebugFmt(null, logger.Loc.Empty, r.allocator, "{s} loading tsconfig.json extends {}", .{ @errorName(err), strings.QuotedFormatter{ .text = abs_path, } }) catch {}; break; |