packwerk-extensions 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f20892b9d7d67a2164c7c632ac760c66859cacd2fa7af97c71a220a1d317893
-  data.tar.gz: a9a7f631ed8e6398a48e91fddc83fcff0e1d923aa16b75231e0a3296c5c4aa4a
+  metadata.gz: 661762b44e28e84ff3b70007bc039b6f767ddf638524f5a069a832e1f0d2fb34
+  data.tar.gz: a229b9432f95c10b211a411fee200e48721ff8d3c6b3fd1b745f8211cf58038a
 SHA512:
-  metadata.gz: f66866b77e2727898fa951a05f716f8b959444553082f9c8999144013ee74d90820ee802a994b11887c3132799b47cbcc74a60cc6434a6172617ebb916748216
-  data.tar.gz: b6deec3d175813666076ce5797d29cc62df65ec233c552114cdf3492c92dd74791b53412201a8b3e56758fdb4bb9a6c7bed804225c99c192d92f9566a60a4a85
+  metadata.gz: 32e5084af7d8e7cba4b743d0be13d29c1ea05b0c6e00ab7d0b9a38a229545093cf21f9e18da883987e487588f5bb7a47cc8728912332c9f295a42b03432bafc3
+  data.tar.gz: 01ff189cc3e645da3eeab3176351ebc0d23d274a9d20269f32733cdb2771169f365857bc946a66e5982c447887f81817fee047b82709e34115f18abaa53a0479

data/lib/packwerk/architecture/checker.rb

@@ -41,8 +41,8 @@ module Packwerk
           .returns(T::Boolean)
       end
       def invalid_reference?(reference)
-        constant_package = Package.from(reference.constant.package)
-        referencing_package = Package.from(reference.package)
+        constant_package = Package.from(reference.constant.package, layers)
+        referencing_package = Package.from(reference.package, layers)
         !referencing_package.can_depend_on?(constant_package, layers: layers)
       end
 
@@ -62,8 +62,8 @@ module Packwerk
           .returns(String)
       end
       def message(reference)
-        constant_package = Package.from(reference.constant.package)
-        referencing_package = Package.from(reference.package)
+        constant_package = Package.from(reference.constant.package, layers)
+        referencing_package = Package.from(reference.package, layers)
 
         message = <<~MESSAGE
           Architecture layer violation: '#{reference.constant.name}' belongs to '#{reference.constant.package}', whose architecture layer type is "#{constant_package.layer}."

data/lib/packwerk/architecture/layers.rb

@@ -8,12 +8,13 @@ module Packwerk
 
       sig { void }
       def initialize
-        @names = T.let(@names, T.nilable(T::Array[String]))
+        @names = T.let(@names, T.nilable(T::Set[String]))
+        @names_list = T.let(@names_list, T.nilable(T::Array[String]))
       end
 
       sig { params(layer: String).returns(Integer) }
       def index_of(layer)
-        index = names.reverse.find_index(layer)
+        index = names_list.reverse.find_index(layer)
         if index.nil?
           raise "Layer #{layer} not find, please run `bin/packwerk validate`"
         end
@@ -21,9 +22,16 @@ module Packwerk
         index
       end
 
-      sig { returns(T::Array[String]) }
+      sig { returns(T::Set[String]) }
       def names
-        @names ||= YAML.load_file('packwerk.yml')['architecture_layers'] || []
+        @names ||= Set.new(names_list)
+      end
+
+      private
+
+      sig { returns(T::Array[String]) }
+      def names_list
+        @names_list ||= YAML.load_file('packwerk.yml')['architecture_layers'] || []
       end
     end
   end

data/lib/packwerk/architecture/package.rb

@@ -30,15 +30,20 @@ module Packwerk
       class << self
         extend T::Sig
 
-        sig { params(package: ::Packwerk::Package).returns(Package) }
-        def from(package)
-          from_config(package.config)
-        end
+        sig { params(package: ::Packwerk::Package, layers: Layers).returns(Package) }
+        def from(package, layers)
+          config = package.config
+
+          # This allows the layer to be inferred based on the package root
+          package_root = package.name.split('/').first
+          if package_root && layers.names.include?(package_root)
+            layer = package_root
+          else
+            layer = config['layer']
+          end
 
-        sig { params(config: T::Hash[T.untyped, T.untyped]).returns(Package) }
-        def from_config(config)
           Package.new(
-            layer: config['layer'],
+            layer: layer,
             enforcement_setting: config['enforce_architecture'],
             config: config
           )

data/lib/packwerk/architecture/validator.rb

@@ -13,19 +13,21 @@ module Packwerk
       def call(package_set, configuration)
         results = T.let([], T::Array[Result])
 
-        package_manifests(configuration).each do |f|
-          config = YAML.load_file(File.join(f))
+        package_set.each do |package|
+          config = package.config
+          f = Pathname.new(package.name).join('package.yml').to_s
           next if !config
 
           result = check_enforce_architecture_setting(f, config['enforce_architecture'])
           results << result
           next if !result.ok?
 
-          result = check_layer_setting(config, f, config['layer'])
+          package = Package.from(package, layers)
+
+          result = check_layer_setting(package, f)
           results << result
           next if !result.ok?
 
-          package = Package.from_config(config)
           results += check_dependencies_setting(package_set, package, f)
         end
 
@@ -51,7 +53,7 @@ module Packwerk
           other_packwerk_package = package_set.fetch(dependency)
           next if other_packwerk_package.nil?
 
-          other_package = Package.from(other_packwerk_package)
+          other_package = Package.from(other_packwerk_package, layers)
           next if package.can_depend_on?(other_package, layers: layers)
 
           results << Result.new(
@@ -64,24 +66,23 @@ module Packwerk
       end
 
       sig do
-        params(config: T::Hash[T.untyped, T.untyped], config_file_path: String, layer: T.untyped).returns(Result)
+        params(package: Package, config_file_path: String).returns(Result)
       end
-      def check_layer_setting(config, config_file_path, layer)
-        enforce_architecture = config['enforce_architecture']
-        enforce_architecture_enabled = !(enforce_architecture.nil? || enforce_architecture == false)
+      def check_layer_setting(package, config_file_path)
+        layer = package.layer
         valid_layer = layer.nil? || layers.names.include?(layer)
 
-        if layer.nil? && enforce_architecture_enabled
+        if layer.nil? && package.enforces?
           Result.new(
             ok: false,
-            error_value: "Invalid 'layer' option in #{config_file_path.inspect}: #{layer.inspect}. `layer` must be set if `enforce_architecture` is on."
+            error_value: "Invalid 'layer' option in #{config_file_path.inspect}: #{package.layer.inspect}. `layer` must be set if `enforce_architecture` is on."
           )
         elsif valid_layer
           Result.new(ok: true)
         else
           Result.new(
             ok: false,
-            error_value: "Invalid 'layer' option in #{config_file_path.inspect}: #{layer.inspect}. Must be one of #{layers.names.inspect}"
+            error_value: "Invalid 'layer' option in #{config_file_path.inspect}: #{layer.inspect}. Must be one of #{layers.names.to_a.inspect}"
           )
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packwerk-extensions
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Gusto Engineers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-21 00:00:00.000000000 Z
+date: 2022-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: packwerk