@bensandee/tooling 0.53.0 → 0.54.0

package/dist/bin.mjs

@@ -715,8 +715,8 @@ function mergeWithSavedConfig(detected, saved) {
 //#endregion
 //#region src/release/docker.ts
 const ToolingDockerMapSchema = z.record(z.string(), z.object({
-	dockerfile: z.string(),
-	context: z.string().default("."),
+	dockerfile: z.string().optional(),
+	context: z.string().optional(),
 	buildArgs: z.record(z.string(), z.string()).optional()
 }));
 const ToolingConfigDockerSchema = z.object({ docker: ToolingDockerMapSchema.optional() });
@@ -737,6 +737,21 @@ function loadDockerMap(executor, cwd) {
 		return {};
 	}
 }
+/**
+* Merge a convention-discovered config with a user override. Missing override fields
+* fall back to convention. Returns undefined if no dockerfile can be resolved from
+* either source.
+*/
+function mergeDockerConfig(convention, override) {
+	if (!override) return convention;
+	const dockerfile = override.dockerfile ?? convention?.dockerfile;
+	if (!dockerfile) return void 0;
+	return {
+		dockerfile,
+		context: override.context ?? convention?.context ?? ".",
+		buildArgs: override.buildArgs ?? convention?.buildArgs
+	};
+}
 /** Read name and version from a package's package.json. */
 function readPackageInfo(executor, packageJsonPath) {
 	const raw = executor.readFile(packageJsonPath);
@@ -821,16 +836,23 @@ function detectDockerPackages(executor, cwd, repoName) {
 	if (packageDirs.length > 0) {
 		for (const dir of packageDirs) {
 			const convention = findConventionDockerfile(executor, cwd, dir);
-			const docker = overrides[dir] ?? convention;
+			const override = overrides[dir];
+			const docker = mergeDockerConfig(convention, override);
 			if (docker) {
 				packages.push(createDockerPackage(executor, cwd, dir, repoName, docker));
 				seen.add(dir);
 			}
 		}
-		for (const [dir, docker] of Object.entries(overrides)) if (!seen.has(dir)) packages.push(createDockerPackage(executor, cwd, dir, repoName, docker));
+		for (const [dir, override] of Object.entries(overrides)) {
+			if (seen.has(dir)) continue;
+			const docker = mergeDockerConfig(void 0, override);
+			if (!docker) throw new FatalError(`Docker override for "${dir}" has no dockerfile and no convention Dockerfile was found`);
+			packages.push(createDockerPackage(executor, cwd, dir, repoName, docker));
+		}
 	} else {
 		const convention = findRootDockerfile(executor, cwd);
-		const docker = overrides["."] ?? convention;
+		const override = overrides["."];
+		const docker = mergeDockerConfig(convention, override);
 		if (docker) packages.push(createDockerPackage(executor, cwd, ".", repoName, docker));
 	}
 	return packages;
@@ -842,7 +864,8 @@ function detectDockerPackages(executor, cwd, repoName) {
 function readSinglePackageDocker(executor, cwd, packageDir, repoName) {
 	const dir = path.basename(path.resolve(cwd, packageDir));
 	const convention = findConventionDockerfile(executor, cwd, dir);
-	const docker = loadDockerMap(executor, cwd)[dir] ?? convention;
+	const override = loadDockerMap(executor, cwd)[dir];
+	const docker = mergeDockerConfig(convention, override);
 	if (!docker) throw new FatalError(`No Dockerfile found for package "${dir}" (checked convention paths and .tooling.json)`);
 	return createDockerPackage(executor, cwd, dir, repoName, docker);
 }
@@ -896,36 +919,39 @@ function interpolate(value, env, onMissing) {
 	});
 }
 /**
-* Translate a package's configured buildArgs map into `--build-arg K=V` flags,
-* expanding env-var references in values. Warns once per unset variable per build.
+* Resolve a package's configured buildArgs map into `K=V` pairs, expanding
+* env-var references in values. Warns once per unset variable per build.
 */
 function resolveBuildArgs(pkg, env) {
 	const entries = Object.entries(pkg.docker.buildArgs ?? {});
 	if (entries.length === 0) return [];
 	const warned = /* @__PURE__ */ new Set();
-	const flags = [];
+	const pairs = [];
 	for (const [k, rawValue] of entries) {
 		const resolved = interpolate(rawValue, env, (missing) => {
 			if (warned.has(missing)) return;
 			warned.add(missing);
 			log.warn(`docker build arg "${k}" for ${pkg.dir}: env var ${missing} is not set; using empty string`);
 		});
-		flags.push("--build-arg", `${k}=${resolved}`);
+		pairs.push(`${k}=${resolved}`);
 	}
-	return flags;
+	return pairs;
 }
 /** Build a single docker image from its config. Paths are resolved relative to cwd. */
 function buildImage(executor, pkg, cwd, extraArgs) {
 	const dockerfilePath = path.resolve(cwd, pkg.docker.dockerfile);
 	const contextPath = path.resolve(cwd, pkg.docker.context);
-	const configuredArgs = resolveBuildArgs(pkg, process.env);
+	const configuredPairs = resolveBuildArgs(pkg, process.env);
+	log.info(`  build args: ${configuredPairs.length > 0 ? configuredPairs.join(" ") : "(none)"}`);
+	log.info(`  extra args: ${extraArgs.length > 0 ? extraArgs.join(" ") : "(none)"}`);
+	const buildArgFlags = configuredPairs.flatMap((pair) => ["--build-arg", pair]);
 	executor.execInherit("docker", [
 		"build",
 		"-f",
 		dockerfilePath,
 		"-t",
 		`${pkg.imageName}:latest`,
-		...configuredArgs,
+		...buildArgFlags,
 		...extraArgs,
 		contextPath
 	]);
@@ -1188,6 +1214,45 @@ function preserveDevBinaryPath(generated, existing) {
 	if (!match) return generated;
 	return generated.replaceAll("pnpm exec bst", match[0]).replaceAll("pnpm dlx @bensandee/tooling", match[0]);
 }
+function escapeRegex(value) {
+	return value.replaceAll(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+/** Match a `uses: <name>@<ref>` line, capturing indentation, action name, ref, and trailing comment. */
+const USES_LINE_PATTERN = /^(?<indent>\s*(?:-\s+)?uses:\s*)(?<name>[^\s@#]+)@(?<ref>\S+)(?<comment>[ \t]+#[^\n]*)?$/gm;
+/**
+* Extract a map of action-name → full verbatim tail (`<ref>` + optional inline comment)
+* from an existing workflow's `uses:` lines. Local actions (starting with `./` or
+* `docker://`) are skipped. First occurrence wins.
+*/
+function extractPinnedActions(existing) {
+	const map = /* @__PURE__ */ new Map();
+	for (const match of existing.matchAll(USES_LINE_PATTERN)) {
+		const { name, ref, comment } = match.groups ?? {};
+		if (!name || !ref) continue;
+		if (name.startsWith("./") || name.startsWith("docker://")) continue;
+		if (!map.has(name)) map.set(name, `${ref}${comment ?? ""}`);
+	}
+	return map;
+}
+/**
+* Preserve existing Renovate-managed action pins when rewriting a workflow.
+*
+* For each `uses: <name>@<ref>` in the existing file, if the generated file references the
+* same action name, substitute the existing ref (including any inline comment like `# v6`)
+* into the generated output. This keeps SHA pins and their version annotations stable when
+* unrelated workflow changes force a rewrite.
+*/
+function preservePinnedActions(generated, existing) {
+	if (!existing) return generated;
+	const pins = extractPinnedActions(existing);
+	if (pins.size === 0) return generated;
+	let result = generated;
+	for (const [name, tail] of pins) {
+		const pattern = new RegExp(String.raw`^(\s*(?:-\s+)?uses:\s*)${escapeRegex(name)}@\S+(?:[ \t]+#[^\n]*)?$`, "gm");
+		result = result.replace(pattern, `$1${name}@${tail}`);
+	}
+	return result;
+}
 /** Build a complete workflow YAML string from structured options. Single source of truth for workflow files. */
 function buildWorkflowYaml(options) {
 	const doc = { name: options.name };
@@ -1350,8 +1415,8 @@ async function generateDeployCi(ctx) {
 			description: "Publish workflow already up to date"
 		};
 	}
-	const withDevPath = preserveDevBinaryPath(content, existing);
-	const final = existing ? insertCustomBlocks(withDevPath, extractCustomBlocks(existing)) : withDevPath;
+	const withPinnedActions = preservePinnedActions(preserveDevBinaryPath(content, existing), existing);
+	const final = existing ? insertCustomBlocks(withPinnedActions, extractCustomBlocks(existing)) : withPinnedActions;
 	ctx.write(workflowPath, final);
 	return {
 		filePath: workflowPath,
@@ -1635,7 +1700,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.10.2";
-	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.53.0";
+	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.54.0";
 	if (ctx.config.useEslintPlugin) devDeps["@bensandee/eslint-plugin"] = isWorkspacePackage(ctx, "@bensandee/eslint-plugin") ? "workspace:*" : "0.12.0";
 	if (ctx.config.formatter === "oxfmt") devDeps["oxfmt"] = {
 		"@changesets/cli": "2.30.0",
@@ -2427,8 +2492,8 @@ async function generateReleaseCi(ctx) {
 			description: "Release workflow already up to date"
 		};
 	}
-	const withDevPath = preserveDevBinaryPath(content, existing);
-	const final = existing ? insertCustomBlocks(withDevPath, extractCustomBlocks(existing)) : withDevPath;
+	const withPinnedActions = preservePinnedActions(preserveDevBinaryPath(content, existing), existing);
+	const final = existing ? insertCustomBlocks(withPinnedActions, extractCustomBlocks(existing)) : withPinnedActions;
 	ctx.write(workflowPath, final);
 	return {
 		filePath: workflowPath,
@@ -2557,8 +2622,8 @@ async function generateCi(ctx) {
 			description: "CI workflow already up to date"
 		};
 	}
-	const withDevPath = preserveDevBinaryPath(content, existing);
-	const final = existing ? insertCustomBlocks(withDevPath, extractCustomBlocks(existing)) : withDevPath;
+	const withPinnedActions = preservePinnedActions(preserveDevBinaryPath(content, existing), existing);
+	const final = existing ? insertCustomBlocks(withPinnedActions, extractCustomBlocks(existing)) : withPinnedActions;
 	ctx.write(filePath, final);
 	return {
 		filePath,
@@ -3411,7 +3476,7 @@ async function runGenerators(ctx) {
 function generateMigratePrompt(results, config, detected) {
 	const sections = [];
 	const timestamp = (/* @__PURE__ */ new Date()).toISOString();
-	sections.push(`# Migration Prompt\n\n_Generated by \`@bensandee/tooling@0.53.0 repo:sync\` on ${timestamp}_\n`);
+	sections.push(`# Migration Prompt\n\n_Generated by \`@bensandee/tooling@0.54.0 repo:sync\` on ${timestamp}_\n`);
 	const changed = results.filter((r) => r.action === "created" || r.action === "updated" || r.action === "archived");
 	if (changed.length > 0) {
 		const items = changed.map((r) => {
@@ -6714,7 +6779,7 @@ async function sendWebhookWithLogging(url, secret, payload) {
 const main = defineCommand({
 	meta: {
 		name: "bst",
-		version: "0.53.0",
+		version: "0.54.0",
 		description: "Bootstrap and maintain standardized TypeScript project tooling"
 	},
 	subCommands: {
@@ -6782,7 +6847,7 @@ const main = defineCommand({
 		})
 	}
 });
-console.log(`@bensandee/tooling v0.53.0`);
+console.log(`@bensandee/tooling v0.54.0`);
 async function run() {
 	await runMain(main);
 	process.exit(process.exitCode ?? 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bensandee/tooling",
-  "version": "0.53.0",
+  "version": "0.54.0",
   "description": "CLI tool to bootstrap and maintain standardized TypeScript project tooling",
   "license": "MIT",
   "repository": {