versionary 0.27.0 → 0.28.0

package/dist/release/changelog.js

@@ -226,7 +226,7 @@ function prependChangelog(cwd, changelogFile, section, format = "markdown-change
     }
     const heading = "# Changelog\n\n";
     const bodyWithoutHeading = existing.replace(/^# Changelog\s*/u, "");
-    const separator = existing.length > 0 ? "\n" : "";
+    const separator = bodyWithoutHeading.length > 0 ? "\n\n" : "";
     const next = `${`${heading}${section}${separator}${bodyWithoutHeading}`.trimEnd()}\n`;
     node_fs_1.default.writeFileSync(changelogPath, next, "utf8");
 }

package/dist/release/pr.js

@@ -157,13 +157,6 @@ function fetchRemoteReleaseBranch(cwd, branch) {
     });
     return remoteRef;
 }
-function resolveReleaseName(cwd, packagePath, packageConfig, strategy, strategyConfig) {
-    const configuredName = packageConfig["package-name"]?.trim();
-    if (configuredName) {
-        return configuredName;
-    }
-    return strategy.readPackageName?.(cwd, strategyConfig) ?? packagePath;
-}
 function buildReleaseTargets(cwd, plan, loadedConfig) {
     const releaseTargets = plan.packages
         ? plan.packages
@@ -178,7 +171,7 @@ function buildReleaseTargets(cwd, plan, loadedConfig) {
             }
             const packageConfig = loadedConfig.packages?.[pkg.path] ?? {};
             const packageContext = (0, package_context_js_1.resolvePackageStrategyContext)(loadedConfig, pkg.path, packageConfig);
-            const releaseName = resolveReleaseName(cwd, pkg.path, packageConfig, packageContext.strategy, packageContext.config);
+            const releaseName = (0, package_context_js_1.resolveReleaseName)(cwd, pkg.path, packageConfig, packageContext.strategy, packageContext.config);
             const tagPrefix = normalizeReleaseNameForTag(releaseName);
             return {
                 path: pkg.path,
@@ -211,7 +204,7 @@ function buildPackageReleaseMetadata(cwd, plan, loadedConfig) {
         }
         const packageConfig = loadedConfig.packages?.[pkg.path] ?? {};
         const packageContext = (0, package_context_js_1.resolvePackageStrategyContext)(loadedConfig, pkg.path, packageConfig);
-        const releaseName = resolveReleaseName(cwd, pkg.path, packageConfig, packageContext.strategy, packageContext.config);
+        const releaseName = (0, package_context_js_1.resolveReleaseName)(cwd, pkg.path, packageConfig, packageContext.strategy, packageContext.config);
         metadataByPath[pkg.path] = {
             releaseName,
             tagPrefix: normalizeReleaseNameForTag(releaseName),
@@ -389,7 +382,7 @@ function renderSimpleReviewRequestBody(version, previousVersion, commits, plan =
         }
         const packageConfig = loadedConfig.packages?.[packagePath] ?? {};
         const packageContext = (0, package_context_js_1.resolvePackageStrategyContext)(loadedConfig, packagePath, packageConfig);
-        const releaseName = resolveReleaseName(cwd, packagePath, packageConfig, packageContext.strategy, packageContext.config);
+        const releaseName = (0, package_context_js_1.resolveReleaseName)(cwd, packagePath, packageConfig, packageContext.strategy, packageContext.config);
         return normalizeReleaseNameForTag(releaseName);
     };
     if (plan?.packages && plan.packages.length > 1) {

package/dist/release/release.d.ts

@@ -1,5 +1,6 @@
 import type { VersionaryConfig } from "../types/config.js";
 import type { VersionaryPluginContext } from "../types/plugins.js";
+export declare function resolveTargetPackageName(cwd: string, config: VersionaryConfig, targetPath: string): string | undefined;
 export declare function extractReleaseNotes(content: string, version: string, changelogFormat: "markdown-changelog" | "r-news"): string;
 export declare function extractClosingReferencesFromNotes(notes: string): number[];
 export declare function resolveTargetChangelogFile(config: VersionaryConfig, rootChangelogFile: string, targetPath: string): string;

package/dist/release/release.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveTargetPackageName = resolveTargetPackageName;
 exports.extractReleaseNotes = extractReleaseNotes;
 exports.extractClosingReferencesFromNotes = extractClosingReferencesFromNotes;
 exports.resolveTargetChangelogFile = resolveTargetChangelogFile;
@@ -15,6 +16,7 @@ const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const load_config_js_1 = require("../config/load-config.js");
 const client_js_1 = require("../scm/client.js");
+const package_context_js_1 = require("../strategy/package-context.js");
 const resolve_js_1 = require("../strategy/resolve.js");
 const plan_js_1 = require("./plan.js");
 const pr_js_1 = require("./pr.js");
@@ -23,6 +25,15 @@ const state_js_1 = require("./state.js");
 function escapeRegExp(input) {
     return input.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&");
 }
+function resolveTargetPackageName(cwd, config, targetPath) {
+    const packageConfig = config.packages?.[targetPath] ?? {};
+    const { strategy, config: strategyConfig } = (0, package_context_js_1.resolvePackageStrategyContext)(config, targetPath, packageConfig);
+    const resolved = (0, package_context_js_1.resolveReleaseName)(cwd, targetPath, packageConfig, strategy, strategyConfig);
+    if (!resolved || resolved === targetPath) {
+        return undefined;
+    }
+    return resolved;
+}
 function extractReleaseNotes(content, version, changelogFormat) {
     const lines = content.split("\n");
     const shortVersion = version.replace(/\.\d+$/u, "");
@@ -172,12 +183,12 @@ async function runReleaseDetailed(cwd = process.cwd(), options = {}) {
     }
     const scmClient = (0, client_js_1.getScmClient)();
     const releases = [];
-    const referencesByTag = new Map();
+    const referenceReleases = [];
     for (const target of targets) {
         const targetChangelogFile = resolveTargetChangelogFile(loaded.config, changelogFile, target.path);
         const targetChangelogFormat = resolveTargetChangelogFormat(loaded.config, target.path);
         const releaseNotes = readReleaseNotes(cwd, target.version, targetChangelogFile, targetChangelogFormat);
-        referencesByTag.set(target.tag, extractClosingReferencesFromNotes(releaseNotes));
+        const references = extractClosingReferencesFromNotes(releaseNotes);
         const outcome = await (0, recovery_js_1.executeIdempotentReleaseTarget)(cwd, {
             tag: target.tag,
             version: target.version,
@@ -197,21 +208,27 @@ async function runReleaseDetailed(cwd = process.cwd(), options = {}) {
             tagStatus: outcome.tagStatus,
             metadataStatus: outcome.metadataStatus,
         });
-        const references = referencesByTag.get(outcome.tag) ?? [];
-        if (references.length > 0 &&
-            referenceCommentMode !== "off" &&
-            scmClient.createReleaseReferenceComments) {
-            await scmClient.createReleaseReferenceComments({
+        if (references.length > 0) {
+            referenceReleases.push({
+                name: resolveTargetPackageName(cwd, loaded.config, target.path),
+                tag: outcome.tag,
                 version: target.version,
                 releaseUrl: outcome.url,
                 references,
-                mode: referenceCommentMode,
-            }, {
-                cwd,
-                logger: options.logger,
             });
         }
     }
+    if (referenceReleases.length > 0 &&
+        referenceCommentMode !== "off" &&
+        scmClient.createReleaseReferenceComments) {
+        await scmClient.createReleaseReferenceComments({
+            releases: referenceReleases,
+            mode: referenceCommentMode,
+        }, {
+            cwd,
+            logger: options.logger,
+        });
+    }
     const published = releases.map((outcome) => `${outcome.tag}: ${outcome.url} (tag=${outcome.tagStatus}, metadata=${outcome.metadataStatus})`);
     return {
         action: "release-published",

package/dist/scm/github-plugin.js

@@ -86,6 +86,42 @@ async function ensureLabels(octokit, repo, pullNumber, labels, branchContext) {
         throw new Error(`Failed applying labels to pull request #${pullNumber}: [${repoRef(repo)} base=${branchContext.baseBranch} head=${branchContext.headBranch}] ${message}`);
     }
 }
+function groupReleasesByIssue(releases) {
+    const byIssue = new Map();
+    for (const release of releases) {
+        for (const reference of release.references) {
+            const bucket = byIssue.get(reference) ?? [];
+            if (!bucket.some((entry) => entry.tag === release.tag)) {
+                bucket.push(release);
+            }
+            byIssue.set(reference, bucket);
+        }
+    }
+    for (const bucket of byIssue.values()) {
+        bucket.sort((a, b) => a.tag.localeCompare(b.tag));
+    }
+    return new Map([...byIssue.entries()].sort(([a], [b]) => a - b));
+}
+function renderReleaseLink(release) {
+    if (release.name) {
+        return `[\`${release.name}\` v${release.version}](${release.releaseUrl})`;
+    }
+    return `[version ${release.version}](${release.releaseUrl})`;
+}
+function renderReleaseReferenceCommentBody(releases) {
+    const footer = "Released by [Versionary](https://github.com/jolars/versionary).";
+    if (releases.length === 1) {
+        const release = releases[0];
+        if (!release) {
+            throw new Error("Expected at least one release for comment body.");
+        }
+        return `This is included in ${renderReleaseLink(release)}. :tada:\n\n${footer}`;
+    }
+    const bullets = releases
+        .map((release) => `- ${renderReleaseLink(release)}`)
+        .join("\n");
+    return `This is included in the following releases: :tada:\n\n${bullets}\n\n${footer}`;
+}
 function createGitHubPlugin() {
     return {
         name: "github",
@@ -275,11 +311,11 @@ function createGitHubPlugin() {
         async createReleaseReferenceComments(input, context) {
             const repo = getRepoFromEnv();
             const octokit = new rest_1.Octokit({ auth: getGitHubToken() });
-            const uniqueReferences = [...new Set(input.references)].sort((a, b) => a - b);
-            const commented = [];
             const mode = input.mode ?? "best-effort";
-            for (const reference of uniqueReferences) {
-                const body = `This is included in [version ${input.version}](${input.releaseUrl}). :tada:\n\nReleased by [Versionary](https://github.com/jolars/versionary).`;
+            const releasesByIssue = groupReleasesByIssue(input.releases);
+            const commented = [];
+            for (const [reference, releases] of releasesByIssue) {
+                const body = renderReleaseReferenceCommentBody(releases);
                 try {
                     await octokit.issues.createComment({
                         owner: repo.owner,

package/dist/scm/types.d.ts

@@ -41,10 +41,15 @@ export interface ScmReleaseMetadataResult {
     url: string;
     status?: "created" | "exists";
 }
-export interface ScmReleaseReferenceCommentsInput {
+export interface ScmReleaseReferenceCommentsRelease {
+    name?: string;
+    tag: string;
     version: string;
     releaseUrl: string;
     references: number[];
+}
+export interface ScmReleaseReferenceCommentsInput {
+    releases: ScmReleaseReferenceCommentsRelease[];
     mode?: "best-effort" | "strict";
 }
 export interface ScmReleaseReferenceCommentsResult {

package/dist/strategy/package-context.d.ts

@@ -1,5 +1,6 @@
 import type { VersionaryConfig, VersionaryPackage } from "../types/config.js";
 import type { VersionStrategy } from "./types.js";
+export declare function resolveReleaseName(cwd: string, packagePath: string, packageConfig: VersionaryPackage, strategy: VersionStrategy, strategyConfig: VersionaryConfig): string;
 export declare function resolvePackageStrategyContext(rootConfig: VersionaryConfig, packagePath: string, packageConfig: VersionaryPackage): {
     strategy: VersionStrategy;
     config: VersionaryConfig;

package/dist/strategy/package-context.js

@@ -3,9 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveReleaseName = resolveReleaseName;
 exports.resolvePackageStrategyContext = resolvePackageStrategyContext;
 const node_path_1 = __importDefault(require("node:path"));
 const resolve_js_1 = require("./resolve.js");
+function resolveReleaseName(cwd, packagePath, packageConfig, strategy, strategyConfig) {
+    const configuredName = packageConfig["package-name"]?.trim();
+    if (configuredName) {
+        return configuredName;
+    }
+    return strategy.readPackageName?.(cwd, strategyConfig) ?? packagePath;
+}
 function withVersionFile(config, versionFile) {
     return {
         ...config,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "versionary",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "description": "Automatic release framework based on conventional commits and semantic versioning",
   "keywords": [
     "releasing",