fix: should re-exports deep star reexports

Author: JSerFeng

crates/rspack_core/src/concatenated_module.rs

@@ -43,8 +43,8 @@ use crate::{
   CodeGenerationExportsFinalNames, CodeGenerationPublicPathAutoReplace, CodeGenerationResult,
   Compilation, ConcatenatedModuleIdent, ConcatenationScope, ConditionalInitFragment,
   ConnectionState, Context, DEFAULT_EXPORT, DEFAULT_EXPORT_ATOM, DependenciesBlock, DependencyId,
-  DependencyType, ExportMode, ExportProvided, ExportsArgument, ExportsInfoGetter, ExportsType,
-  FactoryMeta, GetUsedNameParam, IdentCollector, InitFragment, InitFragmentStage, LibIdentOptions,
+  DependencyType, ExportProvided, ExportsArgument, ExportsInfoGetter, ExportsType, FactoryMeta,
+  GetUsedNameParam, IdentCollector, InitFragment, InitFragmentStage, LibIdentOptions,
   MaybeDynamicTargetExportInfoHashKey, Module, ModuleArgument, ModuleGraph,
   ModuleGraphCacheArtifact, ModuleGraphConnection, ModuleIdentifier, ModuleLayer,
   ModuleStaticCacheArtifact, ModuleType, NAMESPACE_OBJECT_EXPORT, ParserOptions,
@@ -201,7 +201,6 @@ pub struct ConcatenatedModuleInfo {
   pub global_scope_ident: Vec<ConcatenatedModuleIdent>,
   pub idents: Vec<ConcatenatedModuleIdent>,
   pub all_used_names: HashSet<Atom>,
-  pub re_exports: IdentifierIndexMap<Vec<ExportMode>>,
   pub binding_to_ref: HashMap<(Atom, SyntaxContext), Vec<ConcatenatedModuleIdent>>,
 
   pub public_path_auto_replacement: Option<bool>,

crates/rspack_plugin_esm_library/src/link.rs

@@ -1,7 +1,9 @@
 use std::{collections::hash_map::Entry, sync::Arc};
 
 use rayon::prelude::*;
-use rspack_collections::{IdentifierIndexMap, IdentifierIndexSet, IdentifierMap, UkeyMap};
+use rspack_collections::{
+  IdentifierIndexMap, IdentifierIndexSet, IdentifierMap, IdentifierSet, UkeyMap,
+};
 use rspack_core::{
   BuildMetaDefaultObject, BuildMetaExportsType, ChunkGraph, ChunkInitFragments, ChunkUkey,
   CodeGenerationPublicPathAutoReplace, Compilation, ConcatenatedModuleIdent, ExportMode,
@@ -805,12 +807,6 @@ impl EsmLibraryPlugin {
                 concate_info.idents = idents;
                 concate_info.all_used_names = all_used_names;
                 concate_info.binding_to_ref = binding_to_ref;
-
-                let scope = codegen_res
-                  .concatenation_scope
-                  .as_ref()
-                  .expect("should have concatenation scope");
-                concate_info.re_exports = scope.re_exports.clone();
                 concate_info.has_ast = true;
                 concate_info.source = Some(ReplaceSource::new(render_source.source.clone()));
                 concate_info.internal_source = Some(render_source.source.clone());
@@ -967,6 +963,7 @@ impl EsmLibraryPlugin {
           .expect("should have mode");
 
         let optimize_reexport_star = possible_to_optimize_mode
+          && export_dep.name.is_none()
           && ref_box_module
             .as_external_module()
             .is_some_and(|m| matches!(m.get_external_type().as_str(), "module-import" | "module"));
@@ -979,17 +976,36 @@ impl EsmLibraryPlugin {
           chunk_link
             .raw_star_exports
             .insert(export_dep.request.to_string());
+          continue;
         }
 
         let chunk_link = link.get_mut(&current_chunk).expect("should have link");
+
         match re_exports {
           rspack_core::ExportMode::Missing
           | rspack_core::ExportMode::LazyMake
-          | rspack_core::ExportMode::DynamicReexport(_)
           | rspack_core::ExportMode::ReexportUndefined(_)
           | rspack_core::ExportMode::EmptyStar(_)
           | rspack_core::ExportMode::Unused(_) => {}
 
+          rspack_core::ExportMode::DynamicReexport(_) => {
+            // special handling for export * from normal module
+            if export_dep.name.is_none() && export_dep.get_ids(module_graph).is_empty() {
+              Self::link_re_export(
+                ref_module,
+                current_chunk,
+                compilation,
+                concate_modules_map,
+                required,
+                link,
+                module_graph,
+                needed_namespace_objects,
+                entry_imports,
+                exports,
+              );
+            }
+          }
+
           rspack_core::ExportMode::ReexportDynamicDefault(mode) => {
             let ref_info = concate_modules_map
               .get(&ref_module)
@@ -1145,10 +1161,10 @@ impl EsmLibraryPlugin {
             let exports_info = module_graph.get_exports_info(&ref_module);
 
             for item in &mode.items {
-              // reset ref_module for each dep
               let mut ref_module = orig_ref_module;
 
               if item.hidden {
+                // ignore hidden
                 continue;
               }
 
@@ -1161,40 +1177,57 @@ impl EsmLibraryPlugin {
                 continue;
               }
 
-              let chunk_link = link.get_mut(&current_chunk).expect("should have link");
+              let name = item.ids.first().unwrap_or(&item.name);
+              let mut unknown_export_info = false;
 
-              let export_info = item
-                .ids
-                .first()
-                .and_then(|id| exports_info.as_data(module_graph).named_exports(id))
-                .unwrap_or(item.export_info.as_data(module_graph));
+              let mut export_info =
+                if let Some(export_info) = exports_info.as_data(module_graph).named_exports(name) {
+                  export_info
+                } else {
+                  unknown_export_info = true;
+                  // export info not found, this is likely because the export is from unknown
+                  item.export_info.as_data(module_graph)
+                };
 
-              if export_info.is_reexport() {
-                // should point to the real export
+              let mut visited_modules = IdentifierSet::default();
+              visited_modules.insert(ref_module);
+              while export_info.is_reexport() {
                 let targets = export_info.get_max_target();
-                let (Some(dep), _) = targets
+                let (dep, _) = targets
                   .iter()
                   .next()
-                  .expect("should have target if export info is reexport")
-                else {
-                  continue;
-                };
+                  .expect("should have target if export info is reexport");
+                let dep = dep.expect("should have dependency for re-exported export info");
 
-                let Some(module) = module_graph.module_identifier_by_dependency_id(dep) else {
-                  continue;
+                let Some(module) = module_graph.module_identifier_by_dependency_id(&dep) else {
+                  unreachable!("should have module for re-exported dependency");
                 };
                 ref_module = *module;
+                if !visited_modules.insert(*module) {
+                  break;
+                }
+                let Some(target_export_info) = module_graph
+                  .get_exports_info(&ref_module)
+                  .as_data(module_graph)
+                  .named_exports(name)
+                else {
+                  // unknown export info, break
+                  unknown_export_info = true;
+                  break;
+                };
+                export_info = target_export_info;
               }
 
-              let exports_info = module_graph
-                .get_prefetched_exports_info(&ref_module, PrefetchExportsInfoMode::Default);
-              let export_info =
-                exports_info.get_read_only_export_info(item.ids.first().unwrap_or(&item.name));
+              let chunk_link = link.get_mut(&current_chunk).expect("should have link");
 
-              let used_name = export_info.get_used_name(None, None).unwrap_or_else(|| {
-                // dynamic export
+              let used_name = if unknown_export_info {
                 UsedNameItem::Str(item.name.clone())
-              });
+              } else {
+                export_info.get_used_name(None, None).unwrap_or_else(|| {
+                  // dynamic export
+                  UsedNameItem::Str(item.name.clone())
+                })
+              };
 
               if let UsedNameItem::Inlined(inlined) = used_name {
                 let new_name = find_new_name(&item.name, &chunk_link.used_names, &vec![]);
@@ -1212,6 +1245,10 @@ impl EsmLibraryPlugin {
                 continue;
               };
 
+              let UsedNameItem::Str(used_name) = used_name else {
+                unreachable!()
+              };
+
               // if item is from other module
               let ref_info = concate_modules_map
                 .get(&ref_module)
@@ -1234,10 +1271,6 @@ impl EsmLibraryPlugin {
                   chunk_link.used_names.insert(variable_to_export.clone());
                   entry_imports.entry(ref_info.module).or_default();
 
-                  let UsedNameItem::Str(used_name) = used_name else {
-                    unreachable!()
-                  };
-
                   let variable_to_export =
                     interop_info.property_access(&used_name, &mut chunk_link.used_names);
                   Self::add_chunk_export(

tests/rspack-test/esmOutputCases/re-exports/deep-re-exports-esm/__snapshots__/esm.snap.txt

@@ -0,0 +1,33 @@
+```mjs title=main.mjs
+// ./lib3.js
+const lib3_lib3 = 42
+
+// ./lib2.js
+
+
+const lib2_lib2 = 42
+
+// ./lib.js
+
+
+const lib_lib = 42
+
+// ./index.js
+
+
+it('should re-export esm correctly', async () => {
+	const { lib, lib2, lib3 } = await import(/* webpackIgnore: true */ './main.mjs')
+	expect(lib).toBe(42)
+	expect(lib2).toBe(42)
+	expect(lib3).toBe(42)
+})
+
+export { lib2_lib2 as lib2, lib3_lib3 as lib3, lib_lib as lib };
+
+```
+
+```mjs title=runtime.mjs
+
+
+
+```

tests/rspack-test/esmOutputCases/re-exports/deep-re-exports-esm/index.js

@@ -0,0 +1,8 @@
+export * from './lib'
+
+it('should re-export esm correctly', async () => {
+	const { lib, lib2, lib3 } = await import(/* webpackIgnore: true */ './main.mjs')
+	expect(lib).toBe(42)
+	expect(lib2).toBe(42)
+	expect(lib3).toBe(42)
+})

tests/rspack-test/esmOutputCases/re-exports/deep-re-exports-esm/lib.js

@@ -0,0 +1,3 @@
+export * from './lib2'
+
+export const lib = 42

tests/rspack-test/esmOutputCases/re-exports/deep-re-exports-esm/lib2.js

@@ -0,0 +1,3 @@
+export * from './lib3'
+
+export const lib2 = 42

tests/rspack-test/esmOutputCases/re-exports/deep-re-exports-esm/lib3.js

@@ -0,0 +1 @@
+export const lib3 = 42

tests/rspack-test/esmOutputCases/re-exports/deep-re-exports-wrapped/__snapshots__/esm.snap.txt

@@ -0,0 +1,121 @@
+```mjs title=main.mjs
+import { __webpack_require__ } from "./runtime.mjs";
+__webpack_require__.add({
+"./lib.js": 
+/*!****************!*\
+  !*** ./lib.js ***!
+  \****************/
+(function (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+__webpack_require__.d(__webpack_exports__, {
+  BI: () => (/* reexport safe */ _lib2__WEBPACK_IMPORTED_MODULE_0__.B),
+  cR: () => (lib),
+  up: () => (/* reexport safe */ _lib2__WEBPACK_IMPORTED_MODULE_0__.u)
+});
+/* ESM import */var _lib2__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./lib2 */ "./lib2.js");
+
+
+const lib = 42
+
+eval('')
+
+
+}),
+"./lib2.js": 
+/*!*****************!*\
+  !*** ./lib2.js ***!
+  \*****************/
+(function (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+__webpack_require__.d(__webpack_exports__, {
+  B: () => (/* reexport safe */ _lib3__WEBPACK_IMPORTED_MODULE_0__.B),
+  u: () => (lib2)
+});
+/* ESM import */var _lib3__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./lib3 */ "./lib3.js");
+
+
+const lib2 = 42
+
+
+}),
+"./lib3.js": 
+/*!*****************!*\
+  !*** ./lib3.js ***!
+  \*****************/
+(function (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+__webpack_require__.d(__webpack_exports__, {
+  B: () => (lib3)
+});
+const lib3 = 42
+
+
+}),
+});
+// ./index.js
+const lib_0 = __webpack_require__("./lib.js");
+var cR = lib_0.cR;
+
+
+it('should re-export esm correctly', async () => {
+	const { lib, lib2, lib3 } = await import(/* webpackIgnore: true */ './main.mjs')
+	expect(lib).toBe(42)
+	expect(lib2).toBe(42)
+	expect(lib3).toBe(42)
+})
+
+const lib2_0 = __webpack_require__("./lib2.js");
+var u = lib2_0.u;
+
+const lib3_0 = __webpack_require__("./lib3.js");
+var B = lib3_0.B;
+
+export { B as lib3, cR as lib, u as lib2 };
+
+```
+
+```mjs title=runtime.mjs
+
+var __webpack_modules__ = {};
+// The module cache
+var __webpack_module_cache__ = {};
+// The require function
+function __webpack_require__(moduleId) {
+// Check if module is in cache
+var cachedModule = __webpack_module_cache__[moduleId];
+if (cachedModule !== undefined) {
+return cachedModule.exports;
+}
+// Create a new module (and put it into the cache)
+var module = (__webpack_module_cache__[moduleId] = {
+exports: {}
+});
+// Execute the module function
+__webpack_modules__[moduleId](module, module.exports, __webpack_require__);
+
+// Return the exports of the module
+return module.exports;
+}
+// expose the modules object (__webpack_modules__)
+__webpack_require__.m = __webpack_modules__;
+
+// esm library register module runtime
+(() => {
+__webpack_require__.add = function registerModules(modules) { Object.assign(__webpack_require__.m, modules) }
+
+})();
+// webpack/runtime/define_property_getters
+(() => {
+__webpack_require__.d = (exports, definition) => {
+	for(var key in definition) {
+        if(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {
+            Object.defineProperty(exports, key, { enumerable: true, get: definition[key] });
+        }
+    }
+};
+})();
+// webpack/runtime/has_own_property
+(() => {
+__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))
+})();
+
+export { __webpack_require__ };
+
+```

tests/rspack-test/esmOutputCases/re-exports/deep-re-exports-wrapped/index.js

@@ -0,0 +1,8 @@
+export * from './lib'
+
+it('should re-export esm correctly', async () => {
+	const { lib, lib2, lib3 } = await import(/* webpackIgnore: true */ './main.mjs')
+	expect(lib).toBe(42)
+	expect(lib2).toBe(42)
+	expect(lib3).toBe(42)
+})

tests/rspack-test/esmOutputCases/re-exports/deep-re-exports-wrapped/lib.js

@@ -0,0 +1,5 @@
+export * from './lib2'
+
+export const lib = 42
+
+eval('')