feat: handle new version before generating changelog

unjs · Sep 20, 2022 · fd56f6b · fd56f6b
1 parent 858c13c
commit fd56f6b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 14 deletions.
diff --git a/src/cli.ts b/src/cli.ts
@@ -17,7 +17,8 @@ async function main () {
   const config = await loadChangelogConfig(cwd, {
     from: args.from,
     to: args.to,
-    output: args.output
+    output: args.output,
+    newVersion: args.r
   })
 
   const logger = consola.create({ stdout: process.stderr })
@@ -31,6 +32,15 @@ async function main () {
     c.scope !== 'deps'
   )
 
+  // Bump version optionally
+  if (args.bump || args.release) {
+    const newVersion = await bumpVersion(commits, config)
+    if (!newVersion) {
+      throw new Error('Unable to bump version based on changes.')
+    }
+    config.newVersion = newVersion
+  }
+
   // Generate markdown
   const markdown = generateMarkDown(commits, config)
 
@@ -65,18 +75,13 @@ async function main () {
     await fsp.writeFile(config.output, changelogMD)
   }
 
-  // Bump version optionally
-  let newVersion
-  if (args.bump || args.release) {
-    newVersion = await bumpVersion(commits, config)
-  }
   // Commit and tag changes for release mode
   if (args.release) {
     if (args.commit !== false) {
-      await execa('git', ['commit', '-am', `chore(release): ${newVersion}`], { cwd })
+      await execa('git', ['commit', '-am', `chore(release): v${config.newVersion}`], { cwd })
     }
     if (args.tag !== false) {
-      await execa('git', ['tag', '-am', 'v' + newVersion, 'v' + newVersion], { cwd })
+      await execa('git', ['tag', '-am', 'v' + config.newVersion, 'v' + config.newVersion], { cwd })
     }
   }
 }

diff --git a/src/config.ts b/src/config.ts
@@ -10,6 +10,7 @@ export interface ChangelogConfig {
   github: string
   from: string
   to: string
+  newVersion?: string
   output: string | false
 }
 

diff --git a/src/markdown.ts b/src/markdown.ts
@@ -12,7 +12,7 @@ export function generateMarkDown (commits: GitCommit[], config: ChangelogConfig)
   // Version Title
   const compareLink = config.github ? `https://github.com/${config.github}/compare/${config.from}...${config.to}` : ''
   markdown.push('',
-    '## ' + (compareLink ? `[${config.to}](${compareLink})` : `${config.to} (${config.from}..${config.to})`)
+    '## ' + (compareLink ? `[${config.newVersion || config.to}](${compareLink})` : `${config.to} (${config.from}..${config.to})`)
     , '')
 
   for (const type in config.types) {

diff --git a/src/semver.ts b/src/semver.ts
@@ -23,7 +23,7 @@ export function determineSemverChange (commits: GitCommit[], config: ChangelogCo
   return hasMajor ? 'major' : (hasMinor ? 'minor' : (hasPatch ? 'patch' : null))
 }
 
-export async function bumpVersion (commits: GitCommit[], config: ChangelogConfig) {
+export async function bumpVersion (commits: GitCommit[], config: ChangelogConfig): Promise<string | false> {
   let type = determineSemverChange(commits, config)
   const originalType = type
 
@@ -39,15 +39,20 @@ export async function bumpVersion (commits: GitCommit[], config: ChangelogConfig
     }
   }
 
-  if (type) {
+  if (config.newVersion) {
+    pkg.version = config.newVersion
+  } else if (type) {
     // eslint-disable-next-line import/no-named-as-default-member
     pkg.version = semver.inc(currentVersion, type)
+    config.newVersion = pkg.version
   }
 
-  if (pkg.version !== currentVersion) {
-    consola.info(`Bumping version from ${currentVersion} to ${pkg.version} (${originalType})`)
-    await fsp.writeFile(pkgPath, JSON.stringify(pkg, null, 2) + '\n', 'utf8')
+  if (pkg.version === currentVersion) {
+    return false
   }
 
+  consola.info(`Bumping version from ${currentVersion} to ${pkg.version} (${originalType})`)
+  await fsp.writeFile(pkgPath, JSON.stringify(pkg, null, 2) + '\n', 'utf8')
+
   return pkg.version
 }