perf: add SourceTextProvider (#66)

Author: dsherret

Cargo.lock

@@ -22,7 +22,7 @@ All (`SourceRanged` trait):
 
 - `.start(&self) -> SourcePos`
 - `.end(&self) -> SourcePos`
-- `.text_fast(&self, root_node: &dyn SourceTextInfoProvider) -> &'a str` -- Doesn't require going up the tree to the root node
+- `.text_fast(&self, root_node: &dyn SourceTextProvider) -> &'a str` -- Doesn't require going up the tree to the root node
 - `.start_line_fast(&self, root_node: &dyn SourceTextInfoProvider) -> usize`
 - `.end_line_fast(&self, root_node: &dyn SourceTextInfoProvider) -> usize`
 - `.start_column_fast(&self, root_node: &dyn SourceTextInfoProvider) -> usize`

README.md

@@ -20,9 +20,9 @@ bumpalo = { version = "3.16.0", optional = true, features = ["collections", "all
 num-bigint = "0.4"
 rustc-hash = "1.1.0"
 swc_atoms = "0.6.7"
-swc_common = "0.37.0"
-swc_ecma_ast = "0.118.0"
-swc_ecma_parser = "0.149.0"
+swc_common = "0.37.5"
+swc_ecma_ast = "0.118.2"
+swc_ecma_parser = "0.149.1"
 text_lines = "0.6.0"
 
 [dev-dependencies]

rs-lib/Cargo.toml

@@ -288,14 +288,14 @@ macro_rules! source_ranged_trait {
       text_slice.chars().count()
     }
 
-    fn char_width_fast<'a, P: SourceTextInfoProvider<'a>>(&self, source: P) -> usize {
+    fn char_width_fast<'a, P: SourceTextProvider<'a>>(&self, source: P) -> usize {
       self.text_fast(source).chars().count()
     }
 
-    fn text_fast<'a, P: SourceTextInfoProvider<'a>>(&self, source: P) -> &'a str {
-      let text_info = source.text_info();
-      let byte_range = self.range().as_byte_range(text_info.range().start);
-      &text_info.text_str()[byte_range]
+    fn text_fast<'a, P: SourceTextProvider<'a>>(&self, source: P) -> &'a str {
+      let text = source.text();
+      let byte_range = self.range().as_byte_range(source.start_pos());
+      &text[byte_range]
     }
 
     fn tokens_fast<'a>(&self, program: impl RootNode<'a>) -> &'a [TokenAndSpan] {

rs-lib/src/common/pos.rs

@@ -237,6 +237,24 @@ impl<'a> SourceTextInfoProvider<'a> for &'a SourceTextInfo {
   }
 }
 
+pub trait SourceTextProvider<'a> {
+  fn text(&self) -> &'a Arc<str>;
+  fn start_pos(&self) -> StartSourcePos;
+}
+
+impl<'a, T> SourceTextProvider<'a> for T
+where
+  T: SourceTextInfoProvider<'a>,
+{
+  fn text(&self) -> &'a Arc<str> {
+    &self.text_info().text
+  }
+
+  fn start_pos(&self) -> StartSourcePos {
+    self.text_info().start_pos
+  }
+}
+
 #[cfg(test)]
 mod test {
   use super::*;