feat: add contextInfo.issuerLayer for nmf resolve hooks (#9504)

Author: ahabhgk

crates/node_binding/binding.d.ts

@@ -423,6 +423,7 @@ export interface JsAfterResolveData {
   request: string
   context: string
   issuer: string
+  issuerLayer?: string
   fileDependencies: Array<string>
   contextDependencies: Array<string>
   missingDependencies: Array<string>
@@ -489,6 +490,7 @@ export interface JsBeforeResolveArgs {
   request: string
   context: string
   issuer: string
+  issuerLayer?: string
 }
 
 export interface JsBuildMeta {
@@ -647,6 +649,7 @@ export interface JsFactorizeArgs {
   request: string
   context: string
   issuer: string
+  issuerLayer?: string
 }
 
 export interface JsFactoryMeta {
@@ -795,6 +798,7 @@ export interface JsResolveArgs {
   request: string
   context: string
   issuer: string
+  issuerLayer?: string
 }
 
 export interface JsResolveForSchemeArgs {

crates/node_binding/src/normal_module_factory.rs

@@ -16,6 +16,7 @@ pub struct JsBeforeResolveArgs {
   pub request: String,
   pub context: String,
   pub issuer: String,
+  pub issuer_layer: Option<String>,
 }
 
 pub type JsBeforeResolveOutput = (Option<bool>, JsBeforeResolveArgs);
@@ -25,6 +26,7 @@ pub struct JsFactorizeArgs {
   pub request: String,
   pub context: String,
   pub issuer: String,
+  pub issuer_layer: Option<String>,
 }
 
 pub type JsFactorizeOutput = JsFactorizeArgs;
@@ -34,6 +36,7 @@ pub struct JsResolveArgs {
   pub request: String,
   pub context: String,
   pub issuer: String,
+  pub issuer_layer: Option<String>,
 }
 
 pub type JsResolveOutput = JsResolveArgs;
@@ -50,6 +53,7 @@ pub struct JsAfterResolveData {
   pub request: String,
   pub context: String,
   pub issuer: String,
+  pub issuer_layer: Option<String>,
   pub file_dependencies: Vec<String>,
   pub context_dependencies: Vec<String>,
   pub missing_dependencies: Vec<String>,

crates/node_binding/src/plugins/interceptor.rs

@@ -1550,6 +1550,7 @@ impl NormalModuleFactoryBeforeResolve for NormalModuleFactoryBeforeResolveTap {
           .as_ref()
           .map(|issuer| issuer.to_string())
           .unwrap_or_default(),
+        issuer_layer: data.issuer_layer.clone(),
       })
       .await
     {
@@ -1586,6 +1587,7 @@ impl NormalModuleFactoryFactorize for NormalModuleFactoryFactorizeTap {
           .as_ref()
           .map(|issuer| issuer.to_string())
           .unwrap_or_default(),
+        issuer_layer: data.issuer_layer.clone(),
       })
       .await
     {
@@ -1623,6 +1625,7 @@ impl NormalModuleFactoryResolve for NormalModuleFactoryResolveTap {
           .as_ref()
           .map(|issuer| issuer.to_string())
           .unwrap_or_default(),
+        issuer_layer: data.issuer_layer.clone(),
       })
       .await
     {
@@ -1685,6 +1688,7 @@ impl NormalModuleFactoryAfterResolve for NormalModuleFactoryAfterResolveTap {
           .as_ref()
           .map(|issuer| issuer.to_string())
           .unwrap_or_default(),
+        issuer_layer: data.issuer_layer.clone(),
         file_dependencies: data
           .file_dependencies
           .clone()

packages/rspack-test-tools/tests/configCases/plugins/normal-module-replacement-plugin-args/index.js

@@ -0,0 +1,3 @@
+it("should resolve with replaced request", function () {
+	expect(require("./request.v1")).toBe("v2");
+});

packages/rspack-test-tools/tests/configCases/plugins/normal-module-replacement-plugin-args/request.v1.js

@@ -0,0 +1 @@
+module.exports = "v1";

packages/rspack-test-tools/tests/configCases/plugins/normal-module-replacement-plugin-args/request.v2.js

@@ -0,0 +1 @@
+module.exports = "v2";

packages/rspack-test-tools/tests/configCases/plugins/normal-module-replacement-plugin-args/rspack.config.js

@@ -0,0 +1,21 @@
+const { NormalModuleReplacementPlugin } = require("@rspack/core");
+
+module.exports = /** @type {import("@rspack/core").Configuration} */ ({
+	entry: {
+		main: {
+			import: "./index.js",
+			layer: "test"
+		}
+	},
+	plugins: [
+		new NormalModuleReplacementPlugin(/request.v1(\.|$)/, args => {
+			expect(args.request).toBe("./request.v1");
+			expect(args.contextInfo.issuer).toBe("test");
+			expect(args.contextInfo.issuerLayer.endsWith("index.js")).toBe(true);
+			args.request = args.request.replace(/request\.v1(\.|$)/, "request.v2$1");
+		})
+	],
+	experiments: {
+		layers: true
+	}
+});

packages/rspack/etc/core.api.md

@@ -1176,7 +1176,7 @@ export type Context = string;
 // @public (undocumented)
 type ContextInfo = {
     issuer: string;
-    issuerLayer?: string;
+    issuerLayer?: string | null;
 };
 
 // @public (undocumented)

packages/rspack/src/Module.ts

@@ -26,7 +26,7 @@ export type ResourceDataWithData = ResourceData & {
 export type CreateData = Partial<JsCreateData>;
 export type ContextInfo = {
 	issuer: string;
-	issuerLayer?: string;
+	issuerLayer?: string | null;
 };
 export type ResolveData = {
 	contextInfo: ContextInfo;

packages/rspack/src/taps/normalModuleFactory.ts

@@ -19,7 +19,8 @@ export const createNormalModuleFactoryHooksRegisters: CreatePartialRegisters<
 				return async function (resolveData: binding.JsBeforeResolveArgs) {
 					const normalizedResolveData: ResolveData = {
 						contextInfo: {
-							issuer: resolveData.issuer
+							issuer: resolveData.issuer,
+							issuerLayer: resolveData.issuerLayer ?? null
 						},
 						request: resolveData.request,
 						context: resolveData.context,
@@ -46,7 +47,8 @@ export const createNormalModuleFactoryHooksRegisters: CreatePartialRegisters<
 				return async function (resolveData: binding.JsFactorizeArgs) {
 					const normalizedResolveData: ResolveData = {
 						contextInfo: {
-							issuer: resolveData.issuer
+							issuer: resolveData.issuer,
+							issuerLayer: resolveData.issuerLayer ?? null
 						},
 						request: resolveData.request,
 						context: resolveData.context,
@@ -73,7 +75,8 @@ export const createNormalModuleFactoryHooksRegisters: CreatePartialRegisters<
 				return async function (resolveData: binding.JsFactorizeArgs) {
 					const normalizedResolveData: ResolveData = {
 						contextInfo: {
-							issuer: resolveData.issuer
+							issuer: resolveData.issuer,
+							issuerLayer: resolveData.issuerLayer ?? null
 						},
 						request: resolveData.request,
 						context: resolveData.context,
@@ -115,7 +118,8 @@ export const createNormalModuleFactoryHooksRegisters: CreatePartialRegisters<
 				return async function (arg: binding.JsAfterResolveData) {
 					const data: ResolveData = {
 						contextInfo: {
-							issuer: arg.issuer
+							issuer: arg.issuer,
+							issuerLayer: arg.issuerLayer ?? null
 						},
 						request: arg.request,
 						context: arg.context,