@bensandee/tooling 0.25.1 → 0.25.3

package/dist/bin.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { l as createRealExecutor$1, t as runDockerCheck, u as isExecSyncError } from "./check-VAgrEX2D.mjs";
+import { l as createRealExecutor$1, t as runDockerCheck, u as isExecSyncError } from "./check-D41R218h.mjs";
 import { defineCommand, runMain } from "citty";
 import * as p from "@clack/prompts";
 import path from "node:path";
@@ -983,7 +983,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.0";
-	deps["@bensandee/tooling"] = "0.25.1";
+	deps["@bensandee/tooling"] = "0.25.3";
 	if (config.formatter === "oxfmt") deps["oxfmt"] = "0.35.0";
 	if (config.formatter === "prettier") deps["prettier"] = "3.8.1";
 	addReleaseDeps(deps, config);
@@ -1008,7 +1008,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.0";
-	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.25.1";
+	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.25.3";
 	if (ctx.config.useEslintPlugin) devDeps["@bensandee/eslint-plugin"] = isWorkspacePackage(ctx, "@bensandee/eslint-plugin") ? "workspace:*" : "0.9.2";
 	if (ctx.config.formatter === "oxfmt") devDeps["oxfmt"] = "0.35.0";
 	if (ctx.config.formatter === "prettier") devDeps["prettier"] = "3.8.1";
@@ -2649,6 +2649,11 @@ function readPackageInfo(executor, packageJsonPath) {
 		};
 	}
 }
+/** Strip npm scope from a package name: "@scope/foo" → "foo", "foo" → "foo". */
+function stripScope(name) {
+	const slashIndex = name.indexOf("/");
+	return name.startsWith("@") && slashIndex !== -1 ? name.slice(slashIndex + 1) : name;
+}
 /** Convention paths to check for Dockerfiles in a package directory. */
 const CONVENTION_DOCKERFILE_PATHS = ["Dockerfile", "docker/Dockerfile"];
 /**
@@ -2698,7 +2703,7 @@ function detectDockerPackages(executor, cwd, repoName) {
 				const { name, version } = readPackageInfo(executor, path.join(cwd, "packages", dir, "package.json"));
 				packages.push({
 					dir,
-					imageName: `${repoName}-${name ?? dir}`,
+					imageName: `${repoName}-${stripScope(name ?? dir)}`,
 					version,
 					docker
 				});
@@ -2709,7 +2714,7 @@ function detectDockerPackages(executor, cwd, repoName) {
 			const { name, version } = readPackageInfo(executor, path.join(cwd, "packages", dir, "package.json"));
 			packages.push({
 				dir,
-				imageName: `${repoName}-${name ?? dir}`,
+				imageName: `${repoName}-${stripScope(name ?? dir)}`,
 				version,
 				docker
 			});
@@ -2721,7 +2726,7 @@ function detectDockerPackages(executor, cwd, repoName) {
 			const { name, version } = readPackageInfo(executor, path.join(cwd, "package.json"));
 			packages.push({
 				dir: ".",
-				imageName: name ?? repoName,
+				imageName: stripScope(name ?? repoName),
 				version,
 				docker
 			});
@@ -2741,7 +2746,7 @@ function readSinglePackageDocker(executor, cwd, packageDir, repoName) {
 	const { name, version } = readPackageInfo(executor, path.join(cwd, "packages", dir, "package.json"));
 	return {
 		dir,
-		imageName: `${repoName}-${name ?? dir}`,
+		imageName: `${repoName}-${stripScope(name ?? dir)}`,
 		version,
 		docker
 	};
@@ -3093,9 +3098,7 @@ function logDetectionSummary(ctx) {
 }
 async function runInit(config, options = {}) {
 	const detected = detectProject(config.targetDir);
-	const s = p.spinner();
 	const { ctx, archivedFiles } = createContext(config, options.confirmOverwrite ?? (async (relativePath) => {
-		s.stop("Paused");
 		const result = await p.select({
 			message: `${relativePath} already exists. What do you want to do?`,
 			options: [{
@@ -3106,20 +3109,12 @@ async function runInit(config, options = {}) {
 				label: "Skip"
 			}]
 		});
-		s.start("Generating configuration files...");
 		if (p.isCancel(result)) return "skip";
 		return result;
 	}));
 	if (config.releaseStrategy !== "none" && !ctx.packageJson?.repository) p.log.warn(`package.json is missing a "repository" field — required for release strategy "${config.releaseStrategy}"`);
 	logDetectionSummary(ctx);
-	s.start("Generating configuration files...");
-	let results;
-	try {
-		results = await runGenerators(ctx);
-	} catch (error) {
-		s.stop("Generation failed!");
-		throw error;
-	}
+	const results = await runGenerators(ctx);
 	const alreadyArchived = new Set(results.filter((r) => r.action === "archived").map((r) => r.filePath));
 	for (const rel of archivedFiles) if (!alreadyArchived.has(rel)) results.push({
 		filePath: rel,
@@ -3129,10 +3124,9 @@ async function runInit(config, options = {}) {
 	const created = results.filter((r) => r.action === "created");
 	const updated = results.filter((r) => r.action === "updated");
 	if (!(created.length > 0 || updated.length > 0 || archivedFiles.length > 0) && options.noPrompt) {
-		s.stop("Repository is up to date.");
+		p.log.success("Repository is up to date.");
 		return results;
 	}
-	s.stop("Done!");
 	if (results.some((r) => r.action === "archived" && r.filePath.startsWith(".husky/"))) try {
 		execSync("git config --unset core.hooksPath", {
 			cwd: config.targetDir,
@@ -3154,16 +3148,15 @@ async function runInit(config, options = {}) {
 	const bensandeeDeps = getAddedDevDepNames(config).filter((name) => name.startsWith("@bensandee/"));
 	const hasLockfile = ctx.exists("pnpm-lock.yaml");
 	if (bensandeeDeps.length > 0 && hasLockfile) {
-		s.start("Updating @bensandee/* packages...");
+		p.log.info("Updating @bensandee/* packages...");
 		try {
 			execSync(`pnpm update --latest ${bensandeeDeps.join(" ")}`, {
 				cwd: config.targetDir,
-				stdio: "ignore",
+				stdio: "inherit",
 				timeout: 6e4
 			});
-			s.stop("Updated @bensandee/* packages");
 		} catch (_error) {
-			s.stop("Could not update @bensandee/* packages — run pnpm install first");
+			p.log.warn("Could not update @bensandee/* packages — run pnpm install manually");
 		}
 	}
 	p.note([
@@ -4666,7 +4659,7 @@ const dockerCheckCommand = defineCommand({
 const main = defineCommand({
 	meta: {
 		name: "tooling",
-		version: "0.25.1",
+		version: "0.25.3",
 		description: "Bootstrap and maintain standardized TypeScript project tooling"
 	},
 	subCommands: {
@@ -4682,7 +4675,7 @@ const main = defineCommand({
 		"docker:check": dockerCheckCommand
 	}
 });
-console.log(`@bensandee/tooling v0.25.1`);
+console.log(`@bensandee/tooling v0.25.3`);
 async function run() {
 	await runMain(main);
 	process.exit(process.exitCode ?? 0);

package/dist/{check-VAgrEX2D.mjs → check-D41R218h.mjs}

@@ -165,16 +165,21 @@ async function runDockerCheck(executor, config) {
 		const healthStatus = new Map(config.healthChecks.map((c) => [c.name, false]));
 		while (executor.now() - startTime < timeoutMs) {
 			const containers = composePs(executor, compose);
-			for (const service of compose.services) if (getContainerHealth(containers, service) === "unhealthy") {
-				executor.logError(`Container ${service} is unhealthy`);
-				composeLogs(executor, compose, service);
-				cleanup();
-				return {
-					success: false,
-					reason: "unhealthy-container",
-					message: service,
-					elapsedMs: executor.now() - startTime
-				};
+			let allContainersHealthy = true;
+			for (const service of compose.services) {
+				const status = getContainerHealth(containers, service);
+				if (status === "unhealthy") {
+					executor.logError(`Container ${service} is unhealthy`);
+					composeLogs(executor, compose, service);
+					cleanup();
+					return {
+						success: false,
+						reason: "unhealthy-container",
+						message: service,
+						elapsedMs: executor.now() - startTime
+					};
+				}
+				if (status === "starting") allContainersHealthy = false;
 			}
 			for (const check of config.healthChecks) if (!healthStatus.get(check.name)) {
 				if (await checkHttpHealth(executor, check)) {
@@ -182,7 +187,7 @@ async function runDockerCheck(executor, config) {
 					executor.log(`${check.name} is healthy!`);
 				}
 			}
-			if ([...healthStatus.values()].every(Boolean)) {
+			if (allContainersHealthy && [...healthStatus.values()].every(Boolean)) {
 				executor.log("Check successful! All systems operational.");
 				cleanup();
 				return {

package/dist/docker-check/index.mjs

@@ -1,2 +1,2 @@
-import { a as composeDown, c as composeUp, i as composeCommand, l as createRealExecutor, n as checkHttpHealth, o as composeLogs, r as getContainerHealth, s as composePs, t as runDockerCheck } from "../check-VAgrEX2D.mjs";
+import { a as composeDown, c as composeUp, i as composeCommand, l as createRealExecutor, n as checkHttpHealth, o as composeLogs, r as getContainerHealth, s as composePs, t as runDockerCheck } from "../check-D41R218h.mjs";
 export { checkHttpHealth, composeCommand, composeDown, composeLogs, composePs, composeUp, createRealExecutor, getContainerHealth, runDockerCheck };

package/package.json

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