chore: ensure source maps are cached

Author: fraidev

src/analysis.rs

@@ -276,6 +276,9 @@ pub struct ModuleInfo {
   /// or `@import { SomeType } from "npm:some-module"`.
   #[serde(skip_serializing_if = "Vec::is_empty", default)]
   pub jsdoc_imports: Vec<JsDocImportInfo>,
+  /// Source map URL extracted from sourceMappingURL comment
+  #[serde(skip_serializing_if = "Option::is_none", default)]
+  pub source_map_url: Option<SpecifierWithRange>,
 }
 
 fn is_false(v: &bool) -> bool {
@@ -442,6 +445,14 @@ pub fn find_jsx_import_source_types(text: &str) -> Option<regex::Match<'_>> {
     .and_then(|c| c.get(1))
 }
 
+/// Matches the `sourceMappingURL` comment.
+pub fn find_source_mapping_url(text: &str) -> Option<regex::Match<'_>> {
+  static SOURCE_MAPPING_URL_RE: Lazy<Regex> = Lazy::new(|| {
+    Regex::new(r"(?i)^[#@]\s*sourceMappingURL\s*=\s*(\S+)").unwrap()
+  });
+  SOURCE_MAPPING_URL_RE.captures(text).and_then(|c| c.get(1))
+}
+
 /// Matches the `@ts-self-types` pragma.
 pub fn find_ts_self_types(text: &str) -> Option<regex::Match<'_>> {
   static TS_SELF_TYPES_RE: Lazy<Regex> = Lazy::new(|| {
@@ -505,6 +516,7 @@ mod test {
       jsx_import_source: None,
       jsx_import_source_types: None,
       jsdoc_imports: Vec::new(),
+      source_map_url: None,
     };
     run_serialization_test(&module_info, json!({}));
   }
@@ -574,6 +586,7 @@ mod test {
       jsx_import_source: None,
       jsx_import_source_types: None,
       jsdoc_imports: Vec::new(),
+      source_map_url: None,
     };
     run_serialization_test(
       &module_info,
@@ -659,6 +672,7 @@ mod test {
       jsx_import_source: None,
       jsx_import_source_types: None,
       jsdoc_imports: Vec::new(),
+      source_map_url: None,
     };
     run_serialization_test(
       &module_info,
@@ -704,6 +718,7 @@ mod test {
       jsx_import_source: None,
       jsx_import_source_types: None,
       jsdoc_imports: Vec::new(),
+      source_map_url: None,
     };
     run_serialization_test(
       &module_info,
@@ -734,6 +749,7 @@ mod test {
       }),
       jsx_import_source_types: None,
       jsdoc_imports: Vec::new(),
+      source_map_url: None,
     };
     run_serialization_test(
       &module_info,
@@ -764,6 +780,7 @@ mod test {
         },
       }),
       jsdoc_imports: Vec::new(),
+      source_map_url: None,
     };
     run_serialization_test(
       &module_info,
@@ -819,6 +836,7 @@ mod test {
           resolution_mode: Some(TypeScriptTypesResolutionMode::Require),
         },
       ]),
+      source_map_url: None,
     };
     run_serialization_test(
       &module_info,
@@ -1053,6 +1071,7 @@ mod test {
       jsx_import_source: None,
       jsx_import_source_types: None,
       jsdoc_imports: Vec::new(),
+      source_map_url: None,
     };
     let json = json!({
       "dependencies": [{
@@ -1097,6 +1116,7 @@ mod test {
       jsx_import_source: None,
       jsx_import_source_types: None,
       jsdoc_imports: Vec::new(),
+      source_map_url: None,
     };
     let json = json!({
       "dependencies": [{

src/ast/mod.rs

@@ -16,6 +16,7 @@ use crate::analysis::find_jsx_import_source;
 use crate::analysis::find_jsx_import_source_types;
 use crate::analysis::find_path_reference;
 use crate::analysis::find_resolution_mode;
+use crate::analysis::find_source_mapping_url;
 use crate::analysis::find_ts_self_types;
 use crate::analysis::find_ts_types;
 use crate::analysis::find_types_reference;
@@ -268,6 +269,9 @@ impl<'a> ParserModuleAnalyzer<'a> {
         None => comments.get_leading(program.start()),
       },
     };
+    // Get trailing comments from the program end to extract sourceMappingURL
+    // which is typically at the very end of the file
+    let trailing_comments = comments.get_trailing(program.end());
     ModuleInfo {
       is_script: program.compute_is_script(),
       dependencies: analyze_dependencies(program, text_info, comments),
@@ -288,6 +292,7 @@ impl<'a> ParserModuleAnalyzer<'a> {
         leading_comments,
       ),
       jsdoc_imports: analyze_jsdoc_imports(media_type, text_info, comments),
+      source_map_url: analyze_source_map_url(text_info, trailing_comments),
     }
   }
 
@@ -608,6 +613,27 @@ fn analyze_ts_self_types(
   })
 }
 
+// Search source map URL from trailing comments
+fn analyze_source_map_url(
+  text_info: &SourceTextInfo,
+  trailing_comments: Option<&Vec<deno_ast::swc::common::comments::Comment>>,
+) -> Option<SpecifierWithRange> {
+  trailing_comments.and_then(|c| {
+    c.iter().rev().find_map(|comment| {
+      let source_mapping_url = find_source_mapping_url(&comment.text)?;
+      Some(SpecifierWithRange {
+        text: source_mapping_url.as_str().to_string(),
+        range: comment_source_to_position_range(
+          comment.start(),
+          source_mapping_url.range(),
+          text_info,
+          true,
+        ),
+      })
+    })
+  })
+}
+
 /// Searches comments for any `@ts-types` or `@deno-types` compiler hints.
 pub fn analyze_ts_or_deno_types(
   text_info: &SourceTextInfo,
@@ -1459,6 +1485,7 @@ export {};
         }),
         jsx_import_source_types: None,
         jsdoc_imports: vec![],
+        source_map_url: None,
       },
     );
   }

src/graph.rs

@@ -1439,6 +1439,8 @@ pub struct JsModule {
   #[serde(skip_serializing_if = "is_media_type_unknown")]
   pub media_type: MediaType,
   pub specifier: ModuleSpecifier,
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub maybe_source_map_dependency: Option<TypesDependency>,
   #[cfg(feature = "fast_check")]
   #[serde(skip_serializing)]
   pub fast_check: Option<FastCheckTypeModuleSlot>,
@@ -3145,10 +3147,30 @@ pub(crate) fn parse_js_module_from_module_info(
     maybe_types_dependency: None,
     media_type,
     specifier,
+    maybe_source_map_dependency: None,
     #[cfg(feature = "fast_check")]
     fast_check: None,
   };
 
+  // Resolve source map dependency if source_map_url is present
+  if let Some(source_map_specifier) = module_info.source_map_url.as_ref() {
+    let range = Range {
+      specifier: module.specifier.clone(),
+      range: source_map_specifier.range,
+      resolution_mode: None,
+    };
+    module.maybe_source_map_dependency = Some(TypesDependency {
+      specifier: source_map_specifier.text.clone(),
+      dependency: resolve(
+        &source_map_specifier.text,
+        range.clone(),
+        ResolutionKind::Execution,
+        jsr_url_provider,
+        maybe_resolver,
+      ),
+    });
+  }
+
   // Analyze the TypeScript triple-slash references and self types specifier
   if graph_kind.include_types() {
     if let Some(specifier) = module_info.self_types_specifier.as_ref() {
@@ -6000,6 +6022,23 @@ impl<'a, 'graph> Builder<'a, 'graph> {
         if matches!(self.graph.graph_kind, GraphKind::All | GraphKind::CodeOnly)
           || module.maybe_types_dependency.is_none()
         {
+          // Load source map as an external module if it exists
+          if let Some(Resolution::Ok(resolved)) = module
+            .maybe_source_map_dependency
+            .as_ref()
+            .map(|d| &d.dependency)
+          {
+            self.load(LoadOptionsRef {
+              specifier: &resolved.specifier,
+              maybe_range: Some(&resolved.range),
+              is_asset: true,
+              in_dynamic_branch: self.in_dynamic_branch,
+              is_root: self.resolved_roots.contains(&resolved.specifier),
+              maybe_attribute_type: None,
+              maybe_version_info,
+            });
+          }
+
           self.visit_module_dependencies(
             &mut module.dependencies,
             maybe_version_info,