Make all "not reachable" look and work the same

Replicates graphql/graphql-js@d55f6d3

Author: Cito

graphql/execution/execute.py

@@ -26,7 +26,6 @@
     OperationType,
     SelectionSetNode,
 )
-from .middleware import MiddlewareManager
 from ..pyutils import inspect, is_invalid, is_nullish, MaybeAwaitable
 from ..utilities import get_operation_root_type, type_from_ast
 from ..type import (
@@ -54,6 +53,7 @@
     is_non_null_type,
     is_object_type,
 )
+from .middleware import MiddlewareManager
 from .values import get_argument_values, get_directive_values, get_variable_values
 
 __all__ = [
@@ -786,7 +786,8 @@ def complete_value(
 
         # Not reachable. All possible output types have been considered.
         raise TypeError(  # pragma: no cover
-            f"Cannot complete value of unexpected type '{inspect(return_type)}'."
+            "Cannot complete value of unexpected output type:"
+            f" '{inspect(return_type)}'."
         )
 
     def complete_list_value(

graphql/type/introspection.py

@@ -20,8 +20,9 @@
     is_scalar_type,
     is_union_type,
 )
-from .scalars import GraphQLBoolean, GraphQLString
 from ..language import DirectiveLocation, print_ast
+from ..pyutils import inspect
+from .scalars import GraphQLBoolean, GraphQLString
 
 __all__ = [
     "SchemaMetaFieldDef",
@@ -258,7 +259,9 @@ def kind(type_, _info):
             return TypeKind.LIST
         if is_non_null_type(type_):
             return TypeKind.NON_NULL
-        raise TypeError(f"Unknown kind of type: {type_}")
+
+        # Not reachable. All possible types have been considered.
+        raise TypeError(f"Unexpected type: '{inspect(type_)}'.")  # pragma: no cover
 
     @staticmethod
     def name(type_, _info):
@@ -336,39 +339,53 @@ def of_type(type_, _info):
 )
 
 
-def _resolve_input_value_default_value(item, _info):
-    # Since ast_from_value needs graphql.type, it can only be imported later
-    from ..utilities import ast_from_value
-
-    value_ast = ast_from_value(item[1].default_value, item[1].type)
-    return print_ast(value_ast) if value_ast else None
-
-
 __InputValue: GraphQLObjectType = GraphQLObjectType(
     name="__InputValue",
     description="Arguments provided to Fields or Directives and the input"
     " fields of an InputObject are represented as Input Values"
     " which describe their type and optionally a default value.",
     fields=lambda: {
         "name": GraphQLField(
-            GraphQLNonNull(GraphQLString), resolve=lambda item, _info: item[0]
+            GraphQLNonNull(GraphQLString), resolve=InputValueFieldResolvers.name
         ),
         "description": GraphQLField(
-            GraphQLString, resolve=lambda item, _info: item[1].description
+            GraphQLString, resolve=InputValueFieldResolvers.description
         ),
         "type": GraphQLField(
-            GraphQLNonNull(__Type), resolve=lambda item, _info: item[1].type
+            GraphQLNonNull(__Type), resolve=InputValueFieldResolvers.type
         ),
         "defaultValue": GraphQLField(
             GraphQLString,
             description="A GraphQL-formatted string representing"
             " the default value for this input value.",
-            resolve=_resolve_input_value_default_value,
+            resolve=InputValueFieldResolvers.default_value,
         ),
     },
 )
 
 
+class InputValueFieldResolvers:
+    @staticmethod
+    def name(item, _info):
+        return item[0]
+
+    @staticmethod
+    def description(item, _info):
+        return item[1].description
+
+    @staticmethod
+    def type(item, _info):
+        return item[1].type
+
+    @staticmethod
+    def default_value(item, _info):
+        # Since ast_from_value needs graphql.type, it can only be imported later
+        from ..utilities import ast_from_value
+
+        value_ast = ast_from_value(item[1].default_value, item[1].type)
+        return print_ast(value_ast) if value_ast else None
+
+
 __EnumValue: GraphQLObjectType = GraphQLObjectType(
     name="__EnumValue",
     description="One possible value for a given Enum. Enum values are unique"

graphql/utilities/ast_from_value.py

@@ -126,4 +126,5 @@ def ast_from_value(value: Any, type_: GraphQLInputType) -> Optional[ValueNode]:
 
         raise TypeError(f"Cannot convert value to AST: {inspect(serialized)}")
 
-    raise TypeError(f"Unknown type: {inspect(type_)}.")
+    # Not reachable. All possible input types have been considered.
+    raise TypeError(f"Unexpected input type: '{inspect(type_)}'.")  # pragma: no cover

graphql/utilities/build_ast_schema.py

@@ -24,6 +24,7 @@
     parse,
     Node,
 )
+from ..pyutils import inspect
 from ..type import (
     GraphQLArgument,
     GraphQLDeprecatedDirective,
@@ -277,12 +278,13 @@ def build_type(self, ast_node: TypeDefinitionNode) -> GraphQLNamedType:
             "scalar_type_definition": self._make_scalar_def,
             "input_object_type_definition": self._make_input_object_def,
         }.get(ast_node.kind)
-        if not method:
-            # Not reachable. All possible type definition nodes have been considered.
-            raise TypeError(  # pragma: no cover
-                f"Type kind '{ast_node.kind}' not supported."
-            )
-        return method(ast_node)  # type: ignore
+        if method:
+            return method(ast_node)  # type: ignore
+
+        # Not reachable. All possible type definition nodes have been considered.
+        raise TypeError(  # pragma: no cover
+            f"Unexpected type definition node: '{inspect(ast_node)}'."
+        )
 
     def _make_type_def(self, ast_node: ObjectTypeDefinitionNode) -> GraphQLObjectType:
         interface_nodes = ast_node.interfaces

graphql/utilities/coerce_value.py

@@ -2,7 +2,7 @@
 
 from ..error import GraphQLError, INVALID
 from ..language import Node
-from ..pyutils import is_invalid, or_list, suggestion_list
+from ..pyutils import inspect, is_invalid, or_list, suggestion_list
 from ..type import (
     GraphQLEnumType,
     GraphQLInputObjectType,
@@ -175,7 +175,8 @@ def coerce_value(
 
         return of_errors(errors) if errors else of_value(coerced_value_dict)
 
-    raise TypeError("Unexpected type: {type_}.")
+    # Not reachable. All possible input types have been considered.
+    raise TypeError(f"Unexpected input type: '{inspect(type_)}'.")  # pragma: no cover
 
 
 def of_value(value: Any) -> CoercedValue:

graphql/utilities/extend_schema.py

@@ -11,6 +11,7 @@
     TypeDefinitionNode,
     TypeExtensionNode,
 )
+from ..pyutils import inspect
 from ..type import (
     GraphQLArgument,
     GraphQLDirective,
@@ -162,8 +163,9 @@ def extend_named_type(type_: GraphQLNamedType) -> GraphQLNamedType:
         if is_input_object_type(type_):
             type_ = cast(GraphQLInputObjectType, type_)
             return extend_input_object_type(type_)
+
         # Not reachable. All possible types have been considered.
-        raise TypeError(f"Type {type_} not supported.")  # pragma: no cover
+        raise TypeError(f"Unexpected type: '{inspect(type_)}'.")  # pragma: no cover
 
     def extend_directive(directive: GraphQLDirective) -> GraphQLDirective:
         kwargs = directive.to_kwargs()

graphql/utilities/lexicographic_sort_schema.py

@@ -1,5 +1,6 @@
 from typing import Dict, List, Tuple, cast
 
+from ..pyutils import inspect
 from ..type import (
     GraphQLArgument,
     GraphQLDirective,
@@ -129,8 +130,9 @@ def sort_named_type(type_: GraphQLNamedType) -> GraphQLNamedType:
             input_object_type = cast(GraphQLInputObjectType, type_)
             kwargs.update(fields=lambda: sort_input_fields(input_object_type.fields))
             return GraphQLInputObjectType(**kwargs)
-        # Not reachable. All possible type definition nodes have been considered.
-        raise TypeError(f"Unknown type: '{type_}'")  # pragma: no cover
+
+        # Not reachable. All possible types have been considered.
+        raise TypeError(f"Unexpected type: '{inspect(type_)}'.")  # pragma: no cover
 
     type_map: Dict[str, GraphQLNamedType] = {
         type_.name: sort_named_type(type_)

graphql/utilities/schema_printer.py

@@ -139,7 +139,8 @@ def print_type(type_: GraphQLNamedType) -> str:
     if is_input_object_type(type_):
         type_ = cast(GraphQLInputObjectType, type_)
         return print_input_object(type_)
-    raise TypeError(f"Unknown type: {inspect(type_)}")
+    # Not reachable. All possible types have been considered.
+    raise TypeError(f"Unexpected type: '{inspect(type_)}'.")  # pragma: no cover
 
 
 def print_scalar(type_: GraphQLScalarType) -> str:

graphql/utilities/type_from_ast.py

@@ -1,6 +1,7 @@
 from typing import Optional, overload
 
 from ..language import TypeNode, NamedTypeNode, ListTypeNode, NonNullTypeNode
+from ..pyutils import inspect
 from ..type import (
     GraphQLType,
     GraphQLSchema,
@@ -55,4 +56,8 @@ def type_from_ast(schema, type_node):  # noqa: F811
         return GraphQLNonNull(inner_type) if inner_type else None
     if isinstance(type_node, NamedTypeNode):
         return schema.get_type(type_node.name.value)
-    raise TypeError(f"Unexpected type kind: {type_node.kind}")
+
+    # Not reachable. All possible type nodes have been considered.
+    raise TypeError(  # pragma: no cover
+        f"Unexpected type node: '{inspect(type_node)}'."
+    )

graphql/utilities/value_from_ast.py

@@ -9,7 +9,7 @@
     ValueNode,
     VariableNode,
 )
-from ..pyutils import is_invalid
+from ..pyutils import inspect, is_invalid
 from ..type import (
     GraphQLEnumType,
     GraphQLInputObjectType,
@@ -148,6 +148,9 @@ def value_from_ast(
             return INVALID
         return result
 
+    # Not reachable. All possible input types have been considered.
+    raise TypeError(f"Unexpected input type: '{inspect(type_)}'.")  # pragma: no cover
+
 
 def is_missing_variable(
     value_node: ValueNode, variables: Dict[str, Any] = None