visualize_packs 0.5.9 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06613b520a9c2df95a6bef04aeef2fc1658b6e9ac6ce073db977db6bc72170af
-  data.tar.gz: 82f9e53a88d7e094b424a9e58f228172afcc621e38dc0d154609df26cbd9129e
+  metadata.gz: 1c97e3f2997e104fa0359775892adfb5e8cc40d22a85d886bf0f8a1d608398a8
+  data.tar.gz: 7b933103509243b81126bc29cd193daf9536a46860d36ad40f1d988df29d77b3
 SHA512:
-  metadata.gz: 7da1041d6cb907ba9f7e2da5e5d411344fd28d83bbc8045f7c6c0b5a0becc88ad090a1a3ffb8b8c4fdcbb5837e912bb867c9bf11651887d2ca7335d884df36ee
-  data.tar.gz: f6a7b5915af1499829ab9bfde65eb202ba638885e3a233e0048a14eea84830360feb5969101a79b8e943d13e50a5afa372a24524a105dd0a0e5a888d3bcd0f7c
+  metadata.gz: 0e0c1ca8ea26ee9cbd57b3e4066960868ea9362de4bae5fad1517481376ba8f3dd476ff8ad1f43c186d9b9c9d291a7332c203b877e37d5e9d6e07f4277d70899
+  data.tar.gz: 632e641dc9e1c45dd744bf9d09bff3cc9723138bc8eb27c1d6771afdc51ad3aef2de988801420b64a1c7f27155fb530fcbfe66cd3c4c65e7eb3b4c6de5e220e6

data/bin/visualize_packs

@@ -32,14 +32,15 @@ OptionParser.new do |opt|
   opt.on('--no-privacy', "Don't show privacy enforcement") { |o| options.show_privacy = false }
   opt.on('--no-teams', "Don't show team colors") { |o| options.show_teams = false }
 
-  opt.on('--focus-on=PACKAGE', "Focus on a specific package") { |o| options.focus_package = o }
+  opt.on('--focus-folder=FOLDER', "Draw package diagram only for packages in FOLDER. Matches with 'include' for partial matches") { |o| options.focus_folder = o.empty? ? nil : o }
+  opt.on('--focus-pack=pack1,pack2', "Focus on a specific package(s). Wildcards support: 'packs/*'") { |o| options.focus_package = o.to_s.split(",") }
   opt.on('--only-edges-to-focus', "If focus is set, this shows only the edges to/from the focus node instead of all edges in the focussed graph. This only has effect when --focus-on is set.") { |o| options.show_only_edges_to_focus_package = true }
 
   opt.on('--roll-nested-into-parent-packs', "Don't show nested packages (not counting root). Connect edges to top-level package instead") { |o| options.roll_nested_into_parent_packs = true }
-  opt.on('--focus_folder=FOLDER', "Draw package diagram only for packages in FOLDER") { |o| options.focus_folder = o }
-  opt.on('--no_nested_relationships', "Don't draw relationships between parents and nested packs") { |o| options.show_nested_relationships = false }
+  opt.on('--no-nested-relationships', "Don't draw relationships between parents and nested packs") { |o| options.show_nested_relationships = false }
 
-  opt.on('--exclude-packs=pack1,pack2,etc', "Exclude listed packs from diagram. Allows filname matching style wildcards like 'packs/ignores/*'") { |o| options.exclude_packs = o.to_s.split(",") }
+  opt.on('--exclude-packs=pack1,pack2,etc', "Exclude listed packs from diagram. If used with include you will get all included that are not excluded. Wildcards support: 'packs/ignores/*'") { |o| options.exclude_packs = o.to_s.split(",") }
+  opt.on('--include-packs=pack1,pack2,etc', "Include only listed packs in diagram. If used with exclude you will get all included that are not excluded. Wildcards support: 'packs/ignores/*'") { |o| options.include_packs = o.to_s.split(",") }
 
   opt.on('--remote-base-url=PACKAGE', "Link package nodes to an URL (affects graphviz SVG generation)") { |o| options.remote_base_url = o }
 

data/lib/graph.dot.erb

@@ -33,7 +33,7 @@ digraph package_diagram {
       <%- end -%>
       <%- grouped_packages[layer_name].each do |package| -%>
         "<%= package.name -%>" [
-            fontsize=<%= options.focus_package && package.name == options.focus_package ? 18.0 : 12.0 -%>
+            fontsize=<%= options.focus_package.any? && options.focus_package.any? {|p| File.fnmatch(p, package.name)} ? 18.0 : 12.0 -%>
             <%- if options.remote_base_url %>
               URL="<%= options.remote_base_url %>/<%= package.name == '.' ? '' : package.name -%>"
             <%- end %>

data/lib/options.rb

@@ -12,7 +12,7 @@ class Options < T::Struct
   prop :show_privacy, T::Boolean, default: true
   prop :show_teams, T::Boolean, default: true
 
-  prop :focus_package, T.nilable(String)
+  prop :focus_package, T::Array[String], default: []
   prop :show_only_edges_to_focus_package, T::Boolean, default: false
 
   prop :roll_nested_into_parent_packs, T::Boolean, default: false
@@ -20,6 +20,7 @@ class Options < T::Struct
   prop :show_nested_relationships, T::Boolean, default: true
 
   prop :exclude_packs, T::Array[String], default: []
+  prop :include_packs, T.nilable(T::Array[String]), default: nil
 
   prop :remote_base_url, T.nilable(String)
 end

data/lib/visualize_packs.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# typed: false
+# typed: strict
 
 require 'erb'
 require 'packs-specification'
@@ -7,14 +7,14 @@ require 'parse_packwerk'
 require 'digest/md5'
 
 module VisualizePacks
+  extend T::Sig
 
+  sig { params(options: Options, raw_config: T::Hash[String, T.untyped], packages: T::Array[ParsePackwerk::Package]).returns(String) }
   def self.package_graph!(options, raw_config, packages)
-    raise ArgumentError, "Package #{options.focus_package} does not exist. Found packages #{packages.map(&:name).join(", ")}" if options.focus_package && !packages.map(&:name).include?(options.focus_package)
-
-    all_packages = filtered(packages, options.focus_package, options.focus_folder, options.exclude_packs).sort_by {|x| x.name }
+    all_packages = filtered(packages, options).compact.sort_by {|x| x.name }
     all_package_names = all_packages.map &:name
 
-    all_packages = remove_nested_packs(all_packages) if options.roll_nested_into_parent_packs
+    all_packages = remove_nested_packs(all_packages, options)
 
     show_edge = show_edge_builder(options, all_package_names)
     node_color = node_color_builder()
@@ -48,14 +48,16 @@ module VisualizePacks
 
   private 
 
+  sig { params(package: ParsePackwerk::Package).returns(T.nilable(String)) }
   def self.code_owner(package)
     package.config.dig("metadata", "owner") || package.config["owner"]
   end
 
+  sig { params(options: Options, max_todo_count: T.nilable(Integer)).returns(String) }
   def self.diagram_title(options, max_todo_count)
     app_name = File.basename(Dir.pwd)
-    focus_edge_info = options.focus_package && options.show_only_edges_to_focus_package ? "showing only edges to/from focus pack" : "showing all edges between visible packs"
-    focus_info = options.focus_package || options.focus_folder ? "Focus on #{[options.focus_package, options.focus_folder].compact.join(' and ')} (#{focus_edge_info})" : "All packs"
+    focus_edge_info = options.focus_package.any? && options.show_only_edges_to_focus_package ? "showing only edges to/from focus pack" : "showing all edges between visible packs"
+    focus_info = options.focus_package.any? || options.focus_folder ? "Focus on #{[limited_sentence(options.focus_package), options.focus_folder].compact.join(' and ')} (#{focus_edge_info})" : "All packs"
     skipped_info = 
     [
       options.show_legend ? nil : "hiding legend",
@@ -67,6 +69,7 @@ module VisualizePacks
       options.show_teams ? nil : "hiding teams",
       options.roll_nested_into_parent_packs ? "hiding nested packs" : nil,
       options.show_nested_relationships ? nil : "hiding nested relationships",
+      options.include_packs ? "including only: #{limited_sentence(options.include_packs)}" : nil,
       options.exclude_packs.empty? ? nil : "excluding pack#{options.exclude_packs.size > 1 ? 's' : ''}: #{limited_sentence(options.exclude_packs)}",
     ].compact.join(', ').strip
     main_title = "#{app_name}: #{focus_info}#{skipped_info != '' ? ' - ' + skipped_info : ''}"
@@ -77,14 +80,18 @@ module VisualizePacks
     "<<b>#{main_title}</b>#{sub_title}>"
   end
 
+  sig { params(list: T.nilable(T::Array[String])).returns(T.nilable(String)) }
   def self.limited_sentence(list)
+    return nil if !list || list.empty?
+
     if list.size <= 2
       list.join(" and ")
     else
-      "#{list[0, 2].join(", ")}, and #{list.size - 2} more"
+      "#{T.must(list[0, 2]).join(", ")}, and #{list.size - 2} more"
     end
   end
 
+  sig { params(options: Options, all_package_names: T::Array[String]).returns(T.proc.params(arg0: String, arg1: String).returns(T::Boolean)) }
   def self.show_edge_builder(options, all_package_names)
     return lambda do |start_node, end_node|
       (
@@ -96,11 +103,15 @@ module VisualizePacks
         options.show_only_edges_to_focus_package && 
         all_package_names.include?(start_node) && 
         all_package_names.include?(end_node) && 
-        [start_node, end_node].include?(options.focus_package)
+        (
+          match_packs?(start_node, options.focus_package) ||
+          match_packs?(end_node, options.focus_package)
+        )
       )
     end
   end
 
+  sig { returns(T.nilable(T.proc.params(arg0: String).returns(String))) }
   def self.node_color_builder
     return lambda do |text|
       return unless text
@@ -113,17 +124,17 @@ module VisualizePacks
     end
   end
 
+  sig { params(all_packages: T::Array[ParsePackwerk::Package], show_edge: T.proc.params(arg0: String, arg1: String).returns(T::Boolean)).returns(T.nilable(Integer)) }
   def self.max_todo_count(all_packages, show_edge)
     todo_counts = {}
     all_packages.each do |package|
-      todos_by_package = package.violations.group_by(&:to_package_name)
-      todos_by_package.keys.each do |todos_to_package|
-        todo_types = todos_by_package[todos_to_package].group_by(&:type)
-        todo_types.keys.each do |todo_type|
+      todos_by_package = package.violations&.group_by(&:to_package_name)
+      todos_by_package&.keys&.each do |todos_to_package|
+        todo_types = todos_by_package&& todos_by_package[todos_to_package]&.group_by(&:type)
+        todo_types&.keys&.each do |todo_type|
           if show_edge.call(package.name, todos_to_package)
             key = "#{package.name}->#{todos_to_package}:#{todo_type}"
-            todo_counts[key] = todo_types[todo_type].count
-            # todo_counts[key] += 1
+            todo_counts[key] = todo_types && todo_types[todo_type]&.count
           end
         end
       end
@@ -131,6 +142,7 @@ module VisualizePacks
     todo_counts.values.max
   end
 
+  sig { params(todo_count: Integer, max_count: Integer).returns(T.any(Float, Integer)) }
   def self.todo_edge_width(todo_count, max_count)
     # Limits
     min_width = 1
@@ -150,31 +162,58 @@ module VisualizePacks
     edge_width.round(2)
  end
 
-  def self.filtered(packages, filter_package, filter_folder, exclude_packs)
-    return packages unless filter_package || filter_folder || exclude_packs.any?
+ sig { params(packages: T::Array[ParsePackwerk::Package], options: Options).returns(T::Array[ParsePackwerk::Package]) }
+ def self.filtered(packages, options)
+    focus_package = options.focus_package
+    focus_folder = options.focus_folder 
+    include_packs = options.include_packs 
+    exclude_packs = options.exclude_packs
+
+    return packages unless focus_package.any? || focus_folder || include_packs || exclude_packs.any?
+
+    nested_packages = all_nested_packages(packages.map { |p| p.name })
 
+    packages_by_name = packages.inject({}) do |res, p|
+      res[p.name] = p
+      res
+    end
+ 
+    result = T.let([], T::Array[T.nilable(String)])
     result = packages.map { |pack| pack.name }
 
-    if filter_package
-      result = [filter_package]
-      result += packages.select{ |p| p.dependencies.include? filter_package }.map { |pack| pack.name }
-      result += ParsePackwerk.find(filter_package).dependencies
-      result += packages.select{ |p| p.violations.map(&:to_package_name).include? filter_package }.map { |pack| pack.name }
-      result += ParsePackwerk.find(filter_package).violations.map(&:to_package_name)
+    if !focus_package.empty?
+      result = []
+      result += packages.map { |pack| pack.name }.select { |p| match_packs?(p, focus_package) }
+      result += packages.select{ |p| p.dependencies.any? { |d| match_packs?(d, focus_package) }}.map { |pack| pack.name }
+      result += packages.select{ |p| p.violations&.map(&:to_package_name)&.any? { |v| match_packs?(v, focus_package) }}.map { |pack| pack.name }
+      packages.map { |pack| pack.name }.select { |p| match_packs?(p, focus_package) }.each do |p|
+        result += packages_by_name[p].dependencies
+        result += packages_by_name[p].violations.map(&:to_package_name)
+      end
       result = result.uniq
+      parent_packs = result.inject([]) do |res, package_name|
+        res << nested_packages[package_name]
+        res
+      end
+      result = (result + parent_packs).uniq.compact
     end
 
-    if filter_folder
-      result = result.select { |p| p.include? filter_folder }
+    if focus_folder
+      result = result.select { |p| p.include? focus_folder }
+    end
+
+    if include_packs
+      result = result.select { |p| match_packs?(p, include_packs) }
     end
 
     if exclude_packs.any?
-      result = result.reject { |p| exclude_pack?(p, exclude_packs) }
+      result = result.reject { |p| match_packs?(p, exclude_packs) }
     end
 
-    result.map { |pack_name| ParsePackwerk.find(pack_name) }
+    result.map { |pack_name| packages_by_name[pack_name] }
   end
 
+  sig { params(all_package_names: T::Array[String]).returns(T::Hash[String, String]) }
   def self.all_nested_packages(all_package_names)
     all_package_names.reject { |p| p == '.' }.inject({}) do |result, package|
       package_map_tally = all_package_names.map { |other_package| Pathname.new(package).parent.to_s.include?(other_package) }
@@ -188,7 +227,10 @@ module VisualizePacks
     end
   end
 
-  def self.remove_nested_packs(packages)
+  sig { params(packages: T::Array[ParsePackwerk::Package], options: Options).returns(T::Array[ParsePackwerk::Package]) }
+  def self.remove_nested_packs(packages, options)
+    return packages unless options.roll_nested_into_parent_packs
+
     nested_packages = all_nested_packages(packages.map { |p| p.name })
 
     # top-level packages
@@ -207,9 +249,9 @@ module VisualizePacks
               enforce_privacy: package.enforce_privacy,
               public_path: package.public_path,
               metadata: package.metadata,
-              dependencies: package.dependencies + nested_package.dependencies,
+              dependencies: package.dependencies + T.must(nested_package).dependencies,
               config: package.config,
-              violations: package.violations + nested_package.violations
+              violations: T.must(package.violations) + T.must(T.must(nested_package).violations)
             )
           end
         end
@@ -219,7 +261,7 @@ module VisualizePacks
           nested_packages[d] || d
         end.uniq.reject { |p| p == package.name }
 
-        morphed_todos = package.violations.map do |v|
+        morphed_todos = T.must(package.violations).map do |v|
           ParsePackwerk::Violation.new(
             type: v.type, 
             to_package_name: nested_packages[v.to_package_name] || v.to_package_name, 
@@ -239,15 +281,14 @@ module VisualizePacks
           config: package.config,
           violations: morphed_todos
         )
-        # add dependencies TO nested packages to top-level package
-        # add todos TO nested packages to top-level package
       end
     end
 
     morphed_packages.reject { |p| nested_packages.keys.include?(p.name) }
   end
 
-  def self.exclude_pack?(pack, exclude_packs)
-    exclude_packs.any? {|p| File.fnmatch(p, pack)}
+  sig { params(pack: String, packs_name_with_wildcards: T::Array[String]).returns(T::Boolean) }
+  def self.match_packs?(pack, packs_name_with_wildcards)
+    packs_name_with_wildcards.any? {|p| File.fnmatch(p, pack)}
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: visualize_packs
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.5.11
 platform: ruby
 authors:
 - Gusto Engineers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-31 00:00:00.000000000 Z
+date: 2023-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler