feat: add native source maps support

Author: fraidev

Cargo.lock

@@ -61,7 +61,7 @@ repository = "https://github.com/denoland/deno"
 
 [workspace.dependencies]
 deno_ast = { version = "=0.50.3", features = ["transpiling"] }
-deno_core = { version = "0.368.0" }
+deno_core = { version = "0.369.0" }
 
 deno_cache_dir = "=0.25.0"
 deno_doc = "=0.186.0"

Cargo.toml

@@ -1218,6 +1218,8 @@ impl<TGraphContainer: ModuleGraphContainer> ModuleLoader
       "wasm" | "file" | "http" | "https" | "data" | "blob" => (),
       _ => return None,
     }
+
+    // Load the prepared module and extract inline source map
     let graph = self.0.graph_container.graph();
     let source = self
       .0
@@ -1228,29 +1230,76 @@ impl<TGraphContainer: ModuleGraphContainer> ModuleLoader
     source_map_from_code(source.source.as_bytes()).map(Cow::Owned)
   }
 
+  fn load_external_source_map(
+    &self,
+    source_map_url: &str,
+  ) -> Option<Cow<'_, [u8]>> {
+    let specifier = resolve_url(source_map_url).ok()?;
+
+    if let Ok(Some(file)) = self
+      .0
+      .shared
+      .file_fetcher
+      .get_cached_source_or_local(&specifier)
+    {
+      return Some(Cow::Owned(file.source.to_vec()));
+    }
+
+    None
+  }
+
   fn get_source_mapped_source_line(
     &self,
     file_name: &str,
     line_number: usize,
   ) -> Option<String> {
+    let specifier = resolve_url(file_name).ok()?;
     let graph = self.0.graph_container.graph();
-    let code = match graph.get(&resolve_url(file_name).ok()?) {
+
+    let code = match graph.get(&specifier) {
       Some(deno_graph::Module::Js(module)) => &module.source.text,
       Some(deno_graph::Module::Json(module)) => &module.source.text,
-      _ => return None,
+      Some(
+        deno_graph::Module::Wasm(_)
+        | deno_graph::Module::Npm(_)
+        | deno_graph::Module::Node(_)
+        | deno_graph::Module::External(_),
+      ) => {
+        return None;
+      }
+      None => {
+        // Not in graph, try to read from file system (for source-mapped original files)
+        if let Ok(Some(file)) = self
+          .0
+          .shared
+          .file_fetcher
+          .get_cached_source_or_local(&specifier)
+        {
+          return extract_source_line(
+            &String::from_utf8_lossy(&file.source),
+            line_number,
+          );
+        } else {
+          return None;
+        }
+      }
     };
-    // Do NOT use .lines(): it skips the terminating empty line.
-    // (due to internally using_terminator() instead of .split())
-    let lines: Vec<&str> = code.split('\n').collect();
-    if line_number >= lines.len() {
-      Some(format!(
-        "{} Couldn't format source line: Line {} is out of bounds (source may have changed at runtime)",
-        crate::colors::yellow("Warning"),
-        line_number + 1,
-      ))
-    } else {
-      Some(lines[line_number].to_string())
-    }
+
+    extract_source_line(code, line_number)
+  }
+}
+
+/// Extracts a specific line from source code text.
+fn extract_source_line(text: &str, line_number: usize) -> Option<String> {
+  // Do NOT use .lines(): it skips the terminating empty line.
+  // (due to internally using_terminator() instead of .split())
+  match text.split('\n').nth(line_number) {
+    Some(line) => Some(line.to_string()),
+    None => Some(format!(
+      "{} Couldn't format source line: Line {} is out of bounds (source may have changed at runtime)",
+      crate::colors::yellow("Warning"),
+      line_number + 1,
+    )),
   }
 }
 

cli/module_loader.rs

@@ -583,6 +583,15 @@ impl ModuleLoader for EmbeddedModuleLoader {
     data.source_map
   }
 
+  fn load_external_source_map(
+    &self,
+    source_map_url: &str,
+  ) -> Option<Cow<'_, [u8]>> {
+    let url = Url::parse(source_map_url).ok()?;
+    let data = self.shared.modules.read(&url).ok()??;
+    Some(Cow::Owned(data.data.to_vec()))
+  }
+
   fn get_source_mapped_source_line(
     &self,
     file_name: &str,

cli/rt/run.rs

@@ -1,5 +1,7 @@
 1
 1
 error: Uncaught (in promise) TypeError: this.otherMethod is not a function
+    return this.otherMethod();
+                ^
     at getValue (file://[WILDCARD]/@denotest/cjs-this-in-exports/1.0.0/index.js:3:17)
     at file://[WILDCARD]/main.js:11:1

tests/specs/npm/cjs_this_in_exports/cjs_this_in_exports/main.out

@@ -0,0 +1,5 @@
+{
+  "args": "run external.js",
+  "output": "external.js.out",
+  "exitCode": 1
+}

tests/specs/run/sourcemap_external/__test__.jsonc

@@ -0,0 +1,5 @@
+error: Uncaught (in promise) Error: Test error with external sourcemap
+  throw new Error("Test error with external sourcemap");
+  ^
+    at throwError ([WILDCARD]original.ts:3:3)
+    at [WILDCARD]original.ts:6:14

tests/specs/run/sourcemap_external/external.js

@@ -0,0 +1,6 @@
+// Original TypeScript file
+function throwError() {
+  throw new Error("Test error with external sourcemap");
+}
+
+throwError();