@bensandee/tooling 0.25.2 → 0.26.0

package/README.md

@@ -32,10 +32,32 @@ The tool auto-detects project structure, CI platform, project type, and Docker p
 | --------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `tooling repo:sync [dir]`         | Detect, generate, and sync project tooling (idempotent). First run prompts for release strategy, CI platform (if not detected), and formatter (if Prettier found). Subsequent runs are non-interactive. |
 | `tooling repo:sync --check [dir]` | Dry-run drift detection. Exits 1 if files would change. CI-friendly.                                                                                                                                    |
-| `tooling checks:run`              | Run project checks (build, typecheck, lint, knip, test). Flag: `--fail-fast`.                                                                                                                           |
+| `tooling checks:run`              | Run project checks (build, docker:build, typecheck, lint, test, format, knip, tooling:check, docker:check). Flags: `--skip`, `--add`, `--fail-fast`.                                                    |
 
 **Flags:** `--yes` (accept all defaults), `--no-ci`, `--no-prompt`, `--eslint-plugin`
 
+#### `checks:run`
+
+Runs checks in order: build, docker:build, typecheck, lint, test, format (--check), knip, tooling:check, docker:check. Checks without a matching script in `package.json` are silently skipped.
+
+The `--skip` flag supports glob patterns via picomatch:
+
+```bash
+# Skip all docker steps
+tooling checks:run --skip 'docker:*'
+
+# Skip specific checks
+tooling checks:run --skip build,knip
+```
+
+The `--add` flag appends extra checks (must be defined in `package.json`):
+
+```bash
+tooling checks:run --add e2e
+```
+
+The generated `ci:check` script defaults to `pnpm check --skip 'docker:*'` since CI environments typically lack Docker support.
+
 ### Release management
 
 | Command                          | Description                                                                                                                     |
@@ -99,7 +121,7 @@ To give individual packages a standalone `image:build` script for local testing:
 }
 ```
 
-**Flags:** `--package <dir>` (build a single package), `--verbose`
+**Flags:** `--package <dir>` (build a single package)
 
 #### `docker:publish`
 
@@ -109,7 +131,7 @@ Tags generated per package: `latest`, `vX.Y.Z`, `vX.Y`, `vX`
 
 Each package is tagged independently using its own version, so packages in a monorepo can have different release cadences. Packages without a `version` field are rejected at publish time.
 
-**Flags:** `--dry-run` (build and tag only, skip login/push/logout), `--verbose`
+**Flags:** `--dry-run` (build and tag only, skip login/push/logout)
 
 **Required environment variables:**
 

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";
@@ -10,6 +10,7 @@ import { z } from "zod";
 import { FatalError, TransientError, UnexpectedError } from "@bensandee/common";
 import { isMap, isScalar, isSeq, parse as parse$1, parseDocument, stringify } from "yaml";
 import { execSync } from "node:child_process";
+import picomatch from "picomatch";
 import { tmpdir } from "node:os";
 //#region src/types.ts
 const LEGACY_TOOLS = [
@@ -904,7 +905,7 @@ const STANDARD_SCRIPTS_SINGLE = {
 	lint: "oxlint",
 	knip: "knip",
 	check: "pnpm exec tooling checks:run",
-	"ci:check": "pnpm check",
+	"ci:check": "pnpm check --skip 'docker:*'",
 	"tooling:check": "pnpm exec tooling repo:sync --check",
 	"tooling:sync": "pnpm exec tooling repo:sync"
 };
@@ -915,7 +916,7 @@ const STANDARD_SCRIPTS_MONOREPO = {
 	lint: "oxlint",
 	knip: "knip",
 	check: "pnpm exec tooling checks:run",
-	"ci:check": "pnpm check",
+	"ci:check": "pnpm check --skip 'docker:*'",
 	"tooling:check": "pnpm exec tooling repo:sync --check",
 	"tooling:sync": "pnpm exec tooling repo:sync"
 };
@@ -983,7 +984,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.2";
+	deps["@bensandee/tooling"] = "0.26.0";
 	if (config.formatter === "oxfmt") deps["oxfmt"] = "0.35.0";
 	if (config.formatter === "prettier") deps["prettier"] = "3.8.1";
 	addReleaseDeps(deps, config);
@@ -1008,7 +1009,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.2";
+	devDeps["@bensandee/tooling"] = isWorkspacePackage(ctx, "@bensandee/tooling") ? "workspace:*" : "0.26.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"] = "0.35.0";
 	if (ctx.config.formatter === "prettier") devDeps["prettier"] = "3.8.1";
@@ -2779,9 +2780,6 @@ function imageRef(namespace, imageName, tag) {
 function log$1(message) {
 	console.log(message);
 }
-function debug$1(verbose, message) {
-	if (verbose) console.log(`[debug] ${message}`);
-}
 /** Read the repo name from root package.json. */
 function readRepoName(executor, cwd) {
 	const rootPkgRaw = executor.readFile(path.join(cwd, "package.json"));
@@ -2791,7 +2789,7 @@ function readRepoName(executor, cwd) {
 	return repoName;
 }
 /** Build a single docker image from its config. Paths are resolved relative to cwd. */
-function buildImage(executor, pkg, cwd, verbose, extraArgs) {
+function buildImage(executor, pkg, cwd, extraArgs) {
 	const dockerfilePath = path.resolve(cwd, pkg.docker.dockerfile);
 	const contextPath = path.resolve(cwd, pkg.docker.context);
 	const command = [
@@ -2801,10 +2799,7 @@ function buildImage(executor, pkg, cwd, verbose, extraArgs) {
 		...extraArgs,
 		contextPath
 	].join(" ");
-	debug$1(verbose, `Running: ${command}`);
-	const buildResult = executor.exec(command);
-	debug$1(verbose, `Build stdout: ${buildResult.stdout}`);
-	if (buildResult.exitCode !== 0) throw new FatalError(`docker build failed for ${pkg.dir} (exit ${buildResult.exitCode}): ${buildResult.stderr}`);
+	executor.execInherit(command);
 }
 /**
 * Detect packages with docker config in .tooling.json and build each one.
@@ -2818,7 +2813,7 @@ function runDockerBuild(executor, config) {
 	if (config.packageDir) {
 		const pkg = readSinglePackageDocker(executor, config.cwd, config.packageDir, repoName);
 		log$1(`Building image for ${pkg.dir} (${pkg.imageName}:latest)...`);
-		buildImage(executor, pkg, config.cwd, config.verbose, config.extraArgs);
+		buildImage(executor, pkg, config.cwd, config.extraArgs);
 		log$1(`Built ${pkg.imageName}:latest`);
 		return { packages: [pkg] };
 	}
@@ -2830,7 +2825,7 @@ function runDockerBuild(executor, config) {
 	log$1(`Found ${packages.length} Docker package(s): ${packages.map((p) => p.dir).join(", ")}`);
 	for (const pkg of packages) {
 		log$1(`Building image for ${pkg.dir} (${pkg.imageName}:latest)...`);
-		buildImage(executor, pkg, config.cwd, config.verbose, config.extraArgs);
+		buildImage(executor, pkg, config.cwd, config.extraArgs);
 	}
 	log$1(`Built ${packages.length} image(s)`);
 	return { packages };
@@ -2847,7 +2842,6 @@ function runDockerPublish(executor, config) {
 	const { packages } = runDockerBuild(executor, {
 		cwd: config.cwd,
 		packageDir: void 0,
-		verbose: config.verbose,
 		extraArgs: []
 	});
 	if (packages.length === 0) return {
@@ -3098,9 +3092,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: [{
@@ -3111,20 +3103,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,
@@ -3134,10 +3118,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,
@@ -3159,16 +3142,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([
@@ -3323,6 +3305,16 @@ function createRealExecutor() {
 				};
 			}
 		},
+		execInherit(command, options) {
+			execSync(command, {
+				cwd: options?.cwd,
+				env: options?.env ? {
+					...process.env,
+					...options.env
+				} : void 0,
+				stdio: "inherit"
+			});
+		},
 		fetch: globalThis.fetch,
 		listChangesetFiles(cwd) {
 			const dir = path.join(cwd, ".changeset");
@@ -4174,6 +4166,7 @@ const releaseSimpleCommand = defineCommand({
 //#region src/commands/repo-run-checks.ts
 const CHECKS = [
 	{ name: "build" },
+	{ name: "docker:build" },
 	{ name: "typecheck" },
 	{ name: "lint" },
 	{ name: "test" },
@@ -4185,6 +4178,11 @@ const CHECKS = [
 	{ name: "tooling:check" },
 	{ name: "docker:check" }
 ];
+/** Check if a name matches any skip pattern. Supports glob syntax via picomatch. */
+function shouldSkip(name, patterns) {
+	if (patterns.size === 0) return false;
+	return picomatch.isMatch(name, [...patterns]);
+}
 function defaultGetScripts(targetDir) {
 	try {
 		const pkg = parsePackageJson(readFileSync(path.join(targetDir, "package.json"), "utf-8"));
@@ -4219,7 +4217,7 @@ function runRunChecks(targetDir, options = {}) {
 	const failures = [];
 	const notDefined = [];
 	for (const check of allChecks) {
-		if (skip.has(check.name)) continue;
+		if (shouldSkip(check.name, skip)) continue;
 		if (!definedScripts.has(check.name)) {
 			if (addedNames.has(check.name)) {
 				p.log.error(`${check.name} not defined in package.json`);
@@ -4295,16 +4293,10 @@ const publishDockerCommand = defineCommand({
 		name: "docker:publish",
 		description: "Build, tag, and push Docker images for packages with an image:build script"
 	},
-	args: {
-		"dry-run": {
-			type: "boolean",
-			description: "Build and tag images but skip login, push, and logout"
-		},
-		verbose: {
-			type: "boolean",
-			description: "Enable detailed debug logging"
-		}
-	},
+	args: { "dry-run": {
+		type: "boolean",
+		description: "Build and tag images but skip login, push, and logout"
+	} },
 	async run({ args }) {
 		const config = {
 			cwd: process.cwd(),
@@ -4312,8 +4304,7 @@ const publishDockerCommand = defineCommand({
 			registryNamespace: requireEnv("DOCKER_REGISTRY_NAMESPACE"),
 			username: requireEnv("DOCKER_USERNAME"),
 			password: requireEnv("DOCKER_PASSWORD"),
-			dryRun: args["dry-run"] === true,
-			verbose: args.verbose === true
+			dryRun: args["dry-run"] === true
 		};
 		runDockerPublish(createRealExecutor(), config);
 	}
@@ -4346,10 +4337,6 @@ const dockerBuildCommand = defineCommand({
 			type: "string",
 			description: "Build a single package by directory path (e.g. packages/server). Useful as an image:build script."
 		},
-		verbose: {
-			type: "boolean",
-			description: "Enable detailed debug logging"
-		},
 		_: {
 			type: "positional",
 			required: false,
@@ -4370,7 +4357,6 @@ const dockerBuildCommand = defineCommand({
 		runDockerBuild(executor, {
 			cwd,
 			packageDir,
-			verbose: args.verbose === true,
 			extraArgs: extraArgs.filter((a) => a.length > 0)
 		});
 	}
@@ -4671,7 +4657,7 @@ const dockerCheckCommand = defineCommand({
 const main = defineCommand({
 	meta: {
 		name: "tooling",
-		version: "0.25.2",
+		version: "0.26.0",
 		description: "Bootstrap and maintain standardized TypeScript project tooling"
 	},
 	subCommands: {
@@ -4687,7 +4673,7 @@ const main = defineCommand({
 		"docker:check": dockerCheckCommand
 	}
 });
-console.log(`@bensandee/tooling v0.25.2`);
+console.log(`@bensandee/tooling v0.26.0`);
 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.2",
+  "version": "0.26.0",
   "description": "CLI tool to bootstrap and maintain standardized TypeScript project tooling",
   "bin": {
     "tooling": "./dist/bin.mjs"
@@ -34,12 +34,14 @@
     "citty": "^0.2.1",
     "json5": "^2.2.3",
     "jsonc-parser": "^3.3.1",
+    "picomatch": "^4.0.3",
     "yaml": "^2.8.2",
     "zod": "^4.3.6",
     "@bensandee/common": "0.1.2"
   },
   "devDependencies": {
     "@types/node": "24.12.0",
+    "@types/picomatch": "^4.0.2",
     "tsdown": "0.21.2",
     "typescript": "5.9.3",
     "vitest": "4.0.18",