Change to_kwargs() to always return extension_ast_nodes as list

Replicates graphql/graphql-js@9f8c284

Author: Cito

src/graphql/type/definition.py

@@ -249,7 +249,7 @@ def to_kwargs(self) -> Dict[str, Any]:
             description=self.description,
             extensions=self.extensions,
             ast_node=self.ast_node,
-            extension_ast_nodes=self.extension_ast_nodes,
+            extension_ast_nodes=self.extension_ast_nodes or FrozenList(),
         )
 
 

src/graphql/type/schema.py

@@ -276,7 +276,7 @@ def to_kwargs(self) -> Dict[str, Any]:
             description=self.description,
             extensions=self.extensions,
             ast_node=self.ast_node,
-            extension_ast_nodes=self.extension_ast_nodes,
+            extension_ast_nodes=self.extension_ast_nodes or FrozenList(),
             assume_valid=self._validation_errors is not None,
         )
 

src/graphql/utilities/extend_schema.py

@@ -40,7 +40,7 @@
     UnionTypeDefinitionNode,
     UnionTypeExtensionNode,
 )
-from ..pyutils import inspect, FrozenList
+from ..pyutils import inspect
 from ..type import (
     GraphQLArgument,
     GraphQLArgumentMap,
@@ -248,8 +248,7 @@ def extend_input_object_type(
                     },
                     **build_input_field_map(extensions),
                 },
-                "extension_ast_nodes": (kwargs["extension_ast_nodes"] or [])
-                + extensions,
+                "extension_ast_nodes": kwargs["extension_ast_nodes"] + extensions,
             }
         )
 
@@ -261,8 +260,7 @@ def extend_enum_type(type_: GraphQLEnumType) -> GraphQLEnumType:
             **{
                 **kwargs,
                 "values": {**kwargs["values"], **build_enum_value_map(extensions)},
-                "extension_ast_nodes": (kwargs["extension_ast_nodes"] or [])
-                + extensions,
+                "extension_ast_nodes": kwargs["extension_ast_nodes"] + extensions,
             }
         )
 
@@ -273,8 +271,7 @@ def extend_scalar_type(type_: GraphQLScalarType) -> GraphQLScalarType:
         return GraphQLScalarType(
             **{
                 **kwargs,
-                "extension_ast_nodes": (kwargs["extension_ast_nodes"] or [])
-                + extensions,
+                "extension_ast_nodes": kwargs["extension_ast_nodes"] + extensions,
             }
         )
 
@@ -298,8 +295,7 @@ def extend_object_type(type_: GraphQLObjectType) -> GraphQLObjectType:
                     },
                     **build_field_map(extensions),
                 },
-                "extension_ast_nodes": (kwargs["extension_ast_nodes"] or [])
-                + extensions,
+                "extension_ast_nodes": kwargs["extension_ast_nodes"] + extensions,
             }
         )
 
@@ -323,8 +319,7 @@ def extend_interface_type(type_: GraphQLInterfaceType) -> GraphQLInterfaceType:
                     },
                     **build_field_map(extensions),
                 },
-                "extension_ast_nodes": (kwargs["extension_ast_nodes"] or [])
-                + extensions,
+                "extension_ast_nodes": kwargs["extension_ast_nodes"] + extensions,
             }
         )
 
@@ -340,8 +335,7 @@ def extend_union_type(type_: GraphQLUnionType) -> GraphQLUnionType:
                     for member_type in kwargs["types"]
                 ]
                 + build_union_types(extensions),
-                "extension_ast_nodes": (kwargs["extension_ast_nodes"] or [])
-                + extensions,
+                "extension_ast_nodes": kwargs["extension_ast_nodes"] + extensions,
             }
         )
 
@@ -657,14 +651,7 @@ def build_type(ast_node: TypeDefinitionNode) -> GraphQLNamedType:
         else None,
         "extensions": None,
         "ast_node": schema_def or schema_kwargs["ast_node"],
-        "extension_ast_nodes": (
-            (
-                schema_kwargs["extension_ast_nodes"]
-                or cast(FrozenList[SchemaExtensionNode], FrozenList())
-            )
-            + schema_extensions
-        )
-        or None,
+        "extension_ast_nodes": schema_kwargs["extension_ast_nodes"] + schema_extensions,
         "assume_valid": assume_valid,
     }
 

tests/type/test_definition.py

@@ -73,7 +73,7 @@ def defines_a_scalar_type():
             "parse_literal": None,
             "extensions": None,
             "ast_node": None,
-            "extension_ast_nodes": None,
+            "extension_ast_nodes": [],
         }
 
     def accepts_a_scalar_type_defining_serialize():
@@ -688,7 +688,7 @@ def defines_an_interface_type():
             "resolve_type": None,
             "extensions": None,
             "ast_node": None,
-            "extension_ast_nodes": None,
+            "extension_ast_nodes": [],
         }
 
     def accepts_an_interface_type_defining_resolve_type():

tests/type/test_schema.py

@@ -106,7 +106,7 @@ def define_sample_schema():
             "description": "Sample schema",
             "extensions": None,
             "ast_node": None,
-            "extension_ast_nodes": None,
+            "extension_ast_nodes": [],
             "assume_valid": False,
         }