schema_printer: preserve order of types

Replicates graphql/graphql-js@057510b

Author: Cito

src/graphql/utilities/extend_schema.py

@@ -623,13 +623,12 @@ def build_type(ast_node: TypeDefinitionNode) -> GraphQLNamedType:
             return build_function(ast_node)
 
     type_map: Dict[str, GraphQLNamedType] = {}
+    for existing_type in schema_kwargs["types"]:
+        type_map[existing_type.name] = extend_named_type(existing_type)
     for type_node in type_defs:
         name = type_node.name.value
         type_map[name] = std_type_map.get(name) or build_type(type_node)
 
-    for existing_type in schema_kwargs["types"]:
-        type_map[existing_type.name] = extend_named_type(existing_type)
-
     # Get the extended root operation types.
     operation_types: Dict[OperationType, GraphQLNamedType] = {}
     for operation_type in OperationType:

src/graphql/utilities/schema_printer.py

@@ -55,15 +55,14 @@ def print_filtered_schema(
     type_filter: Callable[[GraphQLNamedType], bool],
 ) -> str:
     directives = filter(directive_filter, schema.directives)
-    type_map = schema.type_map
-    types = filter(type_filter, map(type_map.get, sorted(type_map)))  # type: ignore
+    types = filter(type_filter, schema.type_map.values())
 
     return (
         "\n\n".join(
             chain(
                 filter(None, [print_schema_definition(schema)]),
                 (print_directive(directive) for directive in directives),
-                (print_type(type_) for type_ in types),  # type: ignore
+                (print_type(type_) for type_ in types),
             )
         )
         + "\n"

tests/type/test_schema.py

@@ -109,6 +109,11 @@ def define_sample_schema():
 
         assert print_schema(schema) == dedent(
             """
+            type Query {
+              article(id: String): Article
+              feed: [Article]
+            }
+
             type Article {
               id: String
               isPublished: Boolean
@@ -134,11 +139,6 @@ def define_sample_schema():
               writeArticle: Article
             }
 
-            type Query {
-              article(id: String): Article
-              feed: [Article]
-            }
-
             type Subscription {
               articleSubscribe(id: String): Article
             }

tests/utilities/test_extend_schema.py

@@ -658,15 +658,15 @@ def extends_objects_by_adding_new_fields_with_arguments():
         assert validate_schema(extended_schema) == []
         assert print_schema_changes(schema, extended_schema) == dedent(
             """
+            type SomeObject {
+              newField(arg1: String, arg2: NewInputObj!): String
+            }
+
             input NewInputObj {
               field1: Int
               field2: [Float]
               field3: String!
             }
-
-            type SomeObject {
-              newField(arg1: String, arg2: NewInputObj!): String
-            }
             """
         )
 
@@ -778,8 +778,7 @@ def extends_objects_by_including_new_types():
         assert validate_schema(extended_schema) == []
 
         assert print_schema_changes(schema, extended_schema) == dedent(
-            new_types_sdl
-            + """
+            """
             type SomeObject {
               oldField: String
               newObject: NewObject
@@ -788,8 +787,8 @@ def extends_objects_by_including_new_types():
               newScalar: NewScalar
               newEnum: NewEnum
               newTree: [SomeObject]!
-            }
-            """
+            }\n"""
+            + new_types_sdl
         )
 
     def extends_objects_by_adding_implemented_new_interfaces():
@@ -824,12 +823,12 @@ def extends_objects_by_adding_implemented_new_interfaces():
         assert validate_schema(extended_schema) == []
         assert print_schema_changes(schema, extended_schema) == dedent(
             """
-            interface NewInterface {
+            type SomeObject implements OldInterface & NewInterface {
+              oldField: String
               newField: String
             }
 
-            type SomeObject implements OldInterface & NewInterface {
-              oldField: String
+            interface NewInterface {
               newField: String
             }
             """
@@ -917,28 +916,27 @@ def extends_different_types_multiple_times():
 
         assert validate_schema(extended_schema) == []
         assert print_schema_changes(schema, extended_schema) == dedent(
-            new_types_sdl
-            + """
+            """
+            type SomeObject implements SomeInterface & NewInterface & AnotherNewInterface {
+              oldField: String
+              newField: String
+              anotherNewField: String
+            }
+
             enum SomeEnum {
               OLD_VALUE
               NEW_VALUE
               ANOTHER_NEW_VALUE
             }
 
-            input SomeInput {
-              oldField: String
-              newField: String
-              anotherNewField: String
-            }
+            union SomeUnion = SomeObject | NewObject | AnotherNewObject
 
-            type SomeObject implements SomeInterface & NewInterface & AnotherNewInterface {
+            input SomeInput {
               oldField: String
               newField: String
               anotherNewField: String
-            }
-
-            union SomeUnion = SomeObject | NewObject | AnotherNewObject
-            """  # noqa: E501
+            }\n"""  # noqa: E501
+            + new_types_sdl
         )
 
     def extends_interfaces_by_adding_new_fields():
@@ -981,12 +979,12 @@ def extends_interfaces_by_adding_new_fields():
         assert validate_schema(extended_schema) == []
         assert print_schema_changes(schema, extended_schema) == dedent(
             """
-            interface AnotherInterface implements SomeInterface {
+            interface SomeInterface {
               oldField: String
               newField: String
             }
 
-            interface SomeInterface {
+            interface AnotherInterface implements SomeInterface {
               oldField: String
               newField: String
             }
@@ -1043,12 +1041,12 @@ def extends_interfaces_by_adding_new_implemented_interfaces():
               newField: String
             }
 
-            interface NewInterface {
+            type SomeObject implements SomeInterface & AnotherInterface & NewInterface {
+              oldField: String
               newField: String
             }
 
-            type SomeObject implements SomeInterface & AnotherInterface & NewInterface {
-              oldField: String
+            interface NewInterface {
               newField: String
             }
             """
@@ -1162,16 +1160,16 @@ def may_extend_mutations_and_subscriptions():
         assert print_schema(mutation_schema) == original_print
         assert print_schema(extended_schema) == dedent(
             """
-            type Mutation {
-              mutationField: String
-              newMutationField: Int
-            }
-
             type Query {
               queryField: String
               newQueryField: Int
             }
 
+            type Mutation {
+              mutationField: String
+              newMutationField: Int
+            }
+
             type Subscription {
               subscriptionField: String
               newSubscriptionField: Int