@bensandee/tooling 0.53.1 → 0.54.1

package/dist/bin.mjs

@@ -623,23 +623,44 @@ const ToolingConfigSchema = z.strictObject({
 	]).optional().meta({ description: "Project type (determines tsconfig base)" }),
 	detectPackageTypes: z.boolean().optional().meta({ description: "Auto-detect project types for monorepo packages" }),
 	docker: z.record(z.string(), z.object({
-		dockerfile: z.string().meta({ description: "Path to Dockerfile relative to package" }),
-		context: z.string().default(".").meta({ description: "Docker build context relative to package" }),
+		dockerfile: z.string().optional().meta({ description: "Path to Dockerfile relative to package (falls back to convention when omitted)" }),
+		context: z.string().optional().meta({ description: "Docker build context relative to package (falls back to convention, default '.')" }),
 		buildArgs: z.record(z.string(), z.string()).optional().meta({ description: "Build args passed to `docker build` for this package. Values support ${VAR} and ${VAR:-default} expansion against process.env." })
-	})).optional().meta({ description: "Docker package overrides (package name → config)" }),
+	})).optional().meta({ description: "Docker package overrides (package name → partial config; any field may be omitted to fall back to convention)" }),
 	dockerCheck: z.union([z.literal(false), DockerCheckConfigSchema]).optional().meta({ description: "Docker health check configuration or false to disable" }),
 	registryHost: z.string().optional().meta({ description: "Docker registry hostname (e.g. ghcr.io, code.example.com)" }),
 	registryNamespace: z.string().optional().meta({ description: "Docker registry namespace (e.g. ghcr.io/myorg, code.example.com/myorg)" }),
 	postReleaseHook: z.string().optional().meta({ description: "Override the post-release hook command (default: POST to POST_RELEASE_HOOK_URL with HMAC-SHA256 auth)" }),
 	postReleaseHookSecrets: z.array(z.string()).optional().meta({ description: "Additional secret names to inject as env vars in the post-release hook step (e.g. ['WEBHOOK_SECRET'])" })
 });
+/** Format a Zod issue as a human-readable bullet: location + plain-English explanation. */
+function formatIssue(issue) {
+	const loc = issue.path.length > 0 ? issue.path.map(String).join(".") : "(root)";
+	if (issue.code === "invalid_type") {
+		if (issue.input === void 0) return `  ${loc}: missing (expected ${issue.expected})`;
+		return `  ${loc}: expected ${issue.expected}, got ${typeof issue.input}`;
+	}
+	if (issue.code === "unrecognized_keys") return `  ${loc}: ${issue.keys.length > 1 ? "unknown fields" : "unknown field"} ${issue.keys.map((k) => `"${k}"`).join(", ")}`;
+	return `  ${loc}: ${issue.message}`;
+}
 /** Load saved tooling config from the target directory. Returns undefined if missing, throws on invalid. */
 function loadToolingConfig(targetDir) {
 	const fullPath = path.join(targetDir, CONFIG_FILE);
 	if (!existsSync(fullPath)) return void 0;
 	const raw = readFileSync(fullPath, "utf-8");
-	const result = ToolingConfigSchema.safeParse(JSON.parse(raw));
-	if (!result.success) throw new FatalError(`Invalid .tooling.json:\n${result.error.issues.map((i) => `  ${i.path.join(".")}: ${i.message}`).join("\n")}`);
+	const displayPath = path.relative(process.cwd(), fullPath) || fullPath;
+	let parsed;
+	try {
+		parsed = JSON.parse(raw);
+	} catch (error) {
+		throw new FatalError(`Could not parse ${displayPath} as JSON: ${error instanceof Error ? error.message : String(error)}`);
+	}
+	const result = ToolingConfigSchema.safeParse(parsed);
+	if (!result.success) {
+		const issues = result.error.issues.map(formatIssue).join("\n");
+		const count = result.error.issues.length;
+		throw new FatalError(`Invalid .tooling.json (${displayPath}) — ${count === 1 ? "1 problem" : `${count} problems`}:\n${issues}`);
+	}
 	return result.data;
 }
 /** Config fields that can be overridden in .tooling.json. */
@@ -658,30 +679,42 @@ const OVERRIDE_KEYS = [
 ];
 /** Keys that have no effect for monorepos (generators ignore them). */
 const MONOREPO_IGNORED_KEYS = new Set(["setupVitest", "projectType"]);
+const SCHEMA_REF = "node_modules/@bensandee/tooling/tooling.schema.json";
+const RawJsonObjectSchema = z.record(z.string(), z.unknown());
+/** Parse the raw .tooling.json contents into a plain object, or {} if invalid/missing. */
+function parseExistingConfig(raw) {
+	if (raw === void 0) return {};
+	try {
+		const result = RawJsonObjectSchema.safeParse(JSON.parse(raw));
+		if (result.success) return result.data;
+	} catch (_error) {}
+	return {};
+}
 /**
 * Save only the fields that differ from detected defaults to .tooling.json.
 * A fully conventional project produces `{}` (or a minimal set of overrides).
 * Keys that have no effect for the current structure are omitted.
+*
+* Non-override fields (e.g. `docker`, `dockerCheck`) are copied verbatim from the
+* raw JSON — they are not re-parsed through Zod, so schema defaults like
+* `docker.<pkg>.context: "."` are never injected into the user's file.
 */
 function saveToolingConfig(ctx, config) {
 	const defaults = computeDefaults(config.targetDir);
 	const isMonorepo = config.structure === "monorepo";
 	const existing = ctx.exists(CONFIG_FILE) ? ctx.read(CONFIG_FILE) : void 0;
+	const existingJson = parseExistingConfig(existing);
 	const overrideKeySet = new Set(OVERRIDE_KEYS);
-	const preserved = {};
-	if (existing) {
-		const result = ToolingConfigSchema.safeParse(JSON.parse(existing));
-		if (result.success) {
-			for (const [key, value] of Object.entries(result.data)) if (key !== "$schema" && !overrideKeySet.has(key)) preserved[key] = value;
-		}
-	}
-	const overrides = { $schema: "node_modules/@bensandee/tooling/tooling.schema.json" };
+	const result = { $schema: SCHEMA_REF };
 	for (const key of OVERRIDE_KEYS) {
 		if (isMonorepo && MONOREPO_IGNORED_KEYS.has(key)) continue;
-		if (config[key] !== defaults[key]) overrides[key] = config[key];
+		if (config[key] !== defaults[key]) result[key] = config[key];
 	}
-	Object.assign(overrides, preserved);
-	const content = JSON.stringify(overrides, null, 2) + "\n";
+	for (const [key, value] of Object.entries(existingJson)) {
+		if (key === "$schema" || overrideKeySet.has(key)) continue;
+		result[key] = value;
+	}
+	const content = JSON.stringify(result, null, 2) + "\n";
 	if (existing !== void 0 && contentEqual(CONFIG_FILE, existing, content)) return {
 		filePath: CONFIG_FILE,
 		action: "skipped",
@@ -715,8 +748,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 +770,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 +869,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 +897,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 +952,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
 	]);
@@ -1674,7 +1733,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.1";
+	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.54.1";
 	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",
@@ -3450,7 +3509,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.1 repo:sync\` on ${timestamp}_\n`);
+	sections.push(`# Migration Prompt\n\n_Generated by \`@bensandee/tooling@0.54.1 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) => {
@@ -6753,7 +6812,7 @@ async function sendWebhookWithLogging(url, secret, payload) {
 const main = defineCommand({
 	meta: {
 		name: "bst",
-		version: "0.53.1",
+		version: "0.54.1",
 		description: "Bootstrap and maintain standardized TypeScript project tooling"
 	},
 	subCommands: {
@@ -6821,7 +6880,7 @@ const main = defineCommand({
 		})
 	}
 });
-console.log(`@bensandee/tooling v0.53.1`);
+console.log(`@bensandee/tooling v0.54.1`);
 async function run() {
 	await runMain(main);
 	process.exit(process.exitCode ?? 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bensandee/tooling",
-  "version": "0.53.1",
+  "version": "0.54.1",
   "description": "CLI tool to bootstrap and maintain standardized TypeScript project tooling",
   "license": "MIT",
   "repository": {
@@ -54,8 +54,8 @@
     "prettier": "3.8.3",
     "release-it": "20.0.0",
     "tsdown": "0.21.9",
-    "@bensandee/claude-hooks": "0.7.0",
-    "@bensandee/config": "0.10.2"
+    "@bensandee/config": "0.10.2",
+    "@bensandee/claude-hooks": "0.7.0"
   },
   "scripts": {
     "build": "tsdown",

package/tooling.schema.json

@@ -58,7 +58,7 @@
       "type": "boolean"
     },
     "docker": {
-      "description": "Docker package overrides (package name → config)",
+      "description": "Docker package overrides (package name → partial config; any field may be omitted to fall back to convention)",
       "type": "object",
       "propertyNames": {
         "type": "string"
@@ -67,12 +67,11 @@
         "type": "object",
         "properties": {
           "dockerfile": {
-            "type": "string",
-            "description": "Path to Dockerfile relative to package"
+            "description": "Path to Dockerfile relative to package (falls back to convention when omitted)",
+            "type": "string"
           },
           "context": {
-            "default": ".",
-            "description": "Docker build context relative to package",
+            "description": "Docker build context relative to package (falls back to convention, default '.')",
             "type": "string"
           },
           "buildArgs": {
@@ -86,7 +85,6 @@
             }
           }
         },
-        "required": ["dockerfile", "context"],
         "additionalProperties": false
       }
     },