fix: update asset can return undefined (#9530)

Author: SyMind

crates/node_binding/binding.d.ts

@@ -115,7 +115,7 @@ export declare class JsChunkGroup {
 }
 
 export declare class JsCompilation {
-  updateAsset(filename: string, newSourceOrFunction: JsCompatSource | ((source: JsCompatSourceOwned) => JsCompatSourceOwned), assetInfoUpdateOrFunction?: AssetInfo | ((assetInfo: AssetInfo) => AssetInfo)): void
+  updateAsset(filename: string, newSourceOrFunction: JsCompatSource | ((source: JsCompatSourceOwned) => JsCompatSourceOwned), assetInfoUpdateOrFunction?: AssetInfo | ((assetInfo: AssetInfo) => AssetInfo | undefined)): void
   getAssets(): Readonly<JsAsset>[]
   getAsset(name: string): JsAsset | null
   getAssetSource(name: string): JsCompatSource | null

crates/node_binding/src/compilation/mod.rs

@@ -80,14 +80,16 @@ impl JsCompilation {
 #[napi]
 impl JsCompilation {
   #[napi(
-    ts_args_type = r#"filename: string, newSourceOrFunction: JsCompatSource | ((source: JsCompatSourceOwned) => JsCompatSourceOwned), assetInfoUpdateOrFunction?: AssetInfo | ((assetInfo: AssetInfo) => AssetInfo)"#
+    ts_args_type = r#"filename: string, newSourceOrFunction: JsCompatSource | ((source: JsCompatSourceOwned) => JsCompatSourceOwned), assetInfoUpdateOrFunction?: AssetInfo | ((assetInfo: AssetInfo) => AssetInfo | undefined)"#
   )]
   pub fn update_asset(
     &mut self,
     env: &Env,
     filename: String,
     new_source_or_function: Either<JsCompatSource, Function<'_, JsCompatSource, JsCompatSource>>,
-    asset_info_update_or_function: Option<Either<AssetInfo, Function<'_, AssetInfo, AssetInfo>>>,
+    asset_info_update_or_function: Option<
+      Either<AssetInfo, Function<'_, AssetInfo, Option<AssetInfo>>>,
+    >,
   ) -> Result<()> {
     let compilation = self.as_mut()?;
 
@@ -110,9 +112,12 @@ impl JsCompilation {
           .map(
             |asset_info_update_or_function| match asset_info_update_or_function {
               Either::A(asset_info) => Ok(asset_info.into()),
-              Either::B(asset_info_fn) => {
-                Ok(asset_info_fn.call(original_info.clone().into())?.into())
-              }
+              Either::B(asset_info_fn) => Ok(
+                asset_info_fn
+                  .call(original_info.clone().into())?
+                  .map(Into::into)
+                  .unwrap_or_default(),
+              ),
             },
           )
           .transpose();

packages/rspack-test-tools/tests/configCases/hooks/update-asset-return-undefined/index.js

@@ -0,0 +1,40 @@
+/** @type {import("@rspack/core").Configuration} */
+module.exports = {
+    output: {
+        filename: "[name].[contenthash].js"
+    },
+    plugins: [
+        function plugin(compiler) {
+            compiler.hooks.compilation.tap("test", compilation => {
+                compilation.hooks.processAssets.tap(
+                    {
+                        name: "test",
+                        stage: compiler.webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONS
+                    },
+                    assets => {
+                        Object.entries(assets).forEach(([filename, asset]) => {
+                            const newContent = `// UPDATED\n${asset.source()}`;
+                            compilation.updateAsset(
+                                filename,
+                                new compiler.webpack.sources.RawSource(newContent),
+                                () => { }
+                            );
+                        });
+                    }
+                );
+                compilation.hooks.processAssets.tap(
+                    {
+                        name: "test",
+                        stage:
+                            compiler.webpack.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_HASH
+                    },
+                    assets => {
+                        compilation.getAssets().forEach(({ info }) => {
+                            expect(info.contenthash.length).toBeGreaterThan(0);
+                        });
+                    }
+                );
+            });
+        }
+    ]
+};

packages/rspack-test-tools/tests/configCases/hooks/update-asset-return-undefined/rspack.config.js

@@ -0,0 +1,4 @@
+/** @type {import("../../../..").TConfigCaseConfig} */
+module.exports = {
+    noTests: true
+};

packages/rspack-test-tools/tests/configCases/hooks/update-asset-return-undefined/test.config.js

@@ -851,7 +851,7 @@ export class Compilation {
     startTime?: number;
     // (undocumented)
     unseal(): void;
-    updateAsset(filename: string, newSourceOrFunction: Source | ((source: Source) => Source), assetInfoUpdateOrFunction?: AssetInfo | ((assetInfo: AssetInfo) => AssetInfo)): void;
+    updateAsset(filename: string, newSourceOrFunction: Source | ((source: Source) => Source), assetInfoUpdateOrFunction?: AssetInfo | ((assetInfo: AssetInfo) => AssetInfo | undefined)): void;
     // (undocumented)
     get warnings(): RspackError[];
     set warnings(warnings: RspackError[]);

packages/rspack/etc/core.api.md

@@ -576,7 +576,7 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 		newSourceOrFunction: Source | ((source: Source) => Source),
 		assetInfoUpdateOrFunction?:
 			| AssetInfo
-			| ((assetInfo: AssetInfo) => AssetInfo)
+			| ((assetInfo: AssetInfo) => AssetInfo | undefined)
 	) {
 		let compatNewSourceOrFunction:
 			| JsCompatSourceOwned
@@ -597,11 +597,7 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 		this.#inner.updateAsset(
 			filename,
 			compatNewSourceOrFunction,
-			assetInfoUpdateOrFunction === undefined
-				? assetInfoUpdateOrFunction
-				: typeof assetInfoUpdateOrFunction === "function"
-					? assetInfo => assetInfoUpdateOrFunction(assetInfo)
-					: assetInfoUpdateOrFunction
+			assetInfoUpdateOrFunction
 		);
 	}