is_valid_name_error: Remove node argument

Replicates graphql/graphql-js@d72cd3d

Author: Cito

src/graphql/error/located_error.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Collection, Union
+from typing import TYPE_CHECKING, Collection, Optional, Union
 
 from .graphql_error import GraphQLError
 
@@ -10,8 +10,8 @@
 
 def located_error(
     original_error: Union[Exception, GraphQLError],
-    nodes: Collection["Node"],
-    path: Collection[Union[str, int]],
+    nodes: Optional[Union["None", Collection["Node"]]],
+    path: Optional[Collection[Union[str, int]]] = None,
 ) -> GraphQLError:
     """Located GraphQL Error
 
@@ -26,18 +26,22 @@ def located_error(
     if isinstance(original_error, GraphQLError) and original_error.path is not None:
         return original_error
     try:
+        # noinspection PyUnresolvedReferences
         message = original_error.message  # type: ignore
     except AttributeError:
         message = str(original_error)
     try:
+        # noinspection PyUnresolvedReferences
         source = original_error.source  # type: ignore
     except AttributeError:
         source = None
     try:
+        # noinspection PyUnresolvedReferences
         positions = original_error.positions  # type: ignore
     except AttributeError:
         positions = None
     try:
+        # noinspection PyUnresolvedReferences
         nodes = original_error.nodes or nodes  # type: ignore
     except AttributeError:
         pass

src/graphql/type/validate.py

@@ -12,8 +12,7 @@
     cast,
 )
 
-
-from ..error import GraphQLError
+from ..error import GraphQLError, located_error
 from ..pyutils import inspect
 from ..language import NamedTypeNode, Node, OperationType, OperationTypeDefinitionNode
 from .definition import (
@@ -174,9 +173,9 @@ def validate_name(self, node: Any, name: Optional[str] = None) -> None:
         except AttributeError:  # pragma: no cover
             pass
         else:
-            error = is_valid_name_error(name, ast_node)
+            error = is_valid_name_error(name)
             if error:
-                self.add_error(error)
+                self.add_error(located_error(error, ast_node))
 
     def validate_types(self) -> None:
         validate_input_object_circular_refs = InputObjectCircularRefsValidator(self)

src/graphql/utilities/assert_valid_name.py

@@ -1,7 +1,6 @@
 import re
 from typing import Optional
 
-from ..language import Node
 from ..error import GraphQLError
 
 __all__ = ["assert_valid_name", "is_valid_name_error"]
@@ -18,20 +17,17 @@ def assert_valid_name(name: str) -> str:
     return name
 
 
-def is_valid_name_error(
-    name: str, node: Optional[Node] = None
-) -> Optional[GraphQLError]:
+def is_valid_name_error(name: str) -> Optional[GraphQLError]:
     """Return an Error if a name is invalid."""
     if not isinstance(name, str):
         raise TypeError("Expected name to be a string.")
     if name.startswith("__"):
         return GraphQLError(
             f"Name {name!r} must not begin with '__',"
-            " which is reserved by GraphQL introspection.",
-            node,
+            " which is reserved by GraphQL introspection."
         )
     if not re_name.match(name):
         return GraphQLError(
-            f"Names must match /^[_a-zA-Z][_a-zA-Z0-9]*$/ but {name!r} does not.", node
+            f"Names must match /^[_a-zA-Z][_a-zA-Z0-9]*$/ but {name!r} does not."
         )
     return None