Merge pull request #18 from helsing-ai/mara/semver

Cargo.toml

@@ -30,6 +30,7 @@ protoc-bin-vendored = "3.0.0"
 reqwest = "0.11"
 serde = { version = "1", features = ["derive"] }
 serde_typename = "0.1"
+semver = { version = "1", features = ["serde"] }
 tar = "0.4"
 tokio = { version = "1", features = ["full", "tracing"] }
 toml = "0.7"

src/lib.rs

@@ -50,7 +50,7 @@ pub fn build(language: Language) -> eyre::Result<()> {
                     )
                 })?;
 
-                if pkg.version == dependency.manifest.version {
+                if dependency.manifest.version.matches(&pkg.version) {
                     continue;
                 }
             }

src/main.rs

@@ -142,6 +142,7 @@ mod cmd {
     };
     use eyre::{ensure, Context, ContextCompat};
     use futures::future::try_join_all;
+    use semver::{Version, VersionReq};
 
     /// Initializes the project
     pub async fn init(r#type: Option<(PackageType, Option<PackageId>)>) -> eyre::Result<()> {
@@ -163,7 +164,7 @@ mod cmd {
             manifest.package = Some(PackageManifest {
                 r#type,
                 name,
-                version: "0.0.1".to_owned(),
+                version: Version::new(0, 0, 1),
                 description: None,
             });
         }
@@ -200,20 +201,15 @@ mod cmd {
             .parse::<PackageId>()
             .wrap_err_with(|| format!("Invalid package id supplied: {package}"))?;
 
-        ensure!(
-            version
-                .chars()
-                .all(|c| c.is_alphanumeric() || c == '.' || c == '-'),
-            "Version specifications must be in the format <major>.<minor>.<patch>-<tag>"
-        );
+        let version = version
+            .parse::<VersionReq>()
+            .wrap_err_with(|| format!("Invalid version requirement supplied: {package}"))?;
 
         let mut manifest = Manifest::read().await?;
 
-        manifest.dependencies.push(Dependency::new(
-            repository.to_owned(),
-            package,
-            version.to_owned(),
-        ));
+        manifest
+            .dependencies
+            .push(Dependency::new(repository.to_owned(), package, version));
 
         manifest.write().await
     }

src/manifest.rs

@@ -1,6 +1,7 @@
 // (c) Copyright 2023 Helsing GmbH. All rights reserved.
 
 use eyre::Context;
+use semver::{Version, VersionReq};
 use serde::{Deserialize, Serialize};
 use std::{collections::HashMap, fmt};
 use tokio::fs;
@@ -100,13 +101,13 @@ pub struct PackageManifest {
     /// Name of the package
     pub name: PackageId,
     /// Version of the package
-    pub version: String,
+    pub version: Version,
     /// Description of the api package
     pub description: Option<String>,
 }
 
 /// Represents a single project dependency
-#[derive(Clone, Debug, Hash, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Clone, Debug, Hash, Serialize, Deserialize, PartialEq, Eq)]
 pub struct Dependency {
     /// Package name of this dependency
     pub package: PackageId,
@@ -116,7 +117,7 @@ pub struct Dependency {
 
 impl Dependency {
     /// Creates a new dependency
-    pub fn new(repository: String, package: PackageId, version: String) -> Self {
+    pub fn new(repository: String, package: PackageId, version: VersionReq) -> Self {
         Self {
             package,
             manifest: DependencyManifest {
@@ -138,10 +139,10 @@ impl fmt::Display for Dependency {
 }
 
 /// Manifest format for dependencies
-#[derive(Debug, Clone, Hash, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Clone, Hash, Serialize, Deserialize, PartialEq, Eq)]
 pub struct DependencyManifest {
     /// Version requirement in the helsing format, currently only supports pinning
-    pub version: String,
+    pub version: VersionReq,
     /// Artifactory repository to pull dependency from
     pub repository: String,
 }

src/package.rs

@@ -105,7 +105,7 @@ impl PackageStore {
                 ))?;
 
                 eyre::ensure!(
-                    existing.version == dependency.manifest.version,
+                    dependency.manifest.version.matches(&existing.version),
                     "A dependency of your project requires {}@{} which collides with {}@{} required by {}",
                     existing.name,
                     existing.version,

src/registry/artifactory.rs

@@ -2,7 +2,7 @@
 
 use std::sync::Arc;
 
-use eyre::{ensure, Context};
+use eyre::{ensure, Context, ContextCompat};
 use serde::{Deserialize, Serialize};
 use url::Url;
 
@@ -40,6 +40,36 @@ impl Artifactory {
 impl Registry for Artifactory {
     /// Downloads a package from artifactory
     async fn download(&self, dependency: Dependency) -> eyre::Result<Package> {
+        ensure!(
+            dependency.manifest.version.comparators.len() == 1,
+            "{} uses unsupported semver comparators",
+            dependency.package
+        );
+
+        let version = dependency
+            .manifest
+            .version
+            .comparators
+            .first()
+            .wrap_err("internal error")?;
+
+        ensure!(
+            version.op == semver::Op::Exact && version.minor.is_some() && version.patch.is_some(),
+            "artifactory only support pinned dependencies"
+        );
+
+        let version = format!(
+            "{}.{}.{}{}",
+            version.major,
+            version.minor.wrap_err("internal error")?,
+            version.patch.wrap_err("internal error")?,
+            if version.pre.is_empty() {
+                "".to_owned()
+            } else {
+                format!("-{}", version.pre)
+            }
+        );
+
         let artifact_uri: Url = {
             let mut url = self.0.url.clone();
 
@@ -49,7 +79,7 @@ impl Registry for Artifactory {
                 dependency.manifest.repository,
                 dependency.package,
                 dependency.package,
-                dependency.manifest.version
+                version
             ));
 
             url