calver-bump 0.1.5 → 0.1.6

package/package.json

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

package/src/index.js

@@ -153,6 +153,7 @@ async function releaseNotes(cwd, options = {}) {
   const requestUrlBuilder = remoteUrl ? buildRequestUrlBuilder(remoteUrl) : null;
   const allowedTypes = options.types ?? ['feat', 'fix', 'docs', 'style', 'refactor', 'perf', 'test', 'build', 'ci', 'chore', 'revert'];
   const conventionalCommits = 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 ?? ''))
@@ -186,6 +187,16 @@ 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 formatReleaseNotes(changes) {
   if (changes.length === 1 && changes[0] === 'No conventional commits in this release.') {
     return `- ${changes[0]}`;
@@ -317,13 +328,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',