fix: inline enum not only properties used (#11740)

Author: ahabhgk

crates/rspack_plugin_javascript/src/dependency/esm/esm_export_specifier_dependency.rs

@@ -10,6 +10,8 @@ use rspack_core::{
 };
 use swc_core::ecma::atoms::Atom;
 
+use crate::is_export_inlined;
+
 // Create _webpack_require__.d(__webpack_exports__, {}) for each export.
 #[cacheable]
 #[derive(Debug, Clone)]
@@ -177,15 +179,7 @@ impl DependencyTemplate for ESMExportSpecifierDependencyTemplate {
           return false;
         }
         let export_name = &[dep.name.clone(), enum_key.clone()];
-        let exports_info = module_graph.get_prefetched_exports_info(
-          &module.identifier(),
-          PrefetchExportsInfoMode::Nested(export_name),
-        );
-        let Some(export_info) = exports_info.get_read_only_export_info_recursive(export_name)
-        else {
-          return false;
-        };
-        export_info.get_inline().is_some()
+        is_export_inlined(&module_graph, &module.identifier(), export_name, *runtime)
       });
       if all_enum_member_inlined {
         return;

crates/rspack_plugin_javascript/src/dependency/esm/esm_import_specifier_dependency.rs

@@ -25,7 +25,7 @@ use super::{
 };
 use crate::{
   connection_active_inline_value_for_esm_import_specifier, connection_active_used_by_exports,
-  visitors::DestructuringAssignmentProperty,
+  is_export_inlined, visitors::DestructuringAssignmentProperty,
 };
 
 #[cacheable]
@@ -513,33 +513,7 @@ impl DependencyTemplate for ESMImportSpecifierDependencyTemplate {
         *runtime,
         &compilation.module_graph_cache_artifact,
       )
-      && {
-        let used_name = if ids.is_empty() {
-          let exports_info = ExportsInfoGetter::prefetch_used_info_without_name(
-            &module_graph.get_exports_info(con.module_identifier()),
-            &module_graph,
-            *runtime,
-            false,
-          );
-          ExportsInfoGetter::get_used_name(
-            GetUsedNameParam::WithoutNames(&exports_info),
-            *runtime,
-            ids,
-          )
-        } else {
-          let exports_info = module_graph.get_prefetched_exports_info(
-            con.module_identifier(),
-            PrefetchExportsInfoMode::Nested(ids),
-          );
-          ExportsInfoGetter::get_used_name(
-            GetUsedNameParam::WithNames(&exports_info),
-            *runtime,
-            ids,
-          )
-        };
-
-        !used_name.map(|used| used.is_inlined()).unwrap_or_default()
-      }
+      && !is_export_inlined(&module_graph, con.module_identifier(), ids, *runtime)
     {
       return;
     }

crates/rspack_plugin_javascript/src/dependency/export_info_dependency.rs

@@ -5,7 +5,8 @@ use rspack_cacheable::{
 };
 use rspack_core::{
   DependencyCodeGeneration, DependencyTemplate, DependencyTemplateType, ExportProvided,
-  PrefetchExportsInfoMode, TemplateContext, TemplateReplaceSource, UsageState, UsedExports,
+  ExportsInfoGetter, GetUsedNameParam, PrefetchExportsInfoMode, TemplateContext,
+  TemplateReplaceSource, UsageState, UsedExports, UsedName,
 };
 use swc_core::ecma::atoms::Atom;
 
@@ -88,17 +89,12 @@ impl ExportInfoDependency {
         can_mangle.map(|v| v.to_string())
       }
       "canInline" => {
-        let inlinable = if let Some(export_info) =
-          exports_info.get_read_only_export_info_recursive(export_name)
-        {
-          export_info.get_inline()
-        } else {
-          exports_info.other_exports_info().get_inline()
-        };
-        Some(match inlinable {
-          Some(inlined) => format!("inlined {}", inlined.render()),
-          _ => "no inline".to_string(),
-        })
+        let used_name = ExportsInfoGetter::get_used_name(
+          GetUsedNameParam::WithNames(&exports_info),
+          *runtime,
+          export_name,
+        );
+        Some(matches!(used_name, Some(UsedName::Inlined(_))).to_string())
       }
       "used" => {
         let used = exports_info.get_used(export_name, *runtime);

crates/rspack_plugin_javascript/src/parser_plugin/inline_const.rs

@@ -1,8 +1,9 @@
 use rspack_core::{
-  Dependency, DependencyId, EvaluatedInlinableValue, ExportMode, ModuleGraph,
-  ModuleGraphConnection, PrefetchExportsInfoMode, RuntimeSpec, UsageState,
+  Dependency, DependencyId, EvaluatedInlinableValue, ExportMode, ExportsInfoGetter,
+  GetUsedNameParam, ModuleGraph, ModuleGraphConnection, ModuleIdentifier, PrefetchExportsInfoMode,
+  RuntimeSpec, UsageState, UsedName,
 };
-use rspack_util::ryu_js;
+use rspack_util::{atom::Atom, ryu_js};
 use swc_core::ecma::ast::{ModuleDecl, ModuleItem, Program, VarDeclarator};
 
 use super::JavascriptParserPlugin;
@@ -143,6 +144,27 @@ fn inline_value_enabled(dependency_id: &DependencyId, mg: &ModuleGraph) -> bool
   inline_const_enabled || inline_enum_enabled
 }
 
+pub fn is_export_inlined(
+  mg: &ModuleGraph,
+  module: &ModuleIdentifier,
+  ids: &[Atom],
+  runtime: Option<&RuntimeSpec>,
+) -> bool {
+  let used_name = if ids.is_empty() {
+    let exports_info = ExportsInfoGetter::prefetch_used_info_without_name(
+      &mg.get_exports_info(module),
+      mg,
+      runtime,
+      false,
+    );
+    ExportsInfoGetter::get_used_name(GetUsedNameParam::WithoutNames(&exports_info), runtime, ids)
+  } else {
+    let exports_info = mg.get_prefetched_exports_info(module, PrefetchExportsInfoMode::Nested(ids));
+    ExportsInfoGetter::get_used_name(GetUsedNameParam::WithNames(&exports_info), runtime, ids)
+  };
+  matches!(used_name, Some(UsedName::Inlined(_)))
+}
+
 pub fn connection_active_inline_value_for_esm_import_specifier(
   dependency: &ESMImportSpecifierDependency,
   connection: &ModuleGraphConnection,
@@ -154,14 +176,7 @@ pub fn connection_active_inline_value_for_esm_import_specifier(
   }
   let module = connection.module_identifier();
   let ids = dependency.get_ids(mg);
-  let exports_info = mg.get_prefetched_exports_info(module, PrefetchExportsInfoMode::Nested(ids));
-  if exports_info.other_exports_info().get_used(runtime) != UsageState::Unused {
-    return true;
-  }
-  let Some(export_info) = exports_info.get_read_only_export_info_recursive(ids) else {
-    return true;
-  };
-  export_info.get_inline().is_none()
+  !is_export_inlined(mg, module, ids, runtime)
 }
 
 pub fn connection_active_inline_value_for_esm_export_imported_specifier(
@@ -186,12 +201,7 @@ pub fn connection_active_inline_value_for_esm_export_imported_specifier(
     if item.hidden || item.checked {
       return true;
     }
-    let exports_info =
-      mg.get_prefetched_exports_info(module, PrefetchExportsInfoMode::Nested(&item.ids));
-    let Some(export_info) = exports_info.get_read_only_export_info_recursive(&item.ids) else {
-      return true;
-    };
-    if export_info.get_inline().is_none() {
+    if !is_export_inlined(mg, module, &item.ids, runtime) {
       return true;
     }
   }

crates/rspack_plugin_javascript/src/parser_plugin/mod.rs

@@ -57,7 +57,7 @@ pub(crate) use self::{
   initialize_evaluating::InitializeEvaluating,
   inline_const::{
     InlineConstPlugin, connection_active_inline_value_for_esm_export_imported_specifier,
-    connection_active_inline_value_for_esm_import_specifier,
+    connection_active_inline_value_for_esm_import_specifier, is_export_inlined,
   },
   inner_graph::{connection_active_used_by_exports, plugin::*, state::InnerGraphState},
   javascript_meta_info_plugin::JavascriptMetaInfoPlugin,

tests/rspack-test/configCases/inline-enum/basic/index.js

@@ -73,10 +73,14 @@ it("should not inline if enum is not only properties used", () => {
     expect(e.A).toBe(0);
     expect(e.B).toBe(1);
   })(notOnlyPropertiesUsed.E);
+  expect(notOnlyPropertiesUsed.E.A).toBe(0);
+  expect(notOnlyPropertiesUsed.E.B).toBe(1);
   // END:G
   const block = generated.match(/\/\/ START:G([\s\S]*)\/\/ END:G/)[1];
   expect(block.includes(`(e.A).toBe(0)`)).toBe(true);
   expect(block.includes(`(e.B).toBe(1)`)).toBe(true);
+  expect(block.includes(`E.A).toBe(0)`)).toBe(true);
+  expect(block.includes(`E.B).toBe(1)`)).toBe(true);
   expect(block.includes(`inlined export`)).toBe(false);
 })