refactor(rust): add HookGenerateBundleArgs

hyf0 · hyf0 · commit 7396534b1fd3 · 2024-11-24T21:24:10.000+08:00
diff --git a/crates/rolldown_binding/src/options/plugin/js_plugin.rs b/crates/rolldown_binding/src/options/plugin/js_plugin.rs
@@ -362,12 +362,12 @@ impl Plugin for JsPlugin {
   async fn generate_bundle(
     &self,
     ctx: &rolldown_plugin::PluginContext,
-    bundle: &mut Vec<rolldown_common::Output>,
-    is_write: bool,
+    args: &mut rolldown_plugin::HookGenerateBundleArgs<'_>,
   ) -> rolldown_plugin::HookNoopReturn {
     if let Some(cb) = &self.generate_bundle {
-      let changed = cb.await_call((ctx.clone().into(), bundle.clone().into(), is_write)).await?;
-      update_outputs(bundle, changed)?;
+      let changed =
+        cb.await_call((ctx.clone().into(), args.bundle.clone().into(), args.is_write)).await?;
+      update_outputs(args.bundle, changed)?;
     }
     Ok(())
   }
diff --git a/crates/rolldown_binding/src/options/plugin/parallel_js_plugin.rs b/crates/rolldown_binding/src/options/plugin/parallel_js_plugin.rs
@@ -151,11 +151,10 @@ impl Plugin for ParallelJsPlugin {
   async fn generate_bundle(
     &self,
     ctx: &rolldown_plugin::PluginContext,
-    bundle: &mut Vec<rolldown_common::Output>,
-    is_write: bool,
+    args: &mut rolldown_plugin::HookGenerateBundleArgs<'_>,
   ) -> rolldown_plugin::HookNoopReturn {
     if self.first_plugin().generate_bundle.is_some() {
-      self.run_single(|plugin| plugin.call_generate_bundle(ctx, bundle, is_write)).await
+      self.run_single(|plugin| plugin.call_generate_bundle(ctx, args)).await
     } else {
       Ok(())
     }
diff --git a/crates/rolldown_plugin/src/lib.rs b/crates/rolldown_plugin/src/lib.rs
@@ -33,6 +33,7 @@ pub use crate::{
   types::hook_filter::{
     GeneralHookFilter, LoadHookFilter, ResolvedIdHookFilter, TransformHookFilter,
   },
+  types::hook_generate_bundle_args::HookGenerateBundleArgs,
   types::hook_load_args::HookLoadArgs,
   types::hook_load_output::HookLoadOutput,
   types::hook_render_chunk_args::HookRenderChunkArgs,
diff --git a/crates/rolldown_plugin/src/plugin.rs b/crates/rolldown_plugin/src/plugin.rs
@@ -11,9 +11,9 @@ use crate::{
     hook_transform_ast_args::HookTransformAstArgs,
     hook_transform_output::HookTransformOutput,
   },
-  HookAddonArgs, HookBuildEndArgs, HookLoadArgs, HookLoadOutput, HookRenderChunkArgs,
-  HookRenderChunkOutput, HookResolveIdArgs, HookResolveIdOutput, HookTransformArgs,
-  SharedTransformPluginContext,
+  HookAddonArgs, HookBuildEndArgs, HookGenerateBundleArgs, HookLoadArgs, HookLoadOutput,
+  HookRenderChunkArgs, HookRenderChunkOutput, HookResolveIdArgs, HookResolveIdOutput,
+  HookTransformArgs, SharedTransformPluginContext,
 };
 use anyhow::Result;
 use rolldown_common::{ModuleInfo, Output, RollupRenderedChunk, WatcherChangeKind};
@@ -223,8 +223,7 @@ pub trait Plugin: Any + Debug + Send + Sync + 'static {
   fn generate_bundle(
     &self,
     _ctx: &PluginContext,
-    _bundle: &mut Vec<Output>,
-    _is_write: bool,
+    _args: &mut HookGenerateBundleArgs,
   ) -> impl std::future::Future<Output = HookNoopReturn> + Send {
     async { Ok(()) }
   }
diff --git a/crates/rolldown_plugin/src/plugin_driver/output_hooks.rs b/crates/rolldown_plugin/src/plugin_driver/output_hooks.rs
@@ -118,7 +118,8 @@ impl PluginDriver {
     for (_, plugin, ctx) in
       self.iter_plugin_with_context_by_order(&self.order_by_generate_bundle_meta)
     {
-      plugin.call_generate_bundle(ctx, bundle, is_write).await?;
+      let mut args = crate::HookGenerateBundleArgs { is_write, bundle };
+      plugin.call_generate_bundle(ctx, &mut args).await?;
       ctx.file_emitter.add_additional_files(bundle);
     }
     Ok(())
diff --git a/crates/rolldown_plugin/src/pluginable.rs b/crates/rolldown_plugin/src/pluginable.rs
@@ -8,9 +8,9 @@ use crate::{
     hook_render_error::HookRenderErrorArgs,
     hook_transform_ast_args::HookTransformAstArgs,
   },
-  HookAddonArgs, HookBuildEndArgs, HookBuildStartArgs, HookInjectionOutputReturn, HookLoadArgs,
-  HookRenderChunkArgs, HookRenderStartArgs, HookResolveIdArgs, HookTransformArgs, Plugin,
-  SharedTransformPluginContext,
+  HookAddonArgs, HookBuildEndArgs, HookBuildStartArgs, HookGenerateBundleArgs,
+  HookInjectionOutputReturn, HookLoadArgs, HookRenderChunkArgs, HookRenderStartArgs,
+  HookResolveIdArgs, HookTransformArgs, Plugin, SharedTransformPluginContext,
 };
 use anyhow::Ok;
 use rolldown_common::{ModuleInfo, Output, RollupRenderedChunk, WatcherChangeKind};
@@ -171,8 +171,7 @@ pub trait Pluginable: Any + Debug + Send + Sync + 'static {
   async fn call_generate_bundle(
     &self,
     _ctx: &PluginContext,
-    _bundle: &mut Vec<Output>,
-    _is_write: bool,
+    _args: &mut HookGenerateBundleArgs,
   ) -> HookNoopReturn;
 
   fn call_generate_bundle_meta(&self) -> Option<PluginHookMeta>;
@@ -409,10 +408,9 @@ impl<T: Plugin> Pluginable for T {
   async fn call_generate_bundle(
     &self,
     ctx: &PluginContext,
-    bundle: &mut Vec<Output>,
-    is_write: bool,
+    args: &mut HookGenerateBundleArgs,
   ) -> HookNoopReturn {
-    Plugin::generate_bundle(self, ctx, bundle, is_write).await
+    Plugin::generate_bundle(self, ctx, args).await
   }
 
   fn call_generate_bundle_meta(&self) -> Option<PluginHookMeta> {
diff --git a/crates/rolldown_plugin/src/types/hook_generate_bundle_args.rs b/crates/rolldown_plugin/src/types/hook_generate_bundle_args.rs
@@ -0,0 +1,7 @@
+use rolldown_common::Output;
+
+#[derive(Debug)]
+pub struct HookGenerateBundleArgs<'a> {
+  pub bundle: &'a mut Vec<Output>,
+  pub is_write: bool,
+}
diff --git a/crates/rolldown_plugin/src/types/mod.rs b/crates/rolldown_plugin/src/types/mod.rs
@@ -2,6 +2,7 @@ pub mod hook_addon_args;
 pub mod hook_build_end_args;
 pub mod hook_build_start_args;
 pub mod hook_filter;
+pub mod hook_generate_bundle_args;
 pub mod hook_load_args;
 pub mod hook_load_output;
 pub mod hook_render_chunk_args;
diff --git a/crates/rolldown_plugin_manifest/src/lib.rs b/crates/rolldown_plugin_manifest/src/lib.rs
@@ -34,8 +34,7 @@ impl Plugin for ManifestPlugin {
   async fn generate_bundle(
     &self,
     ctx: &PluginContext,
-    bundle: &mut Vec<Output>,
-    _is_write: bool,
+    args: &mut rolldown_plugin::HookGenerateBundleArgs<'_>,
   ) -> HookNoopReturn {
     // Use BTreeMap to make the result sorted
     let mut manifest = BTreeMap::default();
@@ -53,11 +52,11 @@ impl Plugin for ManifestPlugin {
       }
     }
 
-    for file in bundle.iter() {
+    for file in args.bundle.iter() {
       match file {
         Output::Chunk(chunk) => {
           let name = self.get_chunk_name(chunk);
-          let chunk_manifest = Rc::new(self.create_chunk(bundle, chunk, name.clone()));
+          let chunk_manifest = Rc::new(self.create_chunk(args.bundle, chunk, name.clone()));
           manifest.insert(name.clone(), chunk_manifest);
         }
         Output::Asset(asset) => {

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,8 @@ impl PluginDriver {`
`118`	`118`	`for (_, plugin, ctx) in`
`119`	`119`	`self.iter_plugin_with_context_by_order(&self.order_by_generate_bundle_meta)`
`120`	`120`	`{`
`121`		`- plugin.call_generate_bundle(ctx, bundle, is_write).await?;`
	`121`	`+ let mut args = crate::HookGenerateBundleArgs { is_write, bundle };`
	`122`	`+ plugin.call_generate_bundle(ctx, &mut args).await?;`
`122`	`123`	`ctx.file_emitter.add_additional_files(bundle);`
`123`	`124`	`}`
`124`	`125`	`Ok(())`