refactor(hugr-cli): common up some args

hugr-cli/src/lib.rs

@@ -1,9 +1,10 @@
 //! Standard command line tools, used by the hugr binary.
 
-use std::ffi::OsString;
+use clap::Parser;
+use clap_verbosity_flag::{InfoLevel, Verbosity};
+use clio::Input;
+use std::{ffi::OsString, path::PathBuf};
 use thiserror::Error;
-/// We reexport some clap types that are used in the public API.
-pub use {clap::Parser, clap_verbosity_flag::Level};
 
 pub mod extensions;
 pub mod validate;
@@ -32,3 +33,20 @@ pub enum CliError {
     /// Errors produced by the `validate` subcommand.
     Validate(#[from] validate::CliError),
 }
+
+/// Validate and visualise a HUGR file.
+#[derive(Parser, Debug)]
+pub struct HugrArgs {
+    /// Input HUGR file, use '-' for stdin
+    #[clap(value_parser, default_value = "-")]
+    pub input: Input,
+    /// Verbosity.
+    #[command(flatten)]
+    pub verbose: Verbosity<InfoLevel>,
+    /// No standard extensions.
+    #[arg(long, help = "Don't use standard extensions when validating.")]
+    pub no_std: bool,
+    /// Skip validation.
+    #[arg(short, long, help = "Skip validation.")]
+    pub extensions: Vec<PathBuf>,
+}

hugr-cli/src/validate.rs

@@ -1,37 +1,28 @@
 //! The `validate` subcommand.
-use std::path::PathBuf;
 
 use clap::Parser;
-use clap_verbosity_flag::{InfoLevel, Level, Verbosity};
-use clio::Input;
+use clap_verbosity_flag::Level;
 use hugr_core::{extension::ExtensionRegistry, Extension, Hugr, HugrView as _};
 use thiserror::Error;
 
+use crate::HugrArgs;
+
 /// Validate and visualise a HUGR file.
 #[derive(Parser, Debug)]
 #[clap(version = "1.0", long_about = None)]
 #[clap(about = "Validate a HUGR.")]
 #[group(id = "hugr")]
 #[non_exhaustive]
 pub struct ValArgs {
-    /// Input HUGR file, use '-' for stdin
-    #[clap(value_parser, default_value = "-")]
-    pub input: Input,
+    #[command(flatten)]
+    /// common arguments
+    pub hugr_args: HugrArgs,
     /// Visualise with mermaid.
     #[arg(short, long, value_name = "MERMAID", help = "Visualise with mermaid.")]
     pub mermaid: bool,
     /// Skip validation.
     #[arg(short, long, help = "Skip validation.")]
     pub no_validate: bool,
-    /// Verbosity.
-    #[command(flatten)]
-    pub verbose: Verbosity<InfoLevel>,
-    /// No standard extensions.
-    #[arg(long, help = "Don't use standard extensions when validating.")]
-    pub no_std: bool,
-    /// Skip validation.
-    #[arg(short, long, help = "Skip validation.")]
-    pub extensions: Vec<PathBuf>,
 }
 
 /// Error type for the CLI.
@@ -87,7 +78,7 @@ impl ValArgs {
     /// Run the HUGR cli and validate against an extension registry.
     pub fn run(&mut self) -> Result<Vec<Hugr>, CliError> {
         // let rdr = self.input.
-        let val: serde_json::Value = serde_json::from_reader(&mut self.input)?;
+        let val: serde_json::Value = serde_json::from_reader(&mut self.hugr_args.input)?;
         // read either a package or a single hugr
         let (mut modules, packed_exts) = if let Ok(Package {
             modules,
@@ -100,7 +91,7 @@ impl ValArgs {
             (vec![hugr], vec![])
         };
 
-        let mut reg: ExtensionRegistry = if self.no_std {
+        let mut reg: ExtensionRegistry = if self.hugr_args.no_std {
             hugr_core::extension::PRELUDE_REGISTRY.to_owned()
         } else {
             hugr_core::std_extensions::std_reg()
@@ -112,7 +103,7 @@ impl ValArgs {
         }
 
         // register external extensions
-        for ext in &self.extensions {
+        for ext in &self.hugr_args.extensions {
             let f = std::fs::File::open(ext)?;
             let ext: Extension = serde_json::from_reader(f)?;
             reg.register_updated(ext)?;
@@ -135,6 +126,6 @@ impl ValArgs {
 
     /// Test whether a `level` message should be output.
     pub fn verbosity(&self, level: Level) -> bool {
-        self.verbose.log_level_filter() >= level
+        self.hugr_args.verbose.log_level_filter() >= level
     }
 }