Properly parse prefix versions when comparing and fail when bumping a non .0 version.

Author: freezy

__tests__/main.test.ts

@@ -14,6 +14,16 @@ 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', () => {
+  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', () => {
+  const nextVersion = getNextVersion('0.0.1-preview.0', ['v0.0.1-preview.0']);
+  expect(nextVersion).toBe('0.0.1-preview.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');
@@ -62,3 +72,24 @@ test('should bump final version if tag already exists and ends with 0', () => {
   ]);
   expect(nextVersion).toBe('0.2.1');
 });
+
+test('should throw an error if final version is already tagged and does not end with 0', () => {
+  const nextVersion = () => getNextVersion('0.2.1', [
+    '0.2.1',
+  ]);
+  expect(nextVersion).toThrow(Error);
+});
+
+test('should throw an error if pre-release version is already tagged and does not end with 0', () => {
+  const nextVersion = () => getNextVersion('0.2.0-preview.1', [
+    '0.2.0-preview.1',
+  ]);
+  expect(nextVersion).toThrow(Error);
+});
+
+test('should throw an error for wrong versions', () => {
+  expect(() => getNextVersion('xyz', [])).toThrow(Error);
+  expect(() => getNextVersion('1.0', [])).toThrow(Error);
+  expect(() => getNextVersion('~1.0.0', [])).toThrow(Error);
+});
+

src/main.ts

@@ -22,18 +22,29 @@ export function getNextVersion(version: string, tags: string[]): string {
   tags = rsort(tags);
 
   if (semVer === null || semVer.prerelease.length === 1) {
-    throw new Error(`Invalid semver - ${version}`);
+    throw new Error(`Invalid semver: ${version}`);
   }
 
   let nextVer: SemVer | null = null;
 
   if (semVer.prerelease.length === 0) {
     if (tags.includes(semVer.version)) {
+      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.`,
+        );
+      }
       nextVer = new SemVer(tags[0]).inc('patch');
     }
   } else {
     for (const tag of tags) {
-      if (tag.startsWith(semVer.version.substring(0, semVer.version.lastIndexOf('.') + 1))) {
+      const tagSemVer = new SemVer(tag);
+      if (isSameRelease(tagSemVer, semVer)) {
+        if (preReleaseNumber(semVer) > 0) {
+          throw new Error(
+            `Version in package.json is ${version} but tag already exists. Set pre-release to 0 to enable auto-increment.`,
+          );
+        }
         nextVer = new SemVer(tag).inc('prerelease');
         break;
       }
@@ -47,6 +58,14 @@ export function getNextVersion(version: string, tags: string[]): string {
   return nextVer.version;
 }
 
+function isSameRelease(v1: SemVer, v2: SemVer): boolean {
+  return v1.major === v2.major && v1.minor === v2.minor && v1.patch === v2.patch;
+}
+
+function preReleaseNumber(v: SemVer): number {
+  return v.prerelease[1] as number;
+}
+
 async function run(): Promise<void> {
   try {
     const version = JSON.parse(readFileSync('package.json', 'utf8')).version;