internal: Add version helpers. Remove old plugin code. (#266)

crates/cli/Cargo.toml

@@ -29,7 +29,6 @@ path = "src/main.rs"
 [dependencies]
 proto_core = { version = "0.21.0", path = "../core" }
 proto_pdk_api = { version = "0.9.0", path = "../pdk-api" }
-proto_wasm_plugin = { version = "0.7.3", path = "../wasm-plugin" }
 system_env = { version = "0.1.2", path = "../system-env" }
 chrono = "0.4.31"
 clap = { workspace = true, features = ["derive", "env"] }

crates/core/src/version_resolver.rs

@@ -83,8 +83,8 @@ fn extract_installed_versions(installed: &HashSet<VersionSpec>) -> HashSet<&Vers
     installed
         .iter()
         .filter_map(|item| match item {
-            VersionSpec::Alias(_) => None,
             VersionSpec::Version(v) => Some(v),
+            _ => None,
         })
         .collect()
 }

crates/pdk-test-utils/Cargo.toml

@@ -10,7 +10,6 @@ repository = "https://github.com/moonrepo/proto"
 [dependencies]
 proto_core = { version = "0.21.0", path = "../core" }
 proto_pdk_api = { version = "0.9.0", path = "../pdk-api" }
-proto_wasm_plugin = { version = "0.7.3", path = "../wasm-plugin" }
 extism = { workspace = true }
 serde_json = { workspace = true }
 toml = { version = "0.8.2", optional = true }

crates/pdk-test-utils/src/lib.rs

@@ -5,13 +5,12 @@ pub use macros::*;
 pub use proto_core as core;
 pub use proto_core::{
     Id, ProtoEnvironment, Tool, ToolManifest, ToolsConfig, UnresolvedVersionSpec, UserConfig,
-    Version, VersionReq, VersionSpec,
+    Version, VersionReq, VersionSpec, Wasm,
 };
 pub use proto_pdk_api::*;
 pub use wrapper::WasmTestWrapper;
 
 use proto_core::inject_default_manifest_config;
-use proto_wasm_plugin::Wasm;
 use std::collections::HashMap;
 use std::path::{Path, PathBuf};
 use std::{env, fs};

crates/version-spec/src/resolved_spec.rs

@@ -9,6 +9,7 @@ use std::str::FromStr;
 #[derive(Clone, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize)]
 #[serde(untagged, into = "String", try_from = "String")]
 pub enum VersionSpec {
+    Canary,
     Alias(String),
     Version(Version),
 }
@@ -18,22 +19,31 @@ impl VersionSpec {
         Self::from_str(value.as_ref())
     }
 
+    pub fn is_alias<A: AsRef<str>>(&self, name: A) -> bool {
+        match self {
+            Self::Alias(alias) => alias == name.as_ref(),
+            _ => false,
+        }
+    }
+
     pub fn is_canary(&self) -> bool {
         match self {
+            Self::Canary => true,
             Self::Alias(alias) => alias == "canary",
             _ => false,
         }
     }
 
     pub fn is_latest(&self) -> bool {
         match self {
-            Self::Alias(alias) => alias == "latest",
+            Self::Alias(alias) => alias == "latest" || alias == "stable",
             _ => false,
         }
     }
 
     pub fn to_unresolved_spec(&self) -> UnresolvedVersionSpec {
         match self {
+            Self::Canary => UnresolvedVersionSpec::Canary,
             Self::Alias(alias) => UnresolvedVersionSpec::Alias(alias.to_owned()),
             Self::Version(version) => UnresolvedVersionSpec::Version(version.to_owned()),
         }
@@ -84,6 +94,7 @@ impl Debug for VersionSpec {
 impl Display for VersionSpec {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
+            Self::Canary => write!(f, "canary"),
             Self::Alias(alias) => write!(f, "{}", alias),
             Self::Version(version) => write!(f, "{}", version),
         }
@@ -93,6 +104,7 @@ impl Display for VersionSpec {
 impl PartialEq<&str> for VersionSpec {
     fn eq(&self, other: &&str) -> bool {
         match self {
+            Self::Canary => "canary" == *other,
             Self::Alias(alias) => alias == other,
             Self::Version(version) => version.to_string() == *other,
         }
@@ -107,3 +119,9 @@ impl PartialEq<Version> for VersionSpec {
         }
     }
 }
+
+impl AsRef<VersionSpec> for VersionSpec {
+    fn as_ref(&self) -> &VersionSpec {
+        self
+    }
+}

crates/version-spec/src/unresolved_spec.rs

@@ -22,20 +22,31 @@ impl UnresolvedVersionSpec {
         Self::from_str(value.as_ref())
     }
 
+    pub fn is_alias<A: AsRef<str>>(&self, name: A) -> bool {
+        match self {
+            Self::Alias(alias) => alias == name.as_ref(),
+            _ => false,
+        }
+    }
+
     pub fn is_canary(&self) -> bool {
-        matches!(self, UnresolvedVersionSpec::Canary)
+        match self {
+            Self::Canary => true,
+            Self::Alias(alias) => alias == "canary",
+            _ => false,
+        }
     }
 
     pub fn is_latest(&self) -> bool {
         match self {
-            Self::Alias(alias) => alias == "latest",
+            Self::Alias(alias) => alias == "latest" || alias == "stable",
             _ => false,
         }
     }
 
     pub fn to_resolved_spec(&self) -> VersionSpec {
         match self {
-            Self::Canary => VersionSpec::Alias("canary".to_owned()),
+            Self::Canary => VersionSpec::Canary,
             Self::Alias(alias) => VersionSpec::Alias(alias.to_owned()),
             Self::Version(version) => VersionSpec::Version(version.to_owned()),
             _ => unreachable!(),
@@ -148,3 +159,9 @@ impl PartialEq<VersionSpec> for UnresolvedVersionSpec {
         }
     }
 }
+
+impl AsRef<UnresolvedVersionSpec> for UnresolvedVersionSpec {
+    fn as_ref(&self) -> &UnresolvedVersionSpec {
+        self
+    }
+}