Support @specifiedBy(url: "...") directive via specified_by_url attribute argument in #[graphql_scalar] and #[derive(GraphQLScalarValue)] macros (#1003, #1000)

- support `isRepeatable` field on directives
- support `__Schema.description`, `__Type.specifiedByURL` and `__Directive.isRepeatable` fields in introspection

Author: ilslv

integration_tests/codegen_fail/fail/scalar/derive_invalid_url.rs

@@ -0,0 +1,7 @@
+use juniper::GraphQLScalarValue;
+
+#[derive(GraphQLScalarValue)]
+#[graphql(specified_by_url = "not an url")]
+struct ScalarSpecifiedByUrl(i64);
+
+fn main() {}

integration_tests/codegen_fail/fail/scalar/derive_invalid_url.stderr

@@ -0,0 +1,5 @@
+error: Invalid URL: relative URL without a base
+ --> fail/scalar/derive_invalid_url.rs:4:30
+  |
+4 | #[graphql(specified_by_url = "not an url")]
+  |                              ^^^^^^^^^^^^

integration_tests/codegen_fail/fail/scalar/impl_invalid_url.rs

@@ -0,0 +1,22 @@
+use juniper::graphql_scalar;
+
+struct ScalarSpecifiedByUrl(i32);
+
+#[graphql_scalar(specified_by_url = "not an url")]
+impl GraphQLScalar for ScalarSpecifiedByUrl {
+    fn resolve(&self) -> Value {
+        Value::scalar(self.0)
+    }
+
+    fn from_input_value(v: &InputValue) -> Result<ScalarSpecifiedByUrl, String> {
+        v.as_int_value()
+            .map(ScalarSpecifiedByUrl)
+            .ok_or_else(|| format!("Expected `Int`, found: {}", v))
+    }
+
+    fn from_str<'a>(value: ScalarToken<'a>) -> ParseScalarResult<'a, DefaultScalarValue> {
+        <i32 as ParseScalarValue>::from_str(value)
+    }
+}
+
+fn main() {}

integration_tests/codegen_fail/fail/scalar/impl_invalid_url.stderr

@@ -0,0 +1,5 @@
+error: Invalid URL: relative URL without a base
+ --> fail/scalar/impl_invalid_url.rs:5:22
+  |
+5 | #[graphql_scalar(specified_by_url = "not an url")]
+  |                  ^^^^^^^^^^^^^^^^

integration_tests/juniper_tests/src/codegen/derive_scalar.rs

@@ -6,7 +6,11 @@ use juniper::{
 use crate::custom_scalar::MyScalarValue;
 
 #[derive(Debug, PartialEq, Eq, Hash, juniper::GraphQLScalarValue)]
-#[graphql(transparent, scalar = MyScalarValue)]
+#[graphql(
+    transparent,
+    scalar = MyScalarValue,
+    specified_by_url = "https://tools.ietf.org/html/rfc4122",
+)]
 pub struct LargeId(i64);
 
 #[derive(juniper::GraphQLObject)]
@@ -49,6 +53,29 @@ fn test_scalar_value_large_id() {
     assert_eq!(output, InputValue::scalar(num));
 }
 
+#[tokio::test]
+async fn test_scalar_value_large_specified_url() {
+    let schema = RootNode::<'_, _, _, _, MyScalarValue>::new_with_scalar_value(
+        Query,
+        EmptyMutation::<()>::new(),
+        EmptySubscription::<()>::new(),
+    );
+
+    let doc = r#"{
+        __type(name: "LargeId") {
+            specifiedByUrl
+        }
+    }"#;
+
+    assert_eq!(
+        execute(doc, None, &schema, &Variables::<MyScalarValue>::new(), &()).await,
+        Ok((
+            graphql_value!({"__type": {"specifiedByUrl": "https://tools.ietf.org/html/rfc4122"}}),
+            vec![],
+        )),
+    );
+}
+
 #[tokio::test]
 async fn test_scalar_value_large_query() {
     let schema = RootNode::<'_, _, _, _, MyScalarValue>::new_with_scalar_value(

integration_tests/juniper_tests/src/codegen/impl_scalar.rs

@@ -9,6 +9,7 @@ struct DefaultName(i32);
 struct OtherOrder(i32);
 struct Named(i32);
 struct ScalarDescription(i32);
+struct ScalarSpecifiedByUrl(i32);
 struct Generated(String);
 
 struct Root;
@@ -93,6 +94,23 @@ impl GraphQLScalar for ScalarDescription {
     }
 }
 
+#[graphql_scalar(specified_by_url = "https://tools.ietf.org/html/rfc4122")]
+impl GraphQLScalar for ScalarSpecifiedByUrl {
+    fn resolve(&self) -> Value {
+        Value::scalar(self.0)
+    }
+
+    fn from_input_value(v: &InputValue) -> Result<ScalarSpecifiedByUrl, String> {
+        v.as_int_value()
+            .map(ScalarSpecifiedByUrl)
+            .ok_or_else(|| format!("Expected `Int`, found: {}", v))
+    }
+
+    fn from_str<'a>(value: ScalarToken<'a>) -> ParseScalarResult<'a, DefaultScalarValue> {
+        <i32 as ParseScalarValue>::from_str(value)
+    }
+}
+
 macro_rules! impl_scalar {
     ($name: ident) => {
         #[graphql_scalar]
@@ -134,6 +152,9 @@ impl Root {
     fn scalar_description() -> ScalarDescription {
         ScalarDescription(0)
     }
+    fn scalar_specified_by_url() -> ScalarSpecifiedByUrl {
+        ScalarSpecifiedByUrl(0)
+    }
     fn generated() -> Generated {
         Generated("foo".to_owned())
     }
@@ -297,6 +318,7 @@ async fn scalar_description_introspection() {
         __type(name: "ScalarDescription") {
             name
             description
+            specifiedByUrl
         }
     }
     "#;
@@ -312,6 +334,32 @@ async fn scalar_description_introspection() {
                 "A sample scalar, represented as an integer",
             )),
         );
+        assert_eq!(
+            type_info.get_field_value("specifiedByUrl"),
+            Some(&graphql_value!(null)),
+        );
+    })
+    .await;
+}
+
+#[tokio::test]
+async fn scalar_specified_by_url_introspection() {
+    let doc = r#"{
+        __type(name: "ScalarSpecifiedByUrl") {
+            name
+            specifiedByUrl
+        }
+    }"#;
+
+    run_type_info_query(doc, |type_info| {
+        assert_eq!(
+            type_info.get_field_value("name"),
+            Some(&graphql_value!("ScalarSpecifiedByUrl")),
+        );
+        assert_eq!(
+            type_info.get_field_value("specifiedByUrl"),
+            Some(&graphql_value!("https://tools.ietf.org/html/rfc4122")),
+        );
     })
     .await;
 }

integration_tests/juniper_tests/src/codegen/scalar_value_transparent.rs

@@ -14,7 +14,7 @@ struct CustomUserId(String);
 
 /// The doc comment...
 #[derive(GraphQLScalarValue, Debug, Eq, PartialEq)]
-#[graphql(transparent)]
+#[graphql(transparent, specified_by_url = "https://tools.ietf.org/html/rfc4122")]
 struct IdWithDocComment(i32);
 
 #[derive(GraphQLObject)]
@@ -64,6 +64,7 @@ fn test_scalar_value_custom() {
     let meta = CustomUserId::meta(&(), &mut registry);
     assert_eq!(meta.name(), Some("MyUserId"));
     assert_eq!(meta.description(), Some("custom description..."));
+    assert_eq!(meta.specified_by_url(), None);
 
     let input: InputValue = serde_json::from_value(serde_json::json!("userId1")).unwrap();
     let output: CustomUserId = FromInputValue::from_input_value(&input).unwrap();
@@ -79,4 +80,8 @@ fn test_scalar_value_doc_comment() {
     let mut registry: Registry = Registry::new(FnvHashMap::default());
     let meta = IdWithDocComment::meta(&(), &mut registry);
     assert_eq!(meta.description(), Some("The doc comment..."));
+    assert_eq!(
+        meta.specified_by_url(),
+        Some("https://tools.ietf.org/html/rfc4122"),
+    );
 }

juniper/CHANGELOG.md

@@ -20,6 +20,9 @@
 - Add `From` impls to `InputValue` mirroring the ones for `Value` and provide better support for `Option` handling. ([#996](https://github.com/graphql-rust/juniper/pull/996))
 - Implement `graphql_input_value!` and `graphql_vars!` macros. ([#996](https://github.com/graphql-rust/juniper/pull/996))
 - Support [`time` crate](https://docs.rs/time) types as GraphQL scalars behind `time` feature. ([#1006](https://github.com/graphql-rust/juniper/pull/1006))
+- Add `specified_by_url` attribute argument to `#[derive(GraphQLScalarValue)]` and `#[graphql_scalar]` macros. ([#1003](https://github.com/graphql-rust/juniper/pull/1003), [#1000](https://github.com/graphql-rust/juniper/pull/1000))
+- Support `isRepeatable` field on directives. ([#1003](https://github.com/graphql-rust/juniper/pull/1003), [#1000](https://github.com/graphql-rust/juniper/pull/1000))
+- Support `__Schema.description`, `__Type.specifiedByURL` and `__Directive.isRepeatable` fields in introspection. ([#1003](https://github.com/graphql-rust/juniper/pull/1003), [#1000](https://github.com/graphql-rust/juniper/pull/1000))
 
 ## Fixes
 

juniper/src/executor_tests/introspection/mod.rs

@@ -492,6 +492,7 @@ async fn scalar_introspection() {
             name
             kind
             description
+            specifiedByUrl
             fields { name }
             interfaces { name }
             possibleTypes { name }
@@ -527,6 +528,7 @@ async fn scalar_introspection() {
             "name": "SampleScalar",
             "kind": "SCALAR",
             "description": null,
+            "specifiedByUrl": null,
             "fields": null,
             "interfaces": null,
             "possibleTypes": null,

juniper/src/introspection/mod.rs

@@ -1,10 +1,10 @@
-/// From <https://github.com/graphql/graphql-js/blob/8c96dc8276f2de27b8af9ffbd71a4597d483523f/src/utilities/introspectionQuery.js#L21>
+/// From <https://github.com/graphql/graphql-js/blob/90bd6ff72625173dd39a1f82cfad9336cfad8f65/src/utilities/getIntrospectionQuery.ts#L62>
 pub(crate) const INTROSPECTION_QUERY: &str = include_str!("./query.graphql");
 pub(crate) const INTROSPECTION_QUERY_WITHOUT_DESCRIPTIONS: &str =
     include_str!("./query_without_descriptions.graphql");
 
 /// The desired GraphQL introspection format for the canonical query
-/// (<https://github.com/graphql/graphql-js/blob/8c96dc8276f2de27b8af9ffbd71a4597d483523f/src/utilities/introspectionQuery.js#L21>)
+/// (<https://github.com/graphql/graphql-js/blob/90bd6ff72625173dd39a1f82cfad9336cfad8f65/src/utilities/getIntrospectionQuery.ts#L62>)
 pub enum IntrospectionFormat {
     /// The canonical GraphQL introspection query.
     All,