Update some tests and update schema building code

Author: rmosolgo

lib/graphql/schema/build_from_definition.rb

@@ -120,10 +120,13 @@ def build(schema_superclass, document, default_resolve:, using: {}, relay:)
 
           builder = self
 
+          found_types = types.values
+          object_types = found_types.select { |t| t.kind.object? }
           schema_class = Class.new(schema_superclass) do
             begin
               # Add these first so that there's some chance of resolving late-bound types
-              orphan_types types.values
+              add_type_and_traverse(found_types, root: false)
+              orphan_types(object_types)
               query query_root_type
               mutation mutation_root_type
               subscription subscription_root_type

lib/graphql/schema/loader.rb

@@ -32,7 +32,8 @@ def load(introspection_result)
         end
 
         Class.new(GraphQL::Schema) do
-          orphan_types(types.values)
+          add_type_and_traverse(types.values, root: false)
+          orphan_types(types.values.select { |t| t.kind.object? })
           directives(directives)
           description(schema["description"])
 

spec/graphql/schema/dynamic_members_spec.rb

@@ -360,7 +360,7 @@ class Mutation < BaseObject
 
     query(Query)
     mutation(Mutation)
-    orphan_types(Place, LegacyPlace, Locale, Region, Country)
+    orphan_types(Place, LegacyPlace, Country)
   end
 
   def check_for_multiple_visible_calls(context)
@@ -878,7 +878,7 @@ def thing
       end
 
       query(Query)
-      orphan_types(ThingScalar, ThingEnum, ThingInput, ThingObject, ThingUnion, ThingInterface)
+      extra_types(ThingScalar, ThingEnum, ThingInput, ThingObject, ThingUnion, ThingInterface)
     end
   end
 

spec/graphql/schema/printer_spec.rb

@@ -114,8 +114,7 @@ class Subscription < GraphQL::Schema::Object
     query(Query)
     mutation(Mutation)
     subscription(Subscription)
-    orphan_types [Media]
-    extra_types [MediaRating]
+    extra_types [Media, MediaRating]
   end
 
   let(:schema) { PrinterTestSchema }