rubocop-graphql 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34e03ca837f50f20a65cb0e80d7322c5b2998160148dbc354052875335efee8d
-  data.tar.gz: d14bb40f366fa3320c56262a7fafa7d47ffbe445092e481b3d9d0e946bd64649
+  metadata.gz: 1d488e2bcf0fac1f61555afb433e26834bc653b88598ba9fd23d58be29db44cc
+  data.tar.gz: 31afb3a28f7cd44f165dcd4bd93aecebf270ccc2af05f50816f171f19c88680d
 SHA512:
-  metadata.gz: 634b1f66850e898eb545d78da1f6ccb8c0b0bc4fe11d5910e9d8f4820ea1af19e5d55a09ca755acfea73eb6cbb114ac59436a1dae6e6282da8b5fc176c09533e
-  data.tar.gz: 95ec70c992b7428116555b7c1107d1465d14ce7aa6753efea42ad4739a3c6c4bb3f67f0450eb320cd04d8bba4afbce0b00d1d3e4cef8aa305fa4eb80f81113bd
+  metadata.gz: a5d35e978439e99de72eb4d90088b6a726bfbf78a6303ce422bfb09a05b4d965e7a28acb06ada12538dea8148f691384a48682ad651cc39d631e779d41098cfb
+  data.tar.gz: 44ca6c9891b4184b6ab40b1a4be8d9398fb94276502a603f09639bf5993c553aee01f845e61a119470f1a7eb5f51659db7114bf47a472c41394649b91fc20c28

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

@@ -20,11 +20,13 @@ module RuboCop
       #   end
       #
       class ArgumentUniqueness < Base
+        include RuboCop::GraphQL::NodeUniqueness
+
         MSG = "Argument names should only be defined once per block. "\
               "Argument `%<current>s` is duplicated%<field_name>s."
 
         def on_class(node)
-          return if nested_class?(node)
+          return if ::RuboCop::GraphQL::Class.new(node).nested?
 
           # { "MyClassName" => { "test_field" => <Set: {"field_arg_name"}> } }
           argument_names_by_field_by_class = Hash.new do |h, k|
@@ -36,7 +38,7 @@ module RuboCop
           argument_declarations(node).each do |current|
             current_field_name = field_name(current)
             current_argument_name = argument_name(current)
-            class_name = current_class_name(current)
+            class_name = current_class_full_name(current)
 
             argument_names = if current_field_name
                                argument_names_by_field_by_class[class_name][current_field_name]
@@ -55,14 +57,6 @@ module RuboCop
 
         private
 
-        def current_class_name(node)
-          node.each_ancestor(:class).first.defined_module_name
-        end
-
-        def nested_class?(node)
-          node.each_ancestor(:class).any?
-        end
-
         def register_offense(current)
           current_field_name = field_name(current)
           field_name_message = " in field `#{current_field_name}`" if current_field_name

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

@@ -27,16 +27,18 @@ module RuboCop
       #   end
       #
       class FieldUniqueness < Base
+        include RuboCop::GraphQL::NodeUniqueness
+
         MSG = "Field names should only be defined once per type. "\
               "Field `%<current>s` is duplicated."
 
         def on_class(node)
-          return if nested_class?(node)
+          return if ::RuboCop::GraphQL::Class.new(node).nested?
 
           field_names_by_class = Hash.new { |h, k| h[k] = Set.new }
 
           field_declarations(node).each do |current|
-            current_class = current_class_name(current)
+            current_class = current_class_full_name(current)
             field_names = field_names_by_class[current_class]
             current_field_name = field_name(current)
 
@@ -51,10 +53,6 @@ module RuboCop
 
         private
 
-        def nested_class?(node)
-          node.each_ancestor(:class).any?
-        end
-
         def register_offense(current)
           message = format(
             self.class::MSG,
@@ -68,10 +66,6 @@ module RuboCop
           node.first_argument.value.to_s
         end
 
-        def current_class_name(node)
-          node.each_ancestor(:class).first.defined_module_name
-        end
-
         def_node_search :field_declarations, <<~PATTERN
           {
             (send nil? :field (:sym _) ...)

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

@@ -139,11 +139,10 @@ module RuboCop
         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
+          return declared_arg.as if declared_arg.kwargs.as
+          return inferred_arg_name(declared_arg.name.to_s) if declared_arg.kwargs.loads
+
+          declared_arg.name
         end
 
         def_node_search :argument_declarations, <<~PATTERN

data/lib/rubocop/graphql/class.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module GraphQL
+    class Class
+      attr_reader :node
+
+      def initialize(node)
+        @node = node
+      end
+
+      def nested?
+        node.each_ancestor(:class).any?
+      end
+    end
+  end
+end

data/lib/rubocop/graphql/node_uniqueness.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module GraphQL
+    # Shared methods to check duplicated definitions
+    module NodeUniqueness
+      def current_class_full_name(node)
+        node.each_ancestor(:class).map(&:defined_module_name).join("::")
+      end
+
+      def nested_class?(node)
+        node.each_ancestor(:class).any?
+      end
+    end
+  end
+end

data/lib/rubocop/graphql/version.rb

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

data/lib/rubocop-graphql.rb

@@ -9,11 +9,13 @@ require_relative "rubocop/graphql/version"
 require_relative "rubocop/graphql/inject"
 require_relative "rubocop/graphql/description_method"
 require_relative "rubocop/graphql/node_pattern"
+require_relative "rubocop/graphql/node_uniqueness"
 require_relative "rubocop/graphql/swap_range"
 
 require_relative "rubocop/graphql/argument"
 require_relative "rubocop/graphql/argument/block"
 require_relative "rubocop/graphql/argument/kwargs"
+require_relative "rubocop/graphql/class"
 require_relative "rubocop/graphql/field"
 require_relative "rubocop/graphql/field/block"
 require_relative "rubocop/graphql/field/kwargs"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-graphql
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Dmitry Tsepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-05 00:00:00.000000000 Z
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,6 +106,7 @@ files:
 - lib/rubocop/graphql/argument.rb
 - lib/rubocop/graphql/argument/block.rb
 - lib/rubocop/graphql/argument/kwargs.rb
+- lib/rubocop/graphql/class.rb
 - lib/rubocop/graphql/description_method.rb
 - lib/rubocop/graphql/ext/snake_case.rb
 - lib/rubocop/graphql/field.rb
@@ -113,6 +114,7 @@ files:
 - lib/rubocop/graphql/field/kwargs.rb
 - lib/rubocop/graphql/inject.rb
 - lib/rubocop/graphql/node_pattern.rb
+- lib/rubocop/graphql/node_uniqueness.rb
 - lib/rubocop/graphql/schema_member.rb
 - lib/rubocop/graphql/swap_range.rb
 - lib/rubocop/graphql/version.rb