perf: use fxhash for HashMap in napi (#11080)

SyMind · web-flow · commit 8675099a8907 · 2025-07-17T16:58:08.000+08:00
diff --git a/crates/rspack_binding_api/src/chunk.rs b/crates/rspack_binding_api/src/chunk.rs
@@ -1,7 +1,11 @@
-use std::{cell::RefCell, collections::HashMap, ptr::NonNull};
+use std::{cell::RefCell, ptr::NonNull};
 
-use napi::{bindgen_prelude::ToNapiValue, Either, Env, JsString};
+use napi::{
+  bindgen_prelude::{Object, ToNapiValue},
+  Either, Env, JsString,
+};
 use napi_derive::napi;
+use rspack_collections::UkeyMap;
 use rspack_core::{Compilation, CompilationId};
 use rspack_napi::OneShotRef;
 
@@ -116,20 +120,17 @@ impl Chunk {
     )
   }
 
-  #[napi(getter)]
-  pub fn content_hash(&self) -> napi::Result<HashMap<String, &str>> {
+  #[napi(getter, ts_return_type = "Record<string, string>")]
+  pub fn content_hash(&self, env: &Env) -> napi::Result<Object> {
     let (compilation, chunk) = self.as_ref()?;
-    Ok(
-      chunk
-        .content_hash(&compilation.chunk_hashes_artifact)
-        .map(|content_hash| {
-          content_hash
-            .iter()
-            .map(|(key, v)| (key.to_string(), v.encoded()))
-            .collect::<HashMap<String, &str>>()
-        })
-        .unwrap_or_default(),
-    )
+
+    let mut object = Object::new(env)?;
+    if let Some(content_hash) = chunk.content_hash(&compilation.chunk_hashes_artifact) {
+      for (key, value) in content_hash.iter() {
+        object.set(key.to_string(), value.encoded())?;
+      }
+    }
+    Ok(object)
   }
 
   #[napi(getter)]
@@ -246,7 +247,7 @@ impl Chunk {
 }
 
 thread_local! {
-  static CHUNK_INSTANCE_REFS: RefCell<HashMap<CompilationId, HashMap<rspack_core::ChunkUkey, OneShotRef>>> = Default::default();
+  static CHUNK_INSTANCE_REFS: RefCell<UkeyMap<CompilationId, UkeyMap<rspack_core::ChunkUkey, OneShotRef>>> = Default::default();
 }
 
 pub struct ChunkWrapper {
@@ -287,7 +288,7 @@ impl ToNapiValue for ChunkWrapper {
       let refs = match entry {
         std::collections::hash_map::Entry::Occupied(entry) => entry.into_mut(),
         std::collections::hash_map::Entry::Vacant(entry) => {
-          let refs = HashMap::default();
+          let refs = UkeyMap::default();
           entry.insert(refs)
         }
       };
diff --git a/crates/rspack_binding_api/src/chunk_group.rs b/crates/rspack_binding_api/src/chunk_group.rs
@@ -2,9 +2,9 @@ use std::{cell::RefCell, ptr::NonNull};
 
 use napi::{bindgen_prelude::ToNapiValue, Either, Env, JsString};
 use napi_derive::napi;
+use rspack_collections::UkeyMap;
 use rspack_core::{Compilation, CompilationId};
 use rspack_napi::OneShotRef;
-use rustc_hash::FxHashMap as HashMap;
 
 use crate::{location::RealDependencyLocation, ChunkWrapper, ModuleObject, ModuleObjectRef};
 
@@ -179,7 +179,7 @@ impl ChunkGroup {
 }
 
 thread_local! {
-  static CHUNK_GROUP_INSTANCE_REFS: RefCell<HashMap<CompilationId, HashMap<rspack_core::ChunkGroupUkey, OneShotRef>>> = Default::default();
+  static CHUNK_GROUP_INSTANCE_REFS: RefCell<UkeyMap<CompilationId, UkeyMap<rspack_core::ChunkGroupUkey, OneShotRef>>> = Default::default();
 }
 
 pub struct ChunkGroupWrapper {
@@ -217,7 +217,7 @@ impl ToNapiValue for ChunkGroupWrapper {
       let refs = match entry {
         std::collections::hash_map::Entry::Occupied(entry) => entry.into_mut(),
         std::collections::hash_map::Entry::Vacant(entry) => {
-          let refs = HashMap::default();
+          let refs = UkeyMap::default();
           entry.insert(refs)
         }
       };
diff --git a/crates/rspack_binding_api/src/codegen_result.rs b/crates/rspack_binding_api/src/codegen_result.rs
@@ -1,7 +1,6 @@
-use std::collections::HashMap;
-
 use napi_derive::napi;
 use rspack_core::{get_runtime_key, CodeGenerationResult, CodeGenerationResults};
+use rustc_hash::FxHashMap as HashMap;
 
 #[napi(object)]
 #[derive(Debug)]
diff --git a/crates/rspack_binding_api/src/html.rs b/crates/rspack_binding_api/src/html.rs
@@ -1,5 +1,3 @@
-use std::collections::HashMap;
-
 use cow_utils::CowUtils;
 use napi::Either;
 use napi_derive::napi;
@@ -10,6 +8,7 @@ use rspack_plugin_html::{
   AfterEmitData, AfterTemplateExecutionData, AlterAssetTagGroupsData, AlterAssetTagsData,
   BeforeAssetTagGenerationData, BeforeEmitData,
 };
+use rustc_hash::FxHashMap as HashMap;
 
 #[napi(object)]
 pub struct JsHtmlPluginTag {
diff --git a/crates/rspack_binding_api/src/options/raw_resolve.rs b/crates/rspack_binding_api/src/options/raw_resolve.rs
@@ -1,5 +1,3 @@
-use std::collections::HashMap;
-
 use napi::Either;
 use napi_derive::napi;
 use rspack_core::{
@@ -8,6 +6,7 @@ use rspack_core::{
 };
 use rspack_error::error;
 use rspack_regex::RspackRegex;
+use rustc_hash::FxHashMap as HashMap;
 
 pub type AliasValue = serde_json::Value;
 
diff --git a/crates/rspack_binding_api/src/plugins/context_replacement.rs b/crates/rspack_binding_api/src/plugins/context_replacement.rs
@@ -3,7 +3,7 @@ use napi_derive::napi;
 use rspack_error::{miette::IntoDiagnostic, Error};
 use rspack_plugin_context_replacement::ContextReplacementPluginOptions;
 use rspack_regex::RspackRegex;
-use rustc_hash::FxHashMap as HashMap;
+use rustc_hash::FxHashMap;
 
 #[napi(object, object_to_js = false)]
 pub struct RawContextReplacementPluginOptions<'a> {
@@ -31,7 +31,7 @@ impl<'a> TryFrom<RawContextReplacementPluginOptions<'a>> for ContextReplacementP
     } = val;
 
     let new_content_create_context_map = if let Some(raw) = new_content_create_context_map {
-      let mut map = HashMap::default();
+      let mut map = FxHashMap::default();
       let keys = Object::keys(&raw).into_diagnostic()?;
       for key in keys {
         let value = raw.get::<String>(&key).into_diagnostic()?;
diff --git a/crates/rspack_binding_api/src/plugins/js_loader/context.rs b/crates/rspack_binding_api/src/plugins/js_loader/context.rs
@@ -1,11 +1,12 @@
-use std::{collections::HashMap, ptr::NonNull, sync::Arc};
+use std::{ptr::NonNull, sync::Arc};
 
 use napi::bindgen_prelude::*;
 use napi_derive::napi;
 use rspack_core::{LoaderContext, Module, RunnerContext};
 use rspack_error::ToStringResultToRspackResultExt;
 use rspack_loader_runner::State as LoaderState;
 use rspack_napi::threadsafe_js_value_ref::ThreadsafeJsValueRef;
+use rustc_hash::FxHashMap as HashMap;
 
 use crate::{ModuleObject, RspackError};
 
diff --git a/crates/rspack_binding_api/src/raw_options/raw_builtins/raw_css_extract.rs b/crates/rspack_binding_api/src/raw_options/raw_builtins/raw_css_extract.rs
@@ -1,7 +1,6 @@
-use std::collections::HashMap;
-
 use napi_derive::napi;
 use rspack_plugin_extract_css::plugin::{CssExtractOptions, InsertType};
+use rustc_hash::FxHashMap as HashMap;
 
 use crate::JsFilename;
 
diff --git a/crates/rspack_binding_api/src/raw_options/raw_builtins/raw_html.rs b/crates/rspack_binding_api/src/raw_options/raw_builtins/raw_html.rs
@@ -1,4 +1,4 @@
-use std::{collections::HashMap, str::FromStr};
+use std::str::FromStr;
 
 use napi::bindgen_prelude::{Either3, Promise};
 use napi_derive::napi;
@@ -10,6 +10,7 @@ use rspack_plugin_html::{
   },
   sri::HtmlSriHashFunction,
 };
+use rustc_hash::FxHashMap as HashMap;
 
 pub type RawHtmlScriptLoading = String;
 pub type RawHtmlInject = String;
diff --git a/crates/rspack_binding_api/src/raw_options/raw_builtins/raw_http_uri.rs b/crates/rspack_binding_api/src/raw_options/raw_builtins/raw_http_uri.rs
@@ -1,4 +1,4 @@
-use std::{collections::HashMap, fmt::Debug, sync::Arc};
+use std::{fmt::Debug, sync::Arc};
 
 use async_trait::async_trait;
 use napi::bindgen_prelude::{Buffer, Either, FnArgs, Promise};
@@ -10,6 +10,7 @@ use rspack_plugin_schemes::{
 };
 use rspack_regex::RspackRegex;
 use rspack_util::asset_condition::{AssetCondition, AssetConditions};
+use rustc_hash::FxHashMap as HashMap;
 
 type HttpClientRequest =
   ThreadsafeFunction<FnArgs<(String, HashMap<String, String>)>, Promise<JsHttpResponseRaw>>;
diff --git a/crates/rspack_binding_api/src/raw_options/raw_external.rs b/crates/rspack_binding_api/src/raw_options/raw_external.rs
@@ -1,4 +1,4 @@
-use std::{collections::HashMap, fmt::Debug, sync::Arc};
+use std::{fmt::Debug, sync::Arc};
 
 use napi::bindgen_prelude::{Either4, Promise};
 use napi_derive::napi;
@@ -8,6 +8,7 @@ use rspack_core::{
 };
 use rspack_napi::threadsafe_function::ThreadsafeFunction;
 use rspack_regex::RspackRegex;
+use rustc_hash::FxHashMap as HashMap;
 
 use crate::JsResolver;
 
diff --git a/crates/rspack_binding_api/src/raw_options/raw_module/mod.rs b/crates/rspack_binding_api/src/raw_options/raw_module/mod.rs
@@ -1,4 +1,4 @@
-use std::{collections::HashMap, fmt::Formatter, ptr::NonNull, sync::Arc};
+use std::{fmt::Formatter, ptr::NonNull, sync::Arc};
 
 use derive_more::Debug;
 use napi::{
@@ -21,6 +21,7 @@ use rspack_core::{
 use rspack_error::error;
 use rspack_napi::threadsafe_function::ThreadsafeFunction;
 use rspack_regex::RspackRegex;
+use rustc_hash::FxHashMap as HashMap;
 
 use crate::{JsFilename, ModuleObject, RawResolveOptions};
 
diff --git a/crates/rspack_binding_api/src/raw_options/raw_split_chunks/raw_split_chunk_size.rs b/crates/rspack_binding_api/src/raw_options/raw_split_chunks/raw_split_chunk_size.rs
@@ -1,7 +1,6 @@
-use std::collections::HashMap;
-
 use napi_derive::napi;
 use rspack_plugin_split_chunks::SplitChunkSizes;
+use rustc_hash::FxHashMap as HashMap;
 
 #[derive(Debug)]
 #[napi(object, object_to_js = false)]
diff --git a/crates/rspack_binding_api/src/trace_event.rs b/crates/rspack_binding_api/src/trace_event.rs
@@ -1,7 +1,6 @@
-use std::collections::HashMap;
-
 use napi::bindgen_prelude::BigInt;
 use napi_derive::napi;
+use rustc_hash::FxHashMap as HashMap;
 
 #[napi(object)]
 #[derive(Debug)]
diff --git a/crates/rspack_plugin_html/src/config.rs b/crates/rspack_plugin_html/src/config.rs
@@ -1,8 +1,9 @@
-use std::{collections::HashMap, fmt, path::PathBuf, str::FromStr};
+use std::{fmt, path::PathBuf, str::FromStr};
 
 use futures::future::BoxFuture;
 use rspack_core::{Compilation, PublicPath};
 use rspack_error::Result;
+use rspack_util::fx_hash::FxHashMap;
 use serde::Serialize;
 use sugar_path::SugarPath;
 
@@ -89,7 +90,7 @@ impl std::fmt::Debug for TemplateParameterFn {
 
 #[derive(Debug)]
 pub enum TemplateParameters {
-  Map(HashMap<String, String>),
+  Map(FxHashMap<String, String>),
   Function(TemplateParameterFn),
   Disabled,
 }
@@ -173,7 +174,7 @@ pub struct HtmlRspackPluginOptions {
   pub minify: Option<bool>,
   pub title: Option<String>,
   pub favicon: Option<String>,
-  pub meta: Option<HashMap<String, HashMap<String, String>>>,
+  pub meta: Option<FxHashMap<String, FxHashMap<String, String>>>,
   pub hash: Option<bool>,
   pub base: Option<HtmlRspackPluginBaseOptions>,
   /// uid is used to identify the plugin instance on javascript side
diff --git a/crates/rspack_plugin_html/src/tag.rs b/crates/rspack_plugin_html/src/tag.rs
@@ -1,7 +1,7 @@
 use core::fmt;
-use std::collections::HashMap;
 
 use itertools::Itertools;
+use rspack_util::fx_hash::FxHashMap;
 use serde::{
   de::{MapAccess, Visitor},
   ser::SerializeMap,
@@ -191,7 +191,7 @@ impl HtmlPluginTag {
     }
   }
 
-  pub fn create_meta(meta: &HashMap<String, HashMap<String, String>>) -> Vec<HtmlPluginTag> {
+  pub fn create_meta(meta: &FxHashMap<String, FxHashMap<String, String>>) -> Vec<HtmlPluginTag> {
     meta
       .values()
       .map(|value| HtmlPluginTag {
diff --git a/crates/rspack_plugin_schemes/src/http_uri/http_cache.rs b/crates/rspack_plugin_schemes/src/http_uri/http_cache.rs
@@ -11,6 +11,7 @@ use cow_utils::CowUtils;
 use rspack_base64::encode_to_string;
 use rspack_fs::WritableFileSystem;
 use rspack_paths::Utf8Path;
+use rspack_util::fx_hash::FxHashMap;
 use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha512};
 use url::Url;
@@ -20,13 +21,13 @@ use crate::http_uri::HttpUriPluginOptions;
 
 pub struct HttpResponse {
   pub status: u16,
-  pub headers: HashMap<String, String>,
+  pub headers: FxHashMap<String, String>,
   pub body: Vec<u8>,
 }
 
 #[async_trait]
 pub trait HttpClient: Send + Sync + std::fmt::Debug {
-  async fn get(&self, url: &str, headers: &HashMap<String, String>) -> Result<HttpResponse>;
+  async fn get(&self, url: &str, headers: &FxHashMap<String, String>) -> Result<HttpResponse>;
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
@@ -110,7 +111,7 @@ impl HttpCache {
     cached_result: Option<ContentFetchResult>,
   ) -> Result<FetchResultType> {
     let request_time = current_time();
-    let mut headers = HashMap::new();
+    let mut headers = FxHashMap::default();
 
     // Add webpack-like headers
     headers.insert(
diff --git a/packages/rspack/src/ChunkGraph.ts b/packages/rspack/src/ChunkGraph.ts
@@ -49,7 +49,7 @@ Object.defineProperty(ChunkGraph.prototype, "getModuleHash", {
 });
 
 declare module "@rspack/binding" {
-	interface Chunk {
+	interface ChunkGraph {
 		getModuleChunksIterable(module: Module): Iterable<Chunk>;
 		getOrderedChunkModulesIterable(
 			chunk: Chunk,
