rubocop-graphql 0.14.0 → 0.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf7d97ba00fa1e49f43e15e6dd5ee134169eedff3603dc2fcad6d85d832529f0
-  data.tar.gz: ea8b222d69f599a1d9b341fadc15306f8a2b2aff17acf2853aa6129a45bdc056
+  metadata.gz: c1aef8d25bbcf29e3aac8dd31b10b16341f88a0e27d71a04290ee4c265686db4
+  data.tar.gz: 1f8e8a06d5f7c7b1a301c45672634b98fbd748b1904b7e8639bf7377b82d4654
 SHA512:
-  metadata.gz: dc4926760bca79b7a6ea7f3cb73b3b035d52b7cdc2a3819a76aefaadf28b11aef232ee6fed961301cdc65467592effa0d02217d6fdbf8c91bf703688b5834f31
-  data.tar.gz: 6b3bb0304272b6c6ec0b793f698f9139d53da73bbdf2038ab26d4734c754f5b098e075fcf354c361c71f1e82bdaf3be358be1c9b85065d631e5e54fa89b978a1
+  metadata.gz: 050f68792f4b7b042994e3bcb9cc9aef1d5d42dc548d91ec7799b7d83211adc4efee756510cdf18c282d99e11e589a4bea1566a1ee2605944da927a7ff10463d
+  data.tar.gz: 8ed14cde041d5d10f58f0e0ad9a8fee1c6a73f80e0d5c947af82fba6a5f70b7c72269e585f195f9123cea1a5bc0bebe37969d65e81dd55e49ce60fc89ab36fae

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

@@ -52,7 +52,7 @@ module RuboCop
 
         def has_description?(node)
           has_i18n_description?(node) ||
-            description_kwarg?(node)
+            description_method_call?(node)
         end
 
         def child_nodes(node)

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?
@@ -109,6 +106,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(", ")
 

data/lib/rubocop/graphql/argument/block.rb

@@ -10,7 +10,7 @@ module RuboCop
         def_node_matcher :argument_block, <<~PATTERN
           (block
             (send nil? :argument ...)
-            (args)
+            (args ...)
             $...
           )
         PATTERN

data/lib/rubocop/graphql/description_method.rb

@@ -20,13 +20,18 @@ module RuboCop
     module DescriptionMethod
       extend RuboCop::NodePattern::Macros
 
-      def_node_matcher :description_kwarg?, <<~PATTERN
-        (send nil? :description
-          {({str|dstr|const} ...)|(send const ...)|(send ({str|dstr} ...) _)})
+      DESCRIPTION_STRING = "{({str|dstr|const} ...)|(send const ...)|(send ({str|dstr} ...) _)}"
+
+      def_node_matcher :description_method_call?, <<~PATTERN
+        (send nil? :description #{DESCRIPTION_STRING})
+      PATTERN
+
+      def_node_matcher :description_with_block_arg?, <<~PATTERN
+        (send (lvar _) {:description= :description} #{DESCRIPTION_STRING})
       PATTERN
 
       def find_description_method(nodes)
-        nodes.find { |kwarg| description_kwarg?(kwarg) }
+        nodes.find { |kwarg| description_method_call?(kwarg) || description_with_block_arg?(kwarg) }
       end
     end
   end

data/lib/rubocop/graphql/field/block.rb

@@ -10,7 +10,7 @@ module RuboCop
         def_node_matcher :field_block, <<~PATTERN
           (block
             (send nil? :field ...)
-            (args)
+            (args ...)
             {(begin $...)|$...}
           )
         PATTERN

data/lib/rubocop/graphql/version.rb

@@ -1,5 +1,5 @@
 module RuboCop
   module GraphQL
-    VERSION = "0.14.0".freeze
+    VERSION = "0.14.3".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-graphql
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.3
 platform: ruby
 authors:
 - Dmitry Tsepelev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-23 00:00:00.000000000 Z
+date: 2022-05-16 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.2.33
 signing_key:
 specification_version: 4
 summary: Automatic performance checking tool for Ruby code.