perf: let cached source work right (#89)

Author: SyMind

src/cached_source.rs

@@ -7,7 +7,13 @@ use std::{
 use dashmap::DashMap;
 use rustc_hash::FxHasher;
 
-use crate::{helpers::StreamChunks, MapOptions, Source, SourceMap};
+use crate::{
+  helpers::{
+    stream_and_get_source_and_map, stream_chunks_of_raw_source,
+    stream_chunks_of_source_map, StreamChunks,
+  },
+  MapOptions, Source, SourceMap,
+};
 
 /// It tries to reused cached results from other methods to avoid calculations,
 /// usually used after modify is finished.
@@ -44,10 +50,10 @@ use crate::{helpers::StreamChunks, MapOptions, Source, SourceMap};
 /// ```
 pub struct CachedSource<T> {
   inner: Arc<T>,
-  cached_buffer: OnceLock<Vec<u8>>,
+  cached_buffer: OnceLock<Arc<Vec<u8>>>,
   cached_source: OnceLock<Arc<str>>,
   cached_maps:
-    DashMap<MapOptions, Option<SourceMap>, BuildHasherDefault<FxHasher>>,
+    Arc<DashMap<MapOptions, Option<SourceMap>, BuildHasherDefault<FxHasher>>>,
 }
 
 impl<T> CachedSource<T> {
@@ -78,7 +84,7 @@ impl<T: Source + Hash + PartialEq + Eq + 'static> Source for CachedSource<T> {
   fn buffer(&self) -> Cow<[u8]> {
     let cached = self
       .cached_buffer
-      .get_or_init(|| self.inner.buffer().to_vec());
+      .get_or_init(|| self.inner.buffer().to_vec().into());
     Cow::Borrowed(cached)
   }
 
@@ -91,7 +97,7 @@ impl<T: Source + Hash + PartialEq + Eq + 'static> Source for CachedSource<T> {
       map.clone()
     } else {
       let map = self.inner.map(options);
-      self.cached_maps.insert(options.to_owned(), map.clone());
+      self.cached_maps.insert(options.clone(), map.clone());
       map
     }
   }
@@ -111,24 +117,27 @@ impl<T: Source + Hash + PartialEq + Eq + 'static> StreamChunks
     on_source: crate::helpers::OnSource,
     on_name: crate::helpers::OnName,
   ) -> crate::helpers::GeneratedInfo {
-    // if self.cached_maps.contains_key(options)
-    //   && (self.cached_buffer.get().is_some()
-    //     || self.cached_source.get().is_some())
-    // {
-    //   let source = self.source();
-    //   if let Some(map) = &self.map(options) {
-    //     return stream_chunks_of_source_map(
-    //       &source, map, on_chunk, on_source, on_name, options,
-    //     );
-    //   } else {
-    //     return stream_chunks_of_raw_source(
-    //       &source, options, on_chunk, on_source, on_name,
-    //     );
-    //   }
-    // }
-    self
-      .inner
-      .stream_chunks(options, on_chunk, on_source, on_name)
+    if self.cached_maps.contains_key(options) {
+      let source = self.source();
+      if let Some(map) = &self.map(options) {
+        return stream_chunks_of_source_map(
+          &source, map, on_chunk, on_source, on_name, options,
+        );
+      } else {
+        return stream_chunks_of_raw_source(
+          &source, options, on_chunk, on_source, on_name,
+        );
+      }
+    }
+    let (generated_info, map) = stream_and_get_source_and_map(
+      self.original(),
+      options,
+      on_chunk,
+      on_source,
+      on_name,
+    );
+    self.cached_maps.insert(options.clone(), map);
+    generated_info
   }
 }
 

src/helpers.rs

@@ -1464,45 +1464,58 @@ pub fn stream_chunks_of_combined_source_map(
   )
 }
 
-// pub fn stream_and_get_source_and_map<S: StreamChunks>(
-//   input_source: &S,
-//   options: &MapOptions,
-//   on_chunk: OnChunk,
-//   on_source: OnSource,
-//   on_name: OnName,
-// ) -> () {
-//   let mappings = vec![];
-//   let sources = vec![];
-//   let sources_content = vec![];
-//   let names = vec![];
-//   let info = input_source.stream_chunks(
-//     options,
-//     &mut |chunk, mapping| {
-//       mappings.push(mapping.clone());
-//       return on_chunk(chunk, mapping);
-//     },
-//     &mut |source_index, source, source_content| {
-//       let source_index2 = source_index as usize;
-//       while sources.len() <= source_index2 {
-//         sources.push("".to_string());
-//       }
-//       sources[source_index2] = source.to_owned();
-//       if let Some(source_content) = source_content {
-//         while sources_content.len() <= source_index2 {
-//           sources_content.push("".to_string());
-//         }
-//         sources_content[source_index2] = source_content.to_owned();
-//       }
-//       return on_source(source_index, source, source_content);
-//     },
-//     &mut |name_index, name| {
-//       let name_index2 = name_index as usize;
-//       while names.len() <= name_index2 {
-//         names.push("".to_string());
-//       }
-//       names[name_index2] = name.to_owned();
-//       return on_name(name_index, name);
-//     },
-//   );
-//   (info, map)
-// }
+pub fn stream_and_get_source_and_map<S: StreamChunks>(
+  input_source: &S,
+  options: &MapOptions,
+  on_chunk: OnChunk,
+  on_source: OnSource,
+  on_name: OnName,
+) -> (GeneratedInfo, Option<SourceMap>) {
+  let mut mappings = vec![];
+  let mut sources: Vec<Cow<'static, str>> = Vec::new();
+  let mut sources_content: Vec<Cow<'static, str>> = Vec::new();
+  let mut names: Vec<Cow<'static, str>> = Vec::new();
+  let generated_info = input_source.stream_chunks(
+    options,
+    &mut |chunk, mapping| {
+      mappings.push(mapping.clone());
+      on_chunk(chunk, mapping);
+    },
+    &mut |source_index, source, source_content| {
+      let source_index2 = source_index as usize;
+      while sources.len() <= source_index2 {
+        sources.push("".into());
+      }
+      sources[source_index2] = source.to_string().into();
+      if let Some(source_content) = source_content {
+        while sources_content.len() <= source_index2 {
+          sources_content.push("".into());
+        }
+        sources_content[source_index2] = source_content.to_string().into();
+      }
+      on_source(source_index, source, source_content);
+    },
+    &mut |name_index, name| {
+      let name_index2 = name_index as usize;
+      while names.len() <= name_index2 {
+        names.push("".into());
+      }
+      names[name_index2] = name.to_string().into();
+      on_name(name_index, name);
+    },
+  );
+
+  let mappings = encode_mappings(&mappings, options);
+  let map = if mappings.is_empty() {
+    None
+  } else {
+    Some(SourceMap::new(
+      None,
+      mappings,
+      sources,
+      sources_content,
+      names,
+    ))
+  };
+  (generated_info, map)
+}