@bensandee/tooling 0.21.0 → 0.23.0

package/dist/bin.mjs

@@ -7,9 +7,9 @@ import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, unlinkSync, w
 import JSON5 from "json5";
 import { parse } from "jsonc-parser";
 import { z } from "zod";
+import { FatalError, TransientError, UnexpectedError } from "@bensandee/common";
 import { isMap, isScalar, isSeq, parse as parse$1, parseDocument, stringify } from "yaml";
 import { execSync } from "node:child_process";
-import { FatalError, TransientError, UnexpectedError } from "@bensandee/common";
 import { tmpdir } from "node:os";
 //#region src/types.ts
 const LEGACY_TOOLS = [
@@ -201,7 +201,7 @@ function computeDefaults(targetDir) {
 		setupVitest: !isMonorepo && !detected.hasVitestConfig,
 		ci: detectCiPlatform(targetDir),
 		setupRenovate: true,
-		releaseStrategy: isMonorepo ? "changesets" : "simple",
+		releaseStrategy: "none",
 		projectType: isMonorepo ? "default" : detectProjectType(targetDir),
 		detectPackageTypes: true
 	};
@@ -493,7 +493,8 @@ const DockerCheckConfigSchema = z.object({
 	timeoutMs: z.number().int().positive().optional(),
 	pollIntervalMs: z.number().int().positive().optional()
 });
-const ToolingConfigSchema = z.object({
+const ToolingConfigSchema = z.strictObject({
+	$schema: z.string().optional(),
 	structure: z.enum(["single", "monorepo"]).optional(),
 	useEslintPlugin: z.boolean().optional(),
 	formatter: z.enum(["oxfmt", "prettier"]).optional(),
@@ -524,17 +525,14 @@ const ToolingConfigSchema = z.object({
 	})).optional(),
 	dockerCheck: z.union([z.literal(false), DockerCheckConfigSchema]).optional()
 });
-/** Load saved tooling config from the target directory. Returns undefined if missing or invalid. */
+/** Load saved tooling config from the target directory. Returns undefined if missing, throws on invalid. */
 function loadToolingConfig(targetDir) {
 	const fullPath = path.join(targetDir, CONFIG_FILE);
 	if (!existsSync(fullPath)) return void 0;
-	try {
-		const raw = readFileSync(fullPath, "utf-8");
-		const result = ToolingConfigSchema.safeParse(JSON.parse(raw));
-		return result.success ? result.data : void 0;
-	} catch {
-		return;
-	}
+	const raw = readFileSync(fullPath, "utf-8");
+	const result = ToolingConfigSchema.safeParse(JSON.parse(raw));
+	if (!result.success) throw new FatalError(`Invalid .tooling.json:\n${result.error.issues.map((i) => `  ${i.path.join(".")}: ${i.message}`).join("\n")}`);
+	return result.data;
 }
 /** Config fields that can be overridden in .tooling.json. */
 const OVERRIDE_KEYS = [
@@ -558,7 +556,7 @@ const MONOREPO_IGNORED_KEYS = new Set(["setupVitest", "projectType"]);
 function saveToolingConfig(ctx, config) {
 	const defaults = computeDefaults(config.targetDir);
 	const isMonorepo = config.structure === "monorepo";
-	const overrides = {};
+	const overrides = { $schema: "node_modules/@bensandee/tooling/tooling.schema.json" };
 	for (const key of OVERRIDE_KEYS) {
 		if (isMonorepo && MONOREPO_IGNORED_KEYS.has(key)) continue;
 		if (config[key] !== defaults[key]) overrides[key] = config[key];
@@ -740,34 +738,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 +981,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.23.0";
 	if (config.formatter === "oxfmt") deps["oxfmt"] = "0.35.0";
 	if (config.formatter === "prettier") deps["prettier"] = "3.8.1";
 	addReleaseDeps(deps, config);
@@ -1036,7 +1006,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.23.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";
@@ -1522,25 +1492,26 @@ function actionsExpr$1(expr) {
 }
 const CI_CONCURRENCY = {
 	group: `ci-${actionsExpr$1("github.ref")}`,
-	"cancel-in-progress": true
+	"cancel-in-progress": actionsExpr$1("github.ref != 'refs/heads/main'")
 };
 function hasEnginesNode$1(ctx) {
 	const raw = ctx.read("package.json");
 	if (!raw) return false;
 	return typeof parsePackageJson(raw)?.engines?.["node"] === "string";
 }
-function ciWorkflow(nodeVersionYaml, isForgejo) {
+function ciWorkflow(nodeVersionYaml, isForgejo, isChangesets) {
 	const emailNotifications = isForgejo ? "\nenable-email-notifications: true\n" : "";
+	const concurrencyBlock = isChangesets ? `
+concurrency:
+  group: ci-${actionsExpr$1("github.ref")}
+  cancel-in-progress: ${actionsExpr$1("github.ref != 'refs/heads/main'")}
+` : "";
 	return `${workflowSchemaComment(isForgejo ? "forgejo" : "github")}name: CI
 ${emailNotifications}on:
   push:
     branches: [main]
   pull_request:
-
-concurrency:
-  group: ci-${actionsExpr$1("github.ref")}
-  cancel-in-progress: true
-
+${concurrencyBlock}
 jobs:
   check:
     runs-on: ubuntu-latest
@@ -1589,6 +1560,10 @@ function requiredCheckSteps(nodeVersionYaml) {
 		}
 	];
 }
+/** Resolve the CI workflow filename based on release strategy. */
+function ciWorkflowPath(ci, releaseStrategy) {
+	return `${ci === "github" ? ".github/workflows" : ".forgejo/workflows"}/${releaseStrategy === "changesets" ? "ci.yml" : "check.yml"}`;
+}
 async function generateCi(ctx) {
 	if (ctx.config.ci === "none") return {
 		filePath: "ci",
@@ -1596,16 +1571,23 @@ async function generateCi(ctx) {
 		description: "CI workflow not requested"
 	};
 	const isGitHub = ctx.config.ci === "github";
+	const isChangesets = ctx.config.releaseStrategy === "changesets";
 	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 content = ciWorkflow(nodeVersionYaml, !isGitHub);
+	const filePath = ciWorkflowPath(ctx.config.ci, ctx.config.releaseStrategy);
+	const content = ciWorkflow(nodeVersionYaml, !isGitHub, isChangesets);
 	if (ctx.exists(filePath)) {
 		const existing = ctx.read(filePath);
 		if (existing) {
-			const merged = mergeWorkflowSteps(existing, "check", requiredCheckSteps(nodeVersionYaml));
-			const withConcurrency = ensureWorkflowConcurrency(merged.content, CI_CONCURRENCY);
-			const withComment = ensureSchemaComment(withConcurrency.content, isGitHub ? "github" : "forgejo");
-			if (merged.changed || withConcurrency.changed || withComment !== withConcurrency.content) {
+			let result = mergeWorkflowSteps(existing, "check", requiredCheckSteps(nodeVersionYaml));
+			if (isChangesets) {
+				const withConcurrency = ensureWorkflowConcurrency(result.content, CI_CONCURRENCY);
+				result = {
+					content: withConcurrency.content,
+					changed: result.changed || withConcurrency.changed
+				};
+			}
+			const withComment = ensureSchemaComment(result.content, isGitHub ? "github" : "forgejo");
+			if (result.changed || withComment !== result.content) {
 				ctx.write(filePath, withComment);
 				return {
 					filePath,
@@ -2147,89 +2129,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
+			with: {
+				publish: "pnpm changeset publish",
+				version: "pnpm changeset version"
 			},
-			"runs-on": "ubuntu-latest",
-			permissions: {
-				contents: "write",
-				"pull-requests": "write"
-			},
-			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 +2225,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 = ciWorkflowPath(ctx.config.ci, ctx.config.releaseStrategy);
+	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 +3532,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 +4587,7 @@ const dockerCheckCommand = defineCommand({
 const main = defineCommand({
 	meta: {
 		name: "tooling",
-		version: "0.21.0",
+		version: "0.23.0",
 		description: "Bootstrap and maintain standardized TypeScript project tooling"
 	},
 	subCommands: {
@@ -4672,7 +4603,7 @@ const main = defineCommand({
 		"docker:check": dockerCheckCommand
 	}
 });
-console.log(`@bensandee/tooling v0.21.0`);
+console.log(`@bensandee/tooling v0.23.0`);
 runMain(main);
 //#endregion
 export {};

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@bensandee/tooling",
-  "version": "0.21.0",
+  "version": "0.23.0",
   "description": "CLI tool to bootstrap and maintain standardized TypeScript project tooling",
   "bin": {
     "tooling": "./dist/bin.mjs"
   },
   "files": [
-    "dist"
+    "dist",
+    "tooling.schema.json"
   ],
   "type": "module",
   "imports": {
@@ -22,7 +23,8 @@
       "types": "./dist/docker-check/index.d.mts",
       "default": "./dist/docker-check/index.mjs"
     },
-    "./package.json": "./package.json"
+    "./package.json": "./package.json",
+    "./tooling.schema.json": "./tooling.schema.json"
   },
   "publishConfig": {
     "access": "public"

package/tooling.schema.json

@@ -0,0 +1,148 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "@bensandee/tooling configuration",
+  "description": "Override convention-detected defaults for repo:sync. Only fields that differ from detected defaults need to be specified.",
+  "type": "object",
+  "additionalProperties": false,
+  "properties": {
+    "$schema": {
+      "type": "string",
+      "description": "JSON Schema reference (ignored by tooling)"
+    },
+    "structure": {
+      "type": "string",
+      "enum": ["single", "monorepo"],
+      "description": "Project structure"
+    },
+    "useEslintPlugin": {
+      "type": "boolean",
+      "description": "Include @bensandee/eslint-plugin oxlint plugin"
+    },
+    "formatter": {
+      "type": "string",
+      "enum": ["oxfmt", "prettier"],
+      "description": "Formatter choice"
+    },
+    "setupVitest": {
+      "type": "boolean",
+      "description": "Generate vitest config and example test"
+    },
+    "ci": {
+      "type": "string",
+      "enum": ["github", "forgejo", "none"],
+      "description": "CI platform"
+    },
+    "setupRenovate": {
+      "type": "boolean",
+      "description": "Generate Renovate config"
+    },
+    "releaseStrategy": {
+      "type": "string",
+      "enum": ["release-it", "simple", "changesets", "none"],
+      "description": "Release management strategy"
+    },
+    "projectType": {
+      "type": "string",
+      "enum": ["default", "node", "react", "library"],
+      "description": "Project type (determines tsconfig base)"
+    },
+    "detectPackageTypes": {
+      "type": "boolean",
+      "description": "Auto-detect project types for monorepo packages"
+    },
+    "setupDocker": {
+      "type": "boolean",
+      "description": "Generate Docker build/check scripts"
+    },
+    "docker": {
+      "type": "object",
+      "description": "Docker package overrides (package name → config)",
+      "additionalProperties": {
+        "type": "object",
+        "required": ["dockerfile"],
+        "properties": {
+          "dockerfile": {
+            "type": "string",
+            "description": "Path to Dockerfile relative to package"
+          },
+          "context": {
+            "type": "string",
+            "default": ".",
+            "description": "Docker build context relative to package"
+          }
+        },
+        "additionalProperties": false
+      }
+    },
+    "dockerCheck": {
+      "oneOf": [
+        {
+          "const": false,
+          "description": "Disable Docker health checks"
+        },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "composeFiles": {
+              "type": "array",
+              "items": { "type": "string" },
+              "description": "Compose files to use"
+            },
+            "envFile": {
+              "type": "string",
+              "description": "Environment file for compose"
+            },
+            "services": {
+              "type": "array",
+              "items": { "type": "string" },
+              "description": "Services to check (default: all)"
+            },
+            "healthChecks": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "required": ["name", "url"],
+                "additionalProperties": false,
+                "properties": {
+                  "name": {
+                    "type": "string",
+                    "description": "Service name"
+                  },
+                  "url": {
+                    "type": "string",
+                    "description": "Health check URL"
+                  },
+                  "status": {
+                    "type": "integer",
+                    "description": "Expected HTTP status code"
+                  }
+                }
+              },
+              "description": "Health check definitions"
+            },
+            "buildCommand": {
+              "type": "string",
+              "description": "Command to build images before checking"
+            },
+            "buildCwd": {
+              "type": "string",
+              "description": "Working directory for build command"
+            },
+            "timeoutMs": {
+              "type": "integer",
+              "minimum": 1,
+              "description": "Overall timeout in milliseconds"
+            },
+            "pollIntervalMs": {
+              "type": "integer",
+              "minimum": 1,
+              "description": "Poll interval in milliseconds"
+            }
+          }
+        }
+      ],
+      "description": "Docker health check configuration or false to disable"
+    }
+  }
+}