migrate RawValue to use finalizer

Author: rmosolgo

lib/graphql/execution.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 require "graphql/execution/directive_checks"
+require "graphql/execution/next"
 require "graphql/execution/interpreter"
 require "graphql/execution/lazy"
 require "graphql/execution/lookahead"
 require "graphql/execution/multiplex"
-require "graphql/execution/next"
 require "graphql/execution/errors"
 
 module GraphQL

lib/graphql/execution/interpreter/handles_raw_value.rb

@@ -5,6 +5,12 @@ module Execution
     class Interpreter
       # Wrapper for raw values
       class RawValue
+        include GraphQL::Execution::Next::Finalizer
+
+        def assign_graphql_result(query, result_data, result_key)
+          result_data[result_key] = @object
+        end
+
         def initialize(obj = nil)
           @object = obj
         end

lib/graphql/execution/next/field_resolve_step.rb

@@ -520,8 +520,12 @@ def build_results
                 else
                   nil
                 end
-              elsif field_result.is_a?(GraphQL::RuntimeError)
-                add_graphql_error(field_result)
+              elsif field_result.is_a?(Finalizer)
+                if field_result.is_a?(GraphQL::RuntimeError)
+                  add_graphql_error(field_result)
+                else
+                  field_result.path = path
+                end
               else
                 # TODO `nil`s in [T!] types aren't handled
                 return_type.coerce_result(field_result, ctx)
@@ -596,8 +600,13 @@ def build_graphql_result(graphql_result, key, field_result, return_type, is_nn,
             else
               graphql_result[key] = nil
             end
-          elsif field_result.is_a?(GraphQL::RuntimeError)
-            graphql_result[key] = add_graphql_error(field_result)
+          elsif field_result.is_a?(Finalizer)
+            graphql_result[key] = if field_result.is_a?(GraphQL::RuntimeError)
+              add_graphql_error(field_result)
+            else
+              field_result.path = path
+              field_result
+            end
           elsif is_list
             if is_nn
               return_type = return_type.of_type
@@ -728,16 +737,6 @@ def resolve_batch(objects, context, args_hash)
           end
         end
       end
-
-      class RawValueFieldResolveStep < FieldResolveStep
-        def build_graphql_result(graphql_result, key, field_result, return_type, is_nn, is_list, is_from_array) # rubocop:disable Metrics/ParameterLists
-          if field_result.is_a?(Interpreter::RawValue)
-            graphql_result[key] = field_result.resolve
-          else
-            super
-          end
-        end
-      end
     end
   end
 end

lib/graphql/execution/next/runner.rb

@@ -13,7 +13,6 @@ def initialize(multiplex, authorization:)
           @dataloader = multiplex.context[:dataloader] ||= @schema.dataloader_class.new
           @resolves_lazies = @schema.resolves_lazies?
           @lazy_cache = resolves_lazies ? {}.compare_by_identity : nil
-          @field_resolve_step_class = @schema.uses_raw_value? ? RawValueFieldResolveStep : FieldResolveStep
           @authorization = authorization
           if @authorization
             @authorizes_cache = Hash.new do |h, query_context|
@@ -180,7 +179,8 @@ def execute
                 @schema.subscriptions.finish_subscriptions(query)
               end
 
-              fin_result = if query.context.errors.empty?
+              finalizers = query.finalizers
+              fin_result = if finalizers.empty?
                 result
               else
                 data = result["data"]
@@ -216,7 +216,7 @@ def gather_selections(type_defn, ast_selections, selections_step, query, prototy
               step = into[key] ||= begin
                 prototype_result[key] = nil
 
-                @field_resolve_step_class.new(
+                FieldResolveStep.new(
                   selections_step: selections_step,
                   key: key,
                   parent_type: type_defn,

lib/graphql/query.rb

@@ -308,7 +308,7 @@ def finalizers
     def add_finalizer(finalizer)
       f = @finalizers ||= []
       f << finalizer
-      f
+      finalizer
     end
 
     # Determine the values for variables of this query, using default values

lib/graphql/query/context.rb

@@ -126,6 +126,13 @@ def add_error(error)
         nil
       end
 
+      # @param value [Object] Any object to be inserted directly into the final response
+      # @return [GraphQL::Execution::Interpreter::RawValue] Return this from the field
+      def raw_value(value)
+        rv = GraphQL::Execution::Interpreter::RawValue.new(rv)
+        query.add_finalizer(rv)
+      end
+
       # @example Print the GraphQL backtrace during field resolution
       #   puts ctx.backtrace
       #

lib/graphql/runtime_error.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+module GraphQL
+  class RuntimeError < Error
+    include GraphQL::Execution::Next::Finalizer
+  end
+end

lib/graphql/schema.rb

@@ -1362,14 +1362,6 @@ def lazy_resolve(lazy_class, value_method)
         lazy_methods.set(lazy_class, value_method)
       end
 
-      def uses_raw_value?
-        !!@uses_raw_value
-      end
-
-      def uses_raw_value(new_val)
-        @uses_raw_value = new_val
-      end
-
       def resolves_lazies?
         lazy_method_count = 0
         lazy_methods.each do |k, v|

lib/graphql/schema/object.rb

@@ -32,7 +32,8 @@ def dataloader
       # Call this in a field method to return a value that should be returned to the client
       # without any further handling by GraphQL.
       def raw_value(obj)
-        GraphQL::Execution::Interpreter::RawValue.new(obj)
+        rv = GraphQL::Execution::Interpreter::RawValue.new(obj)
+        context.query.add_finalizer(rv)
       end
 
       class << self

spec/graphql/execution/interpreter_spec.rb

@@ -296,7 +296,6 @@ class Schema < GraphQL::Schema
       query(Query)
       mutation(Mutation)
       lazy_resolve(Box, :value)
-      uses_raw_value(true)
       use GraphQL::Schema::AlwaysVisible
       use(GraphQL::Execution::Next) if TESTING_EXEC_NEXT