perf: replace RawSource with smaller RawStringSource and `RawBuff…

…erSource` (#8629)

* perf: smaller `RawSource` with `RawStringSource` and `RawBufferSource`

* feat: more

* feat: test

Cargo.toml

@@ -66,7 +66,7 @@ rayon              = { version = "1.10.0" }
 regex              = { version = "1.11.1" }
 ropey              = "1.6.1"
 rspack_resolver    = { version = "0.3.5", features = ["package_json_raw_json_api"] }
-rspack_sources     = { version = "=0.3.5" }
+rspack_sources     = { version = "=0.3.6" }
 rustc-hash         = { version = "1.1.0" }
 serde              = { version = "1.0.215" }
 serde_json         = { version = "1.0.133" }

crates/rspack_binding_values/src/source.rs

@@ -2,8 +2,9 @@ use std::{hash::Hash, sync::Arc};
 
 use napi_derive::napi;
 use rspack_core::rspack_sources::{
-  BoxSource, CachedSource, ConcatSource, MapOptions, OriginalSource, RawSource, ReplaceSource,
-  Source, SourceExt, SourceMap, SourceMapSource, WithoutOriginalOptions,
+  BoxSource, CachedSource, ConcatSource, MapOptions, OriginalSource, RawBufferSource, RawSource,
+  RawStringSource, ReplaceSource, Source, SourceExt, SourceMap, SourceMapSource,
+  WithoutOriginalOptions,
 };
 use rspack_napi::napi::bindgen_prelude::*;
 
@@ -30,13 +31,13 @@ impl<'s> From<JsCompatSource<'s>> for BoxSource {
               source_map,
             })
             .boxed(),
-            None => RawSource::from(string).boxed(),
+            None => RawStringSource::from(string).boxed(),
           }
         } else {
-          RawSource::from(string).boxed()
+          RawStringSource::from(string).boxed()
         }
       }
-      Either::B(buffer) => RawSource::from(buffer.to_vec()).boxed(),
+      Either::B(buffer) => RawBufferSource::from(buffer.to_vec()).boxed(),
     }
   }
 }
@@ -60,13 +61,13 @@ impl From<JsCompatSourceOwned> for BoxSource {
               source_map,
             })
             .boxed(),
-            None => RawSource::from(string).boxed(),
+            None => RawStringSource::from(string).boxed(),
           }
         } else {
-          RawSource::from(string).boxed()
+          RawStringSource::from(string).boxed()
         }
       }
-      Either::B(buffer) => RawSource::from(Vec::<u8>::from(buffer)).boxed(),
+      Either::B(buffer) => RawBufferSource::from(Vec::<u8>::from(buffer)).boxed(),
     }
   }
 }
@@ -88,6 +89,24 @@ impl ToJsCompatSource for RawSource {
   }
 }
 
+impl ToJsCompatSource for RawBufferSource {
+  fn to_js_compat_source(&self, env: &Env) -> Result<JsCompatSource> {
+    Ok(JsCompatSource {
+      source: Either::B(BufferSlice::from_data(env, self.buffer())?),
+      map: to_webpack_map(self)?,
+    })
+  }
+}
+
+impl ToJsCompatSource for RawStringSource {
+  fn to_js_compat_source(&self, _env: &Env) -> Result<JsCompatSource> {
+    Ok(JsCompatSource {
+      source: Either::A(self.source().to_string()),
+      map: to_webpack_map(self)?,
+    })
+  }
+}
+
 impl<T: Source + Hash + PartialEq + Eq + 'static> ToJsCompatSource for ReplaceSource<T> {
   fn to_js_compat_source(&self, env: &Env) -> Result<JsCompatSource> {
     Ok(JsCompatSource {
@@ -136,8 +155,22 @@ impl ToJsCompatSource for dyn Source + '_ {
   fn to_js_compat_source(&self, env: &Env) -> Result<JsCompatSource> {
     if let Some(raw_source) = self.as_any().downcast_ref::<RawSource>() {
       raw_source.to_js_compat_source(env)
+    } else if let Some(raw_string) = self.as_any().downcast_ref::<RawStringSource>() {
+      raw_string.to_js_compat_source(env)
+    } else if let Some(raw_buffer) = self.as_any().downcast_ref::<RawBufferSource>() {
+      raw_buffer.to_js_compat_source(env)
     } else if let Some(cached_source) = self.as_any().downcast_ref::<CachedSource<RawSource>>() {
       cached_source.to_js_compat_source(env)
+    } else if let Some(cached_source) = self
+      .as_any()
+      .downcast_ref::<CachedSource<RawStringSource>>()
+    {
+      cached_source.to_js_compat_source(env)
+    } else if let Some(cached_source) = self
+      .as_any()
+      .downcast_ref::<CachedSource<RawBufferSource>>()
+    {
+      cached_source.to_js_compat_source(env)
     } else if let Some(cached_source) = self
       .as_any()
       .downcast_ref::<CachedSource<Box<dyn Source>>>()
@@ -153,7 +186,7 @@ impl ToJsCompatSource for dyn Source + '_ {
     } else if let Some(source) = self.as_any().downcast_ref::<Arc<dyn Source>>() {
       source.to_js_compat_source(env)
     } else {
-      // If it's not a `RawSource` related type, then we regards it as a `Source` type.
+      // If it's not a `RawStringSource` related type, then we regards it as a `Source` type.
       Ok(JsCompatSource {
         source: Either::A(self.source().to_string()),
         map: to_webpack_map(self)?,
@@ -179,6 +212,24 @@ impl ToJsCompatSourceOwned for RawSource {
   }
 }
 
+impl ToJsCompatSourceOwned for RawBufferSource {
+  fn to_js_compat_source_owned(&self) -> Result<JsCompatSourceOwned> {
+    Ok(JsCompatSourceOwned {
+      source: Either::B(self.buffer().to_vec().into()),
+      map: to_webpack_map(self)?,
+    })
+  }
+}
+
+impl ToJsCompatSourceOwned for RawStringSource {
+  fn to_js_compat_source_owned(&self) -> Result<JsCompatSourceOwned> {
+    Ok(JsCompatSourceOwned {
+      source: Either::A(self.source().to_string()),
+      map: to_webpack_map(self)?,
+    })
+  }
+}
+
 impl<T: Source + Hash + PartialEq + Eq + 'static> ToJsCompatSourceOwned for ReplaceSource<T> {
   fn to_js_compat_source_owned(&self) -> Result<JsCompatSourceOwned> {
     Ok(JsCompatSourceOwned {
@@ -227,8 +278,22 @@ impl ToJsCompatSourceOwned for dyn Source + '_ {
   fn to_js_compat_source_owned(&self) -> Result<JsCompatSourceOwned> {
     if let Some(raw_source) = self.as_any().downcast_ref::<RawSource>() {
       raw_source.to_js_compat_source_owned()
+    } else if let Some(raw_string) = self.as_any().downcast_ref::<RawStringSource>() {
+      raw_string.to_js_compat_source_owned()
+    } else if let Some(raw_buffer) = self.as_any().downcast_ref::<RawBufferSource>() {
+      raw_buffer.to_js_compat_source_owned()
     } else if let Some(cached_source) = self.as_any().downcast_ref::<CachedSource<RawSource>>() {
       cached_source.to_js_compat_source_owned()
+    } else if let Some(cached_source) = self
+      .as_any()
+      .downcast_ref::<CachedSource<RawStringSource>>()
+    {
+      cached_source.to_js_compat_source_owned()
+    } else if let Some(cached_source) = self
+      .as_any()
+      .downcast_ref::<CachedSource<RawBufferSource>>()
+    {
+      cached_source.to_js_compat_source_owned()
     } else if let Some(cached_source) = self
       .as_any()
       .downcast_ref::<CachedSource<Box<dyn Source>>>()

crates/rspack_cacheable/src/with/as_preset/rspack_sources/mod.rs

@@ -5,7 +5,7 @@ use rkyv::{
   Archive, Archived, Deserialize, Place, Resolver, Serialize,
 };
 use rspack_sources::{
-  BoxSource, RawSource, Source, SourceExt, SourceMap, SourceMapSource, WithoutOriginalOptions,
+  BoxSource, RawBufferSource, Source, SourceExt, SourceMap, SourceMapSource, WithoutOriginalOptions,
 };
 
 use super::AsPreset;
@@ -81,6 +81,6 @@ where
         );
       }
     }
-    Ok(RawSource::from(buffer).boxed())
+    Ok(RawBufferSource::from(buffer).boxed())
   }
 }

crates/rspack_cacheable_test/tests/with/as_preset/rspack_sources.rs

@@ -1,5 +1,5 @@
 use rspack_cacheable::{cacheable, from_bytes, to_bytes, with::AsPreset};
-use rspack_sources::{BoxSource, RawSource, SourceExt};
+use rspack_sources::{BoxSource, RawBufferSource, RawStringSource, SourceExt};
 
 #[cacheable]
 #[derive(Debug)]
@@ -17,6 +17,6 @@ fn test_rspack_source() {
     );
   }
 
-  test_data(Data(RawSource::from("123".as_bytes()).boxed()));
-  test_data(Data(RawSource::from_static("123").boxed()));
+  test_data(Data(RawBufferSource::from("123".as_bytes()).boxed()));
+  test_data(Data(RawStringSource::from_static("123").boxed()));
 }

crates/rspack_core/src/concatenated_module.rs

@@ -17,7 +17,9 @@ use rspack_collections::{
 use rspack_error::{Diagnosable, Diagnostic, DiagnosticKind, Result, TraceableError};
 use rspack_hash::{HashDigest, HashFunction, RspackHash};
 use rspack_hook::define_hook;
-use rspack_sources::{CachedSource, ConcatSource, RawSource, ReplaceSource, Source, SourceExt};
+use rspack_sources::{
+  CachedSource, ConcatSource, RawStringSource, ReplaceSource, Source, SourceExt,
+};
 use rspack_util::{ext::DynHash, itoa, source_map::SourceMapKind, swc::join_atom};
 use rustc_hash::FxHasher;
 use rustc_hash::{FxHashMap as HashMap, FxHashSet as HashSet};
@@ -1022,15 +1024,15 @@ impl Module for ConcatenatedModule {
         runtime_requirements.insert(RuntimeGlobals::DEFINE_PROPERTY_GETTERS);
 
         if should_add_esm_flag {
-          result.add(RawSource::from_static("// ESM COMPAT FLAG\n"));
-          result.add(RawSource::from(define_es_module_flag_statement(
+          result.add(RawStringSource::from_static("// ESM COMPAT FLAG\n"));
+          result.add(RawStringSource::from(define_es_module_flag_statement(
             self.get_exports_argument(),
             &mut runtime_requirements,
           )));
         }
 
-        result.add(RawSource::from_static("\n// EXPORTS\n"));
-        result.add(RawSource::from(format!(
+        result.add(RawStringSource::from_static("\n// EXPORTS\n"));
+        result.add(RawStringSource::from(format!(
           "{}({}, {{{}\n}});\n",
           RuntimeGlobals::DEFINE_PROPERTY_GETTERS,
           exports_argument,
@@ -1041,7 +1043,7 @@ impl Module for ConcatenatedModule {
 
     // List unused exports
     if !unused_exports.is_empty() {
-      result.add(RawSource::from(format!(
+      result.add(RawStringSource::from(format!(
         "\n// UNUSED EXPORTS: {}\n",
         join_atom(unused_exports.iter(), ", ")
       )));
@@ -1163,7 +1165,7 @@ impl Module for ConcatenatedModule {
       };
 
       if let Some(source) = namespace_object_sources.get(&info.module) {
-        result.add(RawSource::from(source.as_str()));
+        result.add(RawStringSource::from(source.as_str()));
       }
     }
 
@@ -1184,7 +1186,7 @@ impl Module for ConcatenatedModule {
 
       match info {
         ModuleInfo::Concatenated(info) => {
-          result.add(RawSource::from(
+          result.add(RawStringSource::from(
             format!(
               "\n;// CONCATENATED MODULE: {}\n",
               module_readable_identifier
@@ -1202,7 +1204,7 @@ impl Module for ConcatenatedModule {
           name = info.namespace_object_name.clone();
         }
         ModuleInfo::External(info) => {
-          result.add(RawSource::from(format!(
+          result.add(RawStringSource::from(format!(
             "\n// EXTERNAL MODULE: {}\n",
             module_readable_identifier
           )));
@@ -1220,10 +1222,10 @@ impl Module for ConcatenatedModule {
 
           if condition != "true" {
             is_conditional = true;
-            result.add(RawSource::from(format!("if ({}) {{\n", condition)));
+            result.add(RawStringSource::from(format!("if ({}) {{\n", condition)));
           }
 
-          result.add(RawSource::from(format!(
+          result.add(RawStringSource::from(format!(
             "var {} = {}({});",
             info.name.as_ref().expect("should have name"),
             RuntimeGlobals::REQUIRE,
@@ -1240,7 +1242,7 @@ impl Module for ConcatenatedModule {
 
       if info.get_interop_namespace_object_used() {
         runtime_requirements.insert(RuntimeGlobals::CREATE_FAKE_NAMESPACE_OBJECT);
-        result.add(RawSource::from(format!(
+        result.add(RawStringSource::from(format!(
           "\nvar {} = /*#__PURE__*/{}({}, 2);",
           info
             .get_interop_namespace_object_name()
@@ -1252,7 +1254,7 @@ impl Module for ConcatenatedModule {
 
       if info.get_interop_namespace_object2_used() {
         runtime_requirements.insert(RuntimeGlobals::CREATE_FAKE_NAMESPACE_OBJECT);
-        result.add(RawSource::from(format!(
+        result.add(RawStringSource::from(format!(
           "\nvar {} = /*#__PURE__*/{}({});",
           info
             .get_interop_namespace_object2_name()
@@ -1264,7 +1266,7 @@ impl Module for ConcatenatedModule {
 
       if info.get_interop_default_access_used() {
         runtime_requirements.insert(RuntimeGlobals::COMPAT_GET_DEFAULT_EXPORT);
-        result.add(RawSource::from(format!(
+        result.add(RawStringSource::from(format!(
           "\nvar {} = /*#__PURE__*/{}({});",
           info
             .get_interop_default_access_name()
@@ -1275,7 +1277,7 @@ impl Module for ConcatenatedModule {
       }
 
       if is_conditional {
-        result.add(RawSource::from_static("\n}"));
+        result.add(RawStringSource::from_static("\n}"));
       }
     }