rubocop-graphql 0.14.2 → 0.14.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8c5edb3e37ffc8245916608bb37f79dc28afb39dde464477e5b31e7f92aef59
-  data.tar.gz: 3fc868fb4e1ee8cdb0fed44c35ae98899e83eb605e0618faba161f65344554b4
+  metadata.gz: 5c4b8fdbb39f5e0bea2bbcce54cdd520480f1e412a2b3c5ce549b7c37a5e2cbb
+  data.tar.gz: 5e6065465cad8df870476977d0b9e4ac64869c27a4247570c5d6d6d56bb32577
 SHA512:
-  metadata.gz: 96f21cb69d2a7fc4c5c084e4859756fc7f525fc29e5c7c2dd4bf5fb1233d039ff3932d5783cdd10f91b0cee15c5cc8c91e94e3fec2f07ee0d09fdbc4b32e2799
-  data.tar.gz: c88d409a7c67630c3f68d98fb6d78418be4c3c99d601470f9732ed456b4ee86f3f2439323c019b82eaa52f2b613aa01fdf14cc195304eb3fc0a7c6bb3bec6774
+  metadata.gz: 267c257092e56d804772fa9f58e0e657151348758d80b7b453b07c00e0aa33651b61f326424822f2fcc272dacff45a245820c3a9eea8bbe00e344ed6ff17bc83
+  data.tar.gz: badf0bbcdefc806c43cdc60defadf002cfc645dfb6c2f6bf6609b444c18cd9c13bb81b4a4c48eebf3ae25ffbdaf477678d6807349133866098736387d483df90

data/config/default.yml

@@ -77,6 +77,7 @@ GraphQL/ExtractType:
   MaxFields: 2
   Prefixes:
     - is
+    - has
     - with
     - avg
     - min

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/legacy_dsl.rb

@@ -29,7 +29,8 @@ module RuboCop
           )
         PATTERN
 
-        MSG = "Avoid using legacy based type-based definitions. Use class-based defintions instead."
+        MSG = "Avoid using legacy based type-based definitions. " \
+              "Use class-based definitions instead."
 
         def on_send(node)
           return unless node.parent.type == :block

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

@@ -79,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
 
@@ -158,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.2".freeze
+    VERSION = "0.14.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-graphql
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.14.5
 platform: ruby
 authors:
 - Dmitry Tsepelev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-26 00:00:00.000000000 Z
+date: 2022-08-02 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.