query_packwerk 0.1.25 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17113dea9c0b350f64d243c1a5006ecdf43852d7f33365f651fe398fe07e0a33
-  data.tar.gz: 97a781754bd44f134f48dddcb055ad8708b99bbde8aa78d121cc7d20193a6097
+  metadata.gz: 98b9a4d914a8be019fa0b1795cd527ac2bfd4ce7931b1e5a204704b5bb503847
+  data.tar.gz: 209fa3baaa03c0687daca480890ff32ec6c2111c1c902c3088771614d4127c53
 SHA512:
-  metadata.gz: d8587392bb0d8934d219c4d55b933b8102dda8eedc6f5214533f78b6d3cf3fbc17918ae84e4fd3577539f59e9faf51d1bb1f81132af195c650cebfa3585b825a
-  data.tar.gz: 92356183da79a996c30433570254c86090c5df4924b0fceb747551253e885298ce1ffc73dc21dd45666e5329f95bbb90a583977a894586820dca941ff951d51c
+  metadata.gz: 406b5e9039a31dda4264391d1287fa89684dc21a982521c212734c05055e727ecaea62b9ed234e296a151587fd9cbaee5dd99915573f5ccb90429509f12de046
+  data.tar.gz: e11dfd82ec7324d499e37c0214d7b12ad735d03732f996bcd8e8397f36f684fd99ff6e3b58fa73a1adbc63f7e87d4be455e62814bb690e51cca0d27d7d8d22dc

data/lib/query_packwerk/file_cache.rb

@@ -9,7 +9,9 @@ module QueryPackwerk
   class FileCache
     extend T::Sig
 
-    RUBY_FILE = T.let(/\.(rb|rake)\z/, Regexp)
+    # The files packwerk parses as Ruby, from Packwerk::Parsers::Factory
+    RUBY_FILE = T.let(/(\.(rb|rake|builder|gemspec|ru)|Gemfile|Rakefile)\z/, Regexp)
+    ERB_FILE = T.let(/\.erb\z/, Regexp)
 
     sig { void }
     def initialize
@@ -62,12 +64,18 @@ module QueryPackwerk
 
     sig { params(file_name: String).returns(RuboCop::AST::Node) }
     def get_file_ast(file_name)
-      @file_ast_cache[file_name] ||= ast_from(get_file(file_name))
+      @file_ast_cache[file_name] ||= begin
+        source = processed_source(ruby_source(file_name))
+        warn_unparseable(file_name, source) unless source.valid_syntax?
+
+        # The AST is also nil for source with no code, like a template that's only HTML
+        source.ast || ast_from('x')
+      end
     end
 
     sig { params(file_name: String).returns(String) }
     def get_file(file_name)
-      @file_cache[file_name] ||= if RUBY_FILE.match?(file_name) && File.exist?(file_name)
+      @file_cache[file_name] ||= if (RUBY_FILE.match?(file_name) || ERB_FILE.match?(file_name)) && File.exist?(file_name)
                                    File.read(file_name)
                                  else
                                    'x'
@@ -84,7 +92,7 @@ module QueryPackwerk
       absolute_const_node = ast_from(class_name)
       relative_const_node = ast_from(class_name.delete_prefix('::'))
 
-      @file_const_cache[const_key] = get_file_ast(file_name).each_descendant.select do |node|
+      @file_const_cache[const_key] = get_file_ast(file_name).each_node.select do |node|
         next false unless node.const_type?
 
         node == absolute_const_node || node == relative_const_node
@@ -133,10 +141,32 @@ module QueryPackwerk
 
     private
 
+    # Blanks out everything in an ERB template except its Ruby code, so line numbers still match the template
+    sig { params(file_name: String).returns(String) }
+    def ruby_source(file_name)
+      source = get_file(file_name)
+      return source unless ERB_FILE.match?(file_name)
+
+      Herb.extract_ruby(source, semicolons: true, comments: false, preserve_positions: true)
+    end
+
+    sig { params(string: String).returns(RuboCop::ProcessedSource) }
+    def processed_source(string)
+      RuboCop::ProcessedSource.new(string, RUBY_VERSION.to_f)
+    end
+
+    sig { params(file_name: String, source: RuboCop::ProcessedSource).void }
+    def warn_unparseable(file_name, source)
+      error = source.diagnostics.find { |diagnostic| diagnostic.level == :error }
+      location = error ? "#{file_name}:#{error.location.line} (#{error.message})" : file_name
+
+      warn "Could not parse #{location}, so its violations are not included"
+    end
+
     # Turns a string into a Ruby AST
     sig { params(string: String).returns(RuboCop::AST::Node) }
     def ast_from(string)
-      RuboCop::ProcessedSource.new(string, RUBY_VERSION.to_f).ast
+      processed_source(string).ast
     end
 
     # We can find a constant, but by going up its parents we can find the full call chain.

data/lib/query_packwerk/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module QueryPackwerk
-  VERSION = '0.1.25'
+  VERSION = '0.1.26'
 end

data/lib/query_packwerk/violation.rb

@@ -9,8 +9,6 @@ module QueryPackwerk
   class Violation
     extend T::Sig
 
-    # This does not play nicely with ERB files which may have violations
-    RUBY_FILE = T.let(/\.(rb|rake)\z/, Regexp)
     ALL_CAPS = T.let(/\A[A-Z_]+\z/, Regexp)
 
     sig { returns(QueryPackwerk::Package) }
@@ -168,13 +166,15 @@ module QueryPackwerk
       load_cache!
 
       file_sources = files.flat_map do |file_name|
+        lines = @file_cache.get_file(file_name).lines
+
         @file_cache.get_full_sources(file_name: file_name, class_name: class_name).map do |s|
           line_number = s.loc.line
-          start_pos = line_number - start_offset
-          end_pos = line_number + end_offset
+          start_pos = [line_number - start_offset, 1].max
+          end_pos = [line_number + end_offset, lines.size].min
 
           location = "#{file_name}:#{s.loc.line} (L#{start_pos}..#{end_pos})"
-          context = @file_cache.get_file(file_name).lines.slice(start_pos..end_pos)
+          context = lines[(start_pos - 1)...end_pos]
           full_context = unindent((context || ['']).join)
 
           [@file_cache.anonymize_arguments(s.source), "> #{location}\n\n#{full_context}"]

data/lib/query_packwerk/violations.rb

@@ -192,7 +192,9 @@ module QueryPackwerk
     def sources_with_contexts(start_offset: 3, end_offset: 3)
       load_sources!
 
-      deep_merge_hash_groups(@original_collection) { |v| [v.class_name, v.sources_with_contexts] }
+      deep_merge_hash_groups(@original_collection) do |v|
+        [v.class_name, v.sources_with_contexts(start_offset:, end_offset:)]
+      end
     end
 
     sig { params(start_offset: Integer, end_offset: Integer).returns(String) }

data/lib/query_packwerk.rb

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require 'sorbet-runtime'
+require 'herb'
 require 'parse_packwerk'
 require 'rubocop'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: query_packwerk
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.26
 platform: ruby
 authors:
 - Gusto Engineering
@@ -23,6 +23,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: herb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: packwerk
   requirement: !ruby/object:Gem::Requirement