Improve juniper::impl_object macro implementation

- Upgrade syn to 0.15
- Improve implementation
- Finalized macro syntax (context, scalar)

Author: theduke

integration_tests/juniper_tests/src/codegen/impl_object.rs

@@ -0,0 +1,160 @@
+use super::util;
+use juniper::{EmptyMutation, Executor, GraphQLType};
+
+#[derive(GraphQLObject)]
+struct SomeType {
+    a: bool,
+}
+
+#[derive(Default)]
+struct Context {
+    version: Option<String>,
+}
+
+#[derive(Default)]
+struct TheQuery {
+    b: bool,
+}
+
+#[juniper::impl_object(
+    scalar = juniper::DefaultScalarValue,
+    name = "Query", 
+    description = "Type Description",
+    context = Context,
+)]
+impl TheQuery {
+    #[graphql(description = "With Self Description")]
+    fn with_self(&self) -> bool {
+        self.b
+    }
+
+    fn independent() -> i32 {
+        100
+    }
+
+    fn with_executor(exec: &Executor<Context>) -> bool {
+        true
+    }
+
+    fn with_executor_and_self(&self, exec: &Executor<Context>) -> bool {
+        true
+    }
+
+    fn with_context(exec: &Context) -> bool {
+        true
+    }
+
+    fn with_context_and_self(&self, exec: &Context) -> bool {
+        true
+    }
+
+    #[graphql(name = "renamed")]
+    fn has_custom_name() -> bool {
+        true
+    }
+
+    #[graphql(description = "attr")]
+    fn has_description_attr() -> bool {
+        true
+    }
+
+    /// Doc description
+    fn has_description_doc_comment() -> bool {
+        true
+    }
+
+    fn has_argument(arg1: bool) -> bool {
+        true
+    }
+
+    fn has_object_return(&self) -> SomeType {
+        SomeType { a: true }
+    }
+}
+
+#[derive(Default)]
+struct Mutation;
+
+#[juniper::impl_object(context = Context)]
+impl Mutation {
+    fn empty() -> bool {
+        true
+    }
+}
+
+#[test]
+fn impl_object_full_introspect() {
+    let res = util::run_info_query::<TheQuery, Mutation, Context>("Query");
+    assert_eq!(
+        dbg!(res),
+        juniper::graphql_value!({
+            "name": "Query",
+            "description": "Type Description",
+            "fields": [
+                {
+                    "name": "withSelf",
+                    "description": "With Self Description",
+                    "args": [],
+                },
+                {
+                    "name": "independent",
+                    "description": None,
+                    "args": [],
+                },
+                {
+                    "name": "withExecutor",
+                    "description": None,
+                    "args": [],
+                },
+                {
+                    "name": "withExecutorAndSelf",
+                    "description": None,
+                    "args": [],
+                },
+                {
+                    "name": "withContext",
+                    "description": None,
+                    "args": [],
+                },
+                {
+                    "name": "withContextAndSelf",
+                    "description": None,
+                    "args": [],
+                },
+                {
+                    "name": "renamed",
+                    "description": None,
+                    "args": [],
+                },
+                {
+                    "name": "hasDescriptionAttr",
+                    "description": "attr",
+                    "args": [],
+                },
+                {
+                    "name": "hasDescriptionDocComment",
+                    "description": "Doc description",
+                    "args": [],
+                },
+                {
+                    "name": "hasArgument",
+                    "description": None,
+                    "args": [
+                        {
+                            "name": "arg1",
+                            "description": None,
+                            "type": {
+                                "name": None,
+                            },
+                        }
+                    ],
+                },
+                {
+                    "name": "hasObjectReturn",
+                    "description": None,
+                    "args": [],
+                },
+            ]
+        })
+    );
+}

integration_tests/juniper_tests/src/codegen/mod.rs

@@ -1,3 +1,6 @@
+mod util;
+
 mod derive_enum;
 mod derive_input_object;
 mod derive_object;
+mod impl_object;

integration_tests/juniper_tests/src/codegen/util.rs

@@ -0,0 +1,55 @@
+use fnv::FnvHashMap;
+use juniper::{DefaultScalarValue, GraphQLType, RootNode, Value, Variables};
+use std::default::Default;
+
+pub fn run_query<Query, Mutation, Context>(query: &str) -> Value
+where
+    Query: GraphQLType<DefaultScalarValue, TypeInfo = (), Context = Context> + Default,
+    Mutation: GraphQLType<DefaultScalarValue, TypeInfo = (), Context = Context> + Default,
+    Context: Default,
+{
+    let schema = RootNode::new(Query::default(), Mutation::default());
+    let (result, errs) =
+        juniper::execute(query, None, &schema, &Variables::new(), &Context::default())
+            .expect("Execution failed");
+
+    assert_eq!(errs, []);
+    result
+}
+
+pub fn run_info_query<Query, Mutation, Context>(type_name: &str) -> Value
+where
+    Query: GraphQLType<DefaultScalarValue, TypeInfo = (), Context = Context> + Default,
+    Mutation: GraphQLType<DefaultScalarValue, TypeInfo = (), Context = Context> + Default,
+    Context: Default,
+{
+    let query = format!(
+        r#"
+    {{
+        __type(name: "{}") {{
+            name,
+            description,
+            fields {{
+                name
+                description
+                args {{
+                    name
+                    description
+                    type {{
+                        name
+                    }}
+                }}
+            }}
+        }}
+    }}
+    "#,
+        type_name
+    );
+    let result = run_query::<Query, Mutation, Context>(&query);
+    result
+        .as_object_value()
+        .expect("Result is not an object")
+        .get_field_value("__type")
+        .expect("__type field missing")
+        .clone()
+}

integration_tests/juniper_tests/src/lib.rs

@@ -9,5 +9,6 @@ extern crate fnv;
 #[cfg(test)]
 extern crate indexmap;
 
+#[cfg(test)]
 mod codegen;
 mod custom_scalar;

juniper/Cargo.toml

@@ -22,7 +22,7 @@ harness = false
 path = "benches/bench.rs"
 
 [features]
-nightly = []
+nightly = ["juniper_codegen/nightly"]
 expose-test-schema = []
 default = [
     "chrono",

juniper_codegen/Cargo.toml

@@ -13,9 +13,12 @@ repository = "https://github.com/graphql-rust/juniper"
 [lib]
 proc-macro = true
 
+[features]
+nightly = []
+
 [dependencies]
 proc-macro2 = "0.4"
-syn = { version = "0.14", features = ["full", "extra-traits"] }
+syn = { version = "0.15.28", features = ["full", "extra-traits", "parsing"] }
 quote = "0.6"
 regex = "1"
 lazy_static = "1.0.0"