rubocop-graphql 0.12.3 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0b5a6defb854d907bf12c23a7262adc13b55228e3d7cf345f19ea7b1371bacb
-  data.tar.gz: 3250274062d10447eb23994e4bc1e99393d4d03a6b17221cdbda5f1d1bd4b2d6
+  metadata.gz: d809ed60d2d98c5f7f84a3555d8ad24ad2c2e1ece6a5fed616b6698260981d29
+  data.tar.gz: e62936fc399419ee72070e658be32660763a96144776727e183007aa53ad0bd8
 SHA512:
-  metadata.gz: 3f59543ad00f27cf92048d5fa3fb7e09ea99c9e1179839f848316025eb48d66a92012f2cdb13847113d602b740a49aab128d8a4538cf5d8c0f8ea8a2c0f47321
-  data.tar.gz: 2b5110aa616044c726f466c6e82a36af0cdad58d096c6359a97a91b3d0c6e023dd4e2ce96f8ecaf44638393bce6b2a4330fa2b3ff76b8c5ecc89d0b07ed6f5e4
+  metadata.gz: 8c508f31ceb2e6f1290ef0220896019c5f3ff007dbd2ec651ba44ad5cc422680ec761ccb6739a7e90f243cc434b787f849d872143c6e709967deeeb81e6500ec
+  data.tar.gz: ccd1741a8b20403f5a904aa321526fb089f4af357b1a8cce37547221f11ef1fa4f407169aedb35923b85c4b5dc5eb0bba76f74ce7b585b260a0d90549c2d7dfb

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

@@ -57,7 +57,19 @@ module RuboCop
               "Field `%<current>s` should appear before `%<previous>s`."
 
         def on_class(node)
-          argument_declarations(node).each_cons(2) do |previous, current|
+          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
+            end
+
+            same_arg_with_block_declaration || node
+          end
+
+          argument_declarations.each_cons(2) do |previous, current|
             next unless consecutive_lines(previous, current)
             next if argument_name(current) >= argument_name(previous)
 
@@ -80,16 +92,26 @@ module RuboCop
         end
 
         def argument_name(node)
-          node.first_argument.value.to_s
+          argument = node.block_type? ? node.children.first.first_argument : node.first_argument
+
+          argument.value.to_s
         end
 
         def consecutive_lines(previous, current)
           previous.source_range.last_line == current.source_range.first_line - 1
         end
 
-        def_node_search :argument_declarations, <<~PATTERN
+        def_node_search :argument_declarations_without_blocks, <<~PATTERN
           (send nil? :argument (:sym _) ...)
         PATTERN
+
+        def_node_search :argument_declarations_with_blocks, <<~PATTERN
+          (block
+            (send nil? :argument
+              (:sym _)
+              ...)
+            ...)
+        PATTERN
       end
     end
   end

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

@@ -90,7 +90,10 @@ module RuboCop
 
         def find_resolve_method_node(node)
           resolve_method_nodes = resolve_method_definition(node)
-          resolve_method_nodes.to_a.last if resolve_method_nodes.any?
+          resolve_method_nodes.find do |resolve_node|
+            # reject resolve methods from other classes
+            resolve_node.each_ancestor(:class).first == node
+          end
         end
 
         def find_unresolved_args(method_node, declared_arg_nodes)

data/lib/rubocop/graphql/version.rb

@@ -1,5 +1,5 @@
 module RuboCop
   module GraphQL
-    VERSION = "0.12.3".freeze
+    VERSION = "0.13.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-graphql
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.13.0
 platform: ruby
 authors:
 - Dmitry Tsepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-08 00:00:00.000000000 Z
+date: 2022-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler