chore: merge origin main

Author: SyMind

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "rspack_sources"
-version = "0.4.10"
+version = "0.4.11"
 edition = "2021"
 authors = ["h-a-n-a <andywangsy@gmail.com>", "ahabhgk <ahabhgk@gmail.com>"]
 resolver = "2"

Cargo.toml

@@ -1,6 +1,7 @@
 #![allow(missing_docs)]
 
 mod bench_complex_replace_source;
+mod bench_source_map;
 
 use std::collections::HashMap;
 
@@ -16,6 +17,10 @@ use rspack_sources::{
 };
 
 use bench_complex_replace_source::benchmark_complex_replace_source;
+use bench_source_map::{
+  benchmark_parse_source_map_from_json, benchmark_source_map_clone,
+  benchmark_stringify_source_map_to_json,
+};
 
 const HELLOWORLD_JS: &str = include_str!(concat!(
   env!("CARGO_MANIFEST_DIR"),
@@ -41,14 +46,6 @@ const BUNDLE_JS_MAP: &str = include_str!(concat!(
   env!("CARGO_MANIFEST_DIR"),
   "/benches/fixtures/transpile-rollup/files/bundle.js.map"
 ));
-const ANTD_MIN_JS: &str = include_str!(concat!(
-  env!("CARGO_MANIFEST_DIR"),
-  "/benches/fixtures/antd-mini/antd.min.js"
-));
-const ANTD_MIN_JS_MAP: &str = include_str!(concat!(
-  env!("CARGO_MANIFEST_DIR"),
-  "/benches/fixtures/antd-mini/antd.min.js.map"
-));
 
 fn benchmark_concat_generate_string(b: &mut Bencher) {
   let sms_minify = SourceMapSource::new(SourceMapSourceOptions {
@@ -225,32 +222,44 @@ fn benchmark_concat_generate_string_as_key(b: &mut Bencher) {
 
 fn bench_rspack_sources(criterion: &mut Criterion) {
   let mut group = criterion.benchmark_group("rspack_sources");
-  group.bench_function(
-    "concat_generate_base64_with_cache",
-    benchmark_concat_generate_base64_with_cache,
-  );
-  group
-    .bench_function("concat_generate_base64", benchmark_concat_generate_base64);
+  // group.bench_function(
+  //   "concat_generate_base64_with_cache",
+  //   benchmark_concat_generate_base64_with_cache,
+  // );
+  // group
+  //   .bench_function("concat_generate_base64", benchmark_concat_generate_base64);
 
-  group.bench_function(
-    "concat_generate_string_with_cache",
-    benchmark_concat_generate_string_with_cache,
-  );
-  group
-    .bench_function("concat_generate_string", benchmark_concat_generate_string);
+  // group.bench_function(
+  //   "concat_generate_string_with_cache",
+  //   benchmark_concat_generate_string_with_cache,
+  // );
+  // group
+  //   .bench_function("concat_generate_string", benchmark_concat_generate_string);
+
+  // group.bench_function(
+  //   "concat_generate_string_with_cache_as_key",
+  //   benchmark_concat_generate_string_with_cache_as_key,
+  // );
+  // group.bench_function(
+  //   "concat_generate_string_as_key",
+  //   benchmark_concat_generate_string_as_key,
+  // );
+
+  // group
+  //   .bench_function("complex_replace_source", benchmark_complex_replace_source);
 
   group.bench_function(
-    "concat_generate_string_with_cache_as_key",
-    benchmark_concat_generate_string_with_cache_as_key,
+    "parse_source_map_from_json",
+    benchmark_parse_source_map_from_json,
   );
+
+  group.bench_function("source_map_clone", benchmark_source_map_clone);
+
   group.bench_function(
-    "concat_generate_string_as_key",
-    benchmark_concat_generate_string_as_key,
+    "stringify_source_map_to_json",
+    benchmark_stringify_source_map_to_json,
   );
 
-  group
-    .bench_function("complex_replace_source", benchmark_complex_replace_source);
-
   group.finish();
 }
 

benches/bench.rs

@@ -0,0 +1,34 @@
+#![allow(missing_docs)]
+
+#[cfg(not(codspeed))]
+pub use criterion::*;
+
+#[cfg(codspeed)]
+pub use codspeed_criterion_compat::*;
+
+use rspack_sources::SourceMap;
+
+const ANTD_MIN_JS_MAP: &str = include_str!(concat!(
+  env!("CARGO_MANIFEST_DIR"),
+  "/benches/fixtures/antd-mini/antd.min.js.map"
+));
+
+pub fn benchmark_parse_source_map_from_json(b: &mut Bencher) {
+  b.iter(|| {
+    black_box(SourceMap::from_json(black_box(ANTD_MIN_JS_MAP)).unwrap())
+  })
+}
+
+pub fn benchmark_source_map_clone(b: &mut Bencher) {
+  let source = SourceMap::from_json(ANTD_MIN_JS_MAP).unwrap();
+  b.iter(|| {
+    let _ = black_box(source.clone());
+  })
+}
+
+pub fn benchmark_stringify_source_map_to_json(b: &mut Bencher) {
+  let source = SourceMap::from_json(ANTD_MIN_JS_MAP).unwrap();
+  b.iter(|| {
+    let _ = black_box(source.to_json().unwrap());
+  })
+}

benches/bench_source_map.rs

@@ -225,6 +225,8 @@ pub struct SourceMap {
   source_root: Option<Arc<str>>,
   #[serde(rename = "debugId", skip_serializing_if = "Option::is_none")]
   debug_id: Option<Arc<str>>,
+  #[serde(rename = "ignoreList", skip_serializing_if = "Option::is_none")]
+  ignore_list: Option<Vec<u32>>,
 }
 
 impl std::fmt::Debug for SourceMap {
@@ -252,6 +254,7 @@ impl Hash for SourceMap {
     self.sources_content.hash(state);
     self.names.hash(state);
     self.source_root.hash(state);
+    self.ignore_list.hash(state);
   }
 }
 
@@ -278,6 +281,7 @@ impl SourceMap {
       names: names.into(),
       source_root: None,
       debug_id: None,
+      ignore_list: None,
     }
   }
 
@@ -291,6 +295,16 @@ impl SourceMap {
     self.file = file.map(Into::into);
   }
 
+  /// Get the ignoreList field in [SourceMap].
+  pub fn ignore_list(&self) -> Option<&[u32]> {
+    self.ignore_list.as_deref()
+  }
+
+  /// Set the ignoreList field in [SourceMap].
+  pub fn set_ignore_list<T: Into<Vec<u32>>>(&mut self, ignore_list: Option<T>) {
+    self.ignore_list = ignore_list.map(Into::into);
+  }
+
   /// Get the decoded mappings in [SourceMap].
   pub fn decoded_mappings(&self) -> impl Iterator<Item = Mapping> + '_ {
     decode_mappings(self)
@@ -415,6 +429,11 @@ impl SourceMap {
         .get_str("sourceRoot")
         .map(|v| Arc::from(v.to_string())),
       debug_id: value.get_str("debugId").map(|v| Arc::from(v.to_string())),
+      ignore_list: value.get_array("ignoreList").map(|v| {
+        v.into_iter()
+          .map(|n| n.as_u32().unwrap_or_default())
+          .collect::<Vec<_>>()
+      }),
     })
   }
 
@@ -426,7 +445,7 @@ impl SourceMap {
   }
 
   /// Generate source map to a json string.
-  pub fn to_json(self) -> Result<String> {
+  pub fn to_json(&self) -> Result<String> {
     let json = simd_json::to_string(&self)?;
     Ok(json)
   }
@@ -539,7 +558,7 @@ mod tests {
     RawBufferSource::from("a".as_bytes()).hash(&mut state);
     (&RawSource::from("h") as &dyn Source).hash(&mut state);
     ReplaceSource::new(RawSource::from("i").boxed()).hash(&mut state);
-    assert_eq!(format!("{:x}", state.finish()), "1b50b537fa997c34");
+    assert_eq!(format!("{:x}", state.finish()), "6abed98aa11f84e5");
   }
 
   #[test]

src/source.rs

@@ -297,7 +297,7 @@ mod tests {
 
     let mut hasher = twox_hash::XxHash64::default();
     sms1.hash(&mut hasher);
-    assert_eq!(format!("{:x}", hasher.finish()), "d136621583d4618c");
+    assert_eq!(format!("{:x}", hasher.finish()), "736934c6e249aa6e");
   }
 
   #[test]