mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-14 12:51:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix sourceMappingURL parsing logic to search last 500 chars, add extensive debug output

Browse Source
This commit is contained in:
Claude Bot
2025-10-09 17:04:55 +00:00
parent 02e46e65eb
commit a0e4bd541d
2 changed files with 78 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
src/bun.js/ModuleLoader.zig
View File

@@ -1192,33 +1192,55 @@ pub fn transpileSourceCode(
} else if (bun.sourcemap.JSSourceMap.@"--enable-source-maps") {
// When --enable-source-maps is enabled and there's no cache entry (i.e., file wasn't transpiled),
// check if the source has a user-provided sourceMappingURL and register it
if (bun.Environment.isDebug) {
Output.prettyln("[ModuleLoader] --enable-source-maps is ON, checking for user sourcemap in: {s}", .{source.path.text});
Output.flush();
}
const source_contents = source.contents;
if (bun.strings.lastIndexOfChar(source_contents, '\n')) |last_newline| {
const last_lines = source_contents[last_newline..];
if (bun.strings.indexOf(last_lines, "//# sourceMappingURL=")) |url_idx| {
const url_start = last_newline + url_idx + "//# sourceMappingURL=".len;
const url_end = bun.strings.indexOfChar(source_contents[url_start..], '\n') orelse
(source_contents.len - url_start);
const source_map_url = bun.strings.trim(source_contents[url_start..][0..url_end], " \r\t");
// Look for sourceMappingURL in the last ~500 characters of the file
const search_start = if (source_contents.len > 500) source_contents.len - 500 else 0;
const search_region = source_contents[search_start..];
if (bun.strings.lastIndexOf(search_region, "//# sourceMappingURL=")) |url_idx| {
const url_start = search_start + url_idx + "//# sourceMappingURL=".len;
const url_end = bun.strings.indexOfAny(source_contents[url_start..], "\r\n") orelse
(source_contents.len - url_start);
const source_map_url = bun.strings.trim(source_contents[url_start..][0..url_end], " \r\t");
// Use a stack fallback allocator for temporary parsing
var sfb = std.heap.stackFallback(8192, bun.default_allocator);
const temp_alloc = sfb.get();
if (bun.Environment.isDebug) {
Output.prettyln("[ModuleLoader] Found sourceMappingURL: {s}", .{source_map_url});
Output.flush();
}
// Try to parse the sourcemap URL (handles both inline and external)
const parse = SourceMap.parseUrl(
bun.default_allocator,
temp_alloc,
source_map_url,
.mappings_only,
) catch null;
// Use a stack fallback allocator for temporary parsing
var sfb = std.heap.stackFallback(8192, bun.default_allocator);
const temp_alloc = sfb.get();
if (parse) |p| {
if (p.map) |map| {
// Register the parsed source map
map.ref();
jsc_vm.source_mappings.putValue(source.path.text, SavedSourceMap.Value.init(map)) catch {};
// Try to parse the sourcemap URL (handles both inline and external)
const parse = SourceMap.parseUrl(
bun.default_allocator,
temp_alloc,
source_map_url,
.mappings_only,
) catch null;
if (parse) |p| {
if (bun.Environment.isDebug) {
Output.prettyln("[ModuleLoader] Parse result has map: {}", .{p.map != null});
Output.flush();
}
if (p.map) |map| {
// Register the parsed source map
if (bun.Environment.isDebug) {
Output.prettyln("[ModuleLoader] Registering sourcemap for: {s}", .{source.path.text});
Output.flush();
}
map.ref();
jsc_vm.source_mappings.putValue(source.path.text, SavedSourceMap.Value.init(map)) catch {};
}
} else {
if (bun.Environment.isDebug) {
Output.prettyln("[ModuleLoader] Parse returned null!", .{});
Output.flush();
}
}
}
@@ -2547,29 +2569,29 @@ pub const RuntimeTranspilerStore = struct {
// When --enable-source-maps is enabled and there's no cache entry,
// check if the source has a user-provided sourceMappingURL and register it
const source_contents = parse_result.source.contents;
if (bun.strings.lastIndexOfChar(source_contents, '\n')) |last_newline| {
const last_lines = source_contents[last_newline..];
if (bun.strings.indexOf(last_lines, "//# sourceMappingURL=")) |url_idx| {
const url_start = last_newline + url_idx + "//# sourceMappingURL=".len;
const url_end = bun.strings.indexOfChar(source_contents[url_start..], '\n') orelse
(source_contents.len - url_start);
const source_map_url = bun.strings.trim(source_contents[url_start..][0..url_end], " \r\t");
// Look for sourceMappingURL in the last ~500 characters of the file
const search_start = if (source_contents.len > 500) source_contents.len - 500 else 0;
const search_region = source_contents[search_start..];
if (bun.strings.lastIndexOf(search_region, "//# sourceMappingURL=")) |url_idx| {
const url_start = search_start + url_idx + "//# sourceMappingURL=".len;
const url_end = bun.strings.indexOfAny(source_contents[url_start..], "\r\n") orelse
(source_contents.len - url_start);
const source_map_url = bun.strings.trim(source_contents[url_start..][0..url_end], " \r\t");
var sfb = std.heap.stackFallback(8192, bun.default_allocator);
const temp_alloc = sfb.get();
var sfb = std.heap.stackFallback(8192, bun.default_allocator);
const temp_alloc = sfb.get();
const parse = SourceMap.parseUrl(
bun.default_allocator,
temp_alloc,
source_map_url,
.mappings_only,
) catch null;
const parse = SourceMap.parseUrl(
bun.default_allocator,
temp_alloc,
source_map_url,
.mappings_only,
) catch null;
if (parse) |p| {
if (p.map) |map| {
map.ref();
vm.source_mappings.putValue(parse_result.source.path.text, SavedSourceMap.Value.init(map)) catch {};
}
if (parse) |p| {
if (p.map) |map| {
map.ref();
vm.source_mappings.putValue(parse_result.source.path.text, SavedSourceMap.Value.init(map)) catch {};
}
}
}

15
src/cli/Arguments.zig
View File

@@ -582,6 +582,10 @@ pub fn parse(allocator: std.mem.Allocator, ctx: Command.Context, comptime cmd: C
// runtime commands
if (cmd == .AutoCommand or cmd == .RunCommand or cmd == .TestCommand or cmd == .RunAsNodeCommand) {
if (bun.Environment.isDebug) {
Output.prettyln("[arguments] Entered runtime commands block, cmd={s}", .{@tagName(cmd)});
Output.flush();
}
{
const preloads = args.options("--preload");
const preloads2 = args.options("--require");
@@ -714,8 +718,17 @@ pub fn parse(allocator: std.mem.Allocator, ctx: Command.Context, comptime cmd: C
ctx.runtime_options.preconnect = args.options("--fetch-preconnect");
ctx.runtime_options.expose_gc = args.flag("--expose-gc");
if (args.flag("--enable-source-maps")) {
const enable_source_maps_flag = args.flag("--enable-source-maps");
if (bun.Environment.isDebug) {
Output.prettyln("[arguments] Checking --enable-source-maps flag: {}", .{enable_source_maps_flag});
Output.flush();
}
if (enable_source_maps_flag) {
bun.sourcemap.JSSourceMap.@"--enable-source-maps" = true;
if (bun.Environment.isDebug) {
Output.prettyln("[arguments] --enable-source-maps flag set to true", .{});
Output.flush();
}
}
if (args.option("--console-depth")) |depth_str| {