@bensandee/tooling 0.11.0 → 0.13.0

package/dist/bin.mjs

@@ -516,8 +516,10 @@ const STANDARD_SCRIPTS_SINGLE = {
 	test: "vitest run",
 	lint: "oxlint",
 	knip: "knip",
-	check: "pnpm exec tooling repo:run-checks",
-	"tooling:check": "pnpm exec tooling repo:check"
+	check: "pnpm exec tooling checks:run",
+	"ci:check": "pnpm check",
+	"tooling:check": "pnpm exec tooling repo:check",
+	"tooling:update": "pnpm exec tooling repo:update"
 };
 const STANDARD_SCRIPTS_MONOREPO = {
 	build: "pnpm -r build",
@@ -525,8 +527,17 @@ const STANDARD_SCRIPTS_MONOREPO = {
 	typecheck: "pnpm -r --parallel run typecheck",
 	lint: "oxlint",
 	knip: "knip",
-	check: "pnpm exec tooling repo:run-checks",
-	"tooling:check": "pnpm exec tooling repo:check"
+	check: "pnpm exec tooling checks:run",
+	"ci:check": "pnpm check",
+	"tooling:check": "pnpm exec tooling repo:check",
+	"tooling:update": "pnpm exec tooling repo:update"
+};
+/** Scripts that tooling owns — map from script name to keyword that must appear in the value. */
+const MANAGED_SCRIPTS = {
+	check: "checks:run",
+	"ci:check": "pnpm check",
+	"tooling:check": "repo:check",
+	"tooling:update": "repo:update"
 };
 /** DevDeps that belong in every project (single repo) or per-package (monorepo). */
 const PER_PACKAGE_DEV_DEPS = {
@@ -583,7 +594,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.11.0";
+	deps["@bensandee/tooling"] = "0.13.0";
 	if (config.formatter === "oxfmt") deps["oxfmt"] = "0.35.0";
 	if (config.formatter === "prettier") deps["prettier"] = "3.8.1";
 	addReleaseDeps(deps, config);
@@ -604,7 +615,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.7.1";
-	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.11.0";
+	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.13.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";
@@ -625,6 +636,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 ?? {};
@@ -1378,7 +1392,7 @@ jobs:
           cache: pnpm
       - run: pnpm install --frozen-lockfile
       - name: Run all checks
-        run: pnpm check
+        run: pnpm ci:check
 `;
 }
 function requiredCheckSteps(nodeVersionYaml) {
@@ -1409,7 +1423,7 @@ function requiredCheckSteps(nodeVersionYaml) {
 			match: { run: "check" },
 			step: {
 				name: "Run all checks",
-				run: "pnpm check"
+				run: "pnpm ci:check"
 			}
 		}
 	];
@@ -3404,35 +3418,26 @@ function mergeGitHub(dryRun) {
 //#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: "build" },
+	{ name: "typecheck" },
+	{ name: "lint" },
+	{ name: "test" },
 	{
 		name: "format",
-		cmd: "pnpm run --if-present format -- --check"
-	},
-	{
-		name: "knip",
-		cmd: "pnpm run --if-present knip"
+		args: "--check"
 	},
-	{
-		name: "tooling:check",
-		cmd: "pnpm run --if-present tooling:check"
-	}
+	{ name: "knip" },
+	{ name: "tooling:check" },
+	{ name: "image:check" }
 ];
+function defaultGetScripts(targetDir) {
+	try {
+		const pkg = parsePackageJson(readFileSync(path.join(targetDir, "package.json"), "utf-8"));
+		return new Set(Object.keys(pkg?.scripts ?? {}));
+	} catch {
+		return /* @__PURE__ */ new Set();
+	}
+}
 function defaultExecCommand(cmd, cwd) {
 	try {
 		execSync(cmd, {
@@ -3448,16 +3453,27 @@ function defaultExecCommand(cmd, cwd) {
 const ciLog = (msg) => console.log(msg);
 function runRunChecks(targetDir, options = {}) {
 	const exec = options.execCommand ?? defaultExecCommand;
+	const getScripts = options.getScripts ?? defaultGetScripts;
 	const skip = options.skip ?? /* @__PURE__ */ new Set();
+	const add = options.add ?? [];
 	const isCI = Boolean(process.env["CI"]);
+	const definedScripts = getScripts(targetDir);
+	const addedNames = new Set(add);
+	const allChecks = [...CHECKS, ...add.map((name) => ({ name }))];
 	const failures = [];
-	for (const check of CHECKS) {
-		if (skip.has(check.name)) {
-			p.log.info(`${check.name} (skipped)`);
+	const notDefined = [];
+	for (const check of allChecks) {
+		if (skip.has(check.name)) continue;
+		if (!definedScripts.has(check.name)) {
+			if (addedNames.has(check.name)) {
+				p.log.error(`${check.name} not defined in package.json`);
+				failures.push(check.name);
+			} else notDefined.push(check.name);
 			continue;
 		}
+		const cmd = check.args ? `pnpm run ${check.name} ${check.args}` : `pnpm run ${check.name}`;
 		if (isCI) ciLog(`::group::${check.name}`);
-		const exitCode = exec(check.cmd, targetDir);
+		const exitCode = exec(cmd, targetDir);
 		if (isCI) ciLog("::endgroup::");
 		if (exitCode === 0) p.log.success(check.name);
 		else {
@@ -3466,6 +3482,7 @@ function runRunChecks(targetDir, options = {}) {
 			failures.push(check.name);
 		}
 	}
+	if (notDefined.length > 0) p.log.info(`Skipped (not defined): ${notDefined.join(", ")}`);
 	if (failures.length > 0) {
 		p.log.error(`Failed checks: ${failures.join(", ")}`);
 		return 1;
@@ -3475,8 +3492,8 @@ function runRunChecks(targetDir, options = {}) {
 }
 const runChecksCommand = defineCommand({
 	meta: {
-		name: "repo:run-checks",
-		description: "Run all standard checks (build, typecheck, lint, test, format, knip, tooling:check)"
+		name: "checks:run",
+		description: "Run all standard checks (build, typecheck, lint, test, format, knip, tooling:check, image:check)"
 	},
 	args: {
 		dir: {
@@ -3486,12 +3503,20 @@ const runChecksCommand = defineCommand({
 		},
 		skip: {
 			type: "string",
-			description: "Comma-separated list of checks to skip (build, typecheck, lint, test, format, knip, tooling:check)",
+			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 <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 });
+		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;
 	}
 });
@@ -3500,21 +3525,21 @@ const runChecksCommand = defineCommand({
 const main = defineCommand({
 	meta: {
 		name: "tooling",
-		version: "0.11.0",
+		version: "0.13.0",
 		description: "Bootstrap and maintain standardized TypeScript project tooling"
 	},
 	subCommands: {
 		"repo:init": initCommand,
 		"repo:update": updateCommand,
 		"repo:check": checkCommand,
-		"repo:run-checks": runChecksCommand,
+		"checks:run": runChecksCommand,
 		"release:changesets": releaseForgejoCommand,
 		"release:trigger": releaseTriggerCommand,
 		"release:create-forgejo-release": createForgejoReleaseCommand,
 		"release:merge": releaseMergeCommand
 	}
 });
-console.log(`@bensandee/tooling v0.11.0`);
+console.log(`@bensandee/tooling v0.13.0`);
 runMain(main);
 //#endregion
 export {};

package/package.json

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