@varlock/bumpy 0.0.2 → 1.1.0

package/dist/commit-message-BwsowSds.mjs

@@ -0,0 +1,23 @@
+import { resolve } from "node:path";
+//#region src/core/commit-message.ts
+/** Build the default version commit message */
+function defaultCommitMessage(plan) {
+	return [
+		"Version packages",
+		"",
+		...plan.releases.map((r) => `${r.name}@${r.newVersion}`)
+	].join("\n");
+}
+/** Resolve the commit message from config, falling back to the default */
+async function resolveCommitMessage(config, plan, rootDir) {
+	if (!config) return defaultCommitMessage(plan);
+	if (config.startsWith("./") || config.startsWith("../")) {
+		const mod = await import(resolve(rootDir, config));
+		const fn = mod.default ?? mod;
+		if (typeof fn !== "function") throw new Error(`versionCommitMessage module "${config}" must export a function`);
+		return fn(plan);
+	}
+	return config;
+}
+//#endregion
+export { resolveCommitMessage as t };

package/dist/{config-BkwIEaQg.mjs → config-B-Qg3DZH.mjs}

@@ -1,5 +1,5 @@
 import { a as __exportAll } from "./logger-C2dEe5Su.mjs";
-import { a as readJson, n as exists } from "./fs-0AtnPUUe.mjs";
+import { a as readJson, n as exists } from "./fs-DYR2XuFE.mjs";
 import { resolve } from "node:path";
 //#region src/types.ts
 const BUMP_LEVELS = {
@@ -10,16 +10,6 @@ const BUMP_LEVELS = {
 function bumpLevel(type) {
 	return BUMP_LEVELS[type];
 }
-function parseIsolatedBump(type) {
-	if (type.endsWith("-isolated")) return {
-		bump: type.replace("-isolated", ""),
-		isolated: true
-	};
-	return {
-		bump: type,
-		isolated: false
-	};
-}
 function maxBump(a, b) {
 	if (!a) return b;
 	return bumpLevel(a) >= bumpLevel(b) ? a : b;
@@ -31,12 +21,9 @@ const DEFAULT_BUMP_RULES = {
 	},
 	peerDependencies: {
 		trigger: "major",
-		bumpAs: "major"
-	},
-	devDependencies: {
-		trigger: "none",
-		bumpAs: "patch"
+		bumpAs: "match"
 	},
+	devDependencies: false,
 	optionalDependencies: {
 		trigger: "minor",
 		bumpAs: "patch"
@@ -57,7 +44,8 @@ const DEFAULT_PUBLISH_CONFIG = {
 const DEFAULT_CONFIG = {
 	baseBranch: "main",
 	access: "public",
-	commit: false,
+	versionCommitMessage: void 0,
+	changedFilePatterns: ["**"],
 	changelog: "default",
 	fixed: [],
 	linked: [],
@@ -69,6 +57,7 @@ const DEFAULT_CONFIG = {
 		version: false,
 		tag: false
 	},
+	allowCustomCommands: false,
 	packages: {},
 	publish: { ...DEFAULT_PUBLISH_CONFIG },
 	aggregateRelease: false,
@@ -80,9 +69,9 @@ const DEFAULT_CONFIG = {
 		title: "🐸 Versioned release",
 		branch: "bumpy/version-packages",
 		preamble: [
-			`<a href="https://github.com/dmno-dev/bumpy"><img src="https://raw.githubusercontent.com/dmno-dev/bumpy/main/images/frog-talking.png" alt="bumpy-frog" width="60" align="left" style="image-rendering: pixelated;" title="Hi! I'm bumpy!" /></a>`,
+			`<a href="https://bumpy.varlock.dev"><img src="https://raw.githubusercontent.com/dmno-dev/bumpy/main/images/frog-talking.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://github.com/dmno-dev/bumpy) based on your .bumpy changeset files. Merge it when you are ready to release the packages listed below:`,
+			`This PR was created and will be kept in sync by [bumpy](https://bumpy.varlock.dev) based on your .bumpy bump files. Merge it when you are ready to release the packages listed below:`,
 			"<br clear=\"left\" />"
 		].join("\n")
 	}
@@ -131,6 +120,20 @@ async function loadPackageConfig(pkgDir, rootConfig, pkgName) {
 		const pkg = await readJson(resolve(pkgDir, "package.json"));
 		if (pkg.bumpy && typeof pkg.bumpy === "object") pkgJsonConfig = pkg.bumpy;
 	} catch {}
+	const disallowedKeys = [
+		"buildCommand",
+		"publishCommand",
+		"checkPublished"
+	].filter((k) => pkgJsonConfig[k] != null);
+	if (disallowedKeys.length > 0 && !isCustomCommandAllowed(pkgName, rootConfig)) {
+		const fields = disallowedKeys.map((k) => `"${k}"`).join(", ");
+		throw new Error(`Package "${pkgName}" defines custom command(s) (${fields}) in its package.json "bumpy" config, but the root config does not allow this.
+Custom commands execute shell commands during publishing and must be explicitly enabled.
+
+To fix this, either:
+  1. Move the command(s) to .bumpy/_config.json under "packages" (always trusted)
+  2. Add "allowCustomCommands": true (or ["${pkgName}"]) to .bumpy/_config.json`);
+	}
 	return mergePackageConfig(rootPkgConfig, pkgJsonConfig);
 }
 /** Find a package config from the root config, supporting glob patterns */
@@ -175,10 +178,6 @@ function mergePackageConfig(...configs) {
 			...result.dependencyBumpRules,
 			...cfg.dependencyBumpRules
 		};
-		if (cfg.specificDependencyRules) result.specificDependencyRules = {
-			...result.specificDependencyRules,
-			...cfg.specificDependencyRules
-		};
 		if (cfg.cascadeTo) result.cascadeTo = {
 			...result.cascadeTo,
 			...cfg.cascadeTo
@@ -186,6 +185,13 @@ function mergePackageConfig(...configs) {
 	}
 	return result;
 }
+/** Check if a package is allowed to define custom commands via package.json */
+function isCustomCommandAllowed(pkgName, config) {
+	const { allowCustomCommands } = config;
+	if (allowCustomCommands === true) return true;
+	if (Array.isArray(allowCustomCommands)) return allowCustomCommands.some((pattern) => matchGlob(pkgName, pattern));
+	return false;
+}
 function getBumpyDir(rootDir) {
 	return resolve(rootDir, BUMPY_DIR);
 }
@@ -212,4 +218,4 @@ function isPackageManaged(pkgName, isPrivate, config, pkgBumpy) {
 	return true;
 }
 //#endregion
-export { loadConfig as a, BUMP_LEVELS as c, DEFAULT_PUBLISH_CONFIG as d, DEP_TYPES as f, parseIsolatedBump as g, maxBump as h, isPackageManaged as i, DEFAULT_BUMP_RULES as l, hasCascade as m, findRoot as n, loadPackageConfig as o, bumpLevel as p, getBumpyDir as r, matchGlob as s, config_exports as t, DEFAULT_CONFIG as u };
+export { loadConfig as a, BUMP_LEVELS as c, DEFAULT_PUBLISH_CONFIG as d, DEP_TYPES as f, maxBump as h, isPackageManaged as i, DEFAULT_BUMP_RULES as l, hasCascade as m, findRoot as n, loadPackageConfig as o, bumpLevel as p, getBumpyDir as r, matchGlob as s, config_exports as t, DEFAULT_CONFIG as u };

package/dist/fs-DYR2XuFE.mjs

@@ -0,0 +1,81 @@
+import { a as __exportAll } from "./logger-C2dEe5Su.mjs";
+import { access, mkdir, readFile, readdir, unlink, writeFile } from "node:fs/promises";
+//#region src/utils/fs.ts
+var fs_exports = /* @__PURE__ */ __exportAll({
+	ensureDir: () => ensureDir,
+	exists: () => exists,
+	listFiles: () => listFiles,
+	readJson: () => readJson,
+	readText: () => readText,
+	removeFile: () => removeFile,
+	updateJsonFields: () => updateJsonFields,
+	updateJsonNestedField: () => updateJsonNestedField,
+	writeJson: () => writeJson,
+	writeText: () => writeText
+});
+async function readJson(filePath) {
+	const content = await readFile(filePath, "utf-8");
+	return JSON.parse(content);
+}
+async function writeJson(filePath, data, indent = 2) {
+	await writeFile(filePath, JSON.stringify(data, null, indent) + "\n", "utf-8");
+}
+/**
+* Update specific top-level string fields in a JSON file without reformatting.
+* Reads the raw text, does targeted regex replacements, and writes it back.
+*/
+async function updateJsonFields(filePath, updates) {
+	let content = await readFile(filePath, "utf-8");
+	for (const [key, newValue] of Object.entries(updates)) {
+		const escaped = key.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+		const pattern = new RegExp(`("${escaped}"\\s*:\\s*)"[^"]*"`);
+		content = content.replace(pattern, `$1"${newValue}"`);
+	}
+	await writeFile(filePath, content, "utf-8");
+}
+/**
+* Update a nested string field inside a top-level object in a JSON file without reformatting.
+* e.g., updateJsonNestedField(path, 'dependencies', 'core', '^2.0.0')
+*/
+async function updateJsonNestedField(filePath, parentKey, childKey, newValue) {
+	let content = await readFile(filePath, "utf-8");
+	const parentEscaped = parentKey.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+	const childEscaped = childKey.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+	const parentPattern = new RegExp(`("${parentEscaped}"\\s*:\\s*\\{)([^}]*)\\}`, "s");
+	content = content.replace(parentPattern, (match, prefix, body) => {
+		const childPattern = new RegExp(`("${childEscaped}"\\s*:\\s*)"[^"]*"`);
+		return `${prefix}${body.replace(childPattern, `$1"${newValue}"`)}}`;
+	});
+	await writeFile(filePath, content, "utf-8");
+}
+async function readText(filePath) {
+	return readFile(filePath, "utf-8");
+}
+async function writeText(filePath, content) {
+	await writeFile(filePath, content, "utf-8");
+}
+async function exists(filePath) {
+	try {
+		await access(filePath);
+		return true;
+	} catch {
+		return false;
+	}
+}
+async function listFiles(dir, ext) {
+	try {
+		const entries = await readdir(dir);
+		if (ext) return entries.filter((e) => e.endsWith(ext));
+		return entries;
+	} catch {
+		return [];
+	}
+}
+async function removeFile(filePath) {
+	await unlink(filePath);
+}
+async function ensureDir(dir) {
+	await mkdir(dir, { recursive: true });
+}
+//#endregion
+export { readJson as a, updateJsonFields as c, writeText as d, listFiles as i, updateJsonNestedField as l, exists as n, readText as o, fs_exports as r, removeFile as s, ensureDir as t, writeJson as u };

package/dist/generate-DX46X-rW.mjs

@@ -0,0 +1,186 @@
+import { n as log, t as colorize } from "./logger-C2dEe5Su.mjs";
+import { t as ensureDir } from "./fs-DYR2XuFE.mjs";
+import { a as loadConfig, r as getBumpyDir } from "./config-B-Qg3DZH.mjs";
+import { t as discoverPackages } from "./workspace-DWXlwcH4.mjs";
+import { s as tryRunArgs } from "./shell-CY7OD48z.mjs";
+import { i as writeBumpFile } from "./bump-file-DVqR3k67.mjs";
+import { i as getFilesChangedInCommit, n as getBranchCommits } from "./git-YDedMddc.mjs";
+import { n as slugify, t as randomName } from "./names-C-TuOPbd.mjs";
+import { relative } from "node:path";
+//#region src/commands/generate.ts
+const BUMP_MAP = {
+	feat: "minor",
+	fix: "patch",
+	perf: "patch",
+	refactor: "patch",
+	docs: "patch",
+	style: "patch",
+	test: "patch",
+	build: "patch",
+	ci: "patch",
+	chore: "patch"
+};
+async function generateCommand(rootDir, opts) {
+	const config = await loadConfig(rootDir);
+	const packages = await discoverPackages(rootDir, config);
+	let commits;
+	if (opts.from) {
+		log.step(`Scanning commits from ${colorize(opts.from, "cyan")}...`);
+		const rawLog = tryRunArgs([
+			"git",
+			"log",
+			`${opts.from}..HEAD`,
+			"--format=%H%n%s%n%b%n---END---"
+		], { cwd: rootDir });
+		if (!rawLog) {
+			log.info("No commits found since " + opts.from);
+			return;
+		}
+		commits = parseGitLog(rawLog);
+	} else {
+		log.step(`Scanning commits on this branch (vs ${colorize(config.baseBranch, "cyan")})...`);
+		commits = getBranchCommits(rootDir, config.baseBranch);
+	}
+	if (commits.length === 0) {
+		log.info("No commits found on this branch.");
+		return;
+	}
+	log.dim(`  Found ${commits.length} commit(s)`);
+	const scopeMap = buildScopeMap(packages, config);
+	const releaseMap = /* @__PURE__ */ new Map();
+	let ccCount = 0;
+	let fileBasedCount = 0;
+	for (const commit of commits) {
+		const cc = parseConventionalCommit(commit);
+		if (cc) {
+			ccCount++;
+			const bump = cc.breaking ? "major" : BUMP_MAP[cc.type] || "patch";
+			let pkgNames = [];
+			if (cc.scope) {
+				const resolved = resolveScope(cc.scope, scopeMap, packages);
+				if (resolved.length > 0) pkgNames = resolved;
+			}
+			if (pkgNames.length > 0) {
+				for (const name of pkgNames) mergeRelease(releaseMap, name, bump, cc.description);
+				continue;
+			}
+			const touchedPkgs = mapFilesToPackages(getFilesChangedInCommit(commit.hash, { cwd: rootDir }), packages, rootDir);
+			if (touchedPkgs.length > 0) for (const name of touchedPkgs) mergeRelease(releaseMap, name, bump, cc.description);
+			else log.dim(`  Skipping CC (no matching packages): ${cc.type}: ${cc.description}`);
+		} else {
+			const touchedPkgs = mapFilesToPackages(getFilesChangedInCommit(commit.hash, { cwd: rootDir }), packages, rootDir);
+			if (touchedPkgs.length > 0) {
+				fileBasedCount++;
+				for (const name of touchedPkgs) mergeRelease(releaseMap, name, "patch", commit.subject);
+			} else log.dim(`  Skipping (no matching packages): ${commit.subject}`);
+		}
+	}
+	if (ccCount > 0) log.dim(`  ${ccCount} conventional commit(s)`);
+	if (fileBasedCount > 0) log.dim(`  ${fileBasedCount} commit(s) detected via changed files`);
+	if (releaseMap.size === 0) {
+		log.info("No package bumps detected from commits.");
+		return;
+	}
+	const releases = [];
+	const summaryLines = [];
+	for (const [name, info] of releaseMap) {
+		releases.push({
+			name,
+			type: info.type
+		});
+		for (const msg of info.messages) summaryLines.push(`- ${name}: ${msg}`);
+	}
+	if (opts.dryRun) {
+		log.bold("Would create bump file:");
+		for (const r of releases) console.log(`  ${r.name}: ${colorize(r.type, r.type === "major" ? "red" : r.type === "minor" ? "yellow" : "green")}`);
+		console.log();
+		log.dim("Summary:");
+		for (const line of summaryLines) log.dim(`  ${line}`);
+		return;
+	}
+	await ensureDir(getBumpyDir(rootDir));
+	const filename = opts.name ? slugify(opts.name) : randomName();
+	await writeBumpFile(rootDir, filename, releases, summaryLines.join("\n"));
+	log.success(`🐸 Created bump file: .bumpy/${filename}.md`);
+	for (const r of releases) log.dim(`  ${r.name}: ${r.type}`);
+}
+/** Merge a bump into the release map, keeping the highest bump level */
+function mergeRelease(releaseMap, name, bump, message) {
+	const existing = releaseMap.get(name);
+	if (existing) {
+		if (bumpPriority(bump) > bumpPriority(existing.type)) existing.type = bump;
+		existing.messages.push(message);
+	} else releaseMap.set(name, {
+		type: bump,
+		messages: [message]
+	});
+}
+/** Map file paths to package names based on directory containment */
+function mapFilesToPackages(files, packages, rootDir) {
+	const matched = /* @__PURE__ */ new Set();
+	for (const file of files) for (const [name, pkg] of packages) {
+		const pkgRelDir = relative(rootDir, pkg.dir);
+		if (file.startsWith(pkgRelDir + "/")) matched.add(name);
+	}
+	return [...matched];
+}
+/** Parse raw git log output into individual commits */
+function parseGitLog(raw) {
+	const commits = [];
+	const entries = raw.split("---END---").filter((e) => e.trim());
+	for (const entry of entries) {
+		const lines = entry.trim().split("\n");
+		if (lines.length < 2) continue;
+		commits.push({
+			hash: lines[0].trim(),
+			subject: lines[1].trim(),
+			body: lines.slice(2).join("\n").trim()
+		});
+	}
+	return commits;
+}
+/** Parse a commit subject into conventional commit format */
+function parseConventionalCommit(commit) {
+	const match = commit.subject.match(/^(\w+)(!)?(?:\(([^)]+)\))?(!)?\s*:\s*(.+)$/);
+	if (!match) return null;
+	const [, type, bang1, scope, bang2, description] = match;
+	const breaking = !!bang1 || !!bang2 || commit.body.includes("BREAKING CHANGE");
+	return {
+		hash: commit.hash,
+		type: type.toLowerCase(),
+		scope: scope || null,
+		breaking,
+		description: description.trim(),
+		body: commit.body
+	};
+}
+/** Build a map of scope aliases → package names from config and package names */
+function buildScopeMap(packages, _config) {
+	const map = /* @__PURE__ */ new Map();
+	for (const [name, pkg] of packages) {
+		const shortName = name.includes("/") ? name.split("/").pop() : name;
+		if (!map.has(shortName)) map.set(shortName, []);
+		map.get(shortName).push(name);
+		if (!map.has(name)) map.set(name, []);
+		map.get(name).push(name);
+		const dirName = pkg.relativeDir.split("/").pop();
+		if (dirName !== shortName) {
+			if (!map.has(dirName)) map.set(dirName, []);
+			map.get(dirName).push(name);
+		}
+	}
+	return map;
+}
+/** Resolve a scope string to package name(s) */
+function resolveScope(scope, scopeMap, packages) {
+	const mapped = scopeMap.get(scope);
+	if (mapped) return [...new Set(mapped)];
+	for (const [key, value] of scopeMap) if (key.toLowerCase() === scope.toLowerCase()) return [...new Set(value)];
+	if (packages.has(scope)) return [scope];
+	return [];
+}
+function bumpPriority(type) {
+	return type === "major" ? 2 : type === "minor" ? 1 : 0;
+}
+//#endregion
+export { generateCommand };

package/dist/{git-CGHVXXKw.mjs → git-YDedMddc.mjs}

@@ -1,4 +1,4 @@
-import { o as tryRunArgs, t as runArgs } from "./shell-Dj7JRD_q.mjs";
+import { n as runArgs, s as tryRunArgs } from "./shell-CY7OD48z.mjs";
 //#region src/core/git.ts
 /** Create a git tag */
 function createTag(tag, opts) {
@@ -63,6 +63,58 @@ function getChangedFiles(rootDir, baseBranch) {
 	if (!diff) return [];
 	return diff.split("\n").filter(Boolean);
 }
+/** Get commits on the current branch since it diverged from baseBranch */
+function getBranchCommits(rootDir, baseBranch) {
+	if (!tryRunArgs([
+		"git",
+		"rev-parse",
+		"--verify",
+		`origin/${baseBranch}`
+	], { cwd: rootDir })) tryRunArgs([
+		"git",
+		"fetch",
+		"origin",
+		baseBranch,
+		"--depth=1"
+	], { cwd: rootDir });
+	const rawLog = tryRunArgs([
+		"git",
+		"log",
+		`${tryRunArgs([
+			"git",
+			"merge-base",
+			"HEAD",
+			`origin/${baseBranch}`
+		], { cwd: rootDir }) || `origin/${baseBranch}`}..HEAD`,
+		"--format=%H%n%s%n%b%n---END---"
+	], { cwd: rootDir });
+	if (!rawLog) return [];
+	const commits = [];
+	const entries = rawLog.split("---END---").filter((e) => e.trim());
+	for (const entry of entries) {
+		const lines = entry.trim().split("\n");
+		if (lines.length < 2) continue;
+		commits.push({
+			hash: lines[0].trim(),
+			subject: lines[1].trim(),
+			body: lines.slice(2).join("\n").trim()
+		});
+	}
+	return commits;
+}
+/** Get files changed in a specific commit */
+function getFilesChangedInCommit(hash, opts) {
+	const result = tryRunArgs([
+		"git",
+		"diff-tree",
+		"--no-commit-id",
+		"--name-only",
+		"-r",
+		hash
+	], opts);
+	if (!result) return [];
+	return result.split("\n").filter(Boolean);
+}
 /** Get all tags matching a pattern */
 function listTags(pattern, opts) {
 	const result = tryRunArgs([
@@ -75,4 +127,4 @@ function listTags(pattern, opts) {
 	return result.split("\n").filter(Boolean);
 }
 //#endregion
-export { pushWithTags as a, listTags as i, getChangedFiles as n, tagExists as o, hasUncommittedChanges as r, createTag as t };
+export { hasUncommittedChanges as a, tagExists as c, getFilesChangedInCommit as i, getBranchCommits as n, listTags as o, getChangedFiles as r, pushWithTags as s, createTag as t };