calver-bump 0.1.2 → 0.1.3

package/README.md

@@ -18,7 +18,7 @@ Example:
 
 1. Bumps `package.json` to the next CalVer version.
 2. Updates `package-lock.json` or `npm-shrinkwrap.json` when present.
-3. Creates or prepends a `CHANGELOG.md` entry from conventional commits since the latest reachable tag.
+3. Creates or prepends a `CHANGELOG.md` entry from conventional commits since the nearest reachable tag.
 4. Creates a release commit.
 5. Creates an annotated git tag.
 
@@ -95,11 +95,11 @@ Project defaults can be stored in `.calverbumprc.json`:
 - The optional `compact` format is `YYMMDD` for the first release of the day, then `YYMMDD.1`, `YYMMDD.2`, etc.
 - The optional `long` format is `YYYY.MM.DD` for the first release of the day, then `YYYY.MM.DD.1`, `YYYY.MM.DD.2`, etc.
 - Existing `v`-prefixed tags are considered when calculating the next sequence number.
-- Changelog ranges start from the latest reachable tag, even when it is not a CalVer tag.
+- Changelog ranges start from the nearest reachable tag, even when it is not a CalVer tag.
 - Changelog entries include conventional commit subjects only, such as `feat:`, `fix(scope):`, or `chore!:`.
 - Changelog entries are grouped into `Features`, `Fixes`, and `Other Changes`.
 - Changelog entries link to their commit hash for GitHub and GitLab-style `origin` remotes.
-- Later releases prepend only commits since the previous reachable tag.
+- Later releases prepend only commits since the previous nearest reachable tag.
 - Release tags are annotated so `git push --follow-tags <remote> <branch>` pushes them.
 - The working tree must be clean before creating a real release.
 - If tag creation fails after the release commit, the CLI rolls back its own release commit.

package/package.json

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

package/src/index.js

@@ -237,15 +237,12 @@ function parseGitRemote(remote) {
 }
 
 async function latestReachableTag(cwd) {
-  const tags = await gitLines(cwd, [
-    'for-each-ref',
-    '--merged',
-    'HEAD',
-    '--sort=-creatordate',
-    '--format=%(refname:short)',
-    'refs/tags',
-  ]);
-  return tags[0] ?? null;
+  try {
+    const { stdout } = await git(cwd, ['describe', '--tags', '--abbrev=0']);
+    return stdout.trim() || null;
+  } catch {
+    return null;
+  }
 }
 
 async function currentBranch(cwd) {

package/test/release.test.js

@@ -104,7 +104,7 @@ test('runRelease updates package-lock.json when it exists', async () => {
   assert.equal(lock.packages[''].version, '26.0529');
 });
 
-test('runRelease uses the latest reachable tag as the changelog base', async () => {
+test('runRelease uses the nearest reachable tag as the changelog base', async () => {
   const repo = await makeRepo();
   execFileSync('git', ['tag', '26.0528.1'], { cwd: repo });
   await writeFile(path.join(repo, 'feature-a.txt'), 'a\n');
@@ -122,7 +122,7 @@ test('runRelease uses the latest reachable tag as the changelog base', async ()
 
   const changelog = await readFile(path.join(repo, 'CHANGELOG.md'), 'utf8');
   assert.match(changelog, /- fix: after non-release tag/);
-  assert.match(changelog, /- feat: after calver tag/);
+  assert.doesNotMatch(changelog, /- feat: after calver tag/);
   assert.doesNotMatch(changelog, /- feat: initial app/);
 });
 
@@ -265,6 +265,29 @@ test('runRelease uses the latest reachable tag as the changelog base even when i
   assert.doesNotMatch(changelog, /- feat: initial app/);
 });
 
+test('runRelease uses the nearest history tag, not the newest-created reachable tag, as the changelog base', async () => {
+  const repo = await makeRepo();
+  execFileSync('git', ['tag', 'old-tag'], { cwd: repo });
+  await writeFile(path.join(repo, 'first.txt'), 'first\n');
+  execFileSync('git', ['add', 'first.txt'], { cwd: repo });
+  execFileSync('git', ['commit', '-m', 'feat: already released'], { cwd: repo });
+  execFileSync('git', ['tag', 'v1.35.0'], { cwd: repo });
+  execFileSync('git', ['tag', '-f', 'newer-created-old-tag', 'old-tag'], { cwd: repo });
+  await writeFile(path.join(repo, 'second.txt'), 'second\n');
+  execFileSync('git', ['add', 'second.txt'], { cwd: repo });
+  execFileSync('git', ['commit', '-m', 'fix: unreleased change'], { 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');
+  assert.match(changelog, /- fix: unreleased change/);
+  assert.doesNotMatch(changelog, /feat: already released/);
+  assert.doesNotMatch(changelog, /feat: initial app/);
+});
+
 test('runRelease rolls back its release commit when tag creation fails', async () => {
   const repo = await makeRepo();
   execFileSync('git', ['tag', '26.0529'], { cwd: repo });