@bensandee/tooling 0.57.2 → 0.57.3

package/dist/bin.mjs

@@ -880,6 +880,13 @@ function detectDockerPackages(executor, cwd, repoName) {
 	const packages = [];
 	const seen = /* @__PURE__ */ new Set();
 	if (packageDirs.length > 0) {
+		const rootConvention = findRootDockerfile(executor, cwd);
+		const rootOverride = overrides["."];
+		const rootDocker = mergeDockerConfig(rootConvention, rootOverride);
+		if (rootDocker) {
+			packages.push(createDockerPackage(executor, cwd, ".", repoName, rootDocker));
+			seen.add(".");
+		}
 		for (const dir of packageDirs) {
 			const convention = findConventionDockerfile(executor, cwd, dir);
 			const override = overrides[dir];
@@ -1800,7 +1807,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.57.2";
+	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.57.3";
 	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.31.0",
@@ -4711,7 +4718,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.57.2 repo:sync\` on ${timestamp}_\n`);
+	sections.push(`# Migration Prompt\n\n_Generated by \`@bensandee/tooling@0.57.3 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) => {
@@ -6509,8 +6516,18 @@ const ComposePortSchema = z.union([z.string(), z.looseObject({
 	published: z.union([z.string(), z.number()]),
 	target: z.union([z.string(), z.number()]).optional()
 })]);
+/**
+* Compose `build:` accepts either a string shorthand (the build context path,
+* with `dockerfile` defaulting to `Dockerfile`) or an object with `context`
+* and/or `dockerfile`. We capture both forms.
+*/
+const ComposeBuildSchema = z.union([z.string(), z.looseObject({
+	context: z.string().optional(),
+	dockerfile: z.string().optional()
+})]);
 const ComposeServiceSchema = z.looseObject({
 	image: z.string().optional(),
+	build: ComposeBuildSchema.optional(),
 	ports: z.array(ComposePortSchema).optional(),
 	healthcheck: z.unknown().optional()
 });
@@ -6533,6 +6550,20 @@ function detectComposeFiles(cwd) {
 		files: []
 	};
 }
+/**
+* Resolve a service's `build:` stanza to an absolute Dockerfile path.
+* Compose spec: bare-string shorthand sets the context; `dockerfile` defaults
+* to `Dockerfile`; both context and dockerfile default to `.` and `Dockerfile`
+* respectively when absent. The dockerfile path is resolved relative to the
+* build context, which is itself relative to the compose file's directory.
+*/
+function resolveBuildDockerfile(composeFileDir, build) {
+	if (build === void 0) return void 0;
+	if (typeof build === "string") return path.resolve(composeFileDir, build, "Dockerfile");
+	const context = build.context ?? ".";
+	const dockerfile = build.dockerfile ?? "Dockerfile";
+	return path.resolve(composeFileDir, context, dockerfile);
+}
 /** Parse a single port mapping string and extract the host port. */
 function parsePortString(port) {
 	const withoutProtocol = port.split("/")[0];
@@ -6583,9 +6614,11 @@ function parseComposeServices(cwd, composeFiles) {
 					break;
 				}
 			}
+			const buildDockerfile = resolveBuildDockerfile(cwd, service.build);
 			serviceMap.set(name, {
 				name,
 				image: existing?.image ?? service.image,
+				buildDockerfile: existing?.buildDockerfile ?? buildDockerfile,
 				hostPort,
 				hasHealthcheck: existing?.hasHealthcheck ?? service.healthcheck !== void 0
 			});
@@ -6616,6 +6649,17 @@ function extractComposeImageNames(services) {
 	return [...names];
 }
 /**
+* Extract absolute Dockerfile paths from services that use `build:` rather
+* than (or alongside) `image:`. Used by `docker:check` to recognize that a
+* compose service builds a known Docker package even when no `image:` tag
+* is set.
+*/
+function extractComposeBuildDockerfiles(services) {
+	const paths = /* @__PURE__ */ new Set();
+	for (const service of services) if (service.buildDockerfile) paths.add(service.buildDockerfile);
+	return [...paths];
+}
+/**
 * Whether a service's image refers to an image this repo builds locally.
 * Matches the bare image name (variables/tag stripped) against the list of
 * detected Docker package image names, using the same exact-or-suffix match
@@ -6790,9 +6834,13 @@ const dockerCheckCommand = defineCommand({
 			if (rootPkg?.name) {
 				const dockerPackages = detectDockerPackages(fileReader, cwd, rootPkg.name);
 				const composeImages = extractComposeImageNames(services);
+				const composeBuildDockerfiles = new Set(extractComposeBuildDockerfiles(services));
 				for (const pkg of dockerPackages) {
 					locallyBuiltImageNames.push(pkg.imageName);
-					if (!composeImages.some((img) => img === pkg.imageName || img.endsWith(`/${pkg.imageName}`))) log.warn(`Docker package "${pkg.dir}" (image: ${pkg.imageName}) is not referenced in any compose service.`);
+					const matchesImage = composeImages.some((img) => img === pkg.imageName || img.endsWith(`/${pkg.imageName}`));
+					const pkgDockerfileAbs = path.resolve(cwd, pkg.docker.dockerfile);
+					const matchesBuild = composeBuildDockerfiles.has(pkgDockerfileAbs);
+					if (!matchesImage && !matchesBuild) log.warn(`Docker package "${pkg.dir}" (image: ${pkg.imageName}) is not referenced in any compose service.`);
 				}
 			}
 		}
@@ -8125,7 +8173,7 @@ const out = (msg) => console.log(msg);
 const main = defineCommand({
 	meta: {
 		name: "bst",
-		version: "0.57.2",
+		version: "0.57.3",
 		description: "Bootstrap and maintain standardized TypeScript project tooling"
 	},
 	subCommands: {
@@ -8197,7 +8245,7 @@ const main = defineCommand({
 		})
 	}
 });
-console.log(`@bensandee/tooling v0.57.2`);
+console.log(`@bensandee/tooling v0.57.3`);
 async function run() {
 	await runMain(main);
 	process.exit(process.exitCode ?? 0);

package/package.json

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