chore: Update changelog gen script

Author: CodeDredd

package.json

@@ -44,6 +44,7 @@
     "rimraf": "^6.0.1",
     "semver": "^7.6.2",
     "sponsorkit": "^0.14.7",
+    "tinyglobby": "^0.2.10",
     "typescript": "^5.5.3",
     "yorkie": "^2.0.0"
   },

pnpm-lock.yaml

@@ -1,9 +1,9 @@
-import { execSync } from 'node:child_process'
 import { promises as fsp } from 'node:fs'
 import { $fetch } from 'ofetch'
 import { resolve } from 'pathe'
-import { globby } from 'globby'
-import { execaSync } from 'execa'
+import { compare } from 'semver'
+import { glob } from 'tinyglobby'
+import { exec } from 'tinyexec'
 import { determineSemverChange, getGitDiff, loadChangelogConfig, parseCommits } from 'changelogen'
 
 export interface Dep {
@@ -27,7 +27,7 @@ export async function loadPackage (dir: string) {
         const dep: Dep = { name: e[0], range: e[1] as string, type }
         delete data[type][dep.name]
         const updated = reviver(dep) || dep
-        data[updated.type] = data[updated.type] || {}
+        data[updated.type] ||= {}
         data[updated.type][updated.name] = updated.range
       }
     }
@@ -43,7 +43,7 @@ export async function loadPackage (dir: string) {
 
 export async function loadWorkspace (dir: string) {
   const workspacePkg = await loadPackage(dir)
-  const pkgDirs = (await globby(['packages/*'], { onlyDirectories: true })).sort()
+  const pkgDirs = (await glob(['packages/*'], { onlyDirectories: true })).sort()
 
   const packages: Package[] = []
 
@@ -103,32 +103,49 @@ export async function determineBumpType () {
   const config = await loadChangelogConfig(process.cwd())
   const commits = await getLatestCommits()
 
-  const bumpType = determineSemverChange(commits, config)
+  return determineSemverChange(commits, config)
+}
+
+export async function getLatestTag () {
+  const { stdout: latestTag } = await exec('git', ['describe', '--tags', '--abbrev=0'])
+  return latestTag.trim()
+}
 
-  return bumpType === 'major' ? 'minor' : bumpType
+export async function getLatestReleasedTag () {
+  const latestReleasedTag = await exec('git', ['tag', '-l']).then(r => r.stdout.trim().split('\n').filter(t => /v2\.\d+\.\d+/.test(t)).sort(compare)).then(r => r.pop()!.trim())
+  return latestReleasedTag
+}
+
+export async function getPreviousReleasedCommits () {
+  const config = await loadChangelogConfig(process.cwd())
+  const latestTag = await getLatestTag()
+  const latestReleasedTag = await getLatestReleasedTag()
+  const commits = parseCommits(await getGitDiff(latestTag, latestReleasedTag), config)
+  return commits
 }
 
 export async function getLatestCommits () {
   const config = await loadChangelogConfig(process.cwd())
-  const latestTag = execaSync('git', ['describe', '--tags', '--abbrev=0']).stdout
+  const latestTag = await getLatestTag()
 
   return parseCommits(await getGitDiff(latestTag), config)
 }
 
 export async function getContributors () {
   const contributors = [] as Array<{ name: string, username: string }>
   const emails = new Set<string>()
-  const latestTag = execSync('git describe --tags --abbrev=0').toString().trim()
+  const latestTag = await getLatestTag()
   const rawCommits = await getGitDiff(latestTag)
   for (const commit of rawCommits) {
     if (emails.has(commit.author.email) || commit.author.name === 'renovate[bot]') { continue }
-    const { author } = await $fetch<{ author: { login: string, email: string } }>(`https://api.github.com/repos/CodeDredd/pinia-orm/commits/${commit.shortHash}`, {
+    const { author } = await $fetch<{ author: { login: string, email: string } }>(`https://api.github.com/repos/nuxt/nuxt/commits/${commit.shortHash}`, {
       headers: {
-        'User-Agent': 'CodeDredd/pinia-orm',
+        'User-Agent': 'nuxt/nuxt',
         'Accept': 'application/vnd.github.v3+json',
         'Authorization': `token ${process.env.GITHUB_TOKEN}`,
       },
     })
+    if (!author) { continue }
     if (!contributors.some(c => c.username === author.login)) {
       contributors.push({ name: commit.author.name, username: author.login })
     }

scripts/_utils.ts

@@ -3,19 +3,21 @@ import { $fetch } from 'ofetch'
 import { inc } from 'semver'
 import { generateMarkDown, getCurrentGitBranch, loadChangelogConfig } from 'changelogen'
 import { consola } from 'consola'
-import { determineBumpType, getContributors, getLatestCommits, loadWorkspace } from './_utils'
+import { determineBumpType, getContributors, getLatestCommits, getLatestReleasedTag, getLatestTag, getPreviousReleasedCommits, loadWorkspace } from './_utils'
 
 async function main () {
   const releaseBranch = await getCurrentGitBranch()
   const workspace = await loadWorkspace(process.cwd())
   const config = await loadChangelogConfig(process.cwd(), {})
 
+  const prevMessages = new Set(handleSeparateBranch ? await getPreviousReleasedCommits().then(r => r.map(c => c.message)) : [])
+
   const commits = await getLatestCommits().then(commits => commits.filter(
     c => config.types[c.type] && !(c.type === 'chore' && c.scope === 'deps' && !c.isBreaking),
   ))
-  const bumpType = await determineBumpType()
+  const bumpType = await determineBumpType() || 'patch'
 
-  const newVersion = inc(workspace.find('pinia-orm').data.version, bumpType || 'patch')
+  const newVersion = inc(workspace.find('pinia-orm').data.version, bumpType)
   const changelog = await generateMarkDown(commits, config)
 
   // Create and push a branch with bumped versions if it has not already been created
@@ -35,19 +37,24 @@ async function main () {
   }
 
   // Get the current PR for this release, if it exists
-  const currentPR = (await $fetch(`https://api.github.com/repos/CodeDredd/pinia-orm/pulls?head=v${newVersion}`)).find(pull => pull.title === `v${newVersion}`)
+  const [currentPR] = await $fetch(`https://api.github.com/repos/CodeDredd/pinia-orm/pulls?head=v${newVersion}`)
   const contributors = await getContributors()
 
+  const latestTag = await getLatestTag()
+  const previousReleasedTag = handleSeparateBranch ? await getLatestReleasedTag() : latestTag
+
   console.log('CurrentPR', currentPR)
   console.info('New Version ', newVersion)
 
   const releaseNotes = [
     currentPR?.body.replace(/## 👉 Changelog[\s\S]*$/, '') || `> ${newVersion} is the next ${bumpType} release.\n>\n> **Timetable**: to be announced.`,
     '## 👉 Changelog',
     changelog
-      .replace(/^## v.*?\n/, '')
+      .replace(/^## v.*\n/, '')
       .replace(`...${releaseBranch}`, `...v${newVersion}`)
-      .replace(/### ❤️ Contributors[\s\S]*$/, ''),
+      .replace(/### ❤️ Contributors[\s\S]*$/, '')
+      .replace(/[\n\r]+/g, '\n')
+      .replace(latestTag, previousReleasedTag),
     '### ❤️ Contributors',
     contributors.map(c => `- ${c.name} (@${c.username})`).join('\n'),
   ].join('\n')