@bensandee/tooling 0.7.2 → 0.7.3

package/dist/bin.mjs

@@ -772,6 +772,8 @@ function generateMigratePrompt(results, config, detected) {
 	}
 	sections.push("## Ground rules");
 	sections.push("");
+	sections.push("It is OK to add new packages (e.g. `zod`, `@bensandee/common`) if they are needed to resolve errors.");
+	sections.push("");
 	sections.push("When resolving errors from the checklist below, prefer fixing the root cause over suppressing the issue. For example:");
 	sections.push("");
 	sections.push("- **Lint errors**: fix the code rather than adding disable comments or rule exceptions");
@@ -808,7 +810,7 @@ async function generateTsconfig(ctx) {
 	if (!existing) {
 		const config = {
 			extends: extendsValue,
-			include: ["src"],
+			...ctx.exists("src") ? { include: ["src"] } : {},
 			exclude: ["node_modules", "dist"]
 		};
 		ctx.write(filePath, JSON.stringify(config, null, 2) + "\n");
@@ -863,12 +865,14 @@ function mergeSingleTsconfig(ctx, filePath, extendsValue) {
 		parsed.extends = extendsValue;
 		changes.push(`added extends: ${extendsValue}`);
 	}
-	const existingInclude = parsed.include ?? [];
-	if (!existingInclude.includes("src")) {
-		existingInclude.push("src");
-		changes.push("added \"src\" to include");
+	if (!parsed.include) {
+		const tsconfigDir = path.dirname(filePath);
+		const srcDir = tsconfigDir === "." ? "src" : path.join(tsconfigDir, "src");
+		if (ctx.exists(srcDir)) {
+			parsed.include = ["src"];
+			changes.push("added include: [\"src\"]");
+		}
 	}
-	parsed.include = existingInclude;
 	if (changes.length === 0) return {
 		filePath,
 		action: "skipped",
@@ -944,12 +948,10 @@ function generateMonorepoPackageTsconfigs(ctx) {
 				parsed.extends = extendsValue;
 				changes.push(prev ? `changed extends: ${String(prev)} → ${extendsValue}` : `added extends: ${extendsValue}`);
 			}
-			const existingInclude = parsed.include ?? [];
-			if (!existingInclude.includes("src")) {
-				existingInclude.push("src");
-				changes.push("added \"src\" to include");
+			if (!parsed.include && ctx.exists(path.join(relDir, "src"))) {
+				parsed.include = ["src"];
+				changes.push("added include: [\"src\"]");
 			}
-			parsed.include = existingInclude;
 			if (changes.length === 0) {
 				results.push({
 					filePath,
@@ -967,7 +969,7 @@ function generateMonorepoPackageTsconfigs(ctx) {
 		} else {
 			const config = {
 				extends: extendsValue,
-				include: ["src"],
+				...ctx.exists(path.join(relDir, "src")) ? { include: ["src"] } : {},
 				exclude: ["node_modules", "dist"]
 			};
 			ctx.write(filePath, JSON.stringify(config, null, 2) + "\n");
@@ -1107,23 +1109,15 @@ async function generateFormatter(ctx) {
 }
 async function generateOxfmt(ctx) {
 	const filePath = ".oxfmtrc.json";
-	const existing = ctx.read(filePath);
-	if (existing) {
-		if (existing === OXFMT_CONFIG) return {
-			filePath,
-			action: "skipped",
-			description: "Already configured"
-		};
-		if (await ctx.confirmOverwrite(filePath) === "skip") return {
-			filePath,
-			action: "skipped",
-			description: "Existing oxfmt config preserved"
-		};
-	}
+	if (ctx.exists(filePath)) return {
+		filePath,
+		action: "skipped",
+		description: "Existing oxfmt config preserved"
+	};
 	ctx.write(filePath, OXFMT_CONFIG);
 	return {
 		filePath,
-		action: existing ? "updated" : "created",
+		action: "created",
 		description: "Generated .oxfmtrc.json"
 	};
 }
@@ -1267,6 +1261,24 @@ jobs:
       - run: pnpm exec tooling repo:check
 `;
 }
+/**
+* Insert a step at the end of the `check` job's steps, even if other jobs
+* follow. Returns null if we can't find the right insertion point.
+*/
+function insertStepIntoCheckJob(yaml, step) {
+	const lines = yaml.split("\n");
+	const checkJobIdx = lines.findIndex((l) => /^ {2}check:\s*$/.test(l));
+	if (checkJobIdx === -1) return null;
+	let lastStepIdx = -1;
+	for (const [i, line] of lines.entries()) {
+		if (i <= checkJobIdx) continue;
+		if (/^ {2}\S/.test(line)) break;
+		if (/^ {6}/.test(line)) lastStepIdx = i;
+	}
+	if (lastStepIdx === -1) return null;
+	lines.splice(lastStepIdx + 1, 0, step.trimEnd());
+	return lines.join("\n");
+}
 async function generateCi(ctx) {
 	if (ctx.config.ci === "none") return {
 		filePath: "ci",
@@ -1281,13 +1293,15 @@ async function generateCi(ctx) {
 	if (ctx.exists(filePath)) {
 		const existing = ctx.read(filePath);
 		if (existing && !existing.includes("repo:check")) {
-			const patched = existing.trimEnd() + "\n      - run: pnpm exec tooling repo:check\n";
-			ctx.write(filePath, patched);
-			return {
-				filePath,
-				action: "updated",
-				description: "Added `pnpm exec tooling repo:check` step to CI workflow"
-			};
+			const patched = insertStepIntoCheckJob(existing, "      - run: pnpm exec tooling repo:check\n");
+			if (patched) {
+				ctx.write(filePath, patched);
+				return {
+					filePath,
+					action: "updated",
+					description: "Added `pnpm exec tooling repo:check` step to CI workflow"
+				};
+			}
 		}
 		return {
 			filePath,
@@ -2971,7 +2985,7 @@ function mergeGitHub(dryRun) {
 const main = defineCommand({
 	meta: {
 		name: "tooling",
-		version: "0.7.2",
+		version: "0.7.3",
 		description: "Bootstrap and maintain standardized TypeScript project tooling"
 	},
 	subCommands: {
@@ -2984,7 +2998,7 @@ const main = defineCommand({
 		"release:merge": releaseMergeCommand
 	}
 });
-console.log(`@bensandee/tooling v0.7.2`);
+console.log(`@bensandee/tooling v0.7.3`);
 runMain(main);
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bensandee/tooling",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "CLI tool to bootstrap and maintain standardized TypeScript project tooling",
   "bin": {
     "tooling": "./dist/bin.mjs"
@@ -33,7 +33,7 @@
     "tsdown": "0.20.3",
     "typescript": "5.9.3",
     "vitest": "4.0.18",
-    "@bensandee/config": "0.6.3"
+    "@bensandee/config": "0.6.4"
   },
   "scripts": {
     "build": "tsdown",