calver-bump 0.1.5 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "calver-bump",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Release CLI for internal applications using readable CalVer versions.",
   "main": "src/index.js",
   "bin": {

package/src/index.js

@@ -152,7 +152,8 @@ async function releaseNotes(cwd, options = {}) {
   const compareUrlBuilder = remoteUrl ? buildCompareUrlBuilder(remoteUrl) : null;
   const requestUrlBuilder = remoteUrl ? buildRequestUrlBuilder(remoteUrl) : null;
   const allowedTypes = options.types ?? ['feat', 'fix', 'docs', 'style', 'refactor', 'perf', 'test', 'build', 'ci', 'chore', 'revert'];
-  const conventionalCommits = commits
+  const conventionalCommits = dedupeConventionalChanges(commits
+    .map((commit) => ({ ...commit, subject: conventionalSubjectForCommit(commit) ?? commit.subject }))
     .filter((commit) => isConventionalCommit(commit.subject))
     .filter((commit) => allowedTypes.includes(conventionalType(commit.subject)))
     .filter((commit) => !isCommitInChangelog(commit, options.existingChangelog ?? ''))
@@ -160,7 +161,7 @@ async function releaseNotes(cwd, options = {}) {
       ...commit,
       request: requestForCommit(commit, requestUrlBuilder),
       url: commitUrlBuilder ? commitUrlBuilder(commit.hash) : null,
-    }));
+    })));
   const requests = uniqueRequests(commits.map((commit) => requestForCommit(commit, requestUrlBuilder)).filter(Boolean));
   return {
     previousTag: latestTag,
@@ -186,6 +187,31 @@ function isConventionalCommit(subject) {
   return /^(feat|fix|docs|style|refactor|perf|test|build|ci|chore|revert)(\([^)]+\))?!?: .+/.test(subject);
 }
 
+function conventionalSubjectForCommit(commit) {
+  return commitLines(commit).find((line) => isConventionalCommit(line)) ?? null;
+}
+
+function commitLines(commit) {
+  return [commit.subject, ...(commit.body ?? '').split('\n')]
+    .map((line) => line.trim())
+    .filter(Boolean);
+}
+
+function dedupeConventionalChanges(changes) {
+  const deduped = [];
+  for (const change of changes) {
+    const existingIndex = deduped.findIndex((candidate) => candidate.subject === change.subject);
+    if (existingIndex < 0) {
+      deduped.push(change);
+      continue;
+    }
+    if (!deduped[existingIndex].request && change.request) {
+      deduped[existingIndex] = change;
+    }
+  }
+  return deduped;
+}
+
 function formatReleaseNotes(changes) {
   if (changes.length === 1 && changes[0] === 'No conventional commits in this release.') {
     return `- ${changes[0]}`;
@@ -317,13 +343,12 @@ function requestForCommit(commit, requestUrlBuilder) {
 }
 
 function requestTitleForCommit(commit) {
-  if (isConventionalCommit(commit.subject)) {
-    return commit.subject;
+  const conventionalSubject = conventionalSubjectForCommit(commit);
+  if (conventionalSubject) {
+    return conventionalSubject;
   }
 
-  return (commit.body ?? '')
-    .split('\n')
-    .map((line) => line.trim())
+  return commitLines(commit)
     .find((line) => line && !parseRequestReference(line) && !/^Merge\b/i.test(line)) ?? null;
 }
 

package/test/release.test.js

@@ -269,6 +269,8 @@ test('runRelease links changelog entries to GitLab merge requests and dedupes th
   execFileSync('git', [
     'commit',
     '-m',
+    'Merge branch feature/review into main',
+    '-m',
     'fix(review): block rule-listed reviewers',
     '-m',
     'See merge request platform/demo-app!77',
@@ -301,6 +303,40 @@ test('runRelease links changelog entries to GitLab merge requests and dedupes th
   );
 });
 
+test('runRelease prefers merge request entries over duplicate commit hash entries', async () => {
+  const repo = await makeRepo();
+  execFileSync('git', ['remote', 'add', 'origin', 'git@gitlab.internal.example.com:platform/demo-app.git'], { cwd: repo });
+  execFileSync('git', ['tag', 'v1.0.0'], { cwd: repo });
+  await writeFile(path.join(repo, 'raw-fix.txt'), 'raw\n');
+  execFileSync('git', ['add', 'raw-fix.txt'], { cwd: repo });
+  execFileSync('git', ['commit', '-m', 'fix(review): block rule-listed reviewers'], { cwd: repo });
+  const rawHash = execFileSync('git', ['rev-parse', 'HEAD'], { cwd: repo, encoding: 'utf8' }).trim();
+  await writeFile(path.join(repo, 'merge-fix.txt'), 'merge\n');
+  execFileSync('git', ['add', 'merge-fix.txt'], { cwd: repo });
+  execFileSync('git', [
+    'commit',
+    '-m',
+    'Merge branch feature/review into main',
+    '-m',
+    'fix(review): block rule-listed reviewers',
+    '-m',
+    'See merge request platform/demo-app!77',
+  ], { cwd: repo });
+
+  await runRelease({
+    cwd: repo,
+    date: new Date('2026-05-29T12:00:00-07:00'),
+  });
+
+  const changelog = await readFile(path.join(repo, 'CHANGELOG.md'), 'utf8');
+  const fixes = changelog.match(/### Fixes\n\n(?<body>[\s\S]*?)(?:\n\n###|\n?$)/)?.groups.body ?? '';
+  assert.match(
+    fixes,
+    /- fix\(review\): block rule-listed reviewers \(\[!77\]\(https:\/\/gitlab\.internal\.example\.com\/platform\/demo-app\/-\/merge_requests\/77\)\)/,
+  );
+  assert.doesNotMatch(fixes, new RegExp(rawHash.slice(0, 7)));
+});
+
 test('runRelease prepends only commits since the previous CalVer tag on later releases', async () => {
   const repo = await makeRepo();
   await runRelease({