@bensandee/tooling 0.10.0 → 0.11.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,8 @@ 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"
 };
 /** DevDeps that belong in every project (single repo) or per-package (monorepo). */
 const PER_PACKAGE_DEV_DEPS = {
@@ -581,7 +583,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.0";
+	deps["@bensandee/tooling"] = "0.11.0";
 	if (config.formatter === "oxfmt") deps["oxfmt"] = "0.35.0";
 	if (config.formatter === "prettier") deps["prettier"] = "3.8.1";
 	addReleaseDeps(deps, config);
@@ -598,11 +600,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.0";
+	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.11.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";
@@ -1193,6 +1195,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",
@@ -1244,6 +1247,17 @@ async function generateGitignore(ctx) {
 //#endregion
 //#region src/utils/yaml-merge.ts
 const IGNORE_PATTERN = "@bensandee/tooling:ignore";
+const FORGEJO_SCHEMA_COMMENT = "# yaml-language-server: $schema=../../.vscode/forgejo-workflow.schema.json\n";
+/** Returns a yaml-language-server schema comment for Forgejo workflows, empty string otherwise. */
+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));
@@ -1343,9 +1357,10 @@ function hasEnginesNode$1(ctx) {
 	if (!raw) return false;
 	return typeof parsePackageJson(raw)?.engines?.["node"] === "string";
 }
-function ciWorkflow(isMonorepo, nodeVersionYaml, isForgejo) {
-	return `name: CI
-${isForgejo ? "\nenable-email-notifications: true\n" : ""}on:
+function ciWorkflow(nodeVersionYaml, isForgejo) {
+	const emailNotifications = isForgejo ? "\nenable-email-notifications: true\n" : "";
+	return `${workflowSchemaComment(isForgejo ? "forgejo" : "github")}name: CI
+${emailNotifications}on:
   push:
     branches: [main]
   pull_request:
@@ -1362,19 +1377,11 @@ jobs:
           ${nodeVersionYaml}
           cache: pnpm
       - run: pnpm install --frozen-lockfile
-      - run: ${isMonorepo ? "pnpm -r --parallel run typecheck" : "pnpm typecheck"}
-      - run: pnpm lint
-      - run: ${isMonorepo ? "pnpm -r build" : "pnpm build"}
-      - run: ${isMonorepo ? "pnpm -r test" : "pnpm test"}
-      - 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" },
@@ -1399,32 +1406,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"
+			}
 		}
 	];
 }
@@ -1434,17 +1420,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",
@@ -1637,6 +1623,7 @@ function buildSettings(ctx) {
 		`Bash(${pm} add *)`,
 		`Bash(${pm} update *)`,
 		`Bash(${pm} view *)`,
+		`Bash(${pm} why *)`,
 		`Bash(${pm} list)`,
 		`Bash(${pm} list *)`,
 		`Bash(${pm} ls)`,
@@ -1933,7 +1920,7 @@ permissions:
   contents: write
 ` : "";
 	const tokenEnv = isGitHub ? `GITHUB_TOKEN: \${{ github.token }}` : `FORGEJO_TOKEN: \${{ secrets.FORGEJO_TOKEN }}`;
-	return `name: Release
+	return `${workflowSchemaComment(ci)}name: Release
 on:
   workflow_dispatch:
 ${permissions}
@@ -1982,7 +1969,7 @@ permissions:
           TAG=$(git describe --tags --abbrev=0)
           pnpm publish --no-git-checks
           pnpm exec tooling release:create-forgejo-release --tag "$TAG"`;
-	return `name: Release
+	return `${workflowSchemaComment(ci)}name: Release
 on:
   workflow_dispatch:
 ${permissions}
@@ -1994,7 +1981,7 @@ ${commonSteps(nodeVersionYaml)}${gitConfigStep}${releaseStep}
 `;
 }
 function changesetsWorkflow(ci, nodeVersionYaml) {
-	if (ci === "github") return `name: Release
+	if (ci === "github") return `${workflowSchemaComment(ci)}name: Release
 on:
   push:
     branches:
@@ -2017,7 +2004,7 @@ ${commonSteps(nodeVersionYaml)}
           GITHUB_TOKEN: \${{ github.token }}
           NPM_TOKEN: \${{ secrets.NPM_TOKEN }}
 `;
-	return `name: Release
+	return `${workflowSchemaComment(ci)}name: Release
 on:
   push:
     branches:
@@ -2125,8 +2112,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",
@@ -2304,22 +2292,13 @@ async function generateLefthook(ctx) {
 const SCHEMA_NPM_PATH = "@bensandee/config/schemas/forgejo-workflow.schema.json";
 const SCHEMA_LOCAL_PATH = ".vscode/forgejo-workflow.schema.json";
 const SETTINGS_PATH = ".vscode/settings.json";
-const SCHEMA_GLOB = ".forgejo/workflows/*.yml";
+const SCHEMA_GLOB = ".forgejo/workflows/*.{yml,yaml}";
 const VscodeSettingsSchema = z.object({ "yaml.schemas": z.record(z.string(), z.unknown()).default({}) }).passthrough();
-const FullWorkspaceFileSchema = z.object({ settings: z.record(z.string(), z.unknown()).default({}) }).passthrough();
 function readSchemaFromNodeModules(targetDir) {
 	const candidate = path.join(targetDir, "node_modules", SCHEMA_NPM_PATH);
 	if (!existsSync(candidate)) return void 0;
 	return readFileSync(candidate, "utf-8");
 }
-/** Find a *.code-workspace file in the target directory. */
-function findWorkspaceFile(targetDir) {
-	try {
-		return readdirSync(targetDir).find((e) => e.endsWith(".code-workspace"));
-	} catch {
-		return;
-	}
-}
 function serializeSettings(settings) {
 	return JSON.stringify(settings, null, 2) + "\n";
 }
@@ -2341,36 +2320,6 @@ function mergeYamlSchemas(settings) {
 		changed: true
 	};
 }
-function writeSchemaToWorkspaceFile(ctx, wsFileName) {
-	const raw = ctx.read(wsFileName);
-	if (!raw) return {
-		filePath: wsFileName,
-		action: "skipped",
-		description: "Could not read workspace file"
-	};
-	const fullParsed = FullWorkspaceFileSchema.safeParse(parse(raw));
-	if (!fullParsed.success) return {
-		filePath: wsFileName,
-		action: "skipped",
-		description: "Could not parse workspace file"
-	};
-	const { merged, changed } = mergeYamlSchemas(fullParsed.data.settings);
-	if (!changed) return {
-		filePath: wsFileName,
-		action: "skipped",
-		description: "Already has Forgejo schema mapping"
-	};
-	const updated = {
-		...fullParsed.data,
-		settings: merged
-	};
-	ctx.write(wsFileName, JSON.stringify(updated, null, 2) + "\n");
-	return {
-		filePath: wsFileName,
-		action: "updated",
-		description: "Added Forgejo workflow schema mapping to workspace settings"
-	};
-}
 function writeSchemaToSettings(ctx) {
 	if (ctx.exists(SETTINGS_PATH)) {
 		const raw = ctx.read(SETTINGS_PATH);
@@ -2438,8 +2387,7 @@ async function generateVscodeSettings(ctx) {
 			description: "Copied Forgejo workflow schema from @bensandee/config"
 		});
 	}
-	const wsFile = findWorkspaceFile(ctx.targetDir);
-	results.push(wsFile ? writeSchemaToWorkspaceFile(ctx, wsFile) : writeSchemaToSettings(ctx));
+	results.push(writeSchemaToSettings(ctx));
 	return results;
 }
 //#endregion
@@ -3454,24 +3402,119 @@ 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"
+	}
+];
+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 isCI = Boolean(process.env["CI"]);
+	const failures = [];
+	for (const check of CHECKS) {
+		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)"
+	},
+	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)",
+			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 });
+		process.exitCode = exitCode;
+	}
+});
+//#endregion
 //#region src/bin.ts
 const main = defineCommand({
 	meta: {
 		name: "tooling",
-		version: "0.10.0",
+		version: "0.11.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.0`);
+console.log(`@bensandee/tooling v0.11.0`);
 runMain(main);
 //#endregion
 export {};

package/package.json

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