introspection: Add missing __Directive.args(includeDeprecated)

Replicates graphql/graphql-js@8261922

Author: Cito

src/graphql/type/introspection.py

@@ -87,27 +87,61 @@
         # Note: The fields onOperation, onFragment and onField are deprecated
         "name": GraphQLField(
             GraphQLNonNull(GraphQLString),
-            resolve=lambda directive, _info: directive.name,
+            resolve=DirectiveResolvers.name,
         ),
         "description": GraphQLField(
-            GraphQLString, resolve=lambda directive, _info: directive.description
+            GraphQLString,
+            resolve=DirectiveResolvers.description,
         ),
         "isRepeatable": GraphQLField(
             GraphQLNonNull(GraphQLBoolean),
-            resolve=lambda directive, _info: directive.is_repeatable,
+            resolve=DirectiveResolvers.is_repeatable,
         ),
         "locations": GraphQLField(
             GraphQLNonNull(GraphQLList(GraphQLNonNull(__DirectiveLocation))),
-            resolve=lambda directive, _info: directive.locations,
+            resolve=DirectiveResolvers.locations,
         ),
         "args": GraphQLField(
             GraphQLNonNull(GraphQLList(GraphQLNonNull(__InputValue))),
-            resolve=lambda directive, _info: directive.args.items(),
+            args={
+                "includeDeprecated": GraphQLArgument(
+                    GraphQLBoolean, default_value=False
+                )
+            },
+            resolve=DirectiveResolvers.args,
         ),
     },
 )
 
 
+class DirectiveResolvers:
+    @staticmethod
+    def name(directive, _info):
+        return directive.name
+
+    @staticmethod
+    def description(directive, _info):
+        return directive.description
+
+    @staticmethod
+    def is_repeatable(directive, _info):
+        return directive.is_repeatable
+
+    @staticmethod
+    def locations(directive, _info):
+        return directive.locations
+
+    # noinspection PyPep8Naming
+    @staticmethod
+    def args(directive, _info, includeDeprecated=False):
+        items = directive.args.items()
+        return (
+            list(items)
+            if includeDeprecated
+            else [item for item in items if item[1].deprecation_reason is None]
+        )
+
+
 __DirectiveLocation: GraphQLEnumType = GraphQLEnumType(
     name="__DirectiveLocation",
     description="A Directive can be adjacent to many parts of the GraphQL"
@@ -206,15 +240,11 @@
     " types possible at runtime. List and NonNull types compose"
     " other types.",
     fields=lambda: {
-        "kind": GraphQLField(
-            GraphQLNonNull(__TypeKind), resolve=TypeFieldResolvers.kind
-        ),
-        "name": GraphQLField(GraphQLString, resolve=TypeFieldResolvers.name),
-        "description": GraphQLField(
-            GraphQLString, resolve=TypeFieldResolvers.description
-        ),
+        "kind": GraphQLField(GraphQLNonNull(__TypeKind), resolve=TypeResolvers.kind),
+        "name": GraphQLField(GraphQLString, resolve=TypeResolvers.name),
+        "description": GraphQLField(GraphQLString, resolve=TypeResolvers.description),
         "specifiedByURL": GraphQLField(
-            GraphQLString, resolve=TypeFieldResolvers.specified_by_url
+            GraphQLString, resolve=TypeResolvers.specified_by_url
         ),
         "fields": GraphQLField(
             GraphQLList(GraphQLNonNull(__Field)),
@@ -223,14 +253,14 @@
                     GraphQLBoolean, default_value=False
                 )
             },
-            resolve=TypeFieldResolvers.fields,
+            resolve=TypeResolvers.fields,
         ),
         "interfaces": GraphQLField(
-            GraphQLList(GraphQLNonNull(__Type)), resolve=TypeFieldResolvers.interfaces
+            GraphQLList(GraphQLNonNull(__Type)), resolve=TypeResolvers.interfaces
         ),
         "possibleTypes": GraphQLField(
             GraphQLList(GraphQLNonNull(__Type)),
-            resolve=TypeFieldResolvers.possible_types,
+            resolve=TypeResolvers.possible_types,
         ),
         "enumValues": GraphQLField(
             GraphQLList(GraphQLNonNull(__EnumValue)),
@@ -239,7 +269,7 @@
                     GraphQLBoolean, default_value=False
                 )
             },
-            resolve=TypeFieldResolvers.enum_values,
+            resolve=TypeResolvers.enum_values,
         ),
         "inputFields": GraphQLField(
             GraphQLList(GraphQLNonNull(__InputValue)),
@@ -248,14 +278,14 @@
                     GraphQLBoolean, default_value=False
                 )
             },
-            resolve=TypeFieldResolvers.input_fields,
+            resolve=TypeResolvers.input_fields,
         ),
-        "ofType": GraphQLField(__Type, resolve=TypeFieldResolvers.of_type),
+        "ofType": GraphQLField(__Type, resolve=TypeResolvers.of_type),
     },
 )
 
 
-class TypeFieldResolvers:
+class TypeResolvers:
     @staticmethod
     def kind(type_, _info):
         if is_scalar_type(type_):

tests/type/test_introspection.py

@@ -755,7 +755,17 @@ def executes_an_introspection_query():
                             },
                             {
                                 "name": "args",
-                                "args": [],
+                                "args": [
+                                    {
+                                        "name": "includeDeprecated",
+                                        "type": {
+                                            "kind": "SCALAR",
+                                            "name": "Boolean",
+                                            "ofType": None,
+                                        },
+                                        "defaultValue": "false",
+                                    }
+                                ],
                                 "type": {
                                     "kind": "NON_NULL",
                                     "name": None,

tests/utilities/test_get_introspection_query.py

@@ -2,12 +2,25 @@
 
 from typing import Pattern
 
-from graphql.utilities import get_introspection_query
+from graphql.language import parse
+from graphql.utilities import build_schema, get_introspection_query
+from graphql.validation import validate
+
+dummy_schema = build_schema(
+    """
+  type Query {
+    dummy: String
+  }
+  """
+)
 
 
 class ExcpectIntrospectionQuery:
     def __init__(self, **options):
-        self.query = get_introspection_query(**options)
+        query = get_introspection_query(**options)
+        validation_errors = validate(dummy_schema, parse(query))
+        assert validation_errors == []
+        self.query = query
 
     def to_match(self, name: str, times: int = 1) -> None:
         pattern = self.to_reg_exp(name)

tests/utilities/test_print_schema.py

@@ -769,7 +769,7 @@ def prints_introspection_schema():
               description: String
               isRepeatable: Boolean!
               locations: [__DirectiveLocation!]!
-              args: [__InputValue!]!
+              args(includeDeprecated: Boolean = false): [__InputValue!]!
             }
 
             """