Switch from architecture to layer (#44)

abraham · web-flow · commit 6450c1104d8f · 2024-05-17T09:55:51.000-05:00
diff --git a/lib/parse_packwerk.rb b/lib/parse_packwerk.rb
@@ -72,8 +72,8 @@ def self.write_package_yml!(package)
         merged_config.merge!('enforce_privacy' => package.enforce_privacy)
       end
 
-      if Extensions.architecture_extension_installed?
-        merged_config.merge!('enforce_architecture' => package.enforce_architecture)
+      if Extensions.layer_extension_installed?
+        merged_config.merge!('enforce_layer' => package.enforce_layer)
       end
 
       unless package.public_path == DEFAULT_PUBLIC_PATH
@@ -107,7 +107,7 @@ def self.key_sort_order
       enforce_dependencies
       enforce_privacy
       enforce_visibility
-      enforce_architecture
+      enforce_layer
       public_path
       owner
       layer
diff --git a/lib/parse_packwerk/constants.rb b/lib/parse_packwerk/constants.rb
@@ -7,7 +7,7 @@ module ParsePackwerk
   PACKAGE_TODO_YML_NAME = T.let('package_todo.yml'.freeze, String)
   ENFORCE_DEPENDENCIES = T.let('enforce_dependencies'.freeze, String)
   ENFORCE_PRIVACY = T.let('enforce_privacy'.freeze, String)
-  ENFORCE_ARCHITECTURE = T.let('enforce_architecture'.freeze, String)
+  ENFORCE_LAYER = T.let('enforce_layer'.freeze, String)
   DEPENDENCY_VIOLATION_TYPE = T.let('dependency'.freeze, String)
   PRIVACY_VIOLATION_TYPE = T.let('privacy'.freeze, String)
   PUBLIC_PATH = T.let('public_path'.freeze, String)
diff --git a/lib/parse_packwerk/extensions.rb b/lib/parse_packwerk/extensions.rb
@@ -15,8 +15,8 @@ def self.privacy_extension_installed?
     end
 
     sig { returns(T::Boolean) }
-    def self.architecture_extension_installed?
-      all_extensions_installed? || ParsePackwerk.yml.requires.include?('packwerk/architecture/checker')
+    def self.layer_extension_installed?
+      all_extensions_installed? || ParsePackwerk.yml.requires.include?('packwerk/layer/checker')
     end
   end
 
diff --git a/lib/parse_packwerk/package.rb b/lib/parse_packwerk/package.rb
@@ -7,7 +7,7 @@ class Package < T::Struct
     const :name, String
     const :enforce_dependencies, T.nilable(T.any(T::Boolean, String))
     const :enforce_privacy, T.any(T::Boolean, String), default: false
-    const :enforce_architecture, T.any(T::Boolean, String), default: false
+    const :enforce_layer, T.any(T::Boolean, String), default: false
     const :public_path, String, default: DEFAULT_PUBLIC_PATH
     const :metadata, MetadataYmlType
     const :dependencies, T::Array[String]
@@ -23,7 +23,7 @@ def self.from(pathname)
         name: package_name,
         enforce_dependencies: package_loaded_yml[ENFORCE_DEPENDENCIES],
         enforce_privacy: package_loaded_yml[ENFORCE_PRIVACY] || false,
-        enforce_architecture: package_loaded_yml[ENFORCE_ARCHITECTURE] || false,
+        enforce_layer: package_loaded_yml[ENFORCE_LAYER] || false,
         public_path: package_loaded_yml[PUBLIC_PATH] || DEFAULT_PUBLIC_PATH,
         metadata: package_loaded_yml[METADATA] || {},
         dependencies: package_loaded_yml[DEPENDENCIES] || [],
@@ -63,8 +63,8 @@ def enforces_privacy?
     end
 
     sig { returns(T.any(T::Boolean, String)) }
-    def enforces_architecture?
-      enforce_architecture
+    def enforces_layer?
+      enforce_layer
     end
   end
 end
diff --git a/spec/parse_packwerk_spec.rb b/spec/parse_packwerk_spec.rb
@@ -983,12 +983,12 @@
     let(:package_yml) { package_dir.join('package.yml') }
     let(:package_todo_yml) { package_dir.join('package_todo.yml') }
 
-    def build_pack(public_path: 'app/public', enforce_privacy: true, enforce_architecture: true, dependencies: [], metadata: {}, config: {})
+    def build_pack(public_path: 'app/public', enforce_privacy: true, enforce_layer: true, dependencies: [], metadata: {}, config: {})
       ParsePackwerk::Package.new(
         name: package_dir.to_s,
         enforce_dependencies: true,
         enforce_privacy: enforce_privacy,
-        enforce_architecture: enforce_architecture,
+        enforce_layer: enforce_layer,
         public_path: public_path,
         dependencies: dependencies,
         metadata: metadata,
@@ -1002,7 +1002,7 @@ def pack_as_hash(package)
         name: package.name,
         enforce_dependencies: package.enforce_dependencies,
         enforce_privacy: package.enforce_privacy,
-        enforce_architecture: package.enforce_architecture,
+        enforce_layer: package.enforce_layer,
         dependencies: package.dependencies,
         metadata: package.metadata
       }
@@ -1016,7 +1016,7 @@ def pack_as_hash(package)
         expect(package_yml.read).to eq <<~PACKAGEYML
           enforce_dependencies: true
           enforce_privacy: true
-          enforce_architecture: true
+          enforce_layer: true
         PACKAGEYML
 
         expect(all_packages.count).to eq 1
@@ -1034,7 +1034,7 @@ def pack_as_hash(package)
         expect(package_yml.read).to eq <<~PACKAGEYML
           enforce_dependencies: true
           enforce_privacy: true
-          enforce_architecture: true
+          enforce_layer: true
           public_path: other/path
         PACKAGEYML
 
@@ -1053,7 +1053,7 @@ def pack_as_hash(package)
         expect(package_yml.read).to eq <<~PACKAGEYML
           enforce_dependencies: true
           enforce_privacy: strict
-          enforce_architecture: true
+          enforce_layer: true
         PACKAGEYML
 
         expect(all_packages.count).to eq 1
@@ -1071,7 +1071,7 @@ def pack_as_hash(package)
         expect(package_yml.read).to eq <<~PACKAGEYML
           enforce_dependencies: true
           enforce_privacy: true
-          enforce_architecture: true
+          enforce_layer: true
           dependencies:
             - my_other_pack1
             - my_other_pack2
@@ -1096,7 +1096,7 @@ def pack_as_hash(package)
         expect(package_yml.read).to eq <<~PACKAGEYML
           enforce_dependencies: true
           enforce_privacy: true
-          enforce_architecture: true
+          enforce_layer: true
           metadata:
             owner: Mission > Team
             protections:
@@ -1113,7 +1113,7 @@ def pack_as_hash(package)
           write_file(package_yml, <<~CONTENTS)
             enforce_dependencies: true
             enforce_privacy: true
-            enforce_architecture: true
+            enforce_layer: true
             public_path: other/path
             dependencies:
             - packs/package2
@@ -1132,7 +1132,7 @@ def pack_as_hash(package)
           expect(package_yml.read).to eq <<~PACKAGEYML
             enforce_dependencies: true
             enforce_privacy: true
-            enforce_architecture: true
+            enforce_layer: true
             public_path: other/path
           PACKAGEYML
         end
@@ -1153,7 +1153,7 @@ def pack_as_hash(package)
         expect(package_yml.read).to eq <<~PACKAGEYML
           enforce_dependencies: true
           enforce_privacy: true
-          enforce_architecture: true
+          enforce_layer: true
           my_special_key:
             blah: 1
           my_other_special_key: true
@@ -1169,7 +1169,7 @@ def pack_as_hash(package)
         write_file('packwerk.yml', '{}')
       end
 
-      let(:package) { build_pack(enforce_privacy: false, enforce_architecture: false) }
+      let(:package) { build_pack(enforce_privacy: false, enforce_layer: false) }
 
       it 'writes the right package' do
         ParsePackwerk.write_package_yml!(package)
