relacher 0.0.7-rc.4 → 0.0.7

package/lib-types/builder/shared.d.ts

@@ -1,5 +1,6 @@
 import type { ChangelogContext, PackageConfig } from '../types';
 import { type UpdateAction, type VersionFallback } from '../updater';
+import type { BumpSize } from '../versioning/types';
 export interface PackageListError {
     name: string;
     message: string;
@@ -11,31 +12,34 @@ export declare class PackageList extends Array<PackageConfig> {
     onPackageBump(name: string, ...actions: UpdateAction[]): this;
     onAllPackages(...actions: UpdateAction[]): this;
     group(groupName: string, ...packageNames: string[]): this;
-    /**
-     * Couples two or more packages together so they share the exact same version bump.
-     * Supports: `.couple('a', 'b')` or `.couple(['a', 'b'], ['c', 'd'])`.
-     */
     couple(...args: [string, string] | [string[]]): this;
     /**
      * Automatically adds a CHANGELOG.md update action to each package's directory.
+     * Defaults to onlyOn: ['major', 'minor', 'patch'] so pre-releases are skipped.
      */
     withChangelogs(options?: {
         only?: string[];
         exclude?: string[];
+        onlyOn?: BumpSize[];
         template?: (ctx: ChangelogContext) => string;
     }): this;
     /**
      * Attaches a workspace-wide root CHANGELOG.md that captures all changes across packages.
+     * Defaults to onlyOn: ['major', 'minor', 'patch'] so pre-releases are skipped.
      */
     withRootChangelog(options?: {
         github?: string;
         path?: string;
+        onlyOn?: BumpSize[];
         template?: (ctx: ChangelogContext) => string;
     }): this;
     /**
      * Declaratively syncs a package version to any file on disk (e.g. `flake.nix`, `README.md`).
+     * Supports `options.onlyOn` to restrict updates to specific bump types.
      */
-    syncVersion(packageName: string, filePath: string, pattern?: string | RegExp, replaceTemplate?: string): this;
+    syncVersion(packageName: string, filePath: string, pattern?: string | RegExp, replaceTemplate?: string, options?: {
+        onlyOn?: BumpSize[];
+    }): this;
     assertFound(...names: string[]): this;
     addDepsOn(pkgName: string, dependsOn: string | string[]): this;
     ignore(...names: string[]): this;

package/lib-types/lockfile.d.ts

@@ -12,4 +12,4 @@ export declare const LOCKFILE_NAME = ".relacher.lock";
 export declare function readLockfile(cwd: string): LockfileData;
 export declare function writeLockfile(cwd: string, data: LockfileData): void;
 export declare function updateLockfile(cwd: string, reports: DependencyUpdateReport[]): void;
-export declare function findLastReleaseCommit(vcs: VcsProvider, packageName: string, currentVersion: string): Effect.Effect<string | null, VcsError>;
+export declare function findLastReleaseCommit(vcs: VcsProvider, packageName: string, targetVersion: string): Effect.Effect<string | null, VcsError>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "relacher",
-  "version": "0.0.7-rc.4",
+  "version": "0.0.7",
   "description": "Scriptable release orchestration library for monorepos",
   "type": "module",
   "private": false,

package/src/builder/shared.ts

@@ -1,7 +1,14 @@
 import path from 'node:path';
 
 import type { ChangelogContext, PackageConfig } from '../types';
-import { changelogUpdate, githubChangelogTemplate, regexUpdate, type UpdateAction, type VersionFallback } from '../updater';
+import {
+  changelogUpdate,
+  githubChangelogTemplate,
+  regexUpdate,
+  type UpdateAction,
+  type VersionFallback,
+} from '../updater';
+import type { BumpSize } from '../versioning/types';
 
 export interface PackageListError {
   name: string;
@@ -70,10 +77,6 @@ export class PackageList extends Array<PackageConfig> {
     return this;
   }
 
-  /**
-   * Couples two or more packages together so they share the exact same version bump.
-   * Supports: `.couple('a', 'b')` or `.couple(['a', 'b'], ['c', 'd'])`.
-   */
   public couple(...args: [string, string] | [string[]]): this {
     if (Array.isArray(args[0])) {
       for (const groupMembers of args as string[][]) {
@@ -87,12 +90,16 @@ export class PackageList extends Array<PackageConfig> {
 
   /**
    * Automatically adds a CHANGELOG.md update action to each package's directory.
+   * Defaults to onlyOn: ['major', 'minor', 'patch'] so pre-releases are skipped.
    */
   public withChangelogs(options?: {
     only?: string[];
     exclude?: string[];
+    onlyOn?: BumpSize[];
     template?: (ctx: ChangelogContext) => string;
   }): this {
+    const onlyOn = options?.onlyOn ?? ['major', 'minor', 'patch'];
+
     for (const pkg of this) {
       if (options?.only && !options.only.includes(pkg.name)) continue;
       if (options?.exclude && options.exclude.includes(pkg.name)) continue;
@@ -103,6 +110,7 @@ export class PackageList extends Array<PackageConfig> {
       this.onPackageBump(
         pkg.name,
         changelogUpdate(changelogPath, {
+          onlyOn,
           template: options?.template,
         }),
       );
@@ -112,18 +120,22 @@ export class PackageList extends Array<PackageConfig> {
 
   /**
    * Attaches a workspace-wide root CHANGELOG.md that captures all changes across packages.
+   * Defaults to onlyOn: ['major', 'minor', 'patch'] so pre-releases are skipped.
    */
   public withRootChangelog(options?: {
     github?: string;
     path?: string;
+    onlyOn?: BumpSize[];
     template?: (ctx: ChangelogContext) => string;
   }): this {
     const changelogPath = options?.path || 'CHANGELOG.md';
     const template = options?.template ?? (options?.github ? githubChangelogTemplate(options.github) : undefined);
+    const onlyOn = options?.onlyOn ?? ['major', 'minor', 'patch'];
 
     this.onAllPackages(
       changelogUpdate(changelogPath, {
         global: true,
+        onlyOn,
         template,
       }),
     );
@@ -132,12 +144,14 @@ export class PackageList extends Array<PackageConfig> {
 
   /**
    * Declaratively syncs a package version to any file on disk (e.g. `flake.nix`, `README.md`).
+   * Supports `options.onlyOn` to restrict updates to specific bump types.
    */
   public syncVersion(
     packageName: string,
     filePath: string,
     pattern: string | RegExp = 'version = "[^"]+"',
     replaceTemplate = 'version = "{{version}}"',
+    options?: { onlyOn?: BumpSize[] },
   ): this {
     const search = typeof pattern === 'string' ? pattern : pattern.source;
     return this.onPackageBump(
@@ -145,6 +159,7 @@ export class PackageList extends Array<PackageConfig> {
       regexUpdate(filePath, {
         search,
         replace: replaceTemplate,
+        onlyOn: options?.onlyOn,
       }),
     );
   }

package/src/lockfile.ts

@@ -5,6 +5,7 @@ import { Effect } from 'effect';
 
 import type { DependencyUpdateReport } from './types';
 import type { VcsError, VcsProvider } from './vcs';
+import { inferLastStableVersion } from './versioning/semver';
 
 export interface LockfilePackageEntry {
   version: string;
@@ -44,7 +45,14 @@ export function updateLockfile(cwd: string, reports: DependencyUpdateReport[]):
       const isPrerelease = dep.newVersion.includes('-');
       const previousEntry = lockfile.packages[dep.name];
 
-      let lastStable = previousEntry?.lastStableVersion || previousEntry?.version;
+      let lastStable =
+        previousEntry?.lastStableVersion ||
+        previousEntry?.version ||
+        dep.lastStableVersion ||
+        (dep.currentVersion && !dep.currentVersion.includes('-')
+          ? dep.currentVersion
+          : inferLastStableVersion(dep.currentVersion));
+
       if (!isPrerelease) {
         lastStable = dep.newVersion;
       }
@@ -61,7 +69,7 @@ export function updateLockfile(cwd: string, reports: DependencyUpdateReport[]):
 export function findLastReleaseCommit(
   vcs: VcsProvider,
   packageName: string,
-  currentVersion: string,
+  targetVersion: string,
 ): Effect.Effect<string | null, VcsError> {
   return Effect.gen(function* () {
     if (!vcs.getFileHistoryCommits || !vcs.getFileAtCommit) {
@@ -71,8 +79,10 @@ export function findLastReleaseCommit(
     const hashes = yield* vcs.getFileHistoryCommits(LOCKFILE_NAME);
     if (hashes.length === 0) return null;
 
-    let lastMatchingHash: string | null = hashes[0] || null;
+    let foundMatch = false;
+    let earliestMatchingHash: string | null = null;
 
+    // Hashes are ordered from newest to oldest
     for (const hash of hashes) {
       const content = yield* vcs.getFileAtCommit(LOCKFILE_NAME, hash);
       if (!content) continue;
@@ -81,16 +91,18 @@ export function findLastReleaseCommit(
         const data = JSON.parse(content) as LockfileData;
         const version = data.packages?.[packageName]?.version;
 
-        if (version === currentVersion) {
-          lastMatchingHash = hash;
-        } else {
-          return lastMatchingHash;
+        if (version === targetVersion) {
+          foundMatch = true;
+          earliestMatchingHash = hash;
+        } else if (foundMatch) {
+          // Reached an older version before targetVersion was introduced
+          return earliestMatchingHash;
         }
       } catch {
-        return lastMatchingHash;
+        if (foundMatch) return earliestMatchingHash;
       }
     }
 
-    return lastMatchingHash;
+    return earliestMatchingHash;
   }) as Effect.Effect<string | null, VcsError>;
 }

package/src/prepare.ts

@@ -14,7 +14,7 @@ import type {
   PrepareOptions,
 } from './types';
 import type { UpdateAction, UpdateActionResolved } from './updater';
-import { VcsProviderService, type VcsProvider } from './vcs';
+import { VcsProviderService } from './vcs';
 import { VersionManagerService, type VersionManager } from './versioning';
 import { isBumpEqual, isPreRelease } from './versioning/bump';
 import type { BumpSize } from './versioning/types';
@@ -116,6 +116,13 @@ export function initReportItems(
       }
 
       let selfBump = versionManager.evaluateCommitsBump(commitsSincePreRelease);
+
+      // If graduating an existing pre-release to stable (e.g. 1.1.0-rc.0 -> 1.1.0),
+      // ensure it is never skipped even if no new commits were added after the RC was cut.
+      if (!versionManager.isRCMode && actualVersion.includes('-') && selfBump === 'skip') {
+        selfBump = 'patch';
+      }
+
       selfBump = resolvePackageBump(dep.name, selfBump, options);
 
       let isErroneous = isMissingVersion;
@@ -177,32 +184,8 @@ export function prepare(
 
     const cwd = options.cwd || process.cwd();
 
-    let trackedPackages: PackageConfig[] = packages;
-    if (Option.isSome(vcsOption)) {
-      const vcs: VcsProvider = vcsOption.value;
-      if (typeof vcs.isTracked === 'function') {
-        const filtered: PackageConfig[] = [];
-        for (const pkg of packages) {
-          // Use relative path directly rather than resolving to absolute
-          const targetPath = pkg.manifestPath || pkg.watch?.[0] || '.';
-
-          const isTracked = yield* vcs.isTracked(targetPath);
-          if (isTracked) {
-            filtered.push(pkg);
-          }
-        }
-        trackedPackages = filtered;
-
-        const activeNames = new Set(trackedPackages.map((p) => p.name));
-        for (const pkg of trackedPackages) {
-          if (pkg.depends) {
-            pkg.depends = pkg.depends.filter((d) => activeNames.has(d));
-          }
-        }
-      }
-    }
-
-    const items = yield* initReportItems(trackedPackages, cwd, options);
+    // Packages passed in were already validated and tracked by the builder.
+    const items = yield* initReportItems(packages, cwd, options);
     const sorted = topologicalSort(items);
     versionManager.propagateBumps(sorted);
     versionManager.propagateCoupledBumps(sorted);

package/src/versioning/vcs-version-manager.ts

@@ -104,10 +104,18 @@ export const makeVcsVersionManager = (
         return vcs.getCommits(dep.watch || [], null, excludePaths);
       }
 
+      // In stable release mode, if the package was in pre-release (e.g. 1.1.0-rc.0),
+      // we query commits since the last STABLE version (e.g. 1.0.0) so that all commits
+      // developed during the RC cycle are included in the final changelog and bump.
+      const targetVersion =
+        !isRCMode && lockVersion.includes('-') && entry?.lastStableVersion
+          ? entry.lastStableVersion
+          : lockVersion;
+
       const findCommitEffect =
         typeof vcs.findLastReleaseCommit === 'function'
-          ? vcs.findLastReleaseCommit(dep.name, lockVersion)
-          : findLastReleaseCommit(vcs, dep.name, lockVersion);
+          ? vcs.findLastReleaseCommit(dep.name, targetVersion)
+          : findLastReleaseCommit(vcs, dep.name, targetVersion);
 
       return findCommitEffect.pipe(
         Effect.flatMap((lastCommit) =>