graphql 2.6.1 → 2.6.2

data/lib/graphql/schema.rb

@@ -1150,17 +1150,14 @@ module GraphQL
       attr_accessor :using_backtrace
 
       # @api private
-      def handle_or_reraise(context, err)
+      def handle_or_reraise(context, err, object: context[:current_object], arguments: context[:current_arguments], field: context[:current_field])
         handler = Execution::Errors.find_handler_for(self, err.class)
         if handler
-          obj = context[:current_object]
-          args = context[:current_arguments]
-          args = args && args.respond_to?(:keyword_arguments) ? args.keyword_arguments : nil
-          field = context[:current_field]
-          if obj.is_a?(GraphQL::Schema::Object)
-            obj = obj.object
+          arguments = arguments.respond_to?(:keyword_arguments) ? arguments.keyword_arguments : arguments
+          if object.is_a?(GraphQL::Schema::Object)
+            object = object.object
           end
-          handler[:handler].call(err, obj, args, context, field)
+          handler[:handler].call(err, object, arguments, context, field)
         else
           if (context[:backtrace] || using_backtrace) && !err.is_a?(GraphQL::ExecutionError)
             err = GraphQL::Backtrace::TracedError.new(err, context)
@@ -1587,6 +1584,14 @@ module GraphQL
       # @see {Query#initialize} for arguments.
       # @return [GraphQL::Query::Result] query result, ready to be serialized as JSON
       def execute(query_str = nil, **kwargs)
+        if default_execution_next
+          execute_next(query_str, **kwargs)
+        else
+          execute_legacy(query_str, **kwargs)
+        end
+      end
+
+      def execute_legacy(query_str = nil, **kwargs)
         if query_str
           kwargs[:query] = query_str
         end
@@ -1628,7 +1633,23 @@ module GraphQL
       # @option kwargs [nil, Integer] :max_complexity (nil)
       # @return [Array<GraphQL::Query::Result>] One result for each query in the input
       def multiplex(queries, **kwargs)
-        GraphQL::Execution::Interpreter.run_all(self, queries, **kwargs)
+        if @default_execution_next
+          multiplex_next(queries, **kwargs)
+        else
+          GraphQL::Execution::Interpreter.run_all(self, queries, **kwargs)
+        end
+      end
+
+      def default_execution_next(new_value = NOT_CONFIGURED)
+        if !NOT_CONFIGURED.equal?(new_value)
+          @default_execution_next = new_value
+        elsif instance_variable_defined?(:@default_execution_next)
+          @default_execution_next
+        elsif superclass.respond_to?(:default_execution_next)
+          superclass.default_execution_next
+        else
+          false
+        end
       end
 
       def instrumenters

data/lib/graphql/subscriptions/default_subscription_resolve_extension.rb

@@ -54,6 +54,12 @@ module GraphQL
             events << subscription_instance.event
           end
           value
+        elsif (exec_next_update_event = context.namespace(:subscriptions)[:update_event])
+          if context.query.subscription_topic == exec_next_update_event.topic
+            value
+          else
+            context.skip
+          end
         elsif (events = context.namespace(:subscriptions)[:events])
           # This is the first execution, so gather an Event
           # for the backend to register:

data/lib/graphql/subscriptions/event.rb

@@ -104,7 +104,6 @@ module GraphQL
 
         def stringify_args(arg_owner, args, context)
           arg_owner = arg_owner.respond_to?(:unwrap) ? arg_owner.unwrap : arg_owner # remove list and non-null wrappers
-
           case args
           when Hash
             next_args = {}

data/lib/graphql/tracing/perfetto_trace.rb

@@ -67,6 +67,8 @@ module GraphQL
         DA_FETCH_KEYS_IID => "fetch keys",
       }
 
+      ANON_CLASS_NAME = "(anonymous)"
+
       DEBUG_INSPECT_CATEGORY_IIDS = [15]
       DA_DEBUG_INSPECT_CLASS_IID = 16
       DEBUG_INSPECT_EVENT_NAME_IID = 17
@@ -118,7 +120,7 @@ module GraphQL
         }
 
         @source_name_iids = Hash.new do |h, source_class|
-          h[source_class] = @interned_event_name_iids[source_class.name]
+          h[source_class] = @interned_event_name_iids[source_class.name || ANON_CLASS_NAME]
         end.compare_by_identity
 
         @auth_name_iids = Hash.new do |h, graphql_type|
@@ -144,7 +146,7 @@ module GraphQL
         end
 
         @class_name_iids = Hash.new do |h, k|
-          h[k] = @interned_da_string_values[k.name]
+          h[k] = @interned_da_string_values[k.name || ANON_CLASS_NAME]
         end.compare_by_identity
 
         @starting_objects = GC.stat(:total_allocated_objects)
@@ -682,7 +684,7 @@ module GraphQL
         when GraphQL::Schema::InputObject
           payload_to_debug(k, v.to_h, iid: iid, intern_value: intern_value)
         else
-          class_name_iid = @interned_da_string_values[(v.class.name || "(anonymous)")]
+          class_name_iid = @interned_da_string_values[(v.class.name || ANON_CLASS_NAME)]
           da = [
             debug_annotation(DA_DEBUG_INSPECT_CLASS_IID, :string_value_iid, class_name_iid),
           ]

data/lib/graphql/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module GraphQL
-  VERSION = "2.6.1"
+  VERSION = "2.6.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.2
 platform: ruby
 authors:
 - Robert Mosolgo
 bindir: bin
 cert_chain: []
-date: 2026-04-27 00:00:00.000000000 Z
+date: 2026-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -512,6 +512,7 @@ files:
 - lib/graphql/execution/multiplex.rb
 - lib/graphql/execution/next.rb
 - lib/graphql/execution/prepare_object_step.rb
+- lib/graphql/execution/resolve_type_step.rb
 - lib/graphql/execution/runner.rb
 - lib/graphql/execution/selections_step.rb
 - lib/graphql/execution_error.rb