Merge pull request rmosolgo#4311 from rmosolgo/improve-interface-tms-2.0

Improve interface tms 2.0

Author: rmosolgo

benchmark/run.rb

@@ -82,7 +82,7 @@ def self.profile_large_result
       }
     end
 
-    result = StackProf.run(mode: :wall) do
+    result = StackProf.run(mode: :wall, interval: 1) do
       schema.execute(document: document)
     end
     StackProf::Report.new(result).print_text
@@ -110,18 +110,28 @@ module ProfileLargeResult
       }
     }
 
+    module Bar
+      include GraphQL::Schema::Interface
+      field :string_array, [String], null: false
+    end
+
+    module Baz
+      include GraphQL::Schema::Interface
+      implements Bar
+      field :int_array, [Integer], null: false
+      field :boolean_array, [Boolean], null: false
+    end
+
 
     class FooType < GraphQL::Schema::Object
+      implements Baz
       field :id, ID, null: false
       field :int1, Integer, null: false
       field :int2, Integer, null: false
       field :string1, String, null: false
       field :string2, String, null: false
       field :boolean1, Boolean, null: false
       field :boolean2, Boolean, null: false
-      field :string_array, [String], null: false
-      field :int_array, [Integer], null: false
-      field :boolean_array, [Boolean], null: false
     end
 
     class QueryType < GraphQL::Schema::Object
@@ -134,7 +144,7 @@ def foos
 
     class Schema < GraphQL::Schema
       query QueryType
-      use GraphQL::Dataloader
+      # use GraphQL::Dataloader
     end
 
     ALL_FIELDS = GraphQL.parse <<-GRAPHQL

lib/graphql/schema/member/has_fields.rb

@@ -141,7 +141,7 @@ def visible_interface_implementation?(type, context, warden)
           if type.respond_to?(:kind) && type.kind.interface?
             implements_this_interface = false
             implementation_is_visible = false
-            interface_type_memberships.each do |tm|
+            warden.interface_type_memberships(self, context).each do |tm|
               if tm.abstract_type == type
                 implements_this_interface ||= true
                 if warden.visible_type_membership?(tm, context)

lib/graphql/schema/member/has_interfaces.rb

@@ -55,7 +55,17 @@ def own_interface_type_memberships
         end
 
         def interface_type_memberships
-          own_interface_type_memberships + ((self.is_a?(Class) && superclass.respond_to?(:interface_type_memberships)) ? superclass.interface_type_memberships : [])
+          own_tms = own_interface_type_memberships
+          if (self.is_a?(Class) && superclass.respond_to?(:interface_type_memberships))
+            inherited_tms = superclass.interface_type_memberships
+            if inherited_tms.size > 0
+              own_tms + inherited_tms
+            else
+              own_tms
+            end
+          else
+            own_tms
+          end
         end
 
         # param context [Query::Context] If omitted, skip filtering.

lib/graphql/schema/warden.rb

@@ -80,6 +80,7 @@ def visible_argument?(arg, ctx); arg.visible?(ctx); end
           def visible_type?(type, ctx); type.visible?(ctx); end
           def visible_enum_value?(ev, ctx); ev.visible?(ctx); end
           def visible_type_membership?(tm, ctx); tm.visible?(ctx); end
+          def interface_type_memberships(obj_t, ctx); obj_t.interface_type_memberships; end
         end
       end
 
@@ -239,6 +240,13 @@ def visible_type_membership?(type_membership, _ctx = nil)
         visible?(type_membership)
       end
 
+      def interface_type_memberships(obj_type, _ctx = nil)
+        @type_memberships ||= read_through do |obj_t|
+          obj_t.interface_type_memberships
+        end
+        @type_memberships[obj_type]
+      end
+
       private
 
       def visible_and_reachable_type?(type_defn)