refactor: PackageManagerKind variant names

nokazn · Feb 10, 2024 · e93f268 · e93f268
1 parent 73176b7
commit e93f268
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/src/core.rs b/src/core.rs
@@ -3,19 +3,19 @@ use strum_macros::EnumIter;
 
 #[derive(EnumIter, Serialize, Deserialize, Hash, Clone, Copy, Debug)]
 pub enum PackageManagerKind {
-  PackageLock,
-  YarnLock,
-  PnpmLock,
-  BunLockb,
+  Npm,
+  Yarn,
+  Pnpm,
+  Bun,
 }
 
 impl PackageManagerKind {
   pub fn file_names(&self) -> Vec<&str> {
     match self {
-      PackageManagerKind::PackageLock => vec!["package-lock.json"],
-      PackageManagerKind::YarnLock => vec!["yarn.lock"],
-      PackageManagerKind::PnpmLock => vec!["pnpm-lock.yaml", "pnpm-lock.yml"],
-      PackageManagerKind::BunLockb => vec!["bun.lockb"],
+      PackageManagerKind::Npm => vec!["package-lock.json"],
+      PackageManagerKind::Yarn => vec!["yarn.lock"],
+      PackageManagerKind::Pnpm => vec!["pnpm-lock.yaml", "pnpm-lock.yml"],
+      PackageManagerKind::Bun => vec!["bun.lockb"],
     }
   }
 }
diff --git a/src/package_json.rs b/src/package_json.rs
@@ -113,14 +113,14 @@ impl WorkspacePackage {
   fn validate_package_json_fields<T: AsRef<Path>>(self, base_dir: T) -> Result<Self, Error> {
     let package_json_path = to_package_json_path(&base_dir);
     match self.kind {
-      PackageManagerKind::YarnLock
+      PackageManagerKind::Yarn
         if self.original.name.is_none() || self.original.version.is_none() =>
       {
         Err(Error::InvalidPackageJsonFieldsForYarnError(
           package_json_path,
         ))
       }
-      PackageManagerKind::BunLockb if self.original.name.is_none() => Err(
+      PackageManagerKind::Bun if self.original.name.is_none() => Err(
         Error::InvalidPackageJsonFieldsForBunError(package_json_path),
       ),
       _ => Ok(self),

diff --git a/src/workspaces.rs b/src/workspaces.rs
@@ -22,10 +22,10 @@ impl Workspaces {
     Self {
       kind: kind,
       packages: match &kind {
-        PackageManagerKind::PackageLock => Workspaces::resolve_npm_workspaces(base_dir, patterns),
-        PackageManagerKind::BunLockb => Workspaces::resolve_bun_workspaces(base_dir, patterns),
-        PackageManagerKind::YarnLock => Workspaces::resolve_yarn_workspaces(base_dir, patterns),
-        PackageManagerKind::PnpmLock => Workspaces::resolve_pnpm_workspaces(base_dir),
+        PackageManagerKind::Npm => Workspaces::resolve_npm_workspaces(base_dir, patterns),
+        PackageManagerKind::Bun => Workspaces::resolve_bun_workspaces(base_dir, patterns),
+        PackageManagerKind::Yarn => Workspaces::resolve_yarn_workspaces(base_dir, patterns),
+        PackageManagerKind::Pnpm => Workspaces::resolve_pnpm_workspaces(base_dir),
       },
     }
   }