feat(mf): add layer-aware shared module core

crates/node_binding/napi-binding.d.ts

@@ -2007,6 +2007,9 @@ export interface RawCompilerPlatform {
 
 export interface RawConsumeOptions {
   key: string
+  request?: string
+  issuerLayer?: string
+  layer?: string
   import?: string
   importResolved?: string
   shareKey: string
@@ -2836,9 +2839,13 @@ export interface RawOptimizationOptions {
 }
 
 export interface RawOptimizeSharedConfig {
+  request?: string
+  issuerLayer?: string
   shareKey: string
+  shareScope?: string | Array<string>
   treeShaking: boolean
   usedExports?: Array<string>
+  layer?: string
 }
 
 export interface RawOptions {
@@ -2943,6 +2950,8 @@ export interface RawProgressPluginOptions {
 
 export interface RawProvideOptions {
   key: string
+  request?: string
+  layer?: string
   shareKey: string
   shareScope: string | Array<string>
   version?: string | false | undefined
@@ -3112,6 +3121,9 @@ export interface RawSharedContainerPluginOptions {
   name: string
   request: string
   version: string
+  shareKey?: string
+  shareScope?: string | Array<string>
+  layer?: string
   fileName?: string
   library: JsLibraryOptions
 }

crates/rspack_binding_api/src/raw_options/raw_builtins/raw_mf.rs

@@ -118,6 +118,8 @@ impl From<RawRemoteOptions> for (String, RemoteOptions) {
 #[napi(object)]
 pub struct RawProvideOptions {
   pub key: String,
+  pub request: Option<String>,
+  pub layer: Option<String>,
   pub share_key: String,
   pub share_scope: Either<String, Vec<String>>,
   #[napi(ts_type = "string | false | undefined")]
@@ -135,6 +137,9 @@ impl From<RawProvideOptions> for (String, ProvideOptions) {
     (
       value.key,
       ProvideOptions {
+        config_id: 0,
+        request: value.request,
+        layer: value.layer,
         share_key: value.share_key,
         share_scope: into_share_scope(value.share_scope),
         version: value.version.map(|v| RawVersionWrapper(v).into()),
@@ -177,16 +182,26 @@ pub struct RawSharedContainerPluginOptions {
   pub name: String,
   pub request: String,
   pub version: String,
+  pub share_key: Option<String>,
+  pub share_scope: Option<Either<String, Vec<String>>>,
+  pub layer: Option<String>,
   pub file_name: Option<String>,
   pub library: JsLibraryOptions,
 }
 
 impl From<RawSharedContainerPluginOptions> for SharedContainerPluginOptions {
   fn from(value: RawSharedContainerPluginOptions) -> Self {
+    let share_key = value.share_key.unwrap_or_else(|| value.name.clone());
     SharedContainerPluginOptions {
       name: value.name,
       request: value.request,
       version: value.version,
+      share_key,
+      share_scope: value.share_scope.map_or_else(
+        || ShareScope::Single("default".to_string()),
+        into_share_scope,
+      ),
+      layer: value.layer,
       library: value.library.into(),
       file_name: value.file_name.map(Into::into),
     }
@@ -217,17 +232,29 @@ impl From<RawConsumeSharedPluginOptions> for ConsumeSharedPluginOptions {
 #[derive(Debug)]
 #[napi(object)]
 pub struct RawOptimizeSharedConfig {
+  pub request: Option<String>,
+  pub issuer_layer: Option<String>,
   pub share_key: String,
+  pub share_scope: Option<Either<String, Vec<String>>>,
   pub tree_shaking: bool,
   pub used_exports: Option<Vec<String>>,
+  pub layer: Option<String>,
 }
 
 impl From<RawOptimizeSharedConfig> for OptimizeSharedConfig {
   fn from(value: RawOptimizeSharedConfig) -> Self {
+    let request = value.request.unwrap_or_else(|| value.share_key.clone());
     Self {
+      request,
+      issuer_layer: value.issuer_layer,
       share_key: value.share_key,
+      share_scope: value.share_scope.map_or_else(
+        || ShareScope::Single("default".to_string()),
+        into_share_scope,
+      ),
       tree_shaking: value.tree_shaking,
       used_exports: value.used_exports.unwrap_or_default(),
+      layer: value.layer,
     }
   }
 }
@@ -264,6 +291,9 @@ impl From<RawSharedUsedExportsOptimizerPluginOptions> for SharedUsedExportsOptim
 #[napi(object)]
 pub struct RawConsumeOptions {
   pub key: String,
+  pub request: Option<String>,
+  pub issuer_layer: Option<String>,
+  pub layer: Option<String>,
   pub import: Option<String>,
   pub import_resolved: Option<String>,
   pub share_key: String,
@@ -282,6 +312,9 @@ impl From<RawConsumeOptions> for (String, ConsumeOptions) {
     (
       value.key,
       ConsumeOptions {
+        request: value.request,
+        issuer_layer: value.issuer_layer,
+        layer: value.layer,
         import: value.import,
         import_resolved: value.import_resolved,
         share_key: value.share_key,

crates/rspack_plugin_mf/src/container/container_entry_dependency.rs

@@ -4,7 +4,7 @@ use rspack_core::{
   DependencyType, ModuleDependency, ResourceIdentifier,
 };
 
-use crate::{ExposeOptions, ShareScope};
+use crate::{ExposeOptions, ShareScope, SharedIdentity};
 
 #[cacheable]
 #[derive(Debug)]
@@ -15,6 +15,8 @@ pub struct ContainerEntryDependency {
   pub share_scope: ShareScope,
   pub request: Option<String>,
   pub version: Option<String>,
+  pub(crate) share_key: Option<String>,
+  pub(crate) layer: Option<String>,
   resource_identifier: ResourceIdentifier,
   pub(crate) enhanced: bool,
   dependency_type: DependencyType,
@@ -35,21 +37,38 @@ impl ContainerEntryDependency {
       share_scope,
       request: None,
       version: None,
+      share_key: None,
+      layer: None,
       resource_identifier,
       enhanced,
       dependency_type: DependencyType::ContainerEntry,
     }
   }
 
-  pub fn new_share_container_entry(name: String, request: String, version: String) -> Self {
-    let resource_identifier = format!("share-container-entry-{}", &name).into();
+  pub(crate) fn new_share_container_entry(
+    name: String,
+    request: String,
+    version: String,
+    share_scope: ShareScope,
+    share_key: String,
+    layer: Option<String>,
+  ) -> Self {
+    let shared_identity = SharedIdentity::new(&share_scope, &share_key, layer.as_deref());
+    let resource_identifier = format!(
+      "share-container-entry-{}-{}",
+      &name,
+      shared_identity.identifier_key()
+    )
+    .into();
     Self {
       id: DependencyId::new(),
       name,
       exposes: vec![],
-      share_scope: ShareScope::Multiple(vec![]),
+      share_scope,
       request: Some(request),
       version: Some(version),
+      share_key: Some(share_key),
+      layer,
       resource_identifier,
       enhanced: false,
       dependency_type: DependencyType::ShareContainerEntry,
@@ -71,6 +90,10 @@ impl Dependency for ContainerEntryDependency {
     &self.dependency_type
   }
 
+  fn get_layer(&self) -> Option<&rspack_core::ModuleLayer> {
+    self.layer.as_ref()
+  }
+
   fn resource_identifier(&self) -> Option<&str> {
     Some(&self.resource_identifier)
   }

crates/rspack_plugin_mf/src/container/container_entry_module.rs

@@ -23,7 +23,7 @@ use super::{
   container_exposed_dependency::ContainerExposedDependency, container_plugin::ExposeOptions,
 };
 use crate::{
-  ShareScope,
+  ShareScope, SharedIdentity,
   utils::{json_stringify, module_identifier_namespace, module_require_scope_name},
 };
 
@@ -42,6 +42,8 @@ pub struct ContainerEntryModule {
   enhanced: bool,
   request: Option<String>,
   version: Option<String>,
+  shared_share_key: Option<String>,
+  shared_layer: Option<String>,
   dependency_type: DependencyType,
   name: String,
 }
@@ -59,8 +61,8 @@ impl ContainerEntryModule {
     Self {
       dependencies_block: Default::default(),
       identifier: ModuleIdentifier::from(format!(
-        "container entry ({}) {}",
-        share_scope.key(),
+        "container entry {} {}",
+        share_scope.identifier_fragment(),
         json_stringify(&exposes),
       )),
       lib_ident,
@@ -79,26 +81,33 @@ impl ContainerEntryModule {
       enhanced,
       request: None,
       version: None,
+      shared_share_key: None,
+      shared_layer: None,
       dependency_type: DependencyType::ContainerEntry,
       source_map_kind: SourceMapKind::empty(),
       name,
     }
   }
 
-  pub fn new_share_container_entry(
+  pub(crate) fn new_share_container_entry(
     name: String,
     request: String,
     version: String,
+    share_scope: ShareScope,
+    share_key: String,
+    layer: Option<String>,
     runtime_mode: RuntimeMode,
   ) -> Self {
     let namespace = module_identifier_namespace(runtime_mode);
-    let lib_ident = format!("{namespace}/share/container/{name}");
+    let shared_identity = SharedIdentity::new(&share_scope, &share_key, layer.as_deref());
+    let identity_key = shared_identity.identifier_key();
+    let lib_ident = format!("{namespace}/share/container/{identity_key}");
     Self {
       dependencies_block: Default::default(),
-      identifier: ModuleIdentifier::from(format!("share container entry {}@{}", &name, &version,)),
+      identifier: ModuleIdentifier::from(format!("share container entry {identity_key}@{version}")),
       lib_ident,
       exposes: vec![],
-      share_scope: ShareScope::Multiple(vec![]),
+      share_scope,
       factory_meta: Default::default(),
       build_info: BuildInfo {
         strict: true,
@@ -112,6 +121,8 @@ impl ContainerEntryModule {
       enhanced: false,
       request: Some(request),
       version: Some(version),
+      shared_share_key: Some(share_key),
+      shared_layer: layer,
       dependency_type: DependencyType::ShareContainerEntry,
       source_map_kind: SourceMapKind::empty(),
       name,
@@ -125,6 +136,12 @@ impl ContainerEntryModule {
   pub fn name(&self) -> &str {
     &self.name
   }
+
+  pub(crate) fn shared_identity(&self) -> Option<SharedIdentity> {
+    self.shared_share_key.as_deref().map(|share_key| {
+      SharedIdentity::new(&self.share_scope, share_key, self.shared_layer.as_deref())
+    })
+  }
 }
 
 impl Identifiable for ContainerEntryModule {
@@ -160,6 +177,10 @@ impl Module for ContainerEntryModule {
     }
   }
 
+  fn get_layer(&self) -> Option<&rspack_core::ModuleLayer> {
+    self.shared_layer.as_ref()
+  }
+
   fn source_types(&self, _module_graph: &ModuleGraph) -> &[SourceType] {
     &[SourceType::JavaScript, SourceType::Expose]
   }

crates/rspack_plugin_mf/src/container/container_entry_module_factory.rs

@@ -25,6 +25,12 @@ impl ModuleFactory for ContainerEntryModuleFactory {
           dep.name.clone(),
           dep.request.clone().expect("should have request"),
           dep.version.clone().expect("should have version"),
+          dep.share_scope.clone(),
+          dep
+            .share_key
+            .clone()
+            .expect("share container entry should have a share key"),
+          dep.layer.clone(),
           data.build_context.compiler_options.experiments.runtime_mode,
         )
         .boxed(),