@bensandee/tooling 0.8.1 → 0.9.0

package/dist/bin.mjs

@@ -437,29 +437,31 @@ function writeFile(targetDir, relativePath, content) {
 function createContext(config, confirmOverwrite) {
 	const archivedFiles = [];
 	const pkgRaw = readFile(config.targetDir, "package.json");
-	return {
-		ctx: {
-			config,
-			targetDir: config.targetDir,
-			packageJson: pkgRaw ? parsePackageJson(pkgRaw) : void 0,
-			exists: (rel) => fileExists(config.targetDir, rel),
-			read: (rel) => readFile(config.targetDir, rel),
-			write: (rel, content) => {
-				if (!rel.startsWith(".tooling-archived/")) {
-					const existing = readFile(config.targetDir, rel);
-					if (existing !== void 0 && existing !== content) {
-						writeFile(config.targetDir, `.tooling-archived/${rel}`, existing);
-						archivedFiles.push(rel);
-					}
+	const ctx = {
+		config,
+		targetDir: config.targetDir,
+		packageJson: pkgRaw ? parsePackageJson(pkgRaw) : void 0,
+		exists: (rel) => fileExists(config.targetDir, rel),
+		read: (rel) => readFile(config.targetDir, rel),
+		write: (rel, content) => {
+			if (!rel.startsWith(".tooling-archived/")) {
+				const existing = readFile(config.targetDir, rel);
+				if (existing !== void 0 && existing !== content) {
+					writeFile(config.targetDir, `.tooling-archived/${rel}`, existing);
+					archivedFiles.push(rel);
 				}
-				writeFile(config.targetDir, rel, content);
-			},
-			remove: (rel) => {
-				const fullPath = path.join(config.targetDir, rel);
-				if (existsSync(fullPath)) rmSync(fullPath);
-			},
-			confirmOverwrite
+			}
+			writeFile(config.targetDir, rel, content);
+			if (rel === "package.json") ctx.packageJson = parsePackageJson(content);
+		},
+		remove: (rel) => {
+			const fullPath = path.join(config.targetDir, rel);
+			if (existsSync(fullPath)) rmSync(fullPath);
 		},
+		confirmOverwrite
+	};
+	return {
+		ctx,
 		archivedFiles
 	};
 }
@@ -472,20 +474,22 @@ function createDryRunContext(config) {
 	const pkgRaw = readFile(config.targetDir, "package.json");
 	const pendingWrites = /* @__PURE__ */ new Map();
 	const shadow = /* @__PURE__ */ new Map();
-	return {
-		ctx: {
-			config,
-			targetDir: config.targetDir,
-			packageJson: pkgRaw ? parsePackageJson(pkgRaw) : void 0,
-			exists: (rel) => shadow.has(rel) || fileExists(config.targetDir, rel),
-			read: (rel) => shadow.get(rel) ?? readFile(config.targetDir, rel),
-			write: (rel, content) => {
-				pendingWrites.set(rel, content);
-				shadow.set(rel, content);
-			},
-			remove: () => {},
-			confirmOverwrite: async () => "overwrite"
+	const ctx = {
+		config,
+		targetDir: config.targetDir,
+		packageJson: pkgRaw ? parsePackageJson(pkgRaw) : void 0,
+		exists: (rel) => shadow.has(rel) || fileExists(config.targetDir, rel),
+		read: (rel) => shadow.get(rel) ?? readFile(config.targetDir, rel),
+		write: (rel, content) => {
+			pendingWrites.set(rel, content);
+			shadow.set(rel, content);
+			if (rel === "package.json") ctx.packageJson = parsePackageJson(content);
 		},
+		remove: () => {},
+		confirmOverwrite: async () => "overwrite"
+	};
+	return {
+		ctx,
 		pendingWrites
 	};
 }
@@ -562,8 +566,8 @@ function addReleaseDeps(deps, config) {
 function getAddedDevDepNames(config) {
 	const deps = { ...ROOT_DEV_DEPS };
 	if (config.structure !== "monorepo") Object.assign(deps, PER_PACKAGE_DEV_DEPS);
-	deps["@bensandee/config"] = "0.7.0";
-	deps["@bensandee/tooling"] = "0.8.1";
+	deps["@bensandee/config"] = "0.7.1";
+	deps["@bensandee/tooling"] = "0.9.0";
 	if (config.formatter === "oxfmt") deps["oxfmt"] = "0.35.0";
 	if (config.formatter === "prettier") deps["prettier"] = "3.8.1";
 	addReleaseDeps(deps, config);
@@ -583,8 +587,8 @@ async function generatePackageJson(ctx) {
 	if (ctx.config.releaseStrategy !== "none") allScripts["trigger-release"] = "pnpm exec tooling release:trigger";
 	const devDeps = { ...ROOT_DEV_DEPS };
 	if (!isMonorepo) Object.assign(devDeps, PER_PACKAGE_DEV_DEPS);
-	devDeps["@bensandee/config"] = isWorkspacePackage(ctx, "@bensandee/config") ? "workspace:*" : "0.7.0";
-	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.8.1";
+	devDeps["@bensandee/config"] = isWorkspacePackage(ctx, "@bensandee/config") ? "workspace:*" : "0.7.1";
+	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.9.0";
 	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";
@@ -2058,15 +2062,107 @@ 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 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";
 }
+const YamlSchemasSchema = z.record(z.string(), z.unknown());
+/** Merge yaml.schemas into a settings object. Returns the result and whether anything changed. */
+function mergeYamlSchemas(settings) {
+	const parsed = YamlSchemasSchema.safeParse(settings["yaml.schemas"]);
+	const yamlSchemas = parsed.success ? { ...parsed.data } : {};
+	if (SCHEMA_LOCAL_PATH in yamlSchemas) return {
+		merged: settings,
+		changed: false
+	};
+	yamlSchemas[SCHEMA_LOCAL_PATH] = SCHEMA_GLOB;
+	return {
+		merged: {
+			...settings,
+			"yaml.schemas": yamlSchemas
+		},
+		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);
+		if (!raw) return {
+			filePath: SETTINGS_PATH,
+			action: "skipped",
+			description: "Could not read existing settings"
+		};
+		const parsed = VscodeSettingsSchema.safeParse(parse(raw));
+		if (!parsed.success) return {
+			filePath: SETTINGS_PATH,
+			action: "skipped",
+			description: "Could not parse existing settings"
+		};
+		const { merged, changed } = mergeYamlSchemas(parsed.data);
+		if (!changed) return {
+			filePath: SETTINGS_PATH,
+			action: "skipped",
+			description: "Already has Forgejo schema mapping"
+		};
+		ctx.write(SETTINGS_PATH, serializeSettings(merged));
+		return {
+			filePath: SETTINGS_PATH,
+			action: "updated",
+			description: "Added Forgejo workflow schema mapping"
+		};
+	}
+	ctx.write(SETTINGS_PATH, serializeSettings({ "yaml.schemas": { [SCHEMA_LOCAL_PATH]: SCHEMA_GLOB } }));
+	return {
+		filePath: SETTINGS_PATH,
+		action: "created",
+		description: "Generated .vscode/settings.json with Forgejo workflow schema"
+	};
+}
 async function generateVscodeSettings(ctx) {
 	const results = [];
 	if (ctx.config.ci !== "forgejo") {
@@ -2100,54 +2196,8 @@ async function generateVscodeSettings(ctx) {
 			description: "Copied Forgejo workflow schema from @bensandee/config"
 		});
 	}
-	const schemaGlob = ".forgejo/workflows/*.yml";
-	if (ctx.exists(SETTINGS_PATH)) {
-		const raw = ctx.read(SETTINGS_PATH);
-		if (!raw) {
-			results.push({
-				filePath: SETTINGS_PATH,
-				action: "skipped",
-				description: "Could not read existing settings"
-			});
-			return results;
-		}
-		const parsed = VscodeSettingsSchema.safeParse(JSON.parse(raw));
-		if (!parsed.success) {
-			results.push({
-				filePath: SETTINGS_PATH,
-				action: "skipped",
-				description: "Could not parse existing settings"
-			});
-			return results;
-		}
-		const existing = parsed.data;
-		const yamlSchemas = existing["yaml.schemas"];
-		if (SCHEMA_LOCAL_PATH in yamlSchemas) {
-			results.push({
-				filePath: SETTINGS_PATH,
-				action: "skipped",
-				description: "Already has Forgejo schema mapping"
-			});
-			return results;
-		}
-		yamlSchemas[SCHEMA_LOCAL_PATH] = schemaGlob;
-		ctx.write(SETTINGS_PATH, serializeSettings({
-			...existing,
-			"yaml.schemas": yamlSchemas
-		}));
-		results.push({
-			filePath: SETTINGS_PATH,
-			action: "updated",
-			description: "Added Forgejo workflow schema mapping"
-		});
-	} else {
-		ctx.write(SETTINGS_PATH, serializeSettings({ "yaml.schemas": { [SCHEMA_LOCAL_PATH]: schemaGlob } }));
-		results.push({
-			filePath: SETTINGS_PATH,
-			action: "created",
-			description: "Generated .vscode/settings.json with Forgejo workflow schema"
-		});
-	}
+	const wsFile = findWorkspaceFile(ctx.targetDir);
+	results.push(wsFile ? writeSchemaToWorkspaceFile(ctx, wsFile) : writeSchemaToSettings(ctx));
 	return results;
 }
 //#endregion
@@ -2355,7 +2405,7 @@ async function runInit(config, options = {}) {
 		const promptPath = ".tooling-migrate.md";
 		ctx.write(promptPath, prompt);
 		p.log.info(`Migration prompt written to ${promptPath}`);
-		p.log.info("Paste its contents into Claude Code to finish the migration.");
+		p.log.info("In Claude Code, run: \"Execute the steps in .tooling-migrate.md\"");
 	}
 	const bensandeeDeps = getAddedDevDepNames(config).filter((name) => name.startsWith("@bensandee/"));
 	const hasLockfile = ctx.exists("pnpm-lock.yaml");
@@ -2376,7 +2426,7 @@ async function runInit(config, options = {}) {
 		"2. Run: pnpm typecheck",
 		"3. Run: pnpm build",
 		"4. Run: pnpm test",
-		...options.noPrompt ? [] : ["5. Paste .tooling-migrate.md into Claude Code for cleanup"]
+		...options.noPrompt ? [] : ["5. In Claude Code, run: \"Execute the steps in .tooling-migrate.md\""]
 	].join("\n"), "Next steps");
 	return results;
 }
@@ -2398,9 +2448,12 @@ const updateCommand = defineCommand({
 });
 async function runUpdate(targetDir) {
 	const saved = loadToolingConfig(targetDir);
-	const detected = buildDefaultConfig(targetDir, {});
-	if (!saved) p.log.warn("No .tooling.json found — using detected defaults. Run `tooling repo:init` to save your preferences.");
-	return runInit(saved ? mergeWithSavedConfig(detected, saved) : detected, {
+	if (!saved) {
+		p.log.error("No .tooling.json found. Run `tooling repo:init` first to initialize the project.");
+		process.exitCode = 1;
+		return [];
+	}
+	return runInit(mergeWithSavedConfig(buildDefaultConfig(targetDir, {}), saved), {
 		noPrompt: true,
 		confirmOverwrite: async () => "overwrite"
 	});
@@ -2424,9 +2477,11 @@ const checkCommand = defineCommand({
 });
 async function runCheck(targetDir) {
 	const saved = loadToolingConfig(targetDir);
-	const detected = buildDefaultConfig(targetDir, {});
-	if (!saved) p.log.warn("No .tooling.json found — using detected defaults. Run `tooling repo:init` to save your preferences.");
-	const { ctx, pendingWrites } = createDryRunContext(saved ? mergeWithSavedConfig(detected, saved) : detected);
+	if (!saved) {
+		p.log.error("No .tooling.json found. Run `tooling repo:init` first to initialize the project.");
+		return 1;
+	}
+	const { ctx, pendingWrites } = createDryRunContext(mergeWithSavedConfig(buildDefaultConfig(targetDir, {}), saved));
 	const actionable = (await runGenerators(ctx)).filter((r) => r.action === "created" || r.action === "updated");
 	if (actionable.length === 0) {
 		p.log.success("Repository is up to date.");
@@ -3152,7 +3207,7 @@ function mergeGitHub(dryRun) {
 const main = defineCommand({
 	meta: {
 		name: "tooling",
-		version: "0.8.1",
+		version: "0.9.0",
 		description: "Bootstrap and maintain standardized TypeScript project tooling"
 	},
 	subCommands: {
@@ -3165,7 +3220,7 @@ const main = defineCommand({
 		"release:merge": releaseMergeCommand
 	}
 });
-console.log(`@bensandee/tooling v0.8.1`);
+console.log(`@bensandee/tooling v0.9.0`);
 runMain(main);
 //#endregion
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bensandee/tooling",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "description": "CLI tool to bootstrap and maintain standardized TypeScript project tooling",
   "bin": {
     "tooling": "./dist/bin.mjs"
@@ -33,7 +33,7 @@
     "tsdown": "0.21.0",
     "typescript": "5.9.3",
     "vitest": "4.0.18",
-    "@bensandee/config": "0.7.0"
+    "@bensandee/config": "0.7.1"
   },
   "scripts": {
     "build": "tsdown",