fix(preserveModules): correctly generate absolute chunk file names

shulaoda · shulaoda · commit 55067534dd93 · 2025-06-26T05:46:12.000+08:00
diff --git a/crates/rolldown/src/stages/generate_stage/mod.rs b/crates/rolldown/src/stages/generate_stage/mod.rs
@@ -174,7 +174,7 @@ impl<'a> GenerateStage<'a> {
                 representative_file_name_for_preserve_modules(module_id.as_path());
 
               let sanitized_absolute_filename =
-                sanitize_filename.call(absolute_chunk_file_name.as_ref()).await?;
+                sanitize_filename.call(absolute_chunk_file_name.as_str()).await?;
 
               let sanitized_chunk_name = sanitize_filename.call(&chunk_name).await?;
               (sanitized_chunk_name, sanitized_absolute_filename)
diff --git a/crates/rolldown_std_utils/src/path_ext.rs b/crates/rolldown_std_utils/src/path_ext.rs
@@ -50,22 +50,13 @@ impl PathExt for Path {
 }
 
 /// The first one is for chunk name, the second element is used for generate absolute file name
-pub fn representative_file_name_for_preserve_modules(path: &Path) -> (Cow<str>, Cow<str>) {
+pub fn representative_file_name_for_preserve_modules(path: &Path) -> (Cow<str>, String) {
   let file_name =
     path.file_stem().map_or_else(|| path.to_string_lossy(), |stem| stem.to_string_lossy());
-  let idx = path.to_string_lossy().rfind(file_name.as_ref()).expect("should contains file_name");
-  let ab_path = slice_cow_str(path.to_string_lossy(), 0, idx + file_name.len());
+  let ab_path = path.with_extension("").to_string_lossy().into_owned();
   (file_name, ab_path)
 }
 
-#[inline]
-fn slice_cow_str(cow: Cow<str>, start: usize, end: usize) -> Cow<'_, str> {
-  match cow {
-    Cow::Borrowed(s) => Cow::Borrowed(&s[start..end]),
-    Cow::Owned(s) => Cow::Owned(s[start..end].to_string()),
-  }
-}
-
 #[test]
 fn test_representative_file_name() {
   let cwd = Path::new(".").join("project");
@@ -78,6 +69,10 @@ fn test_representative_file_name() {
   let path = cwd.join("vue").join("mod.ts");
   assert_eq!(path.representative_file_name(), "vue");
 
+  let path = cwd.join("x.jsx");
+  let (_, ab_path) = representative_file_name_for_preserve_modules(&path);
+  assert_eq!(Path::new(&ab_path).file_name().unwrap().to_string_lossy(), "x");
+
   #[cfg(not(target_os = "windows"))]
   {
     let path = cwd.join("src").join("vue.js");
