graphql_includable 0.5.0.beta.3 → 0.5.0.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37dd12e8f71a2dd6fc03e26b5cf7fc355ffe2580
-  data.tar.gz: 36b57f3175652ec1b06d8b18f67de4169e85720a
+  metadata.gz: e8a7ae35b0df182e490dd380acbc3f84fa80dfb6
+  data.tar.gz: da16677c177a2b9aaaa6a9723bc90763a774cbf5
 SHA512:
-  metadata.gz: e5fb0eee1ff9fa5db33ca17a2a1457ba72f1191d57e1e9c6bd34f9a804ed5f0367e9bf94c217c4c290774f67bd27a54d0a9f760bd536605d668cfc8620b26468
-  data.tar.gz: a5870bfd6ff935b7cfb27725fd3585d2253e9d81b2742435aa2c359befc5d39376bdac7d7e087731457ba1abe7aab7bbcdf442fc797a940e8e7b862cb10c3228
+  metadata.gz: 71bf2450237b9ea22c42dd5d1d6aea7850ac9712dfaa7e21f2bfd8831d407aaf32a8962a04d45618e06d3e971d9b44dbe9a0c38ad2590b5ed5f0dc082eb634cb
+  data.tar.gz: 9adc06e9202198ccf155f545556b865c73929cf4c7f464cb0d45e5ac1ca28f2fa1efc08250fb28d1172d2360c613e76bfbf339ac9cda3d654c4a9740761a68fe

data/lib/graphql_includable/new/resolver.rb

@@ -16,16 +16,17 @@ module GraphQLIncludable
 
         children = node.scoped_children[node.return_type.unwrap]
         children.each_value do |child_node|
-          includes_for_child(child_node, includes)
+          definition_override = node_definition_override(node, child_node)
+          includes_for_child(child_node, includes, definition_override)
         end
       end
 
       private
 
-      def includes_for_child(node, includes)
-        return includes_for_connection(node, includes) if node.definition.connection?
+      def includes_for_child(node, includes, definition_override)
+        return includes_for_connection(node, includes, definition_override) if node.definition.connection?
 
-        builder = build_includes(node)
+        builder = build_includes(node, definition_override)
         return unless builder.present?
         includes.merge_includes(builder.includes) unless builder.includes.empty?
 
@@ -36,14 +37,15 @@ module GraphQLIncludable
 
         children = node.scoped_children[node.return_type.unwrap]
         children.each_value do |child_node|
-          includes_for_child(child_node, child_includes)
+          definition_override = node_definition_override(node, child_node)
+          includes_for_child(child_node, child_includes, definition_override)
         end
       end
 
       # rubocop:disable Metrics/AbcSize
       # rubocop:disable Metrics/MethodLength
-      def includes_for_connection(node, includes)
-        builder = build_connection_includes(node)
+      def includes_for_connection(node, includes, definition_override)
+        builder = build_connection_includes(node, definition_override)
         return unless builder&.includes?
 
         connection_children = node.scoped_children[node.return_type.unwrap]
@@ -76,10 +78,12 @@ module GraphQLIncludable
 
                 node_children = edge_child_node.scoped_children[edge_child_node.return_type.unwrap]
                 node_children.each_value do |node_child_node|
-                  includes_for_child(node_child_node, edge_node_includes)
+                  definition_override = node_definition_override(edge_child_node, node_child_node)
+                  includes_for_child(node_child_node, edge_node_includes, definition_override)
                 end
               else
-                includes_for_child(edge_child_node, edges_includes)
+                definition_override = node_definition_override(connection_node, edge_child_node)
+                includes_for_child(edge_child_node, edges_includes, definition_override)
               end
             end
           elsif connection_node.name == 'nodes'
@@ -89,7 +93,8 @@ module GraphQLIncludable
 
             node_children = connection_node.scoped_children[connection_node.return_type.unwrap]
             node_children.each_value do |node_child_node|
-              includes_for_child(node_child_node, nodes_includes)
+              definition_override = node_definition_override(connection_node, node_child_node)
+              includes_for_child(node_child_node, nodes_includes, definition_override)
             end
           elsif connection_node.name == 'totalCount'
             # Handled using `.size`
@@ -105,7 +110,7 @@ module GraphQLIncludable
         top_level_being_resolved = @root_ctx.namespace(:gql_includable)[:resolving]
 
         if top_level_being_resolved == :edges
-          builder = build_connection_includes(node)
+          builder = build_connection_includes(node, nil)
           return unless builder&.edges_builder&.node_builder&.includes?
 
           edges_node = connection_children['edges']
@@ -120,10 +125,12 @@ module GraphQLIncludable
 
               node_children = edge_child_node.scoped_children[edge_child_node.return_type.unwrap]
               node_children.each_value do |node_child_node|
-                includes_for_child(node_child_node, edge_node_includes)
+                definition_override = node_definition_override(edge_child_node, node_child_node)
+                includes_for_child(node_child_node, edge_node_includes, definition_override)
               end
             else
-              includes_for_child(edge_child_node, edges_includes)
+              definition_override = node_definition_override(edges_node, edge_child_node)
+              includes_for_child(edge_child_node, edges_includes, definition_override)
             end
           end
         else
@@ -133,15 +140,17 @@ module GraphQLIncludable
 
           node_children = nodes_node.scoped_children[nodes_node.return_type.unwrap]
           node_children.each_value do |node_child_node|
-            includes_for_child(node_child_node, nodes_includes)
+            definition_override = node_definition_override(nodes_node, node_child_node)
+            includes_for_child(node_child_node, nodes_includes, definition_override)
           end
         end
       end
       # rubocop:enable Metrics/MethodLength
       # rubocop:enable Metrics/AbcSize
 
-      def build_includes(node)
-        includes_meta = node.definition.metadata[:new_includes]
+      def build_includes(node, definition_override)
+        definition = definition_override || node.definition
+        includes_meta = definition.metadata[:new_includes]
         return nil if includes_meta.blank?
 
         builder = GraphQLIncludable::New::IncludesBuilder.new
@@ -160,8 +169,9 @@ module GraphQLIncludable
         builder
       end
 
-      def build_connection_includes(node)
-        includes_meta = node.definition.metadata[:new_includes]
+      def build_connection_includes(node, definition_override)
+        definition = definition_override || node.definition
+        includes_meta = definition.metadata[:new_includes]
         return nil if includes_meta.blank?
 
         builder = GraphQLIncludable::New::ConnectionIncludesBuilder.new
@@ -173,6 +183,21 @@ module GraphQLIncludable
         end
         builder
       end
+
+      def node_definition_override(parent_node, child_node)
+        node_return_type = parent_node.return_type.unwrap
+        child_node_parent_type = child_node.parent.return_type.unwrap
+
+        return nil unless child_node_parent_type != node_return_type
+        child_node_definition_override = nil
+        # Handle GraphQL interface with overridden fields
+        # GraphQL makes child_node.return_type the interface instance
+        # and therefore takes the metadata from the interface rather than the
+        # implementing object's overridden field instance
+        is_interface = node_return_type.interfaces.include?(child_node_parent_type)
+        child_node_definition_override = node_return_type.fields[child_node.name] if is_interface
+        child_node_definition_override
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphql_includable
 version: !ruby/object:Gem::Version
-  version: 0.5.0.beta.3
+  version: 0.5.0.beta.4
 platform: ruby
 authors:
 - Dan Rouse
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-30 00:00:00.000000000 Z
+date: 2019-09-03 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: