@bensandee/tooling 0.10.0 → 0.10.1

package/dist/bin.mjs

@@ -581,7 +581,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.10.1";
 	if (config.formatter === "oxfmt") deps["oxfmt"] = "0.35.0";
 	if (config.formatter === "prettier") deps["prettier"] = "3.8.1";
 	addReleaseDeps(deps, config);
@@ -602,7 +602,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.10.0";
+	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.10.1";
 	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";
@@ -1244,6 +1244,11 @@ 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 : "";
+}
 /** 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));
@@ -1344,8 +1349,12 @@ function hasEnginesNode$1(ctx) {
 	return typeof parsePackageJson(raw)?.engines?.["node"] === "string";
 }
 function ciWorkflow(isMonorepo, nodeVersionYaml, isForgejo) {
-	return `name: CI
-${isForgejo ? "\nenable-email-notifications: true\n" : ""}on:
+	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";
+	const emailNotifications = isForgejo ? "\nenable-email-notifications: true\n" : "";
+	return `${workflowSchemaComment(isForgejo ? "forgejo" : "github")}name: CI
+${emailNotifications}on:
   push:
     branches: [main]
   pull_request:
@@ -1362,10 +1371,10 @@ jobs:
           ${nodeVersionYaml}
           cache: pnpm
       - run: pnpm install --frozen-lockfile
-      - run: ${isMonorepo ? "pnpm -r --parallel run typecheck" : "pnpm typecheck"}
+      - run: ${typecheckCmd}
       - run: pnpm lint
-      - run: ${isMonorepo ? "pnpm -r build" : "pnpm build"}
-      - run: ${isMonorepo ? "pnpm -r test" : "pnpm test"}
+      - run: ${buildCmd}
+      - run: ${testCmd}
       - run: pnpm format --check
       - run: pnpm knip
       - run: pnpm exec tooling repo:check
@@ -1637,6 +1646,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 +1943,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 +1992,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 +2004,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 +2027,7 @@ ${commonSteps(nodeVersionYaml)}
           GITHUB_TOKEN: \${{ github.token }}
           NPM_TOKEN: \${{ secrets.NPM_TOKEN }}
 `;
-	return `name: Release
+	return `${workflowSchemaComment(ci)}name: Release
 on:
   push:
     branches:
@@ -2304,22 +2314,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 +2342,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 +2409,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
@@ -3458,7 +3428,7 @@ function mergeGitHub(dryRun) {
 const main = defineCommand({
 	meta: {
 		name: "tooling",
-		version: "0.10.0",
+		version: "0.10.1",
 		description: "Bootstrap and maintain standardized TypeScript project tooling"
 	},
 	subCommands: {
@@ -3471,7 +3441,7 @@ const main = defineCommand({
 		"release:merge": releaseMergeCommand
 	}
 });
-console.log(`@bensandee/tooling v0.10.0`);
+console.log(`@bensandee/tooling v0.10.1`);
 runMain(main);
 //#endregion
 export {};

package/package.json

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