rubocop-graphql 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a06d74f8fd3b057575ec841300332c5803de10df0fd2af2fb36f290830370e4
-  data.tar.gz: 75ecf04464efb37fd64dbc1f5ad4d2a2c12523a277090897a832080100530252
+  metadata.gz: 34e03ca837f50f20a65cb0e80d7322c5b2998160148dbc354052875335efee8d
+  data.tar.gz: d14bb40f366fa3320c56262a7fafa7d47ffbe445092e481b3d9d0e946bd64649
 SHA512:
-  metadata.gz: 14583dce74bc8bee2f10a024aad913f607de15b4e2ea340698b2b8ba211adaadd05e8130eb860074a94b670e967c8825b8bbbbd4b9d357bef99c201040531399
-  data.tar.gz: 48b9456d0f54573da9472832322dbdd11f5e7c4793a1713131fa4fc72d4f2e8e75b0206c22eb68a1a2bfc1811af3536464c6a1a2a23c0cd137108374035107c3
+  metadata.gz: 634b1f66850e898eb545d78da1f6ccb8c0b0bc4fe11d5910e9d8f4820ea1af19e5d55a09ca755acfea73eb6cbb114ac59436a1dae6e6282da8b5fc176c09533e
+  data.tar.gz: 95ec70c992b7428116555b7c1107d1465d14ce7aa6753efea42ad4739a3c6c4bb3f67f0450eb320cd04d8bba4afbce0b00d1d3e4cef8aa305fa4eb80f81113bd

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

@@ -10,16 +10,19 @@ module RuboCop
       #
       #   class SomeResolver < Resolvers::Base
       #     argument :arg1, String, required: true
-      #     argument :arg2, String, required: true
+      #     argument :user_id, String, required: true, loads: Types::UserType
+      #     argument :post_id, String, loads: Types::PostType, as: :article
+      #     argument :comment_ids, String, loads: Types::CommentType
       #
-      #     def resolve(arg1:, arg2:); end
+      #     def resolve(arg1:, user:, article:, comments:); end
       #   end
       #
       #   # good
       #
       #   class SomeResolver < Resolvers::Base
       #     argument :arg1, String, required: true
-      #     argument :arg2, String, required: true
+      #     argument :user_id, String, required: true, loads: Types::UserType
+      #     argument :comment_ids, String, loads: Types::CommentType
       #
       #     def resolve(arg1:, **rest); end
       #   end
@@ -84,12 +87,15 @@ module RuboCop
         end
 
         def find_unresolved_args(method_node, declared_arg_nodes)
-          resolve_method_kwargs = method_node.arguments.select(&:kwarg_type?).map do |node|
+          resolve_method_kwargs = method_node.arguments.select do |arg|
+            arg.kwarg_type? || arg.kwoptarg_type?
+          end
+          resolve_method_kwargs_names = resolve_method_kwargs.map do |node|
             node.node_parts[0]
           end.to_set
           declared_args = declared_arg_nodes.map { |node| RuboCop::GraphQL::Argument.new(node) }
-          declared_args.map(&:name).uniq.reject do |declared_arg|
-            resolve_method_kwargs.include?(declared_arg)
+          declared_args.map(&method(:arg_name)).uniq.reject do |declared_arg_name|
+            resolve_method_kwargs_names.include?(declared_arg_name)
           end
         end
 
@@ -119,6 +125,27 @@ module RuboCop
           node.loc.expression.end
         end
 
+        def inferred_arg_name(name_as_string)
+          case name_as_string
+          when /_id$/
+            name_as_string.sub(/_id$/, "").to_sym
+          when /_ids$/
+            name_as_string.sub(/_ids$/, "")
+                          .sub(/([^s])$/, "\\1s")
+                          .to_sym
+          else
+            name
+          end
+        end
+
+        def arg_name(declared_arg)
+          if declared_arg.kwargs.loads.nil?
+            declared_arg.name
+          else
+            declared_arg.as || inferred_arg_name(declared_arg.name.to_s)
+          end
+        end
+
         def_node_search :argument_declarations, <<~PATTERN
           (send nil? :argument (:sym _) ...)
         PATTERN

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

@@ -19,6 +19,14 @@ module RuboCop
           (pair (sym :description) ...)
         PATTERN
 
+        def_node_matcher :loads_kwarg?, <<~PATTERN
+          (pair (sym :loads) ...)
+        PATTERN
+
+        def_node_matcher :as_kwarg?, <<~PATTERN
+          (pair (sym :as) ...)
+        PATTERN
+
         def initialize(argument_node)
           @nodes = argument_kwargs(argument_node) || []
         end
@@ -26,6 +34,14 @@ module RuboCop
         def description
           @nodes.find { |kwarg| description_kwarg?(kwarg) }
         end
+
+        def loads
+          @nodes.find { |kwarg| loads_kwarg?(kwarg) }
+        end
+
+        def as
+          @nodes.find { |kwarg| as_kwarg?(kwarg) }
+        end
       end
     end
   end

data/lib/rubocop/graphql/argument.rb

@@ -13,6 +13,10 @@ module RuboCop
         (send nil? :argument (:sym $_) ...)
       PATTERN
 
+      def_node_matcher :argument_as, <<~PATTERN
+        (pair (sym :as) (sym $_))
+      PATTERN
+
       attr_reader :node
 
       def initialize(node)
@@ -23,6 +27,10 @@ module RuboCop
         @name ||= argument_name(@node)
       end
 
+      def as
+        @as ||= argument_as(kwargs.as)
+      end
+
       def description
         @description ||= argument_description(@node) || kwargs.description || block.description
       end

data/lib/rubocop/graphql/version.rb

@@ -1,5 +1,5 @@
 module RuboCop
   module GraphQL
-    VERSION = "0.12.0".freeze
+    VERSION = "0.12.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-graphql
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Dmitry Tsepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-30 00:00:00.000000000 Z
+date: 2022-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler