rubocop-graphql 1.5.1 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1307db3b7122e5a576ca03bbaecbb5798b03a927718aa85fa25fd5a9afe1ec07
-  data.tar.gz: ea58763eb067a3e576149ebe41830a7ca7210e080e61382011fab9707ceaf2b9
+  metadata.gz: dcfe45f266ed034043a0d696144d81221322a9a6a68128e192fbac769ac696e7
+  data.tar.gz: 2f9a5060ffa601ba91b05fe3351029453d48da27a16a2b3512319fc4360bddc9
 SHA512:
-  metadata.gz: 86d2c4c34918bb8713b15c4485b681d62b8b8c74b894aefbfb4d12e1d364ef2eff48c6c5562ca5b10690195b8f8403dacac73552b0cdfa2960f64fde07b63e3c
-  data.tar.gz: 784d752ff412289d3eeeabdd204939bef5ad946e6cd5f40c8cc2ccfd1ebe4b7ec657f8ebe44c3d14fc7d8b50508891bc9b945f732b1b25c1a9dff6d6751ce87f
+  metadata.gz: ba60c5712c2c6c5445e4ef26ca320bc55e9e83a563389162cad75bfac2fbdb6f20ff3c947fd75eda284367fca751a0f053429b2acc84255b403d04cd42e2bfec
+  data.tar.gz: 3e60c89cfaea9ed2e281f7cb6a62f77776c4ab816bd20051ac7e1f0acb5061fdf494de2928777c8fd67568d314e0cb3cf7109eb2bc0b78c8c1b292ac58948be1

data/lib/rubocop/cop/graphql/field_definitions.rb

@@ -47,6 +47,7 @@ module RuboCop
       class FieldDefinitions < Base # rubocop:disable Metrics/ClassLength
         extend AutoCorrector
         include ConfigurableEnforcedStyle
+        include CommentsHelp
         include RuboCop::GraphQL::NodePattern
         include RuboCop::Cop::RangeHelp
         include RuboCop::GraphQL::Sorbet
@@ -212,17 +213,19 @@ module RuboCop
         end
 
         def insert_new_resolver(corrector, field_definition, resolver_definition)
+          resolver_definition_range = source_range_with_comment(resolver_definition)
           source_to_insert =
             "\n#{signature_to_insert(resolver_definition)}\n" \
-              "#{indent(resolver_definition)}#{resolver_definition.source}\n"
+              "#{indent(resolver_definition)}#{resolver_definition_range.source.strip}\n"
 
           field_definition_range = range_including_heredoc(field_definition)
           corrector.insert_after(field_definition_range, source_to_insert)
         end
 
         def remove_old_resolver(corrector, resolver_definition)
+          resolver_definition_range = source_range_with_comment(resolver_definition)
           range_to_remove = range_with_surrounding_space(
-            range: resolver_definition.source_range, side: :left
+            range: resolver_definition_range, side: :left
           )
           corrector.remove(range_to_remove)
 
@@ -230,8 +233,9 @@ module RuboCop
 
           return unless resolver_signature
 
+          resolver_signature_range = source_range_with_comment(resolver_signature)
           range_to_remove = range_with_surrounding_space(
-            range: resolver_signature.source_range, side: :left
+            range: resolver_signature_range, side: :left
           )
           corrector.remove(range_to_remove)
         end
@@ -241,7 +245,8 @@ module RuboCop
 
           return unless signature
 
-          "\n#{indent(signature)}#{signature.source}"
+          range = source_range_with_comment(signature)
+          "\n#{indent(signature)}#{range.source.strip}"
         end
 
         def indent(node)

data/lib/rubocop/cop/graphql/ordered_arguments.rb

@@ -58,16 +58,14 @@ module RuboCop
               "Field `%<current>s` should appear before `%<previous>s`."
 
         def on_class(node)
-          declarations_with_blocks = argument_declarations_with_blocks(node)
-          declarations_without_blocks = argument_declarations_without_blocks(node)
-
-          argument_declarations = declarations_without_blocks.map do |node|
-            arg_name = argument_name(node)
-            same_arg_with_block_declaration = declarations_with_blocks.find do |dec|
-              argument_name(dec) == arg_name
+          # Do a single pass over descendants to get argument declarations
+          # with and without a block.
+          argument_declarations = argument_declaration(node).map do |declaration|
+            if argument_declaration_with_block?(declaration)
+              declaration.parent
+            else
+              declaration
             end
-
-            same_arg_with_block_declaration || node
           end
 
           argument_declarations.each_cons(2) do |previous, current|
@@ -80,6 +78,10 @@ module RuboCop
 
         private
 
+        def argument_declaration_with_block?(node)
+          node.parent&.block_type? && node.parent.send_node == node
+        end
+
         def register_offense(previous, current)
           message = format(
             self.class::MSG,
@@ -102,19 +104,10 @@ module RuboCop
           previous.source_range.last_line == current.source_range.first_line - 1
         end
 
-        # @!method argument_declarations_without_blocks(node)
-        def_node_search :argument_declarations_without_blocks, <<~PATTERN
+        # @!method argument_declaration(node)
+        def_node_search :argument_declaration, <<~PATTERN
           (send nil? :argument (:sym _) ...)
         PATTERN
-
-        # @!method argument_declarations_with_blocks(node)
-        def_node_search :argument_declarations_with_blocks, <<~PATTERN
-          (block
-            (send nil? :argument
-              (:sym _)
-              ...)
-            ...)
-        PATTERN
       end
     end
   end

data/lib/rubocop/graphql/heredoc.rb

@@ -8,16 +8,23 @@ module RuboCop
       end
 
       def range_including_heredoc(node)
-        field = RuboCop::GraphQL::Field.new(node)
-        last_heredoc = field.kwargs.instance_variable_get(:@nodes).reverse.find do |kwarg|
-                         heredoc?(kwarg.value)
-                       end&.value
+        last_heredoc = find_last_heredoc(node)
 
         range = node.source_range
         range = range.join(last_heredoc.loc.heredoc_end) if last_heredoc
 
         range_by_whole_lines(range)
       end
+
+      private
+
+      def find_last_heredoc(node)
+        # Do a cheap check first.
+        return nil unless node.source.include?("<<")
+
+        heredocs = node.descendants.select { |descendant| heredoc?(descendant) }
+        heredocs.max_by { |heredoc| heredoc.loc.heredoc_end }
+      end
     end
   end
 end

data/lib/rubocop/graphql/sorbet.rb

@@ -15,16 +15,8 @@ module RuboCop
       end
 
       def sorbet_signature_for(node)
-        node.parent.each_descendant.find do |sibling|
-          siblings_in_sequence?(sibling, node) &&
-            sorbet_signature(sibling)
-        end
-      end
-
-      private
-
-      def siblings_in_sequence?(first_node, second_node)
-        first_node.sibling_index - second_node.sibling_index == - 1
+        sibling = node.left_sibling
+        sibling if sibling && sorbet_signature(sibling)
       end
     end
   end

data/lib/rubocop/graphql/version.rb

@@ -1,5 +1,5 @@
 module RuboCop
   module GraphQL
-    VERSION = "1.5.1".freeze
+    VERSION = "1.5.3".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-graphql
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.3
 platform: ruby
 authors:
 - Dmitry Tsepelev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-31 00:00:00.000000000 Z
+date: 2024-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.90'
+        version: '1.50'
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -68,7 +68,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.90'
+        version: '1.50'
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'