Fix release version comparison.

Author: freezy

__tests__/main.test.ts

@@ -14,16 +14,26 @@ test('should bump version if same tag is available', () => {
   expect(nextVersion).toBe('0.0.1-preview.1');
 });
 
-test('should bump version if same tag is available but prefixed', () => {
+test('should bump pre-release version if same tag is available but prefixed', () => {
   const nextVersion = getNextVersion('v0.0.1-preview.0', ['0.0.1-preview.0']);
   expect(nextVersion).toBe('0.0.1-preview.1');
 });
 
-test('should bump version if same tag is available but not prefixed', () => {
+test('should bump pre-release version if same tag is available but not prefixed', () => {
   const nextVersion = getNextVersion('0.0.1-preview.0', ['v0.0.1-preview.0']);
   expect(nextVersion).toBe('0.0.1-preview.1');
 });
 
+test('should bump release version if same tag is available but prefixed', () => {
+  const nextVersion = getNextVersion('v0.1.0', ['0.1.0']);
+  expect(nextVersion).toBe('0.1.1');
+});
+
+test('should bump release version if same tag is available but not prefixed', () => {
+  const nextVersion = getNextVersion('0.1.0', ['v0.1.0']);
+  expect(nextVersion).toBe('0.1.1');
+});
+
 test('should use bump latest pre-release tag if multiple tags are available', async () => {
   const nextVersion = getNextVersion('0.0.1-preview.0', ['0.0.1-preview.1', '0.0.1-preview.0']);
   expect(nextVersion).toBe('0.0.1-preview.2');

src/main.ts

@@ -27,8 +27,8 @@ export function getNextVersion(version: string, tags: string[]): string {
 
   let nextVer: SemVer | null = null;
 
-  if (semVer.prerelease.length === 0) {
-    if (tags.includes(semVer.version)) {
+  if (!isPreRelease(semVer)) {
+    if (tagsInclude(tags, semVer)) {
       if (semVer.patch > 0) {
         throw new Error(
           `Version in package.json is ${version} but tag already exists. Set patch to 0 to enable auto-increment.`,
@@ -58,6 +58,20 @@ export function getNextVersion(version: string, tags: string[]): string {
   return nextVer.version;
 }
 
+function tagsInclude(tags: string[], v: SemVer): boolean {
+  for (const tag of tags) {
+    const vt = new SemVer(tag);
+    if (vt.compare(v) === 0) {
+      return true;
+    }
+  }
+  return false;
+}
+
+function isPreRelease(semVer: SemVer): boolean {
+  return semVer.prerelease.length > 0;
+}
+
 function isSameRelease(v1: SemVer, v2: SemVer): boolean {
   return v1.major === v2.major && v1.minor === v2.minor && v1.patch === v2.patch;
 }