feat(build): support additional build toolchain args

Signed-off-by: Brooks Townsend <brooks@cosmonic.com>

Author: brooksmtownsend

crates/wash/src/cli/component_build.rs

@@ -41,6 +41,10 @@ pub struct ComponentBuildCommand {
     /// Skip fetching WIT dependencies, useful for offline builds
     #[clap(long = "skip-fetch")]
     skip_fetch: bool,
+
+    /// The arguments to pass to the native build tool (cargo, tinygo, npm, etc.)
+    #[clap(name = "arg", trailing_var_arg = true, allow_hyphen_values = true)]
+    pub args: Vec<String>,
 }
 
 impl CliCommand for ComponentBuildCommand {
@@ -57,6 +61,16 @@ impl CliCommand for ComponentBuildCommand {
                 ..Default::default()
             })
         }
+        if let Some(build) = config.build.as_mut() {
+            if !self.args.is_empty() {
+                build.additional_args = self.args.clone();
+            }
+        } else {
+            config.build = Some(crate::component_build::BuildConfig {
+                additional_args: self.args.clone(),
+                ..Default::default()
+            });
+        }
         let result = build_component(&self.project_path, ctx, &config).await?;
 
         Ok(CommandOutput::ok(
@@ -542,8 +556,15 @@ impl ComponentBuilder {
         // Build cargo command arguments
         let mut cargo_args = vec!["build".to_string()];
 
+        let release_mode = rust_config.release
+            || config
+                .build
+                .as_ref()
+                .map(|b| b.additional_args.contains(&"--release".to_string()))
+                .unwrap_or(false);
+
         // Apply release mode if configured
-        if rust_config.release {
+        if release_mode {
             cargo_args.push("--release".to_string());
         }
 
@@ -576,6 +597,14 @@ impl ComponentBuilder {
             cargo_args.push(flag.clone());
         }
 
+        if let Some(build_config) = &config.build {
+            for arg in &build_config.additional_args {
+                if arg != "--release" {
+                    cargo_args.push(arg.clone());
+                }
+            }
+        }
+
         debug!(cargo_args = ?cargo_args, "running cargo with args");
 
         // Change to project directory and run cargo build
@@ -619,11 +648,7 @@ impl ComponentBuilder {
         }
 
         // Find the generated wasm file
-        let build_type = if rust_config.release {
-            "release"
-        } else {
-            "debug"
-        };
+        let build_type = if release_mode { "release" } else { "debug" };
         let target_dir = self
             .project_path
             .join(format!("target/{}/{}", rust_config.target, build_type));
@@ -791,6 +816,12 @@ impl ComponentBuilder {
             tinygo_args.push(flag.to_string());
         }
 
+        if let Some(build_config) = &config.build {
+            for arg in &build_config.additional_args {
+                tinygo_args.push(arg.clone());
+            }
+        }
+
         // Add source directory
         tinygo_args.push(".".to_string());
 
@@ -958,6 +989,12 @@ impl ComponentBuilder {
                 build_args.push(flag.clone());
             }
 
+            if let Some(build_config) = &config.build {
+                for arg in &build_config.additional_args {
+                    build_args.push(arg.clone());
+                }
+            }
+
             debug!(package_manager = %package_manager, build_args = ?build_args, "running build command");
 
             // Run package manager build command

crates/wash/src/cli/plugin.rs

@@ -196,7 +196,7 @@ pub struct TestCommand {
         name = "arg",
         conflicts_with = "type",
         trailing_var_arg = true,
-        // TODO: --help won't get collected into this args
+        allow_hyphen_values = true
     )]
     pub args: Vec<String>,
 }
@@ -383,7 +383,7 @@ impl TestCommand {
                     ) =>
                 {
                     let _ = e.print();
-                    return Ok(CommandOutput::error(e.to_string(), None));
+                    return Ok(CommandOutput::error("", None));
                 }
                 Err(e) => anyhow::bail!("Failed to parse command arguments: {}", e),
             };
@@ -394,7 +394,7 @@ impl TestCommand {
                 plugin_component: Some(plugin),
             };
 
-            output.push_str(component_plugin_command.handle(ctx).await?.message.as_str());
+            output = component_plugin_command.handle(ctx).await?.message;
         }
 
         Ok(CommandOutput::ok(

crates/wash/src/component_build.rs

@@ -23,6 +23,9 @@ pub struct BuildConfig {
     /// Expected path to the built Wasm component artifact
     #[serde(skip_serializing_if = "Option::is_none")]
     pub component_path: Option<PathBuf>,
+
+    #[serde(skip_serializing_if = "Vec::is_empty", default)]
+    pub additional_args: Vec<String>,
 }
 
 /// Types of projects that can be built