Fix directive definition

Author: tyranron

juniper/src/schema/model.rs

@@ -250,12 +250,12 @@ impl<S> SchemaType<S> {
 
         registry.get_type::<SchemaType<S>>(&());
 
-        let skip_directive = DirectiveType::new_skip(&mut registry);
         let include_directive = DirectiveType::new_include(&mut registry);
+        let skip_directive = DirectiveType::new_skip(&mut registry);
         let deprecated_directive = DirectiveType::new_deprecated(&mut registry);
         let specified_by_directive = DirectiveType::new_specified_by(&mut registry);
-        directives.insert(skip_directive.name.clone(), skip_directive);
         directives.insert(include_directive.name.clone(), include_directive);
+        directives.insert(skip_directive.name.clone(), skip_directive);
         directives.insert(deprecated_directive.name.clone(), deprecated_directive);
         directives.insert(specified_by_directive.name.clone(), specified_by_directive);
 
@@ -585,12 +585,12 @@ impl<S> DirectiveType<S> {
         }
     }
 
-    fn new_skip(registry: &mut Registry<S>) -> Self
+    fn new_include(registry: &mut Registry<S>) -> Self
     where
         S: ScalarValue,
     {
         Self::new(
-            arcstr::literal!("skip"),
+            arcstr::literal!("include"),
             &[
                 DirectiveLocation::Field,
                 DirectiveLocation::FragmentSpread,
@@ -601,12 +601,12 @@ impl<S> DirectiveType<S> {
         )
     }
 
-    fn new_include(registry: &mut Registry<S>) -> Self
+    fn new_skip(registry: &mut Registry<S>) -> Self
     where
         S: ScalarValue,
     {
         Self::new(
-            arcstr::literal!("include"),
+            arcstr::literal!("skip"),
             &[
                 DirectiveLocation::Field,
                 DirectiveLocation::FragmentSpread,
@@ -625,9 +625,15 @@ impl<S> DirectiveType<S> {
             arcstr::literal!("deprecated"),
             &[
                 DirectiveLocation::FieldDefinition,
+                DirectiveLocation::ArgumentDefinition,
+                DirectiveLocation::InputFieldDefinition,
                 DirectiveLocation::EnumValue,
             ],
-            &[registry.arg::<String>(arcstr::literal!("reason"), &())],
+            &[registry.arg_with_default::<String>(
+                arcstr::literal!("reason"),
+                &"No longer supported".into(),
+                &(),
+            )],
             false,
         )
     }

juniper/src/tests/introspection_tests.rs

@@ -196,6 +196,8 @@ async fn test_introspection_directives() {
                     "name": "deprecated",
                     "locations": [
                         "FIELD_DEFINITION",
+                        "ARGUMENT_DEFINITION",
+                        "INPUT_FIELD_DEFINITION",
                         "ENUM_VALUE",
                     ],
                 },

juniper/src/tests/schema_introspection.rs

@@ -1465,6 +1465,8 @@ pub(crate) fn schema_introspection_result() -> Value {
               "isRepeatable": false,
               "locations": [
                 "FIELD_DEFINITION",
+                "ARGUMENT_DEFINITION",
+                "INPUT_FIELD_DEFINITION",
                 "ENUM_VALUE"
               ],
               "args": [
@@ -1480,7 +1482,7 @@ pub(crate) fn schema_introspection_result() -> Value {
                       "ofType": null
                     }
                   },
-                  "defaultValue": null,
+                  "defaultValue": "\"No longer supported\"",
                   "isDeprecated": false,
                   "deprecationReason": null
                 }
@@ -2924,6 +2926,8 @@ pub(crate) fn schema_introspection_result_without_descriptions() -> Value {
               "isRepeatable": false,
               "locations": [
                 "FIELD_DEFINITION",
+                "ARGUMENT_DEFINITION",
+                "INPUT_FIELD_DEFINITION",
                 "ENUM_VALUE"
               ],
               "args": [
@@ -2938,7 +2942,7 @@ pub(crate) fn schema_introspection_result_without_descriptions() -> Value {
                       "ofType": null
                     }
                   },
-                  "defaultValue": null,
+                  "defaultValue": "\"No longer supported\"",
                   "isDeprecated": false,
                   "deprecationReason": null
                 }