@bensandee/tooling 0.35.0 → 0.36.0

package/dist/bin.mjs

@@ -956,7 +956,76 @@ function runDockerPublish(executor, config) {
 //#endregion
 //#region src/utils/yaml-merge.ts
 const IGNORE_PATTERN = "@bensandee/tooling:ignore";
+const CUSTOM_START = "# @tooling:custom";
+const CUSTOM_END = "# @tooling:endcustom";
 const FORGEJO_SCHEMA_COMMENT = "# yaml-language-server: $schema=../../.vscode/forgejo-workflow.schema.json\n";
+/** Extract custom blocks from a workflow file, recording their anchor lines. */
+function extractCustomBlocks(content) {
+	const lines = content.split("\n");
+	const blocks = [];
+	let i = 0;
+	while (i < lines.length) if (lines[i].trim() === CUSTOM_START) {
+		let anchor = "";
+		for (let j = i - 1; j >= 0; j--) if (lines[j].trim() !== "") {
+			anchor = lines[j].trim();
+			break;
+		}
+		const blockLines = [lines[i]];
+		i++;
+		while (i < lines.length && lines[i].trim() !== CUSTOM_END) {
+			blockLines.push(lines[i]);
+			i++;
+		}
+		if (i < lines.length) {
+			blockLines.push(lines[i]);
+			i++;
+		}
+		blocks.push({
+			anchor,
+			lines: blockLines
+		});
+	} else i++;
+	return blocks;
+}
+/** Remove custom blocks (markers + content) from a workflow string. */
+function stripCustomBlocks(content) {
+	const lines = content.split("\n");
+	const result = [];
+	let inCustom = false;
+	for (const line of lines) {
+		if (line.trim() === CUSTOM_START) {
+			inCustom = true;
+			continue;
+		}
+		if (inCustom && line.trim() === CUSTOM_END) {
+			inCustom = false;
+			continue;
+		}
+		if (!inCustom) result.push(line);
+	}
+	return result.join("\n");
+}
+/** Insert previously extracted custom blocks into freshly generated content, anchored by preceding line. */
+function insertCustomBlocks(generated, blocks) {
+	if (blocks.length === 0) return generated;
+	const lines = generated.split("\n");
+	const insertions = [];
+	for (const block of blocks) {
+		let insertAfter = -1;
+		for (let i = 0; i < lines.length; i++) if (lines[i].trim() === block.anchor) {
+			insertAfter = i;
+			break;
+		}
+		if (insertAfter < 0) insertAfter = lines.length - 1;
+		insertions.push({
+			afterIndex: insertAfter,
+			block
+		});
+	}
+	insertions.sort((a, b) => b.afterIndex - a.afterIndex);
+	for (const { afterIndex, block } of insertions) lines.splice(afterIndex + 1, 0, ...block.lines);
+	return lines.join("\n");
+}
 /** Prepend the Forgejo schema comment if it's not already present. No-op for GitHub. */
 function ensureSchemaComment(content, ci) {
 	if (ci !== "forgejo") return content;
@@ -1014,7 +1083,7 @@ function mergeLefthookCommands(existing, requiredCommands) {
 * don't cause unnecessary overwrites.
 */
 function normalizeWorkflow(content) {
-	const doc = parseDocument(content.replaceAll(/node\s+packages\/tooling-cli\/dist\/bin\.mjs/g, "pnpm exec bst"));
+	const doc = parseDocument(stripCustomBlocks(content).replaceAll(/node\s+packages\/tooling-cli\/dist\/bin\.mjs/g, "pnpm exec bst"));
 	doc.comment = null;
 	doc.commentBefore = null;
 	visit(doc, {
@@ -1156,7 +1225,9 @@ async function generateDeployCi(ctx) {
 			description: "Publish workflow already up to date"
 		};
 	}
-	ctx.write(workflowPath, preserveDevBinaryPath(content, existing));
+	const withDevPath = preserveDevBinaryPath(content, existing);
+	const final = existing ? insertCustomBlocks(withDevPath, extractCustomBlocks(existing)) : withDevPath;
+	ctx.write(workflowPath, final);
 	return {
 		filePath: workflowPath,
 		action: alreadyExists ? "updated" : "created",
@@ -1427,7 +1498,7 @@ function getAddedDevDepNames(config) {
 	const deps = { ...ROOT_DEV_DEPS };
 	if (config.structure !== "monorepo") Object.assign(deps, PER_PACKAGE_DEV_DEPS);
 	deps["@bensandee/config"] = "0.9.1";
-	deps["@bensandee/tooling"] = "0.35.0";
+	deps["@bensandee/tooling"] = "0.36.0";
 	if (config.formatter === "oxfmt") deps["oxfmt"] = {
 		"@changesets/cli": "2.30.0",
 		"@release-it/bumper": "7.0.5",
@@ -1482,7 +1553,7 @@ async function generatePackageJson(ctx) {
 	const devDeps = { ...ROOT_DEV_DEPS };
 	if (!isMonorepo) Object.assign(devDeps, PER_PACKAGE_DEV_DEPS);
 	devDeps["@bensandee/config"] = isWorkspacePackage(ctx, "@bensandee/config") ? "workspace:*" : "0.9.1";
-	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.35.0";
+	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.36.0";
 	if (ctx.config.useEslintPlugin) devDeps["@bensandee/eslint-plugin"] = isWorkspacePackage(ctx, "@bensandee/eslint-plugin") ? "workspace:*" : "0.9.2";
 	if (ctx.config.formatter === "oxfmt") devDeps["oxfmt"] = {
 		"@changesets/cli": "2.30.0",
@@ -2116,7 +2187,9 @@ async function generateCi(ctx) {
 			description: "CI workflow already up to date"
 		};
 	}
-	ctx.write(filePath, preserveDevBinaryPath(content, existing));
+	const withDevPath = preserveDevBinaryPath(content, existing);
+	const final = existing ? insertCustomBlocks(withDevPath, extractCustomBlocks(existing)) : withDevPath;
+	ctx.write(filePath, final);
 	return {
 		filePath,
 		action: alreadyExists ? "updated" : "created",
@@ -2743,7 +2816,9 @@ async function generateReleaseCi(ctx) {
 			description: "Release workflow already up to date"
 		};
 	}
-	ctx.write(workflowPath, preserveDevBinaryPath(content, existing));
+	const withDevPath = preserveDevBinaryPath(content, existing);
+	const final = existing ? insertCustomBlocks(withDevPath, extractCustomBlocks(existing)) : withDevPath;
+	ctx.write(workflowPath, final);
 	return {
 		filePath: workflowPath,
 		action: alreadyExists ? "updated" : "created",
@@ -3042,7 +3117,7 @@ function generateMigratePrompt(results, config, detected) {
 	const timestamp = (/* @__PURE__ */ new Date()).toISOString();
 	sections.push("# Migration Prompt");
 	sections.push("");
-	sections.push(`_Generated by \`@bensandee/tooling@0.35.0 repo:sync\` on ${timestamp}_`);
+	sections.push(`_Generated by \`@bensandee/tooling@0.36.0 repo:sync\` on ${timestamp}_`);
 	sections.push("");
 	sections.push("The following prompt was generated by `@bensandee/tooling repo:sync`. Paste it into Claude Code or another AI assistant to finish migrating this repository.");
 	sections.push("");
@@ -4915,7 +4990,7 @@ const dockerCheckCommand = defineCommand({
 const main = defineCommand({
 	meta: {
 		name: "bst",
-		version: "0.35.0",
+		version: "0.36.0",
 		description: "Bootstrap and maintain standardized TypeScript project tooling"
 	},
 	subCommands: {
@@ -4931,7 +5006,7 @@ const main = defineCommand({
 		"docker:check": dockerCheckCommand
 	}
 });
-console.log(`@bensandee/tooling v0.35.0`);
+console.log(`@bensandee/tooling v0.36.0`);
 async function run() {
 	await runMain(main);
 	process.exit(process.exitCode ?? 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bensandee/tooling",
-  "version": "0.35.0",
+  "version": "0.36.0",
   "description": "CLI tool to bootstrap and maintain standardized TypeScript project tooling",
   "bin": {
     "bst": "./dist/bin.mjs"