@varlock/bumpy 1.2.1 → 1.3.0

package/dist/{publish-DGSV607z.mjs → publish-CfZCAlPx.mjs}

@@ -1,11 +1,12 @@
 import { n as log, t as colorize } from "./logger-C2dEe5Su.mjs";
-import { a as loadConfig } from "./config-D7Umr-fT.mjs";
-import { n as detectWorkspaces } from "./package-manager-ByJ0wKYh.mjs";
-import { n as discoverWorkspace } from "./workspace-BHsAPUmC.mjs";
-import { t as DependencyGraph } from "./dep-graph-DiLeAhl9.mjs";
-import { r as runArgsAsync, s as tryRunArgs } from "./shell-CY7OD48z.mjs";
-import { c as pushWithTags, o as hasUncommittedChanges, s as listTags } from "./git-H9S9z6g-.mjs";
-import { t as publishPackages } from "./publish-pipeline-DiwZZ5AF.mjs";
+import { a as loadConfig } from "./config-D13G4-R8.mjs";
+import { n as detectWorkspaces } from "./package-manager-CClZtIHP.mjs";
+import { n as discoverWorkspace } from "./workspace-BKOAMeki.mjs";
+import { t as DependencyGraph } from "./dep-graph-E-9-eQ2J.mjs";
+import { r as runArgsAsync, s as tryRunArgs } from "./shell-u3bYGxNy.mjs";
+import { i as loadFormatter, n as generateChangelogEntry } from "./changelog-BIkNBJ15.mjs";
+import { c as pushWithTags, o as hasUncommittedChanges, s as listTags } from "./git-D0__HP86.mjs";
+import { t as publishPackages } from "./publish-pipeline-BvLIu7WF.mjs";
 //#region src/core/github-release.ts
 /** Get the current HEAD commit SHA */
 function getHeadSha(rootDir) {
@@ -24,7 +25,7 @@ async function createIndividualReleases(releases, bumpFiles, rootDir, opts = {})
 	const headSha = getHeadSha(rootDir);
 	for (const release of releases) {
 		const tag = `${release.name}@${release.newVersion}`;
-		const body = buildReleaseBody(release, bumpFiles);
+		const body = opts.formatter ? await generateReleaseBody(release, bumpFiles, opts.formatter) : buildReleaseBody(release, bumpFiles);
 		const title = `${release.name} v${release.newVersion}`;
 		if (opts.dryRun) {
 			log.dim(`  Would create GitHub release: ${title}`);
@@ -58,7 +59,7 @@ async function createAggregateRelease(releases, bumpFiles, rootDir, opts = {}) {
 	if (releases.length === 0) return;
 	const date = (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
 	const { tag, title } = resolveAggregateTagAndTitle(date, listTags(`release-${date}*`, { cwd: rootDir }), opts.title);
-	const body = buildAggregateBody(releases, bumpFiles);
+	const body = opts.formatter ? await generateAggregateBody(releases, bumpFiles, opts.formatter) : buildAggregateBody(releases, bumpFiles);
 	if (opts.dryRun) {
 		log.dim(`  Would create aggregate GitHub release: ${title}`);
 		log.dim(`  Tag: ${tag}`);
@@ -88,6 +89,36 @@ async function createAggregateRelease(releases, bumpFiles, rootDir, opts = {}) {
 		log.warn(`Failed to create aggregate GitHub release: ${err instanceof Error ? err.message : err}`);
 	}
 }
+/** Generate a release body for a single package using the changelog formatter */
+async function generateReleaseBody(release, bumpFiles, formatter) {
+	return stripVersionHeading(await generateChangelogEntry(release, bumpFiles, formatter, void 0, "github-release")).trim() || "No changelog entries.";
+}
+/** Generate an aggregate release body using the changelog formatter */
+async function generateAggregateBody(releases, bumpFiles, formatter) {
+	const lines = [];
+	const groups = [
+		["Major Changes", releases.filter((r) => r.type === "major")],
+		["Minor Changes", releases.filter((r) => r.type === "minor")],
+		["Patch Changes", releases.filter((r) => r.type === "patch")]
+	];
+	for (const [heading, group] of groups) {
+		if (group.length === 0) continue;
+		lines.push(`## ${heading}\n`);
+		for (const release of group) {
+			lines.push(`### ${release.name} v${release.newVersion}\n`);
+			const body = stripVersionHeading(await generateChangelogEntry(release, bumpFiles, formatter, void 0, "github-release")).trim();
+			if (body) lines.push(body);
+			else if (release.isDependencyBump) lines.push("- Updated dependencies");
+			else if (release.isCascadeBump) lines.push("- Version bump via cascade rule");
+			lines.push("");
+		}
+	}
+	return lines.join("\n").trim() || "No changelog entries.";
+}
+/** Strip the leading ## version heading and date sub-heading from a changelog entry */
+function stripVersionHeading(entry) {
+	return entry.replace(/^## .+\n/, "").replace(/^<sub>.+<\/sub>\n/, "").replace(/^_.+_\n/, "");
+}
 function buildReleaseBody(release, bumpFiles) {
 	const lines = [];
 	const relevant = bumpFiles.filter((bf) => release.bumpFiles.includes(bf.id));
@@ -148,7 +179,7 @@ async function publishCommand(rootDir, opts) {
 	}
 	let toPublish = await findUnpublishedPackages(packages, config);
 	if (opts.filter) {
-		const { matchGlob } = await import("./config-D7Umr-fT.mjs").then((n) => n.t);
+		const { matchGlob } = await import("./config-D13G4-R8.mjs").then((n) => n.t);
 		const patterns = opts.filter.split(",").map((p) => p.trim());
 		toPublish = toPublish.filter((r) => patterns.some((p) => matchGlob(r.name, p)));
 	}
@@ -187,11 +218,16 @@ async function publishCommand(rootDir, opts) {
 		const aggConfig = config.aggregateRelease;
 		const isAggregate = aggConfig === true || typeof aggConfig === "object" && aggConfig.enabled;
 		const aggTitle = typeof aggConfig === "object" ? aggConfig.title : void 0;
+		const formatter = config.changelog !== false ? await loadFormatter(config.changelog, rootDir) : void 0;
 		if (isAggregate) await createAggregateRelease(publishedReleases, releasePlan.bumpFiles, rootDir, {
 			dryRun: opts.dryRun,
-			title: aggTitle
+			title: aggTitle,
+			formatter
+		});
+		else await createIndividualReleases(publishedReleases, releasePlan.bumpFiles, rootDir, {
+			dryRun: opts.dryRun,
+			formatter
 		});
-		else await createIndividualReleases(publishedReleases, releasePlan.bumpFiles, rootDir, { dryRun: opts.dryRun });
 	}
 }
 /**
@@ -220,7 +256,7 @@ async function findUnpublishedPackages(packages, _config) {
 	return unpublished;
 }
 async function checkIfPublished(name, version, pkgConfig) {
-	const { runAsync, runArgsAsync, tryRunArgs } = await import("./shell-CY7OD48z.mjs").then((n) => n.a);
+	const { runAsync, runArgsAsync, tryRunArgs } = await import("./shell-u3bYGxNy.mjs").then((n) => n.a);
 	if (pkgConfig?.checkPublished) try {
 		return (await runAsync(pkgConfig.checkPublished)).trim() === version;
 	} catch {

package/dist/{publish-pipeline-DiwZZ5AF.mjs → publish-pipeline-BvLIu7WF.mjs}

@@ -1,9 +1,9 @@
 import { n as log, t as colorize } from "./logger-C2dEe5Su.mjs";
 import { a as readJson, u as updateJsonNestedField } from "./fs-DnDogVn-.mjs";
-import { r as resolveCatalogDep } from "./package-manager-ByJ0wKYh.mjs";
-import { i as runAsync, o as sq, r as runArgsAsync, s as tryRunArgs } from "./shell-CY7OD48z.mjs";
-import { r as stripProtocol } from "./semver-BJzWIuRz.mjs";
-import { l as tagExists, t as createTag } from "./git-H9S9z6g-.mjs";
+import { r as resolveCatalogDep } from "./package-manager-CClZtIHP.mjs";
+import { i as runAsync, o as sq, r as runArgsAsync, s as tryRunArgs } from "./shell-u3bYGxNy.mjs";
+import { r as stripProtocol } from "./semver-DfQyVLM_.mjs";
+import { l as tagExists, t as createTag } from "./git-D0__HP86.mjs";
 import { resolve } from "node:path";
 import { unlink } from "node:fs/promises";
 import { appendFileSync, existsSync, readFileSync, writeFileSync } from "node:fs";

package/dist/{release-plan-CNOuSI-d.mjs → release-plan-RBjKmavL.mjs}

@@ -1,5 +1,6 @@
-import { h as maxBump, l as DEFAULT_BUMP_RULES, m as hasCascade, p as bumpLevel, s as matchGlob } from "./config-D7Umr-fT.mjs";
-import { n as satisfies, t as bumpVersion } from "./semver-BJzWIuRz.mjs";
+import { c as maxBump, n as DEFAULT_BUMP_RULES, o as bumpLevel, s as hasCascade } from "./types-BX4pfmKh.mjs";
+import { s as matchGlob } from "./config-D13G4-R8.mjs";
+import { n as satisfies, t as bumpVersion } from "./semver-DfQyVLM_.mjs";
 //#region src/core/release-plan.ts
 /**
 * Build a release plan from pending bump files, the dependency graph, and config.

package/dist/{status-S2ztf_8E.mjs → status-pMfPtt1p.mjs}

@@ -1,10 +1,10 @@
 import { n as log, t as colorize } from "./logger-C2dEe5Su.mjs";
-import { a as loadConfig } from "./config-D7Umr-fT.mjs";
-import { t as discoverPackages } from "./workspace-BHsAPUmC.mjs";
-import { t as DependencyGraph } from "./dep-graph-DiLeAhl9.mjs";
-import { r as readBumpFiles, t as filterBranchBumpFiles } from "./bump-file-C3S_bzSf.mjs";
-import { t as assembleReleasePlan } from "./release-plan-CNOuSI-d.mjs";
-import { i as getCurrentBranch, r as getChangedFiles } from "./git-H9S9z6g-.mjs";
+import { a as loadConfig } from "./config-D13G4-R8.mjs";
+import { t as discoverPackages } from "./workspace-BKOAMeki.mjs";
+import { t as DependencyGraph } from "./dep-graph-E-9-eQ2J.mjs";
+import { r as readBumpFiles, t as filterBranchBumpFiles } from "./bump-file-CoaSxqne.mjs";
+import { t as assembleReleasePlan } from "./release-plan-RBjKmavL.mjs";
+import { i as getCurrentBranch, r as getChangedFiles } from "./git-D0__HP86.mjs";
 //#region src/commands/status.ts
 async function statusCommand(rootDir, opts) {
 	const config = await loadConfig(rootDir);
@@ -31,7 +31,7 @@ async function statusCommand(rootDir, opts) {
 		releases = releases.filter((r) => types.includes(r.type));
 	}
 	if (opts.filter) {
-		const { matchGlob } = await import("./config-D7Umr-fT.mjs").then((n) => n.t);
+		const { matchGlob } = await import("./config-D13G4-R8.mjs").then((n) => n.t);
 		const patterns = opts.filter.split(",").map((p) => p.trim());
 		releases = releases.filter((r) => patterns.some((p) => matchGlob(r.name, p)));
 	}

package/dist/types-BX4pfmKh.mjs

@@ -0,0 +1,80 @@
+//#region src/types.ts
+const BUMP_LEVELS = {
+	patch: 0,
+	minor: 1,
+	major: 2
+};
+function bumpLevel(type) {
+	return BUMP_LEVELS[type];
+}
+function maxBump(a, b) {
+	if (!a) return b;
+	return bumpLevel(a) >= bumpLevel(b) ? a : b;
+}
+const DEFAULT_BUMP_RULES = {
+	dependencies: {
+		trigger: "patch",
+		bumpAs: "patch"
+	},
+	peerDependencies: {
+		trigger: "major",
+		bumpAs: "match"
+	},
+	devDependencies: false,
+	optionalDependencies: {
+		trigger: "minor",
+		bumpAs: "patch"
+	}
+};
+const DEP_TYPES = [
+	"dependencies",
+	"devDependencies",
+	"peerDependencies",
+	"optionalDependencies"
+];
+const DEFAULT_PUBLISH_CONFIG = {
+	packManager: "auto",
+	publishManager: "npm",
+	publishArgs: [],
+	protocolResolution: "pack"
+};
+const DEFAULT_CONFIG = {
+	baseBranch: "main",
+	access: "public",
+	versionCommitMessage: void 0,
+	changedFilePatterns: ["**"],
+	changelog: "default",
+	fixed: [],
+	linked: [],
+	ignore: [],
+	include: [],
+	updateInternalDependencies: "out-of-range",
+	dependencyBumpRules: {},
+	privatePackages: {
+		version: false,
+		tag: false
+	},
+	allowCustomCommands: false,
+	packages: {},
+	publish: { ...DEFAULT_PUBLISH_CONFIG },
+	aggregateRelease: false,
+	gitUser: {
+		name: "bumpy-bot",
+		email: "276066384+bumpy-bot@users.noreply.github.com"
+	},
+	versionPr: {
+		title: "🐸 Versioned release",
+		branch: "bumpy/version-packages",
+		preamble: [
+			`<a href="https://bumpy.varlock.dev"><img src="https://raw.githubusercontent.com/dmno-dev/bumpy/main/images/frog-clipboard.png" alt="bumpy-frog" width="60" align="left" style="image-rendering: pixelated;" title="Hi! I'm bumpy!" /></a>`,
+			"",
+			`This PR was created and will be kept in sync by [bumpy](https://bumpy.varlock.dev) based on your bump files (in \`.bumpy/\`). Merge it when you are ready to release the packages listed below:`,
+			"<br clear=\"left\" />"
+		].join("\n")
+	}
+};
+function hasCascade(r) {
+	return "cascade" in r && Object.keys(r.cascade).length > 0;
+}
+//#endregion
+export { DEP_TYPES as a, maxBump as c, DEFAULT_PUBLISH_CONFIG as i, DEFAULT_BUMP_RULES as n, bumpLevel as o, DEFAULT_CONFIG as r, hasCascade as s, BUMP_LEVELS as t };

package/dist/{version-BXrP4TIO.mjs → version-DLU0h1cq.mjs}

@@ -1,13 +1,13 @@
 import { n as log, t as colorize } from "./logger-C2dEe5Su.mjs";
-import { a as loadConfig } from "./config-D7Umr-fT.mjs";
-import { n as detectWorkspaces } from "./package-manager-ByJ0wKYh.mjs";
-import { t as discoverPackages } from "./workspace-BHsAPUmC.mjs";
-import { t as DependencyGraph } from "./dep-graph-DiLeAhl9.mjs";
-import { n as runArgs, s as tryRunArgs } from "./shell-CY7OD48z.mjs";
-import { r as readBumpFiles } from "./bump-file-C3S_bzSf.mjs";
-import { t as assembleReleasePlan } from "./release-plan-CNOuSI-d.mjs";
-import { t as applyReleasePlan } from "./apply-release-plan-B1Wwx3HG.mjs";
-import { t as resolveCommitMessage } from "./commit-message-BwsowSds.mjs";
+import { a as loadConfig } from "./config-D13G4-R8.mjs";
+import { n as detectWorkspaces } from "./package-manager-CClZtIHP.mjs";
+import { t as discoverPackages } from "./workspace-BKOAMeki.mjs";
+import { t as DependencyGraph } from "./dep-graph-E-9-eQ2J.mjs";
+import { n as runArgs, s as tryRunArgs } from "./shell-u3bYGxNy.mjs";
+import { r as readBumpFiles } from "./bump-file-CoaSxqne.mjs";
+import { t as assembleReleasePlan } from "./release-plan-RBjKmavL.mjs";
+import { t as applyReleasePlan } from "./apply-release-plan-BvZ32LAm.mjs";
+import { t as resolveCommitMessage } from "./commit-message-DOIfDxfj.mjs";
 //#region src/commands/version.ts
 async function versionCommand(rootDir, opts = {}) {
 	const config = await loadConfig(rootDir);

package/dist/{workspace-BHsAPUmC.mjs → workspace-BKOAMeki.mjs}

@@ -1,6 +1,6 @@
 import { a as readJson, n as exists } from "./fs-DnDogVn-.mjs";
-import { i as isPackageManaged, o as loadPackageConfig } from "./config-D7Umr-fT.mjs";
-import { n as detectWorkspaces } from "./package-manager-ByJ0wKYh.mjs";
+import { i as isPackageManaged, o as loadPackageConfig } from "./config-D13G4-R8.mjs";
+import { n as detectWorkspaces } from "./package-manager-CClZtIHP.mjs";
 import { relative, resolve } from "node:path";
 import { readdir, stat } from "node:fs/promises";
 //#region src/core/workspace.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlock/bumpy",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "Modern monorepo versioning and changelog tool",
   "keywords": [
     "bump",

package/dist/apply-release-plan-B1Wwx3HG.mjs

@@ -1,146 +0,0 @@
-import { n as log } from "./logger-C2dEe5Su.mjs";
-import { a as readJson, c as removeFile, f as writeText, i as listFiles, l as updateJsonFields, n as exists, s as readText, u as updateJsonNestedField } from "./fs-DnDogVn-.mjs";
-import { r as getBumpyDir } from "./config-D7Umr-fT.mjs";
-import { relative, resolve } from "node:path";
-import { realpathSync } from "node:fs";
-//#region src/core/changelog.ts
-/** Default formatter — version heading, date, bullet points */
-const defaultFormatter = (ctx) => {
-	const { release, bumpFiles, date } = ctx;
-	const lines = [];
-	lines.push(`## ${release.newVersion}`);
-	lines.push("");
-	lines.push(`_${date}_`);
-	lines.push("");
-	const relevantBumpFiles = bumpFiles.filter((bf) => release.bumpFiles.includes(bf.id));
-	if (relevantBumpFiles.length > 0) {
-		for (const bf of relevantBumpFiles) if (bf.summary) {
-			const summaryLines = bf.summary.split("\n");
-			lines.push(`- ${summaryLines[0]}`);
-			for (let i = 1; i < summaryLines.length; i++) if (summaryLines[i].trim()) lines.push(`  ${summaryLines[i]}`);
-		}
-	}
-	if (release.isDependencyBump && relevantBumpFiles.length === 0) lines.push("- Updated dependencies");
-	if (release.isCascadeBump && !release.isDependencyBump && relevantBumpFiles.length === 0) lines.push("- Version bump via cascade rule");
-	lines.push("");
-	return lines.join("\n");
-};
-const BUILTIN_FORMATTERS = {
-	default: defaultFormatter,
-	github: async () => {
-		const { createGithubFormatter } = await import("./changelog-github-DZSHX3Tb.mjs");
-		return createGithubFormatter();
-	}
-};
-/**
-* Load a changelog formatter from config.
-* Supports: "default", "./path/to/formatter.ts", or a module name.
-*/
-async function loadFormatter(changelog, rootDir) {
-	const [name, options] = Array.isArray(changelog) ? changelog : [changelog, {}];
-	if (name === "github") {
-		const { createGithubFormatter } = await import("./changelog-github-DZSHX3Tb.mjs");
-		return createGithubFormatter(options);
-	}
-	if (typeof name === "string" && BUILTIN_FORMATTERS[name]) {
-		const builtin = BUILTIN_FORMATTERS[name];
-		if (typeof builtin === "function" && builtin.length === 0) return builtin();
-		return builtin;
-	}
-	if (typeof name === "string") try {
-		let modulePath;
-		if (name.startsWith(".")) {
-			modulePath = resolve(rootDir, name);
-			try {
-				modulePath = realpathSync(modulePath);
-			} catch {}
-			const rel = relative(realpathSync(rootDir), modulePath);
-			if (rel.startsWith("..") || resolve("/", rel) === resolve("/")) throw new Error(`Changelog formatter path "${name}" resolves outside the project root`);
-		} else modulePath = name;
-		const mod = await import(modulePath);
-		const exported = mod.default || mod.changelogFormatter;
-		if (typeof exported === "function") {
-			const result = exported(options);
-			if (typeof result === "function") return result;
-			return exported;
-		}
-		throw new Error(`Changelog module "${name}" does not export a function`);
-	} catch (err) {
-		log.warn(`Failed to load changelog formatter "${name}": ${err instanceof Error ? err.message : err}`);
-		log.warn("Falling back to default formatter");
-		return defaultFormatter;
-	}
-	return defaultFormatter;
-}
-/** Generate a changelog entry using the configured formatter */
-async function generateChangelogEntry(release, bumpFiles, formatter = defaultFormatter, date = (/* @__PURE__ */ new Date()).toISOString().split("T")[0]) {
-	return formatter({
-		release,
-		bumpFiles,
-		date
-	});
-}
-/** Prepend a new entry to an existing CHANGELOG.md content */
-function prependToChangelog(existingContent, newEntry) {
-	const headerMatch = existingContent.match(/^# /m);
-	if (headerMatch && headerMatch.index !== void 0) {
-		const afterTitle = existingContent.indexOf("\n##");
-		if (afterTitle !== -1) return existingContent.slice(0, afterTitle + 1) + "\n" + newEntry + existingContent.slice(afterTitle + 1);
-		return existingContent.trimEnd() + "\n\n" + newEntry;
-	}
-	return "# Changelog\n\n" + newEntry;
-}
-//#endregion
-//#region src/core/apply-release-plan.ts
-/** Apply the release plan: bump versions, update changelogs, delete bump files */
-async function applyReleasePlan(releasePlan, packages, rootDir, config) {
-	const releaseMap = new Map(releasePlan.releases.map((r) => [r.name, r]));
-	const formatter = config.changelog !== false ? await loadFormatter(config.changelog, rootDir) : null;
-	for (const release of releasePlan.releases) {
-		const pkgJsonPath = resolve(packages.get(release.name).dir, "package.json");
-		const pkgJson = await readJson(pkgJsonPath);
-		await updateJsonFields(pkgJsonPath, { version: release.newVersion });
-		for (const depField of [
-			"dependencies",
-			"devDependencies",
-			"peerDependencies",
-			"optionalDependencies"
-		]) {
-			const deps = pkgJson[depField];
-			if (!deps) continue;
-			for (const [depName, range] of Object.entries(deps)) {
-				const depRelease = releaseMap.get(depName);
-				if (!depRelease) continue;
-				await updateJsonNestedField(pkgJsonPath, depField, depName, updateRange(range, depRelease.newVersion));
-			}
-		}
-	}
-	if (formatter) for (const release of releasePlan.releases) {
-		const changelogPath = resolve(packages.get(release.name).dir, "CHANGELOG.md");
-		const entry = await generateChangelogEntry(release, releasePlan.bumpFiles, formatter);
-		let existingContent = "";
-		if (await exists(changelogPath)) existingContent = await readText(changelogPath);
-		await writeText(changelogPath, prependToChangelog(existingContent, entry));
-	}
-	const bumpyDir = getBumpyDir(rootDir);
-	const allBumpFiles = await listFiles(bumpyDir, ".md");
-	for (const file of allBumpFiles) {
-		if (file === "README.md") continue;
-		await removeFile(resolve(bumpyDir, file));
-	}
-}
-/** Update a version range to include a new version, preserving the range prefix */
-function updateRange(range, newVersion) {
-	let protocol = "";
-	let cleanRange = range;
-	const protoMatch = range.match(/^(workspace:|catalog:)/);
-	if (protoMatch) {
-		protocol = protoMatch[1];
-		cleanRange = range.slice(protocol.length);
-	}
-	const prefix = cleanRange.match(/^(\^|~|>=|>|<=|<|=)?/)?.[1] ?? "^";
-	if (cleanRange === "*" || cleanRange === "" || cleanRange === "^" || cleanRange === "~") return range;
-	return `${protocol}${prefix}${newVersion}`;
-}
-//#endregion
-export { prependToChangelog as a, loadFormatter as i, defaultFormatter as n, generateChangelogEntry as r, applyReleasePlan as t };