rubocop-graphql 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75ede967be105c3771fc0c6c648632bf3c8fc49c1e81bb1f89d8b475c0403555
-  data.tar.gz: ec1ced3e202cac94d70c24ecf890c63c0c7cca819edd623476bf7e831083bd1b
+  metadata.gz: 30e4dfa482d073cf52c315042d736a54ce725491b3dcf130c9fecd3987bed8d2
+  data.tar.gz: 4e2467eab2c0ae0be138f6acf3b21912ad888c7b3cbcad98c2c7b0da3d9579af
 SHA512:
-  metadata.gz: ccca643eb811b6c25a4b8f2918b7c094a943b8c3a477d9c4b17c8e0bb4e75fa0d11b167c652790619e356716f6bc6c501446334c6f4d65f4ea75ffa4da2dfa3a
-  data.tar.gz: 62d6ec1ae491c25c1c35b3c8a2d90fbec5a938034bbbc8d4abb7a38c3a7a50f2f359433f845e308f2e5257d9614ff7d3c43a403d56a34c61e575738eee2433ff
+  metadata.gz: 6099e724a272914bac6212d07ad92256316db2874b26edcd2daf9e8155668f5ddb6b394221b740e8ed51273b49eb101cd83cba55c59352a6c2cd178e972afb9b
+  data.tar.gz: 80f3d7cfa9e10f209e3f8d2cbf373ac370dc738da62e05b704f37cb8aaccd41216aed6294f063092d26c606645877b3bc0c2aba77bfabf6b5590b79d31e6928f

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

@@ -57,30 +57,33 @@ module RuboCop
           )
         PATTERN
 
-        def_node_matcher :resolver_method_option, <<~PATTERN
-          (pair (sym :resolver_method) (sym $...))
+        def_node_matcher :class_body, <<~PATTERN
+          (class ... (begin $...))
         PATTERN
 
         def on_send(node)
-          return unless field_definition?(node)
-
-          case style
-          when :group_definitions
-            check_grouped_field_declarations(node.parent)
-          when :define_resolver_after_definition
-            field = RuboCop::GraphQL::Field.new(node)
-            check_resolver_is_defined_after_definition(field)
-          end
+          return if !field_definition?(node) || style != :define_resolver_after_definition
+
+          field = RuboCop::GraphQL::Field.new(node)
+          check_resolver_is_defined_after_definition(field)
+        end
+
+        def on_class(node)
+          return if style != :group_definitions
+
+          body = class_body(node)
+          check_grouped_field_declarations(body) if body
         end
 
         private
 
         GROUP_DEFS_MSG = "Group all field definitions together."
 
-        def check_grouped_field_declarations(node)
-          fields = node.each_child_node.select { |node| field_definition?(node) }
+        def check_grouped_field_declarations(body)
+          fields = body.select { |node| field_definition?(node) || field_definition_with_body?(node) }
 
           first_field = fields.first
+
           fields.each_with_index do |node, idx|
             next if node.sibling_index == first_field.sibling_index + idx
 
@@ -93,16 +96,31 @@ module RuboCop
         def check_resolver_is_defined_after_definition(field)
           return if field.resolver || field.method || field.hash_key
 
-          resolver_method = field.kwargs.flat_map { |kwarg| resolver_method_option(kwarg) }.compact.first
+          root = field.ancestors.find { |parent| root_node?(parent) }
+          method_definition = find_method_definition(root, field.resolver_method_name)
+          return unless method_definition
 
-          method_name = resolver_method || field.name
-          method_definition = field.parent.each_child_node.find { |node|
-            node.def_type? && node.method_name == method_name
-          }
-
-          if method_definition.sibling_index - field.sibling_index > 1
-            add_offense(field.node, message: RESOLVER_AFTER_FIELD_MSG)
+          field_sibling_index = if field_definition_with_body?(field.parent)
+            field.parent.sibling_index
+          else
+            field.sibling_index
           end
+
+          return if method_definition.sibling_index - field_sibling_index == 1
+
+          add_offense(field.node, message: RESOLVER_AFTER_FIELD_MSG)
+        end
+
+        def find_method_definition(root, method_name)
+          class_body(root).find { |node| node.def_type? && node.method_name == method_name }
+        end
+
+        def root_node?(node)
+          node.parent.nil? || root_with_siblings?(node.parent)
+        end
+
+        def root_with_siblings?(node)
+          node.begin_type? && node.parent.nil?
         end
       end
     end

data/lib/rubocop/graphql/field.rb

@@ -6,7 +6,7 @@ module RuboCop
       extend Forwardable
       extend RuboCop::NodePattern::Macros
 
-      def_delegators :@node, :sibling_index, :parent
+      def_delegators :@node, :sibling_index, :parent, :ancestors
 
       def_node_matcher :field_kwargs, <<~PATTERN
         (send nil? :field
@@ -37,6 +37,10 @@ module RuboCop
         (pair (sym :hash_key) ...)
       PATTERN
 
+      def_node_matcher :resolver_method_option, <<~PATTERN
+        (pair (sym :resolver_method) (sym $...))
+      PATTERN
+
       attr_reader :node
 
       def initialize(node)
@@ -66,6 +70,10 @@ module RuboCop
       def hash_key
         kwargs.find { |kwarg| hash_key_kwarg?(kwarg) }
       end
+
+      def resolver_method_name
+        @resolver_method_name ||= kwargs.flat_map { |kwarg| resolver_method_option(kwarg) }.compact.first || name
+      end
     end
   end
 end

data/lib/rubocop/graphql/node_pattern.rb

@@ -8,6 +8,13 @@ module RuboCop
       def_node_matcher :field_definition?, <<~PATTERN
         (send nil? :field ...)
       PATTERN
+
+      def_node_matcher :field_definition_with_body?, <<~PATTERN
+        (block
+          (send nil? :field ...)
+          ...
+        )
+      PATTERN
     end
   end
 end

data/lib/rubocop/graphql/version.rb

@@ -1,5 +1,5 @@
 module RuboCop
   module GraphQL
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-graphql
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Dmitry Tsepelev