@bensandee/tooling 0.59.0 → 0.59.1

package/dist/bin.mjs

@@ -1330,6 +1330,11 @@ function buildWorkflowYaml(options) {
 function actionsExpr(expr) {
 	return `\${{ ${expr} }}`;
 }
+const MAIN_BRANCH_REF = "refs/heads/main";
+/** `if:` condition that gates a step to push events on the default branch. */
+const IS_MAIN_BRANCH = `github.ref == '${MAIN_BRANCH_REF}'`;
+/** Negated form for concurrency `cancel-in-progress` and similar uses. */
+const IS_NOT_MAIN_BRANCH = `github.ref != '${MAIN_BRANCH_REF}'`;
 function hasEnginesNode(ctx) {
 	const raw = ctx.read("package.json");
 	if (!raw) return false;
@@ -1473,7 +1478,7 @@ function hasReleaseAssets(ctx) {
 		return false;
 	}
 }
-const ARCHIVE_DIR$1 = ".tooling-archived";
+const ARCHIVE_DIR$2 = ".tooling-archived";
 async function generateDeployCi(ctx) {
 	const filePath = "deploy-ci";
 	if (!ctx.config.publishDocker || ctx.config.ci === "none") return {
@@ -1486,12 +1491,12 @@ async function generateDeployCi(ctx) {
 	if (ctx.config.releaseStrategy === "simple") {
 		const existing = ctx.read(workflowPath);
 		if (existing !== void 0) {
-			ctx.write(`${ARCHIVE_DIR$1}/${workflowPath}`, existing);
+			ctx.write(`${ARCHIVE_DIR$2}/${workflowPath}`, existing);
 			ctx.remove(workflowPath);
 			return {
 				filePath: workflowPath,
 				action: "archived",
-				description: `Moved to ${ARCHIVE_DIR$1}/${workflowPath} (docker publish runs in release.yml for simple strategy)`
+				description: `Moved to ${ARCHIVE_DIR$2}/${workflowPath} (docker publish runs in release.yml for simple strategy)`
 			};
 		}
 		return {
@@ -1593,7 +1598,7 @@ const PER_PACKAGE_DEV_DEPS = {
 		"tsdown": "0.22.0",
 		"typescript": "6.0.3",
 		"vitest": "4.1.5",
-		"pnpm": "11.1.1"
+		"pnpm": "11.1.2"
 	}["@types/node"],
 	tsdown: {
 		"@changesets/cli": "2.31.0",
@@ -1609,7 +1614,7 @@ const PER_PACKAGE_DEV_DEPS = {
 		"tsdown": "0.22.0",
 		"typescript": "6.0.3",
 		"vitest": "4.1.5",
-		"pnpm": "11.1.1"
+		"pnpm": "11.1.2"
 	}["tsdown"],
 	typescript: {
 		"@changesets/cli": "2.31.0",
@@ -1625,7 +1630,7 @@ const PER_PACKAGE_DEV_DEPS = {
 		"tsdown": "0.22.0",
 		"typescript": "6.0.3",
 		"vitest": "4.1.5",
-		"pnpm": "11.1.1"
+		"pnpm": "11.1.2"
 	}["typescript"],
 	vitest: {
 		"@changesets/cli": "2.31.0",
@@ -1641,7 +1646,7 @@ const PER_PACKAGE_DEV_DEPS = {
 		"tsdown": "0.22.0",
 		"typescript": "6.0.3",
 		"vitest": "4.1.5",
-		"pnpm": "11.1.1"
+		"pnpm": "11.1.2"
 	}["vitest"]
 };
 /** DevDeps that belong at the root regardless of structure. */
@@ -1660,7 +1665,7 @@ const ROOT_DEV_DEPS = {
 		"tsdown": "0.22.0",
 		"typescript": "6.0.3",
 		"vitest": "4.1.5",
-		"pnpm": "11.1.1"
+		"pnpm": "11.1.2"
 	}["knip"],
 	lefthook: {
 		"@changesets/cli": "2.31.0",
@@ -1676,7 +1681,7 @@ const ROOT_DEV_DEPS = {
 		"tsdown": "0.22.0",
 		"typescript": "6.0.3",
 		"vitest": "4.1.5",
-		"pnpm": "11.1.1"
+		"pnpm": "11.1.2"
 	}["lefthook"],
 	oxlint: {
 		"@changesets/cli": "2.31.0",
@@ -1692,7 +1697,7 @@ const ROOT_DEV_DEPS = {
 		"tsdown": "0.22.0",
 		"typescript": "6.0.3",
 		"vitest": "4.1.5",
-		"pnpm": "11.1.1"
+		"pnpm": "11.1.2"
 	}["oxlint"]
 };
 /**
@@ -1733,7 +1738,7 @@ function addReleaseDeps(deps, config) {
 				"tsdown": "0.22.0",
 				"typescript": "6.0.3",
 				"vitest": "4.1.5",
-				"pnpm": "11.1.1"
+				"pnpm": "11.1.2"
 			}["release-it"];
 			if (config.structure === "monorepo") deps["@release-it/bumper"] = {
 				"@changesets/cli": "2.31.0",
@@ -1749,7 +1754,7 @@ function addReleaseDeps(deps, config) {
 				"tsdown": "0.22.0",
 				"typescript": "6.0.3",
 				"vitest": "4.1.5",
-				"pnpm": "11.1.1"
+				"pnpm": "11.1.2"
 			}["@release-it/bumper"];
 			break;
 		case "simple":
@@ -1767,7 +1772,7 @@ function addReleaseDeps(deps, config) {
 				"tsdown": "0.22.0",
 				"typescript": "6.0.3",
 				"vitest": "4.1.5",
-				"pnpm": "11.1.1"
+				"pnpm": "11.1.2"
 			}["commit-and-tag-version"];
 			break;
 		case "changesets":
@@ -1785,7 +1790,7 @@ function addReleaseDeps(deps, config) {
 				"tsdown": "0.22.0",
 				"typescript": "6.0.3",
 				"vitest": "4.1.5",
-				"pnpm": "11.1.1"
+				"pnpm": "11.1.2"
 			}["@changesets/cli"];
 			break;
 	}
@@ -1809,7 +1814,7 @@ async function generatePackageJson(ctx) {
 	const devDeps = { ...ROOT_DEV_DEPS };
 	if (!isMonorepo) Object.assign(devDeps, PER_PACKAGE_DEV_DEPS);
 	devDeps["@bensandee/config"] = isWorkspacePackage(ctx, "@bensandee/config") ? "workspace:*" : "0.11.2";
-	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.59.0";
+	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.59.1";
 	if (ctx.config.useEslintPlugin) devDeps["@bensandee/eslint-plugin"] = isWorkspacePackage(ctx, "@bensandee/eslint-plugin") ? "workspace:*" : "0.13.0";
 	if (ctx.config.formatter === "oxfmt") devDeps["oxfmt"] = {
 		"@changesets/cli": "2.31.0",
@@ -1825,7 +1830,7 @@ async function generatePackageJson(ctx) {
 		"tsdown": "0.22.0",
 		"typescript": "6.0.3",
 		"vitest": "4.1.5",
-		"pnpm": "11.1.1"
+		"pnpm": "11.1.2"
 	}["oxfmt"];
 	if (ctx.config.formatter === "prettier") devDeps["prettier"] = {
 		"@changesets/cli": "2.31.0",
@@ -1841,7 +1846,7 @@ async function generatePackageJson(ctx) {
 		"tsdown": "0.22.0",
 		"typescript": "6.0.3",
 		"vitest": "4.1.5",
-		"pnpm": "11.1.1"
+		"pnpm": "11.1.2"
 	}["prettier"];
 	addReleaseDeps(devDeps, ctx.config);
 	if (existing) {
@@ -1913,7 +1918,7 @@ async function generatePackageJson(ctx) {
 			"tsdown": "0.22.0",
 			"typescript": "6.0.3",
 			"vitest": "4.1.5",
-			"pnpm": "11.1.1"
+			"pnpm": "11.1.2"
 		}["pnpm"];
 		const desiredPm = pinnedPnpm ? `pnpm@${pinnedPnpm}` : void 0;
 		if (desiredPm) {
@@ -1965,7 +1970,7 @@ async function generatePackageJson(ctx) {
 			"tsdown": "0.22.0",
 			"typescript": "6.0.3",
 			"vitest": "4.1.5",
-			"pnpm": "11.1.1"
+			"pnpm": "11.1.2"
 		}["pnpm"]}`
 	};
 	ctx.write(filePath, JSON.stringify(pkg, null, 2) + "\n");
@@ -3385,7 +3390,7 @@ function hookSecretEnv(secrets) {
 }
 /** Step that runs after release with post-release webhook env wired up. */
 function postReleaseHookStep(opts) {
-	const ifCondition = opts?.condition ?? (opts?.guardMain ? "github.ref == 'refs/heads/main'" : void 0);
+	const ifCondition = opts?.condition ?? (opts?.guardMain ? IS_MAIN_BRANCH : void 0);
 	return { step: {
 		name: "Post-release hook",
 		...ifCondition && { if: ifCondition },
@@ -3566,12 +3571,31 @@ async function generateReleaseCi(ctx) {
 }
 //#endregion
 //#region src/generators/ci.ts
+function coverageHistorySteps() {
+	return [
+		{ step: {
+			name: "Print coverage summary",
+			if: IS_MAIN_BRANCH,
+			run: "pnpm exec bst coverage:summary"
+		} },
+		{ step: {
+			name: "Append record to bst/coverage-metrics branch",
+			if: IS_MAIN_BRANCH,
+			run: "pnpm exec bst coverage:record"
+		} },
+		{ step: {
+			name: "Show recent coverage trend",
+			if: IS_MAIN_BRANCH,
+			run: "pnpm exec bst coverage:status --limit 10"
+		} }
+	];
+}
 /** Build the release step for the check job (changesets strategy). */
 function changesetsReleaseStep(ci, publishesNpm) {
 	if (ci === "github") return { step: {
 		id: "release",
 		uses: "changesets/action@v1",
-		if: "github.ref == 'refs/heads/main'",
+		if: IS_MAIN_BRANCH,
 		with: {
 			publish: "pnpm changeset publish",
 			version: "pnpm changeset version"
@@ -3596,9 +3620,11 @@ function changesetsReleaseStep(ci, publishesNpm) {
 }
 const CI_CONCURRENCY = {
 	group: `ci-${actionsExpr("github.ref")}`,
-	"cancel-in-progress": actionsExpr("github.ref != 'refs/heads/main'")
+	"cancel-in-progress": actionsExpr(IS_NOT_MAIN_BRANCH)
 };
-function checkSteps(nodeVersionYaml, publishesNpm) {
+function checkSteps(nodeVersionYaml, publishesNpm, withCoverage) {
+	const isNodeVersionFile = nodeVersionYaml.startsWith("node-version-file");
+	const checkCommand = withCoverage ? "pnpm ci:check --with-coverage" : "pnpm ci:check";
 	return [
 		{ step: {
 			uses: "actions/checkout@v6",
@@ -3608,7 +3634,7 @@ function checkSteps(nodeVersionYaml, publishesNpm) {
 		{ step: {
 			uses: "actions/setup-node@v6",
 			with: {
-				...nodeVersionYaml.startsWith("node-version-file") ? { "node-version-file": "package.json" } : { "node-version": "24" },
+				...isNodeVersionFile ? { "node-version-file": "package.json" } : { "node-version": "24" },
 				cache: "pnpm",
 				...publishesNpm && { "registry-url": actionsExpr("vars.NPM_REGISTRY_URL || 'https://registry.npmjs.org'") }
 			}
@@ -3616,7 +3642,7 @@ function checkSteps(nodeVersionYaml, publishesNpm) {
 		{ step: { run: "pnpm install --frozen-lockfile" } },
 		{ step: {
 			name: "Run all checks",
-			run: "pnpm ci:check"
+			run: checkCommand
 		} }
 	];
 }
@@ -3637,6 +3663,8 @@ async function generateCi(ctx) {
 	const publishesNpm = ctx.config.publishNpm === true;
 	const hookCommand = getPostReleaseHookCommand(ctx);
 	const hookSecrets = getPostReleaseHookSecrets(ctx);
+	const coverage = resolveCoverageConfigFromContext(ctx, ctx.config.setupVitest);
+	const emitCoverageSteps = coverage.historyEnabled;
 	const hasDocker = isChangesets && hasDockerPackages(ctx);
 	const hasAssets = isChangesets && hasReleaseAssets(ctx);
 	const registryDerivable = hasDocker && hasRepositoryUrl(ctx);
@@ -3649,7 +3677,8 @@ async function generateCi(ctx) {
 		releaseEnv["RELEASE_TOKEN"] = actionsExpr("secrets.RELEASE_TOKEN");
 	}
 	const steps = [
-		...checkSteps(nodeVersionYaml, isChangesets && publishesNpm),
+		...checkSteps(nodeVersionYaml, isChangesets && publishesNpm, coverage.enabled),
+		...emitCoverageSteps ? coverageHistorySteps() : [],
 		...isChangesets ? [changesetsReleaseStep(ctx.config.ci, publishesNpm)] : [],
 		...hasAssets ? [{ step: {
 			name: "Upload Release Assets",
@@ -3679,6 +3708,7 @@ async function generateCi(ctx) {
 			},
 			pull_request: null
 		},
+		...emitCoverageSteps && { permissions: { contents: "write" } },
 		enableEmailNotifications: isForgejo,
 		...isChangesets && { concurrency: CI_CONCURRENCY },
 		jobName: "check",
@@ -4301,7 +4331,7 @@ function buildConfig$1(formatter) {
 		""
 	].join("\n");
 }
-const ARCHIVE_DIR = ".tooling-archived";
+const ARCHIVE_DIR$1 = ".tooling-archived";
 /** Common client-side git hooks that husky may have configured. */
 const HUSKY_HOOK_NAMES = [
 	"pre-commit",
@@ -4332,12 +4362,12 @@ function archiveHuskyHooks(ctx, results) {
 		const huskyPath = `.husky/${hook}`;
 		const existing = ctx.read(huskyPath);
 		if (existing !== void 0) {
-			ctx.write(`${ARCHIVE_DIR}/${huskyPath}`, existing);
+			ctx.write(`${ARCHIVE_DIR$1}/${huskyPath}`, existing);
 			ctx.remove(huskyPath);
 			results.push({
 				filePath: huskyPath,
 				action: "archived",
-				description: `Moved to ${ARCHIVE_DIR}/${huskyPath}`
+				description: `Moved to ${ARCHIVE_DIR$1}/${huskyPath}`
 			});
 			found = true;
 		}
@@ -4350,12 +4380,12 @@ function archiveLintStagedConfigs(ctx, results) {
 	for (const lsPath of LINT_STAGED_CONFIG_PATHS) {
 		const existing = ctx.read(lsPath);
 		if (existing !== void 0) {
-			ctx.write(`${ARCHIVE_DIR}/${lsPath}`, existing);
+			ctx.write(`${ARCHIVE_DIR$1}/${lsPath}`, existing);
 			ctx.remove(lsPath);
 			results.push({
 				filePath: lsPath,
 				action: "archived",
-				description: `Moved to ${ARCHIVE_DIR}/${lsPath}`
+				description: `Moved to ${ARCHIVE_DIR$1}/${lsPath}`
 			});
 			found = true;
 		}
@@ -4535,43 +4565,12 @@ async function generateVscodeSettings(ctx) {
 }
 //#endregion
 //#region src/generators/coverage-ci.ts
-function coverageSteps(nodeVersionYaml) {
-	return [
-		{ step: {
-			uses: "actions/checkout@v6",
-			with: { "fetch-depth": 0 }
-		} },
-		{ step: { uses: "pnpm/action-setup@v5" } },
-		{ step: {
-			uses: "actions/setup-node@v6",
-			with: {
-				...nodeVersionYaml.startsWith("node-version-file") ? { "node-version-file": "package.json" } : { "node-version": "24" },
-				cache: "pnpm"
-			}
-		} },
-		{ step: { run: "pnpm install --frozen-lockfile" } },
-		{ step: {
-			name: "Build",
-			run: "pnpm build"
-		} },
-		{ step: {
-			name: "Run tests with coverage",
-			run: "pnpm test:coverage"
-		} },
-		{ step: {
-			name: "Print coverage summary",
-			run: "pnpm exec bst coverage:summary"
-		} },
-		{ step: {
-			name: "Append record to bst/coverage-metrics branch",
-			run: "pnpm exec bst coverage:record"
-		} },
-		{ step: {
-			name: "Show recent coverage trend",
-			run: "pnpm exec bst coverage:status --limit 10"
-		} }
-	];
-}
+const ARCHIVE_DIR = ".tooling-archived";
+/**
+* Cleanup-only generator: coverage steps now run inline in ci.yml (see
+* generateCi). Any legacy coverage.yml left over from a previous version is
+* archived to .tooling-archived/ on the next repo:sync.
+*/
 async function generateCoverageCi(ctx) {
 	const filePath = "coverage-ci";
 	if (ctx.config.ci === "none") return {
@@ -4579,49 +4578,21 @@ async function generateCoverageCi(ctx) {
 		action: "skipped",
 		description: "CI workflow not requested"
 	};
-	const config = resolveCoverageConfigFromContext(ctx, ctx.config.setupVitest);
-	if (!config.enabled || !config.historyEnabled) return {
-		filePath,
-		action: "skipped",
-		description: "Coverage tracking disabled"
-	};
-	const isGitHub = ctx.config.ci === "github";
-	const isForgejo = !isGitHub;
-	const workflowPath = isGitHub ? ".github/workflows/coverage.yml" : ".forgejo/workflows/coverage.yml";
-	const nodeVersionYaml = computeNodeVersionYaml(ctx);
-	const content = buildWorkflowYaml({
-		ci: ctx.config.ci,
-		name: "Coverage",
-		on: { push: {
-			branches: ["main"],
-			"tags-ignore": ["**"]
-		} },
-		permissions: { contents: "write" },
-		enableEmailNotifications: isForgejo,
-		jobName: "coverage",
-		steps: coverageSteps(nodeVersionYaml)
-	});
-	const alreadyExists = ctx.exists(workflowPath);
-	const existing = alreadyExists ? ctx.read(workflowPath) : void 0;
-	if (existing) {
-		if (isToolingIgnored(existing)) return {
-			filePath: workflowPath,
-			action: "skipped",
-			description: "Coverage workflow has ignore comment"
-		};
-		if (normalizeWorkflow(existing) === normalizeWorkflow(content)) return {
+	const workflowPath = ctx.config.ci === "github" ? ".github/workflows/coverage.yml" : ".forgejo/workflows/coverage.yml";
+	const existing = ctx.read(workflowPath);
+	if (existing !== void 0) {
+		ctx.write(`${ARCHIVE_DIR}/${workflowPath}`, existing);
+		ctx.remove(workflowPath);
+		return {
 			filePath: workflowPath,
-			action: "skipped",
-			description: "Coverage workflow already up to date"
+			action: "archived",
+			description: `Moved to ${ARCHIVE_DIR}/${workflowPath} (coverage now runs inline in ci.yml)`
 		};
 	}
-	const withPinnedActions = preservePinnedActions(preserveDevBinaryPath(content, existing), existing);
-	const final = existing ? insertCustomBlocks(withPinnedActions, extractCustomBlocks(existing)) : withPinnedActions;
-	ctx.write(workflowPath, final);
 	return {
-		filePath: workflowPath,
-		action: alreadyExists ? "updated" : "created",
-		description: `Generated ${isGitHub ? "GitHub" : "Forgejo"} Actions coverage workflow`
+		filePath,
+		action: "skipped",
+		description: "Coverage runs inline in ci.yml"
 	};
 }
 //#endregion
@@ -4849,7 +4820,7 @@ async function runGenerators(ctx) {
 function generateMigratePrompt(results, config, detected) {
 	const sections = [];
 	const timestamp = (/* @__PURE__ */ new Date()).toISOString();
-	sections.push(`# Migration Prompt\n\n_Generated by \`@bensandee/tooling@0.59.0 repo:sync\` on ${timestamp}_\n`);
+	sections.push(`# Migration Prompt\n\n_Generated by \`@bensandee/tooling@0.59.1 repo:sync\` on ${timestamp}_\n`);
 	const changed = results.filter((r) => r.action === "created" || r.action === "updated" || r.action === "archived");
 	if (changed.length > 0) {
 		const items = changed.map((r) => {
@@ -6440,6 +6411,9 @@ function runRunChecks(targetDir, options = {}) {
 	const allChecks = [...CHECKS, ...add.map((name) => ({ name }))];
 	const failures = [];
 	const notDefined = [];
+	const withCoverage = options.withCoverage ?? false;
+	const useCoverageScript = withCoverage && definedScripts.has("test:coverage");
+	if (withCoverage && !useCoverageScript) log.warn("--with-coverage requested but test:coverage script is not defined; falling back to test");
 	for (const check of allChecks) {
 		if (shouldSkip(check.name, skip)) continue;
 		if (!definedScripts.has(check.name)) {
@@ -6449,7 +6423,8 @@ function runRunChecks(targetDir, options = {}) {
 			} else notDefined.push(check.name);
 			continue;
 		}
-		const cmd = check.args ? `pnpm run ${check.name} ${check.args}` : `pnpm run ${check.name}`;
+		const scriptName = check.name === "test" && useCoverageScript ? "test:coverage" : check.name;
+		const cmd = check.args ? `pnpm run ${scriptName} ${check.args}` : `pnpm run ${scriptName}`;
 		debug(vc, `Running: ${cmd} (in ${targetDir})`);
 		reporter.groupStart(check.name);
 		const start = Date.now();
@@ -6502,6 +6477,11 @@ const runChecksCommand = defineCommand({
 			type: "boolean",
 			description: "Emit detailed debug logging",
 			required: false
+		},
+		"with-coverage": {
+			type: "boolean",
+			description: "Run the test step with coverage (uses pnpm run test:coverage when defined)",
+			required: false
 		}
 	},
 	run({ args }) {
@@ -6509,7 +6489,8 @@ const runChecksCommand = defineCommand({
 			skip: args.skip ? new Set(args.skip.split(",").map((s) => s.trim())) : void 0,
 			add: args.add ? args.add.split(",").map((s) => s.trim()) : void 0,
 			failFast: args["fail-fast"] ? true : void 0,
-			verbose: args.verbose === true || isEnvVerbose()
+			verbose: args.verbose === true || isEnvVerbose(),
+			withCoverage: args["with-coverage"] === true
 		});
 		process.exitCode = exitCode;
 	}
@@ -8319,7 +8300,7 @@ const out = (msg) => console.log(msg);
 const main = defineCommand({
 	meta: {
 		name: "bst",
-		version: "0.59.0",
+		version: "0.59.1",
 		description: "Bootstrap and maintain standardized TypeScript project tooling"
 	},
 	subCommands: {
@@ -8391,7 +8372,7 @@ const main = defineCommand({
 		})
 	}
 });
-console.log(`@bensandee/tooling v0.59.0`);
+console.log(`@bensandee/tooling v0.59.1`);
 async function run() {
 	await runMain(main);
 	process.exit(process.exitCode ?? 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bensandee/tooling",
-  "version": "0.59.0",
+  "version": "0.59.1",
   "description": "CLI tool to bootstrap and maintain standardized TypeScript project tooling",
   "license": "MIT",
   "repository": {