From 0fde8684591b2af906d820806272c9a999ae2d5b Mon Sep 17 00:00:00 2001
From: Blaine Bublitz <blaine.bublitz@gmail.com>
Date: Thu, 25 Jun 2020 13:54:13 -0700
Subject: [PATCH] Fix issue with unwrapping derive attributes

---
 async-graphql-derive/src/utils.rs | 17 ++++++++++-------
 tests/derive.rs                   | 30 +++++++++++++++++++++++++++---
 2 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/async-graphql-derive/src/utils.rs b/async-graphql-derive/src/utils.rs
index 641dfdf3..417e64cb 100644
--- a/async-graphql-derive/src/utils.rs
+++ b/async-graphql-derive/src/utils.rs
@@ -41,14 +41,17 @@ pub fn add_container_attrs(
 pub fn parse_derive(input: TokenStream) -> Result<(proc_macro::TokenStream, DeriveInput)> {
     let mut input: DeriveInput = syn::parse2(input)?;
     let attrs = &mut input.attrs;
-    let pos = attrs
+    let graphql_attr = attrs
         .iter()
-        .find_position(|attr| attr.path.is_ident("graphql"))
-        .unwrap()
-        .0;
-    let attribute = attrs.remove(pos);
-    let args = attribute.parse_args::<TokenStream>()?;
-    Ok((args.into(), input))
+        .find_position(|attr| attr.path.is_ident("graphql"));
+
+    if let Some((pos, _attr)) = graphql_attr {
+        let attribute = attrs.remove(pos);
+        let args = attribute.parse_args::<TokenStream>()?;
+        Ok((args.into(), input))
+    } else {
+        Ok((TokenStream::new().into(), input))
+    }
 }
 
 fn parse_nested_validator(
diff --git a/tests/derive.rs b/tests/derive.rs
index 0821a613..a2d82d3f 100644
--- a/tests/derive.rs
+++ b/tests/derive.rs
@@ -8,36 +8,60 @@ pub async fn test_derive() {
         A,
     }
 
+    // Infers the name based on Rust name
     #[derive(GQLEnum, Eq, Copy, PartialEq, Clone)]
-    #[graphql(name = "MyEnumDerive1")]
     enum MyEnumDerive {
         #[cfg_attr(feature = "bson", item(name = "A1"))]
         A,
     }
 
+    // Can be renamed with graphql(name = ..) attribute
+    #[derive(GQLEnum, Eq, Copy, PartialEq, Clone)]
+    #[graphql(name = "MyEnumDerive")]
+    enum MyEnumDeriveRenamed {
+        #[cfg_attr(feature = "bson", item(name = "A1"))]
+        A,
+    }
+
     #[InputObject(name = "MyInputObj1")]
     struct MyInputObj {
         #[cfg_attr(feature = "bson", field(default))]
         value: i32,
     }
 
+    // Infers the name based on Rust name
     #[derive(GQLInputObject)]
-    #[graphql(name = "MyInputObjDerive1")]
     struct MyInputObjDerive {
         #[cfg_attr(feature = "bson", field(default))]
         value: i32,
     }
 
+    // Can be renamed with graphql(name = ..) attribute
+    #[derive(GQLInputObject)]
+    #[graphql(name = "MyInputObjDerive")]
+    struct MyInputObjDeriveRenamed {
+        #[cfg_attr(feature = "bson", field(default))]
+        value: i32,
+    }
+
     #[InputObject(name = "MySimpleObj1")]
     struct MySimpleObj {
         #[cfg_attr(feature = "bson", field(name = "value1"))]
         value: i32,
     }
 
+    // Infers the name based on Rust name
     #[derive(GQLInputObject)]
-    #[graphql(name = "MySimpleObjDerive1")]
     struct MySimpleObjDerive {
         #[cfg_attr(feature = "bson", field(name = "value1"))]
         value: i32,
     }
+
+    // Can be renamed with graphql(name = ..) attribute
+    #[derive(GQLInputObject)]
+    #[graphql(name = "MySimpleObjDerive")]
+    struct MySimpleObjDeriveRenamed {
+        #[cfg_attr(feature = "bson", field(name = "value1"))]
+        value: i32,
+    }
 }