@bensandee/tooling 0.7.0 → 0.7.2

package/dist/bin.mjs

@@ -64,6 +64,16 @@ function parseRenovateJson(raw) {
 		return {};
 	}
 }
+const ChangesetConfigSchema = z.object({ commit: z.union([z.boolean(), z.string()]).optional() }).loose();
+/** Parse a JSON string as a .changeset/config.json. Returns `undefined` on failure. */
+function parseChangesetConfig(raw) {
+	try {
+		const result = ChangesetConfigSchema.safeParse(JSON.parse(raw));
+		return result.success ? result.data : void 0;
+	} catch {
+		return;
+	}
+}
 /** Parse a JSON string as a package.json. Returns `undefined` on failure. */
 function parsePackageJson(raw) {
 	try {
@@ -519,7 +529,6 @@ function addReleaseDeps(deps, config) {
 		case "release-it":
 			deps["release-it"] = "18.1.2";
 			if (config.structure === "monorepo") deps["@release-it/bumper"] = "7.0.2";
-			if (config.ci === "forgejo") deps["@bensandee/release-it-forgejo"] = "0.1.1";
 			break;
 		case "commit-and-tag-version":
 			deps["commit-and-tag-version"] = "12.5.0";
@@ -582,6 +591,9 @@ async function generatePackageJson(ctx) {
 		for (const [key, value] of Object.entries(devDeps)) if (!(key in existingDevDeps)) {
 			existingDevDeps[key] = value;
 			changes.push(`added devDependency: ${key}`);
+		} else if (key.startsWith("@bensandee/") && value === "latest" && existingDevDeps[key] !== "latest" && existingDevDeps[key] !== "workspace:*") {
+			existingDevDeps[key] = "latest";
+			changes.push(`updated devDependency: ${key} to latest`);
 		}
 		pkg.devDependencies = existingDevDeps;
 		if (!pkg["engines"]) {
@@ -793,47 +805,81 @@ async function generateTsconfig(ctx) {
 	const existing = ctx.read(filePath);
 	if (ctx.config.structure === "monorepo") return [generateMonorepoRootTsconfig(ctx, existing), ...ctx.config.detectPackageTypes ? generateMonorepoPackageTsconfigs(ctx) : []];
 	const extendsValue = `@bensandee/config/tsconfig/${ctx.config.projectType}`;
-	const config = {
-		extends: extendsValue,
-		include: ["src"],
-		exclude: ["node_modules", "dist"]
-	};
-	if (existing) {
-		if (existing.includes("// @bensandee/tooling:ignore")) return [{
+	if (!existing) {
+		const config = {
+			extends: extendsValue,
+			include: ["src"],
+			exclude: ["node_modules", "dist"]
+		};
+		ctx.write(filePath, JSON.stringify(config, null, 2) + "\n");
+		return [{
 			filePath,
-			action: "skipped",
-			description: "Ignored via tooling:ignore comment"
+			action: "created",
+			description: `Generated tsconfig.json with ${extendsValue}`
 		}];
-		const parsed = parseTsconfig(existing);
-		const changes = [];
-		if (!parsed.extends) {
-			parsed.extends = extendsValue;
-			changes.push(`added extends: ${extendsValue}`);
-		}
-		const existingInclude = parsed.include ?? [];
-		for (const entry of config.include) if (!existingInclude.includes(entry)) {
-			existingInclude.push(entry);
-			changes.push(`added "${entry}" to include`);
-		}
-		parsed.include = existingInclude;
-		if (changes.length === 0) return [{
+	}
+	if (existing.includes("// @bensandee/tooling:ignore")) return [{
+		filePath,
+		action: "skipped",
+		description: "Ignored via tooling:ignore comment"
+	}];
+	const parsed = parseTsconfig(existing);
+	if (isSolutionStyle(parsed)) {
+		const results = [{
 			filePath,
 			action: "skipped",
-			description: "Already up to spec"
-		}];
-		ctx.write(filePath, JSON.stringify(parsed, null, 2) + "\n");
-		return [{
-			filePath,
-			action: "updated",
-			description: changes.join(", ")
+			description: "Solution-style tsconfig — traversing references"
 		}];
+		for (const ref of parsed.references ?? []) {
+			const refPath = resolveReferencePath(ref.path);
+			results.push(mergeSingleTsconfig(ctx, refPath, extendsValue));
+		}
+		return results;
+	}
+	return [mergeSingleTsconfig(ctx, filePath, extendsValue)];
+}
+function isSolutionStyle(parsed) {
+	return Array.isArray(parsed.references) && parsed.references.length > 0 && Array.isArray(parsed.files) && parsed.files.length === 0;
+}
+function resolveReferencePath(refPath) {
+	const resolved = refPath.endsWith(".json") ? refPath : path.join(refPath, "tsconfig.json");
+	return path.normalize(resolved);
+}
+function mergeSingleTsconfig(ctx, filePath, extendsValue) {
+	const existing = ctx.read(filePath);
+	if (!existing) return {
+		filePath,
+		action: "skipped",
+		description: "File not found"
+	};
+	if (existing.includes("// @bensandee/tooling:ignore")) return {
+		filePath,
+		action: "skipped",
+		description: "Ignored via tooling:ignore comment"
+	};
+	const parsed = parseTsconfig(existing);
+	const changes = [];
+	if (!parsed.extends) {
+		parsed.extends = extendsValue;
+		changes.push(`added extends: ${extendsValue}`);
 	}
-	ctx.write(filePath, JSON.stringify(config, null, 2) + "\n");
-	return [{
+	const existingInclude = parsed.include ?? [];
+	if (!existingInclude.includes("src")) {
+		existingInclude.push("src");
+		changes.push("added \"src\" to include");
+	}
+	parsed.include = existingInclude;
+	if (changes.length === 0) return {
 		filePath,
-		action: "created",
-		description: `Generated tsconfig.json with @bensandee/config/tsconfig/${ctx.config.projectType}`
-	}];
+		action: "skipped",
+		description: "Already up to spec"
+	};
+	ctx.write(filePath, JSON.stringify(parsed, null, 2) + "\n");
+	return {
+		filePath,
+		action: "updated",
+		description: changes.join(", ")
+	};
 }
 function generateMonorepoRootTsconfig(ctx, existing) {
 	const filePath = "tsconfig.json";
@@ -855,14 +901,10 @@ function generateMonorepoRootTsconfig(ctx, existing) {
 			description: "Already has project references"
 		};
 	}
-	ctx.write(filePath, JSON.stringify({
-		files: [],
-		references: []
-	}, null, 2) + "\n");
 	return {
 		filePath,
-		action: "created",
-		description: "Generated monorepo root tsconfig.json with project references"
+		action: "skipped",
+		description: "No tsconfig.json found"
 	};
 }
 function generateMonorepoPackageTsconfigs(ctx) {
@@ -884,6 +926,18 @@ function generateMonorepoPackageTsconfigs(ctx) {
 				continue;
 			}
 			const parsed = parseTsconfig(existing);
+			if (isSolutionStyle(parsed)) {
+				results.push({
+					filePath,
+					action: "skipped",
+					description: "Solution-style tsconfig — traversing references"
+				});
+				for (const ref of parsed.references ?? []) {
+					const refPath = path.join(relDir, resolveReferencePath(ref.path));
+					results.push(mergeSingleTsconfig(ctx, refPath, extendsValue));
+				}
+				continue;
+			}
 			const changes = [];
 			if (parsed.extends !== extendsValue) {
 				const prev = parsed.extends;
@@ -1542,7 +1596,6 @@ function buildConfig$2(ci, isMonorepo) {
 	};
 	if (ci === "github") config["github"] = { release: true };
 	const plugins = {};
-	if (ci === "forgejo") plugins["@bensandee/release-it-forgejo"] = { release: true };
 	if (isMonorepo) {
 		config["npm"] = {
 			publish: true,
@@ -2117,14 +2170,26 @@ async function runInit(config, options = {}) {
 		p.log.info(`Migration prompt written to ${promptPath}`);
 		p.log.info("Paste its contents into Claude Code to finish the migration.");
 	}
-	const updateCmd = `pnpm update --latest ${getAddedDevDepNames(config).join(" ")}`;
+	const bensandeeDeps = getAddedDevDepNames(config).filter((name) => name.startsWith("@bensandee/"));
+	const hasLockfile = ctx.exists("pnpm-lock.yaml");
+	if (bensandeeDeps.length > 0 && hasLockfile) {
+		s.start("Updating @bensandee/* packages...");
+		try {
+			execSync(`pnpm update --latest ${bensandeeDeps.join(" ")}`, {
+				cwd: config.targetDir,
+				stdio: "ignore"
+			});
+			s.stop("Updated @bensandee/* packages");
+		} catch (_error) {
+			s.stop("Could not update @bensandee/* packages — run pnpm install first");
+		}
+	}
 	p.note([
 		"1. Run: pnpm install",
-		`2. Run: ${updateCmd}`,
-		"3. Run: pnpm typecheck",
-		"4. Run: pnpm build",
-		"5. Run: pnpm test",
-		...options.noPrompt ? [] : ["6. Paste .tooling-migrate.md into Claude Code for cleanup"]
+		"2. Run: pnpm typecheck",
+		"3. Run: pnpm build",
+		"4. Run: pnpm test",
+		...options.noPrompt ? [] : ["5. Paste .tooling-migrate.md into Claude Code for cleanup"]
 	].join("\n"), "Next steps");
 	return results;
 }
@@ -2513,10 +2578,13 @@ async function runVersionMode(executor, config) {
 	const changesetConfigPath = path.join(config.cwd, ".changeset", "config.json");
 	const originalConfig = executor.readFile(changesetConfigPath);
 	if (originalConfig) {
-		const parsed = JSON.parse(originalConfig);
-		if (parsed.commit) {
-			parsed.commit = false;
-			executor.writeFile(changesetConfigPath, JSON.stringify(parsed, null, 2) + "\n");
+		const parsed = parseChangesetConfig(originalConfig);
+		if (parsed?.commit) {
+			const patched = {
+				...parsed,
+				commit: false
+			};
+			executor.writeFile(changesetConfigPath, JSON.stringify(patched, null, 2) + "\n");
 			debug(config, "Temporarily disabled changeset commit:true");
 		}
 	}
@@ -2903,7 +2971,7 @@ function mergeGitHub(dryRun) {
 const main = defineCommand({
 	meta: {
 		name: "tooling",
-		version: "0.7.0",
+		version: "0.7.2",
 		description: "Bootstrap and maintain standardized TypeScript project tooling"
 	},
 	subCommands: {
@@ -2916,7 +2984,7 @@ const main = defineCommand({
 		"release:merge": releaseMergeCommand
 	}
 });
-console.log(`@bensandee/tooling v0.7.0`);
+console.log(`@bensandee/tooling v0.7.2`);
 runMain(main);
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bensandee/tooling",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "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.2"
+    "@bensandee/config": "0.6.3"
   },
   "scripts": {
     "build": "tsdown",