feat: support premajor, preminor and prepatch inc operations

Author: dario-piotrowicz

include/version_weaver.h

@@ -95,12 +95,12 @@ enum release_type {
   MAJOR,
   MINOR,
   PATCH,
+  PRE_MAJOR,
+  PRE_MINOR,
+  PRE_PATCH,
   // TODO: also support
-  //  - PRE_MAJOR
-  //  - PRE_MINOR
-  //  - PRE_PATCH
-  //  - PRE_RELEASE
   //  - RELEASE
+  //  - PRE_RELEASE
 };
 
 // Increment the version according to the provided release type.

src/version_weaver.cpp

@@ -36,8 +36,11 @@ std::string minimum(std::string_view range) { return ""; }
 
 std::expected<std::string, parse_error> inc(version input,
                                             release_type release_type) {
+  version_weaver::version result;
+  std::string incremented;
   switch (release_type) {
-    case MAJOR: {
+    case MAJOR:
+    case PRE_MAJOR: {
       int major_int;
       auto [ptr, ec] =
           std::from_chars(input.major.data(),
@@ -46,11 +49,12 @@ std::expected<std::string, parse_error> inc(version input,
         return std::unexpected(parse_error::INVALID_MAJOR);
       }
       auto incremented_major_int = major_int + 1;
-      auto major = std::to_string(incremented_major_int);
-      auto new_version = version_weaver::version{major, "0", "0"};
-      return new_version;
+      incremented = std::move(std::to_string(incremented_major_int));
+      result = version_weaver::version{incremented, "0", "0"};
+      break;
     }
-    case MINOR: {
+    case MINOR:
+    case PRE_MINOR: {
       int minor_int;
       auto [ptr, ec] =
           std::from_chars(input.minor.data(),
@@ -59,11 +63,13 @@ std::expected<std::string, parse_error> inc(version input,
         return std::unexpected(parse_error::INVALID_MINOR);
       }
       auto incremented_minor_int = minor_int + 1;
-      return version_weaver::version{
-          input.major, std::to_string(incremented_minor_int), "0"};
+      incremented = std::move(std::to_string(incremented_minor_int));
+      result = version_weaver::version{input.major, incremented, "0"};
+      break;
     }
-    case PATCH: {
-      if (input.pre_release) {
+    case PATCH:
+    case PRE_PATCH: {
+      if (input.pre_release && release_type != PRE_PATCH) {
         return version_weaver::version{input.major, input.minor, input.patch};
       }
       int patch_int;
@@ -74,12 +80,20 @@ std::expected<std::string, parse_error> inc(version input,
         return std::unexpected(parse_error::INVALID_PATCH);
       }
       auto incremented_patch_int = patch_int + 1;
-      return version_weaver::version{input.major, input.minor,
-                                     std::to_string(incremented_patch_int)};
+      incremented = std::move(std::to_string(incremented_patch_int));
+      result = version_weaver::version{input.major, input.minor, incremented};
+      break;
     }
     default:
       return std::unexpected(parse_error::INVALID_RELEASE_TYPE);
   }
+
+  if (release_type == PRE_MAJOR || release_type == PRE_MINOR ||
+      release_type == PRE_PATCH) {
+    result.pre_release = "0";
+  }
+
+  return result;
 }
 
 constexpr inline void trim_whitespace(std::string_view* input) noexcept {

tests/basictests.cpp

@@ -229,6 +229,21 @@ std::vector<IncTestData> inc_values = {
     {version_weaver::version{"1", "2", "3", "alpha.0.beta"},
      "1.2.3-alpha.0.beta", version_weaver::release_type::PATCH, "1.2.3",
      version_weaver::version{"1", "2", "3"}},
+    {version_weaver::version{"1", "2", "0"}, "1.2.0",
+     version_weaver::release_type::PRE_MAJOR, "2.0.0-0",
+     version_weaver::version{"2", "0", "0", "0"}},
+    {version_weaver::version{"1", "2", "0"}, "1.2.0",
+     version_weaver::release_type::PRE_MINOR, "1.3.0-0",
+     version_weaver::version{"1", "3", "0", "0"}},
+    {version_weaver::version{"1", "2", "3", "1"}, "1.2.3-1",
+     version_weaver::release_type::PRE_MINOR, "1.3.0-0",
+     version_weaver::version{"1", "3", "0", "0"}},
+    {version_weaver::version{"1", "2", "0"}, "1.2.0",
+     version_weaver::release_type::PRE_PATCH, "1.2.1-0",
+     version_weaver::version{"1", "2", "1", "0"}},
+    {version_weaver::version{"1", "2", "0", "1"}, "1.2.0-1",
+     version_weaver::release_type::PRE_PATCH, "1.2.1-0",
+     version_weaver::version{"1", "2", "1", "0"}},
 };
 
 TEST(basictests, inc) {