graphql 2.5.24 → 2.5.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edd07077eba1bb80e09f60cefbb284c8f3d520c89f515708e62a1ea63e10eeee
-  data.tar.gz: 921a1370ea598626b4248ea8723f0361550686d3eabd39b9fb8d234642c7b5dd
+  metadata.gz: 8b3c24503e050af2719344fdeb9305dbdd36100e3ae557ef217d618387f7b400
+  data.tar.gz: b20875732821e49db5ff5a1edec8f7e49ff98db65722932b9ab1e84c0f4a7212
 SHA512:
-  metadata.gz: 68dd9c0b0d92d1787dfc76a163d2a057377466246814e694c021cb2a9e994d04974369b74cdb591db7581cc2987e0527e86073554669a77cc9c3be07dfa4c68a
-  data.tar.gz: ab56518a1d21932d0a9026e76340e9fc4b5d3088c3e002ddc002c6afec4171a86b9778a0f82878ead52d57ac8ea950b0a7aa68cf67aa54a77b600f7cd45d1eca
+  metadata.gz: cfde5e5191cbec8091db9559b2f293c590dc7cc693c2d57e401c5e5c0da7c1e9a0bea745ee3f0e80e486ddb916ce65f5fee15d8c54fbeb2173b6900e22631b16
+  data.tar.gz: 9f2e0eb0c45670cc7e8c98414a09d5a203b431beff9d859af12215092ea770955eed9959e420f47e1c6a161e1ecdaf7a4d0a6fd9bd8d50ed16917cabe6d91920

data/lib/graphql/language/lexer.rb

@@ -28,7 +28,15 @@ module GraphQL
       attr_reader :pos, :tokens_count
 
       def advance
-        @scanner.skip(IGNORE_REGEXP)
+        loop do
+          @scanner.skip(IGNORE_REGEXP)
+          if @scanner.skip(COMMENT_REGEXP)
+            @tokens_count += 1
+            next
+          end
+          break
+        end
+
         if @scanner.eos?
           @finished = true
           return false
@@ -178,12 +186,8 @@ module GraphQL
         raise GraphQL::ParseError.new(message, line, col, @string, filename: @filename)
       end
 
-      IGNORE_REGEXP = %r{
-        (?:
-          [, \c\r\n\t]+ |
-          \#.*$
-        )*
-      }x
+      IGNORE_REGEXP = /[, \c\r\n\t]+/
+      COMMENT_REGEXP = /\#[^\n]*/
       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/field_extension.rb

@@ -132,7 +132,7 @@ module GraphQL
       # @yieldparam memo [Object] Any extension-specific value which will be passed to {#after_resolve} later
       # @return [Object] The return value for this field.
       def resolve(object: nil, objects: nil, arguments:, context:)
-        yield(object || objects, arguments, nil)
+        yield(object.nil? ? objects : object, arguments, nil)
       end
 
       # Called after {#field} was resolved, and after any lazy values (like `Promise`s) were synced,
@@ -149,7 +149,7 @@ module GraphQL
       # @param memo [Object] The third value yielded by {#resolve}, or `nil` if there wasn't one
       # @return [Object] The return value for this field.
       def after_resolve(object: nil, objects: nil, arguments:, context:, values: nil, value: nil, memo:)
-        value || values
+        value.nil? ? values : value
       end
     end
   end

data/lib/graphql/version.rb

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

metadata

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