refactor: use package.json versions as source of truth for releases

winetree94 · winetree94 · commit 07210604ea76 · 2026-04-10T02:18:45.000+09:00
diff --git a/packages/tools/src/cli/commands/release.ts b/packages/tools/src/cli/commands/release.ts
@@ -71,7 +71,7 @@ export const releaseCommand = buildCommand<ReleaseCommandFlags, ReleaseArgs>({
   docs: {
     brief: 'Release backend, frontend, and standalone packages',
     fullDescription:
-      'Bump release versions from the latest v* tag and create a commit and signed tag.',
+      'Bump release versions from current package versions and create a commit and signed tag.',
   },
   func: runReleaseCommand,
 });
diff --git a/packages/tools/src/lib/release.mock.test.ts b/packages/tools/src/lib/release.mock.test.ts
@@ -3,7 +3,6 @@ import { beforeEach, describe, expect, test, vi } from 'vitest';
 const getRepoRoot = vi.fn();
 const getWorktreeStatus = vi.fn();
 const hasTag = vi.fn();
-const listVersionTags = vi.fn();
 const stageFiles = vi.fn();
 const createCommit = vi.fn();
 const createTag = vi.fn();
@@ -16,7 +15,6 @@ vi.mock('./git.ts', () => ({
   getRepoRoot,
   getWorktreeStatus,
   hasTag,
-  listVersionTags,
   stageFiles,
 }));
 
@@ -30,7 +28,6 @@ describe('performRelease mocked safety checks', () => {
     getRepoRoot.mockReset();
     getWorktreeStatus.mockReset();
     hasTag.mockReset();
-    listVersionTags.mockReset();
     stageFiles.mockReset();
     createCommit.mockReset();
     createTag.mockReset();
@@ -39,9 +36,8 @@ describe('performRelease mocked safety checks', () => {
 
     getRepoRoot.mockResolvedValue('/repo');
     getWorktreeStatus.mockResolvedValue('');
-    listVersionTags.mockResolvedValue(['v0.0.3']);
     hasTag.mockResolvedValue(false);
-    readPackageVersion.mockResolvedValue('1.0.0');
+    readPackageVersion.mockResolvedValue('0.0.3');
   });
 
   test('fails when the computed next tag already exists', async () => {
@@ -89,4 +85,30 @@ describe('performRelease mocked safety checks', () => {
       },
     );
   });
+
+  test('bumps from the current package version when tags lag behind', async () => {
+    const { performRelease } = await import('./release.ts');
+
+    readPackageVersion.mockResolvedValue('0.0.4');
+
+    await performRelease({
+      cwd: '/repo',
+      dryRun: false,
+      logger: {
+        info: () => {},
+        start: () => {},
+      },
+      releaseType: 'patch',
+    });
+
+    expect(createCommit).toHaveBeenCalledWith('/repo', 'chore: release v0.0.5');
+    expect(createTag).toHaveBeenCalledWith(
+      '/repo',
+      'v0.0.5',
+      'release: v0.0.5',
+      {
+        sign: true,
+      },
+    );
+  });
 });
diff --git a/packages/tools/src/lib/release.test.ts b/packages/tools/src/lib/release.test.ts
@@ -108,7 +108,7 @@ describe('performRelease', () => {
 
     await expect(
       readVersion(repoRoot, 'packages/server/package.json'),
-    ).resolves.toBe('1.0.0');
+    ).resolves.toBe('0.0.3');
     await expect(
       readVersion(repoRoot, 'packages/frontend/package.json'),
     ).resolves.toBe('2.0.0');
@@ -118,6 +118,42 @@ describe('performRelease', () => {
     );
   });
 
+  test('bumps from current package versions even when latest tag lags behind', async () => {
+    await writePackageJson(repoRoot, 'packages/server/package.json', '0.0.4');
+    await writePackageJson(repoRoot, 'packages/frontend/package.json', '0.0.4');
+    await writePackageJson(
+      repoRoot,
+      'packages/standalone/package.json',
+      '0.0.4',
+    );
+    await git(repoRoot, ['add', 'packages/server/package.json']);
+    await git(repoRoot, ['add', 'packages/frontend/package.json']);
+    await git(repoRoot, ['add', 'packages/standalone/package.json']);
+    await git(repoRoot, ['commit', '-m', 'chore: release v0.0.4']);
+
+    await expect(
+      performRelease({
+        cwd: repoRoot,
+        dryRun: false,
+        logger: TEST_LOGGER,
+        releaseType: 'patch',
+        signTag: false,
+      }),
+    ).resolves.toEqual({
+      dryRun: false,
+      previousTag: 'v0.0.4',
+      tag: 'v0.0.5',
+      version: '0.0.5',
+    });
+
+    await expect(git(repoRoot, ['tag', '--list', 'v0.0.5'])).resolves.toBe(
+      'v0.0.5',
+    );
+    await expect(git(repoRoot, ['log', '-1', '--pretty=%s'])).resolves.toBe(
+      'chore: release v0.0.5',
+    );
+  });
+
   test('dry run does not modify package versions or create git objects', async () => {
     const result = await performRelease({
       cwd: repoRoot,
@@ -136,14 +172,14 @@ describe('performRelease', () => {
 
     await expect(
       readVersion(repoRoot, 'packages/server/package.json'),
-    ).resolves.toBe('1.0.0');
+    ).resolves.toBe('0.0.3');
     await expect(git(repoRoot, ['tag', '--list', 'v0.1.0'])).resolves.toBe('');
     await expect(git(repoRoot, ['log', '-1', '--pretty=%s'])).resolves.toBe(
       'chore: seed release fixtures',
     );
   });
 
-  test('fails when there is no release tag', async () => {
+  test('does not require an existing release tag', async () => {
     const emptyRepo = await mkdtemp(
       path.join(os.tmpdir(), 'tinyauth-tools-empty-'),
     );
@@ -155,6 +191,26 @@ describe('performRelease', () => {
       await git(emptyRepo, ['config', 'commit.gpgSign', 'false']);
       await git(emptyRepo, ['config', 'tag.gpgSign', 'false']);
 
+      await writePackageJson(
+        emptyRepo,
+        'packages/server/package.json',
+        '0.0.3',
+      );
+      await writePackageJson(
+        emptyRepo,
+        'packages/frontend/package.json',
+        '0.0.3',
+      );
+      await writePackageJson(
+        emptyRepo,
+        'packages/standalone/package.json',
+        '0.0.3',
+      );
+      await git(emptyRepo, ['add', 'packages/server/package.json']);
+      await git(emptyRepo, ['add', 'packages/frontend/package.json']);
+      await git(emptyRepo, ['add', 'packages/standalone/package.json']);
+      await git(emptyRepo, ['commit', '-m', 'chore: seed release fixtures']);
+
       await expect(
         performRelease({
           cwd: emptyRepo,
@@ -163,7 +219,12 @@ describe('performRelease', () => {
           releaseType: 'minor',
           signTag: false,
         }),
-      ).rejects.toThrow('No release tag found');
+      ).resolves.toEqual({
+        dryRun: false,
+        previousTag: 'v0.0.3',
+        tag: 'v0.1.0',
+        version: '0.1.0',
+      });
     } finally {
       await rm(emptyRepo, { force: true, recursive: true });
     }
@@ -177,9 +238,9 @@ async function setupRepository(repoRoot: string): Promise<void> {
   await git(repoRoot, ['config', 'commit.gpgSign', 'false']);
   await git(repoRoot, ['config', 'tag.gpgSign', 'false']);
 
-  await writePackageJson(repoRoot, 'packages/server/package.json', '1.0.0');
-  await writePackageJson(repoRoot, 'packages/frontend/package.json', '1.0.0');
-  await writePackageJson(repoRoot, 'packages/standalone/package.json', '1.0.0');
+  await writePackageJson(repoRoot, 'packages/server/package.json', '0.0.3');
+  await writePackageJson(repoRoot, 'packages/frontend/package.json', '0.0.3');
+  await writePackageJson(repoRoot, 'packages/standalone/package.json', '0.0.3');
 
   await git(repoRoot, ['add', 'packages/server/package.json']);
   await git(repoRoot, ['add', 'packages/frontend/package.json']);
diff --git a/packages/tools/src/lib/release.ts b/packages/tools/src/lib/release.ts
@@ -6,15 +6,14 @@ import {
   getRepoRoot,
   getWorktreeStatus,
   hasTag,
-  listVersionTags,
   stageFiles,
 } from './git.ts';
 import { readPackageVersion, writePackageVersion } from './package-json.ts';
 import {
   bumpVersion,
   formatVersion,
   formatVersionTag,
-  parseVersionTag,
+  parseVersion,
 } from './version.ts';
 
 const RELEASE_TARGETS = [
@@ -57,22 +56,6 @@ export async function performRelease(
     throw new Error('Git worktree must be clean before releasing');
   }
 
-  const tags = await listVersionTags(repoRoot);
-  const latestTag = tags[0];
-
-  if (!latestTag) {
-    throw new Error('No release tag found. Create a v* tag first.');
-  }
-
-  const currentVersion = parseVersionTag(latestTag);
-  const nextVersion = bumpVersion(currentVersion, options.releaseType);
-  const nextTag = formatVersionTag(nextVersion);
-  const nextVersionText = formatVersion(nextVersion);
-
-  if (await hasTag(repoRoot, nextTag)) {
-    throw new Error(`Release tag already exists: ${nextTag}`);
-  }
-
   const currentPackageVersions = await Promise.all(
     RELEASE_TARGETS.map(async (targetPath) => {
       const absolutePath = path.join(repoRoot, targetPath);
@@ -96,8 +79,18 @@ export async function performRelease(
     );
   }
 
+  const currentVersion = parseVersion(expectedVersion);
+  const currentTag = formatVersionTag(currentVersion);
+  const nextVersion = bumpVersion(currentVersion, options.releaseType);
+  const nextTag = formatVersionTag(nextVersion);
+  const nextVersionText = formatVersion(nextVersion);
+
+  if (await hasTag(repoRoot, nextTag)) {
+    throw new Error(`Release tag already exists: ${nextTag}`);
+  }
+
   if (options.dryRun) {
-    options.logger.start(`Dry run for ${nextTag} from ${latestTag}`);
+    options.logger.start(`Dry run for ${nextTag} from ${currentTag}`);
     if (worktreeStatus.length > 0) {
       options.logger.info(
         'Worktree is dirty; dry run will not modify files or git state',
@@ -109,13 +102,13 @@ export async function performRelease(
 
     return {
       dryRun: true,
-      previousTag: latestTag,
+      previousTag: currentTag,
       tag: nextTag,
       version: nextVersionText,
     };
   }
 
-  options.logger.start(`Releasing ${nextTag} from ${latestTag}`);
+  options.logger.start(`Releasing ${nextTag} from ${currentTag}`);
 
   for (const targetPath of RELEASE_TARGETS) {
     const absolutePath = path.join(repoRoot, targetPath);
@@ -135,7 +128,7 @@ export async function performRelease(
 
   return {
     dryRun: false,
-    previousTag: latestTag,
+    previousTag: currentTag,
     tag: nextTag,
     version: nextVersionText,
   };
diff --git a/packages/tools/src/lib/version.test.ts b/packages/tools/src/lib/version.test.ts
@@ -3,6 +3,7 @@ import {
   bumpVersion,
   formatVersion,
   formatVersionTag,
+  parseVersion,
   parseVersionTag,
 } from './version.ts';
 
@@ -15,6 +16,14 @@ describe('version helpers', () => {
     });
   });
 
+  test('parses versions', () => {
+    expect(parseVersion('0.0.3')).toEqual({
+      major: 0,
+      minor: 0,
+      patch: 3,
+    });
+  });
+
   test('bumps versions by release type', () => {
     const version = parseVersionTag('v0.0.3');
 
@@ -26,4 +35,8 @@ describe('version helpers', () => {
   test('rejects invalid tags', () => {
     expect(() => parseVersionTag('1.2.3')).toThrow('Invalid release tag');
   });
+
+  test('rejects invalid versions', () => {
+    expect(() => parseVersion('v1.2.3')).toThrow('Invalid version');
+  });
 });
diff --git a/packages/tools/src/lib/version.ts b/packages/tools/src/lib/version.ts
@@ -4,8 +4,23 @@ export type Version = {
   patch: number;
 };
 
+const VERSION_PATTERN = /^(\d+)\.(\d+)\.(\d+)$/;
 const VERSION_TAG_PATTERN = /^v(\d+)\.(\d+)\.(\d+)$/;
 
+export function parseVersion(version: string): Version {
+  const match = VERSION_PATTERN.exec(version);
+
+  if (!match) {
+    throw new Error(`Invalid version: ${version}`);
+  }
+
+  const major = Number(match[1]);
+  const minor = Number(match[2]);
+  const patch = Number(match[3]);
+
+  return { major, minor, patch };
+}
+
 export function parseVersionTag(tag: string): Version {
   const match = VERSION_TAG_PATTERN.exec(tag);
 
