From d2771a1a5dab42435e735e5905bacd3036645769 Mon Sep 17 00:00:00 2001 From: chloe caruso Date: Fri, 7 Feb 2025 21:46:04 -0800 Subject: [PATCH] a --- src/bundler/bundle_v2.zig | 11 +++-- .../test/__snapshots__/coverage.test.ts.snap | 4 +- test/js/bun/util/inspect-error.test.js | 44 +++++++++---------- 3 files changed, 32 insertions(+), 27 deletions(-) diff --git a/src/bundler/bundle_v2.zig b/src/bundler/bundle_v2.zig index 3da0e7ef6b1396..8fe4fe56e24bb5 100644 --- a/src/bundler/bundle_v2.zig +++ b/src/bundler/bundle_v2.zig @@ -3507,18 +3507,23 @@ pub const DeferredBatchTask = struct { pub fn runOnJSThread(this: *DeferredBatchTask) void { defer this.deinit(); var bv2 = this.getBundleV2(); - bv2.plugins.?.drainDeferred(bv2.transpiler.log.hasErrors()); + bv2.plugins.?.drainDeferred( + if (bv2.completion) |completion| + completion.result == .err + else + false, + ); } }; -const ContentsOrFd = union(Tag) { +const ContentsOrFd = union(enum) { fd: struct { dir: StoredFileDescriptorType, file: StoredFileDescriptorType, }, contents: string, - const Tag = enum { fd, contents }; + const Tag = @typeInfo(ContentsOrFd).@"union".tag_type.?; }; pub const ParseTask = struct { diff --git a/test/cli/test/__snapshots__/coverage.test.ts.snap b/test/cli/test/__snapshots__/coverage.test.ts.snap index 92503498655382..12122efc4d3238 100644 --- a/test/cli/test/__snapshots__/coverage.test.ts.snap +++ b/test/cli/test/__snapshots__/coverage.test.ts.snap @@ -16,8 +16,8 @@ SF:demo2.ts FNF:2 FNH:1 DA:2,28 -DA:4,10 -DA:6,10 +DA:4,11 +DA:6,9 DA:9,0 DA:10,0 DA:11,1 diff --git a/test/js/bun/util/inspect-error.test.js b/test/js/bun/util/inspect-error.test.js index a439b5c5ad2dc8..0405064cba6dde 100644 --- a/test/js/bun/util/inspect-error.test.js +++ b/test/js/bun/util/inspect-error.test.js @@ -110,18 +110,18 @@ test("Error inside minified file (no color) ", () => { .trim(), ), ).toMatchInlineSnapshot(` -"21 | exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED=Z; -22 | exports.cache=function(a){return function(){var b=U.current;if(!b)return a.apply(null,arguments);var c=b.getCacheForType(V);b=c.get(a);void 0===b&&(b=W(),c.set(a,b));c=0;for(var f=arguments.length;c ([dir]/inspect-error-fixture.min.js:26:2846) - at ([dir]/inspect-error-fixture.min.js:26:2890) - at ([dir]/inspect-error.test.js:102:5)" -`); + error: error inside long minified file! + at ([dir]/inspect-error-fixture.min.js:26:2846) + at ([dir]/inspect-error-fixture.min.js:26:2890) + at ([dir]/inspect-error.test.js:101:7)" + `); } }); @@ -141,18 +141,18 @@ test("Error inside minified file (color) ", () => { ).trim(), ), ).toMatchInlineSnapshot(` -"21 | exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED=Z; -22 | exports.cache=function(a){return function(){var b=U.current;if(!b)return a.apply(null,arguments);var c=b.getCacheForType(V);b=c.get(a);void 0===b&&(b=W(),c.set(a,b));c=0;for(var f=arguments.length;c ([dir]/inspect-error-fixture.min.js:26:2846) - at ([dir]/inspect-error-fixture.min.js:26:2890) - at ([dir]/inspect-error.test.js:130:5)" -`); + error: error inside long minified file! + at ([dir]/inspect-error-fixture.min.js:26:2846) + at ([dir]/inspect-error-fixture.min.js:26:2890) + at ([dir]/inspect-error.test.js:129:7)" + `); } });