Use type aliases for more clarity

Author: Cito

src/graphql/error/graphql_error.py

@@ -6,6 +6,10 @@
     from typing import TypedDict
 except ImportError:  # Python < 3.8
     from typing_extensions import TypedDict
+try:
+    from typing import TypeAlias
+except ImportError:  # Python < 3.10
+    from typing_extensions import TypeAlias
 
 if TYPE_CHECKING:
     from ..language.ast import Node  # noqa: F401
@@ -19,7 +23,7 @@
 
 
 # Custom extensions
-GraphQLErrorExtensions = Dict[str, Any]
+GraphQLErrorExtensions: TypeAlias = Dict[str, Any]
 # Use a unique identifier name for your extension, for example the name of
 # your library or project. Do not use a shortened identifier as this increases
 # the risk of conflicts. We recommend you add at most one extension key,

src/graphql/execution/execute.py

@@ -24,9 +24,9 @@
 except ImportError:  # Python < 3.8
     from typing_extensions import TypedDict
 try:
-    from typing import TypeGuard
+    from typing import TypeAlias, TypeGuard
 except ImportError:  # Python < 3.10
-    from typing_extensions import TypeGuard
+    from typing_extensions import TypeAlias, TypeGuard
 
 from ..error import GraphQLError, GraphQLFormattedError, located_error
 from ..language import (
@@ -170,7 +170,7 @@ def __ne__(self, other: Any) -> bool:
         return not self == other
 
 
-Middleware = Optional[Union[Tuple, List, MiddlewareManager]]
+Middleware: TypeAlias = Optional[Union[Tuple, List, MiddlewareManager]]
 
 
 class ExecutionContext:

src/graphql/execution/middleware.py

@@ -3,9 +3,15 @@
 from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple
 
 
+try:
+    from typing import TypeAlias
+except ImportError:  # Python < 3.10
+    from typing_extensions import TypeAlias
+
+
 __all__ = ["MiddlewareManager"]
 
-GraphQLFieldResolver = Callable[..., Any]
+GraphQLFieldResolver: TypeAlias = Callable[..., Any]
 
 
 class MiddlewareManager:

src/graphql/execution/values.py

@@ -30,10 +30,16 @@
 from ..utilities.value_from_ast import value_from_ast
 
 
+try:
+    from typing import TypeAlias
+except ImportError:  # Python < 3.10
+    from typing_extensions import TypeAlias
+
+
 __all__ = ["get_argument_values", "get_directive_values", "get_variable_values"]
 
 
-CoercedVariableValues = Union[List[GraphQLError], Dict[str, Any]]
+CoercedVariableValues: TypeAlias = Union[List[GraphQLError], Dict[str, Any]]
 
 
 def get_variable_values(
@@ -209,7 +215,7 @@ def get_argument_values(
     return coerced_values
 
 
-NodeWithDirective = Union[
+NodeWithDirective: TypeAlias = Union[
     EnumValueDefinitionNode,
     ExecutableDefinitionNode,
     FieldDefinitionNode,

src/graphql/language/ast.py

@@ -9,6 +9,12 @@
 from .token_kind import TokenKind
 
 
+try:
+    from typing import TypeAlias
+except ImportError:  # Python < 3.10
+    from typing_extensions import TypeAlias
+
+
 __all__ = [
     "Location",
     "Token",
@@ -582,7 +588,7 @@ class ConstObjectFieldNode(ObjectFieldNode):
     value: ConstValueNode
 
 
-ConstValueNode = Union[
+ConstValueNode: TypeAlias = Union[
     IntValueNode,
     FloatValueNode,
     StringValueNode,
@@ -771,7 +777,7 @@ class TypeExtensionNode(TypeSystemDefinitionNode):
     directives: Tuple[ConstDirectiveNode, ...]
 
 
-TypeSystemExtensionNode = Union[SchemaExtensionNode, TypeExtensionNode]
+TypeSystemExtensionNode: TypeAlias = Union[SchemaExtensionNode, TypeExtensionNode]
 
 
 class ScalarTypeExtensionNode(TypeExtensionNode):

src/graphql/language/parser.py

@@ -64,11 +64,17 @@
 from .token_kind import TokenKind
 
 
+try:
+    from typing import TypeAlias
+except ImportError:  # Python < 3.10
+    from typing_extensions import TypeAlias
+
+
 __all__ = ["parse", "parse_type", "parse_value", "parse_const_value"]
 
 T = TypeVar("T")
 
-SourceType = Union[Source, str]
+SourceType: TypeAlias = Union[Source, str]
 
 
 def parse(

src/graphql/language/printer.py

@@ -6,12 +6,18 @@
 from .visitor import Visitor, visit
 
 
+try:
+    from typing import TypeAlias
+except ImportError:  # Python < 3.10
+    from typing_extensions import TypeAlias
+
+
 __all__ = ["print_ast"]
 
 
 MAX_LINE_LENGTH = 80
 
-Strings = Collection[str]
+Strings: TypeAlias = Collection[str]
 
 
 class PrintedNode:

src/graphql/language/visitor.py

@@ -17,6 +17,12 @@
 from .ast import QUERY_DOCUMENT_KEYS, Node
 
 
+try:
+    from typing import TypeAlias
+except ImportError:  # Python < 3.10
+    from typing_extensions import TypeAlias
+
+
 __all__ = [
     "Visitor",
     "ParallelVisitor",
@@ -41,7 +47,7 @@ class VisitorActionEnum(Enum):
     REMOVE = Ellipsis
 
 
-VisitorAction = Optional[VisitorActionEnum]
+VisitorAction: TypeAlias = Optional[VisitorActionEnum]
 
 # Note that in GraphQL.js these are defined differently:
 # BREAK = {}, SKIP = false, REMOVE = null, IDLE = undefined
@@ -51,7 +57,7 @@ class VisitorActionEnum(Enum):
 REMOVE = VisitorActionEnum.REMOVE
 IDLE = None
 
-VisitorKeyMap = Dict[str, Tuple[str, ...]]
+VisitorKeyMap: TypeAlias = Dict[str, Tuple[str, ...]]
 
 
 class EnterLeaveVisitor(NamedTuple):

src/graphql/pyutils/awaitable_or_value.py

@@ -1,9 +1,15 @@
 from typing import Awaitable, TypeVar, Union
 
 
+try:
+    from typing import TypeAlias
+except ImportError:  # Python < 3.10
+    from typing_extensions import TypeAlias
+
+
 __all__ = ["AwaitableOrValue"]
 
 
 T = TypeVar("T")
 
-AwaitableOrValue = Union[Awaitable[T], T]
+AwaitableOrValue: TypeAlias = Union[Awaitable[T], T]

src/graphql/type/definition.py

@@ -66,9 +66,9 @@
 except ImportError:  # Python < 3.8
     from typing_extensions import TypedDict
 try:
-    from typing import TypeGuard
+    from typing import TypeAlias, TypeGuard
 except ImportError:  # Python < 3.10
-    from typing_extensions import TypeGuard
+    from typing_extensions import TypeAlias, TypeGuard
 
 if TYPE_CHECKING:
     from .schema import GraphQLSchema  # noqa: F401
@@ -311,9 +311,9 @@ def __copy__(self) -> GraphQLNamedType:  # pragma: no cover
 
 T = TypeVar("T")
 
-ThunkCollection = Union[Callable[[], Collection[T]], Collection[T]]
-ThunkMapping = Union[Callable[[], Mapping[str, T]], Mapping[str, T]]
-Thunk = Union[Callable[[], T], T]
+ThunkCollection: TypeAlias = Union[Callable[[], Collection[T]], Collection[T]]
+ThunkMapping: TypeAlias = Union[Callable[[], Mapping[str, T]], Mapping[str, T]]
+Thunk: TypeAlias = Union[Callable[[], T], T]
 
 
 def resolve_thunk(thunk: Thunk[T]) -> T:
@@ -325,9 +325,11 @@ def resolve_thunk(thunk: Thunk[T]) -> T:
     return thunk() if callable(thunk) else thunk
 
 
-GraphQLScalarSerializer = Callable[[Any], Any]
-GraphQLScalarValueParser = Callable[[Any], Any]
-GraphQLScalarLiteralParser = Callable[[ValueNode, Optional[Dict[str, Any]]], Any]
+GraphQLScalarSerializer: TypeAlias = Callable[[Any], Any]
+GraphQLScalarValueParser: TypeAlias = Callable[[Any], Any]
+GraphQLScalarLiteralParser: TypeAlias = Callable[
+    [ValueNode, Optional[Dict[str, Any]]], Any
+]
 
 
 class GraphQLScalarTypeKwargs(GraphQLNamedTypeKwargs, total=False):
@@ -490,7 +492,7 @@ def assert_scalar_type(type_: Any) -> GraphQLScalarType:
     return type_
 
 
-GraphQLArgumentMap = Dict[str, "GraphQLArgument"]
+GraphQLArgumentMap: TypeAlias = Dict[str, "GraphQLArgument"]
 
 
 class GraphQLFieldKwargs(TypedDict, total=False):
@@ -633,23 +635,25 @@ class GraphQLResolveInfo(NamedTuple):
 # Note: Contrary to the Javascript implementation of GraphQLFieldResolver,
 # the context is passed as part of the GraphQLResolveInfo and any arguments
 # are passed individually as keyword arguments.
-GraphQLFieldResolverWithoutArgs = Callable[[Any, GraphQLResolveInfo], Any]
+GraphQLFieldResolverWithoutArgs: TypeAlias = Callable[[Any, GraphQLResolveInfo], Any]
 # Unfortunately there is currently no syntax to indicate optional or keyword
 # arguments in Python, so we also allow any other Callable as a workaround:
-GraphQLFieldResolver = Callable[..., Any]
+GraphQLFieldResolver: TypeAlias = Callable[..., Any]
 
 # Note: Contrary to the Javascript implementation of GraphQLTypeResolver,
 # the context is passed as part of the GraphQLResolveInfo:
-GraphQLTypeResolver = Callable[
+GraphQLTypeResolver: TypeAlias = Callable[
     [Any, GraphQLResolveInfo, "GraphQLAbstractType"],
     AwaitableOrValue[Optional[str]],
 ]
 
 # Note: Contrary to the Javascript implementation of GraphQLIsTypeOfFn,
 # the context is passed as part of the GraphQLResolveInfo:
-GraphQLIsTypeOfFn = Callable[[Any, GraphQLResolveInfo], AwaitableOrValue[bool]]
+GraphQLIsTypeOfFn: TypeAlias = Callable[
+    [Any, GraphQLResolveInfo], AwaitableOrValue[bool]
+]
 
-GraphQLFieldMap = Dict[str, GraphQLField]
+GraphQLFieldMap: TypeAlias = Dict[str, GraphQLField]
 
 
 class GraphQLArgumentKwargs(TypedDict, total=False):
@@ -1121,7 +1125,7 @@ def assert_union_type(type_: Any) -> GraphQLUnionType:
     return type_
 
 
-GraphQLEnumValueMap = Dict[str, "GraphQLEnumValue"]
+GraphQLEnumValueMap: TypeAlias = Dict[str, "GraphQLEnumValue"]
 
 
 class GraphQLEnumTypeKwargs(GraphQLNamedTypeKwargs, total=False):
@@ -1381,7 +1385,7 @@ def __copy__(self) -> GraphQLEnumValue:  # pragma: no cover
         return self.__class__(**self.to_kwargs())
 
 
-GraphQLInputFieldMap = Dict[str, "GraphQLInputField"]
+GraphQLInputFieldMap: TypeAlias = Dict[str, "GraphQLInputField"]
 GraphQLInputFieldOutType = Callable[[Dict[str, Any]], Any]
 
 
@@ -1698,7 +1702,7 @@ def assert_non_null_type(type_: Any) -> GraphQLNonNull:
     GraphQLList,
 )
 
-GraphQLNullableType = Union[
+GraphQLNullableType: TypeAlias = Union[
     GraphQLScalarType,
     GraphQLObjectType,
     GraphQLInterfaceType,
@@ -1747,7 +1751,7 @@ def get_nullable_type(
 
 graphql_input_types = (GraphQLScalarType, GraphQLEnumType, GraphQLInputObjectType)
 
-GraphQLInputType = Union[
+GraphQLInputType: TypeAlias = Union[
     GraphQLScalarType, GraphQLEnumType, GraphQLInputObjectType, GraphQLWrappingType
 ]
 
@@ -1774,7 +1778,7 @@ def assert_input_type(type_: Any) -> GraphQLInputType:
     GraphQLEnumType,
 )
 
-GraphQLOutputType = Union[
+GraphQLOutputType: TypeAlias = Union[
     GraphQLScalarType,
     GraphQLObjectType,
     GraphQLInterfaceType,
@@ -1798,11 +1802,11 @@ def assert_output_type(type_: Any) -> GraphQLOutputType:
 
 # These named types do not include modifiers like List or NonNull.
 
-GraphQLNamedInputType = Union[
+GraphQLNamedInputType: TypeAlias = Union[
     GraphQLScalarType, GraphQLEnumType, GraphQLInputObjectType
 ]
 
-GraphQLNamedOutputType = Union[
+GraphQLNamedOutputType: TypeAlias = Union[
     GraphQLScalarType,
     GraphQLObjectType,
     GraphQLInterfaceType,
@@ -1845,7 +1849,7 @@ def get_named_type(type_: Optional[GraphQLType]) -> Optional[GraphQLNamedType]:
 
 graphql_leaf_types = (GraphQLScalarType, GraphQLEnumType)
 
-GraphQLLeafType = Union[GraphQLScalarType, GraphQLEnumType]
+GraphQLLeafType: TypeAlias = Union[GraphQLScalarType, GraphQLEnumType]
 
 
 def is_leaf_type(type_: Any) -> TypeGuard[GraphQLLeafType]:
@@ -1862,7 +1866,9 @@ def assert_leaf_type(type_: Any) -> GraphQLLeafType:
 
 graphql_composite_types = (GraphQLObjectType, GraphQLInterfaceType, GraphQLUnionType)
 
-GraphQLCompositeType = Union[GraphQLObjectType, GraphQLInterfaceType, GraphQLUnionType]
+GraphQLCompositeType: TypeAlias = Union[
+    GraphQLObjectType, GraphQLInterfaceType, GraphQLUnionType
+]
 
 
 def is_composite_type(type_: Any) -> TypeGuard[GraphQLCompositeType]:
@@ -1879,7 +1885,7 @@ def assert_composite_type(type_: Any) -> GraphQLType:
 
 graphql_abstract_types = (GraphQLInterfaceType, GraphQLUnionType)
 
-GraphQLAbstractType = Union[GraphQLInterfaceType, GraphQLUnionType]
+GraphQLAbstractType: TypeAlias = Union[GraphQLInterfaceType, GraphQLUnionType]
 
 
 def is_abstract_type(type_: Any) -> TypeGuard[GraphQLAbstractType]: