Exec-next: some runtime fixes

Author: rmosolgo

CHANGELOG.md

@@ -99,7 +99,7 @@
 
 - Runtime: add hooks for experimental custom runtimes #5425, #5429
 - Lazy handling and Dataloader have been merged under the hood #5422
-- Doc: merk `load_application_object_failed` as public #5426
+- Doc: mark `load_application_object_failed` as public #5426
 
 # 2.5.11 (9 Jul 2025)
 

guides/execution/migration.md

@@ -48,9 +48,9 @@ Adopting a feature flag system (described below) can also make this easier.
 
 When all tests pass on `.execute_next`, you're ready to try it out in production.
 
-## COMING SOON: Migration and Clean-Up Script
+## Migration and Clean-Up Script
 
-Migrating field implementations can be automated in many cases. A script to analyze and execute these cases is in the works: [Pull Request](https://github.com/rmosolgo/graphql-ruby/pull/5531). This script will also be able to clean up unused instance methods when the migration is complete.
+`graphql_migrate_execution` is a command-line development tool that can automate many common GraphQL-Ruby field resolver patterns. Check out its docs and try out: https://rmosolgo.github.io/graphql_migrate_execution/
 
 ## Production Considerations
 
@@ -159,7 +159,7 @@ Previously, GraphQL-Ruby would check `type_object.respond_to?(:title)`, `object.
 
 Now, GraphQL-Ruby simply calls `object.title` and allows the `NoMethodError` to bubble up if one is raised.
 
-### Query Analyzers, including complexity 🌕
+### Query Analyzers, including complexity 🟡
 
 Support is identical; this runs before execution using the exact same code.
 
@@ -219,7 +219,7 @@ Not supported yet. This will need some new kind of integration.
 
 These methods/procs are called.
 
-### `validates:` ❌
+### `validates:` 🟡
 
 Built-in validators are supported. Custom validators will always receive `nil` as the `object`. (`object` is no longer available; this API will probably change before this is fully released.)
 

lib/graphql/execution/next/field_resolve_step.rb

@@ -49,27 +49,27 @@ def append_selection(ast_node)
         end
 
         def coerce_arguments(argument_owner, ast_arguments_or_hash)
-          arg_defns = argument_owner.arguments(@selections_step.query.context)
+          arg_defns = @selections_step.query.types.arguments(argument_owner)
           if arg_defns.empty?
             return EmptyObjects::EMPTY_HASH
           end
           args_hash = {}
           if ast_arguments_or_hash.is_a?(Hash)
             ast_arguments_or_hash.each do |key, value|
               key_s = nil
-              arg_defn = arg_defns.each_value.find { |a|
+              arg_defn = arg_defns.find { |a|
                 a.keyword == key || a.graphql_name == (key_s ||= String(key))
               }
               coerce_argument_value(args_hash, arg_defn, value)
             end
           else
             ast_arguments_or_hash.each { |arg_node|
-              arg_defn = arg_defns[arg_node.name]
+              arg_defn = arg_defns.find { |ad| ad.graphql_name == arg_node.name }
               coerce_argument_value(args_hash, arg_defn, arg_node.value)
             }
           end
           # TODO refactor the loop above into this one
-          arg_defns.each do |arg_graphql_name, arg_defn|
+          arg_defns.each do |arg_defn|
             if arg_defn.default_value? && !args_hash.key?(arg_defn.keyword)
               coerce_argument_value(args_hash, arg_defn, arg_defn.default_value)
             end
@@ -252,14 +252,6 @@ def build_arguments
           query = @selections_step.query
           field_name = @ast_node.name
           @field_definition = query.get_field(@parent_type, field_name) || raise("Invariant: no field found for #{@parent_type.to_type_signature}.#{ast_node.name}")
-          if field_name == "__typename"
-            # TODO handle custom introspection
-            @field_results = Array.new(@selections_step.objects.size, @parent_type.graphql_name)
-            @object_is_authorized = AlwaysAuthorized
-            build_results
-            return
-          end
-
           arguments = coerce_arguments(@field_definition, @ast_node.arguments) # rubocop:disable Development/ContextIsPassedCop
           @arguments ||= arguments # may have already been set to an error
 
@@ -689,6 +681,8 @@ def resolve_batch(objects, context, args_hash)
               else
                 obj_inst.public_send(@field_definition.execution_next_mode_key, **args_hash)
               end
+            rescue GraphQL::ExecutionError => exec_err
+              exec_err
             end
           else
             raise "Batching execution for #{path} not implemented (execution_next_mode: #{@execution_next_mode.inspect}); provide `resolve_static:`, `resolve_batch:`, `hash_key:`, `method:`, or use a compatibility plug-in"

lib/graphql/execution/next/prepare_object_step.rb

@@ -72,7 +72,7 @@ def authorize
           begin
             query.current_trace.begin_authorized(@resolved_type, @object, query.context)
             @authorized_value = @resolved_type.authorized?(@object, query.context)
-            query.current_trace.end_authorized(@resolve_type, @object, query.context, @authorized_value)
+            query.current_trace.end_authorized(@resolved_type, @object, query.context, @authorized_value)
           rescue GraphQL::UnauthorizedError => auth_err
             @authorization_error = auth_err
           end

lib/graphql/execution/next/runner.rb

@@ -23,9 +23,9 @@ def initialize(multiplex, authorization:)
         end
 
         def resolve_type(type, object, query)
-          query.current_trace.begin_resolve_type(@static_type, object, query.context)
+          query.current_trace.begin_resolve_type(type, object, query.context)
           resolved_type, _ignored_new_value = query.resolve_type(type, object)
-          query.current_trace.end_resolve_type(@static_type, object, query.context, resolved_type)
+          query.current_trace.end_resolve_type(type, object, query.context, resolved_type)
           resolved_type
         end
 
@@ -184,7 +184,8 @@ def execute
                 res_h
               end
 
-              GraphQL::Query::Result.new(query: query, values: fin_result)
+              query.result_values = fin_result
+              query.result
             end
           end
         ensure