Implement --output-directory option in the CLI

Author: tomhoule

graphql_client_cli/src/generate.rs

@@ -15,13 +15,22 @@ pub(crate) struct CliCodegenParams {
     pub deprecation_strategy: Option<String>,
     pub no_formatting: bool,
     pub module_visibility: Option<String>,
+    pub output_directory: Option<PathBuf>,
 }
 
 pub(crate) fn generate_code(params: CliCodegenParams) -> Result<(), failure::Error> {
-    let deprecation_strategy = params
-        .deprecation_strategy
-        .as_ref()
-        .and_then(|s| s.parse().ok());
+    let CliCodegenParams {
+        additional_derives,
+        deprecation_strategy,
+        no_formatting,
+        output_directory,
+        module_visibility: _module_visibility,
+        query_path,
+        schema_path,
+        selected_operation,
+    } = params;
+
+    let deprecation_strategy = deprecation_strategy.as_ref().and_then(|s| s.parse().ok());
 
     let mut options = GraphQLClientCodegenOptions::new(CodegenMode::Cli);
 
@@ -32,35 +41,38 @@ pub(crate) fn generate_code(params: CliCodegenParams) -> Result<(), failure::Err
         .into(),
     );
 
-    if let Some(selected_operation) = params.selected_operation {
+    if let Some(selected_operation) = selected_operation {
         options.set_operation_name(selected_operation);
     }
 
-    if let Some(additional_derives) = params.additional_derives {
+    if let Some(additional_derives) = additional_derives {
         options.set_additional_derives(additional_derives);
     }
 
     if let Some(deprecation_strategy) = deprecation_strategy {
         options.set_deprecation_strategy(deprecation_strategy);
     }
 
-    let gen =
-        generate_module_token_stream(params.query_path.clone(), &params.schema_path, options)?;
+    let gen = generate_module_token_stream(query_path.clone(), &schema_path, options)?;
 
     let generated_code = gen.to_string();
-    let generated_code = if cfg!(feature = "rustfmt") && !params.no_formatting {
+    let generated_code = if cfg!(feature = "rustfmt") && !no_formatting {
         format(&generated_code)
     } else {
         generated_code
     };
 
-    let mut dest_path = params.query_path.clone();
-    if dest_path.set_extension("rs") {
-        let mut file = File::create(dest_path)?;
-        write!(file, "{}", generated_code)?;
-    } else {
-        log::error!("Could not set the file extension on {:?}", dest_path);
-    }
+    let query_file_name: ::std::ffi::OsString = query_path
+        .file_name()
+        .map(|s| s.to_owned())
+        .ok_or_else(|| format_err!("Failed to find a file name in the provided query path."))?;
+
+    let dest_file_path: PathBuf = output_directory
+        .map(|output_dir| output_dir.join(query_file_name).with_extension("rs"))
+        .unwrap_or_else(move || query_path.with_extension("rs"));
+
+    let mut file = File::create(dest_file_path)?;
+    write!(file, "{}", generated_code)?;
 
     Ok(())
 }

graphql_client_cli/src/main.rs

@@ -3,6 +3,7 @@ extern crate log;
 use env_logger::fmt::{Color, Style, StyledValue};
 use log::Level;
 
+#[macro_use]
 extern crate failure;
 extern crate reqwest;
 extern crate structopt;
@@ -43,10 +44,8 @@ enum Cli {
     Generate {
         // should be a glob
         /// Path to graphql query file.
-        #[structopt(parse(from_os_str))]
         query_path: PathBuf,
         /// Path to graphql schema file.
-        #[structopt(parse(from_os_str))]
         schema_path: PathBuf,
         /// Name of target query. If you don't set this parameter, cli generate all queries in query file.
         #[structopt(short = "o", long = "selected-operation")]
@@ -66,8 +65,14 @@ enum Cli {
         no_formatting: bool,
         /// You can choose module and target struct visibility from pub and private.
         /// Default value is pub.
-        #[structopt(short = "m", long = "module_visibility")]
+        #[structopt(short = "m", long = "module-visibility")]
         module_visibility: Option<String>,
+        /// The directory in which the code will be generated.
+        ///
+        /// If this option is omitted, the code will be generated next to the .graphql
+        /// file, with the same name and the .rs extension.
+        #[structopt(short = "o", long = "output-directory")]
+        output_directory: Option<PathBuf>,
     },
 }
 
@@ -82,21 +87,23 @@ fn main() -> Result<(), failure::Error> {
             authorization,
         } => introspect_schema::introspect_schema(&schema_location, output, authorization),
         Cli::Generate {
-            query_path,
-            schema_path,
-            selected_operation,
             additional_derives,
             deprecation_strategy,
-            no_formatting,
             module_visibility,
-        } => generate::generate_code(generate::CliCodegenParams {
+            no_formatting,
+            output_directory,
             query_path,
             schema_path,
             selected_operation,
+        } => generate::generate_code(generate::CliCodegenParams {
             additional_derives,
             deprecation_strategy,
-            no_formatting,
             module_visibility,
+            no_formatting,
+            output_directory,
+            query_path,
+            schema_path,
+            selected_operation,
         }),
     }
 }

graphql_client_codegen/src/generated_module.rs

@@ -45,7 +45,7 @@ impl<'a> GeneratedModule<'a> {
         let impls = self.build_impls()?;
 
         let struct_declaration = match self.options.mode {
-            CodegenMode::Cli => quote!(#module_visibility struct #operation_name_ident),
+            CodegenMode::Cli => quote!(#module_visibility struct #operation_name_ident;),
             // The struct is already present in derive mode.
             CodegenMode::Derive => quote!(),
         };