parse_packwerk 0.16.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbe9403aa70147a34d5eff8474bfa6d85d7ce224744adf7f0c9fb8fcbe38031c
-  data.tar.gz: 1eaa3eeed901bb517330f75ac2d9b12c4244410f7037d0c4095df218bb4d1cb1
+  metadata.gz: 7a09aa689cc7e62ae6f1dab57eea2705b3a658954bd12fbd89084d3542d673b2
+  data.tar.gz: d7a76cc5ee374ea98541b8f4663256647389d08357d230479a99d5f85a003a72
 SHA512:
-  metadata.gz: fbc31cab6491b2f2d620c4529f9517446a0a180fe07c1cdc4eb5195b16bc3ce986f63f359421c5460742b49026daa64535c051679a6860b912f509fd65cc7b5f
-  data.tar.gz: ce9ffabcfc52bd3a98eabaf94b7130f1cb8d4f55faa797241a7029efcd143a6e3a2b082fc90017a07ab23bb57190366f425e61a2dd091579db272903d1788e2b
+  metadata.gz: 5597c6896e8421524404bd79b8ae8d7b2b17bc7b44761e5675361b34ccd589f0b6b5ef019f1fcd388766436bae4365146d47d621bf2adf843c28911db52db778
+  data.tar.gz: e9e0f9052c5c778537d73dbdb0317e85c50adf3346933a7eb4d9d14cf46f869fa702f5fca349cfc6fae99b6f9a45a2ab1127034ce55fffec860a8262e9332a34

data/lib/parse_packwerk/package.rb

@@ -5,11 +5,12 @@ module ParsePackwerk
     extend T::Sig
 
     const :name, String
-    const :enforce_dependencies, T::Boolean
-    const :enforce_privacy, T::Boolean
+    const :enforce_dependencies, T.any(T::Boolean, String)
+    const :enforce_privacy, T.any(T::Boolean, String)
     const :public_path, String, default: DEFAULT_PUBLIC_PATH
     const :metadata, MetadataYmlType
     const :dependencies, T::Array[String]
+    const :config, T::Hash[T.untyped, T.untyped]
 
     sig { params(pathname: Pathname).returns(Package) }
     def self.from(pathname)
@@ -18,11 +19,12 @@ module ParsePackwerk
 
       new(
         name: package_name,
-        enforce_dependencies: package_loaded_yml[ENFORCE_DEPENDENCIES] ? true : false,
-        enforce_privacy: package_loaded_yml[ENFORCE_PRIVACY] ? true : false,
+        enforce_dependencies: package_loaded_yml[ENFORCE_DEPENDENCIES],
+        enforce_privacy: package_loaded_yml[ENFORCE_PRIVACY],
         public_path: package_loaded_yml[PUBLIC_PATH] || DEFAULT_PUBLIC_PATH,
         metadata: package_loaded_yml[METADATA] || {},
-        dependencies: package_loaded_yml[DEPENDENCIES] || []
+        dependencies: package_loaded_yml[DEPENDENCIES] || [],
+        config: package_loaded_yml,
       )
     end
 
@@ -41,12 +43,12 @@ module ParsePackwerk
       directory.join(public_path).cleanpath
     end
 
-    sig { returns(T::Boolean) }
+    sig { returns(T.any(T::Boolean, String)) }
     def enforces_dependencies?
       enforce_dependencies
     end
 
-    sig { returns(T::Boolean) }
+    sig { returns(T.any(T::Boolean, String)) }
     def enforces_privacy?
       enforce_privacy
     end

data/lib/parse_packwerk.rb

@@ -53,44 +53,42 @@ module ParsePackwerk
   sig { params(package: ParsePackwerk::Package).void }
   def self.write_package_yml!(package)
     FileUtils.mkdir_p(package.directory)
+    
     File.open(package.yml, 'w') do |file|
-      # We do not use `YAML.dump` or `contents.to_yaml` because it seems like packwerk writes a variation of the default YAML spec.
-      # If you'd like to see the difference, change this to `package_yaml = YAML.dump(contents)` to and run tests to see the difference.
-      package_yml = <<~PACKAGEYML
-        enforce_dependencies: #{package.enforces_dependencies?}
-        enforce_privacy: #{package.enforces_privacy?}
-      PACKAGEYML
+      merged_config = package.config
+
+      merged_config.merge!(
+        'enforce_dependencies' => package.enforce_dependencies,
+        'enforce_privacy' => package.enforce_privacy
+      )
+
+      # We want checkers of the form `enforce_xyz` to be at the top
+      merged_config_arr = merged_config.sort_by do |k, v|
+        if k.include?('enforce')
+          0
+        else
+          1
+        end
+      end
+
+      merged_config = merged_config_arr.to_h
 
       unless package.public_path == DEFAULT_PUBLIC_PATH
-        public_path = <<~PUBLICPATH
-          public_path: #{package.public_path}
-        PUBLICPATH
-        package_yml += public_path
+        merged_config.merge!('public_path' => package.public_path)
       end
 
       if package.dependencies.any?
-        dependencies = <<~STATEDDEPS
-          dependencies:
-          #{package.dependencies.map { |dep| "  - #{dep}" }.join("\n")}
-        STATEDDEPS
-
-        package_yml += dependencies
+        merged_config.merge!('dependencies' => package.dependencies)
       end
 
-      if package.metadata.keys.any?
-        raw_yaml = YAML.dump(package.metadata)
-        stylized_yaml = raw_yaml.gsub("---\n", '')
-        indented_yaml = stylized_yaml.split("\n").map { |line| "  #{line}" }.join("\n")
-
-        metadata = <<~METADATA
-          metadata:
-          #{indented_yaml}
-        METADATA
-
-        package_yml += metadata
+      if package.metadata.any?
+        merged_config.merge!('metadata' => package.metadata)
       end
-
-      file.write(package_yml)
+      raw_yaml = YAML.dump(merged_config)
+      # Add indentation for dependencies
+      raw_yaml.gsub!(/^- /,"  - ")
+      stylized_yaml = raw_yaml.gsub("---\n", '')
+      file.write(stylized_yaml)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parse_packwerk
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Gusto Engineers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-14 00:00:00.000000000 Z
+date: 2022-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime