rubocop-graphql 0.14.1 → 0.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99da3dd6f8e99724cb14b723f2f4ed2c7149dd2921b1295e4a669697b1eed8d2
-  data.tar.gz: 964c04401fb03c769213c7ccd3142e8969b83a741e8325b5916ee91c9daea11d
+  metadata.gz: e7a2b9ff95f2f4a0d33cc53dee5f52b4f3953c4f95756ec96d6956908253d95f
+  data.tar.gz: 59dda32afecd9ad67da8dfca3fa044cb38f6a0986f840b4a71934bc1baf3f3cd
 SHA512:
-  metadata.gz: d284c67aec9969f151437f45751978f8d26da471484b816adcb633f31d8e55950ef09d8035d686382cc44c4eae8c895192dbdbfcf9652cb1cd2594961fbc295c
-  data.tar.gz: af01d1a6e41a303bafa730578bb187462ce4f8ecf5c2436544c68192eceacc99d99c1d01c4cd1cff235e53341ddf9dd1d298f75b2f5f565fd0bd0a3cfc7ba01a
+  metadata.gz: a2bed89e4af7df4fd98dd744c74a9ba9de8f4ef7ea7ce88a7127507c04f2e06ac6f64db0e79fe3c88b0e5b245b51cf220ac59d7d4b2a91d84fa75b5c4f7936da
+  data.tar.gz: bae24c84a5f8933e7a19730074f16a83c4fa1284804cbe3fb177c2814373c2e19e86163f49c1fe8473d3bdddd564f65fc2e0219f1c0db9994216050449bbcfe2

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

@@ -59,7 +59,7 @@ module RuboCop
 
         def register_offense(current)
           current_field_name = field_name(current)
-          field_name_message = " in field `#{current_field_name}`" if current_field_name
+          field_name_message = " in field #{current_field_name}" if current_field_name
 
           message = format(
             self.class::MSG,
@@ -81,9 +81,16 @@ module RuboCop
           is_field_block = node.block_type? &&
                            node.respond_to?(:method_name) &&
                            node.method_name == :field
-          return node.send_node.first_argument.value.to_s if is_field_block
 
-          field_name(node.parent)
+          return field_name(node.parent) unless is_field_block
+
+          first_argument = node.send_node.first_argument
+          if first_argument.lvar_type?
+            variable_name = first_argument.children.first
+            return "with name from `#{variable_name}` variable"
+          end
+
+          "`#{first_argument.value}`"
         end
 
         def_node_search :argument_declarations, <<~PATTERN

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

@@ -67,10 +67,7 @@ module RuboCop
 
         def on_class(node)
           resolve_method_node = find_resolve_method_node(node)
-          return if resolve_method_node.nil? ||
-                    resolve_method_node.arguments.any? do |arg|
-                      arg.arg_type? || arg.kwrestarg_type?
-                    end
+          return if resolve_method_node.nil? || ignore_arguments_type?(resolve_method_node)
 
           declared_arg_nodes = find_declared_arg_nodes(node)
           return unless declared_arg_nodes.any?
@@ -82,9 +79,14 @@ module RuboCop
         private
 
         def find_declared_arg_nodes(node)
-          argument_declarations(node).select do |arg_declaration|
-            # argument is declared on the same class that is being analyzed
-            arg_declaration.each_ancestor(:class).first == node
+          node.each_child_node.flat_map do |child|
+            if scoped_node?(child)
+              []
+            elsif argument_declaration?(child)
+              [child]
+            else
+              find_declared_arg_nodes(child)
+            end
           end
         end
 
@@ -109,6 +111,12 @@ module RuboCop
           end
         end
 
+        def ignore_arguments_type?(resolve_method_node)
+          resolve_method_node.arguments.any? do |arg|
+            arg.arg_type? || arg.kwrestarg_type? || arg.forward_arg_type?
+          end
+        end
+
         def register_offense(node, unresolved_args)
           unresolved_args_source = unresolved_args.map { |v| "#{v}:" }.join(", ")
 
@@ -155,7 +163,19 @@ module RuboCop
           declared_arg.name
         end
 
-        def_node_search :argument_declarations, <<~PATTERN
+        def scoped_node?(node)
+          scope_changing_syntax?(node) || block_or_lambda?(node)
+        end
+
+        def scope_changing_syntax?(node)
+          node.def_type? || node.defs_type? || node.class_type? || node.module_type?
+        end
+
+        def block_or_lambda?(node)
+          node.block_type? || node.lambda_type?
+        end
+
+        def_node_matcher :argument_declaration?, <<~PATTERN
           (send nil? :argument (:sym _) ...)
         PATTERN
 

data/lib/rubocop/graphql/swap_range.rb

@@ -3,22 +3,22 @@
 module RuboCop
   module GraphQL
     module SwapRange
+      include RuboCop::Cop::RangeHelp
+
       def swap_range(corrector, current, previous)
         current_range = declaration(current)
         previous_range = declaration(previous)
 
-        src1 = current_range.source
-        src2 = previous_range.source
-
-        corrector.replace(current_range, src2)
-        corrector.replace(previous_range, src1)
+        corrector.insert_before(previous_range, current_range.source)
+        corrector.remove(current_range)
       end
 
       def declaration(node)
         buffer = processed_source.buffer
-        begin_pos = node.source_range.begin_pos
+        begin_pos = range_by_whole_lines(node.source_range).begin_pos
         end_line = buffer.line_for_position(node.loc.expression.end_pos)
-        end_pos = buffer.line_range(end_line).end_pos
+        end_pos = range_by_whole_lines(buffer.line_range(end_line),
+                                       include_final_newline: true).end_pos
         Parser::Source::Range.new(buffer, begin_pos, end_pos)
       end
     end

data/lib/rubocop/graphql/version.rb

@@ -1,5 +1,5 @@
 module RuboCop
   module GraphQL
-    VERSION = "0.14.1".freeze
+    VERSION = "0.14.4".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-graphql
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.14.4
 platform: ruby
 authors:
 - Dmitry Tsepelev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-25 00:00:00.000000000 Z
+date: 2022-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Automatic performance checking tool for Ruby code.