Make the skipped object available in rescue_from

Author: amomchilov

lib/graphql/execution/interpreter/runtime.rb

@@ -10,18 +10,19 @@ class Interpreter
       class Runtime
 
         module GraphQLResult
-          def initialize(result_name, parent_result)
+          def initialize(result_name, parent_result, represented_value)
             @graphql_parent = parent_result
             if parent_result && parent_result.graphql_dead
               @graphql_dead = true
             end
             @graphql_result_name = result_name
             # Jump through some hoops to avoid creating this duplicate storage if at all possible.
             @graphql_metadata = nil
+            @represented_value
           end
 
           attr_accessor :graphql_dead
-          attr_reader :graphql_parent, :graphql_result_name
+          attr_reader :graphql_parent, :graphql_result_name, :represented_value
 
           # Although these are used by only one of the Result classes,
           # it's handy to have the methods implemented on both (even though they just return `nil`)
@@ -41,14 +42,23 @@ def has_graphql_graph_parent_that_skips_list_items_that_raise
               !!graphql_parent&.has_graphql_graph_parent_that_skips_list_items_that_raise
           end
 
+          def find_first_skippable_object
+            @first_skippable_object ||= if graphql_parent&.graphql_skip_list_items_that_raise
+              self
+            else
+              graphql_parent&.find_first_skippable_parent
+            end
+          end
+
           # @return [Hash] Plain-Ruby result data (`@graphql_metadata` contains Result wrapper objects)
           attr_accessor :graphql_result_data
         end
 
         class GraphQLResultHash
-          def initialize(_result_name, _parent_result)
+          def initialize(result_name, parent_result, represented_value)
             super
             @graphql_result_data = {}
+            @represented_value = represented_value
           end
 
           include GraphQLResult
@@ -107,7 +117,7 @@ def [](k)
         class GraphQLResultArray
           include GraphQLResult
 
-          def initialize(_result_name, _parent_result)
+          def initialize(_result_name, _parent_result, represented_value)
             super
             @graphql_result_data = []
           end
@@ -175,7 +185,7 @@ def initialize(query:)
           @multiplex_context = query.multiplex.context
           # Start this off empty:
           Thread.current[:__graphql_runtime_info] = nil
-          @response = GraphQLResultHash.new(nil, nil)
+          @response = GraphQLResultHash.new(nil, nil, nil)
           # Identify runtime directives by checking which of this schema's directives have overridden `def self.resolve`
           @runtime_directive_names = []
           noop_resolve_owner = GraphQL::Schema::Directive.singleton_class
@@ -786,7 +796,7 @@ def continue_field(path, value, owner_type, field, current_type, ast_node, next_
             after_lazy(object_proxy, owner: current_type, path: path, ast_node: ast_node, field: field, owner_object: owner_object, arguments: arguments, trace: false, result_name: result_name, result: selection_result) do |inner_object|
               continue_value = continue_value(path, inner_object, owner_type, field, is_non_null, ast_node, result_name, selection_result)
               if HALT != continue_value
-                response_hash = GraphQLResultHash.new(result_name, selection_result)
+                response_hash = GraphQLResultHash.new(result_name, selection_result, continue_value)
                 set_result(selection_result, result_name, response_hash)
                 gathered_selections = gather_selections(continue_value, current_type, next_selections)
                 # There are two possibilities for `gathered_selections`:
@@ -828,7 +838,7 @@ def continue_field(path, value, owner_type, field, current_type, ast_node, next_
             # puts("Item type: #{inner_type}, #{inner_type.skip_nodes_on_raise?.inspect}")
             # This is true for objects, unions, and interfaces
             use_dataloader_job = !inner_type.unwrap.kind.input?
-            response_list = GraphQLResultArray.new(result_name, selection_result)
+            response_list = GraphQLResultArray.new(result_name, selection_result, value)
             response_list.graphql_non_null_list_items = inner_type.non_null?
             response_list.graphql_skip_list_items_that_raise = current_type.skip_nodes_on_raise?
             set_result(selection_result, result_name, response_list)

lib/graphql/query/context.rb

@@ -207,7 +207,7 @@ def []=(key, value)
 
       def_delegators :@query, :trace, :interpreter?
 
-      RUNTIME_METADATA_KEYS = Set.new([:current_object, :current_arguments, :current_field, :current_path])
+      RUNTIME_METADATA_KEYS = Set.new([:current_object, :current_arguments, :current_field, :current_path, :current_list_item_to_skip])
       # @!method []=(key, value)
       #   Reassign `key` to the hash passed to {Schema#execute} as `context:`
 
@@ -314,6 +314,11 @@ def scoped_set!(key, value)
         scoped_merge!(key => value)
         nil
       end
+
+      def can_skip_list_item?
+        thread_info = Thread.current[:__graphql_runtime_info]
+        thread_info && thread_info.key?(:current_list_item_to_skip)
+      end
     end
   end
 end