fix: use entry arg with match resource (#9235)

Author: ahabhgk

crates/node_binding/binding.d.ts

@@ -1669,8 +1669,10 @@ export interface RawFlagAllModulesAsUsedPluginOptions {
 export interface RawFuncUseCtx {
   resource?: string
   realResource?: string
-  resourceQuery?: string
-  issuer?: string
+  resourceQuery: string
+  resourceFragment: string
+  issuer: string
+  issuerLayer: string
 }
 
 export interface RawGeneratorOptions {

crates/rspack_binding_values/src/raw_options/raw_module/mod.rs

@@ -745,17 +745,21 @@ impl Debug for RawModuleOptions {
 pub struct RawFuncUseCtx {
   pub resource: Option<String>,
   pub real_resource: Option<String>,
-  pub resource_query: Option<String>,
-  pub issuer: Option<String>,
+  pub resource_query: String,
+  pub resource_fragment: String,
+  pub issuer: String,
+  pub issuer_layer: String,
 }
 
 impl From<FuncUseCtx> for RawFuncUseCtx {
   fn from(value: FuncUseCtx) -> Self {
     Self {
       resource: value.resource,
       real_resource: value.real_resource,
-      resource_query: value.resource_query,
-      issuer: value.issuer.map(|s| s.to_string()),
+      resource_query: value.resource_query.unwrap_or_default(),
+      resource_fragment: value.resource_fragment.unwrap_or_default(),
+      issuer: value.issuer.map(|s| s.to_string()).unwrap_or_default(),
+      issuer_layer: value.issuer_layer.unwrap_or_default(),
     }
   }
 }

crates/rspack_core/src/normal_module_factory.rs

@@ -418,13 +418,18 @@ impl NormalModuleFactory {
         let rule_use = match &rule.r#use {
           ModuleRuleUse::Array(array_use) => Cow::Borrowed(array_use),
           ModuleRuleUse::Func(func_use) => {
+            let resource_data_for_rules = match_resource_data.as_ref().unwrap_or(&resource_data);
             let context = FuncUseCtx {
               // align with webpack https://github.com/webpack/webpack/blob/899f06934391baede59da3dcd35b5ef51c675dbe/lib/NormalModuleFactory.js#L576
-              // resource shouldn't contain query otherwise it will cause duplicate query in https://github.com/unjs/unplugin/blob/62fdc5ae361d86a6ec39eaef5d8f01e12c6a794d/src/utils.ts#L58
-              resource: resource_data.resource_path.clone().map(|x| x.to_string()),
-              real_resource: Some(user_request.clone()),
+              resource: resource_data_for_rules
+                .resource_path
+                .as_ref()
+                .map(|x| x.to_string()),
+              resource_query: resource_data_for_rules.resource_query.clone(),
+              resource_fragment: resource_data_for_rules.resource_fragment.clone(),
+              real_resource: resource_data.resource_path.as_ref().map(|p| p.to_string()),
               issuer: data.issuer.clone(),
-              resource_query: resource_data.resource_query.clone(),
+              issuer_layer: data.issuer_layer.clone(),
             };
             Cow::Owned(func_use(context).await?)
           }

crates/rspack_core/src/options/module.rs

@@ -908,7 +908,9 @@ pub struct FuncUseCtx {
   pub resource: Option<String>,
   pub real_resource: Option<String>,
   pub resource_query: Option<String>,
+  pub resource_fragment: Option<String>,
   pub issuer: Option<Box<str>>,
+  pub issuer_layer: Option<String>,
 }
 
 #[derive(Debug, Clone)]

packages/rspack-test-tools/tests/configCases/module/function-use-match-resource/index.js

@@ -0,0 +1,12 @@
+import { A, B, __info__, __context__ } from "__label__?A=A#B=B!=!./lib";
+
+it("use entry arguments should be correct", () => {
+	expect(A).toBe('A');
+	expect(B).toBe('B');
+	expect(__info__.resource).toBe("__label__");
+	expect(__info__.realResource.includes("lib.js")).toBe(true);
+	expect(__info__.resourceQuery).toBe("?A=A");
+	expect(__info__.resourceFragment).toBe("#B=B");
+	expect(__info__.issuer.includes("index.js")).toBe(true);
+	expect(__info__.issuerLayer).toBe("");
+});

packages/rspack-test-tools/tests/configCases/module/function-use-match-resource/lib.js

@@ -0,0 +1,2 @@
+export const A = 'A';
+export const B = 'B';

packages/rspack-test-tools/tests/configCases/module/function-use-match-resource/loader.js

@@ -0,0 +1,7 @@
+module.exports = function (source) {
+	const info = this.getOptions();
+	delete info.compiler;
+	return source + `
+export const __info__ = ${JSON.stringify(info, null, 2)};
+`
+};

packages/rspack-test-tools/tests/configCases/module/function-use-match-resource/rspack.config.js

@@ -0,0 +1,18 @@
+/** @type {import("@rspack/core").Configuration} */
+module.exports = {
+	module: {
+		rules: [
+			{
+				test: /__label__/,
+				use: (info) => {
+					return [
+						{
+							loader: "./loader.js",
+							options: info,
+						}
+					]
+				},
+			}
+		]
+	}
+};