chore: forward-port directives on directive definitions

Replicates graphql/graphql-js@65fc947

Author: Cito

docs/modules/language.rst

@@ -25,6 +25,7 @@ Each kind of AST node has its own class:
 .. autoclass:: ConstValueNode
 .. autoclass:: DefinitionNode
 .. autoclass:: DirectiveDefinitionNode
+.. autoclass:: DirectiveExtensionNode
 .. autoclass:: DirectiveNode
 .. autoclass:: DocumentNode
 .. autoclass:: EnumTypeDefinitionNode

src/graphql/__init__.py

@@ -168,6 +168,7 @@
     UnionTypeExtensionNode,
     EnumTypeExtensionNode,
     InputObjectTypeExtensionNode,
+    DirectiveExtensionNode,
     SchemaCoordinateNode,
     TypeCoordinateNode,
     MemberCoordinateNode,
@@ -573,6 +574,7 @@
     "DirectiveArgumentCoordinateNode",
     "DirectiveCoordinateNode",
     "DirectiveDefinitionNode",
+    "DirectiveExtensionNode",
     "DirectiveLocation",
     "DirectiveNode",
     "DocumentNode",

src/graphql/execution/values.py

@@ -6,6 +6,8 @@
 
 from ..error import GraphQLError
 from ..language import (
+    DirectiveDefinitionNode,
+    DirectiveExtensionNode,
     DirectiveNode,
     EnumValueDefinitionNode,
     ExecutableDefinitionNode,
@@ -425,7 +427,9 @@ def print_argument_or_fragment_variable(
 
 
 NodeWithDirective: TypeAlias = (
-    EnumValueDefinitionNode
+    DirectiveDefinitionNode
+    | DirectiveExtensionNode
+    | EnumValueDefinitionNode
     | ExecutableDefinitionNode
     | FieldDefinitionNode
     | InputValueDefinitionNode

src/graphql/language/__init__.py

@@ -101,6 +101,7 @@
     UnionTypeExtensionNode,
     EnumTypeExtensionNode,
     InputObjectTypeExtensionNode,
+    DirectiveExtensionNode,
     SchemaCoordinateNode,
     TypeCoordinateNode,
     MemberCoordinateNode,
@@ -142,6 +143,7 @@
     "DirectiveArgumentCoordinateNode",
     "DirectiveCoordinateNode",
     "DirectiveDefinitionNode",
+    "DirectiveExtensionNode",
     "DirectiveLocation",
     "DirectiveNode",
     "DocumentNode",

src/graphql/language/ast.py

@@ -32,6 +32,7 @@
     "DirectiveArgumentCoordinateNode",
     "DirectiveCoordinateNode",
     "DirectiveDefinitionNode",
+    "DirectiveExtensionNode",
     "DirectiveNode",
     "DocumentNode",
     "EnumTypeDefinitionNode",
@@ -331,8 +332,15 @@ class OperationType(Enum):
     "enum_type_definition": ("description", "name", "directives", "values"),
     "enum_value_definition": ("description", "name", "directives"),
     "input_object_type_definition": ("description", "name", "directives", "fields"),
-    "directive_definition": ("description", "name", "arguments", "locations"),
+    "directive_definition": (
+        "description",
+        "name",
+        "arguments",
+        "directives",
+        "locations",
+    ),
     "schema_extension": ("directives", "operation_types"),
+    "directive_extension": ("name", "directives"),
     "scalar_type_extension": ("name", "directives"),
     "object_type_extension": ("name", "interfaces", "directives", "fields"),
     "interface_type_extension": ("name", "interfaces", "directives", "fields"),
@@ -765,6 +773,7 @@ class DirectiveDefinitionNode(TypeSystemDefinitionNode):
     locations: tuple[NameNode, ...]
     description: StringValueNode | None = None
     arguments: tuple[InputValueDefinitionNode, ...] | None = None
+    directives: tuple[ConstDirectiveNode, ...] | None = None
     repeatable: bool = False
 
 
@@ -777,7 +786,15 @@ class SchemaExtensionNode(Node):
     operation_types: tuple[OperationTypeDefinitionNode, ...] | None = None
 
 
-TypeSystemExtensionNode: TypeAlias = SchemaExtensionNode | TypeExtensionNode
+@node_class
+class DirectiveExtensionNode(Node):
+    name: NameNode
+    directives: tuple[ConstDirectiveNode, ...] | None = None
+
+
+TypeSystemExtensionNode: TypeAlias = (
+    SchemaExtensionNode | TypeExtensionNode | DirectiveExtensionNode
+)
 
 
 # Type Extension nodes

src/graphql/language/directive_locations.py

@@ -31,3 +31,4 @@ class DirectiveLocation(Enum):
     ENUM_VALUE = "enum value"
     INPUT_OBJECT = "input object"
     INPUT_FIELD_DEFINITION = "input field definition"
+    DIRECTIVE_DEFINITION = "directive definition"

src/graphql/language/parser.py

@@ -17,6 +17,7 @@
     DirectiveArgumentCoordinateNode,
     DirectiveCoordinateNode,
     DirectiveDefinitionNode,
+    DirectiveExtensionNode,
     DirectiveNode,
     DocumentNode,
     EnumTypeDefinitionNode,
@@ -96,6 +97,7 @@ def parse(
     no_location: bool = False,
     max_tokens: int | None = None,
     experimental_fragment_arguments: bool = False,
+    experimental_directives_on_directive_definitions: bool = False,
 ) -> DocumentNode:
     """Given a GraphQL source, parse it into a Document.
 
@@ -130,12 +132,23 @@ def parse(
         fragment A($var: Boolean = false) on T {
           ...B(x: $var)
         }
+
+    Experimental feature:
+
+    If ``experimental_directives_on_directive_definitions`` is set to ``True``, the
+    parser will understand and parse directives on directive definitions. This syntax
+    is not part of the GraphQL specification and may change. For example::
+
+        directive @foo @bar on FIELD
     """
     parser = Parser(
         source,
         no_location=no_location,
         max_tokens=max_tokens,
         experimental_fragment_arguments=experimental_fragment_arguments,
+        experimental_directives_on_directive_definitions=(
+            experimental_directives_on_directive_definitions
+        ),
     )
     return parser.parse_document()
 
@@ -145,6 +158,7 @@ def parse_value(
     no_location: bool = False,
     max_tokens: int | None = None,
     experimental_fragment_arguments: bool = False,
+    experimental_directives_on_directive_definitions: bool = False,
 ) -> ValueNode:
     """Parse the AST for a given string containing a GraphQL value.
 
@@ -158,6 +172,9 @@ def parse_value(
         no_location=no_location,
         max_tokens=max_tokens,
         experimental_fragment_arguments=experimental_fragment_arguments,
+        experimental_directives_on_directive_definitions=(
+            experimental_directives_on_directive_definitions
+        ),
     )
     parser.expect_token(TokenKind.SOF)
     value = parser.parse_value_literal(False)
@@ -170,6 +187,7 @@ def parse_const_value(
     no_location: bool = False,
     max_tokens: int | None = None,
     experimental_fragment_arguments: bool = False,
+    experimental_directives_on_directive_definitions: bool = False,
 ) -> ConstValueNode:
     """Parse the AST for a given string containing a GraphQL constant value.
 
@@ -181,6 +199,9 @@ def parse_const_value(
         no_location=no_location,
         max_tokens=max_tokens,
         experimental_fragment_arguments=experimental_fragment_arguments,
+        experimental_directives_on_directive_definitions=(
+            experimental_directives_on_directive_definitions
+        ),
     )
     parser.expect_token(TokenKind.SOF)
     value = parser.parse_const_value_literal()
@@ -193,6 +214,7 @@ def parse_type(
     no_location: bool = False,
     max_tokens: int | None = None,
     experimental_fragment_arguments: bool = False,
+    experimental_directives_on_directive_definitions: bool = False,
 ) -> TypeNode:
     """Parse the AST for a given string containing a GraphQL Type.
 
@@ -209,6 +231,9 @@ def parse_type(
         no_location=no_location,
         max_tokens=max_tokens,
         experimental_fragment_arguments=experimental_fragment_arguments,
+        experimental_directives_on_directive_definitions=(
+            experimental_directives_on_directive_definitions
+        ),
     )
     parser.expect_token(TokenKind.SOF)
     type_ = parser.parse_type_reference()
@@ -258,6 +283,7 @@ class Parser:
     _no_location: bool
     _max_tokens: int | None
     _experimental_fragment_arguments: bool
+    _experimental_directives_on_directive_definitions: bool
     _lexer: Lexer
     _token_counter: int
 
@@ -267,6 +293,7 @@ def __init__(
         no_location: bool = False,
         max_tokens: int | None = None,
         experimental_fragment_arguments: bool = False,
+        experimental_directives_on_directive_definitions: bool = False,
         lexer: Lexer | None = None,
     ) -> None:
         if not is_source(source):
@@ -275,6 +302,9 @@ def __init__(
         self._no_location = no_location
         self._max_tokens = max_tokens
         self._experimental_fragment_arguments = experimental_fragment_arguments
+        self._experimental_directives_on_directive_definitions = (
+            experimental_directives_on_directive_definitions
+        )
         # You may override the lexer used to lex the source; this is used by schema
         # coordinates to introduce a lexer with a restricted syntax.
         self._lexer = lexer if lexer is not None else Lexer(source)
@@ -754,6 +784,11 @@ def parse_type_system_extension(self) -> TypeSystemExtensionNode:
             )
             if method_name:  # pragma: no cover
                 return getattr(self, f"parse_{method_name}")()
+            if (
+                keyword_token.value == "directive"
+                and self._experimental_directives_on_directive_definitions
+            ):
+                return self.parse_directive_definition_extension()
         raise self.unexpected(keyword_token)
 
     def peek_description(self) -> bool:
@@ -1105,6 +1140,22 @@ def parse_input_object_type_extension(self) -> InputObjectTypeExtensionNode:
             name=name, directives=directives, fields=fields, loc=self.loc(start)
         )
 
+    def parse_directive_definition_extension(self) -> DirectiveExtensionNode:
+        """DirectiveDefinitionExtension"""
+        start = self._lexer.token
+        self.expect_keyword("extend")
+        self.expect_keyword("directive")
+        self.expect_token(TokenKind.AT)
+        name = self.parse_name()
+        directives = self.parse_const_directives()
+        if not directives:
+            raise self.unexpected()
+        return DirectiveExtensionNode(
+            name=name,
+            directives=directives,
+            loc=self.loc(start),
+        )
+
     def parse_directive_definition(self) -> DirectiveDefinitionNode:
         """DirectiveDefinition"""
         start = self._lexer.token
@@ -1113,13 +1164,19 @@ def parse_directive_definition(self) -> DirectiveDefinitionNode:
         self.expect_token(TokenKind.AT)
         name = self.parse_name()
         args = self.parse_argument_defs()
+        directives = (
+            self.parse_const_directives()
+            if self._experimental_directives_on_directive_definitions
+            else None
+        )
         repeatable = self.expect_optional_keyword("repeatable")
         self.expect_keyword("on")
         locations = self.parse_directive_locations()
         return DirectiveDefinitionNode(
             description=description,
             name=name,
             arguments=args,
+            directives=directives,
             repeatable=repeatable,
             locations=locations,
             loc=self.loc(start),

src/graphql/language/predicates.py

@@ -9,6 +9,7 @@
     DefinitionNode,
     DirectiveArgumentCoordinateNode,
     DirectiveCoordinateNode,
+    DirectiveExtensionNode,
     ExecutableDefinitionNode,
     ListValueNode,
     MemberCoordinateNode,
@@ -102,9 +103,11 @@ def is_type_definition_node(node: Node) -> TypeGuard[TypeDefinitionNode]:
 
 def is_type_system_extension_node(
     node: Node,
-) -> TypeGuard[SchemaExtensionNode | TypeExtensionNode]:
+) -> TypeGuard[SchemaExtensionNode | DirectiveExtensionNode | TypeExtensionNode]:
     """Check whether the given node represents a type system extension."""
-    return isinstance(node, (SchemaExtensionNode, TypeExtensionNode))
+    return isinstance(
+        node, (SchemaExtensionNode, DirectiveExtensionNode, TypeExtensionNode)
+    )
 
 
 def is_type_extension_node(node: Node) -> TypeGuard[TypeExtensionNode]:

src/graphql/language/printer.py

@@ -343,11 +343,12 @@ def leave_directive_definition(node: PrintedNode, *_args: Any) -> str:
             if has_multiline_items(args)
             else wrap("(", join(args, ", "), ")")
         )
+        directives = wrap(" ", join(node.directives, " "))
         repeatable = " repeatable" if node.repeatable else ""
         locations = join(node.locations, " | ")
         return (
             wrap("", node.description, "\n")
-            + f"directive @{node.name}{args}{repeatable} on {locations}"
+            + f"directive @{node.name}{args}{directives}{repeatable} on {locations}"
         )
 
     @staticmethod
@@ -357,6 +358,10 @@ def leave_schema_extension(node: PrintedNode, *_args: Any) -> str:
             " ",
         )
 
+    @staticmethod
+    def leave_directive_extension(node: PrintedNode, *_args: Any) -> str:
+        return join((f"extend directive @{node.name}", join(node.directives, " ")), " ")
+
     @staticmethod
     def leave_scalar_type_extension(node: PrintedNode, *_args: Any) -> str:
         return join(("extend scalar", node.name, join(node.directives, " ")), " ")