Converting more errors

crates/turborepo-repository/src/package_graph/dep_splitter.rs

@@ -175,7 +175,7 @@ impl<'a> DependencyVersion<'a> {
  _ => {
  // If we got this far, then we need to check the workspace package version to
  // see it satisfies the dependencies range to determin whether
- // or not its an internal or external dependency.
+ // or not it's an internal or external dependency.
  let constraint = node_semver::Range::parse(self.version);
  let version = node_semver::Version::parse(package_version);
 

crates/turborepo-repository/src/package_manager/mod.rs

@@ -283,8 +283,16 @@ pub enum Error {
  #[error("We detected multiple package managers in your repository: {}. Please remove one \
  of them.", managers.join(", "))]
  MultiplePackageManagers { managers: Vec<String> },
- #[error(transparent)]
- Semver(#[from] node_semver::SemverError),
+ //#[error(transparent)]
+ //Semver(#[from] node_semver::SemverError),
+ #[error("invalid semantic version `{version}`")]
+ InvalidVersion {
+ version: String,
+ #[label("version found here")]
+ span: Option<SourceSpan>,
+ #[source_code]
+ text: NamedSource,
+ },
  #[error("{0}: {1}")]
  // this will be something like "cannot find binary: <thing we tried to find>"
  Which(which::Error, String),
@@ -438,7 +446,15 @@ impl PackageManager {
  };
 
  let (manager, version) = Self::parse_package_manager_string(package_manager)?;
- let version = version.parse()?;
+ let version = version.parse().map_err(|_| {
+ let (span, text) = package_manager.span_and_text("package.json");
+ Error::InvalidVersion {
+ version: version.to_string(),
+ span,
+ text,
+ }
+ })?;
+
  match manager {
  "npm" => Ok(PackageManager::Npm),
  "bun" => Ok(PackageManager::Bun),

crates/turborepo-repository/src/package_manager/pnpm.rs

@@ -14,8 +14,8 @@ pub struct PnpmDetector;
 
 impl PnpmDetector {
  pub fn detect_pnpm6_or_pnpm(version: &Version) -> Result<PackageManager, Error> {
- let pnpm6_constraint: Range = "<7.0.0".parse()?;
- let pnpm9_constraint: Range = ">=9.0.0-alpha.0".parse()?;
+ let pnpm6_constraint: Range = "<7.0.0".parse().expect("valid version");
+ let pnpm9_constraint: Range = ">=9.0.0-alpha.0".parse().expect("valid version");
  if pnpm6_constraint.satisfies(version) {
  Ok(PackageManager::Pnpm6)
  } else if pnpm9_constraint.satisfies(version) {

crates/turborepo-repository/src/package_manager/yarn.rs

@@ -12,7 +12,7 @@ pub struct YarnDetector;
 
 impl YarnDetector {
  pub fn detect_berry_or_yarn(version: &Version) -> Result<PackageManager, Error> {
- let berry_constraint: Range = ">=2.0.0-0".parse()?;
+ let berry_constraint: Range = ">=2.0.0-0".parse().expect("valid version");
  if berry_constraint.satisfies(version) {
  Ok(PackageManager::Berry)
  } else {