@bensandee/tooling 0.2.0 → 0.3.0

package/dist/bin.mjs

@@ -449,6 +449,7 @@ const STANDARD_SCRIPTS_MONOREPO = {
 };
 /** DevDeps that belong in every project (single repo) or per-package (monorepo). */
 const PER_PACKAGE_DEV_DEPS = {
+	"@tsconfig/strictest": "2.0.8",
 	"@types/node": "25.3.2",
 	tsdown: "0.20.3",
 	typescript: "5.9.3",
@@ -1051,12 +1052,19 @@ const STANDARD_ENTRIES = [
 	"!.env.example",
 	".tooling-migrate.md"
 ];
+/** Normalize a gitignore entry for comparison: strip leading `/` and trailing `/`. */
+function normalizeEntry(entry) {
+	let s = entry.trim();
+	if (s.startsWith("/")) s = s.slice(1);
+	if (s.endsWith("/")) s = s.slice(0, -1);
+	return s;
+}
 async function generateGitignore(ctx) {
 	const filePath = ".gitignore";
 	const existing = ctx.read(filePath);
 	if (existing) {
-		const existingLines = new Set(existing.split("\n").map((line) => line.trim()).filter((line) => line.length > 0));
-		const missing = STANDARD_ENTRIES.filter((entry) => !existingLines.has(entry));
+		const existingNormalized = new Set(existing.split("\n").map(normalizeEntry).filter((line) => line.length > 0));
+		const missing = STANDARD_ENTRIES.filter((entry) => !existingNormalized.has(normalizeEntry(entry)));
 		if (missing.length === 0) return {
 			filePath,
 			action: "skipped",
@@ -1158,39 +1166,56 @@ const KNIP_CONFIG_MONOREPO = {
 		}
 	}
 };
+/** All known knip config file locations, in priority order. */
+const KNIP_CONFIG_PATHS = [
+	"knip.json",
+	"knip.jsonc",
+	"knip.ts",
+	"knip.mts",
+	"knip.config.ts",
+	"knip.config.mts"
+];
 async function generateKnip(ctx) {
 	const filePath = "knip.json";
-	const existing = ctx.read(filePath);
 	const isMonorepo = ctx.config.structure === "monorepo";
-	if (existing) {
-		const parsed = parseKnipJson(existing);
-		const changes = [];
-		if (isMonorepo && !parsed.workspaces) {
-			parsed.workspaces = KNIP_CONFIG_MONOREPO.workspaces;
-			changes.push("added monorepo workspaces config");
-		}
-		if (!isMonorepo) {
-			if (!parsed.entry) {
-				parsed.entry = KNIP_CONFIG_SINGLE.entry;
-				changes.push("added entry patterns");
+	const existingPath = KNIP_CONFIG_PATHS.find((p) => ctx.exists(p));
+	if (existingPath === filePath) {
+		const existing = ctx.read(filePath);
+		if (existing) {
+			const parsed = parseKnipJson(existing);
+			const changes = [];
+			if (isMonorepo && !parsed.workspaces) {
+				parsed.workspaces = KNIP_CONFIG_MONOREPO.workspaces;
+				changes.push("added monorepo workspaces config");
 			}
-			if (!parsed.project) {
-				parsed.project = KNIP_CONFIG_SINGLE.project;
-				changes.push("added project patterns");
+			if (!isMonorepo) {
+				if (!parsed.entry) {
+					parsed.entry = KNIP_CONFIG_SINGLE.entry;
+					changes.push("added entry patterns");
+				}
+				if (!parsed.project) {
+					parsed.project = KNIP_CONFIG_SINGLE.project;
+					changes.push("added project patterns");
+				}
 			}
+			if (changes.length === 0) return {
+				filePath,
+				action: "skipped",
+				description: "Already configured"
+			};
+			ctx.write(filePath, JSON.stringify(parsed, null, 2) + "\n");
+			return {
+				filePath,
+				action: "updated",
+				description: changes.join(", ")
+			};
 		}
-		if (changes.length === 0) return {
-			filePath,
-			action: "skipped",
-			description: "Already configured"
-		};
-		ctx.write(filePath, JSON.stringify(parsed, null, 2) + "\n");
-		return {
-			filePath,
-			action: "updated",
-			description: changes.join(", ")
-		};
 	}
+	if (existingPath) return {
+		filePath: existingPath,
+		action: "skipped",
+		description: `Existing config found at ${existingPath}`
+	};
 	const config = isMonorepo ? KNIP_CONFIG_MONOREPO : KNIP_CONFIG_SINGLE;
 	ctx.write(filePath, JSON.stringify(config, null, 2) + "\n");
 	return {
@@ -1203,6 +1228,15 @@ async function generateKnip(ctx) {
 //#endregion
 //#region src/generators/renovate.ts
 const SHARED_PRESET = "@bensandee/config";
+/** All known renovate config file locations, in priority order. */
+const RENOVATE_CONFIG_PATHS = [
+	"renovate.json",
+	"renovate.json5",
+	".renovaterc",
+	".renovaterc.json",
+	".github/renovate.json",
+	".github/renovate.json5"
+];
 async function generateRenovate(ctx) {
 	const filePath = "renovate.json";
 	if (!ctx.config.setupRenovate) return {
@@ -1210,26 +1244,34 @@ async function generateRenovate(ctx) {
 		action: "skipped",
 		description: "Renovate not requested"
 	};
-	const existing = ctx.read(filePath);
-	if (existing) {
-		const parsed = parseRenovateJson(existing);
-		const existingExtends = parsed.extends ?? [];
-		if (!existingExtends.includes(SHARED_PRESET)) {
-			existingExtends.unshift(SHARED_PRESET);
-			parsed.extends = existingExtends;
-			ctx.write(filePath, JSON.stringify(parsed, null, 2) + "\n");
+	const existingPath = RENOVATE_CONFIG_PATHS.find((p) => ctx.exists(p));
+	if (existingPath === filePath) {
+		const existing = ctx.read(filePath);
+		if (existing) {
+			const parsed = parseRenovateJson(existing);
+			const existingExtends = parsed.extends ?? [];
+			if (!existingExtends.includes(SHARED_PRESET)) {
+				existingExtends.unshift(SHARED_PRESET);
+				parsed.extends = existingExtends;
+				ctx.write(filePath, JSON.stringify(parsed, null, 2) + "\n");
+				return {
+					filePath,
+					action: "updated",
+					description: `Added extends: ${SHARED_PRESET}`
+				};
+			}
 			return {
 				filePath,
-				action: "updated",
-				description: `Added extends: ${SHARED_PRESET}`
+				action: "skipped",
+				description: "Already extends shared config"
 			};
 		}
-		return {
-			filePath,
-			action: "skipped",
-			description: "Already extends shared config"
-		};
 	}
+	if (existingPath) return {
+		filePath: existingPath,
+		action: "skipped",
+		description: `Existing config found at ${existingPath}`
+	};
 	const config = {
 		$schema: "https://docs.renovatebot.com/renovate-schema.json",
 		extends: [SHARED_PRESET]
@@ -1673,28 +1715,47 @@ function buildConfig(formatter) {
 	return `export default {\n  "*": "${formatter === "prettier" ? "prettier --write" : "oxfmt"}",\n};\n`;
 }
 const HUSKY_PRE_COMMIT = "pnpm exec lint-staged\n";
+/** All known lint-staged config file locations, in priority order. */
+const LINT_STAGED_CONFIG_PATHS = [
+	"lint-staged.config.mjs",
+	"lint-staged.config.js",
+	"lint-staged.config.cjs",
+	".lintstagedrc",
+	".lintstagedrc.json",
+	".lintstagedrc.yaml",
+	".lintstagedrc.yml",
+	".lintstagedrc.mjs",
+	".lintstagedrc.cjs"
+];
 async function generateLintStaged(ctx) {
 	const filePath = "lint-staged.config.mjs";
 	const huskyPath = ".husky/pre-commit";
 	const content = buildConfig(ctx.config.formatter);
-	const existing = ctx.read(filePath);
 	if (ctx.read(huskyPath) !== HUSKY_PRE_COMMIT) ctx.write(huskyPath, HUSKY_PRE_COMMIT);
-	if (existing) {
-		if (existing === content) return {
-			filePath,
-			action: "skipped",
-			description: "Already configured"
-		};
-		if (await ctx.confirmOverwrite(filePath) === "skip") return {
-			filePath,
-			action: "skipped",
-			description: "Existing lint-staged config preserved"
-		};
-	}
+	const existingPath = LINT_STAGED_CONFIG_PATHS.find((p) => ctx.exists(p));
+	if (existingPath === filePath) {
+		const existing = ctx.read(filePath);
+		if (existing) {
+			if (existing === content) return {
+				filePath,
+				action: "skipped",
+				description: "Already configured"
+			};
+			if (await ctx.confirmOverwrite(filePath) === "skip") return {
+				filePath,
+				action: "skipped",
+				description: "Existing lint-staged config preserved"
+			};
+		}
+	} else if (existingPath) return {
+		filePath: existingPath,
+		action: "skipped",
+		description: `Existing config found at ${existingPath}`
+	};
 	ctx.write(filePath, content);
 	return {
 		filePath,
-		action: existing ? "updated" : "created",
+		action: existingPath === filePath ? "updated" : "created",
 		description: "Generated lint-staged config and husky pre-commit hook"
 	};
 }

package/package.json

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