@bensandee/tooling 0.10.1 → 0.12.0

package/dist/bin.mjs

@@ -516,7 +516,8 @@ const STANDARD_SCRIPTS_SINGLE = {
 	test: "vitest run",
 	lint: "oxlint",
 	knip: "knip",
-	check: "pnpm typecheck && pnpm build && pnpm lint && pnpm knip"
+	check: "pnpm exec tooling repo:run-checks",
+	"tooling:check": "pnpm exec tooling repo:check"
 };
 const STANDARD_SCRIPTS_MONOREPO = {
 	build: "pnpm -r build",
@@ -524,7 +525,13 @@ const STANDARD_SCRIPTS_MONOREPO = {
 	typecheck: "pnpm -r --parallel run typecheck",
 	lint: "oxlint",
 	knip: "knip",
-	check: "pnpm typecheck && pnpm build && pnpm lint && pnpm knip"
+	check: "pnpm exec tooling repo:run-checks",
+	"tooling:check": "pnpm exec tooling repo:check"
+};
+/** Scripts that tooling owns — map from script name to keyword that must appear in the value. */
+const MANAGED_SCRIPTS = {
+	check: "repo:run-checks",
+	"tooling:check": "repo:check"
 };
 /** DevDeps that belong in every project (single repo) or per-package (monorepo). */
 const PER_PACKAGE_DEV_DEPS = {
@@ -581,7 +588,7 @@ function getAddedDevDepNames(config) {
 	const deps = { ...ROOT_DEV_DEPS };
 	if (config.structure !== "monorepo") Object.assign(deps, PER_PACKAGE_DEV_DEPS);
 	deps["@bensandee/config"] = "0.7.1";
-	deps["@bensandee/tooling"] = "0.10.1";
+	deps["@bensandee/tooling"] = "0.12.0";
 	if (config.formatter === "oxfmt") deps["oxfmt"] = "0.35.0";
 	if (config.formatter === "prettier") deps["prettier"] = "3.8.1";
 	addReleaseDeps(deps, config);
@@ -598,11 +605,11 @@ async function generatePackageJson(ctx) {
 		format: formatScript
 	};
 	if (ctx.config.releaseStrategy === "changesets") allScripts["changeset"] = "changeset";
-	if (ctx.config.releaseStrategy !== "none") allScripts["trigger-release"] = "pnpm exec tooling release:trigger";
+	if (ctx.config.releaseStrategy !== "none" && ctx.config.releaseStrategy !== "changesets") allScripts["trigger-release"] = "pnpm exec tooling release:trigger";
 	const devDeps = { ...ROOT_DEV_DEPS };
 	if (!isMonorepo) Object.assign(devDeps, PER_PACKAGE_DEV_DEPS);
 	devDeps["@bensandee/config"] = isWorkspacePackage(ctx, "@bensandee/config") ? "workspace:*" : "0.7.1";
-	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.10.1";
+	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.12.0";
 	if (ctx.config.useEslintPlugin) devDeps["@bensandee/eslint-plugin"] = isWorkspacePackage(ctx, "@bensandee/eslint-plugin") ? "workspace:*" : "0.9.0";
 	if (ctx.config.formatter === "oxfmt") devDeps["oxfmt"] = "0.35.0";
 	if (ctx.config.formatter === "prettier") devDeps["prettier"] = "3.8.1";
@@ -623,6 +630,9 @@ async function generatePackageJson(ctx) {
 		for (const [key, value] of Object.entries(allScripts)) if (!(key in existingScripts)) {
 			existingScripts[key] = value;
 			changes.push(`added script: ${key}`);
+		} else if (key in MANAGED_SCRIPTS && !existingScripts[key]?.includes(MANAGED_SCRIPTS[key])) {
+			existingScripts[key] = value;
+			changes.push(`updated script: ${key}`);
 		}
 		pkg.scripts = existingScripts;
 		const existingDevDeps = pkg.devDependencies ?? {};
@@ -1193,6 +1203,7 @@ async function generateTsdown(ctx) {
 /** Entries that every project should have — repo:check flags these as missing. */
 const REQUIRED_ENTRIES = [
 	"node_modules/",
+	".pnpm-store/",
 	"dist/",
 	"*.tsbuildinfo",
 	".env",
@@ -1249,6 +1260,12 @@ const FORGEJO_SCHEMA_COMMENT = "# yaml-language-server: $schema=../../.vscode/fo
 function workflowSchemaComment(ci) {
 	return ci === "forgejo" ? FORGEJO_SCHEMA_COMMENT : "";
 }
+/** Prepend the Forgejo schema comment if it's not already present. No-op for GitHub. */
+function ensureSchemaComment(content, ci) {
+	if (ci !== "forgejo") return content;
+	if (content.includes("yaml-language-server")) return content;
+	return FORGEJO_SCHEMA_COMMENT + content;
+}
 /** Check if a YAML file has an opt-out comment in the first 10 lines. */
 function isToolingIgnored(content) {
 	return content.split("\n", 10).some((line) => line.includes(IGNORE_PATTERN));
@@ -1348,10 +1365,7 @@ function hasEnginesNode$1(ctx) {
 	if (!raw) return false;
 	return typeof parsePackageJson(raw)?.engines?.["node"] === "string";
 }
-function ciWorkflow(isMonorepo, nodeVersionYaml, isForgejo) {
-	const buildCmd = isMonorepo ? "pnpm -r build" : "pnpm build";
-	const testCmd = isMonorepo ? "pnpm -r test" : "pnpm test";
-	const typecheckCmd = isMonorepo ? "pnpm -r --parallel run typecheck" : "pnpm typecheck";
+function ciWorkflow(nodeVersionYaml, isForgejo) {
 	const emailNotifications = isForgejo ? "\nenable-email-notifications: true\n" : "";
 	return `${workflowSchemaComment(isForgejo ? "forgejo" : "github")}name: CI
 ${emailNotifications}on:
@@ -1371,19 +1385,11 @@ jobs:
           ${nodeVersionYaml}
           cache: pnpm
       - run: pnpm install --frozen-lockfile
-      - run: ${typecheckCmd}
-      - run: pnpm lint
-      - run: ${buildCmd}
-      - run: ${testCmd}
-      - run: pnpm format --check
-      - run: pnpm knip
-      - run: pnpm exec tooling repo:check
+      - name: Run all checks
+        run: pnpm check
 `;
 }
-function requiredCheckSteps(isMonorepo, nodeVersionYaml) {
-	const buildCmd = isMonorepo ? "pnpm -r build" : "pnpm build";
-	const testCmd = isMonorepo ? "pnpm -r test" : "pnpm test";
-	const typecheckCmd = isMonorepo ? "pnpm -r --parallel run typecheck" : "pnpm typecheck";
+function requiredCheckSteps(nodeVersionYaml) {
 	return [
 		{
 			match: { uses: "actions/checkout" },
@@ -1408,32 +1414,11 @@ function requiredCheckSteps(isMonorepo, nodeVersionYaml) {
 			step: { run: "pnpm install --frozen-lockfile" }
 		},
 		{
-			match: { run: "typecheck" },
-			step: { run: typecheckCmd }
-		},
-		{
-			match: { run: "lint" },
-			step: { run: "pnpm lint" }
-		},
-		{
-			match: { run: "build" },
-			step: { run: buildCmd }
-		},
-		{
-			match: { run: "test" },
-			step: { run: testCmd }
-		},
-		{
-			match: { run: "format" },
-			step: { run: "pnpm format --check" }
-		},
-		{
-			match: { run: "knip" },
-			step: { run: "pnpm knip" }
-		},
-		{
-			match: { run: "repo:check" },
-			step: { run: "pnpm exec tooling repo:check" }
+			match: { run: "check" },
+			step: {
+				name: "Run all checks",
+				run: "pnpm check"
+			}
 		}
 	];
 }
@@ -1443,17 +1428,17 @@ async function generateCi(ctx) {
 		action: "skipped",
 		description: "CI workflow not requested"
 	};
-	const isMonorepo = ctx.config.structure === "monorepo";
 	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 content = ciWorkflow(isMonorepo, nodeVersionYaml, !isGitHub);
+	const content = ciWorkflow(nodeVersionYaml, !isGitHub);
 	if (ctx.exists(filePath)) {
 		const existing = ctx.read(filePath);
 		if (existing) {
-			const merged = mergeWorkflowSteps(existing, "check", requiredCheckSteps(isMonorepo, nodeVersionYaml));
-			if (merged.changed) {
-				ctx.write(filePath, merged.content);
+			const merged = mergeWorkflowSteps(existing, "check", requiredCheckSteps(nodeVersionYaml));
+			const withComment = ensureSchemaComment(merged.content, isGitHub ? "github" : "forgejo");
+			if (merged.changed || withComment !== merged.content) {
+				ctx.write(filePath, withComment);
 				return {
 					filePath,
 					action: "updated",
@@ -2135,8 +2120,9 @@ async function generateReleaseCi(ctx) {
 		const existing = ctx.read(workflowPath);
 		if (existing) {
 			const merged = mergeWorkflowSteps(existing, "release", requiredReleaseSteps(ctx.config.releaseStrategy, nodeVersionYaml));
-			if (merged.changed) {
-				ctx.write(workflowPath, merged.content);
+			const withComment = ensureSchemaComment(merged.content, ctx.config.ci);
+			if (merged.changed || withComment !== merged.content) {
+				ctx.write(workflowPath, withComment);
 				return {
 					filePath: workflowPath,
 					action: "updated",
@@ -3424,24 +3410,136 @@ function mergeGitHub(dryRun) {
 	p.log.info(`Merged changesets PR and deleted branch ${HEAD_BRANCH}`);
 }
 //#endregion
+//#region src/commands/repo-run-checks.ts
+const CHECKS = [
+	{
+		name: "build",
+		cmd: "pnpm run --if-present build"
+	},
+	{
+		name: "typecheck",
+		cmd: "pnpm run --if-present typecheck"
+	},
+	{
+		name: "lint",
+		cmd: "pnpm run --if-present lint"
+	},
+	{
+		name: "test",
+		cmd: "pnpm run --if-present test"
+	},
+	{
+		name: "format",
+		cmd: "pnpm run --if-present format -- --check"
+	},
+	{
+		name: "knip",
+		cmd: "pnpm run --if-present knip"
+	},
+	{
+		name: "tooling:check",
+		cmd: "pnpm run --if-present tooling:check"
+	},
+	{
+		name: "image:check",
+		cmd: "pnpm run --if-present image:check"
+	}
+];
+function defaultExecCommand(cmd, cwd) {
+	try {
+		execSync(cmd, {
+			cwd,
+			stdio: "inherit"
+		});
+		return 0;
+	} catch (err) {
+		if (isExecSyncError(err)) return err.status;
+		return 1;
+	}
+}
+const ciLog = (msg) => console.log(msg);
+function runRunChecks(targetDir, options = {}) {
+	const exec = options.execCommand ?? defaultExecCommand;
+	const skip = options.skip ?? /* @__PURE__ */ new Set();
+	const add = options.add ?? [];
+	const isCI = Boolean(process.env["CI"]);
+	const allChecks = [...CHECKS, ...add.map((name) => ({
+		name,
+		cmd: `pnpm run --if-present ${name}`
+	}))];
+	const failures = [];
+	for (const check of allChecks) {
+		if (skip.has(check.name)) {
+			p.log.info(`${check.name} (skipped)`);
+			continue;
+		}
+		if (isCI) ciLog(`::group::${check.name}`);
+		const exitCode = exec(check.cmd, targetDir);
+		if (isCI) ciLog("::endgroup::");
+		if (exitCode === 0) p.log.success(check.name);
+		else {
+			if (isCI) ciLog(`::error::${check.name} failed`);
+			p.log.error(`${check.name} failed`);
+			failures.push(check.name);
+		}
+	}
+	if (failures.length > 0) {
+		p.log.error(`Failed checks: ${failures.join(", ")}`);
+		return 1;
+	}
+	p.log.success("All checks passed");
+	return 0;
+}
+const runChecksCommand = defineCommand({
+	meta: {
+		name: "repo:run-checks",
+		description: "Run all standard checks (build, typecheck, lint, test, format, knip, tooling:check, image:check)"
+	},
+	args: {
+		dir: {
+			type: "positional",
+			description: "Target directory (default: current directory)",
+			required: false
+		},
+		skip: {
+			type: "string",
+			description: "Comma-separated list of checks to skip (build, typecheck, lint, test, format, knip, tooling:check, image:check)",
+			required: false
+		},
+		add: {
+			type: "string",
+			description: "Comma-separated list of additional check names to run (uses pnpm run --if-present <name>)",
+			required: false
+		}
+	},
+	run({ args }) {
+		const exitCode = runRunChecks(path.resolve(args.dir ?? "."), {
+			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
+		});
+		process.exitCode = exitCode;
+	}
+});
+//#endregion
 //#region src/bin.ts
 const main = defineCommand({
 	meta: {
 		name: "tooling",
-		version: "0.10.1",
+		version: "0.12.0",
 		description: "Bootstrap and maintain standardized TypeScript project tooling"
 	},
 	subCommands: {
 		"repo:init": initCommand,
 		"repo:update": updateCommand,
 		"repo:check": checkCommand,
+		"repo:run-checks": runChecksCommand,
 		"release:changesets": releaseForgejoCommand,
 		"release:trigger": releaseTriggerCommand,
 		"release:create-forgejo-release": createForgejoReleaseCommand,
 		"release:merge": releaseMergeCommand
 	}
 });
-console.log(`@bensandee/tooling v0.10.1`);
+console.log(`@bensandee/tooling v0.12.0`);
 runMain(main);
 //#endregion
 export {};

package/package.json

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