fix: correct production version bump and add tests (#6)

Author: henrycunh

__tests__/index.test.ts

@@ -4,18 +4,18 @@ import { generateChangelog } from './changelog'
 import { getLastCommitMessage, getLastGitTag, tagCommit } from './git'
 import { createGithubRelease } from './github'
 import { notifySlackChannel } from './slack'
-import { getNextVersion, getReleaseTypeFromCommitMessage } from './version'
+import { getNextVersion, getPureVersion, getReleaseTypeFromCommitMessage } from './version'
 
 async function run(): Promise<void> {
     const isReleaseCandidate = core.getInput('release-candidate') === 'true'
     const slackWebhookUrl = core.getInput('slack-webhook-url')
 
     try {
-        const lastVersion = await getLastGitTag({
+        const currentVersion = await getLastGitTag({
             considerReleaseCandidates: true,
             logInGroup: true,
         })
-        if (lastVersion === null)
+        if (currentVersion === null)
             return
 
         const lastCommitMessage = await getLastCommitMessage()
@@ -26,7 +26,9 @@ async function run(): Promise<void> {
 
         // If the commit isn't of type `feat` or `fix`, we don't want to bump the version
         if (releaseType !== null) {
-            const nextVersion = getNextVersion(lastVersion, releaseType)
+            const nextVersion = isReleaseCandidate
+                ? getNextVersion({ currentVersion, releaseType })
+                : getPureVersion(currentVersion)
             core.info(`Publishing a release candidate for version ${nextVersion}`)
 
             const changelog = await generateChangelog(context)

dist/index.js

@@ -11,18 +11,24 @@ export const getReleaseTypeFromCommitMessage = (commitMessage: string): ReleaseT
     return null
 }
 
-export const getNextVersion = (currentVersion: string, releaseType: ReleaseType): string => {
+export const getNextVersion = (options: {
+    currentVersion: string
+    releaseType: ReleaseType
+}): string => {
     // verify that the current version is valid semver
-    if (currentVersion.match(/^\d+\.\d+\.\d+(-[\w\d]+)?$/) === null) {
-        core.error(`Invalid current version: ${currentVersion}`)
-        throw Error
+    if (options.currentVersion.match(/^\d+\.\d+\.\d+(-[\w\d]+)?$/) === null) {
+        const errorMessage = `Invalid current version: ${options.currentVersion}`
+        core.error(errorMessage)
+        throw new Error(errorMessage)
     }
 
-    const pureVersion = currentVersion.split('-')[0]
+    const pureVersion = options.currentVersion.split('-')[0]
     const [major, minor, patch] = pureVersion.split('.').map(Number)
     return ({
         major: () => `${major + 1}.0.0`,
         minor: () => `${major}.${minor + 1}.0`,
         patch: () => `${major}.${minor}.${patch + 1}`,
-    })[releaseType]()
+    })[options.releaseType]()
 }
+
+export const getPureVersion = (version: string) => version.split('-')[0]

dist/index.js.map

@@ -0,0 +1,3 @@
+// Vitest Snapshot v1
+
+exports[`Version should > throw error if version is in the wrong format > "Invalid current version: foo" 1`] = `"Invalid current version: foo"`;

src/main.ts

@@ -0,0 +1,24 @@
+import { describe, expect, it } from 'vitest'
+import { getNextVersion, getPureVersion } from '../src/version'
+
+describe('Version should', () => {
+    it('infer next version correctly', () => {
+        expect(getNextVersion({ currentVersion: '1.0.0', releaseType: 'patch' }))
+            .toMatch('1.0.1')
+        expect(getNextVersion({ currentVersion: '1.0.0', releaseType: 'minor' }))
+            .toMatch('1.1.0')
+        expect(getNextVersion({ currentVersion: '1.0.0', releaseType: 'major' }))
+            .toMatch('2.0.0')
+        expect(getNextVersion({ currentVersion: '1.0.0-rc', releaseType: 'major' }))
+            .toMatch('2.0.0')
+    })
+
+    it('throw error if version is in the wrong format', () => {
+        expect(() => getNextVersion({ currentVersion: 'foo', releaseType: 'patch' }))
+            .toThrowErrorMatchingSnapshot('"Invalid current version: foo"')
+    })
+
+    it('get pure version correctly', () => {
+        expect(getPureVersion('1.0.0-rc-beta')).toMatch('1.0.0')
+    })
+})