graphql 2.3.15 → 2.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe9b171f92b1787bd8733bf0fad9843275a95d39905719c5f10694e7999beed9
-  data.tar.gz: fa6a3502ddf18968eb7f371529225c5982fef12b3f2bee95ffb68dc6bc121382
+  metadata.gz: 194930c79609165d98c3ee58c55d557ce5666860dccd4b4718666bf9080178f6
+  data.tar.gz: c3bcc14c06fbcd90dcef7e046f96240775f903e479a8d76439cea01cfefe8373
 SHA512:
-  metadata.gz: 7cc5ff5de4cc47a3de35255c92410895f381f9bb1a0fd4e0d049e7071a63ed9ab6e57a8d5994447ea8cbf01f7f43de069c3e1ef2804b16385ce783e45186dfcf
-  data.tar.gz: 8232a0a0dc4722cf85d17cd6a8870ee1208d1b37bc3ba2c15b8b69c5ba05607bcc12b7140b7df7964230087b00a59b5c928d510c6adfe8506ec2d0720d77832c
+  metadata.gz: 1a6e461373942ea8ac603a0b7fb6cd6f2153280f9248d9bd0e6f5fae5c1c5e6e9dbf862114a7a518173ce46e5101a3a4e9ea5239d8f3dfcbd60752a6c086ddad
+  data.tar.gz: 37e9dcc03c6fd735b6986efa3ea113702f53528bde840341b3d998bbd8a5a35eba11b4e38fded1bedaa8f84dca298e76fbf0d133299fbb4886dbdae36d0a8fe9

data/lib/graphql/invalid_null_error.rb

@@ -39,7 +39,7 @@ module GraphQL
       end
 
       def inspect
-        if (name.nil? || parent_class.name.nil?) && parent_class.respond_to?(:mutation) && (mutation = parent_class.mutation)
+        if (name.nil? || parent_class&.name.nil?) && parent_class.respond_to?(:mutation) && (mutation = parent_class.mutation)
           "#{mutation.inspect}::#{parent_class.graphql_name}::InvalidNullError"
         else
           super

data/lib/graphql/rubocop/graphql/field_type_in_block.rb

@@ -29,7 +29,7 @@ module GraphQL
         def_node_matcher :field_config_with_inline_type_and_block, <<-Pattern
         (
           block
-            (send {nil? _} :field sym ${const array}) ...
+            (send {nil? _} :field sym ${const array} ...) ...
             (args)
             _
 
@@ -37,8 +37,8 @@ module GraphQL
         Pattern
 
         def on_block(node)
+          ignore_node(node)
           field_config_with_inline_type_and_block(node) do |type_const|
-            ignore_node(type_const)
             type_const_str = get_type_argument_str(node, type_const)
             if ignore_inline_type_str?(type_const_str)
               # Do nothing ...
@@ -54,8 +54,8 @@ module GraphQL
         end
 
         def on_send(node)
+          return if part_of_ignored_node?(node)
           field_config_with_inline_type(node) do |type_const|
-            return if ignored_node?(type_const)
             type_const_str = get_type_argument_str(node, type_const)
             if ignore_inline_type_str?(type_const_str)
               # Do nothing -- not loading from another file
@@ -74,7 +74,13 @@ module GraphQL
         private
 
         def ignore_inline_type_str?(type_str)
-          BUILT_IN_SCALAR_NAMES.include?(type_str)
+          if BUILT_IN_SCALAR_NAMES.include?(type_str)
+            true
+          elsif (inner_type_str = type_str.sub(/\[([A-Za-z]+)(, null: (true|false))?\]/, '\1')) && BUILT_IN_SCALAR_NAMES.include?(inner_type_str)
+            true
+          else
+            false
+          end
         end
 
         def get_type_argument_str(send_node, type_const)
@@ -110,11 +116,20 @@ module GraphQL
         end
 
         def determine_field_indent(send_node)
-          surrounding_node = send_node.parent.parent
-          surrounding_source = surrounding_node.source
-          indent_test_idx = send_node.location.expression.begin_pos - surrounding_node.source_range.begin_pos - 1
+          type_defn_node = send_node
+
+          while (type_defn_node && !(type_defn_node.class_definition? || type_defn_node.module_definition?))
+            type_defn_node = type_defn_node.parent
+          end
+
+          if type_defn_node.nil?
+            raise "Invariant: Something went wrong in GraphQL-Ruby, couldn't find surrounding class definition for field (#{send_node}).\n\nPlease report this error on GitHub."
+          end
+
+          type_defn_source = type_defn_node.source
+          indent_test_idx = send_node.location.expression.begin_pos - type_defn_node.source_range.begin_pos - 1
           field_indent = "".dup
-          while surrounding_source[indent_test_idx] == " "
+          while type_defn_source[indent_test_idx] == " "
             field_indent << " "
             indent_test_idx -= 1
             if indent_test_idx == 0

data/lib/graphql/schema/field.rb

@@ -313,7 +313,7 @@ module GraphQL
         @ast_node = ast_node
         @method_conflict_warning = method_conflict_warning
         @fallback_value = fallback_value
-        @definition_block = nil
+        @definition_block = definition_block
 
         arguments.each do |name, arg|
           case arg
@@ -332,14 +332,15 @@ module GraphQL
         @subscription_scope = subscription_scope
 
         @extensions = EMPTY_ARRAY
+        @call_after_define = false
         set_pagination_extensions(connection_extension: connection_extension)
         # Do this last so we have as much context as possible when initializing them:
         if extensions.any?
-          self.extensions(extensions, call_after_define: false)
+          self.extensions(extensions)
         end
 
         if resolver_class && resolver_class.extensions.any?
-          self.extensions(resolver_class.extensions, call_after_define: false)
+          self.extensions(resolver_class.extensions)
         end
 
         if directives.any?
@@ -352,10 +353,9 @@ module GraphQL
           self.validates(validates)
         end
 
-        if block_given?
-          @definition_block = definition_block
-        else
+        if @definition_block.nil?
           self.extensions.each(&:after_define_apply)
+          @call_after_define = true
         end
       end
 
@@ -372,6 +372,7 @@ module GraphQL
             instance_eval(&@definition_block)
           end
           self.extensions.each(&:after_define_apply)
+          @call_after_define = true
           @definition_block = nil
         end
         self
@@ -435,14 +436,14 @@ module GraphQL
       #
       # @param extensions [Array<Class, Hash<Class => Hash>>] Add extensions to this field. For hash elements, only the first key/value is used.
       # @return [Array<GraphQL::Schema::FieldExtension>] extensions to apply to this field
-      def extensions(new_extensions = nil, call_after_define: !@definition_block)
+      def extensions(new_extensions = nil)
         if new_extensions
           new_extensions.each do |extension_config|
             if extension_config.is_a?(Hash)
               extension_class, options = *extension_config.to_a[0]
-              self.extension(extension_class, call_after_define: call_after_define, **options)
+              self.extension(extension_class, **options)
             else
-              self.extension(extension_config, call_after_define: call_after_define)
+              self.extension(extension_config)
             end
           end
         end
@@ -460,12 +461,12 @@ module GraphQL
       # @param extension_class [Class] subclass of {Schema::FieldExtension}
       # @param options [Hash] if provided, given as `options:` when initializing `extension`.
       # @return [void]
-      def extension(extension_class, call_after_define: !@definition_block, **options)
+      def extension(extension_class, **options)
         extension_inst = extension_class.new(field: self, options: options)
         if @extensions.frozen?
           @extensions = @extensions.dup
         end
-        if call_after_define
+        if @call_after_define
           extension_inst.after_define_apply
         end
         @extensions << extension_inst

data/lib/graphql/subscriptions/action_cable_subscriptions.rb

@@ -166,7 +166,8 @@ module GraphQL
       #
       def setup_stream(channel, initial_event)
         topic = initial_event.topic
-        channel.stream_from(stream_event_name(initial_event), coder: @action_cable_coder) do |message|
+        event_stream = stream_event_name(initial_event)
+        channel.stream_from(event_stream, coder: @action_cable_coder) do |message|
           events_by_fingerprint = @events[topic]
           object = nil
           events_by_fingerprint.each do |_fingerprint, events|

data/lib/graphql/subscriptions.rb

@@ -250,6 +250,8 @@ module GraphQL
     def normalize_arguments(event_name, arg_owner, args, context)
       case arg_owner
       when GraphQL::Schema::Field, Class
+        return args if args.nil?
+
         if arg_owner.is_a?(Class) && !arg_owner.kind.input_object?
           # it's a type, but not an input object
           return args
@@ -302,7 +304,7 @@ module GraphQL
 
         normalized_args
       when GraphQL::Schema::List
-        args.map { |a| normalize_arguments(event_name, arg_owner.of_type, a, context) }
+        args&.map { |a| normalize_arguments(event_name, arg_owner.of_type, a, context) }
       when GraphQL::Schema::NonNull
         normalize_arguments(event_name, arg_owner.of_type, args, context)
       else

data/lib/graphql/testing/helpers.rb

@@ -55,6 +55,7 @@ module GraphQL
             visible_field = dummy_query.types.field(object_type, field_name) # rubocop:disable Development/ContextIsPassedCop
             if visible_field
               dummy_query.context.dataloader.run_isolated {
+                query_context[:current_field] = visible_field
                 field_args = visible_field.coerce_arguments(graphql_result, arguments, query_context)
                 field_args = schema.sync_lazy(field_args)
                 if visible_field.extras.any?

data/lib/graphql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 2.3.15
+  version: 2.3.17
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-10 00:00:00.000000000 Z
+date: 2024-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -168,16 +168,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -665,7 +665,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.12
 signing_key:
 specification_version: 4
 summary: A GraphQL language and runtime for Ruby