Add bin args for watch and serve commands

leptos-rs · Jan 31, 2024 · b14006c · b14006c
1 parent 0a14df0
commit b14006c
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 22 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/compile/tests.rs b/src/compile/tests.rs
@@ -39,7 +39,7 @@ fn dev_opts() -> Opts {
 #[test]
 fn test_project_dev() {
     let cli = dev_opts();
-    let conf = Config::test_load(cli, "examples", "examples/project/Cargo.toml", true);
+    let conf = Config::test_load(cli, "examples", "examples/project/Cargo.toml", true, None);
 
     let mut command = Command::new("cargo");
     let (envs, cargo) = build_cargo_server_cmd("build", &conf.projects[0], &mut command);
@@ -70,7 +70,7 @@ fn test_project_dev() {
 #[test]
 fn test_project_release() {
     let cli = release_opts();
-    let conf = Config::test_load(cli, "examples", "examples/project/Cargo.toml", true);
+    let conf = Config::test_load(cli, "examples", "examples/project/Cargo.toml", true, None);
 
     let mut command = Command::new("cargo");
     let (_, cargo) = build_cargo_server_cmd("build", &conf.projects[0], &mut command);
@@ -112,7 +112,7 @@ fn test_workspace_project1() {
     };
 
     let cli = dev_opts();
-    let conf = Config::test_load(cli, "examples", "examples/workspace/Cargo.toml", true);
+    let conf = Config::test_load(cli, "examples", "examples/workspace/Cargo.toml", true, None);
 
     let mut command = Command::new("cargo");
     let (envs, cargo) = build_cargo_server_cmd("build", &conf.projects[0], &mut command);
@@ -134,7 +134,7 @@ fn test_workspace_project1() {
 #[test]
 fn test_workspace_project2() {
     let cli = dev_opts();
-    let conf = Config::test_load(cli, "examples", "examples/workspace/Cargo.toml", true);
+    let conf = Config::test_load(cli, "examples", "examples/workspace/Cargo.toml", true, None);
 
     let mut command = Command::new("cargo");
     let (_, cargo) = build_cargo_server_cmd("build", &conf.projects[1], &mut command);
@@ -158,7 +158,7 @@ fn test_extra_cargo_args() {
         bin_cargo_args: Some(vec!["-j".into(), "16".into()]),
         ..dev_opts()
     };
-    let conf = Config::test_load(cli, "examples", "examples/project/Cargo.toml", true);
+    let conf = Config::test_load(cli, "examples", "examples/project/Cargo.toml", true, None);
 
     let mut command = Command::new("cargo");
     let (_, cargo) = build_cargo_server_cmd("build", &conf.projects[0], &mut command);

diff --git a/src/config/bin_package.rs b/src/config/bin_package.rs
@@ -26,6 +26,7 @@ pub struct BinPackage {
     pub target_dir: Option<String>,
     pub cargo_command: Option<String>,
     pub cargo_args: Option<Vec<String>>,
+    pub bin_args: Option<Vec<String>>,
 }
 
 impl BinPackage {
@@ -34,6 +35,7 @@ impl BinPackage {
         metadata: &Metadata,
         project: &ProjectDefinition,
         config: &ProjectConfig,
+        bin_args: Option<&[String]>,
     ) -> Result<Self> {
         let mut features = if !cli.bin_features.is_empty() {
             cli.bin_features.clone()
@@ -128,6 +130,7 @@ impl BinPackage {
             target_dir: config.bin_target_dir.clone(),
             cargo_command: config.bin_cargo_command.clone(),
             cargo_args: cli.bin_cargo_args.clone(),
+            bin_args: bin_args.map(ToOwned::to_owned),
         })
     }
 }

diff --git a/src/config/cli.rs b/src/config/cli.rs
@@ -53,6 +53,15 @@ pub struct Opts {
     pub verbose: u8,
 }
 
+#[derive(Debug, Clone, Parser, PartialEq, Default)]
+pub struct BinOpts {
+    #[command(flatten)]
+    opts: Opts,
+
+    #[arg(trailing_var_arg = true)]
+    bin_args: Vec<String>,
+}
+
 #[derive(Debug, Parser)]
 #[clap(version)]
 pub struct Cli {
@@ -73,9 +82,16 @@ impl Cli {
         use Commands::{Build, EndToEnd, New, Serve, Test, Watch};
         match &self.command {
             New(_) => None,
-            Build(opts) | Serve(opts) | Test(opts) | EndToEnd(opts) | Watch(opts) => {
-                Some(opts.clone())
-            }
+            Serve(bin_opts) | Watch(bin_opts) => Some(bin_opts.opts.clone()),
+            Build(opts) | Test(opts) | EndToEnd(opts) => Some(opts.clone()),
+        }
+    }
+
+    pub fn bin_args(&self) -> Option<&[String]> {
+        use Commands::{Serve, Watch};
+        match &self.command {
+            Serve(bin_opts) | Watch(bin_opts) => Some(bin_opts.bin_args.as_ref()),
+            _ => None,
         }
     }
 }
@@ -89,9 +105,9 @@ pub enum Commands {
     /// Start the server and end-2-end tests.
     EndToEnd(Opts),
     /// Serve. Defaults to hydrate mode.
-    Serve(Opts),
+    Serve(BinOpts),
     /// Serve and automatically reload when files change.
-    Watch(Opts),
+    Watch(BinOpts),
     /// Start a wizard for creating a new project (using cargo-generate).
     New(NewCommand),
 }
diff --git a/src/config/mod.rs b/src/config/mod.rs
@@ -46,10 +46,16 @@ impl Debug for Config {
 }
 
 impl Config {
-    pub fn load(cli: Opts, cwd: &Utf8Path, manifest_path: &Utf8Path, watch: bool) -> Result<Self> {
+    pub fn load(
+        cli: Opts,
+        cwd: &Utf8Path,
+        manifest_path: &Utf8Path,
+        watch: bool,
+        bin_args: Option<&[String]>,
+    ) -> Result<Self> {
         let metadata = Metadata::load_cleaned(manifest_path)?;
 
-        let mut projects = Project::resolve(&cli, cwd, &metadata, watch).dot()?;
+        let mut projects = Project::resolve(&cli, cwd, &metadata, watch, bin_args).dot()?;
 
         if projects.is_empty() {
             bail!("Please define leptos projects in the workspace Cargo.toml sections [[workspace.metadata.leptos]]")
@@ -75,15 +81,21 @@ impl Config {
     }
 
     #[cfg(test)]
-    pub fn test_load(cli: Opts, cwd: &str, manifest_path: &str, watch: bool) -> Self {
+    pub fn test_load(
+        cli: Opts,
+        cwd: &str,
+        manifest_path: &str,
+        watch: bool,
+        bin_args: Option<&[String]>,
+    ) -> Self {
         use crate::ext::PathBufExt;
 
         let manifest_path = Utf8PathBuf::from(manifest_path)
             .canonicalize_utf8()
             .unwrap();
         let mut cwd = Utf8PathBuf::from(cwd).canonicalize_utf8().unwrap();
         cwd.clean_windows_path();
-        Self::load(cli, &cwd, &manifest_path, watch).unwrap()
+        Self::load(cli, &cwd, &manifest_path, watch, bin_args).unwrap()
     }
 
     pub fn current_project(&self) -> Result<Arc<Project>> {

diff --git a/src/config/project.rs b/src/config/project.rs
@@ -68,6 +68,7 @@ impl Project {
         cwd: &Utf8Path,
         metadata: &Metadata,
         watch: bool,
+        bin_args: Option<&[String]>,
     ) -> Result<Vec<Arc<Project>>> {
         let projects = ProjectDefinition::parse(metadata)?;
 
@@ -90,7 +91,7 @@ impl Project {
                 working_dir: metadata.workspace_root.clone(),
                 name: project.name.clone(),
                 lib,
-                bin: BinPackage::resolve(cli, metadata, &project, &config)?,
+                bin: BinPackage::resolve(cli, metadata, &project, &config, bin_args)?,
                 style: StyleConfig::new(&config)?,
                 watch,
                 release: cli.release,

diff --git a/src/config/tests.rs b/src/config/tests.rs
@@ -30,7 +30,7 @@ fn test_project() {
 fn test_workspace() {
     let cli = opts(None);
 
-    let conf = Config::test_load(cli, "examples", "examples/workspace/Cargo.toml", true);
+    let conf = Config::test_load(cli, "examples", "examples/workspace/Cargo.toml", true, None);
 
     insta::assert_debug_snapshot!(conf);
 }
@@ -39,7 +39,7 @@ fn test_workspace() {
 fn test_workspace_project1() {
     let cli = opts(Some("project1"));
 
-    let conf = Config::test_load(cli, "examples", "examples/workspace/Cargo.toml", true);
+    let conf = Config::test_load(cli, "examples", "examples/workspace/Cargo.toml", true, None);
 
     insta::assert_debug_snapshot!(conf);
 }
@@ -48,20 +48,21 @@ fn test_workspace_project1() {
 fn test_workspace_project2() {
     let cli = opts(Some("project2"));
 
-    let conf = Config::test_load(cli, "examples", "examples/workspace/Cargo.toml", true);
+    let conf = Config::test_load(cli, "examples", "examples/workspace/Cargo.toml", true, None);
 
     insta::assert_debug_snapshot!(conf);
 }
 
 #[test]
-fn test_workspace_in_subdir_project2() {
+fn test_workspabin_argsce_in_subdir_project2() {
     let cli = opts(None);
 
     let conf = Config::test_load(
         cli,
         "examples/workspace/project2",
         "examples/workspace/Cargo.toml",
         true,
+        None,
     );
 
     insta::assert_debug_snapshot!(conf);

diff --git a/src/lib.rs b/src/lib.rs
@@ -38,9 +38,10 @@ pub async fn run(args: Cli) -> Result<()> {
     cwd.clean_windows_path();
 
     let opts = args.opts().unwrap();
+    let bin_args = args.bin_args();
 
     let watch = matches!(args.command, Commands::Watch(_));
-    let config = Config::load(opts, &cwd, &manifest_path, watch).dot()?;
+    let config = Config::load(opts, &cwd, &manifest_path, watch, bin_args).dot()?;
     env::set_current_dir(&config.working_dir).dot()?;
     log::debug!(
         "Path working dir {}",

diff --git a/src/service/serve.rs b/src/service/serve.rs
@@ -59,6 +59,7 @@ struct ServerProcess {
     process: Option<Child>,
     envs: Vec<(&'static str, String)>,
     binary: Utf8PathBuf,
+    bin_args: Option<Vec<String>>,
 }
 
 impl ServerProcess {
@@ -67,6 +68,7 @@ impl ServerProcess {
             process: None,
             envs: proj.to_envs(),
             binary: proj.bin.exe_file.clone(),
+            bin_args: proj.bin.bin_args.clone(),
         }
     }
 
@@ -134,8 +136,18 @@ impl ServerProcess {
                 bin.clone()
             };
 
+            let bin_args = match &self.bin_args {
+                Some(bin_args) => bin_args.as_slice(),
+                None => &[],
+            };
+
             log::debug!("Serve running {}", GRAY.paint(bin_path.as_str()));
-            let cmd = Some(Command::new(bin_path).envs(self.envs.clone()).spawn()?);
+            let cmd = Some(
+                Command::new(bin_path)
+                    .envs(self.envs.clone())
+                    .args(bin_args)
+                    .spawn()?,
+            );
             let port = self
                 .envs
                 .iter()