Skip to content

Commit ee9a82a

Browse files
theduketheduke
committed
Refacto graphql_union! macro to proc macro
1 parent c903d5e commit ee9a82a

File tree

17 files changed

+412
-193
lines changed

17 files changed

+412
-193
lines changed

‎integration_tests/juniper_tests/src/codegen/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ mod derive_enum;
44
mod derive_input_object;
55
mod derive_object;
66
mod scalar_value_transparent;
7+
mod unions;

‎integration_tests/juniper_tests/src/codegen/unions.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
3+
4+

‎juniper/src/executor_tests/interfaces_unions.rs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,24 @@ mod union {
166166
}
167167
}
168168

169+
/*
169170
graphql_union!(<'a> &'a dyn Pet: () as "Pet" |&self| {
170171
instance_resolvers: |&_| {
171172
&Dog => self.as_dog(),
172173
&Cat => self.as_cat(),
173174
}
174175
});
176+
*/
177+
178+
#[crate::union_internal]
179+
impl<'a> &'a dyn Pet {
180+
fn resolve(&self) {
181+
match self {
182+
Dog => self.as_dog(),
183+
Cat => self.as_cat(),
184+
}
185+
}
186+
}
175187

176188
struct Dog {
177189
name: String,
@@ -227,7 +239,7 @@ mod union {
227239
}
228240

229241
#[test]
230-
fn test() {
242+
fn test_unions() {
231243
let schema = RootNode::new(
232244
Schema {
233245
pets: vec![

‎juniper/src/executor_tests/variables.rs

Lines changed: 62 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,10 @@ fn inline_complex_input() {
158158
|result: &Object<DefaultScalarValue>| {
159159
assert_eq!(
160160
result.get_field_value("fieldWithObjectInput"),
161-
Some(&Value::scalar(r#"Some(TestInputObject { a: Some("foo"), b: Some([Some("bar")]), c: "baz", d: None })"#)));
161+
Some(&Value::scalar(
162+
r#"Some(TestInputObject { a: Some("foo"), b: Some([Some("bar")]), c: "baz", d: None })"#
163+
))
164+
);
162165
},
163166
);
164167
}
@@ -170,7 +173,10 @@ fn inline_parse_single_value_to_list() {
170173
|result: &Object<DefaultScalarValue>| {
171174
assert_eq!(
172175
result.get_field_value("fieldWithObjectInput"),
173-
Some(&Value::scalar(r#"Some(TestInputObject { a: Some("foo"), b: Some([Some("bar")]), c: "baz", d: None })"#)));
176+
Some(&Value::scalar(
177+
r#"Some(TestInputObject { a: Some("foo"), b: Some([Some("bar")]), c: "baz", d: None })"#
178+
))
179+
);
174180
},
175181
);
176182
}
@@ -182,7 +188,10 @@ fn inline_runs_from_input_value_on_scalar() {
182188
|result: &Object<DefaultScalarValue>| {
183189
assert_eq!(
184190
result.get_field_value("fieldWithObjectInput"),
185-
Some(&Value::scalar(r#"Some(TestInputObject { a: None, b: None, c: "baz", d: Some(TestComplexScalar) })"#)));
191+
Some(&Value::scalar(
192+
r#"Some(TestInputObject { a: None, b: None, c: "baz", d: Some(TestComplexScalar) })"#
193+
))
194+
);
186195
},
187196
);
188197
}
@@ -208,7 +217,10 @@ fn variable_complex_input() {
208217
|result: &Object<DefaultScalarValue>| {
209218
assert_eq!(
210219
result.get_field_value("fieldWithObjectInput"),
211-
Some(&Value::scalar(r#"Some(TestInputObject { a: Some("foo"), b: Some([Some("bar")]), c: "baz", d: None })"#)));
220+
Some(&Value::scalar(
221+
r#"Some(TestInputObject { a: Some("foo"), b: Some([Some("bar")]), c: "baz", d: None })"#
222+
))
223+
);
212224
},
213225
);
214226
}
@@ -234,7 +246,10 @@ fn variable_parse_single_value_to_list() {
234246
|result: &Object<DefaultScalarValue>| {
235247
assert_eq!(
236248
result.get_field_value("fieldWithObjectInput"),
237-
Some(&Value::scalar(r#"Some(TestInputObject { a: Some("foo"), b: Some([Some("bar")]), c: "baz", d: None })"#)));
249+
Some(&Value::scalar(
250+
r#"Some(TestInputObject { a: Some("foo"), b: Some([Some("bar")]), c: "baz", d: None })"#
251+
))
252+
);
238253
},
239254
);
240255
}
@@ -259,7 +274,10 @@ fn variable_runs_from_input_value_on_scalar() {
259274
|result: &Object<DefaultScalarValue>| {
260275
assert_eq!(
261276
result.get_field_value("fieldWithObjectInput"),
262-
Some(&Value::scalar(r#"Some(TestInputObject { a: None, b: None, c: "baz", d: Some(TestComplexScalar) })"#)));
277+
Some(&Value::scalar(
278+
r#"Some(TestInputObject { a: None, b: None, c: "baz", d: Some(TestComplexScalar) })"#
279+
))
280+
);
263281
},
264282
);
265283
}
@@ -306,12 +324,13 @@ fn variable_error_on_incorrect_type() {
306324

307325
let error = crate::execute(query, None, &schema, &vars, &()).unwrap_err();
308326

309-
assert_eq!(error, ValidationError(vec![
310-
RuleError::new(
327+
assert_eq!(
328+
error,
329+
ValidationError(vec![RuleError::new(
311330
r#"Variable "$input" got invalid value. Expected "TestInputObject", found not an object."#,
312331
&[SourcePosition::new(8, 0, 8)],
313-
),
314-
]));
332+
),])
333+
);
315334
}
316335

317336
#[test]
@@ -366,16 +385,19 @@ fn variable_multiple_errors_with_nesting() {
366385

367386
let error = crate::execute(query, None, &schema, &vars, &()).unwrap_err();
368387

369-
assert_eq!(error, ValidationError(vec![
370-
RuleError::new(
371-
r#"Variable "$input" got invalid value. In field "na": In field "c": Expected "String!", found null."#,
372-
&[SourcePosition::new(8, 0, 8)],
373-
),
374-
RuleError::new(
375-
r#"Variable "$input" got invalid value. In field "nb": Expected "String!", found null."#,
376-
&[SourcePosition::new(8, 0, 8)],
377-
),
378-
]));
388+
assert_eq!(
389+
error,
390+
ValidationError(vec![
391+
RuleError::new(
392+
r#"Variable "$input" got invalid value. In field "na": In field "c": Expected "String!", found null."#,
393+
&[SourcePosition::new(8, 0, 8)],
394+
),
395+
RuleError::new(
396+
r#"Variable "$input" got invalid value. In field "nb": Expected "String!", found null."#,
397+
&[SourcePosition::new(8, 0, 8)],
398+
),
399+
])
400+
);
379401
}
380402

381403
#[test]
@@ -733,12 +755,13 @@ fn does_not_allow_lists_of_non_null_to_contain_null() {
733755

734756
let error = crate::execute(query, None, &schema, &vars, &()).unwrap_err();
735757

736-
assert_eq!(error, ValidationError(vec![
737-
RuleError::new(
758+
assert_eq!(
759+
error,
760+
ValidationError(vec![RuleError::new(
738761
r#"Variable "$input" got invalid value. In element #1: Expected "String!", found null."#,
739762
&[SourcePosition::new(8, 0, 8)],
740-
),
741-
]));
763+
),])
764+
);
742765
}
743766

744767
#[test]
@@ -759,12 +782,13 @@ fn does_not_allow_non_null_lists_of_non_null_to_contain_null() {
759782

760783
let error = crate::execute(query, None, &schema, &vars, &()).unwrap_err();
761784

762-
assert_eq!(error, ValidationError(vec![
763-
RuleError::new(
785+
assert_eq!(
786+
error,
787+
ValidationError(vec![RuleError::new(
764788
r#"Variable "$input" got invalid value. In element #1: Expected "String!", found null."#,
765789
&[SourcePosition::new(8, 0, 8)],
766-
),
767-
]));
790+
),])
791+
);
768792
}
769793

770794
#[test]
@@ -820,12 +844,13 @@ fn does_not_allow_invalid_types_to_be_used_as_values() {
820844

821845
let error = crate::execute(query, None, &schema, &vars, &()).unwrap_err();
822846

823-
assert_eq!(error, ValidationError(vec![
824-
RuleError::new(
847+
assert_eq!(
848+
error,
849+
ValidationError(vec![RuleError::new(
825850
r#"Variable "$input" expected value of type "TestType!" which cannot be used as an input type."#,
826851
&[SourcePosition::new(8, 0, 8)],
827-
),
828-
]));
852+
),])
853+
);
829854
}
830855

831856
#[test]
@@ -842,12 +867,13 @@ fn does_not_allow_unknown_types_to_be_used_as_values() {
842867

843868
let error = crate::execute(query, None, &schema, &vars, &()).unwrap_err();
844869

845-
assert_eq!(error, ValidationError(vec![
846-
RuleError::new(
870+
assert_eq!(
871+
error,
872+
ValidationError(vec![RuleError::new(
847873
r#"Variable "$input" expected value of type "UnknownType!" which cannot be used as an input type."#,
848874
&[SourcePosition::new(8, 0, 8)],
849-
),
850-
]));
875+
),])
876+
);
851877
}
852878

853879
#[test]

‎juniper/src/http/graphiql.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ pub fn graphiql_source(graphql_endpoint_url: &str) -> String {
4141
</script>
4242
"#;
4343

44-
format!(r#"
44+
format!(
45+
r#"
4546
<!DOCTYPE html>
4647
<html>
4748
<head>
@@ -62,5 +63,6 @@ pub fn graphiql_source(graphql_endpoint_url: &str) -> String {
6263
"#,
6364
graphql_url = graphql_endpoint_url,
6465
stylesheet_source = stylesheet_source,
65-
fetcher_source = fetcher_source)
66+
fetcher_source = fetcher_source
67+
)
6668
}

‎juniper/src/integrations/serde.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,8 @@ mod tests {
450450
to_string(&ExecutionError::at_origin(FieldError::new(
451451
"foo error",
452452
Value::Object(obj),
453-
))).unwrap(),
453+
)))
454+
.unwrap(),
454455
r#"{"message":"foo error","locations":[{"line":1,"column":1}],"path":[],"extensions":{"foo":"bar"}}"#
455456
);
456457
}

‎juniper/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,14 @@ extern crate uuid;
111111
// functionality automatically.
112112
pub use juniper_codegen::{
113113
object, GraphQLEnum, GraphQLInputObject, GraphQLObject, GraphQLScalarValue, ScalarValue,
114+
union,
114115
};
115116
// Internal macros are not exported,
116117
// but declared at the root to make them easier to use.
117118
#[allow(unused_imports)]
118119
use juniper_codegen::{
119120
object_internal, GraphQLEnumInternal, GraphQLInputObjectInternal, GraphQLScalarValueInternal,
121+
union_internal,
120122
};
121123

122124
#[macro_use]

‎juniper/src/macros/tests/field.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,16 @@ impl Root {
9595
Ok(0)
9696
}
9797

98+
/*
99+
* FIXME: make this work again
98100
fn with_return() -> i32 {
99101
return 0;
100102
}
101103
102104
fn with_return_field_result() -> FieldResult<i32> {
103105
return Ok(0);
104106
}
107+
*/
105108
}
106109

107110
graphql_interface!(Interface: () |&self| {

0 commit comments

Comments
 (0)