@varlock/bumpy 0.0.1 → 0.0.2

package/dist/add-BjyVIUlr.mjs

@@ -0,0 +1,175 @@
+import { n as log, o as __toESM, r as require_picocolors } from "./logger-C2dEe5Su.mjs";
+import { n as exists, t as ensureDir } from "./fs-0AtnPUUe.mjs";
+import { a as loadConfig, r as getBumpyDir, s as matchGlob } from "./config-BkwIEaQg.mjs";
+import { t as discoverPackages } from "./workspace-CxEKakDm.mjs";
+import { t as DependencyGraph } from "./dep-graph-E-9-eQ2J.mjs";
+import { i as writeChangeset } from "./changeset-UCZdSRDv.mjs";
+import { c as ot, d as yt, i as _t, l as pt, o as gt, r as Ot, s as mt, t as unwrap, u as wt } from "./clack-CDRCHrC-.mjs";
+import { n as slugify, t as randomName } from "./names-Ck8cun7B.mjs";
+import { resolve } from "node:path";
+//#region src/commands/add.ts
+var import_picocolors = /* @__PURE__ */ __toESM(require_picocolors(), 1);
+const BUMP_CHOICES = [
+	{
+		label: "patch",
+		value: "patch"
+	},
+	{
+		label: "minor",
+		value: "minor"
+	},
+	{
+		label: "major",
+		value: "major"
+	},
+	{
+		label: "patch (isolated)",
+		value: "patch-isolated",
+		hint: "no cascade"
+	},
+	{
+		label: "minor (isolated)",
+		value: "minor-isolated",
+		hint: "no cascade"
+	}
+];
+const CASCADE_CHOICES = [
+	{
+		label: "patch",
+		value: "patch"
+	},
+	{
+		label: "minor",
+		value: "minor"
+	},
+	{
+		label: "major",
+		value: "major"
+	}
+];
+async function addCommand(rootDir, opts) {
+	const config = await loadConfig(rootDir);
+	const bumpyDir = getBumpyDir(rootDir);
+	await ensureDir(bumpyDir);
+	if (opts.empty) {
+		const filename = opts.name ? slugify(opts.name) : randomName();
+		const filePath = resolve(bumpyDir, `${filename}.md`);
+		const { writeText } = await import("./fs-0AtnPUUe.mjs").then((n) => n.r);
+		await writeText(filePath, "---\n---\n");
+		log.success(`Created empty changeset: .bumpy/${filename}.md`);
+		return;
+	}
+	let releases;
+	let summary;
+	let filename;
+	if (opts.packages) {
+		releases = parsePackagesFlag(opts.packages);
+		summary = opts.message || "";
+		filename = opts.name ? slugify(opts.name) : randomName();
+	} else {
+		mt(import_picocolors.default.bgCyan(import_picocolors.default.black(" bumpy add ")));
+		const pkgs = await discoverPackages(rootDir, config);
+		const depGraph = new DependencyGraph(pkgs);
+		if (pkgs.size === 0) {
+			pt("No managed packages found in this workspace.");
+			process.exit(1);
+		}
+		const selected = unwrap(await yt({
+			message: "Which packages should be included in this changeset?",
+			options: [...pkgs.values()].map((pkg) => ({
+				label: pkg.name,
+				value: pkg.name,
+				hint: pkg.version
+			})),
+			required: true
+		}));
+		releases = [];
+		for (const name of selected) {
+			const bumpType = unwrap(await _t({
+				message: `Bump type for ${import_picocolors.default.cyan(name)}`,
+				options: BUMP_CHOICES
+			}));
+			const release = {
+				name,
+				type: bumpType
+			};
+			if (!bumpType.endsWith("-isolated")) {
+				const dependents = depGraph.getDependents(name);
+				const cascadeTargets = pkgs.get(name).bumpy?.cascadeTo;
+				if (dependents.length > 0 || cascadeTargets) {
+					if (unwrap(await ot({
+						message: `${import_picocolors.default.cyan(name)} has ${import_picocolors.default.bold(String(dependents.length))} dependents. Specify explicit cascades?`,
+						initialValue: false
+					}))) {
+						const allTargets = /* @__PURE__ */ new Set();
+						for (const d of dependents) allTargets.add(d.name);
+						if (cascadeTargets) {
+							for (const pattern of Object.keys(cascadeTargets)) for (const [pName] of pkgs) if (matchGlob(pName, pattern)) allTargets.add(pName);
+						}
+						const cascadeSelected = unwrap(await yt({
+							message: "Which packages should cascade?",
+							options: [...allTargets].map((n) => ({
+								label: n,
+								value: n
+							})),
+							required: false
+						}));
+						if (cascadeSelected.length > 0) {
+							const cascadeBump = unwrap(await _t({
+								message: "Cascade bump type",
+								options: CASCADE_CHOICES
+							}));
+							const cascade = {};
+							for (const target of cascadeSelected) cascade[target] = cascadeBump;
+							release.cascade = cascade;
+						}
+					}
+				}
+			}
+			releases.push(release);
+		}
+		summary = unwrap(await Ot({
+			message: "Summary (what changed and why)",
+			placeholder: "A short description of the change",
+			validate: (value) => {
+				if (!value || !value.trim()) return "Summary is required";
+			}
+		}));
+		const defaultName = randomName();
+		filename = slugify(unwrap(await Ot({
+			message: "Changeset name",
+			placeholder: defaultName,
+			defaultValue: defaultName,
+			validate: (value) => {
+				if (!value) return void 0;
+				if (!slugify(value)) return "Name must contain at least one alphanumeric character";
+			}
+		}))) || defaultName;
+	}
+	if (await exists(resolve(bumpyDir, `${filename}.md`))) filename = `${filename}-${Date.now()}`;
+	await writeChangeset(rootDir, filename, releases, summary);
+	if (opts.packages) {
+		log.success(`Created changeset: .bumpy/${filename}.md`);
+		for (const r of releases) log.dim(`  ${r.name}: ${r.type}${formatCascade(r)}`);
+	} else {
+		wt(releases.map((r) => `${import_picocolors.default.cyan(r.name)} ${import_picocolors.default.dim("→")} ${import_picocolors.default.bold(r.type)}${formatCascade(r)}`).join("\n"), "Changeset");
+		gt(import_picocolors.default.green(`Created .bumpy/${filename}.md`));
+	}
+}
+function formatCascade(r) {
+	if (!("cascade" in r) || Object.keys(r.cascade).length === 0) return "";
+	const parts = Object.entries(r.cascade).map(([k, v]) => `${k}:${v}`);
+	return import_picocolors.default.dim(` (cascade: ${parts.join(", ")})`);
+}
+function parsePackagesFlag(input) {
+	return input.split(",").map((entry) => {
+		const [name, type] = entry.trim().split(":");
+		if (!name || !type) throw new Error(`Invalid package format: "${entry}". Expected "name:bumpType"`);
+		return {
+			name: name.trim(),
+			type: type.trim()
+		};
+	});
+}
+//#endregion
+export { addCommand };

package/dist/{ai-B8ZL2x8z.mjs → ai-CQhUyHAG.mjs}

@@ -1,5 +1,5 @@
-import { n as log } from "./logger-ZqggsyGZ.mjs";
-import { l as writeText, n as exists, t as ensureDir } from "./fs-DbNNEyzq.mjs";
+import { n as log } from "./logger-C2dEe5Su.mjs";
+import { l as writeText, n as exists, t as ensureDir } from "./fs-0AtnPUUe.mjs";
 import { dirname, resolve } from "node:path";
 import { readFile } from "node:fs/promises";
 import { fileURLToPath } from "node:url";

package/dist/{apply-release-plan-DtU3rVyL.mjs → apply-release-plan-D6TSrcwX.mjs}

@@ -1,6 +1,6 @@
-import { n as log } from "./logger-ZqggsyGZ.mjs";
-import { a as readJson, c as writeJson, l as writeText, n as exists, o as readText } from "./fs-DbNNEyzq.mjs";
-import { t as deleteChangesets } from "./changeset-ClCYsChu.mjs";
+import { n as log } from "./logger-C2dEe5Su.mjs";
+import { a as readJson, c as writeJson, l as writeText, n as exists, o as readText } from "./fs-0AtnPUUe.mjs";
+import { t as deleteChangesets } from "./changeset-UCZdSRDv.mjs";
 import { resolve } from "node:path";
 //#region src/core/changelog.ts
 /** Default formatter — version heading, date, bullet points */
@@ -27,7 +27,7 @@ const defaultFormatter = (ctx) => {
 const BUILTIN_FORMATTERS = {
 	default: defaultFormatter,
 	github: async () => {
-		const { createGithubFormatter } = await import("./changelog-github-n-3zV1p9.mjs");
+		const { createGithubFormatter } = await import("./changelog-github-Du62krXi.mjs");
 		return createGithubFormatter();
 	}
 };
@@ -43,11 +43,16 @@ async function loadFormatter(changelog, rootDir) {
 		return builtin;
 	}
 	if (name === "github") {
-		const { createGithubFormatter } = await import("./changelog-github-n-3zV1p9.mjs");
+		const { createGithubFormatter } = await import("./changelog-github-Du62krXi.mjs");
 		return createGithubFormatter(options);
 	}
 	if (typeof name === "string") try {
-		const mod = await (name.startsWith(".") ? import(resolve(rootDir, name)) : import(name));
+		let modulePath;
+		if (name.startsWith(".")) {
+			modulePath = resolve(rootDir, name);
+			if (!modulePath.startsWith(rootDir + "/")) 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);

package/dist/changelog-github-Du62krXi.mjs

@@ -0,0 +1,193 @@
+import { o as tryRunArgs } from "./shell-Dj7JRD_q.mjs";
+//#region src/core/changelog-github.ts
+/**
+* GitHub-enhanced changelog formatter.
+* Adds PR links, commit links, and contributor attribution when git/gh info is available.
+*
+* Usage in config:
+*   "changelog": "github"
+*   "changelog": ["github", { "repo": "dmno-dev/bumpy" }]
+*   "changelog": ["github", { "repo": "dmno-dev/bumpy", "internalAuthors": ["theoephraim"] }]
+*/
+function createGithubFormatter(options = {}) {
+	const internalAuthorsSet = new Set((options.internalAuthors ?? []).map((a) => a.toLowerCase()));
+	return async (ctx) => {
+		const { release, changesets, date } = ctx;
+		const repoSlug = options.repo ?? detectRepo();
+		const serverUrl = process.env.GITHUB_SERVER_URL || "https://github.com";
+		const lines = [];
+		lines.push(`## ${release.newVersion}`);
+		lines.push("");
+		lines.push(`_${date}_`);
+		lines.push("");
+		const relevantChangesets = changesets.filter((cs) => release.changesets.includes(cs.id));
+		if (relevantChangesets.length > 0) for (const cs of relevantChangesets) {
+			if (!cs.summary) continue;
+			const { cleanSummary, overrides } = extractSummaryMeta(cs.summary);
+			const gitInfo = resolveChangesetInfo(cs.id, repoSlug, serverUrl, overrides);
+			const summaryLines = cleanSummary.split("\n");
+			const firstLine = linkifyIssueRefs(summaryLines[0], serverUrl, repoSlug);
+			const prefix = formatPrefix(gitInfo, serverUrl, repoSlug, internalAuthorsSet);
+			lines.push(`-${prefix ? ` ${prefix} -` : ""} ${firstLine}`);
+			for (let i = 1; i < summaryLines.length; i++) if (summaryLines[i].trim()) lines.push(`  ${linkifyIssueRefs(summaryLines[i], serverUrl, repoSlug)}`);
+		}
+		if (release.isDependencyBump && relevantChangesets.length === 0) lines.push("- Updated dependencies");
+		if (release.isCascadeBump && !release.isDependencyBump && relevantChangesets.length === 0) lines.push("- Version bump via cascade rule");
+		lines.push("");
+		return lines.join("\n");
+	};
+}
+/**
+* Extract metadata lines (pr, commit, author) from a changeset summary.
+* These override git-derived info, matching the behavior of @changesets/changelog-github.
+*/
+function extractSummaryMeta(summary) {
+	const overrides = {};
+	return {
+		cleanSummary: summary.replace(/^\s*(?:pr|pull|pull\s+request):\s*#?(\d+)/im, (_, pr) => {
+			const num = Number(pr);
+			if (!isNaN(num)) overrides.pr = num;
+			return "";
+		}).replace(/^\s*commit:\s*([^\s]+)/im, (_, commit) => {
+			overrides.commit = commit;
+			return "";
+		}).replace(/^\s*(?:author|user):\s*@?([^\s]+)/gim, (_, user) => {
+			overrides.authors ??= [];
+			overrides.authors.push(user);
+			return "";
+		}).trim(),
+		overrides
+	};
+}
+/**
+* Resolve PR, commit, and author info for a changeset.
+* Summary overrides take precedence over git-derived info.
+*/
+function resolveChangesetInfo(changesetId, repo, serverUrl, overrides) {
+	if (overrides.pr !== void 0) {
+		const prInfo = lookupPr(overrides.pr, repo);
+		return {
+			prNumber: overrides.pr,
+			prUrl: prInfo?.url ?? `${serverUrl}/${repo}/pull/${overrides.pr}`,
+			commitHash: overrides.commit ?? prInfo?.commitHash,
+			author: overrides.authors?.[0] ?? prInfo?.author
+		};
+	}
+	const gitInfo = findChangesetCommitInfo(changesetId, repo);
+	return {
+		prNumber: gitInfo?.prNumber,
+		prUrl: gitInfo?.prUrl,
+		commitHash: overrides.commit ?? gitInfo?.commitHash,
+		author: overrides.authors?.[0] ?? gitInfo?.author
+	};
+}
+/** Look up a PR by number using gh CLI */
+function lookupPr(prNumber, repo) {
+	try {
+		const ghArgs = [
+			"gh",
+			"pr",
+			"view",
+			String(prNumber),
+			"--json",
+			"url,author,mergeCommit"
+		];
+		if (repo) ghArgs.push("--repo", repo);
+		const result = tryRunArgs(ghArgs);
+		if (!result) return null;
+		const pr = JSON.parse(result);
+		return {
+			url: pr.url,
+			author: pr.author?.login,
+			commitHash: pr.mergeCommit?.oid
+		};
+	} catch {
+		return null;
+	}
+}
+/**
+* Find the PR that introduced a changeset file by checking git log
+* for the commit that added the file, then looking up the PR.
+*/
+function findChangesetCommitInfo(changesetId, repo) {
+	try {
+		const commitOutput = tryRunArgs([
+			"git",
+			"log",
+			"--diff-filter=A",
+			"--format=%H",
+			"--",
+			`.bumpy/${changesetId}.md`,
+			`.changeset/${changesetId}.md`
+		]);
+		if (!commitOutput) return null;
+		const commitHash = commitOutput.split("\n")[0].trim();
+		if (!commitHash) return null;
+		const ghArgs = [
+			"gh",
+			"pr",
+			"list",
+			"--search",
+			commitHash,
+			"--state",
+			"merged",
+			"--json",
+			"number,url,author",
+			"--jq",
+			".[0]"
+		];
+		if (repo) ghArgs.push("--repo", repo);
+		const prJson = tryRunArgs(ghArgs);
+		if (!prJson) return { commitHash };
+		const pr = JSON.parse(prJson);
+		if (!pr.number) return { commitHash };
+		return {
+			prNumber: pr.number,
+			prUrl: pr.url,
+			commitHash,
+			author: pr.author?.login
+		};
+	} catch {
+		return null;
+	}
+}
+/**
+* Build the prefix portion of a changelog line: PR link, commit link, thanks.
+* Matches the format used by @changesets/changelog-github.
+*/
+function formatPrefix(info, serverUrl, repo, internalAuthors) {
+	const parts = [];
+	if (info.prNumber && info.prUrl) parts.push(`[#${info.prNumber}](${info.prUrl})`);
+	if (info.commitHash && repo) {
+		const short = info.commitHash.slice(0, 7);
+		parts.push(`[\`${short}\`](${serverUrl}/${repo}/commit/${info.commitHash})`);
+	}
+	if (info.author && !internalAuthors.has(info.author.toLowerCase())) parts.push(`Thanks [@${info.author}](${serverUrl}/${info.author})!`);
+	return parts.join(" ");
+}
+/**
+* Linkify bare issue/PR references like #123 in text,
+* but skip references already inside markdown links.
+*/
+function linkifyIssueRefs(line, serverUrl, repo) {
+	if (!repo) return line;
+	return line.replace(/\[.*?\]\(.*?\)|\B#([1-9]\d*)\b/g, (match, issue) => issue ? `[#${issue}](${serverUrl}/${repo}/issues/${issue})` : match);
+}
+/** Try to detect the repo slug from the gh CLI */
+function detectRepo() {
+	try {
+		return tryRunArgs([
+			"gh",
+			"repo",
+			"view",
+			"--json",
+			"nameWithOwner",
+			"--jq",
+			".nameWithOwner"
+		])?.trim() || void 0;
+	} catch {
+		return;
+	}
+}
+//#endregion
+export { createGithubFormatter };

package/dist/{changeset-ClCYsChu.mjs → changeset-UCZdSRDv.mjs}

@@ -1,9 +1,10 @@
-import { i as listFiles, l as writeText, o as readText, s as removeFile } from "./fs-DbNNEyzq.mjs";
-import { r as getBumpyDir } from "./config-CJ2orhTL.mjs";
+import { i as listFiles, l as writeText, o as readText, s as removeFile } from "./fs-0AtnPUUe.mjs";
+import { r as getBumpyDir } from "./config-BkwIEaQg.mjs";
 import { t as jsYaml } from "./js-yaml-DpZfOoD4.mjs";
+import { o as tryRunArgs } from "./shell-Dj7JRD_q.mjs";
 import { resolve } from "node:path";
 //#region src/core/changeset.ts
-/** Read all changeset files from .bumpy/ directory */
+/** Read all changeset files from .bumpy/ directory, sorted by git creation order */
 async function readChangesets(rootDir) {
 	const dir = getBumpyDir(rootDir);
 	const files = await listFiles(dir, ".md");
@@ -13,8 +14,40 @@ async function readChangesets(rootDir) {
 		const cs = await parseChangesetFile(resolve(dir, file));
 		if (cs) changesets.push(cs);
 	}
+	const creationOrder = getChangesetCreationOrder(rootDir);
+	if (creationOrder.size > 0) changesets.sort((a, b) => {
+		return (creationOrder.get(a.id) ?? Infinity) - (creationOrder.get(b.id) ?? Infinity) || a.id.localeCompare(b.id);
+	});
 	return changesets;
 }
+/**
+* Use `git log` to get the commit timestamp when each changeset file was first added.
+* Returns a map of changeset ID → unix timestamp (seconds).
+*/
+function getChangesetCreationOrder(rootDir) {
+	const order = /* @__PURE__ */ new Map();
+	const result = tryRunArgs([
+		"git",
+		"log",
+		"--diff-filter=A",
+		"--format=%at",
+		"--name-only",
+		"--",
+		".bumpy/*.md"
+	], { cwd: rootDir });
+	if (!result) return order;
+	let currentTimestamp = 0;
+	for (const line of result.split("\n")) {
+		const trimmed = line.trim();
+		if (!trimmed) continue;
+		if (/^\d+$/.test(trimmed)) currentTimestamp = parseInt(trimmed, 10);
+		else if (trimmed.startsWith(".bumpy/") && trimmed.endsWith(".md")) {
+			const id = trimmed.replace(/^\.bumpy\//, "").replace(/\.md$/, "");
+			order.set(id, currentTimestamp);
+		}
+	}
+	return order;
+}
 /** Parse a single changeset markdown file */
 async function parseChangesetFile(filePath) {
 	return parseChangeset(await readText(filePath), fileToId(filePath));

package/dist/{check-CkRubvuk.mjs → check-jIwike9F.mjs}

@@ -1,8 +1,8 @@
-import { n as log, t as colorize } from "./logger-ZqggsyGZ.mjs";
-import { a as loadConfig } from "./config-CJ2orhTL.mjs";
-import { n as discoverWorkspace } from "./workspace-mVjawG8g.mjs";
-import { r as readChangesets } from "./changeset-ClCYsChu.mjs";
-import { i as tryRun } from "./shell-DPlltpzb.mjs";
+import { n as log, t as colorize } from "./logger-C2dEe5Su.mjs";
+import { a as loadConfig } from "./config-BkwIEaQg.mjs";
+import { n as discoverWorkspace } from "./workspace-CxEKakDm.mjs";
+import { r as readChangesets } from "./changeset-UCZdSRDv.mjs";
+import { n as getChangedFiles } from "./git-CGHVXXKw.mjs";
 import { relative } from "node:path";
 //#region src/commands/check.ts
 /**
@@ -38,12 +38,6 @@ async function checkCommand(rootDir) {
 	log.dim("Run `bumpy add` to create a changeset, or `bumpy add --empty` if no release is needed.");
 	process.exit(1);
 }
-/** Get files changed on this branch compared to the base branch */
-function getChangedFiles(rootDir, baseBranch) {
-	const diff = tryRun(`git diff --name-only ${tryRun(`git merge-base HEAD origin/${baseBranch}`, { cwd: rootDir }) || `origin/${baseBranch}`}`, { cwd: rootDir });
-	if (!diff) return [];
-	return diff.split("\n").filter(Boolean);
-}
 /** Map changed files to the packages they belong to */
 function findChangedPackages(changedFiles, packages, rootDir) {
 	const changed = /* @__PURE__ */ new Set();