Make bun run --silent omit "error: "..." exited with code 1 (#5459)

Jarred-Sumner · web-flow · commit 56c471a0052b · 2023-09-15T04:21:43.000-07:00
* Make --silent behave as expected

* Make the "tsconfig.json extends" error a debug level

---------

Co-authored-by: Jarred Sumner &lt;709451+Jarred-Sumner@users.noreply.github.com&gt;
diff --git a/src/cli/run_command.zig b/src/cli/run_command.zig
@@ -282,15 +282,18 @@ 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;
         };
 
         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
@@ -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
@@ -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;
diff --git a/test/cli/install/bun-run.test.ts b/test/cli/install/bun-run.test.ts
@@ -87,39 +87,81 @@ for (let withRun of [false, true]) {
         expect(exitCode).toBe(0);
       });
 
-      it("valid tsconfig.json with invalid extends doesn't crash", async () => {
-        await writeFile(
-          join(run_dir, "package.json"),
-          JSON.stringify({
-            name: "test",
-            version: "0.0.0",
-            scripts: {},
-          }),
-        );
-        await writeFile(
-          join(run_dir, "tsconfig.json"),
-          JSON.stringify(
-            {
-              extends: "!!!bad!!!",
-            },
-            null,
-            2,
-          ),
-        );
+      it("--silent omits error messages", async () => {
+        const { stdout, stderr, exitCode } = spawnSync({
+          cmd: [bunExe(), "run", "--silent", "bash", "-c", "exit 1"],
+          cwd: run_dir,
+          env: bunEnv,
+        });
 
-        await writeFile(join(run_dir, "index.js"), "console.log('hi')");
+        expect(stderr.toString()).toBe("");
+        expect(stdout.toString()).toBe("");
+        expect(exitCode).toBe(1);
+      });
 
+      it("no --silent includes error messages", async () => {
         const { stdout, stderr, exitCode } = spawnSync({
-          cmd: [bunExe(), "--silent", withRun ? "run" : "", "./index.js"].filter(Boolean),
+          cmd: [bunExe(), "run", "bash", "-c", "exit 1"],
           cwd: run_dir,
           env: bunEnv,
         });
 
-        expect(stderr.toString().trim()).toContain("FileNotFound loading tsconfig.json extends");
-        expect(stdout.toString()).toBe("hi\n");
-        expect(exitCode).toBe(0);
+        expect(stderr.toString()).toStartWith('error: "bash" exited with code 1');
+        expect(exitCode).toBe(1);
       });
 
+      for (let withLogLevel of [true, false]) {
+        it(
+          "valid tsconfig.json with invalid extends doesn't crash" + (withLogLevel ? " (log level debug)" : ""),
+          async () => {
+            await writeFile(
+              join(run_dir, "package.json"),
+              JSON.stringify({
+                name: "test",
+                version: "0.0.0",
+                scripts: {},
+              }),
+            );
+            if (withLogLevel)
+              await writeFile(
+                join(run_dir, "bunfig.toml"),
+                `
+logLevel = "debug"
+          `,
+              );
+
+            await writeFile(
+              join(run_dir, "tsconfig.json"),
+              JSON.stringify(
+                {
+                  extends: "!!!bad!!!",
+                },
+                null,
+                2,
+              ),
+            );
+
+            await writeFile(join(run_dir, "index.js"), "console.log('hi')");
+
+            const { stdout, stderr, exitCode } = spawnSync({
+              // TODO: figure out why -c is necessary here.
+              cmd: [bunExe(), withRun ? "run" : "", "-c=" + join(run_dir, "bunfig.toml"), "./index.js"].filter(Boolean),
+              cwd: run_dir,
+              env: bunEnv,
+            });
+            if (withLogLevel) {
+              expect(stderr.toString().trim()).toContain("FileNotFound loading tsconfig.json extends");
+            } else {
+              expect(stderr.toString().trim()).not.toContain("FileNotFound loading tsconfig.json extends");
+            }
+
+            expect(stdout.toString()).toBe("hi\n");
+            expect(exitCode).toBe(0);
+            await rm(join(run_dir, "bunfig.toml"), { force: true });
+          },
+        );
+      }
+
       it("falling back to index with no package.json", async () => {
         await writeFile(join(run_dir, "index.ts"), "console.log('Hello, world!');");
 

Original file line number	Diff line number	Diff line change
`@@ -703,12 +703,12 @@ pub const Log = struct {`
`703`	`703`	`};`
`704`	`704`	`}`
`705`	`705`
`706`		`- pub fn addVerboseFmt(log: Log, source: ?const Source, l: Loc, allocator: std.mem.Allocator, comptime text: string, args: anytype) !void {`
`707`		`- if (!Kind.shouldPrint(.verbose, log.level)) return;`
	`706`	`+ pub fn addDebugFmt(log: Log, source: ?const Source, l: Loc, allocator: std.mem.Allocator, comptime text: string, args: anytype) !void {`
	`707`	`+ if (!Kind.shouldPrint(.debug, log.level)) return;`
`708`	`708`
`709`	`709`	`@setCold(true);`
`710`	`710`	`try log.addMsg(.{`
`711`		`- .kind = .verbose,`
	`711`	`+ .kind = .debug,`
`712`	`712`	`.data = try rangeData(source, Range{ .loc = l }, allocPrint(allocator, text, args) catch unreachable).cloneLineText(log.clone_line_text, log.msgs.allocator),`
`713`	`713`	`});`
`714`	`714`	`}`