calver-bump 0.1.1 → 0.1.3

package/README.md

@@ -5,20 +5,20 @@ Release CLI for applications and internal tools that use readable CalVer version
 Default version and tag format:
 
 ```text
-YY.MMDD.N
+YY.MMDD
 ```
 
 Example:
 
 ```text
-26.0529.1
+26.0529
 ```
 
 ## What it does
 
 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.
 
@@ -91,15 +91,15 @@ Project defaults can be stored in `.calverbumprc.json`:
 
 ## Notes
 
-- The default `short` format is `YY.MMDD.N`.
-- The optional `compact` format is `YYMMDD.N`.
-- The optional `long` format is `YYYY.MM.DD.N`.
+- The default `short` format is `YY.MMDD` for the first release of the day, then `YY.MMDD.1`, `YY.MMDD.2`, etc.
+- 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.1",
+  "version": "0.1.3",
   "description": "Release CLI for internal applications using readable CalVer versions.",
   "main": "src/index.js",
   "bin": {

package/src/calver.js

@@ -2,14 +2,20 @@ export function nextCalVer({ date = new Date(), existingTags = [], format = 'sho
   assertFormat(format);
   const parts = dateParts(date);
   const prefix = calVerPrefix(parts, format);
-  const matcher = new RegExp(`^v?${escapeRegExp(prefix)}\\.(\\d+)$`);
-  const highest = existingTags.reduce((max, tag) => {
+  const matcher = new RegExp(`^v?${escapeRegExp(prefix)}(?:\\.(\\d+))?$`);
+  const releaseState = existingTags.reduce((state, tag) => {
     const match = matcher.exec(tag.trim());
-    if (!match) return max;
-    return Math.max(max, Number(match[1]));
-  }, 0);
+    if (!match) return state;
+    return {
+      hasBase: state.hasBase || !match[1],
+      highestSequence: match[1] ? Math.max(state.highestSequence, Number(match[1])) : state.highestSequence,
+    };
+  }, { hasBase: false, highestSequence: 0 });
 
-  return `${prefix}.${highest + 1}`;
+  if (!releaseState.hasBase && releaseState.highestSequence === 0) {
+    return prefix;
+  }
+  return `${prefix}.${releaseState.highestSequence + 1}`;
 }
 
 export function assertFormat(format) {
@@ -19,10 +25,10 @@ export function assertFormat(format) {
 }
 
 export function isCalVerTag(tag) {
-  return /^v?\d{2}\.\d{4}\.\d+$/.test(tag)
-    || /^v?\d{6}\.\d+$/.test(tag)
-    || /^v?\d{4}\.\d{2}\.\d{2}\.\d+$/.test(tag)
-    || /^v?\d{8}\.\d+$/.test(tag);
+  return /^v?\d{2}\.\d{4}(?:\.\d+)?$/.test(tag)
+    || /^v?\d{6}(?:\.\d+)?$/.test(tag)
+    || /^v?\d{4}\.\d{2}\.\d{2}(?:\.\d+)?$/.test(tag)
+    || /^v?\d{8}(?:\.\d+)?$/.test(tag);
 }
 
 export function isoDate(date = new Date()) {

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/calver.test.js

@@ -3,40 +3,67 @@ import { test } from 'node:test';
 
 import { nextCalVer } from '../src/calver.js';
 
-test('nextCalVer defaults to readable YY.MMDD.N format', () => {
+test('nextCalVer defaults to readable YY.MMDD format for the first release of the day', () => {
   const version = nextCalVer({
     date: new Date('2026-05-29T12:00:00-07:00'),
     existingTags: [],
   });
 
-  assert.equal(version, '26.0529.1');
+  assert.equal(version, '26.0529');
 });
 
 test('nextCalVer increments the sequence for existing tags on the same day', () => {
   const version = nextCalVer({
     date: new Date('2026-05-29T12:00:00-07:00'),
-    existingTags: ['26.0528.7', '26.0529.1', 'v26.0529.2'],
+    existingTags: ['26.0528.7', '26.0529', 'v26.0529.2'],
   });
 
   assert.equal(version, '26.0529.3');
 });
 
-test('nextCalVer can emit compact YYMMDD.N when requested', () => {
+test('nextCalVer emits .1 for the second release of the day', () => {
+  const version = nextCalVer({
+    date: new Date('2026-05-29T12:00:00-07:00'),
+    existingTags: ['26.0529'],
+  });
+
+  assert.equal(version, '26.0529.1');
+});
+
+test('nextCalVer can emit compact YYMMDD without sequence for the first release of the day', () => {
+  const version = nextCalVer({
+    date: new Date('2026-05-29T12:00:00-07:00'),
+    format: 'compact',
+  });
+
+  assert.equal(version, '260529');
+});
+
+test('nextCalVer can emit compact YYMMDD.N after the first release of the day', () => {
   const version = nextCalVer({
     date: new Date('2026-05-29T12:00:00-07:00'),
-    existingTags: ['260529.1'],
+    existingTags: ['260529'],
     format: 'compact',
   });
 
-  assert.equal(version, '260529.2');
+  assert.equal(version, '260529.1');
+});
+
+test('nextCalVer can emit long YYYY.MM.DD without sequence for the first release of the day', () => {
+  const version = nextCalVer({
+    date: new Date('2026-05-29T12:00:00-07:00'),
+    format: 'long',
+  });
+
+  assert.equal(version, '2026.05.29');
 });
 
-test('nextCalVer can emit long YYYY.MM.DD.N when requested', () => {
+test('nextCalVer can emit long YYYY.MM.DD.N after the first release of the day', () => {
   const version = nextCalVer({
     date: new Date('2026-05-29T12:00:00-07:00'),
-    existingTags: ['2026.05.29.1'],
+    existingTags: ['2026.05.29'],
     format: 'long',
   });
 
-  assert.equal(version, '2026.05.29.2');
+  assert.equal(version, '2026.05.29.1');
 });

package/test/cli.test.js

@@ -45,12 +45,12 @@ test('CLI reads .calverbumprc.json defaults', async () => {
   });
 
   assert.equal(result.status, 0, result.stderr);
-  assert.match(result.stdout, /create git tag v26\.\d{4}\.1/);
-  const tag = execFileSync('git', ['tag', '--list', 'v26.*'], {
+  assert.match(result.stdout, /create git tag v26\.\d{4}/);
+  const tag = execFileSync('git', ['tag', '--list', 'v26*'], {
     cwd: repo,
     encoding: 'utf8',
   }).trim();
-  assert.match(tag, /^v26\.\d{4}\.1$/);
+  assert.match(tag, /^v26\.\d{4}$/);
 });
 
 test('CLI prints and runs push command when --push is enabled', async () => {
@@ -66,11 +66,11 @@ test('CLI prints and runs push command when --push is enabled', async () => {
 
   assert.equal(result.status, 0, result.stderr);
   assert.match(result.stdout, /Running: git push --follow-tags origin main/);
-  const remoteTags = execFileSync('git', ['tag', '--list', '26.*'], {
+  const remoteTags = execFileSync('git', ['tag', '--list', '26*'], {
     cwd: remote,
     encoding: 'utf8',
   }).trim();
-  assert.match(remoteTags, /^26\.\d{4}\.1$/);
+  assert.match(remoteTags, /^26\.\d{4}$/);
 });
 
 test('CLI supports --remote with --push', async () => {

package/test/release.test.js

@@ -16,12 +16,12 @@ test('planRelease reports version, changelog, commit, and tag actions without wr
     dryRun: true,
   });
 
-  assert.equal(plan.version, '26.0529.1');
+  assert.equal(plan.version, '26.0529');
   assert.deepEqual(plan.actions, [
-    'update package.json version to 26.0529.1',
-    'prepend CHANGELOG.md entry for 26.0529.1',
-    'create git commit chore(release): 26.0529.1',
-    'create git tag 26.0529.1',
+    'update package.json version to 26.0529',
+    'prepend CHANGELOG.md entry for 26.0529',
+    'create git commit chore(release): 26.0529',
+    'create git tag 26.0529',
   ]);
 
   const pkg = JSON.parse(await readFile(path.join(repo, 'package.json'), 'utf8'));
@@ -37,17 +37,17 @@ test('runRelease supports tag prefixes without changing package.json version', a
     tagPrefix: 'v',
   });
 
-  assert.equal(result.version, '26.0529.1');
-  assert.equal(result.tag, 'v26.0529.1');
+  assert.equal(result.version, '26.0529');
+  assert.equal(result.tag, 'v26.0529');
 
   const pkg = JSON.parse(await readFile(path.join(repo, 'package.json'), 'utf8'));
-  assert.equal(pkg.version, '26.0529.1');
+  assert.equal(pkg.version, '26.0529');
 
-  const tag = execFileSync('git', ['tag', '--list', 'v26.0529.1'], {
+  const tag = execFileSync('git', ['tag', '--list', 'v26.0529'], {
     cwd: repo,
     encoding: 'utf8',
   }).trim();
-  assert.equal(tag, 'v26.0529.1');
+  assert.equal(tag, 'v26.0529');
 });
 
 test('runRelease updates package.json, prepends changelog, commits, and tags', async () => {
@@ -58,25 +58,25 @@ test('runRelease updates package.json, prepends changelog, commits, and tags', a
     date: new Date('2026-05-29T12:00:00-07:00'),
   });
 
-  assert.equal(result.version, '26.0529.1');
+  assert.equal(result.version, '26.0529');
 
   const pkg = JSON.parse(await readFile(path.join(repo, 'package.json'), 'utf8'));
-  assert.equal(pkg.version, '26.0529.1');
+  assert.equal(pkg.version, '26.0529');
 
   const changelog = await readFile(path.join(repo, 'CHANGELOG.md'), 'utf8');
-  assert.match(changelog, /^# Changelog\n\n## 26\.0529\.1 - 2026-05-29\n\n### Features\n\n- feat: initial app/);
+  assert.match(changelog, /^# Changelog\n\n## 26\.0529 - 2026-05-29\n\n### Features\n\n- feat: initial app/);
 
-  const tag = execFileSync('git', ['tag', '--list', '26.0529.1'], {
+  const tag = execFileSync('git', ['tag', '--list', '26.0529'], {
     cwd: repo,
     encoding: 'utf8',
   }).trim();
-  assert.equal(tag, '26.0529.1');
+  assert.equal(tag, '26.0529');
 
   const subject = execFileSync('git', ['log', '-1', '--pretty=%s'], {
     cwd: repo,
     encoding: 'utf8',
   }).trim();
-  assert.equal(subject, 'chore(release): 26.0529.1');
+  assert.equal(subject, 'chore(release): 26.0529');
 });
 
 test('runRelease returns the current branch for push guidance', async () => {
@@ -100,11 +100,11 @@ test('runRelease updates package-lock.json when it exists', async () => {
   });
 
   const lock = JSON.parse(await readFile(path.join(repo, 'package-lock.json'), 'utf8'));
-  assert.equal(lock.version, '26.0529.1');
-  assert.equal(lock.packages[''].version, '26.0529.1');
+  assert.equal(lock.version, '26.0529');
+  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/);
 });
 
@@ -180,7 +180,7 @@ test('runRelease groups changelog entries by conventional commit type', async ()
   const changelog = await readFile(path.join(repo, 'CHANGELOG.md'), 'utf8');
   assert.match(
     changelog,
-    /## 26\.0529\.1 - 2026-05-29\n\n### Features\n\n- feat: add release grouping \([a-f0-9]{7}\)\n- feat: initial app \([a-f0-9]{7}\)\n\n### Fixes\n\n- fix\(auth\): repair token refresh \([a-f0-9]{7}\)/,
+    /## 26\.0529 - 2026-05-29\n\n### Features\n\n- feat: add release grouping \([a-f0-9]{7}\)\n- feat: initial app \([a-f0-9]{7}\)\n\n### Fixes\n\n- fix\(auth\): repair token refresh \([a-f0-9]{7}\)/,
   );
 });
 
@@ -242,8 +242,8 @@ test('runRelease prepends only commits since the previous CalVer tag on later re
   });
 
   const changelog = await readFile(path.join(repo, 'CHANGELOG.md'), 'utf8');
-  const latestEntry = changelog.split('## 26.0529.1 - 2026-05-29')[0];
-  assert.match(latestEntry, /## 26\.0529\.2 - 2026-05-29/);
+  const latestEntry = changelog.split('## 26.0529 - 2026-05-29')[0];
+  assert.match(latestEntry, /## 26\.0529\.1 - 2026-05-29/);
   assert.match(latestEntry, /- fix: second release only/);
   assert.doesNotMatch(latestEntry, /feat: initial app/);
 });
@@ -265,9 +265,32 @@ 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.1'], { cwd: repo });
+  execFileSync('git', ['tag', '26.0529'], { cwd: repo });
   const before = execFileSync('git', ['rev-parse', 'HEAD'], { cwd: repo, encoding: 'utf8' }).trim();
 
   await assert.rejects(