refactor: upgrade to deno_semver 0.7 (#41)

Author: dsherret

Cargo.lock

@@ -14,11 +14,11 @@ path = "tests/spec_test.rs"
 harness = false
 
 [dependencies]
-deno_semver = "0.6.0"
+deno_semver = "0.7.0"
 serde = { version = "1.0.149", features = ["derive"] }
 serde_json = "1.0.85"
 thiserror = "2.0.3"
 
 [dev-dependencies]
-file_test_runner = "0.7.2"
+file_test_runner = "0.7.4"
 pretty_assertions = "1.4.0"

Cargo.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.80.1"
+channel = "1.83.0"
 components = ["clippy", "rustfmt"]
 profile = "minimal"

rust-toolchain.toml

@@ -2,6 +2,7 @@
 
 use deno_semver::jsr::JsrDepPackageReqParseError;
 use deno_semver::package::PackageNv;
+use deno_semver::StackString;
 use thiserror::Error;
 
 use crate::transforms::TransformError;
@@ -41,20 +42,23 @@ pub enum DeserializationError {
   #[error("Invalid {0} section: {1:#}")]
   FailedDeserializing(&'static str, serde_json::Error),
   #[error("Invalid npm package '{0}'")]
-  InvalidNpmPackageId(String),
+  InvalidNpmPackageId(StackString),
   #[error("Invalid npm package dependency '{0}'")]
-  InvalidNpmPackageDependency(String),
+  InvalidNpmPackageDependency(StackString),
   #[error(transparent)]
   InvalidPackageSpecifier(#[from] JsrDepPackageReqParseError),
   #[error("Invalid package specifier version '{version}' for '{specifier}'")]
-  InvalidPackageSpecifierVersion { specifier: String, version: String },
+  InvalidPackageSpecifierVersion {
+    specifier: String,
+    version: StackString,
+  },
   #[error("Invalid jsr dependency '{dependency}' for '{package}'")]
   InvalidJsrDependency {
     package: PackageNv,
-    dependency: String,
+    dependency: StackString,
   },
   #[error(
     "npm package '{0}' was not found and could not have its version resolved"
   )]
-  MissingPackage(String),
+  MissingPackage(StackString),
 }

src/error.rs

@@ -9,6 +9,8 @@ use std::collections::VecDeque;
 use deno_semver::jsr::JsrDepPackageReq;
 use deno_semver::package::PackageNv;
 use deno_semver::package::PackageReq;
+use deno_semver::SmallStackString;
+use deno_semver::StackString;
 use deno_semver::Version;
 
 use crate::NpmPackageInfo;
@@ -24,11 +26,11 @@ enum LockfilePkgId {
 struct LockfileJsrPkgNv(PackageNv);
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
-struct LockfileNpmPackageId(String);
+struct LockfileNpmPackageId(StackString);
 
 impl LockfileNpmPackageId {
   pub fn parts(&self) -> impl Iterator<Item = &str> {
-    let package_id = &self.0;
+    let package_id = self.0.as_str();
     package_id.split('_').filter(|s| !s.is_empty())
   }
 }
@@ -73,7 +75,7 @@ struct LockfileNpmGraphPackage {
   /// Root ids that transitively reference this package.
   root_ids: HashSet<LockfilePkgId>,
   integrity: String,
-  dependencies: BTreeMap<String, LockfileNpmPackageId>,
+  dependencies: BTreeMap<StackString, LockfileNpmPackageId>,
 }
 
 #[derive(Debug)]
@@ -119,7 +121,14 @@ impl LockfilePackageGraph {
           root_packages.insert(LockfilePkgReq::Jsr(dep.req), nv);
         }
         deno_semver::package::PackageKind::Npm => {
-          let id = LockfileNpmPackageId(format!("{}@{}", dep.req.name, value));
+          let id = LockfileNpmPackageId({
+            let mut text =
+              StackString::with_capacity(dep.req.name.len() + 1 + value.len());
+            text.push_str(&dep.req.name);
+            text.push('@');
+            text.push_str(&value);
+            text
+          });
           root_packages
             .insert(LockfilePkgReq::Npm(dep.req), LockfilePkgId::Npm(id));
         }
@@ -303,14 +312,17 @@ impl LockfilePackageGraph {
     *remotes = self.remotes;
     for (req, id) in self.root_packages {
       let value = match &id {
-        LockfilePkgId::Jsr(nv) => nv.0.version.to_string(),
+        LockfilePkgId::Jsr(nv) => {
+          nv.0.version.to_custom_string::<SmallStackString>()
+        }
         LockfilePkgId::Npm(id) => id
           .0
-          .strip_prefix(&req.req().name)
+          .as_str()
+          .strip_prefix(req.req().name.as_str())
           .unwrap()
           .strip_prefix("@")
           .unwrap()
-          .to_string(),
+          .into(),
       };
       packages.specifiers.insert(req.into_jsr_dep(), value);
     }