graphql 2.5.26 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b3c24503e050af2719344fdeb9305dbdd36100e3ae557ef217d618387f7b400
-  data.tar.gz: b20875732821e49db5ff5a1edec8f7e49ff98db65722932b9ab1e84c0f4a7212
+  metadata.gz: 73ce16b1c358f4ab02c2d2d00e3a2a6b58a36ec2ca2d3012026ef5e346976b15
+  data.tar.gz: 8608b2cb12777e9d53c26508fb592a4c71bd733973e80608fa0010f46933d714
 SHA512:
-  metadata.gz: cfde5e5191cbec8091db9559b2f293c590dc7cc693c2d57e401c5e5c0da7c1e9a0bea745ee3f0e80e486ddb916ce65f5fee15d8c54fbeb2173b6900e22631b16
-  data.tar.gz: 9f2e0eb0c45670cc7e8c98414a09d5a203b431beff9d859af12215092ea770955eed9959e420f47e1c6a161e1ecdaf7a4d0a6fd9bd8d50ed16917cabe6d91920
+  metadata.gz: ee646816ac6503e2a50e601b8bcde6750409fb7bb34dd3395e7a6ba36cfc7f86ba2cd4a07b1a300b9f15d480d5a40e1e681b6a54a8355201997bff1ac3675566
+  data.tar.gz: c7f5679d27b0c4141feb01b2b15a5e04bdf5e77c3ef940d5c0cc8ecdcec995ef2e47657f8b2838ea317c639b9be628fd57c4224864b6b754207f18c4d9087b51

data/lib/graphql/language/lexer.rb

@@ -28,15 +28,7 @@ module GraphQL
       attr_reader :pos, :tokens_count
 
       def advance
-        loop do
-          @scanner.skip(IGNORE_REGEXP)
-          if @scanner.skip(COMMENT_REGEXP)
-            @tokens_count += 1
-            next
-          end
-          break
-        end
-
+        @scanner.skip(IGNORE_REGEXP)
         if @scanner.eos?
           @finished = true
           return false
@@ -186,8 +178,12 @@ module GraphQL
         raise GraphQL::ParseError.new(message, line, col, @string, filename: @filename)
       end
 
-      IGNORE_REGEXP = /[, \c\r\n\t]+/
-      COMMENT_REGEXP = /\#[^\n]*/
+      IGNORE_REGEXP = %r{
+        (?:
+          [, \c\r\n\t]+ |
+          \#.*$
+        )*
+      }x
       IDENTIFIER_REGEXP = /[_A-Za-z][_0-9A-Za-z]*/
       INT_REGEXP =        /-?(?:[0]|[1-9][0-9]*)/
       FLOAT_DECIMAL_REGEXP = /[.][0-9]+/

data/lib/graphql/schema/build_from_definition.rb

@@ -99,6 +99,16 @@ module GraphQL
               # It's possible that this was already loaded by the directives
               prev_type = types[definition.name]
               if prev_type.nil? || prev_type.is_a?(Schema::LateBoundType)
+                if definition.is_a?(GraphQL::Language::Nodes::ObjectTypeDefinition) || definition.is_a?(Language::Nodes::InterfaceTypeDefinition)
+                  interface_names = definition.interfaces.map(&:name)
+                  transitive_names = interface_names.map { |n| document.definitions.find { |d| d.respond_to?(:name) && d.name == n }&.interfaces&.map(&:name) }
+                  transitive_names.flatten!
+                  transitive_names.compact!
+                  if !(missing_transitive_interfaces = transitive_names - interface_names).empty?
+                    raise GraphQL::Schema::InvalidDocumentError, "type #{definition.name} is missing one or more transitive interface names: #{missing_transitive_interfaces.join(", ")}. Add them to the type's `implements` list and try again."
+                  end
+                end
+
                 types[definition.name] = build_definition_from_node(definition, type_resolver, default_resolve, base_types)
               end
             end

data/lib/graphql/schema/resolver.rb

@@ -66,14 +66,31 @@ module GraphQL
         q = context.query
         trace_objs = [object]
         q.current_trace.begin_execute_field(field, @prepared_arguments, trace_objs, q)
-        begin
-          is_authed, new_return_value = authorized?(**@prepared_arguments)
-        rescue GraphQL::UnauthorizedError  => err
-          new_return_value = q.schema.unauthorized_object(err)
-          is_authed = true # the error was handled
+        is_ready = ready?(**@prepared_arguments)
+        runner = @field_resolve_step.runner
+        if runner.resolves_lazies && runner.schema.lazy?(is_ready)
+          is_ready, new_return_value = runner.schema.sync_lazy(is_ready)
         end
 
-        if (runner = @field_resolve_step.runner).resolves_lazies && runner.schema.lazy?(is_authed)
+        if is_ready.is_a?(Array)
+          is_ready, new_return_value = is_ready
+          if is_ready != false
+            raise "Unexpected result from #ready? (expected `true`, `false` or `[false, {...}]`): [#{is_ready.inspect}, #{new_return_value.inspect}]"
+          else
+            new_return_value
+          end
+        end
+
+        if is_ready
+          begin
+            is_authed, new_return_value = authorized?(**@prepared_arguments)
+          rescue GraphQL::UnauthorizedError  => err
+            new_return_value = q.schema.unauthorized_object(err)
+            is_authed = true # the error was handled
+          end
+        end
+
+        if runner.resolves_lazies && runner.schema.lazy?(is_authed)
           is_authed, new_return_value = runner.schema.sync_lazy(is_authed)
         end
 
@@ -93,7 +110,13 @@ module GraphQL
         q = context.query
         q.current_trace.end_execute_field(field, @prepared_arguments, trace_objs, q, [result])
         exec_result[exec_index] = result
-      rescue RuntimeError => err
+      rescue GraphQL::UnauthorizedError => auth_err
+        exec_result[exec_index] = begin
+          context.schema.unauthorized_object(auth_err)
+        rescue GraphQL::ExecutionError => exec_err
+          exec_err
+        end
+      rescue GraphQL::RuntimeError => err
         exec_result[exec_index] = err
       rescue StandardError => stderr
         exec_result[exec_index] = begin

data/lib/graphql/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 2.5.26
+  version: 2.6.0
 platform: ruby
 authors:
 - Robert Mosolgo
 bindir: bin
 cert_chain: []
-date: 2026-04-27 00:00:00.000000000 Z
+date: 2026-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64