wip

Author: bartlomieju

core/examples/ts_module_loader.rs

@@ -34,9 +34,13 @@ use deno_core::SourceMapGetter;
 #[derive(Clone)]
 struct SourceMapStore(Rc<RefCell<HashMap<String, Vec<u8>>>>);
 
-impl SourceMapGetter for SourceMapStore {
+struct TypescriptModuleLoader {
+  source_maps: SourceMapStore,
+}
+
+impl SourceMapGetter for TypescriptModuleLoader {
   fn get_source_map(&self, specifier: &str) -> Option<Vec<u8>> {
-    self.0.borrow().get(specifier).cloned()
+    self.source_maps.0.borrow().get(specifier).cloned()
   }
 
   fn get_source_line(
@@ -48,10 +52,6 @@ impl SourceMapGetter for SourceMapStore {
   }
 }
 
-struct TypescriptModuleLoader {
-  source_maps: SourceMapStore,
-}
-
 impl ModuleLoader for TypescriptModuleLoader {
   fn resolve(
     &self,
@@ -129,6 +129,18 @@ impl ModuleLoader for TypescriptModuleLoader {
 
     ModuleLoadResponse::Sync(load(source_maps, module_specifier))
   }
+
+  fn new_get_source_map(&self, specifier: &str) -> Option<Vec<u8>> {
+    self.source_maps.0.borrow().get(specifier).cloned()
+  }
+
+  fn new_get_source_line(
+    &self,
+    _file_name: &str,
+    _line_number: usize,
+  ) -> Option<String> {
+    None
+  }
 }
 
 fn main() -> Result<(), Error> {

core/modules/loaders.rs

@@ -96,7 +96,22 @@ pub trait ModuleLoader {
     async {}.boxed_local()
   }
 
-  fn get_source_map(&self, _path: &str) -> Option<Vec<u8>> {
+  fn get_source_map_from_mapping_url(&self, _path: &str) -> Option<Vec<u8>> {
+    None
+  }
+
+  // TODO(bartlomieju): remove `new_` once `SourceMapGetter` trait is removed
+  /// Returns the raw source map file.
+  fn new_get_source_map(&self, _file_name: &str) -> Option<Vec<u8>> {
+    None
+  }
+
+  // TODO(bartlomieju): remove `new_` once `SourceMapGetter` trait is removed
+  fn new_get_source_line(
+    &self,
+    _file_name: &str,
+    _line_number: usize,
+  ) -> Option<String> {
     None
   }
 }

core/source_map.rs

@@ -15,15 +15,15 @@ use std::collections::HashMap;
 use std::rc::Rc;
 use std::str;
 
-pub trait SourceMapGetter {
-  /// Returns the raw source map file.
-  fn get_source_map(&self, file_name: &str) -> Option<Vec<u8>>;
-  fn get_source_line(
-    &self,
-    file_name: &str,
-    line_number: usize,
-  ) -> Option<String>;
-}
+// pub trait SourceMapGetter {
+//   /// Returns the raw source map file.
+//   fn get_source_map(&self, file_name: &str) -> Option<Vec<u8>>;
+//   fn get_source_line(
+//     &self,
+//     file_name: &str,
+//     line_number: usize,
+//   ) -> Option<String>;
+// }
 
 #[derive(Debug)]
 pub enum SourceMapApplication {
@@ -56,7 +56,7 @@ pub struct SourceMapper {
 }
 
 impl SourceMapper {
-  pub fn new(getter: Option<Rc<dyn SourceMapGetter>>) -> Self {
+  pub fn new(getter: Option<Rc<dyn ModuleLoader>>) -> Self {
     Self {
       maps: Default::default(),
       source_lines: Default::default(),
@@ -142,7 +142,7 @@ impl SourceMapper {
       let contents = module_map
         .loader
         .borrow()
-        .get_source_map(&url.to_file_path().ok()?.to_str()?)?;
+        .get_source_map_from_mapping_url(url.to_file_path().ok()?.to_str()?)?;
       SourceMap::from_slice(&contents).ok()?
     };