feat(cli): introduce semver resolver and fix version handling across commands

GaspardKirira · GaspardKirira · commit e2a87289a0f7 · 2026-04-08T16:57:37.000+03:00
- add Semver helper with proper version comparison and range resolution
- replace lexicographic version comparisons with semantic comparison
- fix latest version detection in search and outdated commands
- fix install and add commands to resolve correct versions
- prepare CLI for semver ranges support (future manifest integration)

This fixes incorrect ordering like 1.9.0 &gt; 1.10.0 and ensures consistent version resolution across Vix.
diff --git a/include/vix/cli/util/Semver.hpp b/include/vix/cli/util/Semver.hpp
@@ -0,0 +1,32 @@
+/**
+ *
+ *  @file Semver.hpp
+ *  @author Gaspard Kirira
+ *
+ *  Copyright 2025, Gaspard Kirira.  All rights reserved.
+ *  https://github.com/vixcpp/vix
+ *  Use of this source code is governed by a MIT license
+ *  that can be found in the License file.
+ *
+ *  Vix.cpp
+ */
+#ifndef VIX_CLI_UTIL_SEMVER_HPP
+#define VIX_CLI_UTIL_SEMVER_HPP
+
+#include <optional>
+#include <string>
+#include <vector>
+
+namespace vix::cli::util::semver
+{
+  int compare(const std::string &lhs, const std::string &rhs);
+  bool satisfies(const std::string &version, const std::string &range);
+  std::optional<std::string> resolveMaxSatisfying(
+      const std::vector<std::string> &versions,
+      const std::string &range);
+  std::string findLatest(const std::vector<std::string> &versions);
+  void sortAscending(std::vector<std::string> &versions);
+  void sortDescending(std::vector<std::string> &versions);
+}
+
+#endif
diff --git a/include/vix/cli/util/Version.hpp b/include/vix/cli/util/Version.hpp
@@ -0,0 +1,27 @@
+/**
+ *
+ *  @file Version.hpp
+ *  @author Gaspard Kirira
+ *
+ *  Copyright 2025, Gaspard Kirira.  All rights reserved.
+ *  https://github.com/vixcpp/vix
+ *  Use of this source code is governed by a MIT license
+ *  that can be found in the License file.
+ *
+ *  Vix.cpp
+ */
+#ifndef VIX_CLI_UTIL_VERSION_HPP
+#define VIX_CLI_UTIL_VERSION_HPP
+
+#include <string>
+#include <vector>
+
+namespace vix::cli::util
+{
+  std::vector<int> parseVersionParts(const std::string &version);
+  int compareVersions(const std::string &lhs, const std::string &rhs);
+  bool isVersionGreater(const std::string &lhs, const std::string &rhs);
+  std::string findLatestVersionFromJsonObjectKeys(const std::vector<std::string> &versions);
+}
+
+#endif
diff --git a/src/commands/AddCommand.cpp b/src/commands/AddCommand.cpp
@@ -15,6 +15,7 @@
 #include <vix/cli/util/Shell.hpp>
 #include <vix/cli/util/Ui.hpp>
 #include <vix/cli/util/Hash.hpp>
+#include <vix/cli/util/Semver.hpp>
 #include <vix/cli/Style.hpp>
 #include <vix/utils/Env.hpp>
 #include <nlohmann/json.hpp>
@@ -149,21 +150,43 @@ namespace vix::commands
 
     static int resolve_version_v1(const json &entry, PkgSpec &spec)
     {
-      if (!spec.requestedVersion.empty())
+      if (!entry.contains("versions") || !entry["versions"].is_object())
       {
-        spec.resolvedVersion = spec.requestedVersion;
+        vix::cli::util::err_line(std::cerr,
+                                 "invalid registry entry: missing versions for " + spec.id());
+        return 1;
+      }
+
+      std::vector<std::string> versions;
+      versions.reserve(entry["versions"].size());
+
+      for (auto it = entry["versions"].begin(); it != entry["versions"].end(); ++it)
+        versions.push_back(it.key());
+
+      if (versions.empty())
+      {
+        vix::cli::util::err_line(std::cerr,
+                                 "no versions available for: " + spec.id());
+        return 1;
+      }
+
+      if (spec.requestedVersion.empty())
+      {
+        spec.resolvedVersion = vix::cli::util::semver::findLatest(versions);
         return 0;
       }
 
-      const std::string latest = find_latest_version(entry);
-      if (latest.empty())
+      const auto resolved =
+          vix::cli::util::semver::resolveMaxSatisfying(versions, spec.requestedVersion);
+
+      if (!resolved.has_value())
       {
         vix::cli::util::err_line(std::cerr,
-                                 "no versions available for: " + spec.ns + "/" + spec.name);
+                                 "no version matches range: " + spec.id() + "@" + spec.requestedVersion);
         return 1;
       }
 
-      spec.resolvedVersion = latest;
+      spec.resolvedVersion = *resolved;
       return 0;
     }
 
@@ -355,18 +378,16 @@ namespace vix::commands
       if (entry.contains("latest") && entry["latest"].is_string())
         return entry["latest"].get<std::string>();
 
-      if (entry.contains("versions") && entry["versions"].is_object())
-      {
-        std::string best;
-        for (auto it = entry["versions"].begin(); it != entry["versions"].end(); ++it)
-        {
-          const std::string v = it.key();
-          if (best.empty() || v > best)
-            best = v;
-        }
-        return best;
-      }
-      return {};
+      if (!entry.contains("versions") || !entry["versions"].is_object())
+        return {};
+
+      std::vector<std::string> versions;
+      versions.reserve(entry["versions"].size());
+
+      for (auto it = entry["versions"].begin(); it != entry["versions"].end(); ++it)
+        versions.push_back(it.key());
+
+      return vix::cli::util::semver::findLatest(versions);
     }
 
     static std::vector<std::string> list_versions(const json &entry)
@@ -378,7 +399,7 @@ namespace vix::commands
       for (auto it = entry["versions"].begin(); it != entry["versions"].end(); ++it)
         out.push_back(it.key());
 
-      std::sort(out.begin(), out.end());
+      vix::cli::util::semver::sortAscending(out);
       return out;
     }
 
diff --git a/src/commands/InstallCommand.cpp b/src/commands/InstallCommand.cpp
@@ -17,6 +17,7 @@
 #include <vix/cli/util/Hash.hpp>
 #include <vix/cli/Style.hpp>
 #include <vix/utils/Env.hpp>
+#include <vix/cli/util/Semver.hpp>
 
 #include <nlohmann/json.hpp>
 
@@ -276,39 +277,62 @@ namespace vix::commands
       if (entry.contains("latest") && entry["latest"].is_string())
         return entry["latest"].get<std::string>();
 
-      if (entry.contains("versions") && entry["versions"].is_object())
-      {
-        std::string best;
-        for (auto it = entry["versions"].begin(); it != entry["versions"].end(); ++it)
-        {
-          const std::string v = it.key();
-          if (best.empty() || v > best)
-            best = v;
-        }
-        return best;
-      }
+      if (!entry.contains("versions") || !entry["versions"].is_object())
+        return {};
+
+      std::vector<std::string> versions;
+      versions.reserve(entry["versions"].size());
 
-      return {};
+      for (auto it = entry["versions"].begin(); it != entry["versions"].end(); ++it)
+        versions.push_back(it.key());
+
+      return vix::cli::util::semver::findLatest(versions);
     }
 
     static int resolve_version_v1(const json &entry, PkgSpec &spec)
     {
-      if (!spec.requestedVersion.empty())
+      if (!entry.contains("versions") || !entry["versions"].is_object())
       {
-        spec.resolvedVersion = spec.requestedVersion;
+        vix::cli::util::err_line(
+            std::cerr,
+            "invalid registry entry: missing versions for " + spec.id());
+        return 1;
+      }
+
+      std::vector<std::string> versions;
+      versions.reserve(entry["versions"].size());
+
+      for (auto it = entry["versions"].begin(); it != entry["versions"].end(); ++it)
+        versions.push_back(it.key());
+
+      if (versions.empty())
+      {
+        vix::cli::util::err_line(
+            std::cerr,
+            "no versions available for: " + spec.id());
+        return 1;
+      }
+
+      if (spec.requestedVersion.empty())
+      {
+        spec.resolvedVersion = vix::cli::util::semver::findLatest(versions);
         return 0;
       }
 
-      const std::string latest = find_latest_version(entry);
-      if (latest.empty())
+      const auto resolved =
+          vix::cli::util::semver::resolveMaxSatisfying(
+              versions,
+              spec.requestedVersion);
+
+      if (!resolved.has_value())
       {
         vix::cli::util::err_line(
             std::cerr,
-            "no versions available for: " + spec.ns + "/" + spec.name);
+            "no version matches range: " + spec.id() + "@" + spec.requestedVersion);
         return 1;
       }
 
-      spec.resolvedVersion = latest;
+      spec.resolvedVersion = *resolved;
       return 0;
     }
 
diff --git a/src/commands/OutdatedCommand.cpp b/src/commands/OutdatedCommand.cpp
@@ -13,6 +13,7 @@
  */
 #include <vix/cli/commands/OutdatedCommand.hpp>
 #include <vix/cli/util/Ui.hpp>
+#include <vix/cli/util/Semver.hpp>
 #include <vix/utils/Env.hpp>
 #include <nlohmann/json.hpp>
 
@@ -248,28 +249,27 @@ namespace vix::commands
       return registry_index_dir() / (ns + "." + name + ".json");
     }
 
-    std::string find_latest_version(const json &entry)
+    static std::string find_latest_version(const json &entry)
     {
       if (entry.contains("latest") && entry["latest"].is_string())
       {
         return entry["latest"].get<std::string>();
       }
 
-      if (entry.contains("versions") && entry["versions"].is_object())
+      if (!entry.contains("versions") || !entry["versions"].is_object())
       {
-        std::string best;
-        for (auto it = entry["versions"].begin(); it != entry["versions"].end(); ++it)
-        {
-          const std::string v = it.key();
-          if (best.empty() || v > best)
-          {
-            best = v;
-          }
-        }
-        return best;
+        return {};
       }
 
-      return {};
+      std::vector<std::string> versions;
+      versions.reserve(entry["versions"].size());
+
+      for (auto it = entry["versions"].begin(); it != entry["versions"].end(); ++it)
+      {
+        versions.push_back(it.key());
+      }
+
+      return vix::cli::util::semver::findLatest(versions);
     }
 
     bool lock_contains_dependency_id(const json &lock, const std::string &wantedId)
diff --git a/src/commands/SearchCommand.cpp b/src/commands/SearchCommand.cpp
@@ -14,6 +14,7 @@
 #include <vix/cli/commands/SearchCommand.hpp>
 #include <vix/cli/util/Ui.hpp>
 #include <vix/cli/Style.hpp>
+#include <vix/cli/util/Semver.hpp>
 #include <vix/utils/Env.hpp>
 #include <nlohmann/json.hpp>
 
@@ -109,22 +110,21 @@ namespace vix::commands
       return out;
     }
 
-    std::string latest_version(const json &entry)
+    static std::string latest_version(const json &entry)
     {
       if (entry.contains("latest") && entry["latest"].is_string())
         return entry["latest"].get<std::string>();
 
       if (!entry.contains("versions") || !entry["versions"].is_object())
         return {};
 
-      std::string best;
+      std::vector<std::string> versions;
+      versions.reserve(entry["versions"].size());
+
       for (auto it = entry["versions"].begin(); it != entry["versions"].end(); ++it)
-      {
-        const std::string v = it.key();
-        if (best.empty() || v > best)
-          best = v;
-      }
-      return best;
+        versions.push_back(it.key());
+
+      return vix::cli::util::semver::findLatest(versions);
     }
 
     struct Hit
diff --git a/src/util/Semver.cpp b/src/util/Semver.cpp
diff --git a/src/util/Version.cpp b/src/util/Version.cpp
