@bensandee/tooling 0.6.0 → 0.6.2

package/dist/bin.mjs

@@ -4,6 +4,7 @@ import * as p from "@clack/prompts";
 import { execSync } from "node:child_process";
 import path from "node:path";
 import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync } from "node:fs";
+import JSON5 from "json5";
 import { parse } from "jsonc-parser";
 import { z } from "zod";
 
@@ -53,10 +54,14 @@ function parseTsconfig(raw) {
 	const result = TsconfigSchema.safeParse(parse(raw));
 	return result.success ? result.data : {};
 }
-/** Parse a JSON string as a renovate.json. Returns a typed object with `{}` fallback on failure. */
+/** Parse a JSON/JSON5/JSONC string as a renovate config. Returns a typed object with `{}` fallback on failure. */
 function parseRenovateJson(raw) {
-	const result = RenovateSchema.safeParse(parse(raw));
-	return result.success ? result.data : {};
+	try {
+		const result = RenovateSchema.safeParse(JSON5.parse(raw));
+		return result.success ? result.data : {};
+	} catch {
+		return {};
+	}
 }
 /** Parse a JSON string as a package.json. Returns `undefined` on failure. */
 function parsePackageJson(raw) {
@@ -436,8 +441,7 @@ const STANDARD_SCRIPTS_SINGLE = {
 	test: "vitest run",
 	lint: "oxlint",
 	knip: "knip",
-	check: "pnpm typecheck && pnpm build && pnpm lint && pnpm knip",
-	prepare: "lefthook install"
+	check: "pnpm typecheck && pnpm build && pnpm lint && pnpm knip"
 };
 const STANDARD_SCRIPTS_MONOREPO = {
 	build: "pnpm -r build",
@@ -445,8 +449,7 @@ const STANDARD_SCRIPTS_MONOREPO = {
 	typecheck: "pnpm -r --parallel run typecheck",
 	lint: "oxlint",
 	knip: "knip",
-	check: "pnpm typecheck && pnpm build && pnpm lint && pnpm knip",
-	prepare: "lefthook install"
+	check: "pnpm typecheck && pnpm build && pnpm lint && pnpm knip"
 };
 /** DevDeps that belong in every project (single repo) or per-package (monorepo). */
 const PER_PACKAGE_DEV_DEPS = {
@@ -1237,15 +1240,15 @@ const RENOVATE_CONFIG_PATHS = [
 	".github/renovate.json5"
 ];
 async function generateRenovate(ctx) {
-	const filePath = "renovate.json";
+	const defaultPath = "renovate.json";
 	if (!ctx.config.setupRenovate) return {
-		filePath,
+		filePath: defaultPath,
 		action: "skipped",
 		description: "Renovate not requested"
 	};
 	const existingPath = RENOVATE_CONFIG_PATHS.find((p) => ctx.exists(p));
-	if (existingPath === filePath) {
-		const existing = ctx.read(filePath);
+	if (existingPath) {
+		const existing = ctx.read(existingPath);
 		if (existing) {
 			const parsed = parseRenovateJson(existing);
 			const existingExtends = parsed.extends ?? [];
@@ -1253,9 +1256,9 @@ async function generateRenovate(ctx) {
 			if (legacyIndex !== -1) {
 				existingExtends[legacyIndex] = SHARED_PRESET;
 				parsed.extends = existingExtends;
-				ctx.write(filePath, JSON.stringify(parsed, null, 2) + "\n");
+				ctx.write(existingPath, JSON.stringify(parsed, null, 2) + "\n");
 				return {
-					filePath,
+					filePath: existingPath,
 					action: "updated",
 					description: `Migrated extends: ${LEGACY_PRESET} → ${SHARED_PRESET}`
 				};
@@ -1263,32 +1266,27 @@ async function generateRenovate(ctx) {
 			if (!existingExtends.includes(SHARED_PRESET)) {
 				existingExtends.unshift(SHARED_PRESET);
 				parsed.extends = existingExtends;
-				ctx.write(filePath, JSON.stringify(parsed, null, 2) + "\n");
+				ctx.write(existingPath, JSON.stringify(parsed, null, 2) + "\n");
 				return {
-					filePath,
+					filePath: existingPath,
 					action: "updated",
 					description: `Added extends: ${SHARED_PRESET}`
 				};
 			}
 			return {
-				filePath,
+				filePath: existingPath,
 				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]
 	};
-	ctx.write(filePath, JSON.stringify(config, null, 2) + "\n");
+	ctx.write(defaultPath, JSON.stringify(config, null, 2) + "\n");
 	return {
-		filePath,
+		filePath: defaultPath,
 		action: "created",
 		description: "Generated renovate.json extending shared config"
 	};
@@ -1816,8 +1814,8 @@ function cleanPackageJson(ctx, results) {
 		}
 	}
 	if (pkg.scripts?.["prepare"] && /\bhusky\b/.test(pkg.scripts["prepare"])) {
-		pkg.scripts["prepare"] = "lefthook install";
-		changes.push("replaced prepare script: husky → lefthook install");
+		delete pkg.scripts["prepare"];
+		changes.push("removed husky prepare script");
 	}
 	if (changes.length === 0) return;
 	ctx.write("package.json", JSON.stringify(pkg, null, 2) + "\n");
@@ -1913,7 +1911,9 @@ const initCommand = defineCommand({
 });
 async function runInit(config, options = {}) {
 	const detected = detectProject(config.targetDir);
+	const s = p.spinner();
 	const { ctx, archivedFiles } = createContext(config, options.confirmOverwrite ?? (async (relativePath) => {
+		s.stop("Paused");
 		const result = await p.select({
 			message: `${relativePath} already exists. What do you want to do?`,
 			options: [{
@@ -1924,11 +1924,11 @@ async function runInit(config, options = {}) {
 				label: "Skip"
 			}]
 		});
+		s.start("Generating configuration files...");
 		if (p.isCancel(result)) return "skip";
 		return result;
 	}));
 	const results = [];
-	const s = p.spinner();
 	s.start("Generating configuration files...");
 	results.push(await generatePackageJson(ctx));
 	results.push(await generatePnpmWorkspace(ctx));
@@ -2701,7 +2701,7 @@ function mergeGitHub(dryRun) {
 const main = defineCommand({
 	meta: {
 		name: "tooling",
-		version: "0.6.0",
+		version: "0.6.2",
 		description: "Bootstrap and maintain standardized TypeScript project tooling"
 	},
 	subCommands: {
@@ -2713,7 +2713,7 @@ const main = defineCommand({
 		"release:merge": releaseMergeCommand
 	}
 });
-console.log(`@bensandee/tooling v0.6.0`);
+console.log(`@bensandee/tooling v0.6.2`);
 runMain(main);
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bensandee/tooling",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "CLI tool to bootstrap and maintain standardized TypeScript project tooling",
   "bin": {
     "tooling": "./dist/bin.mjs"
@@ -23,6 +23,7 @@
   "dependencies": {
     "@clack/prompts": "^1.0.1",
     "citty": "^0.2.1",
+    "json5": "^2.2.3",
     "jsonc-parser": "^3.3.1",
     "zod": "^4.3.6"
   },
@@ -31,7 +32,7 @@
     "tsdown": "0.20.3",
     "typescript": "5.9.3",
     "vitest": "4.0.18",
-    "@bensandee/config": "0.6.0"
+    "@bensandee/config": "0.6.1"
   },
   "scripts": {
     "build": "tsdown",