rubocop-graphql 0.14.3 → 0.14.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1aef8d25bbcf29e3aac8dd31b10b16341f88a0e27d71a04290ee4c265686db4
-  data.tar.gz: 1f8e8a06d5f7c7b1a301c45672634b98fbd748b1904b7e8639bf7377b82d4654
+  metadata.gz: a7832bf74fe37877eee6544f83cc7625cfa874df93f6b141c07a2c1a628a927f
+  data.tar.gz: c764f2caaf3cbbb685eb944b1a206c4904a484fe000f39a41c40b33846eecc1b
 SHA512:
-  metadata.gz: 050f68792f4b7b042994e3bcb9cc9aef1d5d42dc548d91ec7799b7d83211adc4efee756510cdf18c282d99e11e589a4bea1566a1ee2605944da927a7ff10463d
-  data.tar.gz: 8ed14cde041d5d10f58f0e0ad9a8fee1c6a73f80e0d5c947af82fba6a5f70b7c72269e585f195f9123cea1a5bc0bebe37969d65e81dd55e49ce60fc89ab36fae
+  metadata.gz: 9bdb7f16d1b31c795e8d624030e774c3c92ebb1481e4459f229fe135557eb072dbe2920c1cfc2600bb0d768756b338846da6db1b396def061d95ad4d0628e5b0
+  data.tar.gz: d506eade963151227cfa3bf55f7ddf320b281111083ac784807c7c6aa6534a0899a01474d2c80f35c2460d1817b18f033d05ce880be59f477b5fe75cf85ce0e8

data/config/default.yml

@@ -77,6 +77,7 @@ GraphQL/ExtractType:
   MaxFields: 2
   Prefixes:
     - is
+    - has
     - with
     - avg
     - min
@@ -108,5 +109,3 @@ GraphQL/OrderedFields:
 GraphQL/UnusedArgument:
   Enabled: true
   Description: 'Arguments should either be listed explicitly or **rest should be in the resolve signature'
-
-

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

@@ -80,7 +80,7 @@ module RuboCop
 
           is_field_block = node.block_type? &&
                            node.respond_to?(:method_name) &&
-                           node.method_name == :field
+                           node.method?(:field)
 
           return field_name(node.parent) unless is_field_block
 
@@ -93,6 +93,7 @@ module RuboCop
           "`#{first_argument.value}`"
         end
 
+        # @!method argument_declarations(node)
         def_node_search :argument_declarations, <<~PATTERN
           (send nil? :argument (:sym _) ...)
         PATTERN

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

@@ -4,7 +4,7 @@ module RuboCop
   module Cop
     module GraphQL
       class ExtractInputType < Base
-        # This cop checks fields on common prefix groups
+        # Checks fields on common prefix groups
         #
         # # @example
         #   # good

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

@@ -4,7 +4,7 @@ module RuboCop
   module Cop
     module GraphQL
       class ExtractType < Base
-        # This cop checks fields on common prefix groups
+        # Checks fields on common prefix groups
         #
         # # @example
         #   # good

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module GraphQL
-      # This cop checks consistency of field definitions
+      # Checks consistency of field definitions
       #
       # EnforcedStyle supports two modes:
       #
@@ -52,6 +52,7 @@ module RuboCop
         include RuboCop::GraphQL::Sorbet
         include RuboCop::GraphQL::Heredoc
 
+        # @!method field_kwargs(node)
         def_node_matcher :field_kwargs, <<~PATTERN
           (send nil? :field
             ...

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

@@ -28,6 +28,7 @@ module RuboCop
         include RuboCop::GraphQL::NodePattern
         include RuboCop::Cop::RangeHelp
 
+        # @!method hash_key_to_use(node)
         def_node_matcher :hash_key_to_use, <<~PATTERN
           (def
             _
@@ -50,7 +51,7 @@ module RuboCop
           suggested_hash_key_name = hash_key_to_use(method_definition)
 
           return if suggested_hash_key_name.nil?
-          return if RuboCop::GraphQL::Field::CONFLICT_FIELD_NAMES.include?(suggested_hash_key_name)
+          return if conflict?(suggested_hash_key_name)
 
           add_offense(node, message: message(suggested_hash_key_name)) do |corrector|
             autocorrect(corrector, node)
@@ -59,6 +60,10 @@ module RuboCop
 
         private
 
+        def conflict?(suggested_hash_key_name)
+          RuboCop::GraphQL::Field::CONFLICT_FIELD_NAMES.include?(suggested_hash_key_name.to_sym)
+        end
+
         def message(hash_key)
           format(MSG, hash_key: hash_key)
         end

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

@@ -28,6 +28,7 @@ module RuboCop
         include RuboCop::GraphQL::NodePattern
         include RuboCop::Cop::RangeHelp
 
+        # @!method method_to_use(node)
         def_node_matcher :method_to_use, <<~PATTERN
           (def
             _

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module GraphQL
-      # This cop detects duplicate field definitions within
+      # Detects duplicate field definitions within
       # the same type
       #
       # @example
@@ -66,6 +66,7 @@ module RuboCop
           node.first_argument.value.to_s
         end
 
+        # @!method field_declarations(node)
         def_node_search :field_declarations, <<~PATTERN
           {
             (send nil? :field (:sym _) ...)

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

@@ -20,6 +20,7 @@ module RuboCop
     #
     module GraphQL
       class LegacyDsl < Base
+        # @!method legacy_dsl?(node)
         def_node_matcher :legacy_dsl?, <<~PATTERN
           (block
             (send
@@ -29,10 +30,11 @@ 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
+          return unless node.parent.block_type?
 
           add_offense(node.parent) if legacy_dsl?(node.parent)
         end

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

@@ -26,10 +26,12 @@ module RuboCop
 
         MSG = "Missing type description"
 
+        # @!method has_i18n_description?(node)
         def_node_matcher :has_i18n_description?, <<~PATTERN
           (send nil? :description (send (const nil? :I18n) :t ...))
         PATTERN
 
+        # @!method interface?(node)
         def_node_matcher :interface?, <<~PATTERN
           (send nil? :include (const ...))
         PATTERN

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

@@ -101,10 +101,12 @@ module RuboCop
           previous.source_range.last_line == current.source_range.first_line - 1
         end
 
+        # @!method argument_declarations_without_blocks(node)
         def_node_search :argument_declarations_without_blocks, <<~PATTERN
           (send nil? :argument (:sym _) ...)
         PATTERN
 
+        # @!method argument_declarations_with_blocks(node)
         def_node_search :argument_declarations_with_blocks, <<~PATTERN
           (block
             (send nil? :argument

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

@@ -74,6 +74,7 @@ module RuboCop
           previous.source_range.last_line == current.source_range.first_line - 1
         end
 
+        # @!method field_declarations(node)
         def_node_search :field_declarations, <<~PATTERN
           {
             (send nil? :field (:sym _) ...)

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

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module GraphQL
-      # This cop checks if the length of a resolver method exceeds some maximum value.
+      # Checks if the length of a resolver method exceeds some maximum value.
       # Comment lines can optionally be ignored.
       #
       # The maximum allowed length is configurable using the Max option.
@@ -13,6 +13,7 @@ module RuboCop
 
         MSG = "ResolverMethod has too many lines. [%<total>d/%<max>d]"
 
+        # @!method field_definition(node)
         def_node_matcher :field_definition, <<~PATTERN
           (send nil? :field (sym $...) ...)
         PATTERN

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,10 +163,24 @@ 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
+
+        # @!method argument_declaration?(node)
+        def_node_matcher :argument_declaration?, <<~PATTERN
           (send nil? :argument (:sym _) ...)
         PATTERN
 
+        # @!method resolve_method_definition(node)
         def_node_search :resolve_method_definition, <<~PATTERN
           (def :resolve
             (args ...) ...)

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

@@ -7,6 +7,7 @@ module RuboCop
         extend RuboCop::NodePattern::Macros
         include DescriptionMethod
 
+        # @!method argument_block(node)
         def_node_matcher :argument_block, <<~PATTERN
           (block
             (send nil? :argument ...)

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

@@ -6,6 +6,7 @@ module RuboCop
       class Kwargs
         extend RuboCop::NodePattern::Macros
 
+        # @!method argument_kwargs(node)
         def_node_matcher :argument_kwargs, <<~PATTERN
           (send nil? :argument
             ...
@@ -15,14 +16,17 @@ module RuboCop
           )
         PATTERN
 
+        # @!method description_kwarg?(node)
         def_node_matcher :description_kwarg?, <<~PATTERN
           (pair (sym :description) ...)
         PATTERN
 
+        # @!method loads_kwarg?(node)
         def_node_matcher :loads_kwarg?, <<~PATTERN
           (pair (sym :loads) ...)
         PATTERN
 
+        # @!method as_kwarg?(node)
         def_node_matcher :as_kwarg?, <<~PATTERN
           (pair (sym :as) ...)
         PATTERN

data/lib/rubocop/graphql/argument.rb

@@ -5,14 +5,17 @@ module RuboCop
     class Argument
       extend RuboCop::NodePattern::Macros
 
+      # @!method argument_description(node)
       def_node_matcher :argument_description, <<~PATTERN
         (send nil? :argument _ _ (:str $_) ...)
       PATTERN
 
+      # @!method argument_name(node)
       def_node_matcher :argument_name, <<~PATTERN
         (send nil? :argument (:sym $_) ...)
       PATTERN
 
+      # @!method argument_as(node)
       def_node_matcher :argument_as, <<~PATTERN
         (pair (sym :as) (sym $_))
       PATTERN

data/lib/rubocop/graphql/description_method.rb

@@ -22,10 +22,12 @@ module RuboCop
 
       DESCRIPTION_STRING = "{({str|dstr|const} ...)|(send const ...)|(send ({str|dstr} ...) _)}"
 
+      # @!method description_method_call?(node)
       def_node_matcher :description_method_call?, <<~PATTERN
         (send nil? :description #{DESCRIPTION_STRING})
       PATTERN
 
+      # @!method description_with_block_arg?(node)
       def_node_matcher :description_with_block_arg?, <<~PATTERN
         (send (lvar _) {:description= :description} #{DESCRIPTION_STRING})
       PATTERN

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

@@ -7,6 +7,7 @@ module RuboCop
         extend RuboCop::NodePattern::Macros
         include DescriptionMethod
 
+        # @!method field_block(node)
         def_node_matcher :field_block, <<~PATTERN
           (block
             (send nil? :field ...)

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

@@ -6,6 +6,7 @@ module RuboCop
       class Kwargs
         extend RuboCop::NodePattern::Macros
 
+        # @!method field_kwargs(node)
         def_node_matcher :field_kwargs, <<~PATTERN
           (send nil? :field
             ...
@@ -15,22 +16,27 @@ module RuboCop
           )
         PATTERN
 
+        # @!method resolver_kwarg?(node)
         def_node_matcher :resolver_kwarg?, <<~PATTERN
           (pair (sym :resolver) ...)
         PATTERN
 
+        # @!method method_kwarg?(node)
         def_node_matcher :method_kwarg?, <<~PATTERN
           (pair (sym :method) ...)
         PATTERN
 
+        # @!method hash_key_kwarg?(node)
         def_node_matcher :hash_key_kwarg?, <<~PATTERN
           (pair (sym :hash_key) ...)
         PATTERN
 
+        # @!method description_kwarg?(node)
         def_node_matcher :description_kwarg?, <<~PATTERN
           (pair (sym :description) ...)
         PATTERN
 
+        # @!method resolver_method_option(node)
         def_node_matcher :resolver_method_option, <<~PATTERN
           (pair (sym :resolver_method) (sym $...))
         PATTERN

data/lib/rubocop/graphql/field.rb

@@ -20,15 +20,18 @@ module RuboCop
 
       def_delegators :@node, :sibling_index, :parent
 
+      # @!method field_name(node)
       def_node_matcher :field_name, <<~PATTERN
         (send nil? :field (:sym $_) ...)
       PATTERN
 
+      # @!method field_with_body_name(node)
       def_node_matcher :field_with_body_name, <<~PATTERN
         (block
         (send nil? :field (:sym $_) ...)...)
       PATTERN
 
+      # @!method field_description(node)
       def_node_matcher :field_description, <<~PATTERN
         (send nil? :field _ _ (:str $_) ...)
       PATTERN

data/lib/rubocop/graphql/node_pattern.rb

@@ -5,10 +5,12 @@ module RuboCop
     module NodePattern
       extend RuboCop::NodePattern::Macros
 
+      # @!method field_definition?(node)
       def_node_matcher :field_definition?, <<~PATTERN
         (send nil? :field (:sym _) ...)
       PATTERN
 
+      # @!method field_definition_with_body?(node)
       def_node_matcher :field_definition_with_body?, <<~PATTERN
         (block
           (send nil? :field (:sym _) ...)
@@ -16,6 +18,7 @@ module RuboCop
         )
       PATTERN
 
+      # @!method argument?(node)
       def_node_matcher :argument?, <<~PATTERN
         (send nil? :argument (:sym _) ...)
       PATTERN

data/lib/rubocop/graphql/schema_member.rb

@@ -5,6 +5,7 @@ module RuboCop
     class SchemaMember
       extend RuboCop::NodePattern::Macros
 
+      # @!method class_contents(node)
       def_node_matcher :class_contents, <<~PATTERN
         (class _ _ $_)
       PATTERN
@@ -16,7 +17,7 @@ module RuboCop
       end
 
       def find_method_definition(method_name)
-        body.find { |node| node.def_type? && node.method_name == method_name }
+        body.find { |node| node.def_type? && node.method?(method_name) }
       end
 
       def body

data/lib/rubocop/graphql/sorbet.rb

@@ -5,6 +5,7 @@ module RuboCop
     module Sorbet
       extend RuboCop::NodePattern::Macros
 
+      # @!method sorbet_signature(node)
       def_node_matcher(:sorbet_signature, <<~PATTERN)
         (block (send nil? :sig) (args) ...)
       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.3".freeze
+    VERSION = "0.14.6".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-graphql
 version: !ruby/object:Gem::Version
-  version: 0.14.3
+  version: 0.14.6
 platform: ruby
 authors:
 - Dmitry Tsepelev
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-16 00:00:00.000000000 Z
+date: 2022-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -127,7 +127,7 @@ metadata:
   homepage_uri: https://github.com/DmitryTsepelev/rubocop-graphql
   source_code_uri: https://github.com/DmitryTsepelev/rubocop-graphql
   changelog_uri: https://github.com/DmitryTsepelev/rubocop-graphql/blob/master/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -142,8 +142,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Automatic performance checking tool for Ruby code.
 test_files: []