refactor!: remove get_dependency_group_mut from PackageManifest

BREAKING CHANGE: remove get_dependency_group_mut from PackageManifest

Author: EricCrosson

src/package_manifest.rs

@@ -30,14 +30,7 @@ pub enum DependencyGroup {
 }
 
 impl DependencyGroup {
-    pub const VALUES: [Self; 4] = [
-        Self::Dependencies,
-        Self::DevDependencies,
-        Self::OptionalDependencies,
-        Self::PeerDependencies,
-    ];
-
-    pub(crate) const STRINGS: [&str; 4] = [
+    pub(crate) const VALUES: [&str; 4] = [
         "dependencies",
         "devDependencies",
         "optionalDependencies",
@@ -94,7 +87,7 @@ impl PackageManifest {
     where
         S: AsRef<str>,
     {
-        DependencyGroup::STRINGS
+        DependencyGroup::VALUES
             .iter()
             // only iterate over the objects corresponding to each dependency group
             .filter_map(|dependency_group| {
@@ -114,7 +107,7 @@ impl PackageManifest {
     }
 
     pub fn dependencies_iter(&self) -> impl Iterator<Item = (&String, &serde_json::Value)> {
-        DependencyGroup::STRINGS
+        DependencyGroup::VALUES
             .iter()
             .filter_map(|dependency_group| {
                 self.contents
@@ -129,7 +122,7 @@ impl PackageManifest {
         &'a self,
         package_manifests_by_package_name: &'a HashMap<String, PackageManifest>,
     ) -> impl Iterator<Item = &'a PackageManifest> {
-        DependencyGroup::STRINGS
+        DependencyGroup::VALUES
             .iter()
             // only iterate over the objects corresponding to each dependency group
             .filter_map(|dependency_group| {
@@ -178,17 +171,6 @@ impl PackageManifest {
             .collect()
     }
 
-    // REFACTOR: return an iterator
-    pub fn get_dependency_group_mut(
-        &mut self,
-        group: DependencyGroup,
-    ) -> Option<&mut serde_json::Map<String, serde_json::Value>> {
-        self.contents
-            .extra_fields
-            .get_mut(group.as_str())
-            .and_then(serde_json::Value::as_object_mut)
-    }
-
     // REFACTOR: for nearness
     // Name of the archive generated by `npm pack`, for example "myscope-a-cool-package-1.0.0.tgz"
     pub fn npm_pack_file_basename(&self) -> String {

src/pin.rs

@@ -100,6 +100,17 @@ fn needs_modification<'a, 'b>(
         })
 }
 
+fn get_dependency_group_mut<'a>(
+    package_manifest: &'a mut PackageManifest,
+    dependency_group: &str,
+) -> Option<&'a mut serde_json::Map<String, serde_json::Value>> {
+    package_manifest
+        .contents
+        .extra_fields
+        .get_mut(dependency_group)
+        .and_then(serde_json::Value::as_object_mut)
+}
+
 pub fn modify<P>(root: P) -> Result<(), PinError>
 where
     P: AsRef<Path>,
@@ -122,7 +133,7 @@ where
     for (package_name, mut package_manifest) in package_manifest_by_package_name {
         let mut dirty = false;
         for dependency_group in DependencyGroup::VALUES {
-            let dependencies = package_manifest.get_dependency_group_mut(dependency_group);
+            let dependencies = get_dependency_group_mut(&mut package_manifest, dependency_group);
             if dependencies.is_none() {
                 continue;
             }