refactor rope

Author: SyMind

src/cached_source.rs

@@ -13,7 +13,7 @@ use crate::{
   },
   object_pool::ObjectPool,
   source::SourceValue,
-  BoxSource, MapOptions, Rope, Source, SourceExt, SourceMap,
+  BoxSource, MapOptions, Source, SourceExt, SourceMap,
 };
 
 #[derive(Default)]
@@ -82,11 +82,10 @@ impl CachedSource {
 
   fn get_or_init_chunks(&self) -> &[&str] {
     self.cache.chunks.get_or_init(|| {
-      let rope = self.inner.rope();
-      let chunks = match rope {
-        Rope::Light(s) => vec![s],
-        Rope::Full(iter) => iter.collect::<Vec<_>>(),
-      };
+      let mut chunks = Vec::new();
+      self.inner.rope(&mut |chunk| {
+        chunks.push(chunk);
+      });
       #[allow(unsafe_code)]
       // SAFETY: CachedSource guarantees that the underlying source outlives the cache,
       // so transmuting Vec<&str> to Vec<&'static str> is safe in this context.
@@ -108,9 +107,9 @@ impl Source for CachedSource {
     SourceValue::String(Cow::Owned(string))
   }
 
-  fn rope(&self) -> Rope {
+  fn rope<'a>(&'a self, on_chunk: &mut dyn FnMut(&'a str)) {
     let chunks = self.get_or_init_chunks();
-    Rope::Full(Box::new(chunks.iter().cloned()))
+    chunks.iter().for_each(|chunk| on_chunk(chunk));
   }
 
   fn buffer(&self) -> Cow<[u8]> {

src/concat_source.rs

@@ -12,7 +12,7 @@ use crate::{
   linear_map::LinearMap,
   object_pool::ObjectPool,
   source::{Mapping, OriginalLocation},
-  BoxSource, MapOptions, RawStringSource, Rope, Source, SourceExt, SourceMap,
+  BoxSource, MapOptions, RawStringSource, Source, SourceExt, SourceMap,
   SourceValue,
 };
 
@@ -169,31 +169,19 @@ impl Source for ConcatSource {
     }
 
     let mut string = String::with_capacity(self.size());
-    for child in children {
-      match child.rope() {
-        Rope::Light(s) => string.push_str(s),
-        Rope::Full(chunks) => {
-          for chunk in chunks {
-            string.push_str(chunk);
-          }
-        }
-      }
-    }
+    children.iter().for_each(|child| {
+      child.rope(&mut |chunk| {
+        string.push_str(chunk);
+      });
+    });
     SourceValue::String(Cow::Owned(string))
   }
 
-  fn rope(&self) -> Rope {
+  fn rope<'a>(&'a self, on_chunk: &mut dyn FnMut(&'a str)) {
     let children = self.optimized_children();
-    if children.len() == 1 {
-      children[0].rope()
-    } else {
-      Rope::Full(Box::new(children.iter().flat_map(
-        |child| match child.rope() {
-          Rope::Light(s) => Box::new(std::iter::once(s)),
-          Rope::Full(iter) => iter,
-        },
-      )))
-    }
+    children.iter().for_each(|child| {
+      child.rope(on_chunk);
+    });
   }
 
   fn buffer(&self) -> Cow<[u8]> {

src/lib.rs

@@ -23,7 +23,7 @@ pub use original_source::OriginalSource;
 pub use raw_source::{RawBufferSource, RawStringSource};
 pub use replace_source::{ReplaceSource, ReplacementEnforce};
 pub use source::{
-  BoxSource, MapOptions, Mapping, OriginalLocation, Rope, Source, SourceExt,
+  BoxSource, MapOptions, Mapping, OriginalLocation, Source, SourceExt,
   SourceMap, SourceValue,
 };
 pub use source_map_source::{

src/original_source.rs

@@ -11,7 +11,7 @@ use crate::{
   },
   object_pool::ObjectPool,
   source::{Mapping, OriginalLocation},
-  MapOptions, Rope, Source, SourceMap, SourceValue,
+  MapOptions, Source, SourceMap, SourceValue,
 };
 
 /// Represents source code, it will create source map for the source code,
@@ -56,8 +56,8 @@ impl Source for OriginalSource {
     SourceValue::String(Cow::Borrowed(&self.value))
   }
 
-  fn rope(&self) -> Rope {
-    Rope::Light(self.value.as_ref())
+  fn rope<'a>(&'a self, on_chunk: &mut dyn FnMut(&'a str)) {
+    on_chunk(self.value.as_ref())
   }
 
   fn buffer(&self) -> Cow<[u8]> {

src/raw_source.rs

@@ -10,7 +10,7 @@ use crate::{
     GeneratedInfo, StreamChunks,
   },
   object_pool::ObjectPool,
-  MapOptions, Rope, Source, SourceMap, SourceValue,
+  MapOptions, Source, SourceMap, SourceValue,
 };
 
 /// A string variant of [RawStringSource].
@@ -64,8 +64,8 @@ impl Source for RawStringSource {
     SourceValue::String(Cow::Borrowed(&self.0))
   }
 
-  fn rope(&self) -> Rope {
-    Rope::Light(self.0.as_ref())
+  fn rope<'a>(&'a self, on_chunk: &mut dyn FnMut(&'a str)) {
+    on_chunk(self.0.as_ref())
   }
 
   fn buffer(&self) -> Cow<[u8]> {
@@ -210,8 +210,8 @@ impl Source for RawBufferSource {
     SourceValue::Buffer(Cow::Borrowed(&self.value))
   }
 
-  fn rope(&self) -> Rope {
-    Rope::Light(self.get_or_init_value_as_string())
+  fn rope<'a>(&'a self, on_chunk: &mut dyn FnMut(&'a str)) {
+    on_chunk(self.get_or_init_value_as_string())
   }
 
   fn buffer(&self) -> Cow<[u8]> {