@bensandee/tooling 0.21.0 → 0.22.0

package/dist/bin.mjs

@@ -740,34 +740,6 @@ function ensureWorkflowConcurrency(existing, concurrency) {
 		};
 	}
 }
-function addWorkflowJob(existing, jobName, jobConfig) {
-	if (isToolingIgnored(existing)) return {
-		content: existing,
-		changed: false
-	};
-	try {
-		const doc = parseDocument(existing);
-		const jobs = doc.getIn(["jobs"]);
-		if (!isMap(jobs)) return {
-			content: existing,
-			changed: false
-		};
-		if (jobs.has(jobName)) return {
-			content: existing,
-			changed: false
-		};
-		jobs.set(jobName, doc.createNode(jobConfig));
-		return {
-			content: doc.toString(),
-			changed: true
-		};
-	} catch {
-		return {
-			content: existing,
-			changed: false
-		};
-	}
-}
 //#endregion
 //#region src/generators/deploy-ci.ts
 /** Build a GitHub Actions expression like `${{ expr }}` without triggering no-template-curly-in-string. */
@@ -1011,7 +983,7 @@ function getAddedDevDepNames(config) {
 	const deps = { ...ROOT_DEV_DEPS };
 	if (config.structure !== "monorepo") Object.assign(deps, PER_PACKAGE_DEV_DEPS);
 	deps["@bensandee/config"] = "0.8.2";
-	deps["@bensandee/tooling"] = "0.21.0";
+	deps["@bensandee/tooling"] = "0.22.0";
 	if (config.formatter === "oxfmt") deps["oxfmt"] = "0.35.0";
 	if (config.formatter === "prettier") deps["prettier"] = "3.8.1";
 	addReleaseDeps(deps, config);
@@ -1036,7 +1008,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.8.2";
-	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.21.0";
+	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.22.0";
 	if (ctx.config.useEslintPlugin) devDeps["@bensandee/eslint-plugin"] = isWorkspacePackage(ctx, "@bensandee/eslint-plugin") ? "workspace:*" : "0.9.2";
 	if (ctx.config.formatter === "oxfmt") devDeps["oxfmt"] = "0.35.0";
 	if (ctx.config.formatter === "prettier") devDeps["prettier"] = "3.8.1";
@@ -1597,7 +1569,7 @@ async function generateCi(ctx) {
 	};
 	const isGitHub = ctx.config.ci === "github";
 	const nodeVersionYaml = hasEnginesNode$1(ctx) ? "node-version-file: package.json" : "node-version: \"24\"";
-	const filePath = isGitHub ? ".github/workflows/check.yml" : ".forgejo/workflows/check.yml";
+	const filePath = isGitHub ? ".github/workflows/ci.yml" : ".forgejo/workflows/ci.yml";
 	const content = ciWorkflow(nodeVersionYaml, !isGitHub);
 	if (ctx.exists(filePath)) {
 		const existing = ctx.read(filePath);
@@ -2147,89 +2119,36 @@ jobs:
 ${commonSteps(nodeVersionYaml, publishesNpm)}${gitConfigStep}${releaseStep}
 `;
 }
-function changesetsReleaseJobConfig(ci, nodeVersionYaml, publishesNpm) {
-	const isGitHub = ci === "github";
-	const nodeWith = {
-		...nodeVersionYaml.startsWith("node-version-file") ? { "node-version-file": "package.json" } : { "node-version": "24" },
-		cache: "pnpm",
-		...publishesNpm && { "registry-url": "https://registry.npmjs.org" }
-	};
-	if (isGitHub) {
-		const changesetsEnv = {
-			GITHUB_TOKEN: actionsExpr("github.token"),
-			...publishesNpm && { NPM_TOKEN: actionsExpr("secrets.NPM_TOKEN") }
-		};
-		return {
-			needs: "check",
+/** Build the required release step for the check job (changesets). */
+function changesetsReleaseStep(ci, publishesNpm) {
+	if (ci === "github") return {
+		match: { uses: "changesets/action" },
+		step: {
+			uses: "changesets/action@v1",
 			if: "github.ref == 'refs/heads/main'",
-			concurrency: {
-				group: "release",
-				"cancel-in-progress": false
-			},
-			"runs-on": "ubuntu-latest",
-			permissions: {
-				contents: "write",
-				"pull-requests": "write"
+			with: {
+				publish: "pnpm changeset publish",
+				version: "pnpm changeset version"
 			},
-			steps: [
-				{
-					uses: "actions/checkout@v4",
-					with: { "fetch-depth": 0 }
-				},
-				{ uses: "pnpm/action-setup@v4" },
-				{
-					uses: "actions/setup-node@v4",
-					with: nodeWith
-				},
-				{ run: "pnpm install --frozen-lockfile" },
-				{ run: "pnpm build" },
-				{
-					uses: "changesets/action@v1",
-					with: {
-						publish: "pnpm changeset publish",
-						version: "pnpm changeset version"
-					},
-					env: changesetsEnv
-				}
-			]
-		};
-	}
-	const releaseEnv = {
-		FORGEJO_SERVER_URL: actionsExpr("github.server_url"),
-		FORGEJO_REPOSITORY: actionsExpr("github.repository"),
-		FORGEJO_TOKEN: actionsExpr("secrets.FORGEJO_TOKEN"),
-		...publishesNpm && { NODE_AUTH_TOKEN: actionsExpr("secrets.NPM_TOKEN") }
+			env: {
+				GITHUB_TOKEN: actionsExpr("github.token"),
+				...publishesNpm && { NPM_TOKEN: actionsExpr("secrets.NPM_TOKEN") }
+			}
+		}
 	};
 	return {
-		needs: "check",
-		if: "github.ref == 'refs/heads/main'",
-		concurrency: {
-			group: "release",
-			"cancel-in-progress": false
-		},
-		"runs-on": "ubuntu-latest",
-		steps: [
-			{
-				uses: "actions/checkout@v4",
-				with: { "fetch-depth": 0 }
-			},
-			{ uses: "pnpm/action-setup@v4" },
-			{
-				uses: "actions/setup-node@v4",
-				with: nodeWith
-			},
-			{ run: "pnpm install --frozen-lockfile" },
-			{ run: "pnpm build" },
-			{
-				name: "Configure git",
-				run: "git config user.name \"forgejo-actions[bot]\"\ngit config user.email \"forgejo-actions[bot]@noreply.localhost\"\n"
+		match: { run: "release:changesets" },
+		step: {
+			name: "Release",
+			if: "github.ref == 'refs/heads/main'",
+			env: {
+				FORGEJO_SERVER_URL: actionsExpr("github.server_url"),
+				FORGEJO_REPOSITORY: actionsExpr("github.repository"),
+				FORGEJO_TOKEN: actionsExpr("secrets.FORGEJO_TOKEN"),
+				...publishesNpm && { NODE_AUTH_TOKEN: actionsExpr("secrets.NPM_TOKEN") }
 			},
-			{
-				name: "Release",
-				env: releaseEnv,
-				run: "pnpm exec tooling release:changesets"
-			}
-		]
+			run: "pnpm exec tooling release:changesets"
+		}
 	};
 }
 function requiredReleaseSteps(strategy, nodeVersionYaml, publishesNpm) {
@@ -2296,36 +2215,25 @@ function buildWorkflow(strategy, ci, nodeVersionYaml, publishesNpm) {
 	}
 }
 function generateChangesetsReleaseCi(ctx, publishesNpm) {
-	const checkPath = ctx.config.ci === "github" ? ".github/workflows/check.yml" : ".forgejo/workflows/check.yml";
-	const nodeVersionYaml = hasEnginesNode(ctx) ? "node-version-file: package.json" : "node-version: \"24\"";
-	const existing = ctx.read(checkPath);
+	const ciPath = ctx.config.ci === "github" ? ".github/workflows/ci.yml" : ".forgejo/workflows/ci.yml";
+	const existing = ctx.read(ciPath);
 	if (!existing) return {
-		filePath: checkPath,
+		filePath: ciPath,
 		action: "skipped",
 		description: "CI workflow not found — run check generator first"
 	};
-	const addResult = addWorkflowJob(existing, "release", changesetsReleaseJobConfig(ctx.config.ci, nodeVersionYaml, publishesNpm));
-	if (addResult.changed) {
-		const withComment = ensureSchemaComment(addResult.content, ctx.config.ci);
-		ctx.write(checkPath, withComment);
-		return {
-			filePath: checkPath,
-			action: "updated",
-			description: "Added release job to CI workflow"
-		};
-	}
-	const merged = mergeWorkflowSteps(existing, "release", requiredReleaseSteps("changesets", nodeVersionYaml, publishesNpm));
+	const merged = mergeWorkflowSteps(existing, "check", [changesetsReleaseStep(ctx.config.ci, publishesNpm)]);
 	if (!merged.changed) return {
-		filePath: checkPath,
+		filePath: ciPath,
 		action: "skipped",
-		description: "Release job in CI workflow already up to date"
+		description: "Release step in CI workflow already up to date"
 	};
 	const withComment = ensureSchemaComment(merged.content, ctx.config.ci);
-	ctx.write(checkPath, withComment);
+	ctx.write(ciPath, withComment);
 	return {
-		filePath: checkPath,
+		filePath: ciPath,
 		action: "updated",
-		description: "Added missing steps to release job in CI workflow"
+		description: "Added release step to CI workflow"
 	};
 }
 async function generateReleaseCi(ctx) {
@@ -3614,8 +3522,21 @@ function buildReleaseConfig(flags) {
 		verbose: flags.verbose ?? false
 	};
 }
+/** Resolve the current branch from CI env vars or git. */
+function getCurrentBranch(executor, cwd) {
+	const ref = process.env["GITHUB_REF"];
+	if (ref?.startsWith("refs/heads/")) return ref.slice(11);
+	return executor.exec("git rev-parse --abbrev-ref HEAD", { cwd }).stdout.trim();
+}
 /** Core release logic — testable with a mock executor. */
 async function runRelease(config, executor) {
+	const branch = getCurrentBranch(executor, config.cwd);
+	if (branch !== "main") {
+		debug$1(config, `Skipping release on non-main branch: ${branch}`);
+		return { mode: "none" };
+	}
+	executor.exec("git config user.name \"forgejo-actions[bot]\"", { cwd: config.cwd });
+	executor.exec("git config user.email \"forgejo-actions[bot]@noreply.localhost\"", { cwd: config.cwd });
 	const changesetFiles = executor.listChangesetFiles(config.cwd);
 	debug$1(config, `Changeset files found: ${changesetFiles.length > 0 ? changesetFiles.join(", ") : "(none)"}`);
 	if (changesetFiles.length > 0) {
@@ -4656,7 +4577,7 @@ const dockerCheckCommand = defineCommand({
 const main = defineCommand({
 	meta: {
 		name: "tooling",
-		version: "0.21.0",
+		version: "0.22.0",
 		description: "Bootstrap and maintain standardized TypeScript project tooling"
 	},
 	subCommands: {
@@ -4672,7 +4593,7 @@ const main = defineCommand({
 		"docker:check": dockerCheckCommand
 	}
 });
-console.log(`@bensandee/tooling v0.21.0`);
+console.log(`@bensandee/tooling v0.22.0`);
 runMain(main);
 //#endregion
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bensandee/tooling",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "CLI tool to bootstrap and maintain standardized TypeScript project tooling",
   "bin": {
     "tooling": "./dist/bin.mjs"