refactor: upgrade to deno_semver 0.7 (#556)

Author: dsherret

Cargo.lock

@@ -40,11 +40,11 @@ harness = false
 [dependencies]
 anyhow = "1.0.43"
 async-trait = "0.1.68"
-capacity_builder = "0.1.0"
+capacity_builder = "0.5.0"
 data-url = "0.3.0"
 deno_ast = { version = "0.44.0", features = ["dep_analysis", "emit"] }
 deno_unsync.workspace = true
-deno_semver = "0.6.0"
+deno_semver = "0.7.1"
 encoding_rs = "0.8.33"
 futures = "0.3.26"
 import_map = "0.20.0"

Cargo.toml

@@ -47,7 +47,10 @@ use deno_semver::package::PackageNv;
 use deno_semver::package::PackageNvReference;
 use deno_semver::package::PackageReq;
 use deno_semver::package::PackageReqReferenceParseError;
+use deno_semver::package::PackageSubPath;
 use deno_semver::RangeSetOrTag;
+use deno_semver::SmallStackString;
+use deno_semver::StackString;
 use deno_semver::Version;
 use deno_semver::VersionReq;
 use futures::future::LocalBoxFuture;
@@ -213,7 +216,7 @@ pub enum JsrPackageFormatError {
       false => ""
     }
   )]
-  VersionTagNotSupported { tag: String },
+  VersionTagNotSupported { tag: SmallStackString },
 }
 
 #[derive(Debug, Clone, Error)]
@@ -839,7 +842,7 @@ fn is_media_type_unknown(media_type: &MediaType) -> bool {
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct WorkspaceMember {
   pub base: Url,
-  pub name: String,
+  pub name: StackString,
   #[serde(skip_serializing_if = "Option::is_none")]
   pub version: Option<Version>,
   pub exports: IndexMap<String, String>,
@@ -3388,7 +3391,7 @@ pub(crate) struct AttributeTypeWithRange {
 
 #[derive(Debug, Default)]
 struct PendingNpmState {
-  requested_registry_info_loads: HashSet<String>,
+  requested_registry_info_loads: HashSet<StackString>,
   pending_resolutions: Vec<PendingNpmResolutionItem>,
 }
 
@@ -5181,7 +5184,7 @@ impl<'a> NpmSpecifierResolver<'a> {
               self.add_nv_for_item(
                 item.specifier.clone(),
                 pkg_nv.clone(),
-                item.package_ref.sub_path().map(ToOwned::to_owned),
+                item.package_ref.sub_path().map(PackageSubPath::from_str),
               );
             }
             Err(err) => {
@@ -5242,7 +5245,7 @@ impl<'a> NpmSpecifierResolver<'a> {
     &mut self,
     specifier: ModuleSpecifier,
     pkg_nv: PackageNv,
-    sub_path: Option<String>,
+    sub_path: Option<SmallStackString>,
   ) {
     let pkg_id_ref = NpmPackageNvReference::new(PackageNvReference {
       nv: pkg_nv.clone(),
@@ -6501,7 +6504,7 @@ mod tests {
     let workspace_members = vec![WorkspaceMember {
       base: Url::parse("file:///").unwrap(),
       exports: exports.clone(),
-      name: "@foo/bar".to_string(),
+      name: "@foo/bar".into(),
       version: Some(Version::parse_standard("1.0.0").unwrap()),
     }];
     let mut test_loader = MemoryLoader::default();
@@ -6571,7 +6574,7 @@ mod tests {
     let workspace_members = vec![WorkspaceMember {
       base: Url::parse("file:///").unwrap(),
       exports: exports.clone(),
-      name: "@foo/bar".to_string(),
+      name: "@foo/bar".into(),
       version: Some(Version::parse_standard("1.0.0").unwrap()),
     }];
     let mut test_loader = MemoryLoader::default();
@@ -6652,14 +6655,13 @@ mod tests {
   #[test]
   fn leading_v_version_tag_err() {
     {
-      let err = JsrPackageFormatError::VersionTagNotSupported {
-        tag: "v1.2".to_string(),
-      };
+      let err =
+        JsrPackageFormatError::VersionTagNotSupported { tag: "v1.2".into() };
       assert_eq!(err.to_string(), "Version tag not supported in jsr specifiers ('v1.2'). Remove leading 'v' before version.");
     }
     {
       let err = JsrPackageFormatError::VersionTagNotSupported {
-        tag: "latest".to_string(),
+        tag: "latest".into(),
       };
       assert_eq!(
         err.to_string(),
@@ -6668,7 +6670,7 @@ mod tests {
     }
     {
       let err = JsrPackageFormatError::VersionTagNotSupported {
-        tag: "version".to_string(), // not a vversion with a leading 'v'
+        tag: "version".into(), // not a vversion with a leading 'v'
       };
       assert_eq!(
         err.to_string(),

src/graph.rs

@@ -8,6 +8,7 @@ use std::collections::HashSet;
 use deno_semver::jsr::JsrDepPackageReq;
 use deno_semver::package::PackageNv;
 use deno_semver::package::PackageReq;
+use deno_semver::StackString;
 use deno_semver::Version;
 use deno_semver::VersionReq;
 use serde::Deserialize;
@@ -115,7 +116,7 @@ pub struct PackageSpecifiers {
   #[serde(flatten)]
   package_reqs: BTreeMap<PackageReq, PackageNv>,
   #[serde(skip_serializing)]
-  packages_by_name: HashMap<String, Vec<PackageNv>>,
+  packages_by_name: HashMap<StackString, Vec<PackageNv>>,
   #[serde(skip_serializing)]
   packages: BTreeMap<PackageNv, PackageNvInfo>,
   /// Cache for packages that have a referrer outside JSR.

src/packages.rs

@@ -17,6 +17,7 @@ use anyhow::Error;
 use data_url::DataUrl;
 use deno_ast::ModuleSpecifier;
 use deno_semver::package::PackageReq;
+use deno_semver::StackString;
 use futures::future;
 use futures::future::LocalBoxFuture;
 use once_cell::sync::Lazy;
@@ -352,7 +353,14 @@ pub fn recommended_registry_package_url_to_nv(
   let name = parts.next()?;
   let version = parts.next()?;
   Some(PackageNv {
-    name: format!("{}/{}", scope, name),
+    name: {
+      capacity_builder::StringBuilder::<StackString>::build(|builder| {
+        builder.append(scope);
+        builder.append('/');
+        builder.append(name);
+      })
+      .unwrap()
+    },
     version: deno_semver::Version::parse_standard(version).ok()?,
   })
 }

src/source/mod.rs

@@ -54,7 +54,7 @@ fn wasm_module_deps_to_dts(wasm_deps: &wasm_dep_analyzer::WasmDeps) -> String {
   StringBuilder::build(|builder| {
     for import_module in &unique_import_modules {
       builder.append("import \"");
-      builder.append(import_module);
+      builder.append(*import_module);
       builder.append("\";\n");
     }
 

src/source/wasm.rs

@@ -15,6 +15,7 @@ use deno_graph::ModuleGraph;
 use deno_graph::WorkspaceFastCheckOption;
 use deno_graph::WorkspaceMember;
 use deno_semver::package::PackageNv;
+use deno_semver::StackString;
 use file_test_runner::collection::strategies::TestPerFileCollectionStrategy;
 use file_test_runner::collection::CollectedCategoryOrTest;
 use file_test_runner::collection::CollectedTest;
@@ -256,7 +257,7 @@ async fn test_version(
   let workspace_members = vec![WorkspaceMember {
     base: Url::parse("file:///").unwrap(),
     exports: version_meta.exports.clone(),
-    name: format!("@{scope}/{name}"),
+    name: StackString::from_string(format!("@{scope}/{name}")),
     version: Some(deno_semver::Version::parse_standard(version).unwrap()),
   }];