Merge pull request #187 from graphql-rust/remove-quote-from-derive-crate

Move derive-specific code out of graphql_client_codegen

Author: tomhoule

graphql_client_cli/src/generate.rs

@@ -53,9 +53,9 @@ pub fn generate_code(
 
     if cfg!(feature = "rustfmt") && !no_formatting {
         let codes = format(&codes);
-        write!(file, "{}", codes);
+        write!(file, "{}", codes)?;
     } else {
-        write!(file, "{}", codes);
+        write!(file, "{}", codes)?;
     }
 
     Ok(())

graphql_client_codegen/Cargo.toml

@@ -11,7 +11,7 @@ failure = "0.1"
 itertools = "0.7"
 lazy_static = "1.0"
 quote = "0.6"
-syn = "0.15"
+syn = "0.15.20"
 proc-macro2 = { version = "0.4", features = [] }
 serde = "^1.0.78"
 serde_derive = "1.0"

graphql_client_codegen/src/attributes.rs

@@ -1,9 +1,3 @@
-use attributes;
-use failure;
-use syn;
-
-static DEPRECATION_ERROR: &'static str = "deprecated must be one of 'allow', 'deny', or 'warn'";
-
 /// Whether an item is deprecated, with context.
 #[derive(Debug, PartialEq, Hash, Clone)]
 pub enum DeprecationStatus {
@@ -29,77 +23,3 @@ impl Default for DeprecationStrategy {
         DeprecationStrategy::Warn
     }
 }
-
-/// Get the deprecation from a struct attribute in the derive case.
-pub fn extract_deprecation_strategy(
-    ast: &syn::DeriveInput,
-) -> Result<DeprecationStrategy, failure::Error> {
-    match attributes::extract_attr(&ast, "deprecated")?
-        .to_lowercase()
-        .as_str()
-    {
-        "allow" => Ok(DeprecationStrategy::Allow),
-        "deny" => Ok(DeprecationStrategy::Deny),
-        "warn" => Ok(DeprecationStrategy::Warn),
-        _ => Err(format_err!("{}", DEPRECATION_ERROR))?,
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_deprecation_strategy() {
-        let input = "
-        #[derive(GraphQLQuery)]
-        #[graphql(
-            schema_path = \"x\",
-            query_path = \"x\",
-            deprecated = \"warn\",
-        )]
-        struct MyQuery;
-        ";
-        let parsed = syn::parse_str(input).unwrap();
-        assert_eq!(
-            extract_deprecation_strategy(&parsed).unwrap(),
-            DeprecationStrategy::Warn
-        );
-    }
-
-    #[test]
-    fn test_deprecation_strategy_is_case_insensitive() {
-        let input = "
-        #[derive(GraphQLQuery)]
-        #[graphql(
-            schema_path = \"x\",
-            query_path = \"x\",
-            deprecated = \"DeNy\",
-        )]
-        struct MyQuery;
-        ";
-        let parsed = syn::parse_str(input).unwrap();
-        assert_eq!(
-            extract_deprecation_strategy(&parsed).unwrap(),
-            DeprecationStrategy::Deny
-        );
-    }
-
-    #[test]
-    fn test_invalid_deprecation_strategy() {
-        let input = "
-        #[derive(GraphQLQuery)]
-        #[graphql(
-            schema_path = \"x\",
-            query_path = \"x\",
-            deprecated = \"foo\",
-        )]
-        struct MyQuery;
-        ";
-        let parsed = syn::parse_str(input).unwrap();
-        match extract_deprecation_strategy(&parsed) {
-            Ok(_) => panic!("parsed unexpectedly"),
-            Err(e) => assert_eq!(&format!("{}", e), DEPRECATION_ERROR),
-        };
-    }
-}

graphql_client_codegen/src/deprecation.rs

@@ -25,8 +25,6 @@ extern crate quote;
 use proc_macro2::TokenStream;
 use syn::Visibility;
 
-/// Derive-related code. This will be moved into graphql_query_derive.
-pub mod attributes;
 mod codegen;
 /// Deprecation-related code
 pub mod deprecation;

graphql_client_codegen/src/lib.rs

@@ -11,6 +11,6 @@ proc-macro = true
 
 [dependencies]
 failure = "0.1"
-syn = "0.15"
+syn = "0.15.20"
 proc-macro2 = { version = "0.4", features = [] }
 graphql_client_codegen = { path = "../graphql_client_codegen/", version = "0.5.1" }

graphql_query_derive/Cargo.toml

@@ -0,0 +1,108 @@
+use failure;
+use graphql_client_codegen::deprecation::DeprecationStrategy;
+use syn;
+
+const DEPRECATION_ERROR: &'static str = "deprecated must be one of 'allow', 'deny', or 'warn'";
+
+/// The `graphql` attribute as a `syn::Path`.
+fn path_to_match() -> syn::Path {
+    syn::parse_str("graphql").expect("`graphql` is a valid path")
+}
+
+/// Extract an configuration parameter specified in the `graphql` attribute.
+pub fn extract_attr(ast: &syn::DeriveInput, attr: &str) -> Result<String, failure::Error> {
+    let attributes = &ast.attrs;
+    let graphql_path = path_to_match();
+    let attribute = attributes
+        .iter()
+        .find(|attr| attr.path == graphql_path)
+        .ok_or_else(|| format_err!("The graphql attribute is missing"))?;
+    if let syn::Meta::List(items) = &attribute
+        .interpret_meta()
+        .expect("Attribute is well formatted")
+    {
+        for item in items.nested.iter() {
+            if let syn::NestedMeta::Meta(syn::Meta::NameValue(name_value)) = item {
+                let syn::MetaNameValue { ident, lit, .. } = name_value;
+                if ident == attr {
+                    if let syn::Lit::Str(lit) = lit {
+                        return Ok(lit.value());
+                    }
+                }
+            }
+        }
+    }
+
+    Err(format_err!("attribute not found"))?
+}
+
+/// Get the deprecation from a struct attribute in the derive case.
+pub fn extract_deprecation_strategy(
+    ast: &syn::DeriveInput,
+) -> Result<DeprecationStrategy, failure::Error> {
+    match extract_attr(&ast, "deprecated")?.to_lowercase().as_str() {
+        "allow" => Ok(DeprecationStrategy::Allow),
+        "deny" => Ok(DeprecationStrategy::Deny),
+        "warn" => Ok(DeprecationStrategy::Warn),
+        _ => Err(format_err!("{}", DEPRECATION_ERROR))?,
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_deprecation_strategy() {
+        let input = "
+        #[derive(GraphQLQuery)]
+        #[graphql(
+            schema_path = \"x\",
+            query_path = \"x\",
+            deprecated = \"warn\",
+        )]
+        struct MyQuery;
+        ";
+        let parsed = syn::parse_str(input).unwrap();
+        assert_eq!(
+            extract_deprecation_strategy(&parsed).unwrap(),
+            DeprecationStrategy::Warn
+        );
+    }
+
+    #[test]
+    fn test_deprecation_strategy_is_case_insensitive() {
+        let input = "
+        #[derive(GraphQLQuery)]
+        #[graphql(
+            schema_path = \"x\",
+            query_path = \"x\",
+            deprecated = \"DeNy\",
+        )]
+        struct MyQuery;
+        ";
+        let parsed = syn::parse_str(input).unwrap();
+        assert_eq!(
+            extract_deprecation_strategy(&parsed).unwrap(),
+            DeprecationStrategy::Deny
+        );
+    }
+
+    #[test]
+    fn test_invalid_deprecation_strategy() {
+        let input = "
+        #[derive(GraphQLQuery)]
+        #[graphql(
+            schema_path = \"x\",
+            query_path = \"x\",
+            deprecated = \"foo\",
+        )]
+        struct MyQuery;
+        ";
+        let parsed = syn::parse_str(input).unwrap();
+        match extract_deprecation_strategy(&parsed) {
+            Ok(_) => panic!("parsed unexpectedly"),
+            Err(e) => assert_eq!(&format!("{}", e), DEPRECATION_ERROR),
+        };
+    }
+}

graphql_query_derive/src/attributes.rs

@@ -1,9 +1,13 @@
+#[macro_use]
 extern crate failure;
 extern crate graphql_client_codegen;
 extern crate proc_macro;
 extern crate proc_macro2;
 extern crate syn;
 
+/// Derive-related code. This will be moved into graphql_query_derive.
+mod attributes;
+
 use failure::ResultExt;
 use graphql_client_codegen::*;
 
@@ -40,7 +44,7 @@ fn build_query_and_schema_path(
 fn build_graphql_client_derive_options(input: &syn::DeriveInput) -> GraphQLClientDeriveOptions {
     let response_derives = attributes::extract_attr(input, "response_derives").ok();
     // The user can determine what to do about deprecations.
-    let deprecation_strategy = deprecation::extract_deprecation_strategy(input).unwrap_or_default();
+    let deprecation_strategy = attributes::extract_deprecation_strategy(input).unwrap_or_default();
 
     let selected_operation_name = attributes::extract_attr(input, "selected_operation")
         .context("Extracting selected operation name");