refactor: allow passing function type to assets generator.filename (#…

…7206)

crates/node_binding/binding.d.ts

@@ -747,7 +747,7 @@ export interface RawAssetGeneratorDataUrlOptions {
 
 export interface RawAssetGeneratorOptions {
   emit?: boolean
-  filename?: string
+  filename?: JsFilename
   publicPath?: string
   dataUrl?: RawAssetGeneratorDataUrlOptions | ((arg: RawAssetGeneratorDataUrlFnArgs) => string)
 }
@@ -771,7 +771,7 @@ export interface RawAssetParserOptions {
 
 export interface RawAssetResourceGeneratorOptions {
   emit?: boolean
-  filename?: string
+  filename?: JsFilename
   publicPath?: string
 }
 

crates/rspack_binding_options/src/options/raw_module/mod.rs

@@ -5,7 +5,7 @@ use derivative::Derivative;
 use napi::bindgen_prelude::Either3;
 use napi::Either;
 use napi_derive::napi;
-use rspack_binding_values::RawRegex;
+use rspack_binding_values::{JsFilename, RawRegex};
 use rspack_core::{
   AssetGeneratorDataUrl, AssetGeneratorDataUrlFnArgs, AssetGeneratorDataUrlOptions,
   AssetGeneratorOptions, AssetInlineGeneratorOptions, AssetParserDataUrl,
@@ -483,7 +483,7 @@ impl From<RawGeneratorOptions> for GeneratorOptions {
 #[napi(object, object_to_js = false)]
 pub struct RawAssetGeneratorOptions {
   pub emit: Option<bool>,
-  pub filename: Option<String>,
+  pub filename: Option<JsFilename>,
   pub public_path: Option<String>,
   #[derivative(Debug = "ignore")]
   #[napi(
@@ -527,10 +527,10 @@ impl From<RawAssetInlineGeneratorOptions> for AssetInlineGeneratorOptions {
 }
 
 #[derive(Debug, Default)]
-#[napi(object)]
+#[napi(object, object_to_js = false)]
 pub struct RawAssetResourceGeneratorOptions {
   pub emit: Option<bool>,
-  pub filename: Option<String>,
+  pub filename: Option<JsFilename>,
   pub public_path: Option<String>,
 }
 

packages/rspack-test-tools/tests/configCases/asset/filename/index.js

@@ -0,0 +1,11 @@
+import png from "../_images/file.png";
+import png1 from "../_images/file.png?custom1";
+import png2 from "../_images/file.png?custom2";
+import jpeg2 from "../_images/file.jpg?custom2";
+
+it("should change filenames", () => {
+	expect(png).toEqual("images/failure.png");
+	expect(png1).toEqual("custom-images/success1.png");
+	expect(png2).toEqual("custom-images/success2.png");
+	expect(jpeg2).toEqual("images/failure2.jpg");
+});

packages/rspack-test-tools/tests/configCases/asset/filename/rspack.config.js

@@ -0,0 +1,38 @@
+/**
+ * this test case is in addition to webpack-test/configCases/asset-modules/assetModuleFilename
+ */
+/** @type {import("@rspack/core").Configuration} */
+module.exports = {
+	mode: "development",
+	output: {
+		assetModuleFilename: "images/failure[ext]"
+	},
+	module: {
+		rules: [
+			{
+				test: /\.(png|jpg)$/,
+				type: "asset/resource",
+				rules: [
+					{
+						resourceQuery: "?custom1",
+						generator: {
+							filename: "custom-images/success1[ext]"
+						}
+					},
+
+					{
+						resourceQuery: "?custom2",
+						generator: {
+							filename: ({ filename }) => {
+								if (filename.endsWith(".png?custom2")) {
+									return "custom-images/success2[ext]";
+								}
+								return "images/failure2[ext]";
+							}
+						}
+					}
+				]
+			}
+		]
+	}
+};