packwerk 1.1.2 → 1.3.1

data/lib/packwerk/deprecated_references.rb

@@ -1,17 +1,11 @@
 # typed: true
 # frozen_string_literal: true
 
-require "sorbet-runtime"
 require "yaml"
 
-require "packwerk/reference"
-require "packwerk/reference_lister"
-require "packwerk/violation_type"
-
 module Packwerk
   class DeprecatedReferences
     extend T::Sig
-    include ReferenceLister
 
     sig { params(package: Packwerk::Package, filepath: String).void }
     def initialize(package, filepath)
@@ -23,7 +17,6 @@ module Packwerk
     sig do
       params(reference: Packwerk::Reference, violation_type: ViolationType)
         .returns(T::Boolean)
-        .override
     end
     def listed?(reference, violation_type:)
       violated_constants_found = deprecated_references.dig(reference.constant.package.name, reference.constant.name)
@@ -35,18 +28,19 @@ module Packwerk
       violated_constants_found.fetch("violations", []).include?(violation_type.serialize)
     end
 
-    sig { params(reference: Packwerk::Reference, violation_type: String).void }
+    sig { params(reference: Packwerk::Reference, violation_type: Packwerk::ViolationType).returns(T::Boolean) }
     def add_entries(reference, violation_type)
       package_violations = @new_entries.fetch(reference.constant.package.name, {})
       entries_for_file = package_violations[reference.constant.name] ||= {}
 
       entries_for_file["violations"] ||= []
-      entries_for_file["violations"] << violation_type
+      entries_for_file["violations"] << violation_type.serialize
 
       entries_for_file["files"] ||= []
       entries_for_file["files"] << reference.relative_path.to_s
 
       @new_entries[reference.constant.package.name] = package_violations
+      listed?(reference, violation_type: violation_type)
     end
 
     sig { returns(T::Boolean) }
@@ -59,7 +53,7 @@ module Packwerk
           if entries_for_file["violations"].all? { |type| new_entries_violation_types.include?(type) }
             stale_violations =
               entries_for_file["files"] - Array(@new_entries.dig(package, constant_name, "files"))
-            stale_violations.present?
+            stale_violations.any?
           else
             return true
           end
@@ -79,7 +73,7 @@ module Packwerk
           #
           # You can regenerate this file using the following command:
           #
-          # bundle exec packwerk update-deprecations #{@package.name}
+          # packwerk update-deprecations #{@package.name}
         MESSAGE
         File.open(@filepath, "w") do |f|
           f.write(message)

data/lib/packwerk/file_processor.rb

@@ -3,10 +3,6 @@
 
 require "ast/node"
 
-require "packwerk/node"
-require "packwerk/offense"
-require "packwerk/parsers"
-
 module Packwerk
   class FileProcessor
     class UnknownFileTypeResult < Offense

data/lib/packwerk/formatters/offenses_formatter.rb

@@ -1,16 +1,11 @@
 # typed: strict
 # frozen_string_literal: true
 
-require "benchmark"
-require "sorbet-runtime"
-
-require "packwerk/inflector"
-require "packwerk/output_style"
-require "packwerk/output_styles/plain"
-
 module Packwerk
   module Formatters
     class OffensesFormatter
+      include Packwerk::OffensesFormatter
+
       extend T::Sig
 
       sig { params(style: OutputStyle).void }
@@ -18,9 +13,9 @@ module Packwerk
         @style = style
       end
 
-      sig { params(offenses: T::Array[T.nilable(Offense)]).returns(String) }
+      sig { override.params(offenses: T::Array[T.nilable(Offense)]).returns(String) }
       def show_offenses(offenses)
-        return "No offenses detected 🎉" if offenses.empty?
+        return "No offenses detected" if offenses.empty?
 
         <<~EOS
           #{offenses_list(offenses)}
@@ -28,6 +23,15 @@ module Packwerk
         EOS
       end
 
+      sig { override.params(offense_collection: Packwerk::OffenseCollection).returns(String) }
+      def show_stale_violations(offense_collection)
+        if offense_collection.stale_violations?
+          "There were stale violations found, please run `packwerk update-deprecations`"
+        else
+          "No stale violations detected"
+        end
+      end
+
       private
 
       sig { params(offenses: T::Array[T.nilable(Offense)]).returns(String) }

data/lib/packwerk/formatters/progress_formatter.rb

@@ -3,10 +3,6 @@
 
 require "benchmark"
 
-require "packwerk/inflector"
-require "packwerk/output_style"
-require "packwerk/output_styles/plain"
-
 module Packwerk
   module Formatters
     class ProgressFormatter
@@ -45,6 +41,11 @@ module Packwerk
         @out.puts
         @out.puts("📦 Finished in #{execution_time.round(2)} seconds")
       end
+
+      def interrupted
+        @out.puts
+        @out.puts("Manually interrupted. Violations caught so far are listed below:")
+      end
     end
   end
 end

data/lib/packwerk/generators/configuration_file.rb

@@ -1,7 +1,6 @@
 # typed: true
 # frozen_string_literal: true
 
-require "packwerk/configuration"
 require "erb"
 
 module Packwerk

data/lib/packwerk/inflector.rb

@@ -2,8 +2,6 @@
 # frozen_string_literal: true
 
 require "active_support/inflector"
-require "packwerk/inflections/default"
-require "packwerk/inflections/custom"
 
 module Packwerk
   class Inflector

data/lib/packwerk/node.rb

@@ -1,6 +1,7 @@
 # typed: true
 # frozen_string_literal: true
 
+require "parser"
 require "parser/ast/node"
 
 module Packwerk

data/lib/packwerk/node_processor.rb

@@ -1,11 +1,6 @@
 # typed: true
 # frozen_string_literal: true
 
-require "packwerk/node"
-require "packwerk/offense"
-require "packwerk/checker"
-require "packwerk/reference_lister"
-
 module Packwerk
   class NodeProcessor
     extend T::Sig
@@ -13,48 +8,36 @@ module Packwerk
     sig do
       params(
         reference_extractor: ReferenceExtractor,
-        reference_lister: ReferenceLister,
         filename: String,
         checkers: T::Array[Checker]
       ).void
     end
-    def initialize(reference_extractor:, reference_lister:, filename:, checkers:)
+    def initialize(reference_extractor:, filename:, checkers:)
       @reference_extractor = reference_extractor
-      @reference_lister = reference_lister
       @filename = filename
       @checkers = checkers
     end
 
-    def call(node, ancestors:)
-      if Node.method_call?(node) || Node.constant?(node)
-        reference = @reference_extractor.reference_from_node(node, ancestors: ancestors, file_path: @filename)
-        check_reference(reference, node) if reference
-      end
+    sig { params(node: Parser::AST::Node, ancestors: T::Array[Parser::AST::Node]).returns(T::Array[Offense]) }
+    def call(node, ancestors)
+      return [] unless Node.method_call?(node) || Node.constant?(node)
+      reference = @reference_extractor.reference_from_node(node, ancestors: ancestors, file_path: @filename)
+      check_reference(reference, node)
     end
 
     private
 
     def check_reference(reference, node)
-      return nil unless (message = failed_check(reference))
-
-      constant = reference.constant
-
-      Packwerk::Offense.new(
-        location: Node.location(node),
-        file: reference.relative_path,
-        message: <<~EOS
-          #{message}
-          Inference details: this is a reference to #{constant.name} which seems to be defined in #{constant.location}.
-          To receive help interpreting or resolving this error message, see: https://github.com/Shopify/packwerk/blob/main/TROUBLESHOOT.md#Troubleshooting-violations
-        EOS
-      )
-    end
-
-    def failed_check(reference)
-      failing_checker = @checkers.find do |checker|
-        checker.invalid_reference?(reference, @reference_lister)
+      return [] unless reference
+      @checkers.each_with_object([]) do |checker, violations|
+        next unless checker.invalid_reference?(reference)
+        offense = Packwerk::ReferenceOffense.new(
+          location: Node.location(node),
+          reference: reference,
+          violation_type: checker.violation_type
+        )
+        violations << offense
       end
-      failing_checker&.message_for(reference)
     end
   end
 end

data/lib/packwerk/node_processor_factory.rb

@@ -1,15 +1,11 @@
 # typed: strict
 # frozen_string_literal: true
 
-require "packwerk/constant_name_inspector"
-require "packwerk/checker"
-
 module Packwerk
   class NodeProcessorFactory < T::Struct
     extend T::Sig
 
     const :root_path, String
-    const :reference_lister, ReferenceLister
     const :context_provider, Packwerk::ConstantDiscovery
     const :constant_name_inspectors, T::Array[ConstantNameInspector]
     const :checkers, T::Array[Checker]
@@ -18,7 +14,6 @@ module Packwerk
     def for(filename:, node:)
       ::Packwerk::NodeProcessor.new(
         reference_extractor: reference_extractor(node: node),
-        reference_lister: reference_lister,
         filename: filename,
         checkers: checkers,
       )

data/lib/packwerk/node_visitor.rb

@@ -1,8 +1,6 @@
 # typed: false
 # frozen_string_literal: true
 
-require "packwerk/node"
-
 module Packwerk
   class NodeVisitor
     def initialize(node_processor:)
@@ -10,8 +8,7 @@ module Packwerk
     end
 
     def visit(node, ancestors:, result:)
-      offense = @node_processor.call(node, ancestors: ancestors)
-      result << offense if offense
+      result.concat(@node_processor.call(node, ancestors))
 
       child_ancestors = [node] + ancestors
       Node.each_child(node) do |child|

data/lib/packwerk/offense.rb

@@ -2,10 +2,6 @@
 # frozen_string_literal: true
 
 require "parser/source/map"
-require "sorbet-runtime"
-
-require "packwerk/output_style"
-require "packwerk/output_styles/plain"
 
 module Packwerk
   class Offense

data/lib/packwerk/offense_collection.rb

@@ -0,0 +1,84 @@
+# typed: strict
+# frozen_string_literal: true
+
+module Packwerk
+  class OffenseCollection
+    extend T::Sig
+    extend T::Helpers
+
+    sig do
+      params(
+        root_path: String,
+        deprecated_references: T::Hash[Packwerk::Package, Packwerk::DeprecatedReferences]
+      ).void
+    end
+    def initialize(root_path, deprecated_references = {})
+      @root_path = root_path
+      @deprecated_references = T.let(deprecated_references, T::Hash[Packwerk::Package, Packwerk::DeprecatedReferences])
+      @new_violations = T.let([], T::Array[Packwerk::ReferenceOffense])
+      @errors = T.let([], T::Array[Packwerk::Offense])
+    end
+
+    sig { returns(T::Array[Packwerk::ReferenceOffense]) }
+    attr_reader :new_violations
+
+    sig { returns(T::Array[Packwerk::Offense]) }
+    attr_reader :errors
+
+    sig do
+      params(offense: Packwerk::Offense)
+        .returns(T::Boolean)
+    end
+    def listed?(offense)
+      return false unless offense.is_a?(ReferenceOffense)
+      reference = offense.reference
+      deprecated_references_for(reference.source_package).listed?(reference, violation_type: offense.violation_type)
+    end
+
+    sig do
+      params(offense: Packwerk::Offense).void
+    end
+    def add_offense(offense)
+      unless offense.is_a?(ReferenceOffense)
+        @errors << offense
+        return
+      end
+      deprecated_references = deprecated_references_for(offense.reference.source_package)
+      unless deprecated_references.add_entries(offense.reference, offense.violation_type)
+        new_violations << offense
+      end
+    end
+
+    sig { returns(T::Boolean) }
+    def stale_violations?
+      @deprecated_references.values.any?(&:stale_violations?)
+    end
+
+    sig { void }
+    def dump_deprecated_references_files
+      @deprecated_references.each do |_, deprecated_references_file|
+        deprecated_references_file.dump
+      end
+    end
+
+    sig { returns(T::Array[Packwerk::Offense]) }
+    def outstanding_offenses
+      errors + new_violations
+    end
+
+    private
+
+    sig { params(package: Packwerk::Package).returns(Packwerk::DeprecatedReferences) }
+    def deprecated_references_for(package)
+      @deprecated_references[package] ||= Packwerk::DeprecatedReferences.new(
+        package,
+        deprecated_references_file_for(package),
+      )
+    end
+
+    sig { params(package: Packwerk::Package).returns(String) }
+    def deprecated_references_file_for(package)
+      File.join(@root_path, package.name, "deprecated_references.yml")
+    end
+  end
+end

data/lib/packwerk/offenses_formatter.rb

@@ -0,0 +1,19 @@
+# typed: strict
+# frozen_string_literal: true
+
+module Packwerk
+  module OffensesFormatter
+    extend T::Sig
+    extend T::Helpers
+
+    interface!
+
+    sig { abstract.params(offenses: T::Array[T.nilable(Offense)]).returns(String) }
+    def show_offenses(offenses)
+    end
+
+    sig { abstract.params(offense_collection: Packwerk::OffenseCollection).returns(String) }
+    def show_stale_violations(offense_collection)
+    end
+  end
+end

data/lib/packwerk/package.rb

@@ -33,7 +33,15 @@ module Packwerk
     end
 
     def public_path
-      @public_path ||= File.join(@name, user_defined_public_path || "app/public/")
+      @public_path ||= begin
+        unprefixed_public_path = user_defined_public_path || "app/public/"
+
+        if root?
+          unprefixed_public_path
+        else
+          File.join(@name, unprefixed_public_path)
+        end
+      end
     end
 
     def public_path?(path)
@@ -52,6 +60,14 @@ module Packwerk
       name <=> other.name
     end
 
+    def eql?(other)
+      self == other
+    end
+
+    def hash
+      name.hash
+    end
+
     def to_s
       name
     end

data/lib/packwerk/package_set.rb

@@ -3,8 +3,6 @@
 
 require "pathname"
 
-require "packwerk/package"
-
 module Packwerk
   class PackageSet
     include Enumerable