From 1e849b905a5d8261ebcaa226a40feb0d8ca8f817 Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Mon, 27 Oct 2025 11:26:09 -0800 Subject: [PATCH] zig: bun.sourcemap -> bun.SourceMap (#23477) --- src/StandaloneModuleGraph.zig | 2 +- src/bake/DevServer.zig | 2 +- src/bake/DevServer/IncrementalGraph.zig | 6 ++--- src/bake/DevServer/PackedMap.zig | 2 +- src/bake/DevServer/SourceMapStore.zig | 2 +- src/bun.js/SavedSourceMap.zig | 6 ++--- src/bun.js/VirtualMachine.zig | 2 +- .../bindings/generated_classes_list.zig | 2 +- src/bun.js/virtual_machine_exports.zig | 6 ++--- src/bun.zig | 4 ++-- src/bundler/Chunk.zig | 24 +++++++++---------- src/bundler/LinkerContext.zig | 20 ++++++++-------- src/bundler/LinkerGraph.zig | 2 +- src/bundler/bundle_v2.zig | 16 ++++++------- src/bundler/linker_context/computeChunks.zig | 12 +++++----- .../linker_context/postProcessCSSChunk.zig | 2 +- .../linker_context/postProcessJSChunk.zig | 2 +- .../linker_context/writeOutputFilesToDisk.zig | 1 - src/cli/test_command.zig | 20 ++++++++-------- src/js_printer.zig | 2 +- src/sourcemap/CodeCoverage.zig | 2 +- src/sourcemap/JSSourceMap.zig | 10 ++++---- 22 files changed, 73 insertions(+), 74 deletions(-) diff --git a/src/StandaloneModuleGraph.zig b/src/StandaloneModuleGraph.zig index 49c659e0dd..97cdca6bd0 100644 --- a/src/StandaloneModuleGraph.zig +++ b/src/StandaloneModuleGraph.zig @@ -1551,7 +1551,7 @@ const w = std.os.windows; const bun = @import("bun"); const Environment = bun.Environment; const Output = bun.Output; -const SourceMap = bun.sourcemap; +const SourceMap = bun.SourceMap; const StringPointer = bun.StringPointer; const Syscall = bun.sys; const macho = bun.macho; diff --git a/src/bake/DevServer.zig b/src/bake/DevServer.zig index e85e874890..73756e46ef 100644 --- a/src/bake/DevServer.zig +++ b/src/bake/DevServer.zig @@ -4664,7 +4664,7 @@ fn extractPathnameFromUrl(url: []const u8) []const u8 { const bun = @import("bun"); const Environment = bun.Environment; const Output = bun.Output; -const SourceMap = bun.sourcemap; +const SourceMap = bun.SourceMap; const Watcher = bun.Watcher; const assert = bun.assert; const bake = bun.bake; diff --git a/src/bake/DevServer/IncrementalGraph.zig b/src/bake/DevServer/IncrementalGraph.zig index 837cdf2925..6cb775c573 100644 --- a/src/bake/DevServer/IncrementalGraph.zig +++ b/src/bake/DevServer/IncrementalGraph.zig @@ -2034,6 +2034,9 @@ const DynamicBitSetUnmanaged = bun.bit_set.DynamicBitSetUnmanaged; const Log = bun.logger.Log; const useAllFields = bun.meta.useAllFields; +const SourceMap = bun.SourceMap; +const VLQ = SourceMap.VLQ; + const DevServer = bake.DevServer; const ChunkKind = DevServer.ChunkKind; const DevAllocator = DevServer.DevAllocator; @@ -2059,9 +2062,6 @@ const Chunk = bun.bundle_v2.Chunk; const Owned = bun.ptr.Owned; const Shared = bun.ptr.Shared; -const SourceMap = bun.sourcemap; -const VLQ = SourceMap.VLQ; - const std = @import("std"); const ArrayListUnmanaged = std.ArrayListUnmanaged; const AutoArrayHashMapUnmanaged = std.AutoArrayHashMapUnmanaged; diff --git a/src/bake/DevServer/PackedMap.zig b/src/bake/DevServer/PackedMap.zig index 1fc9f75105..0821237651 100644 --- a/src/bake/DevServer/PackedMap.zig +++ b/src/bake/DevServer/PackedMap.zig @@ -114,7 +114,7 @@ pub const Shared = union(enum) { const bun = @import("bun"); const Environment = bun.Environment; -const SourceMap = bun.sourcemap; +const SourceMap = bun.SourceMap; const assert = bun.assert; const assert_eql = bun.assert_eql; const Chunk = bun.bundle_v2.Chunk; diff --git a/src/bake/DevServer/SourceMapStore.zig b/src/bake/DevServer/SourceMapStore.zig index a2de1f35bc..cd2a470130 100644 --- a/src/bake/DevServer/SourceMapStore.zig +++ b/src/bake/DevServer/SourceMapStore.zig @@ -544,7 +544,7 @@ pub fn getParsedSourceMap(store: *Self, script_id: Key, arena: Allocator, gpa: A const bun = @import("bun"); const Environment = bun.Environment; const Output = bun.Output; -const SourceMap = bun.sourcemap; +const SourceMap = bun.SourceMap; const StringJoiner = bun.StringJoiner; const assert = bun.assert; const bake = bun.bake; diff --git a/src/bun.js/SavedSourceMap.zig b/src/bun.js/SavedSourceMap.zig index 7ad60b459e..64567ac553 100644 --- a/src/bun.js/SavedSourceMap.zig +++ b/src/bun.js/SavedSourceMap.zig @@ -384,8 +384,8 @@ const Output = bun.Output; const js_printer = bun.js_printer; const logger = bun.logger; -const SourceMap = bun.sourcemap; -const BakeSourceProvider = bun.sourcemap.BakeSourceProvider; -const DevServerSourceProvider = bun.sourcemap.DevServerSourceProvider; +const SourceMap = bun.SourceMap; +const BakeSourceProvider = bun.SourceMap.BakeSourceProvider; +const DevServerSourceProvider = bun.SourceMap.DevServerSourceProvider; const ParsedSourceMap = SourceMap.ParsedSourceMap; const SourceProviderMap = SourceMap.SourceProviderMap; diff --git a/src/bun.js/VirtualMachine.zig b/src/bun.js/VirtualMachine.zig index 61f3fa5ae6..b5fe09398e 100644 --- a/src/bun.js/VirtualMachine.zig +++ b/src/bun.js/VirtualMachine.zig @@ -3711,7 +3711,7 @@ const Global = bun.Global; const MutableString = bun.MutableString; const Ordinal = bun.Ordinal; const Output = bun.Output; -const SourceMap = bun.sourcemap; +const SourceMap = bun.SourceMap; const String = bun.String; const Transpiler = bun.Transpiler; const Watcher = bun.Watcher; diff --git a/src/bun.js/bindings/generated_classes_list.zig b/src/bun.js/bindings/generated_classes_list.zig index 41705dbd11..f5e3655bc6 100644 --- a/src/bun.js/bindings/generated_classes_list.zig +++ b/src/bun.js/bindings/generated_classes_list.zig @@ -88,7 +88,7 @@ pub const Classes = struct { pub const RedisClient = api.Valkey; pub const BlockList = api.BlockList; pub const NativeZstd = api.NativeZstd; - pub const SourceMap = bun.sourcemap.JSSourceMap; + pub const SourceMap = bun.SourceMap.JSSourceMap; }; const bun = @import("bun"); diff --git a/src/bun.js/virtual_machine_exports.zig b/src/bun.js/virtual_machine_exports.zig index 63606ad9ed..c7f01734bc 100644 --- a/src/bun.js/virtual_machine_exports.zig +++ b/src/bun.js/virtual_machine_exports.zig @@ -224,10 +224,10 @@ const std = @import("std"); const bun = @import("bun"); const PluginRunner = bun.transpiler.PluginRunner; +const BakeSourceProvider = bun.SourceMap.BakeSourceProvider; +const DevServerSourceProvider = bun.SourceMap.DevServerSourceProvider; + const jsc = bun.jsc; const JSGlobalObject = jsc.JSGlobalObject; const JSValue = jsc.JSValue; const VirtualMachine = jsc.VirtualMachine; - -const BakeSourceProvider = bun.sourcemap.BakeSourceProvider; -const DevServerSourceProvider = bun.sourcemap.DevServerSourceProvider; diff --git a/src/bun.zig b/src/bun.zig index a1230783c9..fb4b98ba84 100644 --- a/src/bun.zig +++ b/src/bun.zig @@ -1488,8 +1488,8 @@ pub fn concat(comptime T: type, dest: []T, src: []const []const T) void { } pub const renamer = @import("./renamer.zig"); -// TODO: Rename to SourceMap as this is a struct. -pub const sourcemap = @import("./sourcemap/sourcemap.zig"); + +pub const SourceMap = @import("./sourcemap/sourcemap.zig"); /// Attempt to coerce some value into a byte slice. pub fn asByteSlice(buffer: anytype) []const u8 { diff --git a/src/bundler/Chunk.zig b/src/bundler/Chunk.zig index cdf6eec74c..a7f880bd32 100644 --- a/src/bundler/Chunk.zig +++ b/src/bundler/Chunk.zig @@ -29,7 +29,7 @@ pub const Chunk = struct { has_html_chunk: bool = false, is_browser_chunk_from_server_build: bool = false, - output_source_map: sourcemap.SourceMapPieces, + output_source_map: SourceMap.SourceMapPieces, intermediate_output: IntermediateOutput = .{ .empty = {} }, isolated_hash: u64 = std.math.maxInt(u64), @@ -116,7 +116,7 @@ pub const Chunk = struct { pub const CodeResult = struct { buffer: []u8, - shifts: []sourcemap.SourceMapShifts, + shifts: []SourceMap.SourceMapShifts, }; pub fn getSize(this: *const IntermediateOutput) usize { @@ -181,12 +181,12 @@ pub const Chunk = struct { const entry_point_chunks_for_scb = linker_graph.files.items(.entry_point_chunk_index); var shift = if (enable_source_map_shifts) - sourcemap.SourceMapShifts{ + SourceMap.SourceMapShifts{ .after = .{}, .before = .{}, }; var shifts = if (enable_source_map_shifts) - try std.ArrayList(sourcemap.SourceMapShifts).initCapacity(bun.default_allocator, pieces.len + 1); + try std.ArrayList(SourceMap.SourceMapShifts).initCapacity(bun.default_allocator, pieces.len + 1); if (enable_source_map_shifts) shifts.appendAssumeCapacity(shift); @@ -245,7 +245,7 @@ pub const Chunk = struct { } const debug_id_len = if (enable_source_map_shifts and FeatureFlags.source_map_debug_id) - std.fmt.count("\n//# debugId={}\n", .{bun.sourcemap.DebugIDFormatter{ .id = chunk.isolated_hash }}) + std.fmt.count("\n//# debugId={}\n", .{bun.SourceMap.DebugIDFormatter{ .id = chunk.isolated_hash }}) else 0; @@ -256,7 +256,7 @@ pub const Chunk = struct { const data = piece.data(); if (enable_source_map_shifts) { - var data_offset = sourcemap.LineColumnOffset{}; + var data_offset = SourceMap.LineColumnOffset{}; data_offset.advance(data); shift.before.add(data_offset); shift.after.add(data_offset); @@ -353,7 +353,7 @@ pub const Chunk = struct { remain = remain[(std.fmt.bufPrint( remain, "\n//# debugId={}\n", - .{bun.sourcemap.DebugIDFormatter{ .id = chunk.isolated_hash }}, + .{bun.SourceMap.DebugIDFormatter{ .id = chunk.isolated_hash }}, ) catch |err| switch (err) { error.NoSpaceLeft => std.debug.panic( "unexpected NoSpaceLeft error from bufPrint", @@ -370,7 +370,7 @@ pub const Chunk = struct { .shifts = if (enable_source_map_shifts) shifts.items else - &[_]sourcemap.SourceMapShifts{}, + &[_]SourceMap.SourceMapShifts{}, }; }, .joiner => |*joiner| { @@ -386,7 +386,7 @@ pub const Chunk = struct { const debug_id_fmt = std.fmt.allocPrint( graph.heap.allocator(), "\n//# debugId={}\n", - .{bun.sourcemap.DebugIDFormatter{ .id = chunk.isolated_hash }}, + .{bun.SourceMap.DebugIDFormatter{ .id = chunk.isolated_hash }}, ) catch |err| bun.handleOom(err); break :brk try joiner.doneWithEnd(allocator, debug_id_fmt); @@ -397,12 +397,12 @@ pub const Chunk = struct { return .{ .buffer = buffer, - .shifts = &[_]sourcemap.SourceMapShifts{}, + .shifts = &[_]SourceMap.SourceMapShifts{}, }; }, .empty => return .{ .buffer = "", - .shifts = &[_]sourcemap.SourceMapShifts{}, + .shifts = &[_]SourceMap.SourceMapShifts{}, }, } } @@ -651,10 +651,10 @@ const FeatureFlags = bun.FeatureFlags; const ImportKind = bun.ImportKind; const ImportRecord = bun.ImportRecord; const Output = bun.Output; +const SourceMap = bun.SourceMap; const StringJoiner = bun.StringJoiner; const default_allocator = bun.default_allocator; const renamer = bun.renamer; -const sourcemap = bun.sourcemap; const strings = bun.strings; const AutoBitSet = bun.bit_set.AutoBitSet; const BabyList = bun.collections.BabyList; diff --git a/src/bundler/LinkerContext.zig b/src/bundler/LinkerContext.zig index 8b5e8aba8f..200d3c3d40 100644 --- a/src/bundler/LinkerContext.zig +++ b/src/bundler/LinkerContext.zig @@ -129,7 +129,7 @@ pub const LinkerContext = struct { pub fn computeLineOffsets(this: *LinkerContext, alloc: std.mem.Allocator, source_index: Index.Int) void { debug("Computing LineOffsetTable: {d}", .{source_index}); - const line_offset_table: *bun.sourcemap.LineOffsetTable.List = &this.graph.files.items(.line_offset_table)[source_index]; + const line_offset_table: *bun.SourceMap.LineOffsetTable.List = &this.graph.files.items(.line_offset_table)[source_index]; const source: *const Logger.Source = &this.parse_graph.input_files.items(.source)[source_index]; const loader: options.Loader = this.parse_graph.input_files.items(.loader)[source_index]; @@ -142,7 +142,7 @@ pub const LinkerContext = struct { const approximate_line_count = this.graph.ast.items(.approximate_newline_count)[source_index]; - line_offset_table.* = bun.sourcemap.LineOffsetTable.generate( + line_offset_table.* = bun.SourceMap.LineOffsetTable.generate( alloc, source.contents, @@ -686,7 +686,7 @@ pub const LinkerContext = struct { results: std.MultiArrayList(CompileResultForSourceMap), chunk_abs_dir: string, can_have_shifts: bool, - ) !sourcemap.SourceMapPieces { + ) !SourceMap.SourceMapPieces { const trace = bun.perf.trace("Bundler.generateSourceMapForChunk"); defer trace.end(); @@ -776,7 +776,7 @@ pub const LinkerContext = struct { ); const mapping_start = j.len; - var prev_end_state = sourcemap.SourceMapState{}; + var prev_end_state = SourceMap.SourceMapState{}; var prev_column_offset: i32 = 0; const source_map_chunks = results.items(.source_map_chunk); const offsets = results.items(.generated_offset); @@ -784,7 +784,7 @@ pub const LinkerContext = struct { const mapping_source_index = source_id_map.get(current_source_index) orelse unreachable; // the pass above during printing of "sources" must add the index - var start_state = sourcemap.SourceMapState{ + var start_state = SourceMap.SourceMapState{ .source_index = mapping_source_index, .generated_line = offset.lines.zeroBased(), .generated_column = offset.columns.zeroBased(), @@ -794,7 +794,7 @@ pub const LinkerContext = struct { start_state.generated_column += prev_column_offset; } - try sourcemap.appendSourceMapChunk(&j, worker.allocator, prev_end_state, start_state, chunk.buffer.list.items); + try SourceMap.appendSourceMapChunk(&j, worker.allocator, prev_end_state, start_state, chunk.buffer.list.items); prev_end_state = chunk.end_state; prev_end_state.source_index = mapping_source_index; @@ -810,7 +810,7 @@ pub const LinkerContext = struct { if (comptime FeatureFlags.source_map_debug_id) { j.pushStatic("\",\n \"debugId\": \""); j.push( - try std.fmt.allocPrint(worker.allocator, "{}", .{bun.sourcemap.DebugIDFormatter{ .id = isolated_hash }}), + try std.fmt.allocPrint(worker.allocator, "{}", .{bun.SourceMap.DebugIDFormatter{ .id = isolated_hash }}), worker.allocator, ); j.pushStatic("\",\n \"names\": []\n}"); @@ -821,7 +821,7 @@ pub const LinkerContext = struct { const done = try j.done(worker.allocator); bun.assert(done[0] == '{'); - var pieces = sourcemap.SourceMapPieces.init(worker.allocator); + var pieces = SourceMap.SourceMapPieces.init(worker.allocator); if (can_have_shifts) { try pieces.prefix.appendSlice(done[0..mapping_start]); try pieces.mappings.appendSlice(done[mapping_start..mapping_end]); @@ -1411,7 +1411,7 @@ pub const LinkerContext = struct { const SubstituteChunkFinalPathResult = struct { j: StringJoiner, - shifts: []sourcemap.SourceMapShifts, + shifts: []SourceMap.SourceMapShifts, }; pub fn mangleLocalCss(c: *LinkerContext) void { @@ -2684,11 +2684,11 @@ const MultiArrayList = bun.MultiArrayList; const MutableString = bun.MutableString; const OOM = bun.OOM; const Output = bun.Output; +const SourceMap = bun.SourceMap; const StringJoiner = bun.StringJoiner; const bake = bun.bake; const base64 = bun.base64; const renamer = bun.renamer; -const sourcemap = bun.sourcemap; const strings = bun.strings; const sync = bun.threading; const AutoBitSet = bun.bit_set.AutoBitSet; diff --git a/src/bundler/LinkerGraph.zig b/src/bundler/LinkerGraph.zig index c160e96c28..8fd01500ae 100644 --- a/src/bundler/LinkerGraph.zig +++ b/src/bundler/LinkerGraph.zig @@ -458,7 +458,7 @@ pub const File = struct { /// a Source.Index to its output path inb reakOutputIntoPieces entry_point_chunk_index: u32 = std.math.maxInt(u32), - line_offset_table: bun.sourcemap.LineOffsetTable.List = .empty, + line_offset_table: bun.SourceMap.LineOffsetTable.List = .empty, quoted_source_contents: Owned(?[]u8) = .initNull(), pub fn isEntryPoint(this: *const File) bool { diff --git a/src/bundler/bundle_v2.zig b/src/bundler/bundle_v2.zig index 9b5d912dd5..712a8a99b5 100644 --- a/src/bundler/bundle_v2.zig +++ b/src/bundler/bundle_v2.zig @@ -2868,7 +2868,7 @@ pub const BundleV2 = struct { .parts_in_chunk_in_order = js_part_ranges, }, }, - .output_source_map = sourcemap.SourceMapPieces.init(this.allocator()), + .output_source_map = SourceMap.SourceMapPieces.init(this.allocator()), }; // Then all the distinct CSS bundles (these are JS->CSS, not CSS->CSS) @@ -2886,7 +2886,7 @@ pub const BundleV2 = struct { .asts = try this.allocator().alloc(bun.css.BundlerStyleSheet, order.len), }, }, - .output_source_map = sourcemap.SourceMapPieces.init(this.allocator()), + .output_source_map = SourceMap.SourceMapPieces.init(this.allocator()), }; } @@ -2899,7 +2899,7 @@ pub const BundleV2 = struct { .is_entry_point = false, }, .content = .html, - .output_source_map = sourcemap.SourceMapPieces.init(this.allocator()), + .output_source_map = SourceMap.SourceMapPieces.init(this.allocator()), }; } @@ -4264,7 +4264,7 @@ pub const CompileResult = union(enum) { css: struct { result: bun.Maybe([]const u8, anyerror), source_index: Index.Int, - source_map: ?bun.sourcemap.Chunk = null, + source_map: ?bun.SourceMap.Chunk = null, }, html: struct { source_index: Index.Int, @@ -4295,7 +4295,7 @@ pub const CompileResult = union(enum) { }; } - pub fn sourceMapChunk(this: *const CompileResult) ?sourcemap.Chunk { + pub fn sourceMapChunk(this: *const CompileResult) ?SourceMap.Chunk { return switch (this.*) { .javascript => |r| switch (r.result) { .result => |r2| r2.source_map, @@ -4314,8 +4314,8 @@ pub const CompileResult = union(enum) { }; pub const CompileResultForSourceMap = struct { - source_map_chunk: sourcemap.Chunk, - generated_offset: sourcemap.LineColumnOffset, + source_map_chunk: SourceMap.Chunk, + generated_offset: SourceMap.LineColumnOffset, source_index: u32, }; @@ -4503,7 +4503,7 @@ pub const Part = js_ast.Part; pub const js_printer = @import("../js_printer.zig"); pub const js_ast = bun.ast; pub const linker = @import("../linker.zig"); -pub const sourcemap = bun.sourcemap; +pub const SourceMap = bun.SourceMap; pub const StringJoiner = bun.StringJoiner; pub const base64 = bun.base64; pub const Ref = bun.ast.Ref; diff --git a/src/bundler/linker_context/computeChunks.zig b/src/bundler/linker_context/computeChunks.zig index fd98457e4c..18e8910a6b 100644 --- a/src/bundler/linker_context/computeChunks.zig +++ b/src/bundler/linker_context/computeChunks.zig @@ -63,7 +63,7 @@ pub noinline fn computeChunks( }, .entry_bits = entry_bits.*, .content = .html, - .output_source_map = sourcemap.SourceMapPieces.init(this.allocator()), + .output_source_map = SourceMap.SourceMapPieces.init(this.allocator()), .is_browser_chunk_from_server_build = could_be_browser_target_from_server_build and ast_targets[source_index] == .browser, }; } @@ -97,7 +97,7 @@ pub noinline fn computeChunks( .asts = bun.handleOom(this.allocator().alloc(bun.css.BundlerStyleSheet, order.len)), }, }, - .output_source_map = sourcemap.SourceMapPieces.init(this.allocator()), + .output_source_map = SourceMap.SourceMapPieces.init(this.allocator()), .has_html_chunk = has_html_chunk, .is_browser_chunk_from_server_build = could_be_browser_target_from_server_build and ast_targets[source_index] == .browser, }; @@ -120,7 +120,7 @@ pub noinline fn computeChunks( .javascript = .{}, }, .has_html_chunk = has_html_chunk, - .output_source_map = sourcemap.SourceMapPieces.init(this.allocator()), + .output_source_map = SourceMap.SourceMapPieces.init(this.allocator()), .is_browser_chunk_from_server_build = could_be_browser_target_from_server_build and ast_targets[source_index] == .browser, }; @@ -173,7 +173,7 @@ pub noinline fn computeChunks( }, }, .files_with_parts_in_chunk = css_files_with_parts_in_chunk, - .output_source_map = sourcemap.SourceMapPieces.init(this.allocator()), + .output_source_map = SourceMap.SourceMapPieces.init(this.allocator()), .has_html_chunk = has_html_chunk, .is_browser_chunk_from_server_build = could_be_browser_target_from_server_build and ast_targets[source_index] == .browser, }; @@ -217,7 +217,7 @@ pub noinline fn computeChunks( .content = .{ .javascript = .{}, }, - .output_source_map = sourcemap.SourceMapPieces.init(this.allocator()), + .output_source_map = SourceMap.SourceMapPieces.init(this.allocator()), .is_browser_chunk_from_server_build = is_browser_chunk_from_server_build, }; } @@ -422,8 +422,8 @@ const std = @import("std"); const bun = @import("bun"); const BabyList = bun.BabyList; +const SourceMap = bun.SourceMap; const options = bun.options; -const sourcemap = bun.sourcemap; const AutoBitSet = bun.bit_set.AutoBitSet; const bundler = bun.bundle_v2; diff --git a/src/bundler/linker_context/postProcessCSSChunk.zig b/src/bundler/linker_context/postProcessCSSChunk.zig index c969b53c0e..1f2b6dc5b4 100644 --- a/src/bundler/linker_context/postProcessCSSChunk.zig +++ b/src/bundler/linker_context/postProcessCSSChunk.zig @@ -8,7 +8,7 @@ pub fn postProcessCSSChunk(ctx: GenerateChunkCtx, worker: *ThreadPool.Worker, ch }, }; - var line_offset: bun.sourcemap.LineColumnOffset.Optional = if (c.options.source_maps != .none) .{ .value = .{} } else .{ .null = {} }; + var line_offset: bun.SourceMap.LineColumnOffset.Optional = if (c.options.source_maps != .none) .{ .value = .{} } else .{ .null = {} }; var newline_before_comment = false; diff --git a/src/bundler/linker_context/postProcessJSChunk.zig b/src/bundler/linker_context/postProcessJSChunk.zig index 110b3870cd..d174286d16 100644 --- a/src/bundler/linker_context/postProcessJSChunk.zig +++ b/src/bundler/linker_context/postProcessJSChunk.zig @@ -110,7 +110,7 @@ pub fn postProcessJSChunk(ctx: GenerateChunkCtx, worker: *ThreadPool.Worker, chu errdefer j.deinit(); const output_format = c.options.output_format; - var line_offset: bun.sourcemap.LineColumnOffset.Optional = if (c.options.source_maps != .none) .{ .value = .{} } else .{ .null = {} }; + var line_offset: bun.SourceMap.LineColumnOffset.Optional = if (c.options.source_maps != .none) .{ .value = .{} } else .{ .null = {} }; // Concatenate the generated JavaScript chunks together diff --git a/src/bundler/linker_context/writeOutputFilesToDisk.zig b/src/bundler/linker_context/writeOutputFilesToDisk.zig index e49fd8c7e1..5d4081a7e0 100644 --- a/src/bundler/linker_context/writeOutputFilesToDisk.zig +++ b/src/bundler/linker_context/writeOutputFilesToDisk.zig @@ -426,7 +426,6 @@ const base64 = bun.base64; const default_allocator = bun.default_allocator; const jsc = bun.jsc; const options = bun.options; -const sourcemap = bun.sourcemap; const strings = bun.strings; const bundler = bun.bundle_v2; diff --git a/src/cli/test_command.zig b/src/cli/test_command.zig index 8436e1394d..6466f14b88 100644 --- a/src/cli/test_command.zig +++ b/src/cli/test_command.zig @@ -960,7 +960,7 @@ pub const CommandLineReporter = struct { var map = coverage.ByteRangeMapping.map orelse return; var iter = map.valueIterator(); - var byte_ranges = try std.ArrayList(bun.sourcemap.coverage.ByteRangeMapping).initCapacity(bun.default_allocator, map.count()); + var byte_ranges = try std.ArrayList(bun.SourceMap.coverage.ByteRangeMapping).initCapacity(bun.default_allocator, map.count()); while (iter.next()) |entry| { byte_ranges.appendAssumeCapacity(entry.*); @@ -971,10 +971,10 @@ pub const CommandLineReporter = struct { } std.sort.pdq( - bun.sourcemap.coverage.ByteRangeMapping, + bun.SourceMap.coverage.ByteRangeMapping, byte_ranges.items, {}, - bun.sourcemap.coverage.ByteRangeMapping.isLessThan, + bun.SourceMap.coverage.ByteRangeMapping.isLessThan, ); try this.printCodeCoverage(vm, opts, byte_ranges.items, reporters, enable_ansi_colors); @@ -984,7 +984,7 @@ pub const CommandLineReporter = struct { _: *CommandLineReporter, vm: *jsc.VirtualMachine, opts: *TestCommand.CodeCoverageOptions, - byte_ranges: []bun.sourcemap.coverage.ByteRangeMapping, + byte_ranges: []bun.SourceMap.coverage.ByteRangeMapping, comptime reporters: TestCommand.Reporters, comptime enable_ansi_colors: bool, ) !void { @@ -1054,7 +1054,7 @@ pub const CommandLineReporter = struct { var console_buffer_buffer = console_buffer.bufferedWriter(); var console_writer = console_buffer_buffer.writer(); - var avg = bun.sourcemap.coverage.Fraction{ + var avg = bun.SourceMap.coverage.Fraction{ .functions = 0.0, .lines = 0.0, .stmts = 0.0, @@ -1185,7 +1185,7 @@ pub const CommandLineReporter = struct { avg.stmts /= avg_count; } - const failed = if (avg_count > 0) base_fraction else bun.sourcemap.coverage.Fraction{ + const failed = if (avg_count > 0) base_fraction else bun.SourceMap.coverage.Fraction{ .functions = 0, .lines = 0, .stmts = 0, @@ -1280,7 +1280,7 @@ pub const TestCommand = struct { skip_test_files: bool = !Environment.allow_assert, reporters: Reporters = .{ .text = true, .lcov = false }, reports_directory: string = "coverage", - fractions: bun.sourcemap.coverage.Fraction = .{}, + fractions: bun.SourceMap.coverage.Fraction = .{}, ignore_sourcemap: bool = false, enabled: bool = false, fail_on_low_coverage: bool = false, @@ -2010,12 +2010,12 @@ const strings = bun.strings; const uws = bun.uws; const HTTPThread = bun.http.HTTPThread; +const coverage = bun.SourceMap.coverage; +const CodeCoverageReport = coverage.Report; + const jsc = bun.jsc; const jest = jsc.Jest; const Snapshots = jsc.Snapshot.Snapshots; const TestRunner = jsc.Jest.TestRunner; const Test = TestRunner.Test; - -const coverage = bun.sourcemap.coverage; -const CodeCoverageReport = coverage.Report; diff --git a/src/js_printer.zig b/src/js_printer.zig index c510555bba..15fee9f6eb 100644 --- a/src/js_printer.zig +++ b/src/js_printer.zig @@ -390,7 +390,7 @@ pub const Options = struct { allocator: std.mem.Allocator = default_allocator, source_map_allocator: ?std.mem.Allocator = null, source_map_handler: ?SourceMapHandler = null, - source_map_builder: ?*bun.sourcemap.Chunk.Builder = null, + source_map_builder: ?*bun.SourceMap.Chunk.Builder = null, css_import_behavior: api.CssInJsBehavior = api.CssInJsBehavior.facade, target: options.Target = .browser, diff --git a/src/sourcemap/CodeCoverage.zig b/src/sourcemap/CodeCoverage.zig index bc4a8ee4be..b6d6899ce4 100644 --- a/src/sourcemap/CodeCoverage.zig +++ b/src/sourcemap/CodeCoverage.zig @@ -726,7 +726,7 @@ const std = @import("std"); const bun = @import("bun"); const Bitset = bun.bit_set.DynamicBitSetUnmanaged; -const LineOffsetTable = bun.sourcemap.LineOffsetTable; +const LineOffsetTable = bun.SourceMap.LineOffsetTable; const Output = bun.Output; const prettyFmt = Output.prettyFmt; diff --git a/src/sourcemap/JSSourceMap.zig b/src/sourcemap/JSSourceMap.zig index 0414359019..6162eda416 100644 --- a/src/sourcemap/JSSourceMap.zig +++ b/src/sourcemap/JSSourceMap.zig @@ -2,7 +2,7 @@ /// const JSSourceMap = @This(); -sourcemap: *bun.sourcemap.ParsedSourceMap, +sourcemap: *bun.SourceMap.ParsedSourceMap, sources: []bun.String = &.{}, names: []bun.String = &.{}, @@ -136,7 +136,7 @@ pub fn constructor( } // Parse the VLQ mappings - const parse_result = bun.sourcemap.Mapping.parse( + const parse_result = bun.SourceMap.Mapping.parse( bun.default_allocator, mappings_str.slice(), null, // estimated_mapping_count @@ -156,7 +156,7 @@ pub fn constructor( }; const source_map = bun.new(JSSourceMap, .{ - .sourcemap = bun.new(bun.sourcemap.ParsedSourceMap, mapping_list), + .sourcemap = bun.new(bun.SourceMap.ParsedSourceMap, mapping_list), .sources = sources.items, .names = names.items, }); @@ -200,7 +200,7 @@ fn getLineColumn(globalObject: *JSGlobalObject, callFrame: *CallFrame) bun.JSErr }; } -fn mappingNameToJS(this: *const JSSourceMap, globalObject: *JSGlobalObject, mapping: *const bun.sourcemap.Mapping) bun.JSError!JSValue { +fn mappingNameToJS(this: *const JSSourceMap, globalObject: *JSGlobalObject, mapping: *const bun.SourceMap.Mapping) bun.JSError!JSValue { const name_index = mapping.nameIndex(); if (name_index >= 0) { if (this.sourcemap.mappings.getName(name_index)) |name| { @@ -215,7 +215,7 @@ fn mappingNameToJS(this: *const JSSourceMap, globalObject: *JSGlobalObject, mapp return .js_undefined; } -fn sourceNameToJS(this: *const JSSourceMap, globalObject: *JSGlobalObject, mapping: *const bun.sourcemap.Mapping) bun.JSError!JSValue { +fn sourceNameToJS(this: *const JSSourceMap, globalObject: *JSGlobalObject, mapping: *const bun.SourceMap.Mapping) bun.JSError!JSValue { const source_index = mapping.sourceIndex(); if (source_index >= 0 and source_index < @as(i32, @intCast(this.sources.len))) { return this.sources[@intCast(source_index)].toJS(globalObject);