rubocop-graphql 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1307db3b7122e5a576ca03bbaecbb5798b03a927718aa85fa25fd5a9afe1ec07
-  data.tar.gz: ea58763eb067a3e576149ebe41830a7ca7210e080e61382011fab9707ceaf2b9
+  metadata.gz: 54137ed6106e3d8c0d2c675ea02e41989aef1d4480edf875071c9c7918a96fba
+  data.tar.gz: a1a0b7d307854a39d4b4761d77cc829569dd9e97453a329d027886331407aae0
 SHA512:
-  metadata.gz: 86d2c4c34918bb8713b15c4485b681d62b8b8c74b894aefbfb4d12e1d364ef2eff48c6c5562ca5b10690195b8f8403dacac73552b0cdfa2960f64fde07b63e3c
-  data.tar.gz: 784d752ff412289d3eeeabdd204939bef5ad946e6cd5f40c8cc2ccfd1ebe4b7ec657f8ebe44c3d14fc7d8b50508891bc9b945f732b1b25c1a9dff6d6751ce87f
+  metadata.gz: 9e1fc8711b226bd656ca33d8409949a40667e9eabf31ca55a3536ae5f4f54f3af4e7254cbaa589e406172c724afdeb6772ffe5dd689909ebeb09608c7c94b848
+  data.tar.gz: 392b99c409b0e2b8247fff232d35fab529c1abf5eb3f7b648f40eb9020b07a5c56f074d88538626e564872a4a13f1cb59ee20a5ddc0c982099a2aa3edc596289

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/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.2".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.2
 platform: ruby
 authors:
 - Dmitry Tsepelev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-31 00:00:00.000000000 Z
+date: 2024-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler