Generate code next to query files in CLI

my_query.graphql -> my_query.rs

Author: tomhoule

graphql_client_cli/src/generate.rs

@@ -13,7 +13,6 @@ pub(crate) struct CliCodegenParams {
     pub deprecation_strategy: Option<String>,
     pub no_formatting: bool,
     pub module_visibility: Option<String>,
-    pub output: PathBuf,
 }
 
 pub(crate) fn generate_code(params: CliCodegenParams) -> Result<(), failure::Error> {
@@ -24,7 +23,6 @@ pub(crate) fn generate_code(params: CliCodegenParams) -> Result<(), failure::Err
 
     let mut options = GraphQLClientCodegenOptions::new_default();
 
-    // options.set_module_name(module_name);
     options.set_module_visibility(
         syn::VisPublic {
             pub_token: <Token![pub]>::default(),
@@ -44,7 +42,8 @@ pub(crate) fn generate_code(params: CliCodegenParams) -> Result<(), failure::Err
         options.set_deprecation_strategy(deprecation_strategy);
     }
 
-    let gen = generate_module_token_stream(params.query_path, &params.schema_path, options)?;
+    let gen =
+        generate_module_token_stream(params.query_path.clone(), &params.schema_path, options)?;
 
     let generated_code = gen.to_string();
     let generated_code = if cfg!(feature = "rustfmt") && !params.no_formatting {
@@ -53,9 +52,13 @@ pub(crate) fn generate_code(params: CliCodegenParams) -> Result<(), failure::Err
         generated_code
     };
 
-    let mut file = File::create(params.output)?;
-
-    write!(file, "{}", 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);
+    }
 
     Ok(())
 }

graphql_client_cli/src/main.rs

@@ -34,7 +34,7 @@ enum Cli {
         #[structopt(parse(from_os_str))]
         #[structopt(long = "output")]
         output: Option<PathBuf>,
-        // Set authorizaiton header.
+        /// Set the contents of the Authorizaiton header.
         #[structopt(long = "authorization")]
         authorization: Option<String>,
     },
@@ -67,8 +67,6 @@ enum Cli {
         /// Default value is pub.
         #[structopt(short = "m", long = "module_visibility")]
         module_visibility: Option<String>,
-        #[structopt(parse(from_os_str))]
-        output: PathBuf,
     },
 }
 
@@ -90,7 +88,6 @@ fn main() -> Result<(), failure::Error> {
             deprecation_strategy,
             no_formatting,
             module_visibility,
-            output,
         } => generate::generate_code(generate::CliCodegenParams {
             query_path,
             schema_path,
@@ -99,7 +96,6 @@ fn main() -> Result<(), failure::Error> {
             deprecation_strategy,
             no_formatting,
             module_visibility,
-            output,
         }),
     }
 }

graphql_client_codegen/src/generated_module.rs

@@ -26,15 +26,17 @@ impl<'a> GeneratedModule<'a> {
         let module_name = Ident::new(&self.operation.name.to_snake_case(), Span::call_site());
         let module_visibility = &self.options.module_visibility();
         let operation_name_literal = &self.operation.name;
-        let operation_name_ident = self.options.struct_ident();
+        let operation_name_ident = Ident::new(&self.operation.name, Span::call_site());
 
         // Force cargo to refresh the generated code when the query file changes.
         let query_include = self
             .options
             .query_file()
             .map(|path| {
                 let path = path.to_str();
-                quote!(const __QUERY_WORKAROUND: &str = include_str!(#path))
+                quote!(
+                    const __QUERY_WORKAROUND: &str = include_str!(#path);
+                )
             })
             .unwrap_or_else(|| quote! {});
 
@@ -52,7 +54,7 @@ impl<'a> GeneratedModule<'a> {
                 pub const OPERATION_NAME: &'static str = #operation_name_literal;
                 pub const QUERY: &'static str = #query_string;
 
-                #query_include;
+                #query_include
 
                 #impls