Upgrade pubgrub version.

This commit updates the pubgrub and hexpm dependency version. It also
makes sure that version ranges are parsed on creation rather than use to
improve error handling.

Author: Kaholaz

Cargo.lock

@@ -29,7 +29,7 @@ toml = "0"
 # Enum trait impl macros
 strum = { version = "0", features = ["derive"] }
 # Hex package manager client
-hexpm = "3.3"
+hexpm = "4"
 # Creation of tar file archives
 tar = "0"
 # gzip compression

Cargo.toml

@@ -36,7 +36,7 @@ same-file = "1"
 # Open generated docs in browser
 opener = "0"
 # Pubgrub dependency resolution algorithm
-pubgrub = "0"
+pubgrub = "0.3"
 
 camino = { workspace = true, features = ["serde1"] }
 async-trait.workspace = true

compiler-cli/Cargo.toml

@@ -11,8 +11,8 @@ use futures::future;
 use gleam_core::{
     Error, Result,
     build::{Mode, Target, Telemetry},
-    config::PackageConfig,
-    dependency,
+    config::{GleamVersion, PackageConfig},
+    dependency::{self, PackageFetchError},
     error::{FileIoAction, FileKind, ShellCommandFailureReason, StandardIoAction},
     hex::{self, HEXPM_PUBLIC_KEY},
     io::{HttpClient as _, TarUnpacker, WrappedReader},
@@ -295,7 +295,10 @@ fn remove_extra_requirements(config: &PackageConfig, manifest: &mut Manifest) ->
 pub fn parse_gleam_add_specifier(package: &str) -> Result<(EcoString, Requirement)> {
     let Some((package, version)) = package.split_once('@') else {
         // Default to the latest version available.
-        return Ok((package.into(), Requirement::hex(">= 0.0.0")));
+        return Ok((
+            package.into(),
+            Requirement::hex(">= 0.0.0").expect(">= 0.0.0 should be a valid requirement"),
+        ));
     };
 
     // Parse the major and minor from the provided semantic version.
@@ -338,7 +341,7 @@ pub fn parse_gleam_add_specifier(package: &str) -> Result<(EcoString, Requiremen
                 ),
             });
         }
-    };
+    }?;
 
     Ok((package.into(), requirement))
 }
@@ -1075,8 +1078,9 @@ fn provide_package(
     match provided.get(&package_name) {
         Some(package) if package.source == package_source => {
             // This package has already been provided from this source, return the version
-            let version = hexpm::version::Range::new(format!("== {}", &package.version));
-            return Ok(version);
+            let version = GleamVersion::new(format!("== {}", &package.version))
+                .expect("exact version specification should not fail");
+            return Ok(version.into());
         }
         Some(package) => {
             // This package has already been provided from a different source which conflicts
@@ -1123,7 +1127,8 @@ fn provide_package(
     }
     let _ = parents.pop();
     // Add the package to the provided packages dictionary
-    let version = hexpm::version::Range::new(format!("== {}", &config.version));
+    let version = GleamVersion::new(format!("== {}", &config.version))
+        .expect("exact version specification should not fail");
     let _ = provided.insert(
         config.name,
         ProvidedPackage {
@@ -1133,7 +1138,7 @@ fn provide_package(
         },
     );
     // Return the version
-    Ok(version)
+    Ok(version.into())
 }
 
 /// Unlocks specified packages and their unique dependencies.
@@ -1226,6 +1231,7 @@ async fn lookup_package(
     }
 }
 
+#[derive(Debug)]
 struct PackageFetcher {
     runtime: tokio::runtime::Handle,
     http: HttpClient,
@@ -1267,26 +1273,14 @@ impl TarUnpacker for Untar {
 }
 
 impl dependency::PackageFetcher for PackageFetcher {
-    fn get_dependencies(
-        &self,
-        package: &str,
-    ) -> Result<hexpm::Package, Box<dyn std::error::Error>> {
+    fn get_dependencies(&self, package: &str) -> Result<hexpm::Package, PackageFetchError> {
         tracing::debug!(package = package, "looking_up_hex_package");
         let config = hexpm::Config::new();
         let request = hexpm::get_package_request(package, None, &config);
         let response = self
             .runtime
             .block_on(self.http.send(request))
-            .map_err(Box::new)?;
-
-        match hexpm::get_package_response(response, HEXPM_PUBLIC_KEY) {
-            Ok(a) => Ok(a),
-            Err(e) => match e {
-                hexpm::ApiError::NotFound => {
-                    Err(format!("I couldn't find a package called `{}`", package).into())
-                }
-                _ => Err(e.into()),
-            },
-        }
+            .map_err(|e| PackageFetchError::fetch_error(e.to_string()))?;
+        hexpm::get_package_response(response, HEXPM_PUBLIC_KEY).map_err(|e| e.into())
     }
 }