Skip to content

Support all release types in inc operation #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Support all release types in inc operation #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
775f4a5
feat: support premajor, preminor and prepatch inc operations
dario-piotrowicz Jul 12, 2025
a4c39a0
feat: support release inc operations
dario-piotrowicz Jul 12, 2025
304a0ef
feat: support prerelease inc operations (but only on int prerelease v…
dario-piotrowicz Jul 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions include/version_weaver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ enum parse_error {
INVALID_MAJOR,
INVALID_MINOR,
INVALID_PATCH,
INVALID_PRERELEASE,
INVALID_RELEASE_TYPE,
};

Expand All @@ -95,12 +96,11 @@ enum release_type {
MAJOR,
MINOR,
PATCH,
// TODO: also support
// - PRE_MAJOR
// - PRE_MINOR
// - PRE_PATCH
// - PRE_RELEASE
// - RELEASE
PRE_MAJOR,
PRE_MINOR,
PRE_PATCH,
RELEASE,
PRE_RELEASE,
};

// Increment the version according to the provided release type.
Expand Down
61 changes: 50 additions & 11 deletions src/version_weaver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand All @@ -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(),
Expand All @@ -59,13 +63,34 @@ 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:
case PRE_RELEASE: {
if (input.pre_release.has_value() && release_type == PATCH) {
return version_weaver::version{input.major, input.minor, input.patch};
}
if (release_type == PRE_RELEASE && input.pre_release.has_value()) {
// TODO: support non-int pre_releases as well
// (see:
// https://github.com/npm/node-semver/blob/d17aebf8/test/fixtures/increments.js#L22-L36)
auto pre_release_value = input.pre_release.value();
int prerelease_int;
auto [ptr, ec] =
std::from_chars(pre_release_value.data(),
pre_release_value.data() + pre_release_value.size(),
prerelease_int);
if (ec != std::errc()) {
return std::unexpected(parse_error::INVALID_PRERELEASE);
}
auto incremented_prerelease_int = prerelease_int + 1;
incremented = std::move(std::to_string(incremented_prerelease_int));
return version_weaver::version{input.major, input.minor, input.patch,
incremented};
}
int patch_int;
auto [ptr, ec] =
std::from_chars(input.patch.data(),
Expand All @@ -74,12 +99,26 @@ 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;
}
case RELEASE: {
if (!input.pre_release.has_value()) {
return std::unexpected(parse_error::INVALID_INPUT);
}
return version_weaver::version{input.major, input.minor, input.patch};
};
default:
return std::unexpected(parse_error::INVALID_RELEASE_TYPE);
}

if (release_type == PRE_MAJOR || release_type == PRE_MINOR ||
release_type == PRE_PATCH || release_type == PRE_RELEASE) {
result.pre_release = "0";
}

return result;
}

constexpr inline void trim_whitespace(std::string_view* input) noexcept {
Expand Down
33 changes: 33 additions & 0 deletions tests/basictests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,39 @@ 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"}},
{version_weaver::version{"1", "0", "0", "1"}, "1.0.0-1",
version_weaver::release_type::RELEASE, "1.0.0",
version_weaver::version{"1", "0", "0"}},
{version_weaver::version{"1", "2", "0", "1"}, "1.2.0-1",
version_weaver::release_type::RELEASE, "1.2.0",
version_weaver::version{"1", "2", "0"}},
{version_weaver::version{"1", "2", "3", "1"}, "1.2.3-1",
version_weaver::release_type::RELEASE, "1.2.3",
version_weaver::version{"1", "2", "3"}},
{version_weaver::version{"1", "2", "3"}, "1.2.3",
version_weaver::release_type::RELEASE, "1.2.3",
std::unexpected(version_weaver::parse_error::INVALID_INPUT)},
{version_weaver::version{"1", "2", "4"}, "1.2.4",
version_weaver::release_type::PRE_RELEASE, "1.2.5-0",
version_weaver::version{"1", "2", "5", "0"}},
{version_weaver::version{"1", "2", "3", "0"}, "1.2.3-0",
version_weaver::release_type::PRE_RELEASE, "1.2.3-1",
version_weaver::version{"1", "2", "3", "1"}},
};

TEST(basictests, inc) {
Expand Down
Loading