use_packs 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c91cf31b0f2e560b5ea797df175fc15d5480057d622c93a26a6b6dd6dc470f8
-  data.tar.gz: cd7ff3e14cc6a67df490ece991ae2779fef0b88493c9f1bebe67b539c90e4da4
+  metadata.gz: 1e5ff298c66cd0240894575bbcd27229d27370a946f59578c21f650de6fbb699
+  data.tar.gz: 8863e9d1fd26bbbe3fa512b06f3338e05d0de0d552febd207989d229f07f76c6
 SHA512:
-  metadata.gz: 5be0a6fb61d223c991afd30b55baaaf74035cf7d0e66953dd4d10732fd7a8e2cfc4cadc2b4a6bdc6fee88440e041e53c89f478c3005b0701c6915760d2d2f95b
-  data.tar.gz: 251134796f9054ab9ed1b1d3ebab9c6c33ec74302510c1cbd81f7628cb427e3e88be321e130d44ae3f0aa85a37f1cb252d3edbabee12c0b9803c834e1c907ff9
+  metadata.gz: aa284550c2ffe844c552568ec06985b5d8bf95ebab863b7ceafbad9b28b84604eec045fc9ea56c9c0c73608507406c20eed4c1d1cd932b3c05855eb963eb7359
+  data.tar.gz: 8a186d4871ea6860535dba32a427d9a62c09b0bb92597d168a009d8c49def298877ac5437d7b979f9818b671ffa31dee806c738f7c7afe759734eb5d96347d44

data/lib/use_packs/private.rb

@@ -366,7 +366,7 @@ module UsePacks
 
       existing_package = ParsePackwerk.all.find { |p| p.name == pack_name }
       if existing_package.nil?
-        should_enforce_dependenceies = enforce_dependencies.nil? ? UsePacks.config.enforce_dependencies : enforce_dependencies
+        should_enforce_dependencies = enforce_dependencies.nil? ? UsePacks.config.enforce_dependencies : enforce_dependencies
 
         # TODO: This should probably be `if defined?(CodeOwnership) && CodeOwnership.configured?`
         # but we'll need to add an API to CodeOwnership to do this
@@ -379,7 +379,7 @@ module UsePacks
         end
 
         package = ParsePackwerk::Package.new(
-          enforce_dependencies: should_enforce_dependenceies,
+          enforce_dependencies: should_enforce_dependencies || false,
           enforce_privacy: enforce_privacy,
           dependencies: [],
           metadata: {},
@@ -557,6 +557,39 @@ module UsePacks
       end
     end
 
+    sig { params(packs: T::Array[Packs::Pack]).void }
+    def self.lint_package_yml_files!(packs)
+      packs.each do |p|
+        packwerk_package = ParsePackwerk.find(p.name)
+        next if packwerk_package.nil?
+
+        new_metadata = packwerk_package.metadata
+        new_config = packwerk_package.config
+
+        # Move metadata owner key to top-level
+        existing_owner = new_config['owner'] || new_metadata.delete('owner')
+        new_config['owner'] = existing_owner if !existing_owner.nil?
+
+        if new_metadata.empty?
+          new_config.delete('metadata')
+        end
+
+        new_package = packwerk_package.with(
+          config: new_config,
+          metadata: new_metadata,
+          dependencies: packwerk_package.dependencies.uniq.sort
+        )
+
+        ParsePackwerk.write_package_yml!(new_package)
+      end
+    end
+
+    sig { params(config: T::Hash[T.anything, T.anything]).returns(T::Hash[T.anything, T.anything]) }
+    def self.sort_keys(config)
+      sort_order = ParsePackwerk.key_sort_order
+      config.to_a.sort_by { |key, _value| T.unsafe(sort_order).index(key) }.to_h
+    end
+
     sig { params(packs: T::Array[Packs::Pack]).void }
     def self.visualize(packs: Packs.all)
       packwerk_packages = packs.map do |pack|

data/lib/use_packs.rb

@@ -253,19 +253,6 @@ module UsePacks
 
   sig { params(packs: T::Array[Packs::Pack]).void }
   def self.lint_package_yml_files!(packs)
-    packs.each do |p|
-      packwerk_package = ParsePackwerk.find(p.name)
-      next if packwerk_package.nil?
-
-      new_package = ParsePackwerk::Package.new(
-        name: packwerk_package.name,
-        enforce_privacy: packwerk_package.enforce_privacy,
-        enforce_dependencies: packwerk_package.enforce_dependencies,
-        dependencies: packwerk_package.dependencies.uniq.sort,
-        metadata: packwerk_package.metadata,
-        config: packwerk_package.config
-      )
-      ParsePackwerk.write_package_yml!(new_package)
-    end
+    Private.lint_package_yml_files!(packs)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: use_packs
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Gusto Engineers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-15 00:00:00.000000000 Z
+date: 2023-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: code_ownership